Removed superfluous inline keywords

This commit is contained in:
Martin Hořeňovský 2017-07-12 16:16:55 +02:00
parent d8df83ee2f
commit 878bd140e6
5 changed files with 15 additions and 10 deletions

View File

@ -106,4 +106,9 @@ namespace Catch {
#endif
return os;
}
bool isTrue( bool value ){ return value; }
bool alwaysTrue() { return true; }
bool alwaysFalse() { return false; }
}

View File

@ -46,12 +46,12 @@ namespace Catch {
};
template<typename ContainerT>
inline void deleteAll( ContainerT& container ) {
void deleteAll( ContainerT& container ) {
for( auto p : container )
delete p;
}
template<typename AssociativeContainerT>
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();

View File

@ -105,7 +105,7 @@
}
#else
namespace Catch {
inline bool isDebuggerActive() { return false; }
bool isDebuggerActive() { return false; }
}
#endif // Platform

View File

@ -69,7 +69,7 @@ namespace Catch {
};
// Single, global, instance
inline RegistryHub*& getTheRegistryHub() {
RegistryHub*& getTheRegistryHub() {
static RegistryHub* theRegistryHub = nullptr;
if( !theRegistryHub )
theRegistryHub = new RegistryHub();

View File

@ -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"