From ce44d8255d88ff435d11f5a7d6a20e53610f5367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 1 Jul 2014 05:15:26 -0700 Subject: [PATCH] ignore boost warnings with gcc as well --- include/llmr/util/utf.hpp | 5 +++++ src/text/collision.cpp | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/llmr/util/utf.hpp b/include/llmr/util/utf.hpp index 92da93f01..fc9fb57d5 100644 --- a/include/llmr/util/utf.hpp +++ b/include/llmr/util/utf.hpp @@ -5,7 +5,12 @@ // g++/libstdc++ is missing c++11 codecvt support #ifdef __linux__ +#pragma GCC diagnostic push +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#endif #include +#pragma GCC diagnostic pop #else #include #include diff --git a/src/text/collision.cpp b/src/text/collision.cpp index 0da50f280..0b4c65885 100644 --- a/src/text/collision.cpp +++ b/src/text/collision.cpp @@ -2,14 +2,17 @@ #include #include -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-parameter" -#pragma clang diagnostic ignored "-Wdeprecated-register" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif #include #include #include #include -#pragma clang diagnostic pop +#pragma GCC diagnostic pop namespace llmr { namespace bg = boost::geometry;