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

rename 'geometry_type' to 'topojson_geometry_type' to avoid names clashing

Browse source 
(this was causing miscompilation on linux (ubuntu 17.04/clang))
This commit is contained in:
Artem Pavlenko 2017-09-18 11:35:39 +01:00
parent 13d678d9af
commit 5d5ef602be
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/json/topojson_grammar_x3_def.hpp
View file

@ -288,9 +288,9 @@ using arcs_type = util::variant<std::vector<index_type>,
std::vector<std::vector<index_type>>, std::vector<std::vector<index_type>>,
std::vector<std::vector<std::vector<index_type>>>>; std::vector<std::vector<std::vector<index_type>>>>;
struct geometry_type_ : x3::symbols<int> struct topojson_geometry_type_ : x3::symbols<int>
{ {
geometry_type_() topojson_geometry_type_()
{ {
add add
("\"Point\"",1) ("\"Point\"",1)
@ -301,7 +301,7 @@ struct geometry_type_ : x3::symbols<int>
("\"MultiPolygon\"",6) ("\"MultiPolygon\"",6)
; ;
} }
} geometry_type; } topojson_geometry_type;
// start rule // start rule
topojson_grammar_type const topology = "Topology"; topojson_grammar_type const topology = "Topology";
@ -365,7 +365,7 @@ auto const objects_def = lit("\"objects\"") > lit(':')
; ;
auto const geometry_tuple_def = auto const geometry_tuple_def =
((lit("\"type\"") > lit(':') > geometry_type[assign_geometry_type]) ((lit("\"type\"") > lit(':') > topojson_geometry_type[assign_geometry_type])
| |
(lit("\"coordinates\"") > lit(':') > coordinates[assign_coordinates]) (lit("\"coordinates\"") > lit(':') > coordinates[assign_coordinates])
| |