diff options
| author | Phil Nash | 2016-10-26 12:08:26 +0100 |
|---|---|---|
| committer | Phil Nash | 2016-10-26 12:08:26 +0100 |
| commit | e27c4ee04282f60aefcc9b1062a74f92cf6c1a2b (patch) | |
| tree | 72e343f241c36dd592b5cc78dc58fbe1029418c6 /single_include/catch.hpp | |
| parent | 072114293be4f1b87f8160a631488a64971331d7 (diff) | |
| download | catch3-1.5.8.tar.gz | |
Build 1.5.8v1.5.8
Diffstat (limited to 'single_include/catch.hpp')
| -rw-r--r-- | single_include/catch.hpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/single_include/catch.hpp b/single_include/catch.hpp index a11ecce3..2e6fe8d3 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.5.7 - * Generated: 2016-09-27 10:45:46.824849 + * Catch v1.5.8 + * Generated: 2016-10-26 12:07:30.938259 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6461,7 +6461,7 @@ namespace Catch { namespace Catch { struct RandomNumberGenerator { - typedef int result_type; + typedef std::ptrdiff_t result_type; result_type operator()( result_type n ) const { return std::rand() % n; } @@ -7578,7 +7578,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 5, 7, "", 0 ); + Version libraryVersion( 1, 5, 8, "", 0 ); } @@ -7809,8 +7809,11 @@ namespace Catch { bool contains( std::string const& s, std::string const& infix ) { return s.find( infix ) != std::string::npos; } + char toLowerCh(char c) { + return static_cast<char>( ::tolower( c ) ); + } void toLowerInPlace( std::string& s ) { - std::transform( s.begin(), s.end(), s.begin(), ::tolower ); + std::transform( s.begin(), s.end(), s.begin(), toLowerCh ); } std::string toLower( std::string const& s ) { std::string lc = s; @@ -9258,7 +9261,7 @@ namespace Catch { .writeText( assertionResult.getMessage() ); break; case ResultWas::FatalErrorCondition: - m_xml.scopedElement( "Fatal Error Condition" ) + m_xml.scopedElement( "FatalErrorCondition" ) .writeAttribute( "filename", assertionResult.getSourceInfo().file ) .writeAttribute( "line", assertionResult.getSourceInfo().line ) .writeText( assertionResult.getMessage() ); |