Changed initialization order to avoid some warnings when compiling with g++.

This commit is contained in:
Michael Mortensen 2010-12-28 15:17:27 +01:00
parent 1b96cec8f2
commit 4aa36f6071
3 changed files with 12 additions and 12 deletions

View File

@ -40,20 +40,20 @@ namespace Catch
public: public:
ResultInfo() ResultInfo()
: m_result( ResultWas::Unknown ), : m_line( 0 ),
m_result( ResultWas::Unknown ),
m_isNot( false ), m_isNot( false ),
m_line( 0 ),
m_expressionIncomplete( false ) m_expressionIncomplete( false )
{} {}
ResultInfo( const std::string& expr, ResultWas::OfType result, bool isNot, const std::string& filename, std::size_t line, const std::string& macroName ) ResultInfo( const std::string& expr, ResultWas::OfType result, bool isNot, const std::string& filename, std::size_t line, const std::string& macroName )
: m_expr( expr ), : m_macroName( macroName ),
m_filename( filename ),
m_line( line ),
m_expr( expr ),
m_op( m_expr[0] == '!' ? "!" : "" ),
m_result( result ), m_result( result ),
m_isNot( isNot ), m_isNot( isNot ),
m_op( m_expr[0] == '!' ? "!" : "" ),
m_filename( filename ),
m_line( line ),
m_macroName( macroName ),
m_expressionIncomplete( false ) m_expressionIncomplete( false )
{ {
} }

View File

@ -74,9 +74,9 @@ namespace Catch
{ {
public: public:
explicit Runner( const RunnerConfig& config ) explicit Runner( const RunnerConfig& config )
: m_successes( 0 ), : m_config( config ),
m_successes( 0 ),
m_failures( 0 ), m_failures( 0 ),
m_config( config ),
m_reporter( m_config.getReporter() ) m_reporter( m_config.getReporter() )
{ {
m_reporter->StartTesting(); m_reporter->StartTesting();
@ -219,4 +219,4 @@ namespace Catch
}; };
} }
#endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED #endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED

View File

@ -43,8 +43,8 @@ namespace Catch
RunnerConfig() RunnerConfig()
: m_listSpec( listNone ), : m_reporter( NULL ),
m_reporter( NULL ), m_listSpec( listNone ),
m_shouldDebugBreak( false ) m_shouldDebugBreak( false )
{} {}