From 0d703ee5521d8a2d120bb0c07f69e011e722927c Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 8 Dec 2016 18:55:55 +0100
Subject: [PATCH] cleanup include directives

---
 .../mapnik/json/feature_generator_grammar_impl.hpp |  5 -----
 .../json/properties_generator_grammar_impl.hpp     | 14 ++------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/include/mapnik/json/feature_generator_grammar_impl.hpp b/include/mapnik/json/feature_generator_grammar_impl.hpp
index 7008bb9f3..1ee4b99ae 100644
--- a/include/mapnik/json/feature_generator_grammar_impl.hpp
+++ b/include/mapnik/json/feature_generator_grammar_impl.hpp
@@ -22,11 +22,6 @@
 
 #include <mapnik/json/feature_generator_grammar.hpp>
 
-#include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/fusion/include/at.hpp>
-
 namespace mapnik { namespace json {
 
 template <typename OutputIterator, typename FeatureType>
diff --git a/include/mapnik/json/properties_generator_grammar_impl.hpp b/include/mapnik/json/properties_generator_grammar_impl.hpp
index df9b113c5..b0f008a72 100644
--- a/include/mapnik/json/properties_generator_grammar_impl.hpp
+++ b/include/mapnik/json/properties_generator_grammar_impl.hpp
@@ -26,8 +26,6 @@
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/phoenix.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/fusion/include/at.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #pragma GCC diagnostic pop
 
@@ -60,7 +58,7 @@ escaped_string<OutputIterator>::escaped_string()
 }
 
 template <typename OutputIterator, typename KeyValueStore>
-properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator_grammar()
+properties_generator_grammar<OutputIterator, KeyValueStore>::properties_generator_grammar()
     : properties_generator_grammar::base_type(properties),
       quote_("\"")
 {
@@ -71,14 +69,13 @@ properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator
     boost::spirit::karma::string_type kstring;
     boost::spirit::karma::eps_type eps;
     using boost::phoenix::at_c;
-
     properties = lit('{')
         << -(pair % lit(','))
         << lit('}')
         ;
 
     pair = lit('"')
-        << kstring[_1 = boost::phoenix::at_c<0>(_val)] << lit('"')
+        << kstring[_1 = at_c<0>(_val)] << lit('"')
         << lit(':')
         << value[_1 = extract_string_(at_c<1>(_val))]
         ;
@@ -88,13 +85,6 @@ properties_generator_grammar<OutputIterator,KeyValueStore>::properties_generator
         kstring[_1 = at_c<0>(_val)]
         ;
 
-    // FIXME http://boost-spirit.com/home/articles/karma-examples/creating-your-own-generator-component-for-spirit-karma/
-    //value = (value_null_| bool_ | int__ | double_ | ustring)//[_1 = value_base_(_r1)]
-    //   ;
-    //value_null_ = kstring[_1 = "null"]
-    //    ;
-    //ustring = escaped_string_(quote_.c_str())[_1 = utf8_(_val)]
-    //    ;
 }
 
 }}