From 7da777a4b716f267cb20faf5d117b1322a814519 Mon Sep 17 00:00:00 2001 From: segalaj Date: Mon, 14 Sep 2015 14:28:34 +0200 Subject: [PATCH 1/2] Fix parentheses warning on expression evaluation when using ccache --- include/internal/catch_capture.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 7bfef0e1..a8db94be 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 ); \ From 15317632f3caf59a3ba3da2ec3dc3ee189bbbc9a Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Sat, 26 Sep 2015 18:06:53 -0700 Subject: [PATCH 2/2] Revert "Fix parentheses warning on expression evaluation when using ccache" This reverts commit 7da777a4b716f267cb20faf5d117b1322a814519. --- include/internal/catch_capture.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index a8db94be..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 ); \