diff options
| author | Phil Nash | 2011-09-29 08:58:40 +0100 |
|---|---|---|
| committer | Phil Nash | 2011-09-29 08:58:40 +0100 |
| commit | 0afab69c7d25f00af2ea82ef8df7dfd2efe72f19 (patch) | |
| tree | f6ba8622e8c9334c598599f1b2cdc0b8bf40635d | |
| parent | 7df1ba0926e46e0ce04f08394f3d79db5bf47c6a (diff) | |
| download | catch3-0afab69c7d25f00af2ea82ef8df7dfd2efe72f19.tar.gz | |
Supress more warnings
| -rw-r--r-- | include/internal/catch_commandline.hpp | 1 | ||||
| -rw-r--r-- | include/reporters/catch_reporter_basic.hpp | 5 | ||||
| -rw-r--r-- | include/reporters/catch_reporter_junit.hpp | 4 | ||||
| -rw-r--r-- | include/reporters/catch_reporter_xml.hpp | 6 |
4 files changed, 16 insertions, 0 deletions
diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp index 6a4d0368..7fa7e573 100644 --- a/include/internal/catch_commandline.hpp +++ b/include/internal/catch_commandline.hpp @@ -194,6 +194,7 @@ namespace Catch return setErrorMode( m_command + " does not accept arguments" ); m_config.setShowHelp( true ); break; + case modeError: default: break; } diff --git a/include/reporters/catch_reporter_basic.hpp b/include/reporters/catch_reporter_basic.hpp index 78de2e56..35e86df5 100644 --- a/include/reporters/catch_reporter_basic.hpp +++ b/include/reporters/catch_reporter_basic.hpp @@ -211,6 +211,11 @@ namespace Catch case ResultWas::ExplicitFailure: m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'"; break; + case ResultWas::Unknown: // These cases are here to prevent compiler warnings + case ResultWas::Ok: + case ResultWas::FailureBit: + case ResultWas::ExpressionFailed: + case ResultWas::Exception: default: if( !resultInfo.hasExpression() ) { diff --git a/include/reporters/catch_reporter_junit.hpp b/include/reporters/catch_reporter_junit.hpp index 6dbc4bf3..b281fed0 100644 --- a/include/reporters/catch_reporter_junit.hpp +++ b/include/reporters/catch_reporter_junit.hpp @@ -156,6 +156,10 @@ namespace Catch case ResultWas::Ok: stats.m_element = "success"; break; + case ResultWas::Unknown: + case ResultWas::FailureBit: + case ResultWas::Exception: + case ResultWas::DidntThrowException: default: stats.m_element = "unknown"; break; diff --git a/include/reporters/catch_reporter_xml.hpp b/include/reporters/catch_reporter_xml.hpp index 141ed419..792ab929 100644 --- a/include/reporters/catch_reporter_xml.hpp +++ b/include/reporters/catch_reporter_xml.hpp @@ -153,6 +153,12 @@ namespace Catch .writeText( resultInfo.getMessage() ); m_currentTestSuccess = false; break; + case ResultWas::Unknown: + case ResultWas::Ok: + case ResultWas::FailureBit: + case ResultWas::ExpressionFailed: + case ResultWas::Exception: + case ResultWas::DidntThrowException: default: break; } |