From 39a97865fcc8da2726f79083eee4f8e4f508cc06 Mon Sep 17 00:00:00 2001 From: artemp Date: Tue, 2 Feb 2016 11:23:08 +0100 Subject: [PATCH] image_filter_grammar - move 'BOOST_FUSION_ADAPT_STRUCT` into *_impl.hpp --- include/mapnik/image_filter_grammar.hpp | 11 ----------- include/mapnik/image_filter_grammar_impl.hpp | 7 +++++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/mapnik/image_filter_grammar.hpp b/include/mapnik/image_filter_grammar.hpp index ef9b6697b..176c84e02 100644 --- a/include/mapnik/image_filter_grammar.hpp +++ b/include/mapnik/image_filter_grammar.hpp @@ -31,7 +31,6 @@ #pragma GCC diagnostic push #include #include -#include #pragma GCC diagnostic pop // stl @@ -44,16 +43,6 @@ struct color_stop; struct colorize_alpha; } -} - -BOOST_FUSION_ADAPT_STRUCT( - mapnik::filter::color_stop, - (mapnik::color, color ) - (double, offset) -) - -namespace mapnik { - namespace qi = boost::spirit::qi; struct percent_offset_impl diff --git a/include/mapnik/image_filter_grammar_impl.hpp b/include/mapnik/image_filter_grammar_impl.hpp index 4dfa54038..7b8212ec7 100644 --- a/include/mapnik/image_filter_grammar_impl.hpp +++ b/include/mapnik/image_filter_grammar_impl.hpp @@ -26,9 +26,16 @@ #pragma GCC diagnostic push #include +#include #include #pragma GCC diagnostic pop +BOOST_FUSION_ADAPT_STRUCT( + mapnik::filter::color_stop, + (mapnik::color, color ) + (double, offset) +) + namespace mapnik { namespace qi = boost::spirit::qi;