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

Qualified Catch::toSting

Browse Source
This commit is contained in:
Phil Nash 2011-04-20 22:33:23 +01:00
parent 5d7b054f14
commit 77d72fb852
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/catch_capture.hpp
View File

@ -127,7 +127,7 @@ inline std::string toString
const char* const value const char* const value
) )
{ {
return value ? toString( std::string( value ) ) : std::string( "{null string}" ); return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -136,7 +136,7 @@ inline std::string toString
char* const value char* const value
) )
{ {
return toString( static_cast<const char* const>( value ) ); return Catch::toString( static_cast<const char* const>( value ) );
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -218,7 +218,7 @@ inline std::string toString
T* p T* p
) )
{ {
return toString( static_cast<void*>( p ) ); return Catch::toString( static_cast<void*>( p ) );
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -228,7 +228,7 @@ inline std::string toString
const T* p const T* p
) )
{ {
return toString( static_cast<void*>( const_cast<T*>( p ) ) ); return Catch::toString( static_cast<void*>( const_cast<T*>( p ) ) );
} }
struct TestFailureException struct TestFailureException
@ -312,7 +312,7 @@ private:
bool result bool result
) )
{ {
m_lhs = toString( result ); m_lhs = Catch::toString( result );
m_op = m_isNot ? "!" : ""; m_op = m_isNot ? "!" : "";
setResultType( result ? ResultWas::Ok : ResultWas::ExpressionFailed ); setResultType( result ? ResultWas::Ok : ResultWas::ExpressionFailed );
return *this; return *this;
@ -327,8 +327,8 @@ private:
) )
{ {
setResultType( Internal::compare<Op>( lhs, rhs ) ? ResultWas::Ok : ResultWas::ExpressionFailed ); setResultType( Internal::compare<Op>( lhs, rhs ) ? ResultWas::Ok : ResultWas::ExpressionFailed );
m_lhs = toString( lhs ); m_lhs = Catch::toString( lhs );
m_rhs = toString( rhs ); m_rhs = Catch::toString( rhs );
m_op = Internal::OperatorTraits<Op>::getName(); m_op = Internal::OperatorTraits<Op>::getName();
return *this; return *this;
} }