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

v1.5.6

Browse Source
This commit is contained in:
Phil Nash 2016-06-09 19:21:09 +01:00
parent 742457cbcf
commit 35f510545d
3 changed files with 10 additions and 9 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.5.5* *v1.5.6*
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, 5, 5, "", 0 ); Version libraryVersion( 1, 5, 6, "", 0 );
} }

15
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* Catch v1.5.5 * Catch v1.5.6
* Generated: 2016-06-09 08:17:50.409622 * Generated: 2016-06-09 19:20:41.460328
* ---------------------------------------------------------- * ----------------------------------------------------------
* 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.
@ -4185,7 +4185,7 @@ namespace Clara {
} }
} }
Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) { Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
if( std::string( ":=\0", 5 ).find( c ) == std::string::npos ) if( std::string( ":=\0", 3 ).find( c ) == std::string::npos )
return mode; return mode;
std::string optName = arg.substr( from, i-from ); std::string optName = arg.substr( from, i-from );
@ -4199,7 +4199,7 @@ namespace Clara {
return None; return None;
} }
Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) { Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
if( inQuotes || std::string( "\0", 3 ).find( c ) == std::string::npos ) if( inQuotes || std::string( "\0", 1 ).find( c ) == std::string::npos )
return mode; return mode;
std::string data = arg.substr( from, i-from ); std::string data = arg.substr( from, i-from );
@ -6465,10 +6465,11 @@ namespace Catch {
#endif #endif
template<typename V> template<typename V>
static void shuffle( V& vector ) { static void shuffle( V& vector ) {
RandomNumberGenerator rng;
#ifdef CATCH_CPP14_OR_GREATER #ifdef CATCH_CPP14_OR_GREATER
std::shuffle( vector.begin(), vector.end(), RandomNumberGenerator() ); std::shuffle( vector.begin(), vector.end(), rng );
#else #else
std::random_shuffle( vector.begin(), vector.end(), RandomNumberGenerator() ); std::random_shuffle( vector.begin(), vector.end(), rng );
#endif #endif
} }
}; };
@ -7570,7 +7571,7 @@ namespace Catch {
return os; return os;
} }
Version libraryVersion( 1, 5, 5, "", 0 ); Version libraryVersion( 1, 5, 6, "", 0 );
} }