dev build 16

This commit is contained in:
Phil Nash 2015-11-03 17:06:54 +00:00
parent c81778ecd0
commit 9e42153fe5
3 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.2.1-develop.15* *v1.2.1-develop.16*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

View File

@ -37,7 +37,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 2, 1, "develop", 15 ); Version libraryVersion( 1, 2, 1, "develop", 16 );
} }

View File

@ -1,6 +1,6 @@
/* /*
* Catch v1.2.1-develop.15 * Catch v1.2.1-develop.16
* Generated: 2015-11-03 08:00:19.120246 * Generated: 2015-11-03 17:06:36.466681
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -5679,7 +5679,7 @@ namespace Catch {
bool testForMissingAssertions( Counts& assertions ) { bool testForMissingAssertions( Counts& assertions ) {
if( assertions.total() != 0 ) if( assertions.total() != 0 )
return false; return false;
if( m_config->warnAboutMissingAssertions() ) if( !m_config->warnAboutMissingAssertions() )
return false; return false;
if( m_trackerContext.currentTracker().hasChildren() ) if( m_trackerContext.currentTracker().hasChildren() )
return false; return false;
@ -7191,7 +7191,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 2, 1, "develop", 15 ); Version libraryVersion( 1, 2, 1, "develop", 16 );
} }