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

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhil Nash2015-12-09 18:11:48 +0000
committerPhil Nash2015-12-09 18:11:48 +0000
commit981347b6e432007882fd59f9a498c363a3b39ec0 (patch)
treea614b577fb108ee6a03e89f8d24da72babc3b4b6
parent9e341231ba123c76040ca3d6cf874ae225e027d5 (diff)
downloadcatch3-1.3.1.tar.gz
patch build to include last two fixesv1.3.1
-rw-r--r--README.md2
-rw-r--r--include/internal/catch_test_case_registry_impl.hpp2
-rw-r--r--include/internal/catch_version.hpp2
-rw-r--r--single_include/catch.hpp13
4 files changed, 11 insertions, 8 deletions
diff --git a/README.md b/README.md
index d7669177..c15d0937 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png)
-*v1.3.0*
+*v1.3.1*
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_test_case_registry_impl.hpp b/include/internal/catch_test_case_registry_impl.hpp
index b48e79a8..a2b041a3 100644
--- a/include/internal/catch_test_case_registry_impl.hpp
+++ b/include/internal/catch_test_case_registry_impl.hpp
@@ -89,7 +89,7 @@ namespace Catch {
public:
TestRegistry()
: m_currentSortOrder( RunTests::InDeclarationOrder ),
- m_unnamedCount( 0 )
+ m_unnamedCount( 0 )
{}
virtual ~TestRegistry();
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index 6194242f..2d44d399 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, "", 0 );
+ Version libraryVersion( 1, 3, 1, "", 0 );
}
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 1d0d8085..e2774f0b 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
/*
- * Catch v1.3.0
- * Generated: 2015-12-04 10:18:17.055188
+ * Catch v1.3.1
+ * Generated: 2015-12-09 18:10:29.846134
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -6248,7 +6248,10 @@ namespace Catch {
class TestRegistry : public ITestCaseRegistry {
public:
- TestRegistry() : m_unnamedCount( 0 ) {}
+ TestRegistry()
+ : m_currentSortOrder( RunTests::InDeclarationOrder ),
+ m_unnamedCount( 0 )
+ {}
virtual ~TestRegistry();
virtual void registerTest( TestCase const& testCase ) {
@@ -7267,7 +7270,7 @@ namespace Catch {
return os;
}
- Version libraryVersion( 1, 3, 0, "", 0 );
+ Version libraryVersion( 1, 3, 1, "", 0 );
}
@@ -10020,7 +10023,7 @@ namespace Catch {
#ifndef __OBJC__
// Standard C/C++ main entry point
-int main (int argc, char * const argv[]) {
+int main (int argc, char * argv[]) {
return Catch::Session().run( argc, argv );
}