sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix -Wshadow errors from boost - refs #3204

Browse source
This commit is contained in:
Dane Springmeyer 2015-12-14 13:40:23 -08:00
parent d21d49a8ef
commit 6e5a67c1fb
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/svg2_color_grammar_def.hpp
View file

@ -25,14 +25,17 @@
#ifndef MAPNIK_SVG2_COLOR_GRAMMAR_DEF_HPP #ifndef MAPNIK_SVG2_COLOR_GRAMMAR_DEF_HPP
#define MAPNIK_SVG2_COLOR_GRAMMAR_DEF_HPP #define MAPNIK_SVG2_COLOR_GRAMMAR_DEF_HPP
// boost
#include <boost/spirit/home/x3.hpp>
#include <boost/fusion/adapted/struct.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/util/hsl.hpp> #include <mapnik/util/hsl.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <boost/spirit/home/x3.hpp>
#include <boost/fusion/adapted/struct.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>
#pragma GCC diagnostic pop
BOOST_FUSION_ADAPT_STRUCT ( BOOST_FUSION_ADAPT_STRUCT (
mapnik::color, mapnik::color,
(std::uint8_t, red_) (std::uint8_t, red_)
@ -400,6 +403,8 @@ auto const svg2_color_def =
hsla_color hsla_color
; ;
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
BOOST_SPIRIT_DEFINE( BOOST_SPIRIT_DEFINE(
svg2_color, svg2_color,
hex2_color, hex2_color,
@ -409,6 +414,7 @@ BOOST_SPIRIT_DEFINE(
rgb_color_percent, rgb_color_percent,
rgba_color_percent rgba_color_percent
); );
#pragma GCC diagnostic pop
auto const expression = svg2_color; auto const expression = svg2_color;