Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 37daca644aebc6118077e6262d92d3baa1383b11 2 parents 8665291 + 20718b0
Dane Springmeyer springmeyer authored

Showing 2 changed files with 2 additions and 7 deletions. Show diff stats Hide diff stats

  1. +0 1  src/cairo_renderer.cpp
  2. +2 6 src/expression.cpp
1  src/cairo_renderer.cpp
@@ -36,7 +36,6 @@
36 36 #include <mapnik/parse_path.hpp>
37 37 #include <mapnik/marker.hpp>
38 38 #include <mapnik/marker_cache.hpp>
39   -#include <mapnik/unicode.hpp>
40 39 #include <mapnik/font_set.hpp>
41 40 #include <mapnik/parse_path.hpp>
42 41 #include <mapnik/map.hpp>
8 src/expression.cpp
@@ -24,12 +24,11 @@
24 24 #include <mapnik/expression.hpp>
25 25 #include <mapnik/config_error.hpp>
26 26 #include <mapnik/unicode.hpp>
27   -#include <mapnik/expression_node.hpp>
  27 +#include <mapnik/expression_node_types.hpp>
28 28 #include <mapnik/expression_grammar.hpp>
29 29 #include <boost/spirit/include/qi.hpp>
30 30
31 31 // boost
32   -#include <boost/algorithm/string.hpp>
33 32 #include <boost/make_shared.hpp>
34 33
35 34 namespace mapnik
@@ -39,7 +38,6 @@ expression_ptr parse_expression(std::string const& str, std::string const& encod
39 38 {
40 39 transcoder tr(encoding);
41 40 expression_grammar<std::string::const_iterator> g(tr);
42   -
43 41 return parse_expression(str, g);
44 42 }
45 43
@@ -47,12 +45,10 @@ expression_ptr parse_expression(std::string const& str,
47 45 mapnik::expression_grammar<std::string::const_iterator> const& g)
48 46 {
49 47 expr_node node;
50   -
51 48 std::string::const_iterator itr = str.begin();
52 49 std::string::const_iterator end = str.end();
53   -
54 50 bool r = boost::spirit::qi::phrase_parse(itr, end, g, boost::spirit::standard_wide::space, node);
55   - if (r && itr==end)
  51 + if (r && itr == end)
56 52 {
57 53 return boost::make_shared<expr_node>(node);
58 54 }

0 comments on commit 37daca6

Please sign in to comment.
Something went wrong with that request. Please try again.