diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp index 70dc2411d..2d9437c62 100644 --- a/include/mapnik/expression_grammar_x3_def.hpp +++ b/include/mapnik/expression_grammar_x3_def.hpp @@ -73,11 +73,7 @@ namespace mapnik { namespace grammar { template inline mapnik::transcoder const& extract_transcoder(Context const& ctx) { -#if BOOST_VERSION >= 106700 return x3::get(ctx); -#else - return x3::get(ctx).get(); -#endif } auto append = [](auto const& ctx) diff --git a/include/mapnik/svg/svg_path_grammar_x3_def.hpp b/include/mapnik/svg/svg_path_grammar_x3_def.hpp index 250f7e1b0..50503fcfc 100644 --- a/include/mapnik/svg/svg_path_grammar_x3_def.hpp +++ b/include/mapnik/svg/svg_path_grammar_x3_def.hpp @@ -34,7 +34,6 @@ namespace mapnik { namespace svg { namespace grammar { - namespace x3 = boost::spirit::x3; using x3::lit; @@ -44,8 +43,6 @@ using x3::no_case; using coord_type = std::tuple; -#if BOOST_VERSION >= 106700 - template svg_converter_type & extract_path(Context const& ctx) { @@ -58,19 +55,6 @@ bool & extract_relative(Context const& ctx) return x3::get(ctx); } -#else -template -svg_converter_type & extract_path(Context const& ctx) -{ - return x3::get(ctx).get(); -} -template -bool & extract_relative(Context const& ctx) -{ - return x3::get(ctx).get(); -} -#endif - auto const move_to = [] (auto const& ctx) { extract_path(ctx).move_to(std::get<0>(_attr(ctx)), std::get<1>(_attr(ctx)), x3::get(ctx)); diff --git a/include/mapnik/svg/svg_transform_grammar_x3_def.hpp b/include/mapnik/svg/svg_transform_grammar_x3_def.hpp index d6ea30be2..7b8b7b8c7 100644 --- a/include/mapnik/svg/svg_transform_grammar_x3_def.hpp +++ b/include/mapnik/svg/svg_transform_grammar_x3_def.hpp @@ -44,19 +44,11 @@ using x3::lit; using x3::double_; using x3::no_case; -#if BOOST_VERSION >= 106700 template -auto & extract_transform(Context const& ctx) +agg::trans_affine & extract_transform(Context const& ctx) { return x3::get(ctx); } -#else -template -auto & extract_transform(Context const& ctx) -{ - return x3::get(ctx).get(); -} -#endif auto const matrix_action = [] (auto const& ctx) {