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

replace remaining boost::unordered_map

Browse source
This commit is contained in:
artemp 2015-06-18 11:08:35 +02:00
parent 93937ca443
commit 98d87f4c88
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/palette.hpp
View file

@ -33,11 +33,11 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#ifdef USE_DENSE_HASH_MAP #ifdef USE_DENSE_HASH_MAP
#include <mapnik/sparsehash/dense_hash_map> #include <mapnik/sparsehash/dense_hash_map>
using rgba_hash_table = google::dense_hash_map<unsigned int, unsigned char>; using rgba_hash_table = google::dense_hash_map<unsigned int, unsigned char>;
#else #else
#include <boost/unordered_map.hpp> #include <unordered_map>
using rgba_hash_table = boost::unordered_map<unsigned int, unsigned char>; using rgba_hash_table = std::unordered_map<unsigned int, unsigned char>;
#endif #endif
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

4
src/datasource_cache_static.cpp
View file

@ -28,12 +28,12 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
// boost // boost
#include <boost/unordered_map.hpp>
#include <boost/assign/list_of.hpp> #include <boost/assign/list_of.hpp>
#endif #endif
// stl // stl
#include <stdexcept> #include <stdexcept>
#include <unordered_map>
// static plugin linkage // static plugin linkage
#ifdef MAPNIK_STATIC_PLUGINS #ifdef MAPNIK_STATIC_PLUGINS
@ -88,7 +88,7 @@ datasource_ptr ds_generator(parameters const& params)
} }
typedef datasource_ptr (*ds_generator_ptr)(parameters const& params); typedef datasource_ptr (*ds_generator_ptr)(parameters const& params);
using datasource_map = boost::unordered_map<std::string, ds_generator_ptr>; using datasource_map = std::unordered_map<std::string, ds_generator_ptr>;
static datasource_map ds_map = boost::assign::map_list_of static datasource_map ds_map = boost::assign::map_list_of
#if defined(MAPNIK_STATIC_PLUGIN_CSV) #if defined(MAPNIK_STATIC_PLUGIN_CSV)