Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

build 47

Commit
48fac9cf01fedb074bd349dac922015c35aae82b
Author
Phil Nash ·
Parents
d12c00666a81

Files · Download .tar.gz

Changes

 README.md                          |  2 +-
 include/internal/catch_version.hpp |  2 +-
 single_include/catch.hpp           | 41 +++++++++++++++++++-------------------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index c30bd5e3..d6808241 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.0 build 46 (master branch)*
+*v1.0 build 47 (master branch)*
 
 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 6d9c1db3..ed992349 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, 46, "master" );
+    Version libraryVersion( 1, 0, 47, "master" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index d778a661..a8aec02d 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  CATCH v1.0 build 46 (master branch)
- *  Generated: 2014-05-20 18:49:44.156173
+ *  CATCH v1.0 build 47 (master branch)
+ *  Generated: 2014-05-20 19:02:15.946806
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -4657,6 +4657,24 @@ namespace Catch {
         return matchedTests;
     }
 
+    struct TagInfo {
+        TagInfo() : count ( 0 ) {}
+        void add( std::string const& spelling ) {
+            ++count;
+            spellings.insert( spelling );
+        }
+        std::string all() const {
+            std::string out;
+            for( std::set<std::string>::const_iterator it = spellings.begin(), itEnd = spellings.end();
+                        it != itEnd;
+                        ++it )
+                out += "[" + *it + "]";
+            return out;
+        }
+        std::set<std::string> spellings;
+        std::size_t count;
+    };
+
     inline std::size_t listTags( Config const& config ) {
         TestSpec testSpec = config.testSpec();
         if( config.testSpec().hasFilters() )
@@ -4666,23 +4684,6 @@ namespace Catch {
             testSpec = TestSpecParser().parse( "*" ).testSpec();
         }
 
-        struct TagInfo {
-            TagInfo() : count ( 0 ) {}
-            void add( std::string const& spelling ) {
-                ++count;
-                spellings.insert( spelling );
-            }
-            std::string all() const {
-                std::string out;
-                for( std::set<std::string>::const_iterator it = spellings.begin(), itEnd = spellings.end();
-                            it != itEnd;
-                            ++it )
-                    out += "[" + *it + "]";
-                return out;
-            }
-            std::set<std::string> spellings;
-            std::size_t count;
-        };
         std::map<std::string, TagInfo> tagCounts;
 
         std::vector<TestCase> matchedTestCases;
@@ -6480,7 +6481,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 46, "master" );
+    Version libraryVersion( 1, 0, 47, "master" );
 }
 
 // #included from: catch_message.hpp