From 6d4abf908d42a1967d572c20957a58d9848e007e Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 1 Dec 2015 12:43:24 -0500
Subject: [PATCH] fix -Wshadow warnings

---
 include/mapnik/expression_grammar_x3.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/mapnik/expression_grammar_x3.hpp b/include/mapnik/expression_grammar_x3.hpp
index feab23261..19d087a26 100644
--- a/include/mapnik/expression_grammar_x3.hpp
+++ b/include/mapnik/expression_grammar_x3.hpp
@@ -25,11 +25,15 @@
 
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
+#include <mapnik/unicode.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/home/x3.hpp>
 #include <boost/spirit/home/x3/support/ast/variant.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/fusion/include/std_pair.hpp>
-#include <mapnik/unicode.hpp>
+#pragma GCC diagnostic pop
 
 
 BOOST_FUSION_ADAPT_STRUCT(mapnik::unary_function_call,
@@ -331,7 +335,7 @@ namespace mapnik { namespace grammar {
              |
              ('-' > multiplicative_expression[do_subt]));
 
-    auto const attr = '[' > no_skip[+~char_(']')] > ']';
+    auto const mattr = '[' > no_skip[+~char_(']')] > ']';
     auto const global_attr = x3::rule<class ustring, std::string> {} = '@' > no_skip[alpha > *(alnum | char_('-'))];
     auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')';
     auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';
@@ -377,7 +381,7 @@ namespace mapnik { namespace grammar {
         |
         lit("[mapnik::geometry_type]")[do_geometry_type_attribute]
         |
-        attr[do_attribute]
+        mattr[do_attribute]
         |
         global_attr[do_global_attribute]
         |