From 342b78dc52f608c061f94b7f2142c1a180b9f406 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 18 Mar 2016 09:51:17 -0700
Subject: [PATCH] more trimming of unneeded phoenix includes - refs #3343

---
 .../json/geometry_generator_grammar.hpp       |  1 +
 .../json/properties_generator_grammar.hpp     | 13 ++++----
 include/mapnik/svg/geometry_svg_generator.hpp |  6 ++--
 include/mapnik/svg/svg_path_commands.hpp      | 30 ++++++++-----------
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/include/mapnik/json/geometry_generator_grammar.hpp b/include/mapnik/json/geometry_generator_grammar.hpp
index 5b2c59da9..0e314650b 100644
--- a/include/mapnik/json/geometry_generator_grammar.hpp
+++ b/include/mapnik/json/geometry_generator_grammar.hpp
@@ -32,6 +32,7 @@
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/karma.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
 #include <boost/spirit/home/karma/domain.hpp>
 #pragma GCC diagnostic pop
diff --git a/include/mapnik/json/properties_generator_grammar.hpp b/include/mapnik/json/properties_generator_grammar.hpp
index e0f7be632..69145b8ab 100644
--- a/include/mapnik/json/properties_generator_grammar.hpp
+++ b/include/mapnik/json/properties_generator_grammar.hpp
@@ -25,23 +25,20 @@
 
 #include <mapnik/value_types.hpp>
 #include <mapnik/value.hpp>
-#include <mapnik/feature_kv_iterator.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/fusion/adapted/std_tuple.hpp>
-#include <boost/fusion/include/at.hpp>
-#include <boost/fusion/include/cons.hpp>
 #pragma GCC diagnostic pop
 
+#include <string>
+#include <tuple>
+
 namespace mapnik { namespace json {
 
+namespace karma = boost::spirit::karma;
+
 template <typename OutputIterator>
 struct escaped_string
     : karma::grammar<OutputIterator, std::string(char const*)>
diff --git a/include/mapnik/svg/geometry_svg_generator.hpp b/include/mapnik/svg/geometry_svg_generator.hpp
index 11aa5c9c1..7594c26dd 100644
--- a/include/mapnik/svg/geometry_svg_generator.hpp
+++ b/include/mapnik/svg/geometry_svg_generator.hpp
@@ -36,15 +36,13 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_statement.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
 #pragma GCC diagnostic pop
 
+#include <tuple>
 
 // adapted to conform to the concepts
 // required by Karma to be recognized as a container of
diff --git a/include/mapnik/svg/svg_path_commands.hpp b/include/mapnik/svg/svg_path_commands.hpp
index d0fa70462..7e7ab5fef 100644
--- a/include/mapnik/svg/svg_path_commands.hpp
+++ b/include/mapnik/svg/svg_path_commands.hpp
@@ -29,16 +29,12 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/fusion/sequence/intrinsic/at.hpp>
 #pragma GCC diagnostic pop
 
 namespace mapnik {
 namespace svg {
 
-using namespace boost::fusion;
 
 inline double deg2rad(double deg)
 {
@@ -52,7 +48,7 @@ struct move_to
     template <typename PathType, typename T0, typename T1>
     void operator()(PathType& path, T0 v, T1 rel) const
     {
-        path.move_to(at_c<0>(v), at_c<1>(v), rel); // impl
+        path.move_to(boost::fusion::at_c<0>(v), boost::fusion::at_c<1>(v), rel); // impl
     }
 };
 
@@ -82,7 +78,7 @@ struct line_to
     template <typename PathType, typename T0, typename T1>
     void operator()(PathType& path, T0 const& v, T1 rel) const
     {
-        path.line_to(at_c<0>(v), at_c<1>(v), rel); // impl
+        path.line_to(boost::fusion::at_c<0>(v), boost::fusion::at_c<1>(v), rel); // impl
     }
 };
 
@@ -92,9 +88,9 @@ struct curve4
     template <typename PathType, typename T0, typename T1, typename T2, typename T3>
     void operator()(PathType& path, T0 const& v0, T1 const& v1, T2 const& v2, T3 rel) const
     {
-        path.curve4(at_c<0>(v0), at_c<1>(v0),
-                    at_c<0>(v1), at_c<1>(v1),
-                    at_c<0>(v2), at_c<1>(v2),
+        path.curve4(boost::fusion::at_c<0>(v0), boost::fusion::at_c<1>(v0),
+                    boost::fusion::at_c<0>(v1), boost::fusion::at_c<1>(v1),
+                    boost::fusion::at_c<0>(v2), boost::fusion::at_c<1>(v2),
                     rel); // impl
     }
 };
@@ -105,8 +101,8 @@ struct curve4_smooth
     template <typename PathType, typename T0, typename T1, typename T2>
     void operator()(PathType& path, T0 const& v0, T1 const& v1, T2 rel) const
     {
-        path.curve4(at_c<0>(v0), at_c<1>(v0),
-                    at_c<0>(v1), at_c<1>(v1),
+        path.curve4(boost::fusion::at_c<0>(v0), boost::fusion::at_c<1>(v0),
+                    boost::fusion::at_c<0>(v1), boost::fusion::at_c<1>(v1),
                     rel); // impl
     }
 };
@@ -117,8 +113,8 @@ struct curve3
     template <typename PathType, typename T0, typename T1, typename T2>
     void operator()(PathType& path, T0 const& v0, T1 const& v1, T2 rel) const
     {
-        path.curve3(at_c<0>(v0), at_c<1>(v0),
-                    at_c<0>(v1), at_c<1>(v1),
+        path.curve3(boost::fusion::at_c<0>(v0), boost::fusion::at_c<1>(v0),
+                    boost::fusion::at_c<0>(v1), boost::fusion::at_c<1>(v1),
                     rel); // impl
     }
 };
@@ -129,7 +125,7 @@ struct curve3_smooth
     template <typename PathType, typename T0, typename T1>
     void operator()(PathType& path, T0 const& v0, T1 rel) const
     {
-        path.curve3(at_c<0>(v0), at_c<1>(v0),
+        path.curve3(boost::fusion::at_c<0>(v0), boost::fusion::at_c<1>(v0),
                     rel); // impl
     }
 };
@@ -140,9 +136,9 @@ struct arc_to
     template <typename PathType, typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
     void operator()(PathType& path, T0 const& rv, T1 const& angle, T2 large_arc_flag, T3 sweep_flag, T4 const& v, T5 rel) const
     {
-        path.arc_to(at_c<0>(rv), at_c<1>(rv),
+        path.arc_to(boost::fusion::at_c<0>(rv), boost::fusion::at_c<1>(rv),
                     deg2rad(angle), large_arc_flag, sweep_flag,
-                    at_c<0>(v), at_c<1>(v),
+                    boost::fusion::at_c<0>(v), boost::fusion::at_c<1>(v),
                     rel);
     }
 };