From d2f50a015891ce6632d9ce8bf92555590df7f5a9 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 18 Sep 2013 18:27:04 -0700
Subject: [PATCH] no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header,
 it is now set in SConstruct

---
 include/mapnik/css_color_grammar.hpp               | 2 --
 include/mapnik/expression_grammar.hpp              | 2 --
 include/mapnik/image_filter_grammar.hpp            | 1 -
 include/mapnik/json/feature_collection_grammar.hpp | 1 -
 include/mapnik/json/feature_generator_grammar.hpp  | 2 --
 include/mapnik/json/feature_grammar.hpp            | 1 -
 include/mapnik/json/geometry_generator_grammar.hpp | 1 -
 include/mapnik/json/geometry_grammar.hpp           | 2 --
 include/mapnik/path_expression_grammar.hpp         | 1 -
 include/mapnik/svg/svg_path_grammar.hpp            | 1 -
 include/mapnik/transform_expression_grammar.hpp    | 1 -
 include/mapnik/util/dasharray_parser.hpp           | 2 --
 include/mapnik/util/geometry_svg_generator.hpp     | 2 --
 include/mapnik/util/geometry_to_svg.hpp            | 2 --
 include/mapnik/util/geometry_wkt_generator.hpp     | 4 ----
 include/mapnik/wkt/wkt_grammar.hpp                 | 2 --
 src/conversions.cpp                                | 2 --
 src/json/feature_grammar.cpp                       | 1 -
 src/json/geojson_generator.cpp                     | 2 --
 src/json/geometry_grammar.cpp                      | 2 --
 src/json/geometry_parser.cpp                       | 2 --
 src/text_placements/simple.cpp                     | 2 --
 src/transform_expression_grammar.cpp               | 1 -
 tests/cpp_tests/conversions_test.cpp               | 2 --
 24 files changed, 41 deletions(-)

diff --git a/include/mapnik/css_color_grammar.hpp b/include/mapnik/css_color_grammar.hpp
index 28217adcb..58e2f0c70 100644
--- a/include/mapnik/css_color_grammar.hpp
+++ b/include/mapnik/css_color_grammar.hpp
@@ -27,8 +27,6 @@
 #include <mapnik/color.hpp>
 #include <mapnik/util/hsl.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // spirit2
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/qi_action.hpp>
diff --git a/include/mapnik/expression_grammar.hpp b/include/mapnik/expression_grammar.hpp
index d9c457f4f..97e619041 100644
--- a/include/mapnik/expression_grammar.hpp
+++ b/include/mapnik/expression_grammar.hpp
@@ -23,8 +23,6 @@
 #ifndef MAPNIK_EXPRESSIONS_GRAMMAR_HPP
 #define MAPNIK_EXPRESSIONS_GRAMMAR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/value_types.hpp>
diff --git a/include/mapnik/image_filter_grammar.hpp b/include/mapnik/image_filter_grammar.hpp
index e873489ba..26156fbf1 100644
--- a/include/mapnik/image_filter_grammar.hpp
+++ b/include/mapnik/image_filter_grammar.hpp
@@ -23,7 +23,6 @@
 #ifndef MAPNIK_IMAGE_FILITER_GRAMMAR_HPP
 #define MAPNIK_IMAGE_FILITER_GRAMMAR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // boost
 #include <boost/spirit/include/qi.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
diff --git a/include/mapnik/json/feature_collection_grammar.hpp b/include/mapnik/json/feature_collection_grammar.hpp
index 29ca15f34..ef8b8aadd 100644
--- a/include/mapnik/json/feature_collection_grammar.hpp
+++ b/include/mapnik/json/feature_collection_grammar.hpp
@@ -28,7 +28,6 @@
 #include <mapnik/json/feature_grammar.hpp>
 #include <mapnik/feature.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // spirit::qi
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix.hpp>
diff --git a/include/mapnik/json/feature_generator_grammar.hpp b/include/mapnik/json/feature_generator_grammar.hpp
index 57612fc72..7c7666ddb 100644
--- a/include/mapnik/json/feature_generator_grammar.hpp
+++ b/include/mapnik/json/feature_generator_grammar.hpp
@@ -23,8 +23,6 @@
 #ifndef MAPNIK_JSON_FEATURE_GENERATOR_GRAMMAR_HPP
 #define MAPNIK_JSON_FEATURE_GENERATOR_GRAMMAR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/value_types.hpp>
diff --git a/include/mapnik/json/feature_grammar.hpp b/include/mapnik/json/feature_grammar.hpp
index b44b41bc3..119c5d063 100644
--- a/include/mapnik/json/feature_grammar.hpp
+++ b/include/mapnik/json/feature_grammar.hpp
@@ -23,7 +23,6 @@
 #ifndef MAPNIK_FEATURE_GRAMMAR_HPP
 #define MAPNIK_FEATURE_GRAMMAR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // mapnik
 #include <mapnik/json/geometry_grammar.hpp>
 #include <mapnik/value.hpp>
diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp
index 407d8ff76..f79f9decf 100644
--- a/include/mapnik/json/geometry_generator_grammar.hpp
+++ b/include/mapnik/json/geometry_generator_grammar.hpp
@@ -23,7 +23,6 @@
 #ifndef MAPNIK_JSON_GEOMETRY_GENERATOR_GRAMMAR_HPP
 #define MAPNIK_JSON_GEOMETRY_GENERATOR_GRAMMAR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
diff --git a/include/mapnik/json/geometry_grammar.hpp b/include/mapnik/json/geometry_grammar.hpp
index c297d0e79..a0e2c9580 100644
--- a/include/mapnik/json/geometry_grammar.hpp
+++ b/include/mapnik/json/geometry_grammar.hpp
@@ -27,8 +27,6 @@
 #include <mapnik/geometry.hpp>  // for geometry_type
 #include <mapnik/vertex.hpp>  // for CommandType
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // spirit::qi
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
diff --git a/include/mapnik/path_expression_grammar.hpp b/include/mapnik/path_expression_grammar.hpp
index 68f6e93da..a03511215 100644
--- a/include/mapnik/path_expression_grammar.hpp
+++ b/include/mapnik/path_expression_grammar.hpp
@@ -26,7 +26,6 @@
 // mapnik
 #include <mapnik/path_expression.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // spirit2
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/qi_action.hpp>
diff --git a/include/mapnik/svg/svg_path_grammar.hpp b/include/mapnik/svg/svg_path_grammar.hpp
index 940cdbc76..851a501c2 100644
--- a/include/mapnik/svg/svg_path_grammar.hpp
+++ b/include/mapnik/svg/svg_path_grammar.hpp
@@ -26,7 +26,6 @@
 // mapnik
 #include <mapnik/svg/svg_path_commands.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // spirit
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
diff --git a/include/mapnik/transform_expression_grammar.hpp b/include/mapnik/transform_expression_grammar.hpp
index fb113f07a..886ffaa1f 100644
--- a/include/mapnik/transform_expression_grammar.hpp
+++ b/include/mapnik/transform_expression_grammar.hpp
@@ -27,7 +27,6 @@
 #include <mapnik/expression_grammar.hpp>
 #include <mapnik/transform_expression.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // spirit
 #include <boost/spirit/include/qi.hpp>
 
diff --git a/include/mapnik/util/dasharray_parser.hpp b/include/mapnik/util/dasharray_parser.hpp
index ad5b64ef7..a422b53d1 100644
--- a/include/mapnik/util/dasharray_parser.hpp
+++ b/include/mapnik/util/dasharray_parser.hpp
@@ -23,8 +23,6 @@
 #ifndef MAPNIK_UTIL_DASHARRAY_PARSER_HPP
 #define MAPNIK_UTIL_DASHARRAY_PARSER_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
diff --git a/include/mapnik/util/geometry_svg_generator.hpp b/include/mapnik/util/geometry_svg_generator.hpp
index e6db2f80a..b3521d3db 100644
--- a/include/mapnik/util/geometry_svg_generator.hpp
+++ b/include/mapnik/util/geometry_svg_generator.hpp
@@ -23,8 +23,6 @@
 #ifndef MAPNIK_GEOMETRY_SVG_GENERATOR_HPP
 #define MAPNIK_GEOMETRY_SVG_GENERATOR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp> // for container stuff
diff --git a/include/mapnik/util/geometry_to_svg.hpp b/include/mapnik/util/geometry_to_svg.hpp
index b24a666b7..d7294d878 100644
--- a/include/mapnik/util/geometry_to_svg.hpp
+++ b/include/mapnik/util/geometry_to_svg.hpp
@@ -28,8 +28,6 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/util/geometry_svg_generator.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // boost
 #include <boost/spirit/include/karma.hpp>
 
diff --git a/include/mapnik/util/geometry_wkt_generator.hpp b/include/mapnik/util/geometry_wkt_generator.hpp
index e53370e3f..74dd1be70 100644
--- a/include/mapnik/util/geometry_wkt_generator.hpp
+++ b/include/mapnik/util/geometry_wkt_generator.hpp
@@ -23,15 +23,11 @@
 #ifndef MAPNIK_GEOMETRY_WKT_GENERATOR_HPP
 #define MAPNIK_GEOMETRY_WKT_GENERATOR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // mapnik
 #include <mapnik/global.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/vertex.hpp>    // for CommandType::SEG_MOVETO
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // boost
 #include <boost/tuple/tuple.hpp>
 #include <boost/spirit/include/karma.hpp>
diff --git a/include/mapnik/wkt/wkt_grammar.hpp b/include/mapnik/wkt/wkt_grammar.hpp
index 47e7e8e84..b70943997 100644
--- a/include/mapnik/wkt/wkt_grammar.hpp
+++ b/include/mapnik/wkt/wkt_grammar.hpp
@@ -23,8 +23,6 @@
 #ifndef MAPNIK_WKT_GRAMMAR_HPP
 #define MAPNIK_WKT_GRAMMAR_HPP
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 #include <boost/assert.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 // spirit::qi
diff --git a/src/conversions.cpp b/src/conversions.cpp
index f7d6d67e6..c4abfff54 100644
--- a/src/conversions.cpp
+++ b/src/conversions.cpp
@@ -26,8 +26,6 @@
 
 #include <cstring>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 #include <boost/spirit/include/qi.hpp>
 
 #if _MSC_VER
diff --git a/src/json/feature_grammar.cpp b/src/json/feature_grammar.cpp
index f859ced4e..2930490be 100644
--- a/src/json/feature_grammar.cpp
+++ b/src/json/feature_grammar.cpp
@@ -27,7 +27,6 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/json/feature_grammar.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // boost
 #include <boost/spirit/include/support_multi_pass.hpp>
 
diff --git a/src/json/geojson_generator.cpp b/src/json/geojson_generator.cpp
index e58b5a17e..6e98a4d6f 100644
--- a/src/json/geojson_generator.cpp
+++ b/src/json/geojson_generator.cpp
@@ -20,8 +20,6 @@
  *
  *****************************************************************************/
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // boost
 #include <boost/version.hpp>
 #include <mapnik/feature.hpp>
diff --git a/src/json/geometry_grammar.cpp b/src/json/geometry_grammar.cpp
index 70172f7c2..7708ab17c 100644
--- a/src/json/geometry_grammar.cpp
+++ b/src/json/geometry_grammar.cpp
@@ -26,8 +26,6 @@
 // mapnik
 #include <mapnik/json/geometry_grammar.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // boost
 #include <boost/spirit/include/support_multi_pass.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
diff --git a/src/json/geometry_parser.cpp b/src/json/geometry_parser.cpp
index f55945103..f88177765 100644
--- a/src/json/geometry_parser.cpp
+++ b/src/json/geometry_parser.cpp
@@ -21,8 +21,6 @@
  *****************************************************************************/
 
 // mapnik
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 #include <mapnik/json/geometry_parser.hpp>
 #include <mapnik/json/geometry_grammar.hpp>
 
diff --git a/src/text_placements/simple.cpp b/src/text_placements/simple.cpp
index 25bd9d662..ec5f812d0 100644
--- a/src/text_placements/simple.cpp
+++ b/src/text_placements/simple.cpp
@@ -26,8 +26,6 @@
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/xml_node.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 // boost
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
diff --git a/src/transform_expression_grammar.cpp b/src/transform_expression_grammar.cpp
index d707bab65..4c5ab6d0a 100644
--- a/src/transform_expression_grammar.cpp
+++ b/src/transform_expression_grammar.cpp
@@ -20,7 +20,6 @@
  *
  *****************************************************************************/
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 // mapnik
 #include <mapnik/transform_expression_grammar.hpp>
 
diff --git a/tests/cpp_tests/conversions_test.cpp b/tests/cpp_tests/conversions_test.cpp
index 89bbca77b..687f2ba4a 100644
--- a/tests/cpp_tests/conversions_test.cpp
+++ b/tests/cpp_tests/conversions_test.cpp
@@ -1,5 +1,3 @@
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 #include <boost/version.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/util/conversions.hpp>