Skip to content

Commit faf53cd

Browse files
author
Dane Springmeyer
committed
use <mapnik/warning_ignore.hpp>
1 parent 82dd2d3 commit faf53cd

42 files changed

Lines changed: 101 additions & 320 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/mapnik_color.cpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,8 @@
2323
#include <mapnik/config.hpp>
2424
#include "boost_std_shared_shim.hpp"
2525

26-
// boost
2726
#pragma GCC diagnostic push
28-
#pragma GCC diagnostic ignored "-Wunused-parameter"
29-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
30-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
31-
#pragma GCC diagnostic ignored "-Wshadow"
32-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
33-
34-
27+
#include <mapnik/warning_ignore.hpp>
3528
#include <boost/python.hpp>
3629
#pragma GCC diagnostic pop
3730

‎src/mapnik_coord.cpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,11 @@
2222
#include <mapnik/config.hpp>
2323
#include "boost_std_shared_shim.hpp"
2424

25-
// boost
2625
#pragma GCC diagnostic push
27-
#pragma GCC diagnostic ignored "-Wunused-parameter"
28-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
29-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
30-
#pragma GCC diagnostic ignored "-Wshadow"
31-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
32-
33-
26+
#include <mapnik/warning_ignore.hpp>
3427
#include <boost/python.hpp>
3528
#pragma GCC diagnostic pop
3629

37-
3830
// mapnik
3931
#include <mapnik/coord.hpp>
4032

‎src/mapnik_datasource.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,10 @@
2121
*****************************************************************************/
2222

2323
#include <mapnik/config.hpp>
24-
25-
// boost
2624
#include "boost_std_shared_shim.hpp"
27-
#pragma GCC diagnostic push
28-
#pragma GCC diagnostic ignored "-Wunused-parameter"
29-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
30-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
31-
#pragma GCC diagnostic ignored "-Wshadow"
32-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
33-
3425

26+
#pragma GCC diagnostic push
27+
#include <mapnik/warning_ignore.hpp>
3528
#include <boost/python.hpp>
3629
#include <boost/noncopyable.hpp>
3730
#include <boost/version.hpp>

‎src/mapnik_datasource_cache.cpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@
2222

2323
#include <mapnik/config.hpp>
2424

25-
// boost
26-
#include "boost_std_shared_shim.hpp"
2725
#pragma GCC diagnostic push
28-
#pragma GCC diagnostic ignored "-Wunused-parameter"
29-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
30-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
31-
#pragma GCC diagnostic ignored "-Wshadow"
32-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
33-
26+
#include <mapnik/warning_ignore.hpp>
3427
#include <boost/python.hpp>
3528
#include <boost/noncopyable.hpp>
3629
#pragma GCC diagnostic pop

‎src/mapnik_enumeration.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@
2222
#ifndef MAPNIK_PYTHON_BINDING_ENUMERATION_INCLUDED
2323
#define MAPNIK_PYTHON_BINDING_ENUMERATION_INCLUDED
2424

25+
#pragma GCC diagnostic push
26+
#include <mapnik/warning_ignore.hpp>
2527
#include <boost/python/converter/registered.hpp> // for registered
2628
#include <boost/python/enum.hpp> // for enum_
2729
#include <boost/python/implicit.hpp> // for implicitly_convertible
2830
#include <boost/python/to_python_converter.hpp>
31+
#pragma GCC diagnostic pop
2932

3033
namespace mapnik {
3134

‎src/mapnik_enumeration_wrapper_converter.hpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
// mapnik
2727
#include <mapnik/symbolizer.hpp>
2828

29-
// boost
29+
#pragma GCC diagnostic push
30+
#include <mapnik/warning_ignore.hpp>
3031
#include <boost/python.hpp>
32+
#pragma GCC diagnostic pop
3133

3234

3335
namespace boost { namespace python {

‎src/mapnik_envelope.cpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,12 @@
2121
*****************************************************************************/
2222

2323
#include <mapnik/config.hpp>
24-
25-
// boost
2624
#include "boost_std_shared_shim.hpp"
27-
#pragma GCC diagnostic push
28-
#pragma GCC diagnostic ignored "-Wunused-parameter"
29-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
30-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
31-
#pragma GCC diagnostic ignored "-Wshadow"
32-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
3325

26+
#pragma GCC diagnostic push
27+
#include <mapnik/warning_ignore.hpp>
3428
#include <boost/python.hpp>
29+
#include <boost/noncopyable.hpp>
3530
#pragma GCC diagnostic pop
3631

3732
// mapnik

‎src/mapnik_expression.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@
2222

2323
#include <mapnik/config.hpp>
2424
#include "python_to_value.hpp"
25-
26-
// boost
2725
#include "boost_std_shared_shim.hpp"
28-
#pragma GCC diagnostic push
29-
#pragma GCC diagnostic ignored "-Wunused-parameter"
30-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
31-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
32-
#pragma GCC diagnostic ignored "-Wshadow"
33-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
34-
3526

27+
#pragma GCC diagnostic push
28+
#include <mapnik/warning_ignore.hpp>
3629
#include <boost/python.hpp>
3730
#include <boost/noncopyable.hpp>
3831
#pragma GCC diagnostic pop

‎src/mapnik_feature.cpp‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,16 @@
2121
*****************************************************************************/
2222

2323
#include <mapnik/config.hpp>
24-
25-
// boost
2624
#include "boost_std_shared_shim.hpp"
27-
#pragma GCC diagnostic push
28-
#pragma GCC diagnostic ignored "-Wunused-parameter"
29-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
30-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
31-
#pragma GCC diagnostic ignored "-Wshadow"
32-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
33-
3425

26+
#pragma GCC diagnostic push
27+
#include <mapnik/warning_ignore.hpp>
3528
#include <boost/python.hpp>
29+
#include <boost/noncopyable.hpp>
3630
#include <boost/python/iterator.hpp>
3731
#include <boost/python/call_method.hpp>
3832
#include <boost/python/tuple.hpp>
3933
#include <boost/python/to_python_converter.hpp>
40-
#include <boost/noncopyable.hpp>
4134
#pragma GCC diagnostic pop
4235

4336
// mapnik

‎src/mapnik_featureset.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,10 @@
2121
*****************************************************************************/
2222

2323
#include <mapnik/config.hpp>
24-
25-
// boost
2624
#include "boost_std_shared_shim.hpp"
27-
#pragma GCC diagnostic push
28-
#pragma GCC diagnostic ignored "-Wunused-parameter"
29-
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
30-
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
31-
#pragma GCC diagnostic ignored "-Wshadow"
32-
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
33-
3425

26+
#pragma GCC diagnostic push
27+
#include <mapnik/warning_ignore.hpp>
3528
#include <boost/python.hpp>
3629
#include <boost/noncopyable.hpp>
3730
#pragma GCC diagnostic pop

0 commit comments

Comments
 (0)