dev build 2

- it was forward declared as a class, which caused warnings on some compilers. It should really have been a class anyway.
- this addresses the same issue as PR #534, albeit from the other angle.

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)
 

include/internal/catch_matchers.hpp

@@ -43,7 +43,8 @@ namespace Matchers {
 
     namespace Generic {
         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()) {}
             Not( Not const& other ) : m_matcher( other.m_matcher ) {}
 
@@ -54,7 +55,7 @@ namespace Matchers {
             virtual std::string toString() const CATCH_OVERRIDE {
                 return "not " + m_matcher->toString();
             }
-
+        private:
             Ptr< Matcher<ExpressionT> > m_matcher;
         };
 

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 );
 
 }
 

projects/SelfTest/Baselines/console.std.approved.txt

@@ -708,7 +708,7 @@ with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
 
 -------------------------------------------------------------------------------
-Matchers can be composed with both + and | - failing
+Matchers can be composed with both && and || - failing
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................

projects/SelfTest/Baselines/console.sw.approved.txt

@@ -3419,7 +3419,7 @@ with expansion:
   'abc' as a substring"
 
 -------------------------------------------------------------------------------
-Matchers can be (AllOf) composed with the + operator
+Matchers can be (AllOf) composed with the && operator
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
@@ -3432,7 +3432,7 @@ with expansion:
   contains: "abc" and contains: "substring" and contains: "contains" )
 
 -------------------------------------------------------------------------------
-Matchers can be (AnyOf) composed with the | operator
+Matchers can be (AnyOf) composed with the || operator
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
@@ -3452,7 +3452,7 @@ with expansion:
   "string" or contains: "different" or contains: "random" )
 
 -------------------------------------------------------------------------------
-Matchers can be composed with both + and |
+Matchers can be composed with both && and ||
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................
@@ -3465,7 +3465,7 @@ with expansion:
   contains: "different" ) and contains: "substring" )
 
 -------------------------------------------------------------------------------
-Matchers can be composed with both + and | - failing
+Matchers can be composed with both && and || - failing
 -------------------------------------------------------------------------------
 MiscTests.cpp:<line number>
 ...............................................................................

projects/SelfTest/Baselines/junit.sw.approved.txt

@@ -438,10 +438,10 @@ MiscTests.cpp:<line number>
     <testcase classname="global" name="AllOf matcher" time="{duration}"/>
     <testcase classname="global" name="AnyOf matcher" time="{duration}"/>
     <testcase classname="global" name="Equals" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be (AllOf) composed with the + operator" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be (AnyOf) composed with the | operator" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be composed with both + and |" time="{duration}"/>
-    <testcase classname="global" name="Matchers can be composed with both + and | - failing" time="{duration}">
+    <testcase classname="global" name="Matchers can be (AllOf) composed with the &amp;&amp; operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be (AnyOf) composed with the || operator" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and ||" time="{duration}"/>
+    <testcase classname="global" name="Matchers can be composed with both &amp;&amp; and || - failing" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; ( ( contains: &quot;string&quot; or contains: &quot;different&quot; ) and contains: &quot;random&quot; )" type="CHECK_THAT">
 MiscTests.cpp:<line number>
       </failure>

projects/SelfTest/Baselines/xml.sw.approved.txt

@@ -3590,7 +3590,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be (AllOf) composed with the + operator">
+    <TestCase name="Matchers can be (AllOf) composed with the &amp;&amp; operator">
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() Contains( "string" ) &amp;&amp; Contains( "abc" ) &amp;&amp; Contains( "substring" ) &amp;&amp; Contains( "contains" )
@@ -3601,7 +3601,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be (AnyOf) composed with the | operator">
+    <TestCase name="Matchers can be (AnyOf) composed with the || operator">
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" )
@@ -3620,7 +3620,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be composed with both + and |">
+    <TestCase name="Matchers can be composed with both &amp;&amp; and ||">
       <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "substring" )
@@ -3631,7 +3631,7 @@
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Matchers can be composed with both + and | - failing">
+    <TestCase name="Matchers can be composed with both &amp;&amp; and || - failing">
       <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" >
         <Original>
           testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) &amp;&amp; Contains( "random" )

projects/SelfTest/MiscTests.cpp

@@ -262,7 +262,7 @@ TEST_CASE("Equals", "[matchers]")
     CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) );
 }
 
-TEST_CASE("Matchers can be (AllOf) composed with the + operator", "[matchers][operators][operator+]")
+TEST_CASE("Matchers can be (AllOf) composed with the && operator", "[matchers][operators][operator&&]")
 {
     CHECK_THAT( testStringForMatching(),
            Contains( "string" ) &&
@@ -271,18 +271,18 @@ TEST_CASE("Matchers can be (AllOf) composed with the + operator", "[matchers][op
            Contains( "contains" ) );
 }
 
-TEST_CASE("Matchers can be (AnyOf) composed with the | operator", "[matchers][operators][operator|]")
+TEST_CASE("Matchers can be (AnyOf) composed with the || operator", "[matchers][operators][operator||]")
 {
     CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) );
     CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) );
 }
 
-TEST_CASE("Matchers can be composed with both + and |", "[matchers][operators][operator|][operator+]")
+TEST_CASE("Matchers can be composed with both && and ||", "[matchers][operators][operator||][operator&&]")
 {
     CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) );
 }
 
-TEST_CASE("Matchers can be composed with both + and | - failing", "[matchers][operators][operator|][operator+][.failing]")
+TEST_CASE("Matchers can be composed with both && and || - failing", "[matchers][operators][operator||][operator&&][.failing]")
 {
     CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) );
 }

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<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()) {}
             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<ExpressionT> > m_matcher;
         };
 
@@ -7238,7 +7239,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 3, 0, "develop", 1 );
+    Version libraryVersion( 1, 3, 0, "develop", 2 );
 
 }