Addressed some warnings (mostly MSVC)

This commit is contained in:
Phil Nash
2013-03-25 08:46:48 +00:00
parent 6ba2057abd
commit 2e3c5fa2ad
8 changed files with 26 additions and 3 deletions

View File

@@ -210,6 +210,9 @@ TEST_CASE( "./succeeding/conditions/int literals",
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wsign-conversion"
#endif
#ifdef _MSC_VER
#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
#endif
TEST_CASE( "./succeeding/conditions//long_to_unsigned_x",
"comparisons between int variables" )

View File

@@ -107,6 +107,9 @@ TEST_CASE_NORETURN( "./failing/exceptions/custom", "Unexpected custom exceptions
{
throw CustomException( "custom exception" );
}
#ifdef _MSC_VER
#pragma warning(disable:4702) // unreachable code
#endif
TEST_CASE( "./failing/exceptions/custom/nothrow", "Custom exceptions can be translated when testing for nothrow" )
{

View File

@@ -47,7 +47,7 @@ TEST_CASE( "./mixed/message/info/2", "INFO gets logged on failure" )
TEST_CASE( "./failing/message/fail", "FAIL aborts the test" )
{
if( true )
if( Catch::isTrue( true ) )
FAIL( "This is a " << "failure" ); // This should output the message and abort
}