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

fix -Wsign-compare warnings in several grammars

Browse source
This commit is contained in:
Dane Springmeyer 2014-07-25 15:49:50 -07:00
parent d598a2bb55
commit bbc57f442c
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/json/geometry_generator_grammar_impl.hpp
View file

@ -74,7 +74,7 @@ geometry_generator_grammar<OutputIterator>::geometry_generator_grammar()
; ;
polygon_coord %= ( &uint_(mapnik::SEG_MOVETO) << eps[_r1 += 1] polygon_coord %= ( &uint_(mapnik::SEG_MOVETO) << eps[_r1 += 1]
<< kstring[ if_ (_r1 > 1) [_1 = "],["] << kstring[ if_ (_r1 > 1u) [_1 = "],["]
.else_[_1 = '[' ]] .else_[_1 = '[' ]]
| |
&uint_(mapnik::SEG_LINETO) &uint_(mapnik::SEG_LINETO)
@ -123,9 +123,9 @@ multi_geometry_generator_grammar<OutputIterator>::multi_geometry_generator_gramm
geometry = ( &bool_(true)[_1 = not_empty_(_val)] << lit("{\"type\":") geometry = ( &bool_(true)[_1 = not_empty_(_val)] << lit("{\"type\":")
<< geometry_types[_1 = boost::phoenix::at_c<0>(_a)][_a = multi_type_(_val)] << geometry_types[_1 = boost::phoenix::at_c<0>(_a)][_a = multi_type_(_val)]
<< lit(",\"coordinates\":") << 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 << 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") << lit('}')) | lit("null")
; ;

2
include/mapnik/svg/geometry_svg_generator_impl.hpp
View file

@ -62,7 +62,7 @@ namespace mapnik { namespace svg {
; ;
svg_path %= ((&uint_(mapnik::SEG_MOVETO) << lit('M') 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(' ') << lit(' ') << coordinate << lit(' ') << coordinate) % lit(' ')
; ;

2
include/mapnik/wkt/wkt_generator_grammar_impl.hpp
View file

@ -92,7 +92,7 @@ wkt_generator<OutputIterator, Geometry>::wkt_generator(bool single)
polygon_coord %= ( &uint_(mapnik::SEG_MOVETO) polygon_coord %= ( &uint_(mapnik::SEG_MOVETO)
<< eps[_r1 += 1][_a = _x(_val)][ _b = _y(_val)] << eps[_r1 += 1][_a = _x(_val)][ _b = _y(_val)]
<< kstring[ if_ (_r1 > 1) [_1 = "),("] << kstring[ if_ (_r1 > 1u) [_1 = "),("]
.else_[_1 = "("]] .else_[_1 = "("]]
| |
&uint_(mapnik::SEG_LINETO) &uint_(mapnik::SEG_LINETO)