3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-12-23 11:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

conditionally compile GCC pragmas

Browse Source
This commit is contained in:
Phil Nash 2012-08-16 20:35:52 +01:00
parent 5bc030ddd7
commit d5fbe2ec5d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/SelfTest/ConditionTests.cpp
View File

@ -213,9 +213,11 @@ TEST_CASE( "./succeeding/conditions/int literals",
// Disable warnings about sign conversions for the next two tests // Disable warnings about sign conversions for the next two tests
// (as we are deliberately invoking them) // (as we are deliberately invoking them)
// - Current only disabled for GCC/ LLVM. Should add VC++ too // - Current only disabled for GCC/ LLVM. Should add VC++ too
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-compare" #pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#endif
TEST_CASE( "./succeeding/conditions//long_to_unsigned_x", TEST_CASE( "./succeeding/conditions//long_to_unsigned_x",
"comparisons between int variables" ) "comparisons between int variables" )
@ -261,8 +263,9 @@ TEST_CASE( "./succeeding/conditions/computed ints",
CHECK( 54 == 6*9 ); CHECK( 54 == 6*9 );
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
inline const char* returnsConstNull(){ return NULL; } inline const char* returnsConstNull(){ return NULL; }
inline char* returnsNull(){ return NULL; } inline char* returnsNull(){ return NULL; }

4
projects/SelfTest/ExceptionTests.cpp
View File

@ -113,8 +113,10 @@ TEST_CASE_NORETURN( "./failing/exceptions/custom/double", "Unexpected custom exc
throw double( 3.14 ); throw double( 3.14 );
} }
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-variable"
#endif
TEST_CASE( "./failing/exceptions/in-section", "Exceptions thrown from sections report file/ line or section" ) TEST_CASE( "./failing/exceptions/in-section", "Exceptions thrown from sections report file/ line or section" )
{ {
@ -127,7 +129,9 @@ TEST_CASE( "./failing/exceptions/in-section", "Exceptions thrown from sections r
} }
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
TEST_CASE( "./succeeding/exceptions/error messages", "The error messages produced by exceptions caught by Catch matched the expected form" ) TEST_CASE( "./succeeding/exceptions/error messages", "The error messages produced by exceptions caught by Catch matched the expected form" )
{ {