fixes for compiling against Mapnik 2.0.0

mapnik · Jan 7, 2013 · b2a552e · b2a552e
1 parent 6a63a5c
commit b2a552e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/src/ds_emitter.hpp b/src/ds_emitter.hpp
@@ -10,7 +10,6 @@
 #include <mapnik/attribute_descriptor.hpp>  // for attribute_descriptor, etc
 #include <mapnik/datasource.hpp>        // for datasource, etc
 #include <mapnik/feature.hpp>           // for feature_impl::iterator, etc
-#include <mapnik/feature_kv_iterator.hpp>  // for feature_kv_iterator
 #include <mapnik/feature_layer_desc.hpp>  // for layer_descriptor
 #include <mapnik/query.hpp>             // for query
 #include <mapnik/value.hpp>             // for value_base, value

diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp
@@ -5,7 +5,6 @@
 // mapnik
 #include <mapnik/unicode.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/feature_kv_iterator.hpp>
 
 // boost
 #include <boost/scoped_ptr.hpp>

diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp
@@ -15,7 +15,9 @@
 // mapnik
 #include <mapnik/agg_renderer.hpp>      // for agg_renderer
 #include <mapnik/box2d.hpp>             // for box2d
+#if MAPNIK_VERSION >= 200100
 #include <mapnik/building_symbolizer.hpp>  // for building_symbolizer
+#endif
 #include <mapnik/color.hpp>             // for color
 #include <mapnik/datasource.hpp>        // for featureset_ptr
 #include <mapnik/feature_type_style.hpp>  // for rules, feature_type_style

diff --git a/src/mapnik_memory_datasource.cpp b/src/mapnik_memory_datasource.cpp
@@ -3,7 +3,6 @@
 #include <mapnik/version.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/feature_kv_iterator.hpp>
 #include <mapnik/memory_datasource.hpp>
 
 #include "mapnik_memory_datasource.hpp"