Silenced a lot of -Wshadow from boost libraries during build

flippmoke · flippmoke · commit 3dd90f342e25 · 2015-06-30T13:34:05.000-05:00
diff --git a/src/mapnik_color.cpp b/src/mapnik_color.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_coord.cpp b/src/mapnik_coord.cpp
@@ -27,6 +27,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_datasource.cpp b/src/mapnik_datasource.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_datasource_cache.cpp b/src/mapnik_datasource_cache.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_envelope.cpp b/src/mapnik_envelope.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
 
diff --git a/src/mapnik_expression.cpp b/src/mapnik_expression.cpp
@@ -29,6 +29,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/iterator.hpp>
diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_font_engine.cpp b/src/mapnik_font_engine.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_fontset.cpp b/src/mapnik_fontset.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_gamma_method.cpp b/src/mapnik_gamma_method.cpp
@@ -27,6 +27,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_geometry.cpp b/src/mapnik_geometry.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/def.hpp>
diff --git a/src/mapnik_grid.cpp b/src/mapnik_grid.cpp
@@ -30,6 +30,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
diff --git a/src/mapnik_grid_view.cpp b/src/mapnik_grid_view.cpp
@@ -30,6 +30,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
diff --git a/src/mapnik_image_view.cpp b/src/mapnik_image_view.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
diff --git a/src/mapnik_label_collision_detector.cpp b/src/mapnik_label_collision_detector.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
diff --git a/src/mapnik_layer.cpp b/src/mapnik_layer.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
diff --git a/src/mapnik_logger.cpp b/src/mapnik_logger.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_palette.cpp b/src/mapnik_palette.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_parameters.cpp b/src/mapnik_parameters.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_proj_transform.cpp b/src/mapnik_proj_transform.cpp
@@ -29,6 +29,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/src/mapnik_projection.cpp b/src/mapnik_projection.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_python.cpp b/src/mapnik_python.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 #include "python_to_value.hpp"
 #include <boost/python/args.hpp>        // for keywords, arg, etc
 #include <boost/python/converter/from_python.hpp>
diff --git a/src/mapnik_query.cpp b/src/mapnik_query.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include "python_to_value.hpp"
 #include <boost/python.hpp>
diff --git a/src/mapnik_raster_colorizer.cpp b/src/mapnik_raster_colorizer.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
diff --git a/src/mapnik_rule.cpp b/src/mapnik_rule.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/implicit.hpp>
diff --git a/src/mapnik_scaling_method.cpp b/src/mapnik_scaling_method.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/mapnik_style.cpp b/src/mapnik_style.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
diff --git a/src/mapnik_symbolizer.cpp b/src/mapnik_symbolizer.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/map_indexing_suite.hpp>
diff --git a/src/mapnik_text_placement.cpp b/src/mapnik_text_placement.cpp
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
diff --git a/src/mapnik_view_transform.cpp b/src/mapnik_view_transform.cpp
@@ -27,6 +27,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/python_grid_utils.cpp b/src/python_grid_utils.cpp
@@ -29,6 +29,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
diff --git a/src/python_to_value.hpp b/src/python_to_value.hpp
@@ -27,6 +27,7 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wunused-local-typedef"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wshadow"
 #include <boost/python.hpp>
 #pragma GCC diagnostic pop
 
