3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some toString cleanups

Browse Source
This commit is contained in:
Phil Nash 2014-12-09 18:49:58 +00:00
parent 32186db1b0
commit b0545d1f12
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/catch_approx.hpp
View File

@ -81,8 +81,7 @@ namespace Detail {
}; };
} }
template<> inline std::string toString( Detail::Approx const& value ) {
inline std::string toString<Detail::Approx>( Detail::Approx const& value ) {
return value.toString(); return value.toString();
} }

2
include/internal/catch_exception_translator_registry.hpp
View File

@ -35,7 +35,7 @@ namespace Catch {
throw; throw;
} }
@catch (NSException *exception) { @catch (NSException *exception) {
return toString( [exception description] ); return Catch::toString( [exception description] );
} }
#else #else
throw; throw;

7
include/internal/catch_tostring.h
View File

@ -219,10 +219,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();

4
include/internal/catch_tostring.hpp
View File

@ -75,7 +75,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 ) {
@ -112,7 +112,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>

2
include/reporters/catch_reporter_junit.hpp
View File

@ -135,7 +135,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 );