diff options
| author | Martin Hořeňovský | 2020-04-26 21:33:55 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-04-26 21:33:55 +0200 |
| commit | 8d50f044196c92d0b9cb3dcd9bc32fe96d768b99 (patch) | |
| tree | 9920320adcbbf2eca94b33cec5b849bb4950216c | |
| parent | 804e2df099e59b06a97fcf794e93d89e8fcbaed5 (diff) | |
| download | catch3-8d50f044196c92d0b9cb3dcd9bc32fe96d768b99.tar.gz | |
Move around matcher macro implementation
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/catch2/internal/catch_assertionhandler.cpp | 1 | ||||
| -rw-r--r-- | src/catch2/matchers/catch_matchers.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/matchers/internal/catch_matchers_impl.cpp (renamed from src/catch2/internal/catch_capture_matchers.cpp) | 2 | ||||
| -rw-r--r-- | src/catch2/matchers/internal/catch_matchers_impl.hpp (renamed from src/catch2/internal/catch_capture_matchers.hpp) | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 685e77d8..0a4a21f7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,7 +33,7 @@ set(BENCHMARK_SOURCES SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES}) set(INTERNAL_HEADERS - ${SOURCES_DIR}/internal/catch_capture_matchers.hpp + ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp ${SOURCES_DIR}/catch_approx.hpp ${SOURCES_DIR}/internal/catch_assertionhandler.hpp @@ -130,7 +130,7 @@ set(IMPL_SOURCES ${SOURCES_DIR}/catch_approx.cpp ${SOURCES_DIR}/internal/catch_assertionhandler.cpp ${SOURCES_DIR}/catch_assertion_result.cpp - ${SOURCES_DIR}/internal/catch_capture_matchers.cpp + ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.cpp ${SOURCES_DIR}/internal/catch_commandline.cpp ${SOURCES_DIR}/internal/catch_common.cpp ${SOURCES_DIR}/catch_config.cpp diff --git a/src/catch2/internal/catch_assertionhandler.cpp b/src/catch2/internal/catch_assertionhandler.cpp index 0fe95f50..b16d356d 100644 --- a/src/catch2/internal/catch_assertionhandler.cpp +++ b/src/catch2/internal/catch_assertionhandler.cpp @@ -14,7 +14,6 @@ #include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_debugger.hpp> #include <catch2/interfaces/catch_interfaces_registry_hub.hpp> -#include <catch2/internal/catch_capture_matchers.hpp> #include <catch2/internal/catch_run_context.hpp> #include <catch2/matchers/catch_matchers_string.hpp> diff --git a/src/catch2/matchers/catch_matchers.hpp b/src/catch2/matchers/catch_matchers.hpp index 6ff74dba..3d16bc56 100644 --- a/src/catch2/matchers/catch_matchers.hpp +++ b/src/catch2/matchers/catch_matchers.hpp @@ -6,7 +6,7 @@ #define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED #include <catch2/internal/catch_common.hpp> -#include <catch2/internal/catch_capture_matchers.hpp> +#include <catch2/matchers/internal/catch_matchers_impl.hpp> #include <string> #include <vector> diff --git a/src/catch2/internal/catch_capture_matchers.cpp b/src/catch2/matchers/internal/catch_matchers_impl.cpp index 90f0c084..6ebab591 100644 --- a/src/catch2/internal/catch_capture_matchers.cpp +++ b/src/catch2/matchers/internal/catch_matchers_impl.cpp @@ -2,7 +2,7 @@ * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include <catch2/internal/catch_capture_matchers.hpp> +#include <catch2/matchers/internal/catch_matchers_impl.hpp> #include <catch2/matchers/catch_matchers.hpp> #include <catch2/interfaces/catch_interfaces_registry_hub.hpp> diff --git a/src/catch2/internal/catch_capture_matchers.hpp b/src/catch2/matchers/internal/catch_matchers_impl.hpp index 0ec60bc2..9f706201 100644 --- a/src/catch2/internal/catch_capture_matchers.hpp +++ b/src/catch2/matchers/internal/catch_matchers_impl.hpp @@ -34,8 +34,8 @@ namespace Catch { }; namespace Matchers { - template <typename ArgT> - struct MatcherBase; + template <typename ArgT> + struct MatcherBase; } using StringMatcher = Matchers::MatcherBase<std::string>; |