diff options
| author | Martin Hořeňovský | 2017-04-28 18:30:04 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2017-04-28 18:30:04 +0200 |
| commit | 5ffc8a84cda91b5da037a923480236450f7f4586 (patch) | |
| tree | 0a143b2863fb7f144547f5d881bb7a71bf265baa /include | |
| parent | 6e0fa4be682ccc142da5ed7ddaadb6e42ea936c5 (diff) | |
| download | catch3-5ffc8a84cda91b5da037a923480236450f7f4586.tar.gz | |
Fix order of arguments in CATCH_FAIL and nonvariadic INTERNAL_CATCH_MSG
Fixes #896
Diffstat (limited to 'include')
| -rw-r--r-- | include/catch.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_capture.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/catch.hpp b/include/catch.hpp index bf0d72d6..f258f8a2 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -136,7 +136,7 @@ LeakDetector leakDetector; #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ ) #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) - #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__ ) + #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS ) #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) #else diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 58993718..928b06c9 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -152,7 +152,7 @@ INTERNAL_CATCH_REACT( __catchResult ) \ } while( Catch::alwaysFalse() ) #else - #define INTERNAL_CATCH_MSG( messageType, resultDisposition, macroName, log ) \ + #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, log ) \ do { \ Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \ __catchResult << log + ::Catch::StreamEndStop(); \ |