Fix whitespace errors in include/**

Two types of errors:

* Trailing whitespace.
* Empty line at the end of a file.

No functional changes.

include/catch_runner.hpp

@@ -62,7 +62,7 @@ namespace Catch {
             }
             std::vector<TestCase> skippedTestCases;
             getRegistryHub().getTestCaseRegistry().getFilteredTests( testSpec, *m_config, skippedTestCases, true );
-            
+
             for( std::vector<TestCase>::const_iterator it = skippedTestCases.begin(), itEnd = skippedTestCases.end();
                     it != itEnd;
                     ++it )

include/internal/catch_commandline.hpp

@@ -158,7 +158,7 @@ namespace Catch {
             .describe( "list all/matching test cases names only" )
             .bind( &ConfigData::listTestNamesOnly );
 
-        cli["--list-reporters"] 
+        cli["--list-reporters"]
             .describe( "list all reporters" )
             .bind( &ConfigData::listReporters );
 

include/internal/catch_common.h

@@ -128,4 +128,3 @@ namespace Catch {
 #define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO );
 
 #endif // TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
-

include/internal/catch_common.hpp

@@ -36,7 +36,7 @@ namespace Catch {
 
         return start != std::string::npos ? str.substr( start, 1+end-start ) : "";
     }
-    
+
     bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
         bool replaced = false;
         std::size_t i = str.find( replaceThis );
@@ -50,7 +50,7 @@ namespace Catch {
         }
         return replaced;
     }
-    
+
     pluralise::pluralise( std::size_t count, std::string const& label )
     :   m_count( count ),
         m_label( label )
@@ -100,4 +100,3 @@ namespace Catch {
 }
 
 #endif // TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED
-

include/internal/catch_compiler_capabilities.h

@@ -164,4 +164,3 @@
 
 
 #endif // TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
-

include/internal/catch_interfaces_reporter.h

@@ -244,7 +244,7 @@ namespace Catch
         virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
         virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
         virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-        
+
         virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
     };
 

include/internal/catch_result_builder.h

@@ -80,7 +80,7 @@ namespace Catch {
             std::string lhs, rhs, op;
         } m_exprComponents;
         CopyableStream m_stream;
-        
+
         bool m_shouldDebugBreak;
         bool m_shouldThrow;
     };

include/internal/catch_result_type.h

@@ -55,7 +55,7 @@ namespace Catch {
     inline bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
     inline bool isFalseTest( int flags )                { return ( flags & ResultDisposition::FalseTest ) != 0; }
     inline bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-    
+
 } // end namespace Catch
 
 #endif // TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED

include/internal/catch_test_case_info.h

@@ -31,7 +31,7 @@ namespace Catch {
             MayFail = 1 << 3,
             Throws = 1 << 4
         };
-        
+
         TestCaseInfo(   std::string const& _name,
                         std::string const& _className,
                         std::string const& _description,

include/internal/catch_test_case_registry_impl.hpp

@@ -83,7 +83,7 @@ namespace Catch {
     private:
 
         static void sortTests( IConfig const& config, std::vector<TestCase>& matchingTestCases ) {
-            
+
             switch( config.runOrder() ) {
                 case RunTests::InLexicographicalOrder:
                     std::sort( matchingTestCases.begin(), matchingTestCases.end(), LexSort() );

include/internal/catch_test_case_tracker.hpp

@@ -16,9 +16,9 @@ namespace Catch {
 namespace SectionTracking {
 
     class TrackedSection {
-        
+
         typedef std::map<std::string, TrackedSection> TrackedSections;
-        
+
     public:
         enum RunState {
             NotStarted,
@@ -26,13 +26,13 @@ namespace SectionTracking {
             ExecutingChildren,
             Completed
         };
-        
+
         TrackedSection( std::string const& name, TrackedSection* parent )
         :   m_name( name ), m_runState( NotStarted ), m_parent( parent )
         {}
-        
+
         RunState runState() const { return m_runState; }
-        
+
         TrackedSection* findChild( std::string const& childName );
         TrackedSection* acquireChild( std::string const& childName );
 
@@ -48,14 +48,14 @@ namespace SectionTracking {
         bool hasChildren() const {
             return !m_children.empty();
         }
-        
+
     private:
         std::string m_name;
         RunState m_runState;
         TrackedSections m_children;
-        TrackedSection* m_parent;        
+        TrackedSection* m_parent;
     };
-    
+
     inline TrackedSection* TrackedSection::findChild( std::string const& childName ) {
         TrackedSections::iterator it = m_children.find( childName );
         return it != m_children.end()

include/internal/catch_tostring.h

@@ -62,7 +62,7 @@ std::string toString( std::nullptr_t );
     std::string toString( NSObject* const& nsObject );
 #endif
 
-  
+
 namespace Detail {
 
     extern std::string unprintableString;
@@ -73,7 +73,7 @@ namespace Detail {
 
     struct TrueType { char sizer[1]; };
     struct FalseType { char sizer[2]; };
-    
+
     TrueType& testStreamable( std::ostream& );
     FalseType testStreamable( FalseType );
 

include/internal/catch_version.h

@@ -27,7 +27,7 @@ namespace Catch {
         unsigned int const buildNumber;
 
         friend std::ostream& operator << ( std::ostream& os, Version const& version );
-        
+
     private:
         void operator=( Version const& );
     };

include/reporters/catch_reporter_junit.hpp

@@ -108,7 +108,7 @@ namespace Catch {
             SectionNode const& rootSection = *testCaseNode.children.front();
 
             std::string className = stats.testInfo.className;
-            
+
             if( className.empty() ) {
                 if( rootSection.childSections.empty() )
                     className = "global";
@@ -122,7 +122,7 @@ namespace Catch {
             std::string name = trim( sectionNode.stats.sectionInfo.name );
             if( !rootName.empty() )
                 name = rootName + "/" + name;
-            
+
             if( !sectionNode.assertions.empty() ||
                 !sectionNode.stdOut.empty() ||
                 !sectionNode.stdErr.empty() ) {
@@ -191,7 +191,7 @@ namespace Catch {
                         elementName = "internalError";
                         break;
                 }
-            
+
                 XmlWriter::ScopedElement e = xml.scopedElement( elementName );
 
                 xml.writeAttribute( "message", result.getExpandedExpression() );
@@ -220,7 +220,7 @@ namespace Catch {
         unsigned int unexpectedExceptions;
     };
 
-    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )    
+    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
 
 } // end namespace Catch
 

include/reporters/catch_reporter_teamcity.hpp

@@ -22,13 +22,13 @@
 #endif
 
 namespace Catch {
-    
+
     struct TeamCityReporter : StreamingReporterBase {
         TeamCityReporter( ReporterConfig const& _config )
         :   StreamingReporterBase( _config ),
             m_headerPrintedForThisSection( false )
         {}
-        
+
         static std::string escape( std::string const& str ) {
             std::string escaped = str;
             replaceInPlace( escaped, "|", "||" );
@@ -59,9 +59,9 @@ namespace Catch {
                 stream << " message='test skipped because it didn|'t match the test spec'";
             stream << "]\n";
         }
-        
+
         virtual void noMatchingTestCases( std::string const& /* spec */ ) {}
-        
+
         virtual void testGroupStarting( GroupInfo const& groupInfo ) {
             StreamingReporterBase::testGroupStarting( groupInfo );
             stream << "##teamcity[testSuiteStarted name='"
@@ -73,21 +73,21 @@ namespace Catch {
                 << escape( testGroupStats.groupInfo.name ) << "']\n";
         }
 
-        
+
         virtual void assertionStarting( AssertionInfo const& ) {
         }
-        
+
         virtual bool assertionEnded( AssertionStats const& assertionStats ) {
             AssertionResult const& result = assertionStats.assertionResult;
             if( !result.isOk() ) {
-                
+
                 std::ostringstream msg;
                 if( !m_headerPrintedForThisSection )
                     printSectionHeader( msg );
                 m_headerPrintedForThisSection = true;
-                
+
                 msg << result.getSourceInfo() << "\n";
-                
+
                 switch( result.getResultType() ) {
                     case ResultWas::ExpressionFailed:
                         msg << "expression failed";
@@ -126,15 +126,15 @@ namespace Catch {
                     it != itEnd;
                     ++it )
                     msg << "\n  \"" << it->message << "\"";
-                
+
-                
+
                 if( result.hasExpression() ) {
                     msg <<
                         "\n  " << result.getExpressionInMacro() << "\n"
                         "with expansion:\n" <<
                         "  " << result.getExpandedExpression() << "\n";
                 }
-                
+
                 stream << "##teamcity[testFailed"
                     << " name='" << escape( currentTestCaseInfo->name )<< "'"
                     << " message='" << escape( msg.str() ) << "'"
@@ -142,7 +142,7 @@ namespace Catch {
             }
             return true;
         }
-        
+
         virtual void sectionStarting( SectionInfo const& sectionInfo ) {
             m_headerPrintedForThisSection = false;
             StreamingReporterBase::sectionStarting( sectionInfo );
@@ -153,7 +153,7 @@ namespace Catch {
             stream << "##teamcity[testStarted name='"
                 << escape( testInfo.name ) << "']\n";
         }
-        
+
         virtual void testCaseEnded( TestCaseStats const& testCaseStats ) {
             StreamingReporterBase::testCaseEnded( testCaseStats );
             if( !testCaseStats.stdOut.empty() )
@@ -182,9 +182,9 @@ namespace Catch {
                     printHeaderString( os, it->name );
                 os << getLineOfChars<'-'>() << "\n";
             }
-            
+
             SourceLineInfo lineInfo = m_sectionStack.front().lineInfo;
-            
+
             if( !lineInfo.empty() )
                 os << lineInfo << "\n";
             os << getLineOfChars<'.'>() << "\n\n";
@@ -204,15 +204,15 @@ namespace Catch {
         }
     private:
         bool m_headerPrintedForThisSection;
-        
+
     };
-    
+
 #ifdef CATCH_IMPL
     TeamCityReporter::~TeamCityReporter() {}
 #endif
-    
+
     INTERNAL_CATCH_REGISTER_REPORTER( "teamcity", TeamCityReporter )
-    
+
 } // end namespace Catch
 
 #ifdef __clang__

include/reporters/catch_reporter_xml.hpp

@@ -24,7 +24,7 @@ namespace Catch {
         {}
 
         virtual ~XmlReporter();
-        
+
         static std::string getDescription() {
             return "Reports test results as an XML document";
         }
@@ -75,7 +75,7 @@ namespace Catch {
 
         virtual bool assertionEnded( AssertionStats const& assertionStats ) {
             const AssertionResult& assertionResult = assertionStats.assertionResult;
-                
+
             // Print any info messages in <Info> tags.
             if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) {
                 for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
@@ -137,10 +137,10 @@ namespace Catch {
                 default:
                     break;
             }
-            
+
             if( assertionResult.hasExpression() )
                 m_xml.endElement();
-                
+
             return true;
         }
 
@@ -179,7 +179,7 @@ namespace Catch {
                 .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
             m_xml.endElement();
         }
-        
+
         virtual void testRunEnded( TestRunStats const& testRunStats ) {
             StreamingReporterBase::testRunEnded( testRunStats );
             m_xml.scopedElement( "OverallResults" )