diff options
| author | Martin Hořeňovský | 2017-04-05 21:37:27 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2017-04-05 21:37:27 +0200 |
| commit | 8f85d08e9f5bc0a1046d0f89e99d75fcbb453202 (patch) | |
| tree | 42799da7d85bbe32d8fb1b40dabc2ddca9db7f22 /include/internal | |
| parent | 3ae076ce8d0233c20519d6e70d715850271073b1 (diff) | |
| download | catch3-8f85d08e9f5bc0a1046d0f89e99d75fcbb453202.tar.gz | |
Give up on _Pragma for gcc, force disable Wparentheses in all TUs
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/catch_compiler_capabilities.h | 13 | ||||
| -rw-r--r-- | include/internal/catch_suppress_warnings.h | 6 |
2 files changed, 1 insertions, 18 deletions
diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index c29c3a38..325ae028 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -118,23 +118,10 @@ // GCC #ifdef __GNUC__ -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) -# define CATCH_GCC_HAS_NEW_PRAGMA -# endif - # if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) # define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR # endif -# if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) && defined(CATCH_GCC_HAS_NEW_PRAGMA) -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "GCC diagnostic push" ) \ - _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "GCC diagnostic pop" ) -# endif - - // - otherwise more recent versions define __cplusplus >= 201103L // and will get picked up below diff --git a/include/internal/catch_suppress_warnings.h b/include/internal/catch_suppress_warnings.h index ffaab696..ad405922 100644 --- a/include/internal/catch_suppress_warnings.h +++ b/include/internal/catch_suppress_warnings.h @@ -24,11 +24,7 @@ #elif defined __GNUC__ # pragma GCC diagnostic ignored "-Wvariadic-macros" # pragma GCC diagnostic ignored "-Wunused-variable" - - // For newer version we can use __Pragma to disable the warnings locally -# if __GNUC__ == 4 && __GNUC_MINOR__ >= 4 && __GNUC_MINOR__ <= 7 -# pragma GCC diagnostic ignored "-Wparentheses" -# endif +# pragma GCC diagnostic ignored "-Wparentheses" # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wpadded" |