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

Use char const* as iterator type for CSS grammar

Browse source
This commit is contained in:
Artem Pavlenko 2020-02-04 11:40:52 +00:00
parent 8a90551b63
commit 4d54e81889
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/css/css_color_grammar_x3.cpp
View file

@ -29,11 +29,13 @@ namespace mapnik { namespace css_color_grammar {
namespace x3 = boost::spirit::x3;
using iterator_type = std::string::const_iterator;
using iterator_css_type = char const*;
using context_type = x3::phrase_parse_context<x3::ascii::space_type>::type;
using context_skipper_type = x3::phrase_parse_context<css_grammar::css_skipper_type>::type;
using context_css_type = x3::phrase_parse_context<css_grammar::css_skipper_type>::type;
BOOST_SPIRIT_INSTANTIATE(css_color_grammar_type, iterator_type, context_type);
BOOST_SPIRIT_INSTANTIATE(css_color_grammar_type, iterator_type, context_skipper_type);
BOOST_SPIRIT_INSTANTIATE(css_color_grammar_type, iterator_css_type, context_css_type);
#if BOOST_VERSION < 107000
template bool parse_rule<iterator_type, context_type, mapnik::filter::color_to_alpha>

3
src/css/css_grammar_x3.cpp
View file

@ -26,7 +26,7 @@
namespace mapnik { namespace css_grammar {
namespace x3 = boost::spirit::x3;
using iterator_type = std::string::const_iterator;
using iterator_type = char const*;
using context_type = x3::phrase_parse_context<css_skipper_type>::type;
BOOST_SPIRIT_INSTANTIATE(ident_grammar_type, iterator_type, context_type);
@ -35,7 +35,6 @@ BOOST_SPIRIT_INSTANTIATE(css_grammar_type, iterator_type, context_type);
BOOST_SPIRIT_INSTANTIATE(css_skipper_type, iterator_type, x3::unused_type);
}
css_grammar::ident_grammar_type const ident_grammar()
{
return css_grammar::ident;