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

update test-data to pull in 9f471a25e3 -refs #3160

Browse source
This commit is contained in:
Dane Springmeyer 2015-11-04 13:57:04 -08:00
parent db7466adf0
commit da624b9ef4
6 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/image_filter_grammar.hpp
View file

@ -29,6 +29,7 @@
#pragma GCC diagnostic ignored "-Wunused-local-typedef" #pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wconversion"
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/fusion/include/adapt_struct.hpp> #include <boost/fusion/include/adapt_struct.hpp>

1
include/mapnik/json/error_handler.hpp
View file

@ -26,6 +26,7 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wsign-compare"
#include <boost/spirit/home/qi.hpp> #include <boost/spirit/home/qi.hpp>
#include <boost/spirit/home/support/info.hpp> #include <boost/spirit/home/support/info.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

1
include/mapnik/json/generic_json.hpp
View file

@ -32,6 +32,7 @@
#pragma GCC diagnostic ignored "-Wunused-local-typedef" #pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wconversion"
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/phoenix.hpp>

1
include/mapnik/wkt/wkt_grammar.hpp
View file

@ -31,6 +31,7 @@
#pragma GCC diagnostic ignored "-Wunused-local-typedef" #pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wconversion"
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>

1
plugins/input/shape/dbfile.cpp
View file

@ -35,6 +35,7 @@
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers" #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wsign-compare"
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#if defined(MAPNIK_MEMORY_MAPPED_FILE) #if defined(MAPNIK_MEMORY_MAPPED_FILE)
#include <boost/interprocess/mapped_region.hpp> #include <boost/interprocess/mapped_region.hpp>

2
test/data-visual

@ -1 +1 @@
Subproject commit 8544eb8164be721c4e4788e018351a0354d2472a Subproject commit 9f471a25e33635cbbaae17c022b85340570d8869