From 341db51aa7cb5d618a01d4a0bc9779fcaec6df98 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 9 Mar 2016 16:42:15 -0800 Subject: [PATCH] finish wrapping boost includes to suppress warnings - add agg wrapper - refs #2907 --- include/mapnik/agg_helpers.hpp | 4 +++- include/mapnik/agg_pattern_source.hpp | 4 +++- include/mapnik/agg_rasterizer.hpp | 5 ++++- include/mapnik/agg_render_marker.hpp | 4 +++- include/mapnik/box2d.hpp | 4 +++- include/mapnik/cairo/cairo_context.hpp | 14 +++++++----- include/mapnik/color.hpp | 4 +++- include/mapnik/coord.hpp | 4 +++- include/mapnik/feature_kv_iterator.hpp | 4 +++- include/mapnik/feature_type_style.hpp | 4 +++- include/mapnik/global.hpp | 16 +++++++------- include/mapnik/grid/grid_rasterizer.hpp | 4 ++++ include/mapnik/grid/grid_render_marker.hpp | 5 +++-- include/mapnik/grid/grid_renderer_base.hpp | 6 ++--- include/mapnik/grid/grid_rendering_buffer.hpp | 4 ++++ include/mapnik/image_compositing.hpp | 4 +++- include/mapnik/image_filter.hpp | 5 ++++- include/mapnik/image_options.hpp | 5 +++++ include/mapnik/image_reader.hpp | 6 ++++- include/mapnik/image_scaling.hpp | 5 ++++- include/mapnik/image_scaling_traits.hpp | 4 +++- include/mapnik/label_collision_detector.hpp | 4 +++- include/mapnik/map.hpp | 4 +++- include/mapnik/mapped_memory_cache.hpp | 5 +++++ include/mapnik/marker.hpp | 4 +++- include/mapnik/marker_helpers.hpp | 5 ++++- include/mapnik/markers_placements/basic.hpp | 4 +++- include/mapnik/params.hpp | 5 ++++- .../mapnik/path_expression_grammar_impl.hpp | 5 ++++- include/mapnik/projection.hpp | 4 +++- include/mapnik/ptree_helpers.hpp | 4 +++- include/mapnik/raster.hpp | 5 ++++- include/mapnik/raster_colorizer.hpp | 11 +++++----- .../process_raster_symbolizer.hpp | 4 +++- include/mapnik/simplify.hpp | 4 +++- include/mapnik/span_image_filter.hpp | 14 ++++++++---- include/mapnik/stringify_macro.hpp | 19 ++-------------- include/mapnik/svg/svg_converter.hpp | 4 +++- include/mapnik/svg/svg_path_adapter.hpp | 4 +++- include/mapnik/svg/svg_path_attributes.hpp | 12 +++++----- include/mapnik/svg/svg_renderer_agg.hpp | 4 +++- include/mapnik/symbolizer.hpp | 4 +++- include/mapnik/text/face.hpp | 6 ++++- include/mapnik/text/font_feature_settings.hpp | 8 ++++++- include/mapnik/text/formatting/layout.hpp | 3 +++ include/mapnik/text/glyph_positions.hpp | 4 +++- include/mapnik/text/harfbuzz_shaper.hpp | 6 ++--- include/mapnik/text/icu_shaper.hpp | 5 +++-- include/mapnik/text/itemizer.hpp | 4 +++- include/mapnik/text/properties_util.hpp | 7 ++++-- include/mapnik/text/renderer.hpp | 7 +++++- include/mapnik/text/scrptrun.hpp | 3 +++ include/mapnik/text/text_properties.hpp | 4 +++- include/mapnik/transform_expression.hpp | 6 +++-- .../mapnik/util/const_rendering_buffer.hpp | 3 +++ include/mapnik/util/geometry_to_ds_type.hpp | 7 +++++- include/mapnik/util/variant.hpp | 6 ++++- include/mapnik/value_hash.hpp | 4 +++- include/mapnik/value_types.hpp | 5 ++++- include/mapnik/vertex_cache.hpp | 4 +++- include/mapnik/vertex_converters.hpp | 4 +++- include/mapnik/warning_ignore.hpp | 22 ++++++++++++++++++- include/mapnik/well_known_srs.hpp | 4 +++- include/mapnik/xml_node.hpp | 4 +++- src/agg/agg_renderer.cpp | 9 ++++++-- src/agg/process_building_symbolizer.cpp | 5 ++++- src/agg/process_debug_symbolizer.cpp | 4 +++- src/agg/process_dot_symbolizer.cpp | 4 +++- src/agg/process_group_symbolizer.cpp | 4 +++- src/agg/process_line_pattern_symbolizer.cpp | 6 ++++- src/agg/process_line_symbolizer.cpp | 5 ++++- src/agg/process_markers_symbolizer.cpp | 4 +++- src/agg/process_point_symbolizer.cpp | 4 +++- .../process_polygon_pattern_symbolizer.cpp | 5 ++++- src/agg/process_polygon_symbolizer.cpp | 5 ++++- src/agg/process_raster_symbolizer.cpp | 4 +++- src/font_engine_freetype.cpp | 10 ++++----- src/fs.cpp | 5 ++++- src/grid/grid_renderer.cpp | 4 +++- src/grid/process_building_symbolizer.cpp | 4 +++- src/grid/process_group_symbolizer.cpp | 4 +++- src/grid/process_line_pattern_symbolizer.cpp | 5 ++++- src/grid/process_line_symbolizer.cpp | 5 ++++- src/grid/process_markers_symbolizer.cpp | 4 +++- src/grid/process_point_symbolizer.cpp | 4 +++- .../process_polygon_pattern_symbolizer.cpp | 4 +++- src/grid/process_polygon_symbolizer.cpp | 4 +++- src/grid/process_shield_symbolizer.cpp | 5 ++++- src/image_compositing.cpp | 5 +++-- src/image_scaling.cpp | 5 +++-- src/image_util.cpp | 5 +++-- src/load_map.cpp | 8 +++++-- src/marker_cache.cpp | 4 +++- src/marker_helpers.cpp | 4 ++++ src/renderer_common/render_pattern.cpp | 3 +++ src/svg/svg_parser.cpp | 4 ++++ src/text/face.cpp | 5 +++++ src/text/font_library.cpp | 5 +++++ src/text/text_layout.cpp | 5 ++++- src/warp.cpp | 4 +++- 100 files changed, 400 insertions(+), 144 deletions(-) diff --git a/include/mapnik/agg_helpers.hpp b/include/mapnik/agg_helpers.hpp index 139405cd9..ff87ce0ef 100644 --- a/include/mapnik/agg_helpers.hpp +++ b/include/mapnik/agg_helpers.hpp @@ -26,8 +26,10 @@ // mapnik #include -// agg +#pragma GCC diagnostic push +#include #include "agg_gamma_functions.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/agg_pattern_source.hpp b/include/mapnik/agg_pattern_source.hpp index a0000204f..42dd7f36f 100644 --- a/include/mapnik/agg_pattern_source.hpp +++ b/include/mapnik/agg_pattern_source.hpp @@ -27,8 +27,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_color_rgba.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/agg_rasterizer.hpp b/include/mapnik/agg_rasterizer.hpp index 51cf4cd5d..66da59fd6 100644 --- a/include/mapnik/agg_rasterizer.hpp +++ b/include/mapnik/agg_rasterizer.hpp @@ -26,8 +26,11 @@ // mapnik #include -// agg + +#pragma GCC diagnostic push +#include #include "agg_rasterizer_scanline_aa.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/agg_render_marker.hpp b/include/mapnik/agg_render_marker.hpp index 65e531cfd..283807a93 100644 --- a/include/mapnik/agg_render_marker.hpp +++ b/include/mapnik/agg_render_marker.hpp @@ -30,7 +30,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/include/mapnik/box2d.hpp b/include/mapnik/box2d.hpp index 4471c281c..d63908b8a 100644 --- a/include/mapnik/box2d.hpp +++ b/include/mapnik/box2d.hpp @@ -27,8 +27,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // agg // forward declare so that apps using mapnik do not need agg headers diff --git a/include/mapnik/cairo/cairo_context.hpp b/include/mapnik/cairo/cairo_context.hpp index 3f065db36..9733efbd6 100644 --- a/include/mapnik/cairo/cairo_context.hpp +++ b/include/mapnik/cairo/cairo_context.hpp @@ -38,18 +38,20 @@ #include #include +#pragma GCC diagnostic push +#include +#include +#pragma GCC diagnostic pop + // stl #include - -// cairo -#include - -// stl #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_basics.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/color.hpp b/include/mapnik/color.hpp index 690803a9a..434a9cf21 100644 --- a/include/mapnik/color.hpp +++ b/include/mapnik/color.hpp @@ -27,8 +27,10 @@ #include #include -//boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/coord.hpp b/include/mapnik/coord.hpp index fcdfa9090..f8ea3f161 100644 --- a/include/mapnik/coord.hpp +++ b/include/mapnik/coord.hpp @@ -23,8 +23,10 @@ #ifndef MAPNIK_COORD_HPP #define MAPNIK_COORD_HPP -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop namespace mapnik { template diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp index 37093a897..77b292fd5 100644 --- a/include/mapnik/feature_kv_iterator.hpp +++ b/include/mapnik/feature_kv_iterator.hpp @@ -27,12 +27,14 @@ #include #include #include -// boost +#pragma GCC diagnostic push +#include #include #include #include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/feature_type_style.hpp b/include/mapnik/feature_type_style.hpp index 68240af3a..9f9f1aec9 100644 --- a/include/mapnik/feature_type_style.hpp +++ b/include/mapnik/feature_type_style.hpp @@ -29,8 +29,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/global.hpp b/include/mapnik/global.hpp index aa5be35f5..39a8c5ff7 100644 --- a/include/mapnik/global.hpp +++ b/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(data[7]) & 0xff) | + (static_cast(data[6]) & 0xff) << 8 | + (static_cast(data[5]) & 0xff) << 16 | + (static_cast(data[4]) & 0xff) << 24 | + (static_cast(data[3]) & 0xff) << 32 | + (static_cast(data[2]) & 0xff) << 40 | + (static_cast(data[1]) & 0xff) << 48 | + (static_cast(data[0]) & 0xff) << 56 ; std::memcpy(&val,&bits,8); } diff --git a/include/mapnik/grid/grid_rasterizer.hpp b/include/mapnik/grid/grid_rasterizer.hpp index 98a6dd31f..612944799 100644 --- a/include/mapnik/grid/grid_rasterizer.hpp +++ b/include/mapnik/grid/grid_rasterizer.hpp @@ -24,7 +24,11 @@ #define MAPNIK_GRID_RASTERIZER_HPP #include + +#pragma GCC diagnostic push +#include #include "agg_rasterizer_scanline_aa.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/grid/grid_render_marker.hpp b/include/mapnik/grid/grid_render_marker.hpp index 8f345e301..5ad5fea13 100644 --- a/include/mapnik/grid/grid_render_marker.hpp +++ b/include/mapnik/grid/grid_render_marker.hpp @@ -26,7 +26,8 @@ // mapnik #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/include/mapnik/grid/grid_renderer_base.hpp b/include/mapnik/grid/grid_renderer_base.hpp index 1000083df..bcc2e18c1 100644 --- a/include/mapnik/grid/grid_renderer_base.hpp +++ b/include/mapnik/grid/grid_renderer_base.hpp @@ -24,11 +24,11 @@ #define MAPNIK_GRID_RENDERER_BASE_HPP #pragma GCC diagnostic push -#include -#include "agg_renderer_base.h" +#include #include -#pragma GCC diagnostic pop #include +#include "agg_renderer_base.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/grid/grid_rendering_buffer.hpp b/include/mapnik/grid/grid_rendering_buffer.hpp index 4282e3bb9..8ab12cfc0 100644 --- a/include/mapnik/grid/grid_rendering_buffer.hpp +++ b/include/mapnik/grid/grid_rendering_buffer.hpp @@ -24,7 +24,11 @@ #define MAPNIK_GRID_RENDERING_BUFFER_HPP #include + +#pragma GCC diagnostic push +#include #include "agg_rendering_buffer.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/image_compositing.hpp b/include/mapnik/image_compositing.hpp index 2967be780..82b89a398 100644 --- a/include/mapnik/image_compositing.hpp +++ b/include/mapnik/image_compositing.hpp @@ -26,8 +26,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp index 9b0b754cc..a96d4cd9d 100644 --- a/include/mapnik/image_filter.hpp +++ b/include/mapnik/image_filter.hpp @@ -34,7 +34,8 @@ #include #pragma GCC diagnostic pop -// agg +#pragma GCC diagnostic push +#include #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 diff --git a/include/mapnik/image_options.hpp b/include/mapnik/image_options.hpp index fc8f9f1a5..d44b2bf35 100644 --- a/include/mapnik/image_options.hpp +++ b/include/mapnik/image_options.hpp @@ -25,7 +25,12 @@ #include #include + +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop + namespace mapnik { diff --git a/include/mapnik/image_reader.hpp b/include/mapnik/image_reader.hpp index a15d7c9dd..6c1c2329c 100644 --- a/include/mapnik/image_reader.hpp +++ b/include/mapnik/image_reader.hpp @@ -29,8 +29,12 @@ #include #include #include -// boost + +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop + // stl #include #include diff --git a/include/mapnik/image_scaling.hpp b/include/mapnik/image_scaling.hpp index ddae3689f..461e99f27 100644 --- a/include/mapnik/image_scaling.hpp +++ b/include/mapnik/image_scaling.hpp @@ -30,8 +30,11 @@ // stl #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop + namespace mapnik { diff --git a/include/mapnik/image_scaling_traits.hpp b/include/mapnik/image_scaling_traits.hpp index 81ddf54e4..b8daff152 100644 --- a/include/mapnik/image_scaling_traits.hpp +++ b/include/mapnik/image_scaling_traits.hpp @@ -28,7 +28,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/include/mapnik/label_collision_detector.hpp b/include/mapnik/label_collision_detector.hpp index 684618087..f751f31c3 100644 --- a/include/mapnik/label_collision_detector.hpp +++ b/include/mapnik/label_collision_detector.hpp @@ -28,8 +28,10 @@ #include #include -// icu +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/map.hpp b/include/mapnik/map.hpp index 23ea96a7c..9f582791b 100644 --- a/include/mapnik/map.hpp +++ b/include/mapnik/map.hpp @@ -34,8 +34,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/mapped_memory_cache.hpp b/include/mapnik/mapped_memory_cache.hpp index c67d63ad7..1ac8d877e 100644 --- a/include/mapnik/mapped_memory_cache.hpp +++ b/include/mapnik/mapped_memory_cache.hpp @@ -31,7 +31,12 @@ #include #include #include + +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop + namespace boost { namespace interprocess { class mapped_region; } } diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp index 8ba117ec3..1feb0fecf 100644 --- a/include/mapnik/marker.hpp +++ b/include/mapnik/marker.hpp @@ -29,8 +29,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_array.h" +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/marker_helpers.hpp b/include/mapnik/marker_helpers.hpp index 9f055da9a..8ba3c6f4b 100644 --- a/include/mapnik/marker_helpers.hpp +++ b/include/mapnik/marker_helpers.hpp @@ -37,8 +37,11 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/markers_placements/basic.hpp b/include/mapnik/markers_placements/basic.hpp index 2889c8041..abcef5ea6 100644 --- a/include/mapnik/markers_placements/basic.hpp +++ b/include/mapnik/markers_placements/basic.hpp @@ -29,9 +29,11 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_basics.h" #include "agg_trans_affine.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/params.hpp b/include/mapnik/params.hpp index a154cf731..a38fa54e7 100644 --- a/include/mapnik/params.hpp +++ b/include/mapnik/params.hpp @@ -27,8 +27,11 @@ #include #include #include -// boost + +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/path_expression_grammar_impl.hpp b/include/mapnik/path_expression_grammar_impl.hpp index bc2fcfb52..22002bf33 100644 --- a/include/mapnik/path_expression_grammar_impl.hpp +++ b/include/mapnik/path_expression_grammar_impl.hpp @@ -24,10 +24,13 @@ #include #include -// boost + +#pragma GCC diagnostic push +#include #include #include #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/projection.hpp b/include/mapnik/projection.hpp index cb4284fb0..0869bb2d6 100644 --- a/include/mapnik/projection.hpp +++ b/include/mapnik/projection.hpp @@ -27,8 +27,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/ptree_helpers.hpp b/include/mapnik/ptree_helpers.hpp index 3062d7115..6a9c91e56 100644 --- a/include/mapnik/ptree_helpers.hpp +++ b/include/mapnik/ptree_helpers.hpp @@ -26,8 +26,10 @@ // stl #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/raster.hpp b/include/mapnik/raster.hpp index 311c06cf0..02022d359 100644 --- a/include/mapnik/raster.hpp +++ b/include/mapnik/raster.hpp @@ -28,8 +28,11 @@ #include #include #include - // boost + +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/raster_colorizer.hpp b/include/mapnik/raster_colorizer.hpp index c1e83aba1..e496c2400 100644 --- a/include/mapnik/raster_colorizer.hpp +++ b/include/mapnik/raster_colorizer.hpp @@ -41,12 +41,13 @@ #include #include #include - // boost -#include -// boost -#include -// stl +#pragma GCC diagnostic push +#include +#include +#pragma GCC diagnostic pop + +#include #include namespace mapnik diff --git a/include/mapnik/renderer_common/process_raster_symbolizer.hpp b/include/mapnik/renderer_common/process_raster_symbolizer.hpp index f8ce32d84..7ca90a0af 100644 --- a/include/mapnik/renderer_common/process_raster_symbolizer.hpp +++ b/include/mapnik/renderer_common/process_raster_symbolizer.hpp @@ -32,13 +32,15 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/include/mapnik/simplify.hpp b/include/mapnik/simplify.hpp index 71b7711bf..dd75fcf2d 100644 --- a/include/mapnik/simplify.hpp +++ b/include/mapnik/simplify.hpp @@ -7,8 +7,10 @@ // stl #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/span_image_filter.hpp b/include/mapnik/span_image_filter.hpp index 31217690e..c0a9adbb9 100644 --- a/include/mapnik/span_image_filter.hpp +++ b/include/mapnik/span_image_filter.hpp @@ -23,15 +23,21 @@ #ifndef MAPNIK_SPAN_IMAGE_FILTER_INCLUDED #define MAPNIK_SPAN_IMAGE_FILTER_INCLUDED +#include + +#pragma GCC diagnostic push +#include +#include +#pragma GCC diagnostic pop + +#pragma GCC diagnostic push +#include #include "agg_span_image_filter_gray.h" #include "agg_span_image_filter_rgba.h" - -#include +#pragma GCC diagnostic pop #include -#include - namespace mapnik { diff --git a/include/mapnik/stringify_macro.hpp b/include/mapnik/stringify_macro.hpp index 3298d75b8..41f947467 100644 --- a/include/mapnik/stringify_macro.hpp +++ b/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 \ No newline at end of file diff --git a/include/mapnik/svg/svg_converter.hpp b/include/mapnik/svg/svg_converter.hpp index 50d7708b2..9cf3c9c16 100644 --- a/include/mapnik/svg/svg_converter.hpp +++ b/include/mapnik/svg/svg_converter.hpp @@ -29,7 +29,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 diff --git a/include/mapnik/svg/svg_path_adapter.hpp b/include/mapnik/svg/svg_path_adapter.hpp index 3b09af4bc..8b4fb6bf2 100644 --- a/include/mapnik/svg/svg_path_adapter.hpp +++ b/include/mapnik/svg/svg_path_adapter.hpp @@ -28,10 +28,12 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_math.h" #include "agg_array.h" #include "agg_bezier_arc.h" +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/svg/svg_path_attributes.hpp b/include/mapnik/svg/svg_path_attributes.hpp index d1b48aa8f..80bf46349 100644 --- a/include/mapnik/svg/svg_path_attributes.hpp +++ b/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 #include // dash_array +#pragma GCC diagnostic push +#include +#include "agg_math_stroke.h" +#include "agg_color_rgba.h" +#include "agg_trans_affine.h" +#pragma GCC diagnostic pop + namespace mapnik { namespace svg { diff --git a/include/mapnik/svg/svg_renderer_agg.hpp b/include/mapnik/svg/svg_renderer_agg.hpp index 3c714cd68..d99575b4d 100644 --- a/include/mapnik/svg/svg_renderer_agg.hpp +++ b/include/mapnik/svg/svg_renderer_agg.hpp @@ -37,7 +37,8 @@ #pragma GCC diagnostic pop #endif -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp index 39d650d32..9308ecd7b 100644 --- a/include/mapnik/symbolizer.hpp +++ b/include/mapnik/symbolizer.hpp @@ -51,8 +51,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/text/face.hpp b/include/mapnik/text/face.hpp index 87692ca5c..3d797a1f2 100644 --- a/include/mapnik/text/face.hpp +++ b/include/mapnik/text/face.hpp @@ -27,7 +27,9 @@ #include #include -// freetype2 +#pragma GCC diagnostic push +#include + extern "C" { #include @@ -35,6 +37,8 @@ extern "C" #include FT_STROKER_H } +#pragma GCC diagnostic pop + //stl #include #include diff --git a/include/mapnik/text/font_feature_settings.hpp b/include/mapnik/text/font_feature_settings.hpp index 9d945fbe5..8bc3e33c6 100644 --- a/include/mapnik/text/font_feature_settings.hpp +++ b/include/mapnik/text/font_feature_settings.hpp @@ -31,8 +31,11 @@ #include #include #include -// harfbuzz + +#pragma GCC diagnostic push +#include #include +#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::max(); +#pragma GCC diagnostic push +#include 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 diff --git a/include/mapnik/text/formatting/layout.hpp b/include/mapnik/text/formatting/layout.hpp index dd7f4b011..6892ce72b 100644 --- a/include/mapnik/text/formatting/layout.hpp +++ b/include/mapnik/text/formatting/layout.hpp @@ -26,7 +26,10 @@ #include #include +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop namespace mapnik { namespace formatting { diff --git a/include/mapnik/text/glyph_positions.hpp b/include/mapnik/text/glyph_positions.hpp index 72314c319..aa08e3376 100644 --- a/include/mapnik/text/glyph_positions.hpp +++ b/include/mapnik/text/glyph_positions.hpp @@ -30,8 +30,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#pragma GCC diagnostic pop //stl #include diff --git a/include/mapnik/text/harfbuzz_shaper.hpp b/include/mapnik/text/harfbuzz_shaper.hpp index 0f23bc844..8b574b095 100644 --- a/include/mapnik/text/harfbuzz_shaper.hpp +++ b/include/mapnik/text/harfbuzz_shaper.hpp @@ -36,12 +36,12 @@ #include #include -// harfbuzz +#pragma GCC diagnostic push +#include #include #include - -// icu #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/text/icu_shaper.hpp b/include/mapnik/text/icu_shaper.hpp index bcd822b27..39bc590bb 100644 --- a/include/mapnik/text/icu_shaper.hpp +++ b/include/mapnik/text/icu_shaper.hpp @@ -36,11 +36,12 @@ // stl #include -// icu +#pragma GCC diagnostic push +#include #include #include #include - +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/text/itemizer.hpp b/include/mapnik/text/itemizer.hpp index b8589448d..5087ce06f 100644 --- a/include/mapnik/text/itemizer.hpp +++ b/include/mapnik/text/itemizer.hpp @@ -34,10 +34,12 @@ #include #include -// ICU +#pragma GCC diagnostic push +#include #include #include #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/text/properties_util.hpp b/include/mapnik/text/properties_util.hpp index 0fff84e7b..5b92ed306 100644 --- a/include/mapnik/text/properties_util.hpp +++ b/include/mapnik/text/properties_util.hpp @@ -26,11 +26,14 @@ #include #include #include -#include + #include -// boost +#pragma GCC diagnostic push +#include +#include #include +#pragma GCC diagnostic pop namespace mapnik { namespace detail { diff --git a/include/mapnik/text/renderer.hpp b/include/mapnik/text/renderer.hpp index a4cd76ed7..692ada3cd 100644 --- a/include/mapnik/text/renderer.hpp +++ b/include/mapnik/text/renderer.hpp @@ -28,7 +28,10 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include + #include // freetype2 @@ -39,6 +42,8 @@ extern "C" #include FT_STROKER_H } +#pragma GCC diagnostic pop + namespace mapnik { diff --git a/include/mapnik/text/scrptrun.hpp b/include/mapnik/text/scrptrun.hpp index 67942b0a8..7c8063b28 100644 --- a/include/mapnik/text/scrptrun.hpp +++ b/include/mapnik/text/scrptrun.hpp @@ -17,9 +17,12 @@ #ifndef __SCRPTRUN_H #define __SCRPTRUN_H +#pragma GCC diagnostic push +#include #include #include #include +#pragma GCC diagnostic pop struct ScriptRecord { diff --git a/include/mapnik/text/text_properties.hpp b/include/mapnik/text/text_properties.hpp index 654921eb2..511ba3a28 100644 --- a/include/mapnik/text/text_properties.hpp +++ b/include/mapnik/text/text_properties.hpp @@ -36,9 +36,11 @@ // stl #include -// boost +#pragma GCC diagnostic push +#include #include #include +#pragma GCC diagnostic pop namespace mapnik { diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp index 9714b1eeb..b43f69170 100644 --- a/include/mapnik/transform_expression.hpp +++ b/include/mapnik/transform_expression.hpp @@ -30,11 +30,13 @@ #include #include #include -// boost + +#pragma GCC diagnostic push +#include #include -// fusion #include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/util/const_rendering_buffer.hpp b/include/mapnik/util/const_rendering_buffer.hpp index 360eea564..97b98ca65 100644 --- a/include/mapnik/util/const_rendering_buffer.hpp +++ b/include/mapnik/util/const_rendering_buffer.hpp @@ -25,7 +25,10 @@ #include +#pragma GCC diagnostic push +#include #include "agg_basics.h" +#pragma GCC diagnostic pop #include diff --git a/include/mapnik/util/geometry_to_ds_type.hpp b/include/mapnik/util/geometry_to_ds_type.hpp index 58fc89df2..e09808f3e 100644 --- a/include/mapnik/util/geometry_to_ds_type.hpp +++ b/include/mapnik/util/geometry_to_ds_type.hpp @@ -28,8 +28,13 @@ #include #include #include -// boost + +#pragma GCC diagnostic push +#include #include +#include +#include +#pragma GCC diagnostic pop namespace mapnik { namespace util { diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp index 61832a0b7..05dddecf8 100644 --- a/include/mapnik/util/variant.hpp +++ b/include/mapnik/util/variant.hpp @@ -24,9 +24,13 @@ #define MAPNIK_UTIL_VARIANT_HPP #include -#include // spirit support #include +#pragma GCC diagnostic push +#include +#include // spirit support +#pragma GCC diagnostic pop + namespace mapnik { namespace util { template diff --git a/include/mapnik/value_hash.hpp b/include/mapnik/value_hash.hpp index c1f1d60fc..b050e370e 100644 --- a/include/mapnik/value_hash.hpp +++ b/include/mapnik/value_hash.hpp @@ -30,8 +30,10 @@ // stl #include -// icu +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop namespace mapnik { namespace detail { diff --git a/include/mapnik/value_types.hpp b/include/mapnik/value_types.hpp index 85a015ba1..235133a34 100644 --- a/include/mapnik/value_types.hpp +++ b/include/mapnik/value_types.hpp @@ -27,8 +27,11 @@ #include #include -// icu + +#pragma GCC diagnostic push +#include #include // for U_NAMESPACE_QUALIFIER +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/vertex_cache.hpp b/include/mapnik/vertex_cache.hpp index a0a32e96b..9df786e62 100644 --- a/include/mapnik/vertex_cache.hpp +++ b/include/mapnik/vertex_cache.hpp @@ -28,8 +28,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_basics.h" +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp index d9ec9d0f8..ba1829472 100644 --- a/include/mapnik/vertex_converters.hpp +++ b/include/mapnik/vertex_converters.hpp @@ -37,7 +37,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 diff --git a/include/mapnik/warning_ignore.hpp b/include/mapnik/warning_ignore.hpp index a9856b970..2358ce19c 100644 --- a/include/mapnik/warning_ignore.hpp +++ b/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" \ No newline at end of file +#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" + diff --git a/include/mapnik/well_known_srs.hpp b/include/mapnik/well_known_srs.hpp index eeb478ee3..b5e6a4780 100644 --- a/include/mapnik/well_known_srs.hpp +++ b/include/mapnik/well_known_srs.hpp @@ -28,8 +28,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // stl #include diff --git a/include/mapnik/xml_node.hpp b/include/mapnik/xml_node.hpp index 1c3602134..bf7130c20 100644 --- a/include/mapnik/xml_node.hpp +++ b/include/mapnik/xml_node.hpp @@ -26,8 +26,10 @@ //mapnik #include // for MAPNIK_DECL -//boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop //stl #include diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp index 9fbcdca4b..f144ceaad 100644 --- a/src/agg/agg_renderer.cpp +++ b/src/agg/agg_renderer.cpp @@ -43,7 +43,9 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include #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 #include +#pragma GCC diagnostic pop // stl #include diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp index aabba778d..d27b68b7c 100644 --- a/src/agg/process_building_symbolizer.cpp +++ b/src/agg/process_building_symbolizer.cpp @@ -33,10 +33,12 @@ #include #include #include + // stl #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/src/agg/process_debug_symbolizer.cpp b/src/agg/process_debug_symbolizer.cpp index 2016c456d..3c3f898f8 100644 --- a/src/agg/process_debug_symbolizer.cpp +++ b/src/agg/process_debug_symbolizer.cpp @@ -33,7 +33,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/src/agg/process_dot_symbolizer.cpp b/src/agg/process_dot_symbolizer.cpp index cc375862d..cfb58c6e9 100644 --- a/src/agg/process_dot_symbolizer.cpp +++ b/src/agg/process_dot_symbolizer.cpp @@ -33,7 +33,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/src/agg/process_group_symbolizer.cpp b/src/agg/process_group_symbolizer.cpp index 010d3f18a..6ba5605dc 100644 --- a/src/agg/process_group_symbolizer.cpp +++ b/src/agg/process_group_symbolizer.cpp @@ -35,8 +35,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp index f5045c5a3..3b947a4cc 100644 --- a/src/agg/process_line_pattern_symbolizer.cpp +++ b/src/agg/process_line_pattern_symbolizer.cpp @@ -37,7 +37,10 @@ #include #include #include -// agg + + +#pragma GCC diagnostic push +#include #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 { diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp index b3a01c7e8..9bace2539 100644 --- a/src/agg/process_line_symbolizer.cpp +++ b/src/agg/process_line_symbolizer.cpp @@ -32,7 +32,9 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include #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 diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp index b229f01af..3fc122dcb 100644 --- a/src/agg/process_markers_symbolizer.cpp +++ b/src/agg/process_markers_symbolizer.cpp @@ -33,7 +33,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/src/agg/process_point_symbolizer.cpp b/src/agg/process_point_symbolizer.cpp index 1da740fe6..bb54db51c 100644 --- a/src/agg/process_point_symbolizer.cpp +++ b/src/agg/process_point_symbolizer.cpp @@ -34,8 +34,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#pragma GCC diagnostic pop // stl #include diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp index 8e340a9a8..e65488622 100644 --- a/src/agg/process_polygon_pattern_symbolizer.cpp +++ b/src/agg/process_polygon_pattern_symbolizer.cpp @@ -39,7 +39,9 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include #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 { diff --git a/src/agg/process_polygon_symbolizer.cpp b/src/agg/process_polygon_symbolizer.cpp index 9af6d4ac5..bd2d2bc15 100644 --- a/src/agg/process_polygon_symbolizer.cpp +++ b/src/agg/process_polygon_symbolizer.cpp @@ -32,7 +32,9 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include #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 { diff --git a/src/agg/process_raster_symbolizer.cpp b/src/agg/process_raster_symbolizer.cpp index 0105e9bc3..746a5cc2b 100644 --- a/src/agg/process_raster_symbolizer.cpp +++ b/src/agg/process_raster_symbolizer.cpp @@ -38,9 +38,11 @@ // stl #include -// agg +#pragma GCC diagnostic push +#include #include "agg_rendering_buffer.h" #include "agg_pixfmt_rgba.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp index efe654bee..a9470dc19 100644 --- a/src/font_engine_freetype.cpp +++ b/src/font_engine_freetype.cpp @@ -33,11 +33,6 @@ #include #include #include -#pragma GCC diagnostic pop - -// stl -#include -#include // freetype2 extern "C" @@ -47,6 +42,11 @@ extern "C" #include FT_STROKER_H #include FT_MODULE_H } +#pragma GCC diagnostic pop + +// stl +#include +#include namespace mapnik diff --git a/src/fs.cpp b/src/fs.cpp index 9c87d97be..640345396 100644 --- a/src/fs.cpp +++ b/src/fs.cpp @@ -24,9 +24,12 @@ #include #include -// boost + +#pragma GCC diagnostic push +#include #include // for absolute, exists, etc #include // for path, operator/ +#pragma GCC diagnostic pop // stl #include diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp index 33d10ee6a..43806030c 100644 --- a/src/grid/grid_renderer.cpp +++ b/src/grid/grid_renderer.cpp @@ -47,8 +47,10 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop // agg #include "agg_trans_affine.h" diff --git a/src/grid/process_building_symbolizer.cpp b/src/grid/process_building_symbolizer.cpp index e6649da53..13ee8d442 100644 --- a/src/grid/process_building_symbolizer.cpp +++ b/src/grid/process_building_symbolizer.cpp @@ -39,11 +39,13 @@ // stl #include -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/src/grid/process_group_symbolizer.cpp b/src/grid/process_group_symbolizer.cpp index a93ea9d59..ba7f48ece 100644 --- a/src/grid/process_group_symbolizer.cpp +++ b/src/grid/process_group_symbolizer.cpp @@ -37,8 +37,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/src/grid/process_line_pattern_symbolizer.cpp b/src/grid/process_line_pattern_symbolizer.cpp index dc370f73c..af54ac5b6 100644 --- a/src/grid/process_line_pattern_symbolizer.cpp +++ b/src/grid/process_line_pattern_symbolizer.cpp @@ -35,12 +35,15 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include #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 diff --git a/src/grid/process_line_symbolizer.cpp b/src/grid/process_line_symbolizer.cpp index c569f6b2c..b65dd8502 100644 --- a/src/grid/process_line_symbolizer.cpp +++ b/src/grid/process_line_symbolizer.cpp @@ -32,12 +32,15 @@ #include #include #include -// agg + +#pragma GCC diagnostic push +#include #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 diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp index 2fa71c880..380923211 100644 --- a/src/grid/process_markers_symbolizer.cpp +++ b/src/grid/process_markers_symbolizer.cpp @@ -55,10 +55,12 @@ porting notes --> #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_basics.h" #include "agg_rendering_buffer.h" #include "agg_rasterizer_scanline_aa.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp index 130fc1fc2..60328009d 100644 --- a/src/grid/process_point_symbolizer.cpp +++ b/src/grid/process_point_symbolizer.cpp @@ -36,8 +36,10 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#pragma GCC diagnostic pop // stl #include diff --git a/src/grid/process_polygon_pattern_symbolizer.cpp b/src/grid/process_polygon_pattern_symbolizer.cpp index 06408a801..5e30314e3 100644 --- a/src/grid/process_polygon_pattern_symbolizer.cpp +++ b/src/grid/process_polygon_pattern_symbolizer.cpp @@ -36,10 +36,12 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_rasterizer_scanline_aa.h" #include "agg_renderer_scanline.h" #include "agg_scanline_bin.h" +#pragma GCC diagnostic pop // stl #include diff --git a/src/grid/process_polygon_symbolizer.cpp b/src/grid/process_polygon_symbolizer.cpp index 3e1f08932..ab8526252 100644 --- a/src/grid/process_polygon_symbolizer.cpp +++ b/src/grid/process_polygon_symbolizer.cpp @@ -34,10 +34,12 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_rasterizer_scanline_aa.h" #include "agg_renderer_scanline.h" #include "agg_scanline_bin.h" +#pragma GCC diagnostic pop // stl #include diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp index 50bc8209f..0463bee8e 100644 --- a/src/grid/process_shield_symbolizer.cpp +++ b/src/grid/process_shield_symbolizer.cpp @@ -33,8 +33,11 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#include "agg_gamma_functions.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/src/image_compositing.cpp b/src/image_compositing.cpp index 925f56e64..a8f9bba3c 100644 --- a/src/image_compositing.cpp +++ b/src/image_compositing.cpp @@ -33,7 +33,8 @@ #include #pragma GCC diagnostic pop -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/src/image_scaling.cpp b/src/image_scaling.cpp index f0cc450e6..413948c64 100644 --- a/src/image_scaling.cpp +++ b/src/image_scaling.cpp @@ -25,14 +25,14 @@ #include #include -// boost #pragma GCC diagnostic push #include #include #include #pragma GCC diagnostic pop -// agg +#pragma GCC diagnostic push +#include #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 { diff --git a/src/image_util.cpp b/src/image_util.cpp index 43c599166..1fec8b130 100644 --- a/src/image_util.cpp +++ b/src/image_util.cpp @@ -38,13 +38,14 @@ #include #ifdef SSE_MATH #include - #endif -// agg +#pragma GCC diagnostic push +#include #include "agg_rendering_buffer.h" #include "agg_pixfmt_rgba.h" #include "agg_color_rgba.h" +#pragma GCC diagnostic pop // stl #include diff --git a/src/load_map.cpp b/src/load_map.cpp index 6e15ba2fb..f21708274 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -59,18 +59,22 @@ #include #include -// boost +#pragma GCC diagnostic push +#include #include #include #include #include #include +#pragma GCC diagnostic pop // stl #include -// agg +#pragma GCC diagnostic push +#include #include "agg_trans_affine.h" +#pragma GCC diagnostic pop using boost::tokenizer; diff --git a/src/marker_cache.cpp b/src/marker_cache.cpp index 9e4062226..6fef8613e 100644 --- a/src/marker_cache.cpp +++ b/src/marker_cache.cpp @@ -39,9 +39,11 @@ #include #pragma GCC diagnostic pop -// agg +#pragma GCC diagnostic push +#include #include "agg_rendering_buffer.h" #include "agg_pixfmt_rgba.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/src/marker_helpers.cpp b/src/marker_helpers.cpp index 9baa546b8..dc9f67980 100644 --- a/src/marker_helpers.cpp +++ b/src/marker_helpers.cpp @@ -24,8 +24,12 @@ #include #include #include + +#pragma GCC diagnostic push +#include #include "agg_ellipse.h" #include "agg_color_rgba.h" +#pragma GCC diagnostic pop namespace mapnik { diff --git a/src/renderer_common/render_pattern.cpp b/src/renderer_common/render_pattern.cpp index 06477d460..5e6f95820 100644 --- a/src/renderer_common/render_pattern.cpp +++ b/src/renderer_common/render_pattern.cpp @@ -28,12 +28,15 @@ #include #include +#pragma GCC diagnostic push +#include #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 { diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp index 6613d5cde..b2ae7815f 100644 --- a/src/svg/svg_parser.cpp +++ b/src/svg/svg_parser.cpp @@ -30,10 +30,14 @@ #include #include #include + +#pragma GCC diagnostic push +#include #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 diff --git a/src/text/face.cpp b/src/text/face.cpp index 79f35d8fe..915718b92 100644 --- a/src/text/face.cpp +++ b/src/text/face.cpp @@ -23,11 +23,16 @@ #include #include +#pragma GCC diagnostic push +#include + extern "C" { #include FT_GLYPH_H } +#pragma GCC diagnostic pop + namespace mapnik { diff --git a/src/text/font_library.cpp b/src/text/font_library.cpp index 2bdb4ba48..37fd6a43b 100644 --- a/src/text/font_library.cpp +++ b/src/text/font_library.cpp @@ -28,6 +28,9 @@ #include #include +#pragma GCC diagnostic push +#include + // 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) diff --git a/src/text/text_layout.cpp b/src/text/text_layout.cpp index ff37d28e2..3a3818c1f 100644 --- a/src/text/text_layout.cpp +++ b/src/text/text_layout.cpp @@ -29,8 +29,11 @@ #include #include -// ICU +#pragma GCC diagnostic push +#include #include +#pragma GCC diagnostic pop + #include namespace mapnik diff --git a/src/warp.cpp b/src/warp.cpp index 4a468a8b3..29cfa44cc 100644 --- a/src/warp.cpp +++ b/src/warp.cpp @@ -31,7 +31,8 @@ #include #include -// agg +#pragma GCC diagnostic push +#include #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 {