Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal
diff options
context:
space:
mode:
authorPhil Nash2015-08-24 06:28:25 +0100
committerPhil Nash2015-08-24 06:28:25 +0100
commitd234ed1a67a41e2d14ddb1fbe839a4e5ab466311 (patch)
treeb2d4ef27f22e462b9ea4a36c04db804f473537a9 /include/internal
parent7fd7c5b8c87097d2bc6c3f09f7c5fd5daa04dbfc (diff)
downloadcatch3-d234ed1a67a41e2d14ddb1fbe839a4e5ab466311.tar.gz
dev build 13
Diffstat (limited to 'include/internal')
-rw-r--r--include/internal/catch_matchers.hpp7
-rw-r--r--include/internal/catch_version.hpp2
2 files changed, 3 insertions, 6 deletions
diff --git a/include/internal/catch_matchers.hpp b/include/internal/catch_matchers.hpp
index a2adf61f..8b0783cc 100644
--- a/include/internal/catch_matchers.hpp
+++ b/include/internal/catch_matchers.hpp
@@ -33,13 +33,11 @@ namespace Matchers {
namespace Generic {
template<typename ExpressionT>
- struct Not : public MatcherImpl<Not<ExpressionT>, ExpressionT>
- {
+ struct Not : public MatcherImpl<Not<ExpressionT>, ExpressionT> {
Not( Matcher<ExpressionT> const& matcher ) : m_matcher(matcher.clone()) {}
Not( Not const& other ) : m_matcher( other.m_matcher ) {}
- virtual bool match( ExpressionT const& expr ) const CATCH_OVERRIDE
- {
+ virtual bool match( ExpressionT const& expr ) const CATCH_OVERRIDE {
return !m_matcher->match( expr );
}
@@ -117,7 +115,6 @@ namespace Matchers {
private:
std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
};
-
}
namespace StdString {
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index d11a6d95..d292644c 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -37,7 +37,7 @@ namespace Catch {
return os;
}
- Version libraryVersion( 1, 2, 1, "develop", 12 );
+ Version libraryVersion( 1, 2, 1, "develop", 13 );
}