3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Build 2

Browse Source
This commit is contained in:
Phil Nash
2013-06-29 12:11:32 +01:00
parent eb81850381
commit cd688300b0
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_list.hpp
View File

@@ -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;

2
include/internal/catch_version.hpp
View File

@@ -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

2
include/internal/clara.h
View File

@@ -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;