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

Fix for boost < 1.70.0 (ref #4143)

Browse source
This commit is contained in:
Artem Pavlenko 2020-05-12 12:14:18 +01:00
parent a14d27f090
commit cc78a5de78
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mapnik/json/feature_generator_grammar.hpp
View file

@ -91,15 +91,23 @@ BOOST_FUSION_ADAPT_ADT(
(mapnik::kv_store const, mapnik::kv_store const, mapnik::kv_store(obj), /**/)) (mapnik::kv_store const, mapnik::kv_store const, mapnik::kv_store(obj), /**/))
namespace mapnik { namespace json { namespace mapnik { namespace json {
namespace detail {
template <typename T>
#if BOOST_VERSION >= 107000
struct attribute_type { using type = T();};
#else
struct attribute_type { using type = T const&();};
#endif
}
namespace karma = boost::spirit::karma; namespace karma = boost::spirit::karma;
template <typename OutputIterator, typename FeatureType> template <typename OutputIterator, typename FeatureType>
struct feature_generator_grammar : struct feature_generator_grammar :
karma::grammar<OutputIterator, FeatureType const&()> karma::grammar<OutputIterator, typename detail::attribute_type<FeatureType>::type>
{ {
feature_generator_grammar(); feature_generator_grammar();
karma::rule<OutputIterator, FeatureType const&()> feature; karma::rule<OutputIterator, typename detail::attribute_type<FeatureType>::type> feature;
geometry_generator_grammar<OutputIterator, mapnik::geometry::geometry<double>> geometry; geometry_generator_grammar<OutputIterator, mapnik::geometry::geometry<double>> geometry;
properties_generator_grammar<OutputIterator, mapnik::kv_store> properties; properties_generator_grammar<OutputIterator, mapnik::kv_store> properties;
}; };