mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-29 16:53:30 +01:00
build 35
This commit is contained in:
parent
1bccc03213
commit
c5406a25bf
@ -1,6 +1,6 @@
|
||||
![catch logo](catch-logo-small.png)
|
||||
|
||||
*v1.0 build 34 (master branch)*
|
||||
*v1.0 build 35 (master branch)*
|
||||
|
||||
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
namespace Catch {
|
||||
|
||||
// These numbers are maintained by a script
|
||||
Version libraryVersion( 1, 0, 34, "master" );
|
||||
Version libraryVersion( 1, 0, 35, "master" );
|
||||
}
|
||||
|
||||
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* CATCH v1.0 build 34 (master branch)
|
||||
* Generated: 2014-04-12 19:07:02.688717
|
||||
* CATCH v1.0 build 35 (master branch)
|
||||
* Generated: 2014-04-12 19:20:39.856403
|
||||
* ----------------------------------------------------------
|
||||
* This file has been merged from multiple headers. Please don't edit it directly
|
||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
@ -1599,7 +1599,7 @@ struct TestFailureException{};
|
||||
throw; \
|
||||
} catch( ... ) { \
|
||||
INTERNAL_CATCH_ACCEPT_EXPR( Catch::ExpressionResultBuilder( Catch::ResultWas::ThrewException ) << Catch::translateActiveException(), \
|
||||
resultDisposition, expr ); \
|
||||
Catch::ResultDisposition::Normal, expr ); \
|
||||
} \
|
||||
} while( Catch::isTrue( false ) )
|
||||
|
||||
@ -6598,7 +6598,7 @@ namespace Catch {
|
||||
namespace Catch {
|
||||
|
||||
// These numbers are maintained by a script
|
||||
Version libraryVersion( 1, 0, 34, "master" );
|
||||
Version libraryVersion( 1, 0, 35, "master" );
|
||||
}
|
||||
|
||||
// #included from: catch_message.hpp
|
||||
|
Loading…
Reference in New Issue
Block a user