From bbc57f442c83b2a9897b744e156597b29ade8256 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 25 Jul 2014 15:49:50 -0700 Subject: [PATCH] fix -Wsign-compare warnings in several grammars --- include/mapnik/json/geometry_generator_grammar_impl.hpp | 6 +++--- include/mapnik/svg/geometry_svg_generator_impl.hpp | 2 +- include/mapnik/wkt/wkt_generator_grammar_impl.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/mapnik/json/geometry_generator_grammar_impl.hpp b/include/mapnik/json/geometry_generator_grammar_impl.hpp index fbb01b636..61be1b910 100644 --- a/include/mapnik/json/geometry_generator_grammar_impl.hpp +++ b/include/mapnik/json/geometry_generator_grammar_impl.hpp @@ -74,7 +74,7 @@ geometry_generator_grammar::geometry_generator_grammar() ; polygon_coord %= ( &uint_(mapnik::SEG_MOVETO) << eps[_r1 += 1] - << kstring[ if_ (_r1 > 1) [_1 = "],["] + << kstring[ if_ (_r1 > 1u) [_1 = "],["] .else_[_1 = '[' ]] | &uint_(mapnik::SEG_LINETO) @@ -123,9 +123,9 @@ multi_geometry_generator_grammar::multi_geometry_generator_gramm geometry = ( &bool_(true)[_1 = not_empty_(_val)] << lit("{\"type\":") << geometry_types[_1 = boost::phoenix::at_c<0>(_a)][_a = multi_type_(_val)] << lit(",\"coordinates\":") - << kstring[ boost::phoenix::if_ (boost::phoenix::at_c<0>(_a) > 3) [_1 = '['].else_[_1 = ""]] + << kstring[ boost::phoenix::if_ (boost::phoenix::at_c<0>(_a) > 3u) [_1 = '['].else_[_1 = ""]] << coordinates - << kstring[ boost::phoenix::if_ (boost::phoenix::at_c<0>(_a) > 3) [_1 = ']'].else_[_1 = ""]] + << kstring[ boost::phoenix::if_ (boost::phoenix::at_c<0>(_a) > 3u) [_1 = ']'].else_[_1 = ""]] << lit('}')) | lit("null") ; diff --git a/include/mapnik/svg/geometry_svg_generator_impl.hpp b/include/mapnik/svg/geometry_svg_generator_impl.hpp index a448514c6..3f284ae1e 100644 --- a/include/mapnik/svg/geometry_svg_generator_impl.hpp +++ b/include/mapnik/svg/geometry_svg_generator_impl.hpp @@ -62,7 +62,7 @@ namespace mapnik { namespace svg { ; svg_path %= ((&uint_(mapnik::SEG_MOVETO) << lit('M') - | &uint_(mapnik::SEG_LINETO) [_a +=1] << kstring [if_(_a == 1) [_1 = "L" ].else_[_1 =""]]) + | &uint_(mapnik::SEG_LINETO) [_a +=1] << kstring [if_(_a == 1u) [_1 = "L" ].else_[_1 =""]]) << lit(' ') << coordinate << lit(' ') << coordinate) % lit(' ') ; diff --git a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp index fccdecb60..e4051a73b 100644 --- a/include/mapnik/wkt/wkt_generator_grammar_impl.hpp +++ b/include/mapnik/wkt/wkt_generator_grammar_impl.hpp @@ -92,7 +92,7 @@ wkt_generator::wkt_generator(bool single) polygon_coord %= ( &uint_(mapnik::SEG_MOVETO) << eps[_r1 += 1][_a = _x(_val)][ _b = _y(_val)] - << kstring[ if_ (_r1 > 1) [_1 = "),("] + << kstring[ if_ (_r1 > 1u) [_1 = "),("] .else_[_1 = "("]] | &uint_(mapnik::SEG_LINETO)