3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move around matcher macro implementation

Browse Source
This commit is contained in:
Martin Hořeňovský 2020-04-26 21:33:55 +02:00
parent 804e2df099
commit 8d50f04419
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -33,7 +33,7 @@ set(BENCHMARK_SOURCES
SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES}) SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
set(INTERNAL_HEADERS 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}/internal/catch_container_nonmembers.hpp
${SOURCES_DIR}/catch_approx.hpp ${SOURCES_DIR}/catch_approx.hpp
${SOURCES_DIR}/internal/catch_assertionhandler.hpp ${SOURCES_DIR}/internal/catch_assertionhandler.hpp
@ -130,7 +130,7 @@ set(IMPL_SOURCES
${SOURCES_DIR}/catch_approx.cpp ${SOURCES_DIR}/catch_approx.cpp
${SOURCES_DIR}/internal/catch_assertionhandler.cpp ${SOURCES_DIR}/internal/catch_assertionhandler.cpp
${SOURCES_DIR}/catch_assertion_result.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_commandline.cpp
${SOURCES_DIR}/internal/catch_common.cpp ${SOURCES_DIR}/internal/catch_common.cpp
${SOURCES_DIR}/catch_config.cpp ${SOURCES_DIR}/catch_config.cpp

1
src/catch2/internal/catch_assertionhandler.cpp
View File

@ -14,7 +14,6 @@
#include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_enforce.hpp>
#include <catch2/internal/catch_debugger.hpp> #include <catch2/internal/catch_debugger.hpp>
#include <catch2/interfaces/catch_interfaces_registry_hub.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/internal/catch_run_context.hpp>
#include <catch2/matchers/catch_matchers_string.hpp> #include <catch2/matchers/catch_matchers_string.hpp>

2
src/catch2/matchers/catch_matchers.hpp
View File

@ -6,7 +6,7 @@
#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
#include <catch2/internal/catch_common.hpp> #include <catch2/internal/catch_common.hpp>
#include <catch2/internal/catch_capture_matchers.hpp> #include <catch2/matchers/internal/catch_matchers_impl.hpp>
#include <string> #include <string>
#include <vector> #include <vector>

2
src/catch2/internal/catch_capture_matchers.cpp → src/catch2/matchers/internal/catch_matchers_impl.cpp
View File

@ -2,7 +2,7 @@
* Distributed under the Boost Software License, Version 1.0. (See accompanying * 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) * 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/matchers/catch_matchers.hpp>
#include <catch2/interfaces/catch_interfaces_registry_hub.hpp> #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>

4
src/catch2/internal/catch_capture_matchers.hpp → src/catch2/matchers/internal/catch_matchers_impl.hpp
View File

@ -34,8 +34,8 @@ namespace Catch {
}; };
namespace Matchers { namespace Matchers {
template <typename ArgT> template <typename ArgT>
struct MatcherBase; struct MatcherBase;
} }
using StringMatcher = Matchers::MatcherBase<std::string>; using StringMatcher = Matchers::MatcherBase<std::string>;