diff --git a/include/internal/catch_common.cpp b/include/internal/catch_common.cpp index 12968515..6cd1b46d 100644 --- a/include/internal/catch_common.cpp +++ b/include/internal/catch_common.cpp @@ -106,4 +106,9 @@ namespace Catch { #endif return os; } + + bool isTrue( bool value ){ return value; } + bool alwaysTrue() { return true; } + bool alwaysFalse() { return false; } + } diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 87b7020f..f86af403 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -46,12 +46,12 @@ namespace Catch { }; template - inline void deleteAll( ContainerT& container ) { + void deleteAll( ContainerT& container ) { for( auto p : container ) delete p; } template - inline void deleteAllValues( AssociativeContainerT& container ) { + void deleteAllValues( AssociativeContainerT& container ) { for( auto const& kvp : container ) delete kvp.second; } @@ -96,9 +96,9 @@ namespace Catch { std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); // This is just here to avoid compiler warnings with macro constants and boolean literals - inline bool isTrue( bool value ){ return value; } - inline bool alwaysTrue() { return true; } - inline bool alwaysFalse() { return false; } + bool isTrue( bool value ); + bool alwaysTrue(); + bool alwaysFalse(); void seedRng( IConfig const& config ); unsigned int rngSeed(); diff --git a/include/internal/catch_debugger.cpp b/include/internal/catch_debugger.cpp index e857717d..c7d66375 100644 --- a/include/internal/catch_debugger.cpp +++ b/include/internal/catch_debugger.cpp @@ -105,7 +105,7 @@ } #else namespace Catch { - inline bool isDebuggerActive() { return false; } + bool isDebuggerActive() { return false; } } #endif // Platform diff --git a/include/internal/catch_registry_hub.cpp b/include/internal/catch_registry_hub.cpp index 71967f58..4d34311c 100644 --- a/include/internal/catch_registry_hub.cpp +++ b/include/internal/catch_registry_hub.cpp @@ -69,7 +69,7 @@ namespace Catch { }; // Single, global, instance - inline RegistryHub*& getTheRegistryHub() { + RegistryHub*& getTheRegistryHub() { static RegistryHub* theRegistryHub = nullptr; if( !theRegistryHub ) theRegistryHub = new RegistryHub(); diff --git a/include/internal/catch_test_case_info.cpp b/include/internal/catch_test_case_info.cpp index 5ef88593..04bebecd 100644 --- a/include/internal/catch_test_case_info.cpp +++ b/include/internal/catch_test_case_info.cpp @@ -16,7 +16,7 @@ namespace Catch { - inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) { + TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) { if( startsWith( tag, '.' ) || tag == "hide" || tag == "!hide" ) @@ -32,10 +32,10 @@ namespace Catch { else return TestCaseInfo::None; } - inline bool isReservedTag( std::string const& tag ) { + bool isReservedTag( std::string const& tag ) { return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( tag[0] ); } - inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) { + void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) { CATCH_ENFORCE( !isReservedTag(tag), "Tag name: [" << tag << "] is not allowed.\n" << "Tag names starting with non alpha-numeric characters are reserved\n"