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

Merge branch 'master' into vertex_adapter

Browse source
This commit is contained in:
artemp 2015-02-09 10:05:02 +01:00
commit 2ece72658a
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/symbolizer_keys.cpp
View file

@ -24,12 +24,8 @@
#include <mapnik/color.hpp>
#include <mapnik/simplify.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string/replace.hpp> // for replace
#pragma GCC diagnostic pop
// stl
#include <algorithm>
namespace mapnik {
@ -170,7 +166,7 @@ property_meta_type const& get_meta(mapnik::keys key)
mapnik::keys get_key(std::string const& name)
{
std::string name_copy(name);
boost::algorithm::replace_all(name_copy,"_","-");
std::replace(name_copy.begin(), name_copy.end(), '_', '-');
for (unsigned i=0; i< const_max_key ; ++i)
{
property_meta_type const& item = key_meta[i];