From 54d51e2728f777c2b8787f95b54a56ca3a93adf2 Mon Sep 17 00:00:00 2001 From: artemp Date: Fri, 15 Jul 2016 12:21:41 +0100 Subject: [PATCH] Revert "feature_kv_iterator - change logic in 'increment' to skip key/value's when value doesn't exist" This reverts commit 3397b8f14fa649f8907bd7b2974f1b5792cf99ef. --- include/mapnik/feature_kv_iterator.hpp | 2 +- src/feature_kv_iterator.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp index 3abe37131..77b292fd5 100644 --- a/include/mapnik/feature_kv_iterator.hpp +++ b/include/mapnik/feature_kv_iterator.hpp @@ -46,7 +46,7 @@ class feature_impl; class MAPNIK_DECL feature_kv_iterator : public boost::iterator_facade const, + std::tuple const, boost::forward_traversal_tag> { public: diff --git a/src/feature_kv_iterator.cpp b/src/feature_kv_iterator.cpp index 241908ab6..4ae384254 100644 --- a/src/feature_kv_iterator.cpp +++ b/src/feature_kv_iterator.cpp @@ -39,20 +39,16 @@ feature_kv_iterator::feature_kv_iterator (feature_impl const& f, bool begin) void feature_kv_iterator::increment() { ++itr_; - for ( ;itr_ != f_.ctx_->end(); ++itr_) - { - if (f_.has_key(itr_->first)) break; - } } void feature_kv_iterator::decrement() { - // no-op //--itr_; + // dummy //--itr_; } void feature_kv_iterator::advance(boost::iterator_difference::type ) { - // no-op + // dummy } bool feature_kv_iterator::equal( feature_kv_iterator const& other) const