From 6e5a67c1fb981556bfd490473cb2570d97bb09c6 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 14 Dec 2015 13:40:23 -0800
Subject: [PATCH] Fix -Wshadow errors from boost - refs #3204

---
 include/mapnik/svg2_color_grammar_def.hpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/svg2_color_grammar_def.hpp b/include/mapnik/svg2_color_grammar_def.hpp
index 893049b1a..a866cd1a8 100644
--- a/include/mapnik/svg2_color_grammar_def.hpp
+++ b/include/mapnik/svg2_color_grammar_def.hpp
@@ -25,14 +25,17 @@
 #ifndef MAPNIK_SVG2_COLOR_GRAMMAR_DEF_HPP
 #define MAPNIK_SVG2_COLOR_GRAMMAR_DEF_HPP
 
-// boost
-#include <boost/spirit/home/x3.hpp>
-#include <boost/fusion/adapted/struct.hpp>
-#include <boost/fusion/adapted/std_tuple.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/util/hsl.hpp>
 #include <mapnik/safe_cast.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/spirit/home/x3.hpp>
+#include <boost/fusion/adapted/struct.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp>
+#pragma GCC diagnostic pop
+
 BOOST_FUSION_ADAPT_STRUCT (
     mapnik::color,
     (std::uint8_t, red_)
@@ -400,6 +403,8 @@ auto const svg2_color_def =
     hsla_color
     ;
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 BOOST_SPIRIT_DEFINE(
     svg2_color,
     hex2_color,
@@ -409,6 +414,7 @@ BOOST_SPIRIT_DEFINE(
     rgb_color_percent,
     rgba_color_percent
     );
+#pragma GCC diagnostic pop
 
 auto const expression = svg2_color;