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

remove boost::lexical_cast

Browse source
This commit is contained in:
Dane Springmeyer 2014-07-23 10:54:02 -07:00
parent bf8572fac6
commit 9959006e61
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/mapnik/attribute_collector.hpp
View file

@ -28,9 +28,7 @@
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
#include <mapnik/attribute.hpp> #include <mapnik/attribute.hpp>
#include <mapnik/symbolizer.hpp> #include <mapnik/symbolizer.hpp>
#include <mapnik/rule.hpp> // for rule::symbolizers
#include <mapnik/expression.hpp> // for expression_ptr, etc #include <mapnik/expression.hpp> // for expression_ptr, etc
#include <mapnik/expression_node_types.hpp>
#include <mapnik/expression_node.hpp> #include <mapnik/expression_node.hpp>
#include <mapnik/parse_path.hpp> // for path_processor_type #include <mapnik/parse_path.hpp> // for path_processor_type
#include <mapnik/path_expression.hpp> // for path_expression_ptr #include <mapnik/path_expression.hpp> // for path_expression_ptr
@ -38,12 +36,12 @@
#include <mapnik/image_scaling.hpp> #include <mapnik/image_scaling.hpp>
#include <mapnik/group/group_symbolizer_properties.hpp> #include <mapnik/group/group_symbolizer_properties.hpp>
#include <mapnik/group/group_rule.hpp> #include <mapnik/group/group_rule.hpp>
#include <mapnik/util/conversions.hpp>
// boost // boost
#include <boost/variant/static_visitor.hpp> #include <boost/variant/static_visitor.hpp>
#include <boost/variant/apply_visitor.hpp> #include <boost/variant/apply_visitor.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string/replace.hpp>
#include <boost/lexical_cast.hpp>
// stl // stl
#include <set> #include <set>
@ -286,9 +284,13 @@ inline void group_attribute_collector::operator() (group_symbolizer const& sym)
// Indexed column name. add column name for each index value. // Indexed column name. add column name for each index value.
for (int col_idx = start; col_idx < end; ++col_idx) for (int col_idx = start; col_idx < end; ++col_idx)
{ {
std::string col_idx_name = col_name; std::string col_idx_str;
boost::replace_all(col_idx_name, "%", boost::lexical_cast<std::string>(col_idx)); if (mapnik::util::to_string(col_idx_str,col_idx))
names_.insert(col_idx_name); {
std::string col_idx_name = col_name;
boost::replace_all(col_idx_name, "%", col_idx_str);
names_.insert(col_idx_name);
}
} }
} }
} }