diff options
| author | Phil Nash | 2016-06-09 19:21:09 +0100 |
|---|---|---|
| committer | Phil Nash | 2016-06-09 19:21:09 +0100 |
| commit | 35f510545d55a831372d3113747bf1314ff4f2ef (patch) | |
| tree | fa07bff79fca0ff220bf21edc999b529a2c9fc96 /single_include/catch.hpp | |
| parent | 742457cbcf4756271eb12c86140100e64e35dac6 (diff) | |
| download | catch3-1.5.6.tar.gz | |
v1.5.6v1.5.6
Diffstat (limited to 'single_include/catch.hpp')
| -rw-r--r-- | single_include/catch.hpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 79570fb4..879fc5b1 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.5.5 - * Generated: 2016-06-09 08:17:50.409622 + * Catch v1.5.6 + * Generated: 2016-06-09 19:20:41.460328 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * 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 ) { - if( std::string( ":=\0", 5 ).find( c ) == std::string::npos ) + if( std::string( ":=\0", 3 ).find( c ) == std::string::npos ) return mode; std::string optName = arg.substr( from, i-from ); @@ -4199,7 +4199,7 @@ namespace Clara { return None; } 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; std::string data = arg.substr( from, i-from ); @@ -6465,10 +6465,11 @@ namespace Catch { #endif template<typename V> static void shuffle( V& vector ) { + RandomNumberGenerator rng; #ifdef CATCH_CPP14_OR_GREATER - std::shuffle( vector.begin(), vector.end(), RandomNumberGenerator() ); + std::shuffle( vector.begin(), vector.end(), rng ); #else - std::random_shuffle( vector.begin(), vector.end(), RandomNumberGenerator() ); + std::random_shuffle( vector.begin(), vector.end(), rng ); #endif } }; @@ -7570,7 +7571,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 5, 5, "", 0 ); + Version libraryVersion( 1, 5, 6, "", 0 ); } |