diff --git a/README.md b/README.md index a57c21fe..d9a588a4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![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) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index eebb3791..ad9322ef 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -37,7 +37,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 5, 5, "", 0 ); + Version libraryVersion( 1, 5, 6, "", 0 ); } 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& 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& 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 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 ); }