mirror of https://github.com/catchorg/Catch2.git
build 8
This commit is contained in:
parent
ff9e51df7f
commit
13f98431ad
|
@ -1,6 +1,6 @@
|
||||||
![catch logo](catch-logo-small.png)
|
![catch logo](catch-logo-small.png)
|
||||||
|
|
||||||
*v1.1 build 7 (develop branch)*
|
*v1.1 build 8 (develop branch)*
|
||||||
|
|
||||||
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)
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
|
|
||||||
// These numbers are maintained by a script
|
// These numbers are maintained by a script
|
||||||
Version libraryVersion( 1, 1, 7, "develop" );
|
Version libraryVersion( 1, 1, 8, "develop" );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* CATCH v1.1 build 7 (develop branch)
|
* CATCH v1.1 build 8 (develop branch)
|
||||||
* Generated: 2014-10-21 07:24:45.439607
|
* Generated: 2014-12-12 08:10:57.025852
|
||||||
* ----------------------------------------------------------
|
* ----------------------------------------------------------
|
||||||
* 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.
|
||||||
|
@ -1246,10 +1246,9 @@ std::string toString( std::nullptr_t );
|
||||||
std::ostringstream oss;
|
std::ostringstream oss;
|
||||||
oss << "{ ";
|
oss << "{ ";
|
||||||
if( first != last ) {
|
if( first != last ) {
|
||||||
oss << toString( *first );
|
oss << Catch::toString( *first );
|
||||||
for( ++first ; first != last ; ++first ) {
|
for( ++first ; first != last ; ++first )
|
||||||
oss << ", " << toString( *first );
|
oss << ", " << Catch::toString( *first );
|
||||||
}
|
|
||||||
}
|
}
|
||||||
oss << " }";
|
oss << " }";
|
||||||
return oss.str();
|
return oss.str();
|
||||||
|
@ -5844,7 +5843,7 @@ namespace Catch {
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
@catch (NSException *exception) {
|
@catch (NSException *exception) {
|
||||||
return toString( [exception description] );
|
return Catch::toString( [exception description] );
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
throw;
|
throw;
|
||||||
|
@ -6669,7 +6668,7 @@ namespace Catch {
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
|
|
||||||
// These numbers are maintained by a script
|
// These numbers are maintained by a script
|
||||||
Version libraryVersion( 1, 1, 7, "develop" );
|
Version libraryVersion( 1, 1, 8, "develop" );
|
||||||
}
|
}
|
||||||
|
|
||||||
// #included from: catch_message.hpp
|
// #included from: catch_message.hpp
|
||||||
|
@ -7146,7 +7145,7 @@ std::string toString( std::wstring const& value ) {
|
||||||
s.reserve( value.size() );
|
s.reserve( value.size() );
|
||||||
for(size_t i = 0; i < value.size(); ++i )
|
for(size_t i = 0; i < value.size(); ++i )
|
||||||
s += value[i] <= 0xff ? static_cast<char>( value[i] ) : '?';
|
s += value[i] <= 0xff ? static_cast<char>( value[i] ) : '?';
|
||||||
return toString( s );
|
return Catch::toString( s );
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string toString( const char* const value ) {
|
std::string toString( const char* const value ) {
|
||||||
|
@ -7169,6 +7168,9 @@ std::string toString( wchar_t* const value )
|
||||||
|
|
||||||
std::string toString( int value ) {
|
std::string toString( int value ) {
|
||||||
std::ostringstream oss;
|
std::ostringstream oss;
|
||||||
|
if( value > 8192 )
|
||||||
|
oss << "0x" << std::hex << value;
|
||||||
|
else
|
||||||
oss << value;
|
oss << value;
|
||||||
return oss.str();
|
return oss.str();
|
||||||
}
|
}
|
||||||
|
@ -7183,7 +7185,7 @@ std::string toString( unsigned long value ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string toString( unsigned int value ) {
|
std::string toString( unsigned int value ) {
|
||||||
return toString( static_cast<unsigned long>( value ) );
|
return Catch::toString( static_cast<unsigned long>( value ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
@ -8197,7 +8199,7 @@ namespace Catch {
|
||||||
xml.writeAttribute( "classname", className );
|
xml.writeAttribute( "classname", className );
|
||||||
xml.writeAttribute( "name", name );
|
xml.writeAttribute( "name", name );
|
||||||
}
|
}
|
||||||
xml.writeAttribute( "time", toString( sectionNode.stats.durationInSeconds ) );
|
xml.writeAttribute( "time", Catch::toString( sectionNode.stats.durationInSeconds ) );
|
||||||
|
|
||||||
writeAssertions( sectionNode );
|
writeAssertions( sectionNode );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue