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

remove unused/supported second arg to parse_expression

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-20 22:20:04 -07:00
parent f8b8eb1c52
commit 02b7537d6d
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
benchmark/test_expression_parse.cpp
View file

@ -13,7 +13,7 @@ public:
expr_("((([mapnik::geometry_type]=2) and ([oneway]=1)) and ([class]='path'))") {}
bool validate() const
{
mapnik::expression_ptr expr = mapnik::parse_expression(expr_,"utf-8");
mapnik::expression_ptr expr = mapnik::parse_expression(expr_);
std::string result = mapnik::to_expression_string(*expr);
bool ret = (result == expr_);
if (!ret)
@ -25,7 +25,7 @@ public:
void operator()() const
{
for (std::size_t i=0;i<iterations_;++i) {
mapnik::expression_ptr expr = mapnik::parse_expression(expr_,"utf-8");
mapnik::expression_ptr expr = mapnik::parse_expression(expr_);
}
}
};

2
bindings/python/mapnik_expression.cpp
View file

@ -46,7 +46,7 @@ using mapnik::path_expression_ptr;
// expression
expression_ptr parse_expression_(std::string const& wkt)
{
return parse_expression(wkt,"utf8");
return parse_expression(wkt);
}
std::string expression_to_string_(mapnik::expr_node const& expr)

2
include/mapnik/expression.hpp
View file

@ -41,7 +41,7 @@ namespace mapnik
using expression_ptr = std::shared_ptr<expr_node>;
using expression_set = std::set<expression_ptr>;
MAPNIK_DECL expression_ptr parse_expression (std::string const& wkt, std::string const& encoding = "UTF8");
MAPNIK_DECL expression_ptr parse_expression (std::string const& wkt);
}
#endif // MAPNIK_EXPRESSION_HPP

2
src/expression.cpp
View file

@ -33,7 +33,7 @@
namespace mapnik
{
expression_ptr parse_expression(std::string const& str, std::string const& encoding)
expression_ptr parse_expression(std::string const& str)
{
static const expression_grammar<std::string::const_iterator> g;
boost::spirit::standard_wide::space_type space;