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

add missing context type definitions + BOOST_SPIRIT_INSTANTIATE_UNUSED macro to instantiate parse_rule with boost::spirit::x3::unused_type attribute

Browse source
This commit is contained in:
artemp 2016-11-25 16:46:10 +01:00
parent 163a82fd1e
commit be4f9ca79b
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/mapnik/json/json_grammar_config.hpp
View file

@ -60,9 +60,6 @@ constexpr char const* wkn_to_string(well_known_names val)
} }
} }
struct keys_tag;
struct transcoder_tag;
struct feature_tag;
using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>, using keys_map = boost::bimap<boost::bimaps::unordered_set_of<std::string>,
boost::bimaps::set_of<int>>; boost::bimaps::set_of<int>>;
@ -82,21 +79,42 @@ inline keys_map get_keys()
namespace grammar { namespace grammar {
struct keys_tag;
struct transcoder_tag;
struct feature_tag;
namespace x3 = boost::spirit::x3; namespace x3 = boost::spirit::x3;
using space_type = x3::standard::space_type; using space_type = x3::standard::space_type;
using iterator_type = char const*; using iterator_type = char const*;
using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
using context_type = x3::with_context<keys_tag, using context_type = x3::with_context<keys_tag,
std::reference_wrapper<keys_map> const, std::reference_wrapper<keys_map> const,
x3::phrase_parse_context<space_type>::type>::type; phrase_parse_context_type>::type;
using geometry_context_type = x3::with_context<feature_tag, using geometry_context_type = x3::with_context<feature_tag,
std::reference_wrapper<mapnik::feature_impl> const, std::reference_wrapper<mapnik::feature_impl> const,
x3::phrase_parse_context<space_type>::type>::type; phrase_parse_context_type>::type;
using feature_context_type = x3::with_context<transcoder_tag, using feature_context_type = x3::with_context<transcoder_tag,
std::reference_wrapper<mapnik::transcoder> const, std::reference_wrapper<mapnik::transcoder> const,
geometry_context_type>::type; geometry_context_type>::type;
// our spirit x3 grammars needs this one with changed order of feature_impl and transcoder (??)
using feature_context_const_type = x3::with_context<feature_tag,
std::reference_wrapper<mapnik::feature_impl> const,
x3::with_context<transcoder_tag,
std::reference_wrapper<mapnik::transcoder const> const,
phrase_parse_context_type>::type>::type;
// helper macro
#define BOOST_SPIRIT_INSTANTIATE_UNUSED(rule_type, Iterator, Context) \
template bool parse_rule<Iterator, Context, boost::spirit::x3::unused_type const>( \
rule_type rule_ \
, Iterator& first, Iterator const& last \
, Context const& context, boost::spirit::x3::unused_type const& ); \
/***/
}}} }}}
#endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP #endif // MAPNIK_JSON_GRAMMAR_CONFIG_HPP