This commit is contained in:
Phil Nash 2012-11-17 10:49:24 +00:00
parent 75b89a9763
commit 3e2e318eeb
3 changed files with 8 additions and 8 deletions

2
README
View File

@ -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. CATCH is an automated test framework for C, C++ and Objective-C.

View File

@ -13,7 +13,7 @@
namespace Catch { namespace Catch {
// These numbers are maintained by a script // 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 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

View File

@ -1,6 +1,6 @@
/* /*
* CATCH v0.9 build 3 (integration branch) * CATCH v0.9 build 4 (integration branch)
* Generated: 2012-11-16 21:01:18.673384 * Generated: 2012-11-17 10:48:52.075284
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -688,9 +688,9 @@ namespace Catch {
return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) ); return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
} }
inline bool shouldContinueOnFailure( int flags ) { return flags & ResultDisposition::ContinueOnFailure; } inline bool shouldContinueOnFailure( int flags ) { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
inline bool shouldNegate( int flags ) { return flags & ResultDisposition::NegateResult; } inline bool shouldNegate( int flags ) { return ( flags & ResultDisposition::NegateResult ) != 0; }
inline bool shouldSuppressFailure( int flags ) { return flags & ResultDisposition::SuppressFail; } inline bool shouldSuppressFailure( int flags ) { return ( flags & ResultDisposition::SuppressFail ) != 0; }
} // end namespace Catch } // end namespace Catch
@ -5375,7 +5375,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // 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 // #included from: ../reporters/catch_reporter_basic.hpp