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

Merge branch 'mathisloge-master'

Browse source
This commit is contained in:
Artem Pavlenko 2020-11-20 10:09:30 +00:00
commit c945dd7195
240 changed files with 978 additions and 581 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
deps/agg/src/agg_pixfmt_rgba.cpp vendored
View file

@ -1,6 +1,7 @@
#include "agg_pixfmt_rgba.h" #include "agg_pixfmt_rgba.h"
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
#if BOOST_VERSION >= 106900 #if BOOST_VERSION >= 106900
@ -13,7 +14,7 @@
#include <boost/gil/extension/toolbox/hsl.hpp> #include <boost/gil/extension/toolbox/hsl.hpp>
#endif #endif
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace agg namespace agg
{ {

5
deps/boost/gil/extension/toolbox/hsl.hpp vendored
View file

@ -14,7 +14,8 @@
/// \author Christian Henning \n /// \author Christian Henning \n
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#if BOOST_VERSION >= 106900 #if BOOST_VERSION >= 106900
#include <boost/gil.hpp> #include <boost/gil.hpp>
@ -22,7 +23,7 @@
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#endif #endif
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace boost { namespace gil { namespace boost { namespace gil {

5
deps/boost/gil/extension/toolbox/hsv.hpp vendored
View file

@ -14,7 +14,8 @@
/// \author Christian Henning \n /// \author Christian Henning \n
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#if BOOST_VERSION >= 106900 #if BOOST_VERSION >= 106900
#include <boost/gil.hpp> #include <boost/gil.hpp>
@ -22,7 +23,7 @@
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#endif #endif
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace boost { namespace gil { namespace boost { namespace gil {

5
include/mapnik/adaptive_smooth.hpp
View file

@ -3,10 +3,11 @@
#include <mapnik/util/math.hpp> #include <mapnik/util/math.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_conv_smooth_poly1.h" #include "agg_conv_smooth_poly1.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

5
include/mapnik/agg/render_polygon_pattern.hpp
View file

@ -31,7 +31,8 @@
#include <mapnik/vertex_converters.hpp> #include <mapnik/vertex_converters.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_basics.h" #include "agg_basics.h"
#include "agg_rendering_buffer.h" #include "agg_rendering_buffer.h"
@ -44,7 +45,7 @@
#include "agg_span_pattern_rgba.h" #include "agg_span_pattern_rgba.h"
#include "agg_image_accessors.h" #include "agg_image_accessors.h"
#include "agg_conv_clip_polygon.h" #include "agg_conv_clip_polygon.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/agg_helpers.hpp
View file

@ -26,10 +26,11 @@
// mapnik // mapnik
#include <mapnik/symbolizer_enumerations.hpp> #include <mapnik/symbolizer_enumerations.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_gamma_functions.h" #include "agg_gamma_functions.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/agg_pattern_source.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_color_rgba.h" #include "agg_color_rgba.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

5
include/mapnik/agg_rasterizer.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_rasterizer_scanline_aa.h" #include "agg_rasterizer_scanline_aa.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/agg_render_marker.hpp
View file

@ -33,7 +33,8 @@
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#include <mapnik/util/const_rendering_buffer.hpp> #include <mapnik/util/const_rendering_buffer.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_color_rgba.h" #include "agg_color_rgba.h"
#include "agg_renderer_base.h" #include "agg_renderer_base.h"
@ -47,7 +48,7 @@
#include "agg_pixfmt_rgba.h" #include "agg_pixfmt_rgba.h"
#include "agg_span_image_filter_rgba.h" #include "agg_span_image_filter_rgba.h"
#include "agg_span_interpolator_linear.h" #include "agg_span_interpolator_linear.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/attribute_collector.hpp
View file

@ -39,10 +39,11 @@
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <set> #include <set>

10
include/mapnik/cairo/cairo_context.hpp
View file

@ -38,20 +38,22 @@
#include <mapnik/symbolizer_base.hpp> #include <mapnik/symbolizer_base.hpp>
#include <mapnik/symbolizer_enumerations.hpp> #include <mapnik/symbolizer_enumerations.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <cairo.h> #include <cairo.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <memory> #include <memory>
#include <map> #include <map>
#include <stdexcept> #include <stdexcept>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_basics.h" #include "agg_basics.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/color.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/operators.hpp> #include <boost/operators.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <sstream> #include <sstream>

5
include/mapnik/coord.hpp
View file

@ -23,10 +23,11 @@
#ifndef MAPNIK_COORD_HPP #ifndef MAPNIK_COORD_HPP
#define MAPNIK_COORD_HPP #define MAPNIK_COORD_HPP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/operators.hpp> #include <boost/operators.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {
template <typename T,int dim> template <typename T,int dim>

5
include/mapnik/css/css_color_grammar_x3.hpp
View file

@ -25,10 +25,11 @@
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

10
include/mapnik/css/css_color_grammar_x3_def.hpp
View file

@ -29,12 +29,13 @@
#include <mapnik/util/hsl.hpp> #include <mapnik/util/hsl.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#include <boost/fusion/adapted/struct.hpp> #include <boost/fusion/adapted/struct.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
BOOST_FUSION_ADAPT_STRUCT ( BOOST_FUSION_ADAPT_STRUCT (
mapnik::color, mapnik::color,
@ -429,7 +430,8 @@ auto const css_color_def =
hsla_color hsla_color
; ;
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
css_color, css_color,
@ -440,7 +442,7 @@ BOOST_SPIRIT_DEFINE(
rgb_color_percent, rgb_color_percent,
rgba_color_percent rgba_color_percent
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
} // ns } // ns
} //ns mapnik } //ns mapnik

5
include/mapnik/css/css_grammar_x3.hpp
View file

@ -25,10 +25,11 @@
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

10
include/mapnik/css/css_grammar_x3_def.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/css/css_grammar_x3.hpp> #include <mapnik/css/css_grammar_x3.hpp>
#include <mapnik/json/unicode_string_grammar_x3.hpp> #include <mapnik/json/unicode_string_grammar_x3.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/fusion/adapted/std_pair.hpp> #include <boost/fusion/adapted/std_pair.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
/* /*
@ -198,7 +199,8 @@ auto const css_skipper_def = space | "/*" >> *(char_ - "*/") >> "*/";
auto const css_classes_def = +lexeme[ident]; auto const css_classes_def = +lexeme[ident];
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
ident, ident,
@ -212,7 +214,7 @@ BOOST_SPIRIT_DEFINE(
css_skipper css_skipper
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
} //css_grammar } //css_grammar
} //mapnik } //mapnik

5
include/mapnik/csv/csv_grammar_x3_def.hpp
View file

@ -23,10 +23,11 @@
#ifndef MAPNIK_CSV_GRAMMAR_X3_DEF_HPP #ifndef MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
#define MAPNIK_CSV_GRAMMAR_X3_DEF_HPP #define MAPNIK_CSV_GRAMMAR_X3_DEF_HPP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <mapnik/csv/csv_grammar_x3.hpp> #include <mapnik/csv/csv_grammar_x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace grammar { namespace mapnik { namespace grammar {

33
include/mapnik/enumeration.hpp
View file

@ -32,6 +32,8 @@
#include <cstdlib> #include <cstdlib>
#include <algorithm> #include <algorithm>
#include <mapnik/warning.hpp>
namespace mapnik { namespace mapnik {
class illegal_enum_value : public std::exception class illegal_enum_value : public std::exception
@ -188,12 +190,13 @@ public:
} }
for (unsigned i = 0; i < THE_MAX; ++i) for (unsigned i = 0; i < THE_MAX; ++i)
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc MAPNIK_DISABLE_WARNING_PUSH
#pragma GCC diagnostic ignored "-Wpragmas" // gcc MAPNIK_DISABLE_WARNING_UNKNOWN_PRAGMAS
#pragma GCC diagnostic ignored "-Wundefined-var-template" MAPNIK_DISABLE_WARNING_PRAGMAS
MAPNIK_DISABLE_LONG_LONG
if (str_copy == our_strings_[i]) if (str_copy == our_strings_[i])
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
{ {
value_ = static_cast<ENUM>(i); value_ = static_cast<ENUM>(i);
if (deprecated) if (deprecated)
@ -203,24 +206,24 @@ public:
return; return;
} }
} }
#pragma GCC diagnostic push MAPNIK_DISABLE_WARNING_PUSH
#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc MAPNIK_DISABLE_WARNING_UNKNOWN_PRAGMAS
#pragma GCC diagnostic ignored "-Wpragmas" // gcc MAPNIK_DISABLE_WARNING_PRAGMAS
#pragma GCC diagnostic ignored "-Wundefined-var-template" MAPNIK_DISABLE_LONG_LONG
throw illegal_enum_value(std::string("Illegal enumeration value '") + throw illegal_enum_value(std::string("Illegal enumeration value '") +
str + "' for enum " + our_name_); str + "' for enum " + our_name_);
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
} }
/** Returns the current value as a string identifier. */ /** Returns the current value as a string identifier. */
std::string as_string() const std::string as_string() const
{ {
#pragma GCC diagnostic push MAPNIK_DISABLE_WARNING_PUSH
#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc MAPNIK_DISABLE_WARNING_UNKNOWN_PRAGMAS
#pragma GCC diagnostic ignored "-Wpragmas" // gcc MAPNIK_DISABLE_WARNING_PRAGMAS
#pragma GCC diagnostic ignored "-Wundefined-var-template" MAPNIK_DISABLE_LONG_LONG
return our_strings_[value_]; return our_strings_[value_];
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
} }
/** Static helper function to iterate over valid identifiers. */ /** Static helper function to iterate over valid identifiers. */

5
include/mapnik/expression_grammar_x3.hpp
View file

@ -25,10 +25,11 @@
#include <mapnik/expression_node.hpp> #include <mapnik/expression_node.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace grammar { namespace mapnik { namespace grammar {

5
include/mapnik/expression_grammar_x3_def.hpp
View file

@ -29,13 +29,14 @@
#include <mapnik/function_call.hpp> #include <mapnik/function_call.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#include <boost/spirit/home/x3/support/ast/variant.hpp> #include <boost/spirit/home/x3/support/ast/variant.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>
#include <boost/fusion/include/std_pair.hpp> #include <boost/fusion/include/std_pair.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
BOOST_FUSION_ADAPT_STRUCT(mapnik::unary_function_call, BOOST_FUSION_ADAPT_STRUCT(mapnik::unary_function_call,
(mapnik::unary_function_impl, fun) (mapnik::unary_function_impl, fun)

7
include/mapnik/extend_converter.hpp
View file

@ -25,14 +25,15 @@
#include <mapnik/vertex.hpp> #include <mapnik/vertex.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
#pragma clang diagnostic ignored "-Wunused-variable" MAPNIK_DISABLE_WARNING_PUSH
MAPNIK_DISABLE_UNUSED_VARIABLE
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/msm/back/state_machine.hpp> #include <boost/msm/back/state_machine.hpp>
#include <boost/msm/front/state_machine_def.hpp> #include <boost/msm/front/state_machine_def.hpp>
#include <boost/msm/front/functor_row.hpp> #include <boost/msm/front/functor_row.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <cmath> #include <cmath>

5
include/mapnik/feature_kv_iterator.hpp
View file

@ -28,13 +28,14 @@
#include <mapnik/value.hpp> #include <mapnik/value.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/iterator/iterator_traits.hpp> #include <boost/iterator/iterator_traits.hpp>
#include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/iterator_facade.hpp>
#include <boost/iterator/iterator_adaptor.hpp> #include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/filter_iterator.hpp> #include <boost/iterator/filter_iterator.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <map> #include <map>

5
include/mapnik/feature_type_style.hpp
View file

@ -29,10 +29,11 @@
#include <mapnik/image_filter_types.hpp> #include <mapnik/image_filter_types.hpp>
#include <mapnik/image_compositing.hpp> #include <mapnik/image_compositing.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <vector> #include <vector>

5
include/mapnik/geom_util.hpp
View file

@ -36,10 +36,11 @@
#include <algorithm> #include <algorithm>
// boost // boost
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

5
include/mapnik/geometry/boost_adapters.hpp
View file

@ -27,7 +27,8 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
// undef B0 to workaround https://svn.boost.org/trac/boost/ticket/10467 // undef B0 to workaround https://svn.boost.org/trac/boost/ticket/10467
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#undef B0 #undef B0
#if BOOST_VERSION == 106400 #if BOOST_VERSION == 106400
@ -37,7 +38,7 @@
#include <boost/geometry/geometries/register/point.hpp> #include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/register/ring.hpp> #include <boost/geometry/geometries/register/ring.hpp>
#include <boost/geometry/geometries/register/linestring.hpp> #include <boost/geometry/geometries/register/linestring.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// mapnik // mapnik
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>

5
include/mapnik/geometry/box2d.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/operators.hpp> #include <boost/operators.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// agg // agg
// forward declare so that apps using mapnik do not need agg headers // forward declare so that apps using mapnik do not need agg headers

5
include/mapnik/geometry/box2d_impl.hpp
View file

@ -31,11 +31,12 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// agg // agg
#include "agg_trans_affine.h" #include "agg_trans_affine.h"

5
include/mapnik/geometry/correct.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/geometry/boost_adapters.hpp> #include <mapnik/geometry/boost_adapters.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/geometry/algorithms/correct.hpp> #include <boost/geometry/algorithms/correct.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <type_traits> #include <type_traits>

5
include/mapnik/gradient.hpp
View file

@ -23,10 +23,11 @@
#ifndef MAPNIK_GRADIENT_HPP #ifndef MAPNIK_GRADIENT_HPP
#define MAPNIK_GRADIENT_HPP #define MAPNIK_GRADIENT_HPP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include <agg_trans_affine.h> #include <agg_trans_affine.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// mapnik // mapnik
#include <mapnik/color.hpp> #include <mapnik/color.hpp>

5
include/mapnik/grid/grid_pixfmt.hpp
View file

@ -26,11 +26,12 @@
#include <string> #include <string>
#include <mapnik/grid/grid_rendering_buffer.hpp> #include <mapnik/grid/grid_rendering_buffer.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include "agg_basics.h" #include "agg_basics.h"
#include <mapnik/grid/grid_pixel.hpp> #include <mapnik/grid/grid_pixel.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

5
include/mapnik/grid/grid_rasterizer.hpp
View file

@ -25,10 +25,11 @@
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_rasterizer_scanline_aa.h" #include "agg_rasterizer_scanline_aa.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/grid/grid_render_marker.hpp
View file

@ -26,7 +26,8 @@
// mapnik // mapnik
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_renderer_scanline.h" #include "agg_renderer_scanline.h"
#include "agg_scanline_bin.h" #include "agg_scanline_bin.h"
@ -35,7 +36,7 @@
#include "agg_span_allocator.h" #include "agg_span_allocator.h"
#include "agg_image_accessors.h" #include "agg_image_accessors.h"
#include "agg_span_image_filter_gray.h" #include "agg_span_image_filter_gray.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/grid/grid_renderer_base.hpp
View file

@ -23,12 +23,13 @@
#ifndef MAPNIK_GRID_RENDERER_BASE_HPP #ifndef MAPNIK_GRID_RENDERER_BASE_HPP
#define MAPNIK_GRID_RENDERER_BASE_HPP #define MAPNIK_GRID_RENDERER_BASE_HPP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include <mapnik/grid/grid_pixel.hpp> #include <mapnik/grid/grid_pixel.hpp>
#include <mapnik/grid/grid_pixfmt.hpp> #include <mapnik/grid/grid_pixfmt.hpp>
#include "agg_renderer_base.h" #include "agg_renderer_base.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/grid/grid_rendering_buffer.hpp
View file

@ -25,10 +25,11 @@
#include <mapnik/grid/grid.hpp> #include <mapnik/grid/grid.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_rendering_buffer.h" #include "agg_rendering_buffer.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/image_compositing.hpp
View file

@ -26,10 +26,11 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <string> #include <string>

10
include/mapnik/image_filter.hpp
View file

@ -28,16 +28,18 @@
#include <mapnik/image_filter_types.hpp> #include <mapnik/image_filter_types.hpp>
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
#include <mapnik/util/hsl.hpp> #include <mapnik/util/hsl.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#if BOOST_VERSION >= 106900 #if BOOST_VERSION >= 106900
#include <boost/gil.hpp> #include <boost/gil.hpp>
#else #else
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#endif #endif
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_basics.h" #include "agg_basics.h"
#include "agg_rendering_buffer.h" #include "agg_rendering_buffer.h"
@ -46,7 +48,7 @@
#include "agg_scanline_u.h" #include "agg_scanline_u.h"
#include "agg_blur.h" #include "agg_blur.h"
#include "agg_gradient_lut.h" #include "agg_gradient_lut.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <cmath> #include <cmath>

5
include/mapnik/image_filter_grammar_x3.hpp
View file

@ -25,10 +25,11 @@
#include <mapnik/image_filter_types.hpp> #include <mapnik/image_filter_types.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

10
include/mapnik/image_filter_grammar_x3_def.hpp
View file

@ -28,13 +28,14 @@
#include <mapnik/image_filter_types.hpp> #include <mapnik/image_filter_types.hpp>
#include <mapnik/css/css_color_grammar_x3.hpp> #include <mapnik/css/css_color_grammar_x3.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#include <boost/spirit/home/x3/support/ast/variant.hpp> #include <boost/spirit/home/x3/support/ast/variant.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> // spirit support #include <boost/fusion/adapted/std_tuple.hpp> // spirit support
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
BOOST_FUSION_ADAPT_STRUCT( BOOST_FUSION_ADAPT_STRUCT(
@ -220,7 +221,8 @@ auto const colorize_alpha_filter_def = lit("colorize-alpha")
auto const color_to_alpha_filter_def = lit("color-to-alpha") > lit('(') auto const color_to_alpha_filter_def = lit("color-to-alpha") > lit('(')
> -css_color > lit(')'); > -css_color > lit(')');
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
@ -245,7 +247,7 @@ BOOST_SPIRIT_DEFINE(
offset, offset,
color_to_alpha_filter color_to_alpha_filter
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
} // image_filter } // image_filter
} //ns mapnik } //ns mapnik

5
include/mapnik/image_options.hpp
View file

@ -26,10 +26,11 @@
#include <map> #include <map>
#include <string> #include <string>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/image_reader.hpp
View file

@ -30,10 +30,11 @@
#include <mapnik/factory.hpp> #include <mapnik/factory.hpp>
#include <mapnik/geometry/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <stdexcept> #include <stdexcept>

5
include/mapnik/image_scaling.hpp
View file

@ -30,10 +30,11 @@
// stl // stl
#include <iosfwd> #include <iosfwd>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik

5
include/mapnik/image_scaling_traits.hpp
View file

@ -28,7 +28,8 @@
#include <mapnik/image_scaling.hpp> #include <mapnik/image_scaling.hpp>
#include <mapnik/span_image_filter.hpp> #include <mapnik/span_image_filter.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_image_accessors.h" #include "agg_image_accessors.h"
#include "agg_pixfmt_rgba.h" #include "agg_pixfmt_rgba.h"
@ -37,7 +38,7 @@
#include "agg_span_image_filter_gray.h" #include "agg_span_image_filter_gray.h"
#include "agg_span_image_filter_rgba.h" #include "agg_span_image_filter_rgba.h"
#include "agg_span_interpolator_linear.h" #include "agg_span_interpolator_linear.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace detail { namespace mapnik { namespace detail {

5
include/mapnik/image_util.hpp
View file

@ -28,11 +28,12 @@
#include <mapnik/pixel_types.hpp> #include <mapnik/pixel_types.hpp>
#include <mapnik/image_compositing.hpp> #include <mapnik/image_compositing.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <string> #include <string>

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

@ -26,10 +26,11 @@
#include <mapnik/json/json_grammar_config.hpp> #include <mapnik/json/json_grammar_config.hpp>
#include <mapnik/geometry/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
//auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter)) //auto feature_collection_impl = x3::with<mapnik::json::grammar::bracket_tag>(std::ref(bracket_counter))
// [x3::with<mapnik::json::grammar::keys_tag>(std::ref(keys)) // [x3::with<mapnik::json::grammar::keys_tag>(std::ref(keys))

5
include/mapnik/json/feature_grammar_x3.hpp
View file

@ -25,10 +25,11 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace json { namespace grammar { namespace mapnik { namespace json { namespace grammar {

5
include/mapnik/json/feature_grammar_x3_def.hpp
View file

@ -283,7 +283,8 @@ auto const feature_rule_def = lit('{') > feature_part % lit(',') > lit('}');
auto const geometry_rule_def = (lit('{') > geometry_tuple[create_geometry] > lit('}')) | lit("null"); auto const geometry_rule_def = (lit('{') > geometry_tuple[create_geometry] > lit('}')) | lit("null");
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
@ -298,7 +299,7 @@ BOOST_SPIRIT_DEFINE(
geometry_rule, geometry_rule,
geometry_collection geometry_collection
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
}}} }}}

5
include/mapnik/json/generic_json_grammar_x3.hpp
View file

@ -24,10 +24,11 @@
#define MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_HPP #define MAPNIK_JSON_GENERIC_JSON_GRAMMAR_X3_HPP
#include <mapnik/json/json_value.hpp> #include <mapnik/json/json_value.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <vector> #include <vector>

5
include/mapnik/json/generic_json_grammar_x3_def.hpp
View file

@ -103,7 +103,8 @@ auto const number_def = json_double[assign]
| lit("null")[make_null] | lit("null")[make_null]
; ;
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
@ -114,7 +115,7 @@ BOOST_SPIRIT_DEFINE(
number number
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
}}} }}}

5
include/mapnik/json/geojson_grammar_x3.hpp
View file

@ -28,10 +28,11 @@
#include <mapnik/json/json_grammar_config.hpp> #include <mapnik/json/json_grammar_config.hpp>
#include <mapnik/json/positions_x3.hpp> #include <mapnik/json/positions_x3.hpp>
#include <mapnik/geometry/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <vector> #include <vector>

5
include/mapnik/json/geojson_grammar_x3_def.hpp
View file

@ -143,7 +143,8 @@ auto const number_def = geojson_double[assign]
| lit("null")[make_null] | lit("null")[make_null]
; ;
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
@ -157,7 +158,7 @@ BOOST_SPIRIT_DEFINE(
number number
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
}}} }}}

5
include/mapnik/json/geometry_generator_grammar.hpp
View file

@ -27,12 +27,13 @@
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
// boost // boost
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/include/karma.hpp> #include <boost/spirit/include/karma.hpp>
#include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc #include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
#include <boost/spirit/home/karma/domain.hpp> #include <boost/spirit/home/karma/domain.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace json { namespace mapnik { namespace json {

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

@ -25,14 +25,15 @@
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#include <boost/bimap.hpp> #include <boost/bimap.hpp>
#include <boost/bimap/set_of.hpp> #include <boost/bimap/set_of.hpp>
#include <boost/bimap/unordered_set_of.hpp> #include <boost/bimap/unordered_set_of.hpp>
#include <boost/assign/list_of.hpp> #include <boost/assign/list_of.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <mapnik/boost_spirit_instantiate.hpp> #include <mapnik/boost_spirit_instantiate.hpp>
namespace mapnik { namespace json { namespace mapnik { namespace json {

5
include/mapnik/json/positions_grammar_x3.hpp
View file

@ -23,10 +23,11 @@
#ifndef MAPNIK_JSON_POSITIONS_GRAMMAR_X3_HPP #ifndef MAPNIK_JSON_POSITIONS_GRAMMAR_X3_HPP
#define MAPNIK_JSON_POSITIONS_GRAMMAR_X3_HPP #define MAPNIK_JSON_POSITIONS_GRAMMAR_X3_HPP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// mapnik // mapnik
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>

5
include/mapnik/json/properties_generator_grammar.hpp
View file

@ -26,12 +26,13 @@
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/value.hpp> #include <mapnik/value.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/include/karma.hpp> #include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/home/karma/domain.hpp> #include <boost/spirit/home/karma/domain.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <string> #include <string>
#include <tuple> #include <tuple>

5
include/mapnik/json/properties_generator_grammar_impl.hpp
View file

@ -23,11 +23,12 @@
#include <mapnik/json/properties_generator_grammar.hpp> #include <mapnik/json/properties_generator_grammar.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/phoenix.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace json { namespace mapnik { namespace json {

5
include/mapnik/json/topojson_grammar_x3.hpp
View file

@ -26,10 +26,11 @@
// mapnik // mapnik
#include <mapnik/json/topology.hpp> #include <mapnik/json/topology.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace json { namespace grammar { namespace mapnik { namespace json { namespace grammar {

5
include/mapnik/json/topojson_grammar_x3_def.hpp
View file

@ -27,11 +27,12 @@
#include <mapnik/json/generic_json_grammar_x3.hpp> #include <mapnik/json/generic_json_grammar_x3.hpp>
#include <mapnik/json/topojson_grammar_x3.hpp> #include <mapnik/json/topojson_grammar_x3.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/fusion/adapted/struct.hpp> #include <boost/fusion/adapted/struct.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
BOOST_FUSION_ADAPT_STRUCT( BOOST_FUSION_ADAPT_STRUCT(
mapnik::topojson::coordinate, mapnik::topojson::coordinate,

5
include/mapnik/json/topology.hpp
View file

@ -26,10 +26,11 @@
#include <mapnik/json/json_value.hpp> #include <mapnik/json/json_value.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <tuple> #include <tuple>
#include <vector> #include <vector>

5
include/mapnik/json/unicode_string_grammar_x3.hpp
View file

@ -23,10 +23,11 @@
#ifndef MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_HPP #ifndef MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_HPP
#define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_HPP #define MAPNIK_JSON_UNICODE_STRING_GRAMMAR_X3_HPP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace json { namespace grammar { namespace mapnik { namespace json { namespace grammar {

5
include/mapnik/json/unicode_string_grammar_x3_def.hpp
View file

@ -134,7 +134,8 @@ static auto const escaped_def = lit('\\') >
; ;
static auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"'))[append])] > lit('"'); static auto const double_quoted_def = lit('"') > no_skip[*(escaped[append] | (~char_('"'))[append])] > lit('"');
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
@ -145,7 +146,7 @@ BOOST_SPIRIT_DEFINE(
utf16_string utf16_string
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
}}} }}}

5
include/mapnik/label_collision_detector.hpp
View file

@ -28,10 +28,11 @@
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <unicode/unistr.h> #include <unicode/unistr.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <vector> #include <vector>

5
include/mapnik/map.hpp
View file

@ -34,10 +34,11 @@
#include <mapnik/image_compositing.hpp> #include <mapnik/image_compositing.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <map> #include <map>

5
include/mapnik/mapped_memory_cache.hpp
View file

@ -32,10 +32,11 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace boost { namespace interprocess { class mapped_region; } } namespace boost { namespace interprocess { class mapped_region; } }

5
include/mapnik/marker_helpers.hpp
View file

@ -38,10 +38,11 @@
#include <mapnik/renderer_common/render_markers_symbolizer.hpp> #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
#include <mapnik/vertex_converters.hpp> #include <mapnik/vertex_converters.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_trans_affine.h" #include "agg_trans_affine.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <memory> #include <memory>

5
include/mapnik/markers_placements/basic.hpp
View file

@ -29,11 +29,12 @@
#include <mapnik/util/math.hpp> #include <mapnik/util/math.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_basics.h" #include "agg_basics.h"
#include "agg_trans_affine.h" #include "agg_trans_affine.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/palette.hpp
View file

@ -30,7 +30,8 @@
#define USE_DENSE_HASH_MAP #define USE_DENSE_HASH_MAP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#ifdef USE_DENSE_HASH_MAP #ifdef USE_DENSE_HASH_MAP
#include <mapnik/sparsehash/dense_hash_map> #include <mapnik/sparsehash/dense_hash_map>
@ -39,7 +40,7 @@ using rgba_hash_table = google::dense_hash_map<unsigned int, unsigned char>;
#include <unordered_map> #include <unordered_map>
using rgba_hash_table = std::unordered_map<unsigned int, unsigned char>; using rgba_hash_table = std::unordered_map<unsigned int, unsigned char>;
#endif #endif
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <vector> #include <vector>

5
include/mapnik/params.hpp
View file

@ -28,10 +28,11 @@
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <string> #include <string>

5
include/mapnik/params_impl.hpp
View file

@ -29,11 +29,12 @@
#include <mapnik/boolean.hpp> #include <mapnik/boolean.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <string> #include <string>

5
include/mapnik/path_expression_grammar_x3.hpp
View file

@ -26,10 +26,11 @@
// mapnik // mapnik
#include <mapnik/path_expression.hpp> #include <mapnik/path_expression.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace grammar { namespace mapnik { namespace grammar {

5
include/mapnik/png_io.hpp
View file

@ -29,7 +29,8 @@
#include <mapnik/hextree.hpp> #include <mapnik/hextree.hpp>
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
// zlib // zlib
@ -40,7 +41,7 @@ extern "C"
#include <png.h> #include <png.h>
} }
#include <set> #include <set>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#define MAX_OCTREE_LEVELS 4 #define MAX_OCTREE_LEVELS 4

5
include/mapnik/proj_strategy.hpp
View file

@ -28,12 +28,13 @@
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/geometry/core/coordinate_type.hpp> #include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/core/access.hpp> #include <boost/geometry/core/access.hpp>
#include <boost/numeric/conversion/cast.hpp> #include <boost/numeric/conversion/cast.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/projection.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/well_known_srs.hpp> #include <mapnik/well_known_srs.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <string> #include <string>

5
include/mapnik/ptree_helpers.hpp
View file

@ -26,10 +26,11 @@
// stl // stl
#include <string> #include <string>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/raster.hpp
View file

@ -29,10 +29,11 @@
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/raster_colorizer.hpp
View file

@ -42,10 +42,11 @@
#include <mapnik/enumeration.hpp> #include <mapnik/enumeration.hpp>
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <memory> #include <memory>
#include <vector> #include <vector>

5
include/mapnik/renderer_common/process_building_symbolizer.hpp
View file

@ -28,10 +28,11 @@
#include <mapnik/path.hpp> #include <mapnik/path.hpp>
#include <mapnik/transform_path_adapter.hpp> #include <mapnik/transform_path_adapter.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_conv_transform.h" #include "agg_conv_transform.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/renderer_common/process_raster_symbolizer.hpp
View file

@ -32,7 +32,8 @@
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_rendering_buffer.h" #include "agg_rendering_buffer.h"
#include "agg_pixfmt_rgba.h" #include "agg_pixfmt_rgba.h"
@ -40,7 +41,7 @@
#include "agg_rasterizer_scanline_aa.h" #include "agg_rasterizer_scanline_aa.h"
#include "agg_scanline_u.h" #include "agg_scanline_u.h"
#include "agg_renderer_scanline.h" #include "agg_renderer_scanline.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {

5
include/mapnik/simplify.hpp
View file

@ -7,10 +7,11 @@
// stl // stl
#include <string> #include <string>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

10
include/mapnik/span_image_filter.hpp
View file

@ -25,16 +25,18 @@
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_span_image_filter_gray.h" #include "agg_span_image_filter_gray.h"
#include "agg_span_image_filter_rgba.h" #include "agg_span_image_filter_rgba.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <limits> #include <limits>

5
include/mapnik/sql_utils.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/util/trim.hpp> // for trim #include <mapnik/util/trim.hpp> // for trim
// boost // boost
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <iosfwd> #include <iosfwd>

5
include/mapnik/svg/geometry_svg_generator.hpp
View file

@ -33,14 +33,15 @@
#include <mapnik/util/path_iterator.hpp> #include <mapnik/util/path_iterator.hpp>
#include <mapnik/util/container_adapter.hpp> #include <mapnik/util/container_adapter.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/include/karma.hpp> #include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_function.hpp> #include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/include/phoenix_operator.hpp> #include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/type_traits/remove_pointer.hpp> #include <boost/type_traits/remove_pointer.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <tuple> #include <tuple>

5
include/mapnik/svg/output/svg_output_grammars.hpp
View file

@ -36,11 +36,12 @@ namespace mapnik { namespace svg {
struct root_output_attributes; struct root_output_attributes;
}} }}
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/include/karma_nonterminal.hpp> #include <boost/spirit/include/karma_nonterminal.hpp>
#include <boost/spirit/include/karma_rule.hpp> #include <boost/spirit/include/karma_rule.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace svg { namespace mapnik { namespace svg {

5
include/mapnik/svg/output/svg_output_grammars_impl.hpp
View file

@ -26,12 +26,13 @@
// mapnik // mapnik
#include <mapnik/svg/output/svg_output_grammars.hpp> #include <mapnik/svg/output/svg_output_grammars.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/include/karma.hpp> #include <boost/spirit/include/karma.hpp>
#include <boost/fusion/include/std_pair.hpp> #include <boost/fusion/include/std_pair.hpp>
#include <boost/fusion/adapted/struct.hpp> #include <boost/fusion/adapted/struct.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
/*! /*!
* mapnik::svg::path_output_attributes is adapted as a fusion sequence * mapnik::svg::path_output_attributes is adapted as a fusion sequence

5
include/mapnik/svg/svg_converter.hpp
View file

@ -29,7 +29,8 @@
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_path_storage.h" #include "agg_path_storage.h"
#include "agg_conv_transform.h" #include "agg_conv_transform.h"
@ -38,7 +39,7 @@
#include "agg_conv_curve.h" #include "agg_conv_curve.h"
#include "agg_color_rgba.h" #include "agg_color_rgba.h"
#include "agg_bounding_rect.h" #include "agg_bounding_rect.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <deque> #include <deque>

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

@ -25,10 +25,11 @@
#include <mapnik/svg/svg_path_parser.hpp> #include <mapnik/svg/svg_path_parser.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp> #include <boost/spirit/home/x3.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace svg { namespace grammar { namespace mapnik { namespace svg { namespace grammar {

5
include/mapnik/svg/svg_path_adapter.hpp
View file

@ -28,12 +28,13 @@
#include <mapnik/geometry/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_math.h" #include "agg_math.h"
#include "agg_array.h" #include "agg_array.h"
#include "agg_bezier_arc.h" #include "agg_bezier_arc.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// stl // stl
#include <cmath> #include <cmath>

5
include/mapnik/svg/svg_path_attributes.hpp
View file

@ -27,12 +27,13 @@
#include <mapnik/gradient.hpp> #include <mapnik/gradient.hpp>
#include <mapnik/symbolizer_base.hpp> // dash_array #include <mapnik/symbolizer_base.hpp> // dash_array
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_math_stroke.h" #include "agg_math_stroke.h"
#include "agg_color_rgba.h" #include "agg_color_rgba.h"
#include "agg_trans_affine.h" #include "agg_trans_affine.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {
namespace svg { namespace svg {

5
include/mapnik/svg/svg_path_commands.hpp
View file

@ -27,10 +27,11 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/util/math.hpp> #include <mapnik/util/math.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/fusion/sequence/intrinsic/at.hpp> #include <boost/fusion/sequence/intrinsic/at.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {
namespace svg { namespace svg {

10
include/mapnik/svg/svg_path_grammar_x3_def.hpp
View file

@ -28,10 +28,11 @@
#include <mapnik/svg/svg_path_grammar_x3.hpp> #include <mapnik/svg/svg_path_grammar_x3.hpp>
#include <mapnik/util/math.hpp> #include <mapnik/util/math.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace svg { namespace grammar { namespace mapnik { namespace svg { namespace grammar {
@ -191,13 +192,14 @@ auto const cmd = x3::rule<class cmd_tag> {} = M > *drawto_cmd ;
auto const svg_path_def = +cmd; auto const svg_path_def = +cmd;
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
svg_path, svg_path,
svg_points svg_points
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
}}} }}}

10
include/mapnik/svg/svg_renderer_agg.hpp
View file

@ -31,13 +31,15 @@
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#if defined(GRID_RENDERER) #if defined(GRID_RENDERER)
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <mapnik/grid/grid_pixel.hpp> #include <mapnik/grid/grid_pixel.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#endif #endif
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_path_storage.h" #include "agg_path_storage.h"
#include "agg_conv_transform.h" #include "agg_conv_transform.h"
@ -58,7 +60,7 @@
#include "agg_gradient_lut.h" #include "agg_gradient_lut.h"
#include "agg_gamma_lut.h" #include "agg_gamma_lut.h"
#include "agg_span_interpolator_linear.h" #include "agg_span_interpolator_linear.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace mapnik {
namespace svg { namespace svg {

15
include/mapnik/svg/svg_transform_grammar_x3_def.hpp
View file

@ -27,15 +27,17 @@
#include <mapnik/svg/svg_transform_grammar_x3.hpp> #include <mapnik/svg/svg_transform_grammar_x3.hpp>
// boost::fusion // boost::fusion
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/fusion/sequence.hpp> #include <boost/fusion/sequence.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// agg // agg
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include <agg_trans_affine.h> #include <agg_trans_affine.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace svg { namespace grammar { namespace mapnik { namespace svg { namespace grammar {
@ -148,12 +150,13 @@ auto const transform = x3::rule<class transform_tag> {} = matrix | rotate | tran
auto const svg_transform_def = +transform ; auto const svg_transform_def = +transform ;
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
svg_transform svg_transform
); );
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
}}} }}}

5
include/mapnik/symbolizer.hpp
View file

@ -51,10 +51,11 @@
#include <map> #include <map>
#include <tuple> #include <tuple>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

10
include/mapnik/text/color_font_renderer.hpp
View file

@ -23,13 +23,15 @@
#ifndef MAPNIK_COLOR_FONT_RENDERER_HPP #ifndef MAPNIK_COLOR_FONT_RENDERER_HPP
#define MAPNIK_COLOR_FONT_RENDERER_HPP #define MAPNIK_COLOR_FONT_RENDERER_HPP
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include <agg_trans_affine.h> #include <agg_trans_affine.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// freetype2 // freetype2
extern "C" extern "C"
@ -39,7 +41,7 @@ extern "C"
#include FT_STROKER_H #include FT_STROKER_H
} }
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
#include <mapnik/text/glyph_info.hpp> #include <mapnik/text/glyph_info.hpp>
#include <mapnik/image_any.hpp> #include <mapnik/image_any.hpp>

5
include/mapnik/text/face.hpp
View file

@ -27,7 +27,8 @@
#include <mapnik/text/glyph_info.hpp> #include <mapnik/text/glyph_info.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
extern "C" extern "C"
@ -37,7 +38,7 @@ extern "C"
#include FT_STROKER_H #include FT_STROKER_H
} }
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
//stl //stl
#include <memory> #include <memory>

10
include/mapnik/text/font_feature_settings.hpp
View file

@ -32,10 +32,11 @@
#include <limits> #include <limits>
#include <ostream> #include <ostream>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <harfbuzz/hb.h> #include <harfbuzz/hb.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
// EqualityComparable // EqualityComparable
inline bool operator==(hb_feature_t const& lhs, hb_feature_t const& rhs) inline bool operator==(hb_feature_t const& lhs, hb_feature_t const& rhs)
@ -89,10 +90,11 @@ inline bool operator==(font_feature_settings const& lhs, font_feature_settings c
constexpr unsigned int font_feature_range_global_start = 0u; constexpr unsigned int font_feature_range_global_start = 0u;
static const unsigned int font_feature_range_global_end = std::numeric_limits<unsigned int>::max(); static const unsigned int font_feature_range_global_end = std::numeric_limits<unsigned int>::max();
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
constexpr hb_feature_t font_feature_liga_off = { HB_TAG('l', 'i', 'g', 'a'), 0, font_feature_range_global_start, font_feature_range_global_end }; constexpr hb_feature_t font_feature_liga_off = { HB_TAG('l', 'i', 'g', 'a'), 0, font_feature_range_global_start, font_feature_range_global_end };
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
} // mapnik namespace } // mapnik namespace

5
include/mapnik/text/formatting/layout.hpp
View file

@ -26,10 +26,11 @@
#include <mapnik/text/formatting/base.hpp> #include <mapnik/text/formatting/base.hpp>
#include <mapnik/text/text_properties.hpp> #include <mapnik/text/text_properties.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace formatting { namespace mapnik { namespace formatting {

5
include/mapnik/text/glyph_positions.hpp
View file

@ -30,10 +30,11 @@
#include <mapnik/marker_cache.hpp> #include <mapnik/marker_cache.hpp>
#include <mapnik/text/glyph_info.hpp> #include <mapnik/text/glyph_info.hpp>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>
#include "agg_trans_affine.h" #include "agg_trans_affine.h"
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
//stl //stl
#include <vector> #include <vector>

5
include/mapnik/text/harfbuzz_shaper.hpp
View file

@ -36,13 +36,14 @@
#include <list> #include <list>
#include <type_traits> #include <type_traits>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <harfbuzz/hb.h> #include <harfbuzz/hb.h>
#include <harfbuzz/hb-ft.h> #include <harfbuzz/hb-ft.h>
#include <unicode/uvernum.h> #include <unicode/uvernum.h>
#include <unicode/uscript.h> #include <unicode/uscript.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik { namespace detail { namespace mapnik { namespace detail {

5
include/mapnik/text/icu_shaper.hpp
View file

@ -36,12 +36,13 @@
// stl // stl
#include <list> #include <list>
#pragma GCC diagnostic push #include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <unicode/unistr.h> #include <unicode/unistr.h>
#include <unicode/ushape.h> #include <unicode/ushape.h>
#include <unicode/schriter.h> #include <unicode/schriter.h>
#pragma GCC diagnostic pop MAPNIK_DISABLE_WARNING_POP
namespace mapnik namespace mapnik
{ {

Some files were not shown because too many files have changed in this diff Show more