diff options
| author | Phil Nash | 2013-06-29 12:11:32 +0100 |
|---|---|---|
| committer | Phil Nash | 2013-06-29 12:11:32 +0100 |
| commit | cd688300b0477e249a5a069301be4037e6756bb4 (patch) | |
| tree | 93a257e00ea9b18c0402711ab1a419f18c958636 /include | |
| parent | eb81850381ffeffd403cfb82844a6905a5c949d3 (diff) | |
| download | catch3-cd688300b0477e249a5a069301be4037e6756bb4.tar.gz | |
Build 2
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_list.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_version.hpp | 2 | ||||
| -rw-r--r-- | include/internal/clara.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/internal/catch_list.hpp b/include/internal/catch_list.hpp index 6108f36d..1abba573 100644 --- a/include/internal/catch_list.hpp +++ b/include/internal/catch_list.hpp @@ -68,7 +68,7 @@ namespace Catch { .setInitialIndent(0) .setIndent( 2 ) ); - for( std::size_t i = 0; i < std::max( nameWrapper.size(), tagsWrapper.size() ); ++i ) { + for( std::size_t i = 0; i < (std::max)( nameWrapper.size(), tagsWrapper.size() ); ++i ) { Colour::Code colour = Colour::None; if( it->getTestCaseInfo().isHidden ) colour = Colour::SecondaryText; diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 1a370573..89a5efe6 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, 1, "master" ); + Version libraryVersion( 1, 0, 2, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/include/internal/clara.h b/include/internal/clara.h index c89c6e51..887de868 100644 --- a/include/internal/clara.h +++ b/include/internal/clara.h @@ -400,7 +400,7 @@ namespace Clara { Catch::Text desc( it->description, Catch::TextAttributes() .setWidth( width - maxWidth -3 ) ); - for( std::size_t i = 0; i < std::max( usage.size(), desc.size() ); ++i ) { + for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) { std::string usageCol = i < usage.size() ? usage[i] : ""; os << usageCol; |