Merge pull request #345 from Poldraunic/catch2-3.7.1-compatibility

Catch2 3.7.1 compatibility
eranpeer · Oct 6, 2024 · 82d53c6 · 82d53c6
2 parents 4aa3086 + 0189fa3
commit 82d53c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/config/catch/CatchFakeit.hpp b/config/catch/CatchFakeit.hpp
@@ -49,18 +49,18 @@ namespace fakeit {
             INTERNAL_CATCH_TRY { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
                 CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-                catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
+                catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage)); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
             } INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
-                INTERNAL_CATCH_REACT(catchAssertionHandler) \
+                catchAssertionHandler.complete(); \
             }
 #else
             INTERNAL_CATCH_TRY { \
                 CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-                catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
+                catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage)); \
                 CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
             } INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
-                INTERNAL_CATCH_REACT(catchAssertionHandler) \
+                catchAssertionHandler.complete(); \
             }
 #endif
         }

diff --git a/single_header/catch/fakeit.hpp b/single_header/catch/fakeit.hpp
@@ -1207,18 +1207,18 @@ namespace fakeit {
             INTERNAL_CATCH_TRY { \
                 CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
                 CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-                catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
+                catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage); \
                 CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
             } INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
-                INTERNAL_CATCH_REACT(catchAssertionHandler) \
+                catchAssertionHandler.complete(); \
             }
 #else
             INTERNAL_CATCH_TRY { \
                 CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-                catchAssertionHandler.handleMessage(resultWas, fomattedMessage); \
+                catchAssertionHandler.handleMessage(resultWas, std::move(fomattedMessage)); \
                 CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
             } INTERNAL_CATCH_CATCH(catchAssertionHandler) { \
-                INTERNAL_CATCH_REACT(catchAssertionHandler) \
+                catchAssertionHandler.complete(); \
             }
 #endif
         }