diff --git a/README b/README index a3673d18..6eacf7db 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -CATCH v0.9 build 3 (integration branch) +CATCH v0.9 build 4 (integration branch) --------------------------------------------- CATCH is an automated test framework for C, C++ and Objective-C. diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index a8172af4..8e6ee42f 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion = { 0, 9, 3, "integration" }; + Version libraryVersion = { 0, 9, 4, "integration" }; } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 8243c349..355ac1eb 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v0.9 build 3 (integration branch) - * Generated: 2012-11-16 21:01:18.673384 + * CATCH v0.9 build 4 (integration branch) + * Generated: 2012-11-17 10:48:52.075284 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -688,9 +688,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 @@ -5375,7 +5375,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion = { 0, 9, 3, "integration" }; + Version libraryVersion = { 0, 9, 4, "integration" }; } // #included from: ../reporters/catch_reporter_basic.hpp