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

Revert "+ std::unordered_map to store properties"

Browse source 
This reverts commit d909c6dede.
This commit is contained in:
artemp 2013-10-29 14:17:45 +00:00
parent 3837c68762
commit febf712343
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/feature.hpp
View file

@ -38,7 +38,7 @@
// stl
#include <vector>
#include <unordered_map>
#include <map>
#include <ostream> // for basic_ostream, operator<<, etc
#include <sstream> // for basic_stringstream
#include <stdexcept> // for out_of_range
@ -87,7 +87,7 @@ private:
map_type mapping_;
};
typedef context<std::unordered_map<std::string,std::size_t> > context_type;
typedef context<std::map<std::string,std::size_t> > context_type;
typedef std::shared_ptr<context_type> context_ptr;
static const value default_value;

6
include/mapnik/feature_kv_iterator.hpp
View file

@ -35,7 +35,8 @@
#include <boost/iterator/filter_iterator.hpp>
// stl
#include <unordered_map>
#include <map>
namespace mapnik {
@ -60,7 +61,7 @@ private:
value_type const& dereference() const;
feature_impl const& f_;
std::unordered_map<std::string,std::size_t>::const_iterator itr_;
std::map<std::string,std::size_t>::const_iterator itr_;
mutable value_type kv_;
};
@ -78,3 +79,4 @@ typedef boost::filter_iterator<value_not_null, feature_kv_iterator> feature_kv_i
}
#endif // MAPNIK_FEATURE_KV_ITERATOR_HPP