sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "feature_kv_iterator - change logic in 'increment' to skip key/value's when value doesn't exist"

Browse source 
This reverts commit 3397b8f14f.
This commit is contained in:
artemp 2016-07-15 12:21:41 +01:00
parent 8ce58ea29c
commit 54d51e2728
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/feature_kv_iterator.hpp
View file

@ -46,7 +46,7 @@ class feature_impl;
class MAPNIK_DECL feature_kv_iterator : class MAPNIK_DECL feature_kv_iterator :
public boost::iterator_facade<feature_kv_iterator, public boost::iterator_facade<feature_kv_iterator,
std::tuple<std::string, value> const, std::tuple<std::string , value> const,
boost::forward_traversal_tag> boost::forward_traversal_tag>
{ {
public: public:

8
src/feature_kv_iterator.cpp
View file

@ -39,20 +39,16 @@ feature_kv_iterator::feature_kv_iterator (feature_impl const& f, bool begin)
void feature_kv_iterator::increment() void feature_kv_iterator::increment()
{ {
++itr_; ++itr_;
for ( ;itr_ != f_.ctx_->end(); ++itr_)
{
if (f_.has_key(itr_->first)) break;
}
} }
void feature_kv_iterator::decrement() void feature_kv_iterator::decrement()
{ {
// no-op //--itr_; // dummy //--itr_;
} }
void feature_kv_iterator::advance(boost::iterator_difference<feature_kv_iterator>::type ) void feature_kv_iterator::advance(boost::iterator_difference<feature_kv_iterator>::type )
{ {
// no-op // dummy
} }
bool feature_kv_iterator::equal( feature_kv_iterator const& other) const bool feature_kv_iterator::equal( feature_kv_iterator const& other) const