From febf7123438c985ed4260aaf6aa8f4158120e84f Mon Sep 17 00:00:00 2001 From: artemp Date: Tue, 29 Oct 2013 14:17:45 +0000 Subject: [PATCH] Revert "+ std::unordered_map to store properties" This reverts commit d909c6deded74fd7c427f7848f061be03601519b. --- include/mapnik/feature.hpp | 4 ++-- include/mapnik/feature_kv_iterator.hpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp index 2954e06b2..bf2c547ab 100644 --- a/include/mapnik/feature.hpp +++ b/include/mapnik/feature.hpp @@ -38,7 +38,7 @@ // stl #include -#include +#include #include // for basic_ostream, operator<<, etc #include // for basic_stringstream #include // for out_of_range @@ -87,7 +87,7 @@ private: map_type mapping_; }; -typedef context > context_type; +typedef context > context_type; typedef std::shared_ptr context_ptr; static const value default_value; diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp index 4d5f0f721..8018274db 100644 --- a/include/mapnik/feature_kv_iterator.hpp +++ b/include/mapnik/feature_kv_iterator.hpp @@ -35,7 +35,8 @@ #include // stl -#include +#include + namespace mapnik { @@ -60,7 +61,7 @@ private: value_type const& dereference() const; feature_impl const& f_; - std::unordered_map::const_iterator itr_; + std::map::const_iterator itr_; mutable value_type kv_; }; @@ -78,3 +79,4 @@ typedef boost::filter_iterator feature_kv_i } #endif // MAPNIK_FEATURE_KV_ITERATOR_HPP +