diff options
| author | Martin Hořeňovský | 2020-12-13 15:41:12 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-12-13 18:12:20 +0100 |
| commit | a091853f4ae62b428983c63224fec9f1af377295 (patch) | |
| tree | 523325345dd1d17415b77bf9926beb6966e6a522 | |
| parent | be813faaa0034c9930fcd593cc4090757cdbccbb (diff) | |
| download | catch3-a091853f4ae62b428983c63224fec9f1af377295.tar.gz | |
Rename file catch_matchers_floating -> catch_matchers_floating_point
The old name was a legacy of v2 era, where all headers were stitched
into one. With v3 using separate headers, it is better when they have
proper name.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/catch2/matchers/catch_matchers_all.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/matchers/catch_matchers_floating_point.cpp (renamed from src/catch2/matchers/catch_matchers_floating.cpp) | 2 | ||||
| -rw-r--r-- | src/catch2/matchers/catch_matchers_floating_point.hpp (renamed from src/catch2/matchers/catch_matchers_floating.hpp) | 6 | ||||
| -rw-r--r-- | tests/SelfTest/UsageTests/Matchers.tests.cpp | 2 | ||||
| -rw-r--r-- | tests/SelfTest/UsageTests/MatchersRanges.tests.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea6f7f75..e19bd639 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -86,7 +86,7 @@ set(INTERNAL_HEADERS ${SOURCES_DIR}/matchers/catch_matchers_container_properties.hpp ${SOURCES_DIR}/matchers/catch_matchers_contains.hpp ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp - ${SOURCES_DIR}/matchers/catch_matchers_floating.hpp + ${SOURCES_DIR}/matchers/catch_matchers_floating_point.hpp ${SOURCES_DIR}/matchers/catch_matchers_predicate.hpp ${SOURCES_DIR}/matchers/catch_matchers_string.hpp ${SOURCES_DIR}/matchers/catch_matchers_templated.hpp @@ -160,7 +160,7 @@ set(IMPL_SOURCES ${SOURCES_DIR}/interfaces/catch_interfaces_combined_tu.cpp ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp ${SOURCES_DIR}/internal/catch_list.cpp - ${SOURCES_DIR}/matchers/catch_matchers_floating.cpp + ${SOURCES_DIR}/matchers/catch_matchers_floating_point.cpp ${SOURCES_DIR}/matchers/catch_matchers_string.cpp ${SOURCES_DIR}/matchers/catch_matchers_templated.cpp ${SOURCES_DIR}/catch_message.cpp diff --git a/src/catch2/matchers/catch_matchers_all.hpp b/src/catch2/matchers/catch_matchers_all.hpp index f16c47b5..6466b8ab 100644 --- a/src/catch2/matchers/catch_matchers_all.hpp +++ b/src/catch2/matchers/catch_matchers_all.hpp @@ -24,7 +24,7 @@ #include <catch2/matchers/catch_matchers_container_properties.hpp> #include <catch2/matchers/catch_matchers_contains.hpp> #include <catch2/matchers/catch_matchers_exception.hpp> -#include <catch2/matchers/catch_matchers_floating.hpp> +#include <catch2/matchers/catch_matchers_floating_point.hpp> #include <catch2/matchers/catch_matchers_predicate.hpp> #include <catch2/matchers/catch_matchers_string.hpp> #include <catch2/matchers/catch_matchers_templated.hpp> diff --git a/src/catch2/matchers/catch_matchers_floating.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp index e583f46b..fc5d9165 100644 --- a/src/catch2/matchers/catch_matchers_floating.cpp +++ b/src/catch2/matchers/catch_matchers_floating_point.cpp @@ -5,7 +5,7 @@ // https://www.boost.org/LICENSE_1_0.txt) // SPDX-License-Identifier: BSL-1.0 -#include <catch2/matchers/catch_matchers_floating.hpp> +#include <catch2/matchers/catch_matchers_floating_point.hpp> #include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_polyfills.hpp> #include <catch2/internal/catch_to_string.hpp> diff --git a/src/catch2/matchers/catch_matchers_floating.hpp b/src/catch2/matchers/catch_matchers_floating_point.hpp index 6414a6f8..dc0fa8f7 100644 --- a/src/catch2/matchers/catch_matchers_floating.hpp +++ b/src/catch2/matchers/catch_matchers_floating_point.hpp @@ -5,8 +5,8 @@ // https://www.boost.org/LICENSE_1_0.txt) // SPDX-License-Identifier: BSL-1.0 -#ifndef CATCH_MATCHERS_FLOATING_HPP_INCLUDED -#define CATCH_MATCHERS_FLOATING_HPP_INCLUDED +#ifndef CATCH_MATCHERS_FLOATING_POINT_HPP_INCLUDED +#define CATCH_MATCHERS_FLOATING_POINT_HPP_INCLUDED #include <catch2/matchers/catch_matchers.hpp> @@ -70,4 +70,4 @@ namespace Matchers { } // namespace Matchers } // namespace Catch -#endif // CATCH_MATCHERS_FLOATING_HPP_INCLUDED +#endif // CATCH_MATCHERS_FLOATING_POINT_HPP_INCLUDED diff --git a/tests/SelfTest/UsageTests/Matchers.tests.cpp b/tests/SelfTest/UsageTests/Matchers.tests.cpp index b4621d86..93543434 100644 --- a/tests/SelfTest/UsageTests/Matchers.tests.cpp +++ b/tests/SelfTest/UsageTests/Matchers.tests.cpp @@ -5,7 +5,7 @@ #include <catch2/catch_test_macros.hpp> #include <catch2/matchers/catch_matchers_exception.hpp> -#include <catch2/matchers/catch_matchers_floating.hpp> +#include <catch2/matchers/catch_matchers_floating_point.hpp> #include <catch2/matchers/catch_matchers_predicate.hpp> #include <catch2/matchers/catch_matchers_string.hpp> #include <catch2/matchers/catch_matchers_vector.hpp> diff --git a/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp b/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp index d958ac86..505057d3 100644 --- a/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp +++ b/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp @@ -4,7 +4,7 @@ #include <catch2/catch_test_macros.hpp> #include <catch2/matchers/catch_matchers_container_properties.hpp> #include <catch2/matchers/catch_matchers_contains.hpp> -#include <catch2/matchers/catch_matchers_floating.hpp> +#include <catch2/matchers/catch_matchers_floating_point.hpp> #include <array> #include <cmath> |