|
38 | 38 |
|
39 | 39 | #endif
|
40 | 40 |
|
41 |
| -#define INTERNAL_CATCH_REACT( handler ) handler.complete(); |
42 |
| - |
43 | 41 | ///////////////////////////////////////////////////////////////////////////////
|
44 | 42 | #define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
|
45 | 43 | do { /* NOLINT(bugprone-infinite-loop) */ \
|
|
52 | 50 | catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); /* NOLINT(bugprone-chained-comparison) */ \
|
53 | 51 | CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
|
54 | 52 | } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
|
55 |
| - INTERNAL_CATCH_REACT( catchAssertionHandler ) \ |
| 53 | + catchAssertionHandler.complete(); \ |
56 | 54 | } while( (void)0, (false) && static_cast<const bool&>( !!(__VA_ARGS__) ) ) // the expression here is never evaluated at runtime but it forces the compiler to give it a look
|
57 | 55 | // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
|
58 | 56 |
|
|
80 | 78 | catch( ... ) { \
|
81 | 79 | catchAssertionHandler.handleUnexpectedInflightException(); \
|
82 | 80 | } \
|
83 |
| - INTERNAL_CATCH_REACT( catchAssertionHandler ) \ |
| 81 | + catchAssertionHandler.complete(); \ |
84 | 82 | } while( false )
|
85 | 83 |
|
86 | 84 | ///////////////////////////////////////////////////////////////////////////////
|
|
101 | 99 | } \
|
102 | 100 | else \
|
103 | 101 | catchAssertionHandler.handleThrowingCallSkipped(); \
|
104 |
| - INTERNAL_CATCH_REACT( catchAssertionHandler ) \ |
| 102 | + catchAssertionHandler.complete(); \ |
105 | 103 | } while( false )
|
106 | 104 |
|
107 | 105 | ///////////////////////////////////////////////////////////////////////////////
|
|
125 | 123 | } \
|
126 | 124 | else \
|
127 | 125 | catchAssertionHandler.handleThrowingCallSkipped(); \
|
128 |
| - INTERNAL_CATCH_REACT( catchAssertionHandler ) \ |
| 126 | + catchAssertionHandler.complete(); \ |
129 | 127 | } while( false )
|
130 | 128 |
|
131 | 129 |
|
|
149 | 147 | } \
|
150 | 148 | else \
|
151 | 149 | catchAssertionHandler.handleThrowingCallSkipped(); \
|
152 |
| - INTERNAL_CATCH_REACT( catchAssertionHandler ) \ |
| 150 | + catchAssertionHandler.complete(); \ |
153 | 151 | } while( false )
|
154 | 152 |
|
155 | 153 | #endif // CATCH_CONFIG_DISABLE
|
|
0 commit comments