From efa52c60e96ee2aa41bc5da1e1759379ad8df799 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Thu, 28 Apr 2016 16:08:20 +1000 Subject: [PATCH] build: remove unnecessary pedantic checks --- coord/store.hpp | 9 ++++----- region.hpp | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/coord/store.hpp b/coord/store.hpp index 2c938795..4d5073a4 100644 --- a/coord/store.hpp +++ b/coord/store.hpp @@ -28,12 +28,9 @@ namespace util { namespace coord { // Disable GCC warnings about validity of anonymous structures in // unions. Push comes to shove I'll manually redsign everything to // keep this syntax anyway. -#pragma GCC diagnostic push -#if defined(COMPILER_GCC) -#pragma GCC diagnostic ignored "-pedantic" -#endif #if defined(COMPILER_CLANG) -#pragma GCC diagnostic ignored "-Wgnu" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wgnu-anonymous-struct" #endif /////////////////////////////////////////////////////////////////////////// @@ -181,7 +178,9 @@ namespace util { namespace coord { }; }; +#if defined(COMPILER_CLANG) #pragma GCC diagnostic pop +#endif } } #endif diff --git a/region.hpp b/region.hpp index 12e39c0b..95dc4ae2 100644 --- a/region.hpp +++ b/region.hpp @@ -43,12 +43,9 @@ namespace util { static constexpr size_t dimension = S; static constexpr size_t elements = extent_t::elements + point_t::elements; -#pragma GCC diagnostic push -#if defined(COMPILER_GCC) - #pragma GCC diagnostic ignored "-pedantic" -#endif #if defined(COMPILER_CLANG) - #pragma GCC diagnostic ignored "-Wgnu" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wgnu-anonymous-struct" #endif union { struct { @@ -60,7 +57,9 @@ namespace util { T w, h; }; }; +#if defined(COMPILER_CLANG) #pragma GCC diagnostic pop +#endif //--------------------------------------------------------------------- region () = default;