3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Got rid of some warnings

Browse Source
This commit is contained in:
Phil Nash
2012-08-27 21:48:15 +01:00
parent ecf934b045
commit 78c92e68aa
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/internal/catch_commandline.hpp
View File

@@ -317,7 +317,7 @@ namespace Catch {
return "!TBD";
}
virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
virtual void parseIntoConfig( const Command&, ConfigData& config ) {
config.includeWhichResults = Include::SuccessfulResults;
}
};
@@ -335,7 +335,7 @@ namespace Catch {
return "!TBD";
}
virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
virtual void parseIntoConfig( const Command&, ConfigData& config ) {
config.shouldDebugBreak = true;
}
};
@@ -397,7 +397,7 @@ namespace Catch {
return "!TBD";
}
virtual void parseIntoConfig( const Command& cmd, ConfigData& config ) {
virtual void parseIntoConfig( const Command&, ConfigData& config ) {
config.allowThrows = false;
}
};

11
include/internal/catch_test_spec.h
View File

@@ -50,6 +50,11 @@ namespace Catch {
}
private:
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunreachable-code"
#endif
bool isMatch( const TestCaseInfo& testCase ) const {
const std::string& name = testCase.getName();
@@ -63,9 +68,13 @@ namespace Catch {
case WildcardAtBothEnds:
return contains( name, m_stringToMatch );
}
throw std::logic_error( "Unhandled wildcard type" );
}
#ifdef __clang__
#pragma clang diagnostic pop
#endif
std::string m_stringToMatch;
IfFilterMatches::DoWhat m_filterType;
WildcardPosition m_wildcardPosition;