From f825d67d71a042c1de20b0a7fdf130eb71b13e27 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Sat, 17 Nov 2012 10:47:17 +0000 Subject: [PATCH] Tweaked bitfield tests to avoid warnings --- include/internal/catch_result_type.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/internal/catch_result_type.h b/include/internal/catch_result_type.h index 9fd23861..5492531e 100644 --- a/include/internal/catch_result_type.h +++ b/include/internal/catch_result_type.h @@ -54,9 +54,9 @@ namespace Catch { return static_cast( static_cast( lhs ) | static_cast( rhs ) ); } - inline bool shouldContinueOnFailure( int flags ) { return flags & ResultDisposition::ContinueOnFailure; } - inline bool shouldNegate( int flags ) { return flags & ResultDisposition::NegateResult; } - inline bool shouldSuppressFailure( int flags ) { return flags & ResultDisposition::SuppressFail; } + inline bool shouldContinueOnFailure( int flags ) { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; } + inline bool shouldNegate( int flags ) { return ( flags & ResultDisposition::NegateResult ) != 0; } + inline bool shouldSuppressFailure( int flags ) { return ( flags & ResultDisposition::SuppressFail ) != 0; } } // end namespace Catch