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

fix more gcc warnings

Browse source
This commit is contained in:
artemp 2016-12-02 11:42:57 +01:00
parent 069de8e266
commit 6824f4c477
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mapnik/expression_grammar_x3_def.hpp
View file

@ -316,7 +316,7 @@ namespace mapnik { namespace grammar {
auto const not_expression_def = conditional_expression[do_assign] auto const not_expression_def = conditional_expression[do_assign]
| |
(lit("not") | lit('!')) > conditional_expression[do_not] ((lit("not") | lit('!')) > conditional_expression[do_not])
; ;
auto const conditional_expression_def = equality_expression[do_assign] auto const conditional_expression_def = equality_expression[do_assign]
@ -350,11 +350,11 @@ namespace mapnik { namespace grammar {
auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')'; auto const regex_match_expression_def = lit(".match") > '(' > quoted_string > ')';
auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')'; auto const regex_replace_expression_def = lit(".replace") > '(' > quoted_string > ',' > quoted_string > ')';
auto const multiplicative_expression_def = unary_expression [do_assign] auto const multiplicative_expression_def = unary_expression [do_assign]
> *( '*' > unary_expression [do_mult] > *( ('*' > unary_expression [do_mult])
| |
'/' > unary_expression [do_div] ('/' > unary_expression [do_div])
| |
'%' > unary_expression [do_mod] ('%' > unary_expression [do_mod])
| |
regex_match_expression[do_regex_match] regex_match_expression[do_regex_match]
| |
@ -367,9 +367,9 @@ namespace mapnik { namespace grammar {
auto const unary_expression_def = auto const unary_expression_def =
primary_expression[do_assign] primary_expression[do_assign]
| |
'+' > primary_expression[do_assign] ('+' > primary_expression[do_assign])
| |
'-' > primary_expression[do_negate] ('-' > primary_expression[do_negate])
; ;
auto const primary_expression_def = auto const primary_expression_def =

3
src/json/extract_bounding_boxes_x3.cpp
View file

@ -181,9 +181,8 @@ void extract_bounding_boxes(Iterator& start, Iterator const& end, Boxes & boxes)
using namespace boost::spirit; using namespace boost::spirit;
using space_type = mapnik::json::grammar::space_type; using space_type = mapnik::json::grammar::space_type;
using iterator_type = Iterator; using iterator_type = Iterator;
using boxes_type = Boxes;
extract_positions<iterator_type, boxes_type> callback(start, boxes); extract_positions<iterator_type, Boxes> callback(start, boxes);
auto keys = mapnik::json::get_keys(); auto keys = mapnik::json::get_keys();
std::size_t bracket_counter = 0; std::size_t bracket_counter = 0;
auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter)) auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))