catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Use <= operator instead of ->* for decomposer
- Commit
8cc1108f2b8aa215c94f1d6d3b93121d28ffd08a- Author
- Phil Nash ·
- Parents
c51e86819dc9
Changes
include/internal/catch_capture.hpp | 2 +- include/internal/catch_result_builder.h | 8 ++++---- .../XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 58591265..7bfef0e1 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -33,7 +33,7 @@ do { \ Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ try { \ - ( __catchResult->*expr ).endExpression(); \ + ( __catchResult <= expr ).endExpression(); \ } \ catch( ... ) { \ __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \ diff --git a/include/internal/catch_result_builder.h b/include/internal/catch_result_builder.h index 3963c26d..b44882bb 100644 --- a/include/internal/catch_result_builder.h +++ b/include/internal/catch_result_builder.h @@ -41,8 +41,8 @@ namespace Catch { ResultDisposition::Flags resultDisposition ); template<typename T> - ExpressionLhs<T const&> operator->* ( T const& operand ); - ExpressionLhs<bool> operator->* ( bool value ); + ExpressionLhs<T const&> operator <= ( T const& operand ); + ExpressionLhs<bool> operator <= ( bool value ); template<typename T> ResultBuilder& operator << ( T const& value ) { @@ -93,11 +93,11 @@ namespace Catch { namespace Catch { template<typename T> - inline ExpressionLhs<T const&> ResultBuilder::operator->* ( T const& operand ) { + inline ExpressionLhs<T const&> ResultBuilder::operator <= ( T const& operand ) { return ExpressionLhs<T const&>( *this, operand ); } - inline ExpressionLhs<bool> ResultBuilder::operator->* ( bool value ) { + inline ExpressionLhs<bool> ResultBuilder::operator <= ( bool value ) { return ExpressionLhs<bool>( *this, value ); } diff --git a/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj index 9afd9bdf..b64ceef1 100644 --- a/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj +++ b/projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj @@ -688,6 +688,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = ( "-Weverything", + "-Wparentheses", "-Wno-disabled-macro-expansion", ); }; @@ -705,6 +706,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; WARNING_CFLAGS = ( "-Weverything", + "-Wparentheses", "-Wno-disabled-macro-expansion", ); };