Skip to content

Commit 82d53c6

Browse files
authored
Merge pull request #345 from Poldraunic/catch2-3.7.1-compatibility
Catch2 3.7.1 compatibility
2 parents 4aa3086 + 0189fa3 commit 82d53c6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

config/catch/CatchFakeit.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ namespace fakeit {
4949
INTERNAL_CATCH_TRY { \
5050
CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
5151
CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
52-
catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
52+
catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage)); \
5353
CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
5454
} INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
55-
INTERNAL_CATCH_REACT(catchAssertionHandler) \
55+
catchAssertionHandler.complete(); \
5656
}
5757
#else
5858
INTERNAL_CATCH_TRY { \
5959
CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
60-
catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
60+
catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage)); \
6161
CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
6262
} INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
63-
INTERNAL_CATCH_REACT(catchAssertionHandler) \
63+
catchAssertionHandler.complete(); \
6464
}
6565
#endif
6666
}

single_header/catch/fakeit.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,18 +1207,18 @@ namespace fakeit {
12071207
INTERNAL_CATCH_TRY { \
12081208
CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
12091209
CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
1210-
catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
1210+
catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage); \
12111211
CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
12121212
} INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
1213-
INTERNAL_CATCH_REACT(catchAssertionHandler) \
1213+
catchAssertionHandler.complete(); \
12141214
}
12151215
#else
12161216
INTERNAL_CATCH_TRY { \
12171217
CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
1218-
catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
1218+
catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage)); \
12191219
CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
12201220
} INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
1221-
INTERNAL_CATCH_REACT(catchAssertionHandler) \
1221+
catchAssertionHandler.complete(); \
12221222
}
12231223
#endif
12241224
}

0 commit comments

Comments
 (0)