dev build 2

This commit is contained in:
Phil Nash 2015-11-06 18:06:56 +00:00
parent d10b73f9f1
commit 92356769f1
3 changed files with 8 additions and 7 deletions

View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![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) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

View File

@ -37,7 +37,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 3, 0, "develop", 1 ); Version libraryVersion( 1, 3, 0, "develop", 2 );
} }

View File

@ -1,6 +1,6 @@
/* /*
* Catch v1.3.0-develop.1 * Catch v1.3.0-develop.2
* Generated: 2015-11-05 18:47:08.462966 * Generated: 2015-11-06 18:05:44.676531
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -862,7 +862,8 @@ namespace Matchers {
namespace Generic { namespace Generic {
template<typename ExpressionT> template<typename ExpressionT>
struct Not : public MatcherImpl<Not<ExpressionT>, ExpressionT> { class Not : public MatcherImpl<Not<ExpressionT>, ExpressionT> {
public:
explicit Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {} explicit Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {}
Not( Not const& other ) : m_matcher( other.m_matcher ) {} Not( Not const& other ) : m_matcher( other.m_matcher ) {}
@ -873,7 +874,7 @@ namespace Matchers {
virtual std::string toString() const CATCH_OVERRIDE { virtual std::string toString() const CATCH_OVERRIDE {
return "not " + m_matcher->toString(); return "not " + m_matcher->toString();
} }
private:
Ptr< Matcher<ExpressionT> > m_matcher; Ptr< Matcher<ExpressionT> > m_matcher;
}; };
@ -7238,7 +7239,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 3, 0, "develop", 1 ); Version libraryVersion( 1, 3, 0, "develop", 2 );
} }