Don't introduce Catch::Matchers namespace in macro
- this could be a breaking change - fixed up self-test code to compensate
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index 544fc12..22cf695 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -131,12 +131,12 @@
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg " " #matcher, resultDisposition ); \
try { \
- std::string matcherAsString = ::Catch::Matchers::matcher.toString(); \
+ std::string matcherAsString = (matcher).toString(); \
__catchResult \
.setLhs( Catch::toString( arg ) ) \
.setRhs( matcherAsString == Catch::Detail::unprintableString ? #matcher : matcherAsString ) \
.setOp( "matches" ) \
- .setResultType( ::Catch::Matchers::matcher.match( arg ) ); \
+ .setResultType( (matcher).match( arg ) ); \
__catchResult.captureExpression(); \
} catch( ... ) { \
__catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \
diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp
index 70a6cee..8bd271c 100644
--- a/projects/SelfTest/MiscTests.cpp
+++ b/projects/SelfTest/MiscTests.cpp
@@ -208,6 +208,7 @@
{
return "this string contains 'abc' as a substring";
}
+using namespace Catch::Matchers;
TEST_CASE("String matchers", "[matchers]" )
{
diff --git a/projects/SelfTest/TagAliasTests.cpp b/projects/SelfTest/TagAliasTests.cpp
index b95ad00..002a93c 100644
--- a/projects/SelfTest/TagAliasTests.cpp
+++ b/projects/SelfTest/TagAliasTests.cpp
@@ -11,6 +11,8 @@
TEST_CASE( "Tag alias can be registered against tag patterns", "" ) {
+ using namespace Catch::Matchers;
+
Catch::TagAliasRegistry registry;
registry.add( "[@zzz]", "[one][two]", Catch::SourceLineInfo( "file", 2 ) );
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp
index f8d17fd..bffc7e7 100644
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -44,6 +44,8 @@
TEST_CASE( "Process can be configured on command line", "[config][command-line]" ) {
+ using namespace Catch::Matchers;
+
Catch::ConfigData config;
SECTION( "default - no arguments", "" ) {