Merge remote branch 'socketpuppet/master'

catch_reporter_basic.hpp

@@ -142,6 +142,8 @@ namespace Catch
                 case ResultWas::ExplicitFailure:
                     m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'";
                     break;
+                default:
+                    break;
             }
             
             if( resultInfo.hasExpression() )
@@ -170,4 +172,4 @@ namespace Catch
     
 } // end namespace Catch
     
-#endif // TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED

catch_reporter_junit.hpp

@@ -101,8 +101,13 @@ namespace Catch
             m_currentStats = &m_testSuiteStats;
         }
         
-        virtual void StartSection( const std::string& sectionName, const std::string description ){(sectionName,description);}
+        virtual void StartSection( const std::string& sectionName, const std::string description )
-        virtual void EndSection( const std::string& sectionName, std::size_t succeeded, std::size_t failed ){(sectionName, succeeded, failed);}
+        {
+        }
+
+        virtual void EndSection( const std::string& sectionName, std::size_t succeeded, std::size_t failed )
+        {
+        }
         
         ///////////////////////////////////////////////////////////////////////////
         virtual void StartTestCase( const Catch::TestCaseInfo& testInfo )
@@ -252,4 +257,4 @@ namespace Catch
     
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED

catch_reporter_xml.hpp

@@ -130,6 +130,8 @@ namespace Catch
                         .writeText( resultInfo.getMessage() );
                     m_currentTestSuccess = false;
                     break;
+                default:
+                    break;
             }            
             if( resultInfo.hasExpression() )
                 m_xml.endElement();
@@ -150,4 +152,4 @@ namespace Catch
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED

internal/catch_commandline.hpp

@@ -157,6 +157,8 @@ namespace Catch
                         return setErrorMode( m_command + " does not accept arguments" );
                     m_config.setShouldDebugBreak( true );
                     break;
+            default:
+                break;
             }
             m_args.clear();
             m_mode = mode;
@@ -180,4 +182,4 @@ namespace Catch
     
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED

internal/catch_resultinfo.hpp

@@ -40,20 +40,20 @@ namespace Catch
     public:
         
         ResultInfo()
-        :   m_result( ResultWas::Unknown ),
+        :   m_line( 0 ),
+            m_result( ResultWas::Unknown ),
             m_isNot( false ),
-            m_line( 0 ),
             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 )
-        :   m_expr( expr ),
+        :   m_macroName( macroName ),
+            m_filename( filename ),
+            m_line( line ),
+            m_expr( expr ),
+            m_op( m_expr[0] == '!' ? "!" : "" ),
             m_result( result ),
             m_isNot( isNot ),
-            m_op( m_expr[0] == '!' ? "!" : "" ),
-            m_filename( filename ),
-            m_line( line ), 
-            m_macroName( macroName ),
             m_expressionIncomplete( false )
         {
         }

internal/catch_runner_impl.hpp

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

internal/catch_runnerconfig.hpp

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