diff --git a/include/mapnik/json/feature_parser.hpp b/include/mapnik/json/feature_parser.hpp index e4cf569ed..3e5b2b32b 100644 --- a/include/mapnik/json/feature_parser.hpp +++ b/include/mapnik/json/feature_parser.hpp @@ -39,7 +39,7 @@ inline bool from_geojson(std::string const& json, mapnik::feature_impl & feature using iterator_type = char const*; static const mapnik::json::feature_grammar g(tr); using namespace boost::spirit; - ascii::space_type space; + standard::space_type space; iterator_type start = json.c_str(); iterator_type end = start + json.length(); return qi::phrase_parse(start, end, (g)(boost::phoenix::ref(feature)), space); diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp index c4fa67c28..16124adbc 100644 --- a/include/mapnik/json/generic_json.hpp +++ b/include/mapnik/json/generic_json.hpp @@ -37,9 +37,9 @@ namespace mapnik { namespace json { namespace qi = boost::spirit::qi; -namespace ascii = boost::spirit::ascii; +namespace standard = boost::spirit::standard; namespace phoenix = boost::phoenix; -using space_type = ascii::space_type; +using space_type = standard::space_type; using json_value = mapnik::util::variant; using uchar = std::uint32_t; // a unicode code point diff --git a/include/mapnik/json/geometry_parser.hpp b/include/mapnik/json/geometry_parser.hpp index f4aabe51c..941abb0c7 100644 --- a/include/mapnik/json/geometry_parser.hpp +++ b/include/mapnik/json/geometry_parser.hpp @@ -38,7 +38,7 @@ inline bool from_geojson(std::string const& json, mapnik::geometry::geometry g; - ascii::space_type space; + standard::space_type space; char const* start = json.c_str(); char const* end = start + json.length(); return qi::phrase_parse(start, end, g, space, geom); diff --git a/include/mapnik/json/topojson_grammar.hpp b/include/mapnik/json/topojson_grammar.hpp index 881dcb594..e3db0990d 100644 --- a/include/mapnik/json/topojson_grammar.hpp +++ b/include/mapnik/json/topojson_grammar.hpp @@ -44,7 +44,7 @@ namespace mapnik { namespace topojson { namespace qi = boost::spirit::qi; namespace fusion = boost::fusion; -using space_type = boost::spirit::ascii::space_type; +using space_type = mapnik::json::space_type; template > struct topojson_grammar : qi::grammar diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp index 1d3dfd876..c30d25803 100644 --- a/plugins/input/geojson/geojson_datasource.cpp +++ b/plugins/input/geojson/geojson_datasource.cpp @@ -192,7 +192,7 @@ template void geojson_datasource::initialise_index(Iterator start, Iterator end) { mapnik::json::boxes boxes; - boost::spirit::ascii::space_type space; + boost::spirit::standard::space_type space; Iterator itr = start; if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_bbox_grammar)(boost::phoenix::ref(boxes)) , space)) { @@ -214,7 +214,7 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end) Iterator end = itr + geometry_index.second; mapnik::context_ptr ctx = std::make_shared(); mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,1)); - boost::spirit::ascii::space_type space; + boost::spirit::standard::space_type space; if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space)) { throw std::runtime_error("Failed to parse geojson feature"); @@ -236,7 +236,7 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end) template void geojson_datasource::parse_geojson(Iterator start, Iterator end) { - boost::spirit::ascii::space_type space; + boost::spirit::standard::space_type space; mapnik::context_ptr ctx = std::make_shared(); std::size_t start_id = 1; @@ -355,7 +355,7 @@ boost::optional geojson_datasource::get_geometry_ chr_iterator_type end = start + json.size(); using namespace boost::spirit; - ascii::space_type space; + standard::space_type space; mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,1)); if (!qi::phrase_parse(start, end, (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space)) { diff --git a/plugins/input/geojson/large_geojson_featureset.cpp b/plugins/input/geojson/large_geojson_featureset.cpp index 795d61944..f3922b279 100644 --- a/plugins/input/geojson/large_geojson_featureset.cpp +++ b/plugins/input/geojson/large_geojson_featureset.cpp @@ -70,7 +70,7 @@ mapnik::feature_ptr large_geojson_featureset::next() static const mapnik::transcoder tr("utf8"); static const mapnik::json::feature_grammar grammar(tr); using namespace boost::spirit; - ascii::space_type space; + standard::space_type space; mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_,1)); if (!qi::phrase_parse(start, end, (grammar)(boost::phoenix::ref(*feature)), space)) { diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp index 6aceb32eb..321ac21dd 100644 --- a/plugins/input/topojson/topojson_datasource.cpp +++ b/plugins/input/topojson/topojson_datasource.cpp @@ -190,7 +190,7 @@ const mapnik::topojson::topojson_grammar g; template void topojson_datasource::parse_topojson(T const& buffer) { - boost::spirit::ascii::space_type space; + boost::spirit::standard::space_type space; bool result = boost::spirit::qi::phrase_parse(buffer.begin(), buffer.end(), g, space, topo_); if (!result) {