3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Regenerated single include

This commit is contained in:
Phil Nash 2012-05-11 19:06:43 +01:00
parent 8d69208a58
commit 6217966743
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
single_include/catch.hpp
View File

@ -73,9 +73,9 @@ namespace Catch
struct SourceLineInfo struct SourceLineInfo
{ {
SourceLineInfo() : line( 0 ){} SourceLineInfo() : line( 0 ){}
SourceLineInfo( const std::string& file, std::size_t line ) SourceLineInfo( const std::string& _file, std::size_t _line )
: file( file ), : file( _file ),
line( line ) line( _line )
{} {}
SourceLineInfo( const SourceLineInfo& other ) SourceLineInfo( const SourceLineInfo& other )
: file( other.file ), : file( other.file ),
@ -577,7 +577,7 @@ inline std::string toString( unsigned long value ) {
} }
inline std::string toString( unsigned int value ) { inline std::string toString( unsigned int value ) {
return toString( (unsigned long)value ); return toString( static_cast<unsigned long>( value ) );
} }
inline std::string toString( const double value ) { inline std::string toString( const double value ) {
@ -2798,6 +2798,7 @@ return @ desc; \
#include <vector> #include <vector>
#include <set> #include <set>
#include <sstream> #include <sstream>
#include <iostream>
namespace Catch namespace Catch
{ {
@ -4856,12 +4857,12 @@ namespace Catch
m_config.stream() << resultInfo.getExpression(); m_config.stream() << resultInfo.getExpression();
if( resultInfo.ok() ) if( resultInfo.ok() )
{ {
TextColour colour( TextColour::Success ); TextColour successColour( TextColour::Success );
m_config.stream() << " succeeded"; m_config.stream() << " succeeded";
} }
else else
{ {
TextColour colour( TextColour::Error ); TextColour errorColour( TextColour::Error );
m_config.stream() << " failed"; m_config.stream() << " failed";
} }
} }