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

more warning_ignore usage - refs #2907

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-09 16:43:00 -08:00
parent 341db51aa7
commit 57dbd77819
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/cleanup.hpp
View file

@ -1,6 +1,9 @@
#ifndef TEST_MEMORY_CLEANUP #ifndef TEST_MEMORY_CLEANUP
#define TEST_MEMORY_CLEANUP #define TEST_MEMORY_CLEANUP
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#if defined(HAVE_LIBXML2) #if defined(HAVE_LIBXML2)
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/entities.h> #include <libxml/entities.h>
@ -16,6 +19,8 @@
#include <proj_api.h> #include <proj_api.h>
#endif #endif
#pragma GCC diagnostic pop
namespace testing { namespace testing {
inline void run_cleanup() inline void run_cleanup()

4
utils/svg2png/svg2png.cpp
View file

@ -40,12 +40,16 @@
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#pragma GCC diagnostic push
#include <mapnik/warning_ignore_agg.hpp>
#include "agg_rasterizer_scanline_aa.h" #include "agg_rasterizer_scanline_aa.h"
#include "agg_basics.h" #include "agg_basics.h"
#include "agg_rendering_buffer.h" #include "agg_rendering_buffer.h"
#include "agg_renderer_base.h" #include "agg_renderer_base.h"
#include "agg_pixfmt_rgba.h" #include "agg_pixfmt_rgba.h"
#include "agg_scanline_u.h" #include "agg_scanline_u.h"
#pragma GCC diagnostic pop
struct main_marker_visitor struct main_marker_visitor
{ {