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

fix variable shadowing in extract_bounding_box_grammar

Browse source
This commit is contained in:
Dane Springmeyer 2015-09-30 15:42:42 -07:00
parent aa2c28b89c
commit d70725b218
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/json/extract_bounding_box_grammar.hpp
View file

@ -45,8 +45,8 @@
namespace mapnik { namespace json { namespace mapnik { namespace json {
using position = mapnik::geometry::point<double>; using position_type = mapnik::geometry::point<double>;
using boxes = std::vector<std::pair<box2d<double>, std::pair<std::size_t, std::size_t>>>; using boxes_type = std::vector<std::pair<box2d<double>, std::pair<std::size_t, std::size_t>>>;
namespace qi = boost::spirit::qi; namespace qi = boost::spirit::qi;
@ -84,15 +84,15 @@ struct push_box_impl
template <typename Iterator, typename ErrorHandler = error_handler<Iterator> > template <typename Iterator, typename ErrorHandler = error_handler<Iterator> >
struct extract_bounding_box_grammar : struct extract_bounding_box_grammar :
qi::grammar<Iterator, void(boxes&), space_type> qi::grammar<Iterator, void(boxes_type&), space_type>
{ {
extract_bounding_box_grammar(); extract_bounding_box_grammar();
// rules // rules
qi::rule<Iterator, void(boxes&), space_type> start; qi::rule<Iterator, void(boxes_type&), space_type> start;
qi::rule<Iterator, qi::locals<Iterator>, void(boxes&), space_type> features; qi::rule<Iterator, qi::locals<Iterator>, void(boxes_type&), space_type> features;
qi::rule<Iterator, qi::locals<int, box2d<double>>, void(boxes&, Iterator const&), space_type> feature; qi::rule<Iterator, qi::locals<int, box2d<double>>, void(boxes_type&, Iterator const&), space_type> feature;
qi::rule<Iterator, qi::locals<box2d<double>>, box2d<double>(), space_type> coords; qi::rule<Iterator, qi::locals<box2d<double>>, box2d<double>(), space_type> coords;
qi::rule<Iterator, boost::optional<position>(), space_type> pos; qi::rule<Iterator, boost::optional<position_type>(), space_type> pos;
qi::rule<Iterator, void(box2d<double>&), space_type> ring; qi::rule<Iterator, void(box2d<double>&), space_type> ring;
qi::rule<Iterator, void(box2d<double>&), space_type> rings; qi::rule<Iterator, void(box2d<double>&), space_type> rings;
qi::rule<Iterator, void(box2d<double>&), space_type> rings_array; qi::rule<Iterator, void(box2d<double>&), space_type> rings_array;

2
plugins/input/geojson/geojson_datasource.cpp
View file

@ -198,7 +198,7 @@ const mapnik::json::extract_bounding_box_grammar<base_iterator_type> geojson_dat
template <typename Iterator> template <typename Iterator>
void geojson_datasource::initialise_index(Iterator start, Iterator end) void geojson_datasource::initialise_index(Iterator start, Iterator end)
{ {
mapnik::json::boxes boxes; mapnik::json::boxes_type boxes;
boost::spirit::standard::space_type space; boost::spirit::standard::space_type space;
Iterator itr = start; Iterator itr = start;
if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_bbox_grammar)(boost::phoenix::ref(boxes)) , space)) if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_bbox_grammar)(boost::phoenix::ref(boxes)) , space))