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

more portable workaround for gil c++11 bug - closes #2859

Browse source
This commit is contained in:
Dane Springmeyer 2015-05-24 13:48:04 -07:00
parent 647d20981a
commit 4667e9470a
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -1734,11 +1734,6 @@ if not preconfigured:
# c++11 support / https://github.com/mapnik/mapnik/issues/1683 # c++11 support / https://github.com/mapnik/mapnik/issues/1683
# - upgrade to PHOENIX_V3 since that is needed for c++11 compile # - upgrade to PHOENIX_V3 since that is needed for c++11 compile
env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1') env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1')
if 'clang++' in env['CXX']:
# - workaround boost gil channel_algorithm.hpp narrowing error
# TODO - remove when building against >= 1.55
# https://github.com/mapnik/mapnik/issues/1970
env.Append(CXXFLAGS = '-Wno-c++11-narrowing')
# Enable logging in debug mode (always) and release mode (when specified) # Enable logging in debug mode (always) and release mode (when specified)
if env['DEFAULT_LOG_SEVERITY']: if env['DEFAULT_LOG_SEVERITY']:

1
deps/agg/src/agg_pixfmt_rgba.cpp vendored
View file

@ -4,6 +4,7 @@
// boost // boost
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wc++11-narrowing"
#pragma GCC diagnostic ignored "-Wunused-local-typedef" #pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#include <boost/gil/extension/toolbox/hsv.hpp> #include <boost/gil/extension/toolbox/hsv.hpp>

5
deps/boost/gil/extension/toolbox/hsl.hpp vendored
View file

@ -14,7 +14,12 @@
/// \author Christian Henning \n /// \author Christian Henning \n
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wc++11-narrowing"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#pragma GCC diagnostic pop
namespace boost { namespace gil { namespace boost { namespace gil {

5
deps/boost/gil/extension/toolbox/hsv.hpp vendored
View file

@ -14,7 +14,12 @@
/// \author Christian Henning \n /// \author Christian Henning \n
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wc++11-narrowing"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#pragma GCC diagnostic pop
namespace boost { namespace gil { namespace boost { namespace gil {

1
include/mapnik/image_filter.hpp
View file

@ -31,6 +31,7 @@
// boost GIL // boost GIL
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wc++11-narrowing"
#pragma GCC diagnostic ignored "-Wunused-local-typedef" #pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop