finish wrapping boost includes to suppress warnings - add agg wrapper - refs #2907

include/mapnik/agg_helpers.hpp

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

include/mapnik/agg_pattern_source.hpp

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

include/mapnik/agg_rasterizer.hpp

@@ -26,8 +26,11 @@
 // mapnik
 #include <mapnik/util/noncopyable.hpp>
 
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rasterizer_scanline_aa.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/agg_render_marker.hpp

@@ -30,7 +30,8 @@
 #include <mapnik/safe_cast.hpp>
 #include <mapnik/util/const_rendering_buffer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_color_rgba.h"
 #include "agg_renderer_base.h"
 #include "agg_renderer_scanline.h"
@@ -43,6 +44,7 @@
 #include "agg_pixfmt_rgba.h"
 #include "agg_span_image_filter_rgba.h"
 #include "agg_span_interpolator_linear.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/box2d.hpp

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

include/mapnik/cairo/cairo_context.hpp

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

include/mapnik/color.hpp

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

include/mapnik/coord.hpp

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

include/mapnik/feature_kv_iterator.hpp

@@ -27,12 +27,14 @@
 #include <mapnik/config.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/util/variant.hpp>
-// boost
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/filter_iterator.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <map>

include/mapnik/feature_type_style.hpp

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

include/mapnik/global.hpp

@@ -99,14 +99,14 @@ inline void read_int32_xdr(const char* data, std::int32_t & val)
 // read double XDR (big endian)
 inline void read_double_xdr(const char* data, double & val)
 {
-    std::int64_t bits = ((std::int64_t)data[7] & 0xff) |
-        ((std::int64_t)data[6] & 0xff) << 8   |
-        ((std::int64_t)data[5] & 0xff) << 16  |
-        ((std::int64_t)data[4] & 0xff) << 24  |
-        ((std::int64_t)data[3] & 0xff) << 32  |
-        ((std::int64_t)data[2] & 0xff) << 40  |
-        ((std::int64_t)data[1] & 0xff) << 48  |
-        ((std::int64_t)data[0] & 0xff) << 56  ;
+    std::int64_t bits = (static_cast<std::int64_t>(data[7]) & 0xff) |
+        (static_cast<std::int64_t>(data[6]) & 0xff) << 8   |
+        (static_cast<std::int64_t>(data[5]) & 0xff) << 16  |
+        (static_cast<std::int64_t>(data[4]) & 0xff) << 24  |
+        (static_cast<std::int64_t>(data[3]) & 0xff) << 32  |
+        (static_cast<std::int64_t>(data[2]) & 0xff) << 40  |
+        (static_cast<std::int64_t>(data[1]) & 0xff) << 48  |
+        (static_cast<std::int64_t>(data[0]) & 0xff) << 56  ;
     std::memcpy(&val,&bits,8);
 }
 

include/mapnik/grid/grid_rasterizer.hpp

@@ -24,7 +24,11 @@
 #define MAPNIK_GRID_RASTERIZER_HPP
 
 #include <mapnik/util/noncopyable.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rasterizer_scanline_aa.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/grid/grid_render_marker.hpp

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

include/mapnik/grid/grid_renderer_base.hpp

@@ -24,11 +24,11 @@
 #define MAPNIK_GRID_RENDERER_BASE_HPP
 
 #pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#include "agg_renderer_base.h"
+#include <mapnik/warning_ignore_agg.hpp>
 #include <mapnik/grid/grid_pixel.hpp>
-#pragma GCC diagnostic pop
 #include <mapnik/grid/grid_pixfmt.hpp>
+#include "agg_renderer_base.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/grid/grid_rendering_buffer.hpp

@@ -24,7 +24,11 @@
 #define MAPNIK_GRID_RENDERING_BUFFER_HPP
 
 #include <mapnik/grid/grid.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/image_compositing.hpp

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

include/mapnik/image_filter.hpp

@@ -34,7 +34,8 @@
 #include <boost/gil/gil_all.hpp>
 #pragma GCC diagnostic pop
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
 #include "agg_color_rgba.h"
@@ -42,6 +43,8 @@
 #include "agg_scanline_u.h"
 #include "agg_blur.h"
 #include "agg_gradient_lut.h"
+#pragma GCC diagnostic pop
+
 // stl
 #include <cmath>
 

include/mapnik/image_options.hpp

@@ -25,7 +25,12 @@
 
 #include <map>
 #include <string>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
+
 
 namespace mapnik {
 

include/mapnik/image_reader.hpp

@@ -29,8 +29,12 @@
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/factory.hpp>
 #include <mapnik/box2d.hpp>
-// boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
+
 // stl
 #include <stdexcept>
 #include <string>

include/mapnik/image_scaling.hpp

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

include/mapnik/image_scaling_traits.hpp

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

include/mapnik/label_collision_detector.hpp

@@ -28,8 +28,10 @@
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/value_types.hpp>
 
-// icu
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/unistr.h>
+#pragma GCC diagnostic pop
 
 // stl
 #include <vector>

include/mapnik/map.hpp

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

include/mapnik/mapped_memory_cache.hpp

@@ -31,7 +31,12 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
+
 
 namespace boost { namespace interprocess { class mapped_region; } }
 

include/mapnik/marker.hpp

@@ -29,8 +29,10 @@
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/util/variant.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_array.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <memory>

include/mapnik/marker_helpers.hpp

@@ -37,8 +37,11 @@
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
 #include <mapnik/vertex_converters.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <memory>

include/mapnik/markers_placements/basic.hpp

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

include/mapnik/params.hpp

@@ -27,8 +27,11 @@
 #include <mapnik/config.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/util/variant.hpp>
-// boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

include/mapnik/path_expression_grammar_impl.hpp

@@ -24,10 +24,13 @@
 #include <mapnik/path_expression_grammar.hpp>
 #include <mapnik/attribute.hpp>
 
-// boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>
 #include <boost/spirit/include/phoenix_stl.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

include/mapnik/projection.hpp

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

include/mapnik/ptree_helpers.hpp

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

include/mapnik/raster.hpp

@@ -28,8 +28,11 @@
 #include <mapnik/image_any.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/util/variant.hpp>
- // boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/raster_colorizer.hpp

@@ -41,12 +41,13 @@
 #include <mapnik/color.hpp>
 #include <mapnik/enumeration.hpp>
 #include <mapnik/image.hpp>
- // boost
-#include <boost/optional.hpp>
-// boost
-#include <memory>
 
-// stl
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/optional.hpp>
+#pragma GCC diagnostic pop
+
+#include <memory>
 #include <vector>
 
 namespace mapnik

include/mapnik/renderer_common/process_raster_symbolizer.hpp

@@ -32,13 +32,15 @@
 #include <mapnik/proj_transform.hpp>
 #include <mapnik/feature.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_pixfmt_gray.h"
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_scanline_u.h"
 #include "agg_renderer_scanline.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/simplify.hpp

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

include/mapnik/span_image_filter.hpp

@@ -23,15 +23,21 @@
 #ifndef MAPNIK_SPAN_IMAGE_FILTER_INCLUDED
 #define MAPNIK_SPAN_IMAGE_FILTER_INCLUDED
 
+#include <mapnik/safe_cast.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/optional.hpp>
+#pragma GCC diagnostic pop
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_span_image_filter_gray.h"
 #include "agg_span_image_filter_rgba.h"
-
-#include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 #include <limits>
 
-#include <mapnik/safe_cast.hpp>
-
 namespace mapnik
 {
 

include/mapnik/stringify_macro.hpp

@@ -2,7 +2,7 @@
  *
  * This file is part of Mapnik (c++ mapping toolkit)
  *
- * Copyright (C) 2015 Artem Pavlenko
+ * Copyright (C) 2016 Artem Pavlenko
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,22 +20,7 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_VERSION_HPP
-#define MAPNIK_VERSION_HPP
-
-#define MAPNIK_MAJOR_VERSION 3
-#define MAPNIK_MINOR_VERSION 0
-#define MAPNIK_PATCH_VERSION 11
-
-#define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION)
-
 #ifndef MAPNIK_STRINGIFY
 #define MAPNIK_STRINGIFY(n) MAPNIK_STRINGIFY_HELPER(n)
 #define MAPNIK_STRINGIFY_HELPER(n) #n
-#endif
-
-#define MAPNIK_VERSION_STRING   MAPNIK_STRINGIFY(MAPNIK_MAJOR_VERSION) "." \
-                                MAPNIK_STRINGIFY(MAPNIK_MINOR_VERSION) "." \
-                                MAPNIK_STRINGIFY(MAPNIK_PATCH_VERSION)
-
-#endif // MAPNIK_VERSION_HPP
+#endif

include/mapnik/svg/svg_converter.hpp

@@ -29,7 +29,8 @@
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/safe_cast.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_path_storage.h"
 #include "agg_conv_transform.h"
 #include "agg_conv_stroke.h"
@@ -37,6 +38,7 @@
 #include "agg_conv_curve.h"
 #include "agg_color_rgba.h"
 #include "agg_bounding_rect.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <stdexcept>

include/mapnik/svg/svg_path_adapter.hpp

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

include/mapnik/svg/svg_path_attributes.hpp

@@ -23,15 +23,17 @@
 #ifndef MAPNIK_SVG_PATH_ATTRIBUTES_HPP
 #define MAPNIK_SVG_PATH_ATTRIBUTES_HPP
 
-// agg
-#include "agg_math_stroke.h"
-#include "agg_color_rgba.h"
-#include "agg_trans_affine.h"
-
 // mapnik
 #include <mapnik/gradient.hpp>
 #include <mapnik/symbolizer_base.hpp> // dash_array
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
+#include "agg_math_stroke.h"
+#include "agg_color_rgba.h"
+#include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
+
 namespace mapnik {
 namespace svg {
 

include/mapnik/svg/svg_renderer_agg.hpp

@@ -37,7 +37,8 @@
 #pragma GCC diagnostic pop
 #endif
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_path_storage.h"
 #include "agg_conv_transform.h"
 #include "agg_conv_stroke.h"
@@ -57,6 +58,7 @@
 #include "agg_gradient_lut.h"
 #include "agg_gamma_lut.h"
 #include "agg_span_interpolator_linear.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik  {
 namespace svg {

include/mapnik/symbolizer.hpp

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

include/mapnik/text/face.hpp

@@ -27,7 +27,9 @@
 #include <mapnik/text/glyph_info.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
-// freetype2
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
 extern "C"
 {
 #include <ft2build.h>
@@ -35,6 +37,8 @@ extern "C"
 #include FT_STROKER_H
 }
 
+#pragma GCC diagnostic pop
+
 //stl
 #include <memory>
 #include <string>

include/mapnik/text/font_feature_settings.hpp

@@ -31,8 +31,11 @@
 #include <memory>
 #include <limits>
 #include <ostream>
-// harfbuzz
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <harfbuzz/hb.h>
+#pragma GCC diagnostic pop
 
 // EqualityComparable
 inline bool operator==(hb_feature_t const& lhs, hb_feature_t const& rhs)
@@ -86,7 +89,10 @@ inline bool operator==(font_feature_settings const& lhs, font_feature_settings c
 constexpr unsigned int font_feature_range_global_start = 0u;
 static const unsigned int font_feature_range_global_end = std::numeric_limits<unsigned int>::max();
 
+#pragma GCC diagnostic push
+#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 };
+#pragma GCC diagnostic pop
 
 } // mapnik namespace
 

include/mapnik/text/formatting/layout.hpp

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

include/mapnik/text/glyph_positions.hpp

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

include/mapnik/text/harfbuzz_shaper.hpp

@@ -36,12 +36,12 @@
 #include <list>
 #include <type_traits>
 
-// harfbuzz
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <harfbuzz/hb.h>
 #include <harfbuzz/hb-ft.h>
-
-// icu
 #include <unicode/uscript.h>
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

include/mapnik/text/icu_shaper.hpp

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

include/mapnik/text/itemizer.hpp

@@ -34,10 +34,12 @@
 #include <list>
 #include <vector>
 
-// ICU
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/unistr.h>
 #include <unicode/uscript.h>
 #include <unicode/ubidi.h>
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

include/mapnik/text/properties_util.hpp

@@ -26,11 +26,14 @@
 #include <mapnik/symbolizer_base.hpp>
 #include <mapnik/xml_node.hpp>
 #include <mapnik/config_error.hpp>
-#include <boost/optional.hpp>
+
 #include <string>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/optional.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace detail {
 

include/mapnik/text/renderer.hpp

@@ -28,7 +28,10 @@
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/util/noncopyable.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
 #include <agg_trans_affine.h>
 
 // freetype2
@@ -39,6 +42,8 @@ extern "C"
 #include FT_STROKER_H
 }
 
+#pragma GCC diagnostic pop
+
 namespace mapnik
 {
 

include/mapnik/text/scrptrun.hpp

@@ -17,9 +17,12 @@
 #ifndef __SCRPTRUN_H
 #define __SCRPTRUN_H
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/utypes.h>
 #include <unicode/uobject.h>
 #include <unicode/uscript.h>
+#pragma GCC diagnostic pop
 
 struct ScriptRecord
 {

include/mapnik/text/text_properties.hpp

@@ -36,9 +36,11 @@
 // stl
 #include <map>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

include/mapnik/transform_expression.hpp

@@ -30,11 +30,13 @@
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/util/variant.hpp>
-// boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
-// fusion
 #include <boost/fusion/include/at.hpp>
 #include <boost/fusion/include/vector.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <vector>

include/mapnik/util/const_rendering_buffer.hpp

@@ -25,7 +25,10 @@
 
 #include <mapnik/safe_cast.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
+#pragma GCC diagnostic pop
 
 #include <cstdint>
 

include/mapnik/util/geometry_to_ds_type.hpp

@@ -28,8 +28,13 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/datasource_geometry_type.hpp>
 #include <mapnik/util/variant.hpp>
-// boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#include <boost/fusion/include/at.hpp>
+#include <boost/fusion/include/vector.hpp>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace util {
 

include/mapnik/util/variant.hpp

@@ -24,9 +24,13 @@
 #define MAPNIK_UTIL_VARIANT_HPP
 
 #include <mapnik/config.hpp>
-#include <boost/mpl/vector.hpp> // spirit support
 #include <mapbox/variant/variant.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+#include <boost/mpl/vector.hpp> // spirit support
+#pragma GCC diagnostic pop
+
 namespace mapnik { namespace util {
 
 template <typename T>

include/mapnik/value_hash.hpp

@@ -30,8 +30,10 @@
 // stl
 #include <functional>
 
-// icu
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/unistr.h>
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace detail {
 

include/mapnik/value_types.hpp

@@ -27,8 +27,11 @@
 #include <mapnik/config.hpp>
 #include <mapnik/pixel_types.hpp>
 
-// icu
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/uversion.h> // for U_NAMESPACE_QUALIFIER
+#pragma GCC diagnostic pop
 
 // stl
 #include <type_traits>

include/mapnik/vertex_cache.hpp

@@ -28,8 +28,10 @@
 #include <mapnik/config.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <vector>

include/mapnik/vertex_converters.hpp

@@ -37,7 +37,8 @@
 #include <mapnik/symbolizer_keys.hpp>
 #include <mapnik/symbolizer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_math_stroke.h"
 #include "agg_trans_affine.h"
 #include "agg_conv_clip_polygon.h"
@@ -46,6 +47,7 @@
 #include "agg_conv_stroke.h"
 #include "agg_conv_dash.h"
 #include "agg_conv_transform.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <type_traits>

include/mapnik/warning_ignore.hpp

@@ -32,4 +32,24 @@
 #pragma GCC diagnostic ignored "-Wc++11-narrowing"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wc++98-compat-pedantic"
+#pragma GCC diagnostic ignored "-Wdisabled-macro-expansion"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wdocumentation"
+#pragma GCC diagnostic ignored "-Wdocumentation-unknown-command"
+#pragma GCC diagnostic ignored "-Wundef"
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wpadded"
+#pragma GCC diagnostic ignored "-Wc++98-compat"
+#pragma GCC diagnostic ignored "-Wreserved-id-macro"
+#pragma GCC diagnostic ignored "-Wweak-vtables"
+#pragma GCC diagnostic ignored "-Wextra-semi"
+#pragma GCC diagnostic ignored "-Wc++98-compat-pedantic"
+#pragma GCC diagnostic ignored "-Wglobal-constructors"
+#pragma GCC diagnostic ignored "-Wheader-hygiene"
+#pragma GCC diagnostic ignored "-Wexit-time-destructors"
+#pragma GCC diagnostic ignored "-Wswitch-enum"
+#pragma GCC diagnostic ignored "-Wmissing-noreturn"
+#pragma GCC diagnostic ignored "-Wcovered-switch-default"
+

include/mapnik/well_known_srs.hpp

@@ -28,8 +28,10 @@
 #include <mapnik/enumeration.hpp>
 #include <mapnik/geometry.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <cmath>

include/mapnik/xml_node.hpp

@@ -26,8 +26,10 @@
 //mapnik
 #include <mapnik/config.hpp> // for MAPNIK_DECL
 
-//boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 //stl
 #include <list>

src/agg/agg_renderer.cpp

@@ -43,7 +43,9 @@
 #include <mapnik/image_filter.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/image_any.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_color_rgba.h"
@@ -53,9 +55,12 @@
 #include "agg_span_allocator.h"
 #include "agg_image_accessors.h"
 #include "agg_span_image_filter_rgba.h"
+#pragma GCC diagnostic pop
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <cmath>

src/agg/process_building_symbolizer.cpp

@@ -33,10 +33,12 @@
 #include <mapnik/expression.hpp>
 #include <mapnik/renderer_common/process_building_symbolizer.hpp>
 #include <mapnik/transform_path_adapter.hpp>
+
 // stl
 #include <deque>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
 #include "agg_color_rgba.h"
@@ -45,6 +47,7 @@
 #include "agg_scanline_u.h"
 #include "agg_renderer_scanline.h"
 #include "agg_conv_stroke.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

src/agg/process_debug_symbolizer.cpp

@@ -33,7 +33,8 @@
 #include <mapnik/agg_helpers.hpp>
 #include <mapnik/util/is_clockwise.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
 #include "agg_color_rgba.h"
@@ -41,6 +42,7 @@
 #include "agg_scanline_u.h"
 #include "agg_renderer_scanline.h"
 #include "agg_conv_stroke.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/agg/process_dot_symbolizer.cpp

@@ -33,7 +33,8 @@
 #include <mapnik/proj_transform.hpp>
 #include <mapnik/image_compositing.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_ellipse.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
@@ -41,6 +42,7 @@
 #include "agg_renderer_scanline.h"
 #include "agg_color_rgba.h"
 #include "agg_renderer_base.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik { namespace detail {
 

src/agg/process_group_symbolizer.cpp

@@ -35,8 +35,10 @@
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/svg/svg_converter.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/agg/process_line_pattern_symbolizer.cpp

@@ -37,7 +37,10 @@
 #include <mapnik/renderer_common/clipping_extent.hpp>
 #include <mapnik/renderer_common/render_pattern.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-// agg
+
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_color_rgba.h"
@@ -50,6 +53,7 @@
 #include "agg_span_allocator.h"
 #include "agg_span_pattern_rgba.h"
 #include "agg_renderer_outline_image.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/agg/process_line_symbolizer.cpp

@@ -32,7 +32,9 @@
 #include <mapnik/renderer_common/clipping_extent.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 #include <mapnik/geometry_type.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
@@ -45,6 +47,7 @@
 #include "agg_conv_dash.h"
 #include "agg_renderer_outline_aa.h"
 #include "agg_rasterizer_outline_aa.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/agg/process_markers_symbolizer.cpp

@@ -33,7 +33,8 @@
 #include <mapnik/renderer_common/clipping_extent.hpp>
 #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_renderer_base.h"
 #include "agg_renderer_scanline.h"
@@ -44,6 +45,7 @@
 #include "agg_scanline_u.h"
 #include "agg_path_storage.h"
 #include "agg_conv_transform.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/agg/process_point_symbolizer.cpp

@@ -34,8 +34,10 @@
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/renderer_common/process_point_symbolizer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/agg/process_polygon_pattern_symbolizer.cpp

@@ -39,7 +39,9 @@
 #include <mapnik/renderer_common/render_pattern.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 #include <mapnik/renderer_common/pattern_alignment.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
@@ -52,6 +54,7 @@
 #include "agg_span_pattern_rgba.h"
 #include "agg_image_accessors.h"
 #include "agg_conv_clip_polygon.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/agg/process_polygon_symbolizer.cpp

@@ -32,7 +32,9 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/renderer_common/process_polygon_symbolizer.hpp>
 #include <mapnik/renderer_common/clipping_extent.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
@@ -40,6 +42,7 @@
 #include "agg_renderer_scanline.h"
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_scanline_u.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/agg/process_raster_symbolizer.cpp

@@ -38,9 +38,11 @@
 // stl
 #include <cmath>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/font_engine_freetype.cpp

@@ -33,11 +33,6 @@
 #include <mapnik/warning_ignore.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/optional.hpp>
-#pragma GCC diagnostic pop
-
-// stl
-#include <algorithm>
-#include <stdexcept>
 
 // freetype2
 extern "C"
@@ -47,6 +42,11 @@ extern "C"
 #include FT_STROKER_H
 #include FT_MODULE_H
 }
+#pragma GCC diagnostic pop
+
+// stl
+#include <algorithm>
+#include <stdexcept>
 
 
 namespace mapnik

src/fs.cpp

@@ -24,9 +24,12 @@
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/fs.hpp>
 
-// boost
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/filesystem/operations.hpp>  // for absolute, exists, etc
 #include <boost/filesystem/path.hpp>    // for path, operator/
+#pragma GCC diagnostic pop
 
 // stl
 #include <stdexcept>

src/grid/grid_renderer.cpp

@@ -47,8 +47,10 @@
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/pixel_position.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include <boost/math/special_functions/round.hpp>
+#pragma GCC diagnostic pop
 
 // agg
 #include "agg_trans_affine.h"

src/grid/process_building_symbolizer.cpp

@@ -39,11 +39,13 @@
 // stl
 #include <deque>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_renderer_scanline.h"
 #include "agg_scanline_bin.h"
 #include "agg_conv_stroke.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

src/grid/process_group_symbolizer.cpp

@@ -37,8 +37,10 @@
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/renderer_common/render_group_symbolizer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/grid/process_line_pattern_symbolizer.cpp

@@ -35,12 +35,15 @@
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/parse_path.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_renderer_scanline.h"
 #include "agg_scanline_bin.h"
 #include "agg_conv_stroke.h"
 #include "agg_conv_dash.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/grid/process_line_symbolizer.cpp

@@ -32,12 +32,15 @@
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 #include <mapnik/geometry_type.hpp>
-// agg
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_renderer_scanline.h"
 #include "agg_scanline_bin.h"
 #include "agg_conv_stroke.h"
 #include "agg_conv_dash.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/grid/process_markers_symbolizer.cpp

@@ -55,10 +55,12 @@ porting notes -->
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
 #include "agg_rasterizer_scanline_aa.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/grid/process_point_symbolizer.cpp

@@ -36,8 +36,10 @@
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/renderer_common/process_point_symbolizer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/grid/process_polygon_pattern_symbolizer.cpp

@@ -36,10 +36,12 @@
 #include <mapnik/parse_path.hpp>
 #include <mapnik/renderer_common/apply_vertex_converter.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_renderer_scanline.h"
 #include "agg_scanline_bin.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/grid/process_polygon_symbolizer.cpp

@@ -34,10 +34,12 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/renderer_common/process_polygon_symbolizer.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_renderer_scanline.h"
 #include "agg_scanline_bin.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/grid/process_shield_symbolizer.cpp

@@ -33,8 +33,11 @@
 #include <mapnik/text/renderer.hpp>
 #include <mapnik/text/glyph_positions.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#include "agg_gamma_functions.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/image_compositing.cpp

@@ -33,7 +33,8 @@
 #include <boost/bimap.hpp>
 #pragma GCC diagnostic pop
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_scanline_u.h"
@@ -41,7 +42,7 @@
 #include "agg_pixfmt_rgba.h"
 #include "agg_pixfmt_gray.h"
 #include "agg_color_rgba.h"
-
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

src/image_scaling.cpp

@@ -25,14 +25,14 @@
 #include <mapnik/image_scaling.hpp>
 #include <mapnik/image_scaling_traits.hpp>
 
-// boost
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/bimap.hpp>
 #pragma GCC diagnostic pop
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_image_accessors.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_pixfmt_gray.h"
@@ -47,6 +47,7 @@
 #include "agg_span_interpolator_linear.h"
 #include "agg_trans_affine.h"
 #include "agg_image_filters.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

src/image_util.cpp

@@ -38,13 +38,14 @@
 #include <mapnik/safe_cast.hpp>
 #ifdef SSE_MATH
 #include <mapnik/sse.hpp>
-
 #endif
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_color_rgba.h"
+#pragma GCC diagnostic pop
 
 // stl
 #include <string>

src/load_map.cpp

@@ -59,18 +59,22 @@
 #include <mapnik/evaluate_global_attributes.hpp>
 #include <mapnik/boolean.hpp>
 
-// boost
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <boost/optional.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/static_assert.hpp>
+#pragma GCC diagnostic pop
 
 // stl
 #include <algorithm>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_trans_affine.h"
+#pragma GCC diagnostic pop
 
 using boost::tokenizer;
 

src/marker_cache.cpp

@@ -39,9 +39,11 @@
 #include <boost/algorithm/string.hpp>
 #pragma GCC diagnostic pop
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik
 {

src/marker_helpers.cpp

@@ -24,8 +24,12 @@
 #include <mapnik/marker_helpers.hpp>
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/label_collision_detector.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_ellipse.h"
 #include "agg_color_rgba.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/renderer_common/render_pattern.cpp

@@ -28,12 +28,15 @@
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/agg_rasterizer.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_pixfmt_gray.h"
 #include "agg_color_rgba.h"
 #include "agg_color_gray.h"
 #include "agg_scanline_u.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {
 

src/svg/svg_parser.cpp

@@ -30,10 +30,14 @@
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/util/dasharray_parser.hpp>
+
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_ellipse.h"
 #include "agg_rounded_rect.h"
 #include "agg_span_gradient.h"
 #include "agg_color_rgba.h"
+#pragma GCC diagnostic pop
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>

src/text/face.cpp

@@ -23,11 +23,16 @@
 #include <mapnik/text/face.hpp>
 #include <mapnik/debug.hpp>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
 extern "C"
 {
 #include FT_GLYPH_H
 }
 
+#pragma GCC diagnostic pop
+
 namespace mapnik
 {
 

src/text/font_library.cpp

@@ -28,6 +28,9 @@
 #include <cstdlib>
 #include <stdexcept>
 
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
+
 // freetype2
 extern "C"
 {
@@ -36,6 +39,8 @@ extern "C"
 #include FT_MODULE_H
 }
 
+#pragma GCC diagnostic pop
+
 namespace {
 
 void* _Alloc_Func(FT_Memory, long size)

src/text/text_layout.cpp

@@ -29,8 +29,11 @@
 #include <mapnik/text/harfbuzz_shaper.hpp>
 #include <mapnik/make_unique.hpp>
 
-// ICU
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore.hpp>
 #include <unicode/brkiter.h>
+#pragma GCC diagnostic pop
+
 #include <algorithm>
 
 namespace mapnik

src/warp.cpp

@@ -31,7 +31,8 @@
 #include <mapnik/raster.hpp>
 #include <mapnik/proj_transform.hpp>
 
-// agg
+#pragma GCC diagnostic push
+#include <mapnik/warning_ignore_agg.hpp>
 #include "agg_image_filters.h"
 #include "agg_trans_bilinear.h"
 #include "agg_span_interpolator_linear.h"
@@ -45,6 +46,7 @@
 #include "agg_span_allocator.h"
 #include "agg_image_accessors.h"
 #include "agg_renderer_scanline.h"
+#pragma GCC diagnostic pop
 
 namespace mapnik {