From 3741a7f348f936668e2dd195f461ca60df8582fb Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sat, 3 Sep 2016 09:58:40 -0700 Subject: [PATCH] fix -Wshadow warnings caught by g++-5 --- include/mapnik/image_view_any.hpp | 4 ++-- include/mapnik/warning_ignore.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/mapnik/image_view_any.hpp b/include/mapnik/image_view_any.hpp index 23c9779d8..a5452df0b 100644 --- a/include/mapnik/image_view_any.hpp +++ b/include/mapnik/image_view_any.hpp @@ -47,9 +47,9 @@ struct MAPNIK_DECL image_view_any : image_view_base image_view_any() = default; template - image_view_any(T && data) + image_view_any(T && _data) noexcept(std::is_nothrow_constructible::value) - : image_view_base(std::forward(data)) {} + : image_view_base(std::forward(_data)) {} std::size_t width() const; std::size_t height() const; diff --git a/include/mapnik/warning_ignore.hpp b/include/mapnik/warning_ignore.hpp index 95249b8bf..6be432f0b 100644 --- a/include/mapnik/warning_ignore.hpp +++ b/include/mapnik/warning_ignore.hpp @@ -28,7 +28,8 @@ #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wredeclared-class-member" -#pragma GCC diagnostic ignored "-Wunused-local-typedef" +#pragma GCC diagnostic ignored "-Wunused-local-typedef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" // gcc5 #pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wc++11-narrowing" #pragma GCC diagnostic ignored "-Wsign-conversion"