From cd688300b0477e249a5a069301be4037e6756bb4 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Sat, 29 Jun 2013 12:11:32 +0100 Subject: [PATCH] Build 2 --- README.md | 2 +- include/internal/catch_list.hpp | 2 +- include/internal/catch_version.hpp | 2 +- include/internal/clara.h | 2 +- .../SelfTest/Baselines/approvedResults.txt | 4 ++-- single_include/catch.hpp | 19 ++++++++++++------- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1835ca8d..d49b6ca5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 1 (master branch)* +*v1.0 build 2 (master branch)* # New release with significant changes 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; diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index e3d0dc64..d7a1c4d9 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -1,6 +1,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -CatchSelfTest is a Catch v1.0 b1 host application. +CatchSelfTest is a Catch v1.0 b2 host application. Run with -? for options ------------------------------------------------------------------------------- @@ -682,7 +682,7 @@ with expansion: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -CatchSelfTest is a Catch v1.0 b1 host application. +CatchSelfTest is a Catch v1.0 b2 host application. Run with -? for options ------------------------------------------------------------------------------- diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 778985cf..84635d16 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 1 (master branch) - * Generated: 2013-06-28 17:08:06.313616 + * CATCH v1.0 build 2 (master branch) + * Generated: 2013-06-29 12:10:25.613092 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -1126,6 +1126,8 @@ namespace Internal { namespace Catch { +struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; + // Wraps the (stringised versions of) the lhs, operator and rhs of an expression - as well as // the result of evaluating it. This is used to build an AssertionResult object class ExpressionResultBuilder { @@ -1153,6 +1155,9 @@ public: AssertionResult buildResult( AssertionInfo const& info ) const; + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& ); + private: AssertionResultData m_data; struct ExprComponents { @@ -1167,8 +1172,6 @@ private: namespace Catch { -struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; - // Wraps the LHS of an expression and captures the operator and RHS (if any) - wrapping them all // in an ExpressionResultBuilder object template @@ -1230,6 +1233,8 @@ public: template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( RhsT const& ); template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( RhsT const& ); template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( RhsT const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( RhsT const& ); + template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( RhsT const& ); private: template @@ -4031,7 +4036,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; @@ -4409,7 +4414,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; @@ -6219,7 +6224,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 1, "master" ); + Version libraryVersion( 1, 0, 2, "master" ); } // #included from: catch_text.hpp