From 4b06dfe9b4636baf6358e3413b8d9e2e6506fe40 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 31 Aug 2016 11:09:27 -0700 Subject: [PATCH] Avoid warnings when building the g++5 --- include/mapnik/raster_colorizer.hpp | 4 ++-- include/mapnik/value.hpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/mapnik/raster_colorizer.hpp b/include/mapnik/raster_colorizer.hpp index 86a85def2..690549746 100644 --- a/include/mapnik/raster_colorizer.hpp +++ b/include/mapnik/raster_colorizer.hpp @@ -93,7 +93,7 @@ public: //! \brief Set the stop value //! \param[in] value The stop value - inline void set_value(float value) { value_ = value; } + inline void set_value(float v) { value_ = v; } //! \brief Get the stop value //! \return The stop value @@ -205,7 +205,7 @@ public: //! //! \param[in] value Input value //! \return color associated with the value - unsigned get_color(float value) const; + unsigned get_color(float v) const; //! \brief Set the epsilon value for exact mode diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp index 3bd59b4b7..9ee732385 100644 --- a/include/mapnik/value.hpp +++ b/include/mapnik/value.hpp @@ -149,6 +149,7 @@ namespace std { #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" #pragma GCC diagnostic ignored "-Wmismatched-tags" template <>