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

avoid more -Wshadow warnings from boost

Browse source
This commit is contained in:
Dane Springmeyer 2015-10-01 11:18:11 -07:00
parent 101be82281
commit 3acec350f6
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/input/csv/csv_datasource.cpp
View file

@ -42,8 +42,12 @@
#include <mapnik/util/spatial_index.hpp>
#include <mapnik/geom_util.hpp>
#ifdef CSV_MEMORY_MAPPED_FILE
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsign-conversion"
#include <boost/interprocess/mapped_region.hpp>
#include <boost/interprocess/streams/bufferstream.hpp>
#pragma GCC diagnostic pop
#include <mapnik/mapped_memory_cache.hpp>
#endif

4
utils/csvindex/csvindex.cpp
View file

@ -37,8 +37,12 @@
#include <boost/program_options.hpp>
#pragma GCC diagnostic pop
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsign-conversion"
#include <boost/interprocess/mapped_region.hpp>
#include <boost/interprocess/streams/bufferstream.hpp>
#pragma GCC diagnostic pop
#include <mapnik/mapped_memory_cache.hpp>
#include <boost/version.hpp>