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

more const-ness

Browse source
This commit is contained in:
Artem Pavlenko 2019-11-27 16:16:09 +00:00
parent cfa5809cd2
commit 44198d1ac2
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/csv/csv_grammar_x3_def.hpp
View file

@ -82,9 +82,9 @@ auto static const separator = literal<separator_tag>{};
auto static const quote = literal<quote_tag>{}; auto static const quote = literal<quote_tag>{};
// rules // rules
x3::rule<class csv_column, csv_value> column("csv-column"); x3::rule<class csv_column, csv_value> const column("csv-column");
x3::rule<class csv_text, csv_value> text("csv-text"); x3::rule<class csv_text, csv_value> const text("csv-text");
x3::rule<class csc_quoted_text, csv_value> quoted_text("csv-quoted-text"); x3::rule<class csc_quoted_text, csv_value> const quoted_text("csv-quoted-text");
auto const line_def = -lit('\r') > -lit('\n') > lexeme[column] % separator auto const line_def = -lit('\r') > -lit('\n') > lexeme[column] % separator
; ;

2
include/mapnik/json/geojson_grammar_x3_def.hpp
View file

@ -91,7 +91,7 @@ struct geometry_type_ : x3::symbols<mapnik::geometry::geometry_types>
x3::rule<class json_object_tag, geojson_object> const object("JSON Object"); x3::rule<class json_object_tag, geojson_object> const object("JSON Object");
x3::rule<class json_array_tag, geojson_array> const array("JSON Array"); x3::rule<class json_array_tag, geojson_array> const array("JSON Array");
x3::rule<class json_number_tag, json::geojson_value> const number("JSON Number"); x3::rule<class json_number_tag, json::geojson_value> const number("JSON Number");
x3::rule<class key_value_tag, geojson_object_element> key_value("JSON key/value"); x3::rule<class key_value_tag, geojson_object_element> const key_value("JSON key/value");
// GeoJSON // GeoJSON
x3::rule<class geojson_coordinates_tag, geojson_object_element> const coordinates("GeoJSON Coordinates"); x3::rule<class geojson_coordinates_tag, geojson_object_element> const coordinates("GeoJSON Coordinates");
x3::rule<class geojson_geometry_type_tag, geojson_object_element> const geometry_type("GeoJSON Geometry Type"); x3::rule<class geojson_geometry_type_tag, geojson_object_element> const geometry_type("GeoJSON Geometry Type");

20
include/mapnik/transform/transform_expression_grammar_x3_def.hpp
View file

@ -128,16 +128,16 @@ auto const construct_rotate = [](auto const& ctx)
}; };
// rules // rules
x3::rule<class transform_list_class, mapnik::transform_list> transform_list_rule("transform list"); x3::rule<class transform_list_class, mapnik::transform_list> const transform_list_rule("transform list");
x3::rule<class transform_node_class, mapnik::transform_node> transform_node_rule("transform node"); x3::rule<class transform_node_class, mapnik::transform_node> const transform_node_rule("transform node");
x3::rule<class matrix_node_class, mapnik::matrix_node> matrix("matrix node"); x3::rule<class matrix_node_class, mapnik::matrix_node> const matrix("matrix node");
x3::rule<class translate_node_class, mapnik::translate_node> translate("translate node"); x3::rule<class translate_node_class, mapnik::translate_node> const translate("translate node");
x3::rule<class scale_node_class, mapnik::scale_node> scale("scale node"); x3::rule<class scale_node_class, mapnik::scale_node> const scale("scale node");
x3::rule<class rotate_node_class, mapnik::rotate_node> rotate("rotate node"); x3::rule<class rotate_node_class, mapnik::rotate_node> const rotate("rotate node");
x3::rule<class skewX_node_class, mapnik::skewX_node> skewX("skew X node"); x3::rule<class skewX_node_class, mapnik::skewX_node> const skewX("skew X node");
x3::rule<class skewY_node_class, mapnik::skewY_node> skewY("skew Y node"); x3::rule<class skewY_node_class, mapnik::skewY_node> const skewY("skew Y node");
x3::rule<class expr_tag, mapnik::expr_node> expr("Expression"); x3::rule<class expr_tag, mapnik::expr_node> const expr("Expression");
x3::rule<class sep_expr_tag, mapnik::expr_node> sep_expr("Separated Expression"); x3::rule<class sep_expr_tag, mapnik::expr_node> const sep_expr("Separated Expression");
// start // start
auto const transform_def = transform_list_rule; auto const transform_def = transform_list_rule;