From e9343ca32ca73f19213da5ae41e9b25908c716b0 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 3 Jan 2013 23:56:11 -0800
Subject: [PATCH] iwyu

---
 src/json/feature_grammar.cpp   | 4 ++--
 src/json/geojson_generator.cpp | 5 +++--
 src/placement_finder.cpp       | 3 ++-
 src/symbolizer.cpp             | 3 ++-
 src/text_properties.cpp        | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/json/feature_grammar.cpp b/src/json/feature_grammar.cpp
index 4fca07c59..aa83162bc 100644
--- a/src/json/feature_grammar.cpp
+++ b/src/json/feature_grammar.cpp
@@ -149,8 +149,8 @@ feature_grammar<Iterator,FeatureType>::feature_grammar(mapnik::transcoder const&
 
 }
 
-template struct mapnik::json::feature_grammar<std::string::const_iterator,mapnik::Feature>;
-template struct mapnik::json::feature_grammar<boost::spirit::multi_pass<std::istreambuf_iterator<char> >,mapnik::Feature>;
+template struct mapnik::json::feature_grammar<std::string::const_iterator,mapnik::feature_impl>;
+template struct mapnik::json::feature_grammar<boost::spirit::multi_pass<std::istreambuf_iterator<char> >,mapnik::feature_impl>;
 
 }}
 
diff --git a/src/json/geojson_generator.cpp b/src/json/geojson_generator.cpp
index b086179ad..d178fe8d3 100644
--- a/src/json/geojson_generator.cpp
+++ b/src/json/geojson_generator.cpp
@@ -22,6 +22,7 @@
 
 // boost
 #include <boost/version.hpp>
+#include <mapnik/feature.hpp>
 #include <mapnik/json/geojson_generator.hpp>
 
 #if BOOST_VERSION >= 104700
@@ -37,7 +38,7 @@ feature_generator::feature_generator()
 
 feature_generator::~feature_generator() {}
 
-bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
+bool feature_generator::generate(std::string & geojson, mapnik::feature_impl const& f)
 {
     sink_type sink(geojson);
     return karma::generate(sink, *grammar_,f);
@@ -65,7 +66,7 @@ bool geometry_generator::generate(std::string & geojson, mapnik::geometry_contai
 
 namespace  mapnik { namespace json {
 
-bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
+bool feature_generator::generate(std::string & geojson, mapnik::feature_impl const& f)
 {
     std::ostringstream s;
     s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000  << "." << BOOST_VERSION % 100;
diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp
index f83daae4f..1dc5ca877 100644
--- a/src/placement_finder.cpp
+++ b/src/placement_finder.cpp
@@ -21,6 +21,7 @@
  *****************************************************************************/
 
 //mapnik
+#include <mapnik/feature.hpp>
 #include <mapnik/placement_finder.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/text_path.hpp>
@@ -95,7 +96,7 @@ double get_total_distance(T & shape_path)
 }
 
 template <typename DetectorT>
-placement_finder<DetectorT>::placement_finder(Feature const& feature,
+placement_finder<DetectorT>::placement_finder(feature_impl const& feature,
                                               text_placement_info const& placement_info,
                                               string_info const& info,
                                               DetectorT & detector,
diff --git a/src/symbolizer.cpp b/src/symbolizer.cpp
index 5144d139a..3025df455 100644
--- a/src/symbolizer.cpp
+++ b/src/symbolizer.cpp
@@ -21,13 +21,14 @@
  *****************************************************************************/
 
 //mapnik
+#include <mapnik/feature.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/map.hpp>
 #include <mapnik/transform_processor.hpp>
 
 namespace mapnik {
 
-void evaluate_transform(agg::trans_affine& tr, Feature const& feature,
+void evaluate_transform(agg::trans_affine& tr, feature_impl const& feature,
                         transform_list_ptr const& trans_expr)
 {
     if (trans_expr)
diff --git a/src/text_properties.cpp b/src/text_properties.cpp
index f551a34ae..a695e17d8 100644
--- a/src/text_properties.cpp
+++ b/src/text_properties.cpp
@@ -63,7 +63,7 @@ text_symbolizer_properties::text_symbolizer_properties() :
 
 }
 
-void text_symbolizer_properties::process(processed_text &output, Feature const& feature) const
+void text_symbolizer_properties::process(processed_text &output, feature_impl const& feature) const
 {
     output.clear();
     if (tree_) {