mirror of https://github.com/catchorg/Catch2.git
parent
e04ba5c9f6
commit
ce0b170dc2
|
@ -9,7 +9,11 @@
|
||||||
#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
|
#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
|
# ifdef __ICC // icpc defines the __clang__ macro
|
||||||
|
# pragma warning(pop)
|
||||||
|
# else
|
||||||
# pragma clang diagnostic pop
|
# pragma clang diagnostic pop
|
||||||
|
# endif
|
||||||
#elif defined __GNUC__
|
#elif defined __GNUC__
|
||||||
# pragma GCC diagnostic pop
|
# pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,6 +9,10 @@
|
||||||
#define TWOBLUECUBES_CATCH_SUPPRESS_WARNINGS_H_INCLUDED
|
#define TWOBLUECUBES_CATCH_SUPPRESS_WARNINGS_H_INCLUDED
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
|
# ifdef __ICC // icpc defines the __clang__ macro
|
||||||
|
# pragma warning(push)
|
||||||
|
# pragma warning(disable: 161 1682)
|
||||||
|
# else // __ICC
|
||||||
# pragma clang diagnostic ignored "-Wglobal-constructors"
|
# pragma clang diagnostic ignored "-Wglobal-constructors"
|
||||||
# pragma clang diagnostic ignored "-Wvariadic-macros"
|
# pragma clang diagnostic ignored "-Wvariadic-macros"
|
||||||
# pragma clang diagnostic ignored "-Wc99-extensions"
|
# pragma clang diagnostic ignored "-Wc99-extensions"
|
||||||
|
@ -17,6 +21,7 @@
|
||||||
# pragma clang diagnostic ignored "-Wpadded"
|
# pragma clang diagnostic ignored "-Wpadded"
|
||||||
# pragma clang diagnostic ignored "-Wc++98-compat"
|
# pragma clang diagnostic ignored "-Wc++98-compat"
|
||||||
# pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
|
# pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
|
||||||
|
# endif
|
||||||
#elif defined __GNUC__
|
#elif defined __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wvariadic-macros"
|
# pragma GCC diagnostic ignored "-Wvariadic-macros"
|
||||||
# pragma GCC diagnostic ignored "-Wunused-variable"
|
# pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
|
Loading…
Reference in New Issue