3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 07:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

patch build to include last two fixes

Browse Source
This commit is contained in:
Phil Nash 2015-12-09 18:11:48 +00:00
parent 9e341231ba
commit 981347b6e4
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

2
include/internal/catch_version.hpp
View File

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

13
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* Catch v1.3.0 * Catch v1.3.1
* Generated: 2015-12-04 10:18:17.055188 * Generated: 2015-12-09 18:10:29.846134
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -6248,7 +6248,10 @@ namespace Catch {
class TestRegistry : public ITestCaseRegistry { class TestRegistry : public ITestCaseRegistry {
public: public:
TestRegistry() : m_unnamedCount( 0 ) {} TestRegistry()
: m_currentSortOrder( RunTests::InDeclarationOrder ),
m_unnamedCount( 0 )
{}
virtual ~TestRegistry(); virtual ~TestRegistry();
virtual void registerTest( TestCase const& testCase ) { virtual void registerTest( TestCase const& testCase ) {
@ -7267,7 +7270,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 3, 0, "", 0 ); Version libraryVersion( 1, 3, 1, "", 0 );
} }
@ -10020,7 +10023,7 @@ namespace Catch {
#ifndef __OBJC__ #ifndef __OBJC__
// Standard C/C++ main entry point // 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 ); return Catch::Session().run( argc, argv );
} }