3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-20 19:45:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-performance'

Browse Source
This commit is contained in:
Martin Hořeňovský
2017-01-25 22:56:36 +01:00
parent b1171bd1f2 99c2ea594c
commit 4ce11d63a6
28 changed files with 400 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/internal/catch_capture.hpp
View File

@@ -132,13 +132,7 @@
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #arg ", " #matcher, resultDisposition ); \
try { \
std::string matcherAsString = (matcher).toString(); \
__catchResult \
.setLhs( Catch::toString( arg ) ) \
.setRhs( matcherAsString == Catch::Detail::unprintableString ? #matcher : matcherAsString ) \
.setOp( "matches" ) \
.setResultType( (matcher).match( arg ) ); \
__catchResult.captureExpression(); \
__catchResult.captureMatch( arg, matcher, #matcher ); \
} catch( ... ) { \
__catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \
} \