diff --git a/README.md b/README.md index 8aa1cf2d..9c3db9d9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.3.0-develop.1* +*v1.3.0-develop.2* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 30540c82..e61dcb17 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -37,7 +37,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 3, 0, "develop", 1 ); + Version libraryVersion( 1, 3, 0, "develop", 2 ); } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index f50973a1..e9ed2436 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.3.0-develop.1 - * Generated: 2015-11-05 18:47:08.462966 + * Catch v1.3.0-develop.2 + * Generated: 2015-11-06 18:05:44.676531 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -862,7 +862,8 @@ namespace Matchers { namespace Generic { template - struct Not : public MatcherImpl, ExpressionT> { + class Not : public MatcherImpl, ExpressionT> { + public: explicit Not( Matcher const& matcher ) : m_matcher(matcher.clone()) {} Not( Not const& other ) : m_matcher( other.m_matcher ) {} @@ -873,7 +874,7 @@ namespace Matchers { virtual std::string toString() const CATCH_OVERRIDE { return "not " + m_matcher->toString(); } - + private: Ptr< Matcher > m_matcher; }; @@ -7238,7 +7239,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 3, 0, "develop", 1 ); + Version libraryVersion( 1, 3, 0, "develop", 2 ); }