more warning_ignore usage - refs #2907

test/cleanup.hpp

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

utils/svg2png/svg2png.cpp

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