From 4d2cf2922f8a8b933d7327d3256e6afe7561bc98 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath <rashad.kanavath@c-s.fr> Date: Mon, 23 Nov 2015 10:10:04 +0100 Subject: [PATCH] WRG: final set of warnings from mapnik --- .../include/otbMapnikAdapter.h | 18 ++++++++++++++++++ .../include/otbVectorDataToImageFilter.h | 1 + 2 files changed, 19 insertions(+) diff --git a/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h b/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h index b9032872d6..9ac69affe7 100644 --- a/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h +++ b/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h @@ -19,6 +19,10 @@ #ifndef __otbMapnikAdapter_h #define __otbMapnikAdapter_h +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wunused-parameter" #include <mapnik/datasource_cache.hpp> #include <mapnik/font_engine_freetype.hpp> #include <mapnik/agg_renderer.hpp> @@ -30,6 +34,20 @@ #include <mapnik/layer.hpp> #include <mapnik/map.hpp> #include <mapnik/value.hpp> +#pragma GCC diagnostic pop +#else +#include <mapnik/datasource_cache.hpp> +#include <mapnik/font_engine_freetype.hpp> +#include <mapnik/agg_renderer.hpp> +#include <mapnik/filter_factory.hpp> +#include <mapnik/color_factory.hpp> +#include <mapnik/image_util.hpp> +#include <mapnik/config_error.hpp> +#include <mapnik/memory_datasource.hpp> +#include <mapnik/layer.hpp> +#include <mapnik/map.hpp> +#include <mapnik/value.hpp> +#endif #ifdef OTB_MAPNIK_COMPATIBILITY_API07 namespace mapnik { diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h index 9a3bcea0c3..86777f9605 100644 --- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h +++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h @@ -26,6 +26,7 @@ #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wunused-parameter" #include <mapnik/memory_datasource.hpp> #include <mapnik/map.hpp> #pragma GCC diagnostic pop -- GitLab