Permalink
Browse files

Merge branch 'master' of github.com:mapnik/mapnik into stats_processor

  • Loading branch information...
2 parents 8665291 + 20718b0 commit 37daca644aebc6118077e6262d92d3baa1383b11 Dane Springmeyer committed Jan 25, 2013
Showing with 2 additions and 7 deletions.
  1. +0 −1 src/cairo_renderer.cpp
  2. +2 −6 src/expression.cpp
View
@@ -36,7 +36,6 @@
#include <mapnik/parse_path.hpp>
#include <mapnik/marker.hpp>
#include <mapnik/marker_cache.hpp>
-#include <mapnik/unicode.hpp>
#include <mapnik/font_set.hpp>
#include <mapnik/parse_path.hpp>
#include <mapnik/map.hpp>
View
@@ -24,12 +24,11 @@
#include <mapnik/expression.hpp>
#include <mapnik/config_error.hpp>
#include <mapnik/unicode.hpp>
-#include <mapnik/expression_node.hpp>
+#include <mapnik/expression_node_types.hpp>
#include <mapnik/expression_grammar.hpp>
#include <boost/spirit/include/qi.hpp>
// boost
-#include <boost/algorithm/string.hpp>
#include <boost/make_shared.hpp>
namespace mapnik
@@ -39,20 +38,17 @@ expression_ptr parse_expression(std::string const& str, std::string const& encod
{
transcoder tr(encoding);
expression_grammar<std::string::const_iterator> g(tr);
-
return parse_expression(str, g);
}
expression_ptr parse_expression(std::string const& str,
mapnik::expression_grammar<std::string::const_iterator> const& g)
{
expr_node node;
-
std::string::const_iterator itr = str.begin();
std::string::const_iterator end = str.end();
-
bool r = boost::spirit::qi::phrase_parse(itr, end, g, boost::spirit::standard_wide::space, node);
- if (r && itr==end)
+ if (r && itr == end)
{
return boost::make_shared<expr_node>(node);
}

0 comments on commit 37daca6

Please sign in to comment.