From 657dd7d73ae88c8c8262a3a9ff5ba2b6013169c3 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 14 Nov 2016 15:04:07 -0800 Subject: [PATCH] suppress boost warnings --- include/mapnik/enumeration.hpp | 6 ++++++ include/mapnik/json/json_grammar_config.hpp | 4 ++++ test/unit/serialization/parse_hex.hpp | 3 +++ 3 files changed, 13 insertions(+) diff --git a/include/mapnik/enumeration.hpp b/include/mapnik/enumeration.hpp index 1b6fc21b6..ded9dc058 100644 --- a/include/mapnik/enumeration.hpp +++ b/include/mapnik/enumeration.hpp @@ -189,6 +189,8 @@ public: for (unsigned i = 0; i < THE_MAX; ++i) { #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc +#pragma GCC diagnostic ignored "-Wpragmas" // gcc #pragma GCC diagnostic ignored "-Wundefined-var-template" if (str_copy == our_strings_[i]) #pragma GCC diagnostic pop @@ -202,6 +204,8 @@ public: } } #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc +#pragma GCC diagnostic ignored "-Wpragmas" // gcc #pragma GCC diagnostic ignored "-Wundefined-var-template" throw illegal_enum_value(std::string("Illegal enumeration value '") + str + "' for enum " + our_name_); @@ -212,6 +216,8 @@ public: std::string as_string() const { #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc +#pragma GCC diagnostic ignored "-Wpragmas" // gcc #pragma GCC diagnostic ignored "-Wundefined-var-template" return our_strings_[value_]; #pragma GCC diagnostic pop diff --git a/include/mapnik/json/json_grammar_config.hpp b/include/mapnik/json/json_grammar_config.hpp index f8e5c07c4..564ed796f 100644 --- a/include/mapnik/json/json_grammar_config.hpp +++ b/include/mapnik/json/json_grammar_config.hpp @@ -23,7 +23,11 @@ #ifndef MAPNIK_JSON_GRAMMAR_CONFIG_HPP #define MAPNIK_JSON_GRAMMAR_CONFIG_HPP +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop + #include namespace mapnik { namespace json { diff --git a/test/unit/serialization/parse_hex.hpp b/test/unit/serialization/parse_hex.hpp index 48c70a5d4..53f48fdbe 100644 --- a/test/unit/serialization/parse_hex.hpp +++ b/test/unit/serialization/parse_hex.hpp @@ -23,8 +23,11 @@ #ifndef MAPNIK_PARSE_HEX_HPP #define MAPNIK_PARSE_HEX_HPP +#pragma GCC diagnostic push +#include #include #include +#pragma GCC diagnostic pop namespace mapnik { namespace util {