added code to unwrap expression

This commit is contained in:
Ribulous Barnulous
2014-10-13 19:22:42 -04:00
parent 452bf7a4a3
commit cce7bddbf3
3 changed files with 42 additions and 24 deletions

View File

@@ -28,12 +28,21 @@
resultBuilder.react();
///////////////////////////////////////////////////////////////////////////////
#ifdef CATCH_CONFIG_VARIADIC_MACROS
#define INTERNAL_CATCH_EVALUATE_EXPRESSION(...) \
( __catchResult->* __VA_ARGS__ ).endExpression();
#else
#define INTERNAL_CATCH_EVALUATE_EXPRESSION(expr) \
( __catchResult->* expr ).endExpression();
#endif
///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_TEST( expr, resultDisposition, macroName ) \
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
try { \
( __catchResult->*expr ).endExpression(); \
INTERNAL_CATCH_EVALUATE_EXPRESSION expr \
} \
catch( ... ) { \
__catchResult.useActiveException( Catch::ResultDisposition::Normal ); \