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

update const-ness in x3::context definitions to support boost 1_67 [skip-ci]

Browse source
This commit is contained in:
Artem Pavlenko 2018-04-17 15:24:55 +02:00
parent def0fd1f31
commit 9e79e1edf1
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/expression_grammar_x3_config.hpp
View file

@ -35,7 +35,7 @@ using phrase_context_type = x3::phrase_parse_context<x3::ascii::space_type>::typ
// define combined context
using context_type = x3::context<transcoder_tag,
std::reference_wrapper<mapnik::transcoder const> const,
std::reference_wrapper<mapnik::transcoder const>,
phrase_context_type>;
}}

25
include/mapnik/json/extract_bounding_boxes_x3_config.hpp
View file

@ -84,30 +84,27 @@ using space_type = x3::standard::space_type;
using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
using context_type = x3::context<keys_tag, std::reference_wrapper<keys_map> const,
phrase_parse_context_type>;
using extract_bounding_boxes_context_type =
x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type> const,
context_type>>;
x3::context<bracket_tag, std::reference_wrapper<std::size_t>,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type>,
context_type>>;
using extract_bounding_boxes_reverse_context_type =
x3::context<keys_tag, std::reference_wrapper<keys_map> const,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type> const,
x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
x3::context<keys_tag, std::reference_wrapper<keys_map>,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type>,
x3::context<bracket_tag, std::reference_wrapper<std::size_t>,
phrase_parse_context_type>>>;
using extract_bounding_boxes_context_type_f =
x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
x3::context<bracket_tag, std::reference_wrapper<std::size_t>,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type_f>,
context_type>>;
using extract_bounding_boxes_reverse_context_type_f =
x3::context<keys_tag, std::reference_wrapper<keys_map> const,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type_f> const,
x3::context<bracket_tag, std::reference_wrapper<std::size_t> const,
x3::context<keys_tag, std::reference_wrapper<keys_map>,
x3::context<feature_callback_tag, std::reference_wrapper<callback_type_f>,
x3::context<bracket_tag, std::reference_wrapper<std::size_t>,
phrase_parse_context_type>>>;
}}}

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

@ -92,20 +92,20 @@ using iterator_type = char const*;
using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
using context_type = x3::context<keys_tag,
std::reference_wrapper<keys_map> const,
std::reference_wrapper<keys_map>,
phrase_parse_context_type>;
using feature_context_type = x3::context<transcoder_tag,
std::reference_wrapper<mapnik::transcoder> const,
std::reference_wrapper<mapnik::transcoder>,
x3::context<feature_tag,
std::reference_wrapper<mapnik::feature_impl> const,
std::reference_wrapper<mapnik::feature_impl>,
phrase_parse_context_type>>;
// our spirit x3 grammars needs this one with changed order of feature_impl and transcoder (??)
using feature_context_const_type = x3::context<feature_tag,
std::reference_wrapper<mapnik::feature_impl> const,
std::reference_wrapper<mapnik::feature_impl>,
x3::context<transcoder_tag,
std::reference_wrapper<mapnik::transcoder const> const,
std::reference_wrapper<mapnik::transcoder const>,
phrase_parse_context_type>>;
// helper macro

4
include/mapnik/svg/svg_grammar_config_x3.hpp
View file

@ -40,8 +40,8 @@ using space_type = x3::standard::space_type;
using iterator_type = char const*;
using phrase_parse_context_type = x3::phrase_parse_context<space_type>::type;
using svg_parse_context_type = x3::context<relative_tag, std::reference_wrapper<bool> const,
x3::context<svg_path_tag,std::reference_wrapper<svg_converter_type> const,
using svg_parse_context_type = x3::context<relative_tag, std::reference_wrapper<bool>,
x3::context<svg_path_tag,std::reference_wrapper<svg_converter_type>,
phrase_parse_context_type>>;
inline double deg2rad(double deg) {return (M_PI * deg) / 180.0;}

5
src/css_color_grammar_x3.cpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/
#include <mapnik/css_color_grammar_x3_def.hpp>
#include <mapnik/image_filter_types.hpp>
namespace mapnik { namespace css_color_grammar {
namespace x3 = boost::spirit::x3;
@ -30,4 +30,7 @@ using context_type = x3::phrase_parse_context<x3::ascii::space_type>::type;
BOOST_SPIRIT_INSTANTIATE(css_color_grammar_type, iterator_type, context_type);
template bool parse_rule<iterator_type, context_type, mapnik::filter::color_to_alpha>
(css_color_grammar_type, iterator_type&, iterator_type const&, context_type const&, mapnik::filter::color_to_alpha&);
}}