From 8f4e211ebd5d5769d5a2a8135b9865db35f3f8f2 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 10 Mar 2016 12:46:00 -0800
Subject: [PATCH] suppress more third party warnings

---
 include/mapnik/util/path_iterator.hpp | 5 ++++-
 src/feature_kv_iterator.cpp           | 4 ++++
 src/grid/grid_renderer.cpp            | 6 ++++--
 src/rapidxml_loader.cpp               | 6 +++++-
 src/text/formatting/format.cpp        | 4 +++-
 src/text/formatting/layout.cpp        | 4 +++-
 src/text/formatting/list.cpp          | 4 +++-
 src/text/formatting/text.cpp          | 4 +++-
 src/text/placements/list.cpp          | 4 +++-
 src/text/scrptrun.cpp                 | 3 +++
 src/text/text_properties.cpp          | 4 +++-
 src/unicode.cpp                       | 4 +++-
 src/well_known_srs.cpp                | 4 +++-
 13 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/include/mapnik/util/path_iterator.hpp b/include/mapnik/util/path_iterator.hpp
index 319c3461a..19b69ce26 100644
--- a/include/mapnik/util/path_iterator.hpp
+++ b/include/mapnik/util/path_iterator.hpp
@@ -26,8 +26,11 @@
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/path.hpp>
-// boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/iterator/iterator_facade.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <tuple>
diff --git a/src/feature_kv_iterator.cpp b/src/feature_kv_iterator.cpp
index 8fdba826b..4ae384254 100644
--- a/src/feature_kv_iterator.cpp
+++ b/src/feature_kv_iterator.cpp
@@ -22,7 +22,11 @@
 
 #include <mapnik/feature_kv_iterator.hpp>
 #include <mapnik/feature.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 
diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp
index 43806030c..fd970f580 100644
--- a/src/grid/grid_renderer.cpp
+++ b/src/grid/grid_renderer.cpp
@@ -48,12 +48,14 @@
 #include <mapnik/pixel_position.hpp>
 
 #pragma GCC diagnostic push
-#include <mapnik/warning_ignore_agg.hpp>
+#include <mapnik/warning_ignore.hpp>
 #include <boost/math/special_functions/round.hpp>
 #pragma GCC diagnostic pop
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {
diff --git a/src/rapidxml_loader.cpp b/src/rapidxml_loader.cpp
index c0a631f69..94e829405 100644
--- a/src/rapidxml_loader.cpp
+++ b/src/rapidxml_loader.cpp
@@ -28,12 +28,16 @@
 #include <mapnik/config_error.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/xml_loader.hpp>
-#include <boost/property_tree/detail/xml_parser_read_rapidxml.hpp>
 #include <mapnik/xml_node.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/property_tree/detail/xml_parser_read_rapidxml.hpp>
+#pragma GCC diagnostic pop
+
 // stl
 #include <iostream>
 #include <fstream>
diff --git a/src/text/formatting/format.cpp b/src/text/formatting/format.cpp
index 8e0fef52d..8a6a8cc9d 100644
--- a/src/text/formatting/format.cpp
+++ b/src/text/formatting/format.cpp
@@ -30,9 +30,11 @@
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/xml_node.hpp>
 
-//boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
 #include <boost/property_tree/ptree.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace formatting {
 
diff --git a/src/text/formatting/layout.cpp b/src/text/formatting/layout.cpp
index 19da033fc..ef908c569 100644
--- a/src/text/formatting/layout.cpp
+++ b/src/text/formatting/layout.cpp
@@ -35,8 +35,10 @@
 #include <mapnik/text/properties_util.hpp>
 #include <mapnik/boolean.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/property_tree/ptree.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace formatting {
 
diff --git a/src/text/formatting/list.cpp b/src/text/formatting/list.cpp
index 89e9d2373..4bf7c4d2d 100644
--- a/src/text/formatting/list.cpp
+++ b/src/text/formatting/list.cpp
@@ -25,8 +25,10 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/symbolizer.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/property_tree/ptree.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 using boost::property_tree::ptree;
diff --git a/src/text/formatting/text.cpp b/src/text/formatting/text.cpp
index c24aab123..3158f20e2 100644
--- a/src/text/formatting/text.cpp
+++ b/src/text/formatting/text.cpp
@@ -30,8 +30,10 @@
 #include <mapnik/text/text_layout.hpp>
 #include <mapnik/debug.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/property_tree/ptree.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {
diff --git a/src/text/placements/list.cpp b/src/text/placements/list.cpp
index 65c729b84..7d609f2c4 100644
--- a/src/text/placements/list.cpp
+++ b/src/text/placements/list.cpp
@@ -24,8 +24,10 @@
 #include <mapnik/text/placements/list.hpp>
 #include <mapnik/xml_node.hpp>
 
-//boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/property_tree/ptree.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {
diff --git a/src/text/scrptrun.cpp b/src/text/scrptrun.cpp
index 37a02e7c8..0cbb2c839 100644
--- a/src/text/scrptrun.cpp
+++ b/src/text/scrptrun.cpp
@@ -14,8 +14,11 @@
  * http://source.icu-project.org/repos/icu/icu/trunk/license.html
  */
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/utypes.h>
 #include <unicode/uscript.h>
+#pragma GCC diagnostic pop
 
 #include <mapnik/text/scrptrun.hpp>
 
diff --git a/src/text/text_properties.cpp b/src/text/text_properties.cpp
index 4b08c106b..ef5b9af10 100644
--- a/src/text/text_properties.cpp
+++ b/src/text/text_properties.cpp
@@ -34,8 +34,10 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/make_unique.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/property_tree/ptree.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {
diff --git a/src/unicode.cpp b/src/unicode.cpp
index abbf85df7..c96c58914 100644
--- a/src/unicode.cpp
+++ b/src/unicode.cpp
@@ -27,8 +27,10 @@
 // std
 #include <stdexcept>
 
-// icu
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/ucnv.h>
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 
diff --git a/src/well_known_srs.cpp b/src/well_known_srs.cpp
index d3296effa..445d84aee 100644
--- a/src/well_known_srs.cpp
+++ b/src/well_known_srs.cpp
@@ -25,8 +25,10 @@
 #include <mapnik/util/trim.hpp>
 #include <mapnik/enumeration.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik {