Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2015-11-05 18:10:33 +0000
committerPhil Nash2015-11-05 18:10:33 +0000
commitf3e7722cc604793f6d07eee1afa912f3e095a6f7 (patch)
treed1db069d96099938c5a5708fbc0263358d7f1501 /include
parent315c83ad87d3ef8fce2a4bd3e5d77866ba2b7c78 (diff)
downloadcatch3-f3e7722cc604793f6d07eee1afa912f3e095a6f7.tar.gz
Don't introduce Catch::Matchers namespace in macro
- this could be a breaking change - fixed up self-test code to compensate
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_capture.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index 544fc120..22cf6959 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 ); \