diff options
| author | Phil Nash | 2013-11-09 07:47:09 +0000 |
|---|---|---|
| committer | Phil Nash | 2013-11-09 07:47:09 +0000 |
| commit | 5320518dbc3f22909b24f182ce2e463e6fc80abc (patch) | |
| tree | c28058fef830a3e5c865265cd9f8f6f6de13052d | |
| parent | 11ba37713490fe6f2a8ba20b4d467a30d37973f6 (diff) | |
| download | catch3-5320518dbc3f22909b24f182ce2e463e6fc80abc.tar.gz | |
Build 12
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | include/internal/catch_version.hpp | 2 | ||||
| -rw-r--r-- | single_include/catch.hpp | 12 |
3 files changed, 9 insertions, 7 deletions
@@ -1,6 +1,6 @@  -*v1.0 build 11 (master branch)* +*v1.0 build 12 (master branch)* Build status (on Travis CI) [](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 4b021717..68912715 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( 1, 0, 11, "master" ); + Version libraryVersion( 1, 0, 12, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 9aab75a3..dedb9363 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 11 (master branch) - * Generated: 2013-10-23 15:34:32.120349 + * CATCH v1.0 build 12 (master branch) + * Generated: 2013-11-09 07:46:33.549497 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -595,6 +595,7 @@ namespace Catch { #include <sstream> #include <iomanip> #include <limits> +#include <vector> #ifdef __OBJC__ // #included from: catch_objc_arc.hpp @@ -4629,12 +4630,13 @@ namespace Catch { std::cout << nameCol; } if( i < tagsWrapper.size() && !tagsWrapper[i].empty() ) { + size_t padLen( maxNameLen > nameCol.size() ? maxNameLen - nameCol.size() : 0 ); if( i == 0 ) { Colour colourGuard( Colour::SecondaryText ); - std::cout << " " << std::string( maxNameLen - nameCol.size(), '.' ) << " "; + std::cout << " " << std::string( padLen, '.' ) << " "; } else { - std::cout << std::string( maxNameLen - nameCol.size(), ' ' ) << " "; + std::cout << std::string( padLen, ' ' ) << " "; } std::cout << tagsWrapper[i]; } @@ -6371,7 +6373,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 11, "master" ); + Version libraryVersion( 1, 0, 12, "master" ); } // #included from: catch_text.hpp |