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

silence boost warnings

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-21 16:37:27 -07:00
parent 0ec4fbef45
commit 83588937b9
100 changed files with 549 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -26,6 +26,7 @@ clean:
@find ./ -name "*.dylib" -exec rm {} \;
@find ./ -name "*.so" -exec rm {} \;
@find ./ -name "*.o" -exec rm {} \;
@find ./ -name "*.a" -exec rm {} \;
@find ./ -name "*.pyc" -exec rm {} \;
@if test -e "bindings/python/mapnik/paths.py"; then rm "bindings/python/mapnik/paths.py"; fi

2
SConstruct
View file

@ -1788,7 +1788,7 @@ if not preconfigured:
else:
# TODO - add back -fvisibility-inlines-hidden
# https://github.com/mapnik/mapnik/issues/1863
env.Append(CXXFLAGS = common_cxx_flags + '-O%s -fno-strict-aliasing -Wno-inline -Wno-parentheses -Wno-char-subscripts' % (env['OPTIMIZATION']))
env.Append(CXXFLAGS = common_cxx_flags + '-O%s -Wextra -Wno-unknown-pragmas' % (env['OPTIMIZATION']))
if env['DEBUG_UNDEFINED']:
env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')

6
bindings/python/mapnik_color.cpp
View file

@ -24,7 +24,13 @@
#include "boost_std_shared_shim.hpp"
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
//mapnik
#include <mapnik/color.hpp>

7
bindings/python/mapnik_coord.cpp
View file

@ -23,7 +23,14 @@
#include "boost_std_shared_shim.hpp"
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/coord.hpp>

6
bindings/python/mapnik_datasource.cpp
View file

@ -24,9 +24,15 @@
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#include <boost/version.hpp>
#pragma GCC diagnostic pop
// stl
#include <vector>

8
bindings/python/mapnik_datasource_cache.cpp
View file

@ -22,10 +22,16 @@
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
#include <mapnik/value_types.hpp>
#include <mapnik/params.hpp>
#include <mapnik/datasource.hpp>

10
bindings/python/mapnik_envelope.cpp
View file

@ -22,10 +22,14 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/box2d.hpp>
@ -94,7 +98,7 @@ void (box2d<double>::*clip)(box2d<double> const&) = &box2d<double>::clip;
void (box2d<double>::*pad)(double) = &box2d<double>::pad;
// deepcopy
box2d<double> box2d_deepcopy(box2d<double> & obj, boost::python::dict memo)
box2d<double> box2d_deepcopy(box2d<double> & obj, boost::python::dict const&)
{
// FIXME::ignore memo for now
box2d<double> result(obj);

10
bindings/python/mapnik_expression.cpp
View file

@ -21,15 +21,21 @@
*****************************************************************************/
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
#include "python_to_value.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <mapnik/util/variant.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/util/variant.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/expression.hpp>
#include <mapnik/expression_string.hpp>

9
bindings/python/mapnik_feature.cpp
View file

@ -22,15 +22,20 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/iterator.hpp>
#include <boost/python/call_method.hpp>
#include <boost/python/tuple.hpp>
#include <boost/python/to_python_converter.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/value_types.hpp>

9
bindings/python/mapnik_featureset.cpp
View file

@ -22,11 +22,16 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/feature.hpp>

6
bindings/python/mapnik_font_engine.cpp
View file

@ -22,10 +22,16 @@
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
#include <mapnik/font_engine_freetype.hpp>
#include <mapnik/utils.hpp>

8
bindings/python/mapnik_fontset.cpp
View file

@ -21,10 +21,16 @@
*****************************************************************************/
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
//mapnik
#include <mapnik/font_set.hpp>

8
bindings/python/mapnik_gamma_method.cpp
View file

@ -22,7 +22,15 @@
#include <mapnik/config.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
#include <mapnik/symbolizer_enumerations.hpp>
#include "mapnik_enumeration.hpp"

9
bindings/python/mapnik_geometry.cpp
View file

@ -20,9 +20,13 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/def.hpp>
#include <boost/python/exception_translator.hpp>
@ -30,6 +34,7 @@
#include <boost/python/iterator.hpp>
#include <boost/noncopyable.hpp>
#include <boost/version.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/geometry.hpp>

9
bindings/python/mapnik_grid.cpp
View file

@ -24,12 +24,17 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
#include <boost/python/def.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/grid/grid.hpp>

8
bindings/python/mapnik_grid_view.cpp
View file

@ -23,12 +23,18 @@
#if defined(GRID_RENDERER)
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
#include <boost/python/def.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <string>

9
bindings/python/mapnik_image.cpp
View file

@ -22,12 +22,17 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
#include <boost/python/def.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/graphics.hpp>

10
bindings/python/mapnik_image_view.cpp
View file

@ -22,9 +22,19 @@
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
#include <boost/python/def.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/image_data.hpp>
#include <mapnik/image_view.hpp>
#include <mapnik/image_util.hpp>

8
bindings/python/mapnik_label_collision_detector.cpp
View file

@ -22,13 +22,17 @@
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/module.hpp>
#include <boost/python/def.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
#include <mapnik/label_collision_detector.hpp>
#include <mapnik/map.hpp>

8
bindings/python/mapnik_layer.cpp
View file

@ -21,11 +21,17 @@
*****************************************************************************/
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/layer.hpp>

7
bindings/python/mapnik_logger.cpp
View file

@ -21,10 +21,17 @@
*****************************************************************************/
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
#include <mapnik/debug.hpp>
#include <mapnik/utils.hpp>

9
bindings/python/mapnik_map.cpp
View file

@ -22,12 +22,19 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include <boost/python/iterator.hpp>
#include <boost/iterator/transform_iterator.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/rule.hpp>

9
bindings/python/mapnik_palette.cpp
View file

@ -22,11 +22,16 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
//mapnik
#include <mapnik/palette.hpp>

9
bindings/python/mapnik_parameters.cpp
View file

@ -22,10 +22,15 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/debug.hpp>

15
bindings/python/mapnik_proj_transform.cpp
View file

@ -21,7 +21,18 @@
*****************************************************************************/
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/proj_transform.hpp>
@ -29,10 +40,6 @@
#include <mapnik/coord.hpp>
#include <mapnik/box2d.hpp>
// boost
#include <boost/noncopyable.hpp>
#include <boost/python.hpp>
// stl
#include <stdexcept>

9
bindings/python/mapnik_projection.cpp
View file

@ -22,10 +22,15 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/coord.hpp>

7
bindings/python/mapnik_python.cpp
View file

@ -22,7 +22,13 @@
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include "python_to_value.hpp"
#include <boost/python/args.hpp> // for keywords, arg, etc
#include <boost/python/converter/from_python.hpp>
@ -36,6 +42,7 @@
#include <boost/python/object_core.hpp> // for get_managed_object
#include <boost/python/register_ptr_to_python.hpp>
#include <boost/python/to_python_converter.hpp>
#pragma GCC diagnostic pop
// stl
#include <stdexcept>

11
bindings/python/mapnik_query.cpp
View file

@ -22,11 +22,16 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
#include "python_to_value.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include "python_to_value.hpp"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/query.hpp>

8
bindings/python/mapnik_raster_colorizer.cpp
View file

@ -22,10 +22,16 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/raster_colorizer.hpp>

9
bindings/python/mapnik_rule.cpp
View file

@ -22,12 +22,17 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/implicit.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/rule.hpp>

8
bindings/python/mapnik_scaling_method.cpp
View file

@ -22,7 +22,15 @@
#include <mapnik/image_scaling.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
void export_scaling_method()
{

9
bindings/python/mapnik_style.cpp
View file

@ -22,11 +22,16 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp"
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/value_error.hpp>

21
bindings/python/mapnik_symbolizer.cpp
View file

@ -22,18 +22,17 @@
#include <mapnik/config.hpp>
#include "boost_std_shared_shim.hpp" // FIXME - do we need it?
// The functions in this file produce deprecation warnings.
// But as shield symbolizer doesn't fully support more than one
// placement from python yet these functions are actually the
// correct ones.
#define NO_DEPRECATION_WARNINGS
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/suite/indexing/map_indexing_suite.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/symbolizer.hpp>
#include <mapnik/symbolizer_hash.hpp>
@ -131,10 +130,12 @@ boost::python::object __getitem__(mapnik::symbolizer_base const& sym, std::strin
return boost::python::object();
}
/*
std::string __str__(mapnik::symbolizer const& sym)
{
return mapnik::util::apply_visitor(mapnik::symbolizer_to_json(), sym);
}
*/
std::string get_symbolizer_type(symbolizer const& sym)
{
@ -201,7 +202,7 @@ void export_symbolizer()
.def("__setattr__",&__setitem__)
.def("__getitem__",&__getitem__)
.def("__getattr__",&__getitem__)
.def("__str__", &__str__)
//.def("__str__", &__str__)
.def(self == self) // __eq__
;
}

6
bindings/python/mapnik_text_placement.cpp
View file

@ -22,11 +22,17 @@
#include <mapnik/config.hpp>
// boost
#include "boost_std_shared_shim.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/stl_iterator.hpp>
#include <boost/noncopyable.hpp>
#pragma GCC diagnostic pop
#include <mapnik/text/text_properties.hpp>
#include <mapnik/text/placements/simple.hpp>

7
bindings/python/mapnik_view_transform.cpp
View file

@ -21,8 +21,15 @@
*****************************************************************************/
#include <mapnik/config.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/view_transform.hpp>

7
bindings/python/python_grid_utils.cpp
View file

@ -23,8 +23,15 @@
#if defined(GRID_RENDERER)
#include <mapnik/config.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/map.hpp>

5
bindings/python/python_to_value.hpp
View file

@ -23,7 +23,12 @@
#define MAPNIK_PYTHON_BINDING_PYTHON_TO_VALUE
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/value.hpp>

8
deps/agg/src/agg_pixfmt_rgba.cpp vendored
View file

@ -1,8 +1,14 @@
#include "agg_pixfmt_rgba.h"
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/gil/gil_all.hpp>
#include <boost/gil/extension/toolbox/hsv.hpp>
#include <boost/gil/extension/toolbox/hsl.hpp>
//#include <iostream>
#pragma GCC diagnostic pop
namespace agg
{

3
include/mapnik/attribute_collector.hpp
View file

@ -40,7 +40,10 @@
#include <mapnik/util/variant.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string/replace.hpp>
#pragma GCC diagnostic pop
// stl
#include <set>

12
include/mapnik/css_color_grammar.hpp
View file

@ -27,22 +27,22 @@
#include <mapnik/color.hpp>
#include <mapnik/util/hsl.hpp>
// spirit2
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp>
// phoenix
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/fusion/include/adapt_adt.hpp>
#pragma GCC diagnostic pop
// stl
#include <string>
// fusion
#include <boost/fusion/include/adapt_adt.hpp>
BOOST_FUSION_ADAPT_ADT(
mapnik::color,
(unsigned, unsigned, obj.red(), obj.set_red(val))

12
include/mapnik/evaluate_global_attributes.hpp
View file

@ -46,7 +46,7 @@ struct evaluate_expression : util::static_visitor<T>
explicit evaluate_expression(Attributes const& attributes)
: attributes_(attributes) {}
value_type operator() (attribute const& attr) const
value_type operator() (attribute const&) const
{
throw std::runtime_error("can't evaluate feature attributes in this context");
}
@ -61,7 +61,7 @@ struct evaluate_expression : util::static_visitor<T>
return value_type();// throw?
}
value_type operator() (geometry_type_attribute const& geom) const
value_type operator() (geometry_type_attribute const&) const
{
throw std::runtime_error("can't evaluate geometry_type attributes in this context");
}
@ -139,17 +139,17 @@ struct evaluate_expression<T, boost::none_t> : util::static_visitor<T>
evaluate_expression(boost::none_t) {}
value_type operator() (attribute const& attr) const
value_type operator() (attribute const&) const
{
throw std::runtime_error("can't evaluate feature attributes in this context");
}
value_type operator() (global_attribute const& attr) const
value_type operator() (global_attribute const&) const
{
throw std::runtime_error("can't evaluate feature attributes in this context");
}
value_type operator() (geometry_type_attribute const& geom) const
value_type operator() (geometry_type_attribute const&) const
{
throw std::runtime_error("can't evaluate geometry_type attributes in this context");
}
@ -287,7 +287,7 @@ struct evaluate_global_attributes : mapnik::noncopyable
}
template <typename T>
void operator() (T const& val) const
void operator() (T const&) const
{
// no-op
}

8
include/mapnik/expression_grammar.hpp
View file

@ -30,13 +30,15 @@
#include <mapnik/expression_node.hpp>
#include <mapnik/function_call.hpp>
// spirit2
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/support_locals.hpp>
// phoenix
#include <boost/spirit/include/phoenix_function.hpp>
// fusion
#include <boost/fusion/adapted/struct.hpp>
#pragma GCC diagnostic pop
BOOST_FUSION_ADAPT_STRUCT(mapnik::unary_function_call,
(mapnik::unary_function_impl, fun)

4
include/mapnik/geometry_container.hpp
View file

@ -24,7 +24,11 @@
#define MAPNIK_GEOMETRY_CONTAINER_HPP
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/ptr_container/ptr_vector.hpp>
#pragma GCC diagnostic pop
namespace mapnik {

4
include/mapnik/image_filter.hpp
View file

@ -29,7 +29,11 @@
#include <mapnik/util/hsl.hpp>
// boost GIL
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/gil/gil_all.hpp>
#pragma GCC diagnostic pop
// agg
#include "agg_basics.h"

4
include/mapnik/image_filter_grammar.hpp
View file

@ -24,8 +24,12 @@
#define MAPNIK_IMAGE_FILITER_GRAMMAR_HPP
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/fusion/include/adapt_struct.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/css_color_grammar.hpp>

3
include/mapnik/image_util.hpp
View file

@ -29,8 +29,11 @@
#include <mapnik/image_view.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string/predicate.hpp>
#include <boost/optional.hpp>
#pragma GCC diagnostic pop
// stl
#include <string>

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

@ -34,7 +34,7 @@ struct error_handler
{
using result_type = void;
void operator() (
Iterator first, Iterator last,
Iterator, Iterator last,
Iterator err_pos, boost::spirit::info const& what) const
{
std::stringstream s;

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

@ -26,8 +26,13 @@
#include <mapnik/value_types.hpp>
#include <mapnik/util/variant.hpp>
#include <mapnik/json/value_converters.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix.hpp>
#pragma GCC diagnostic pop
namespace mapnik { namespace json {

4
include/mapnik/json/geometry_generator_grammar.hpp
View file

@ -31,10 +31,14 @@
#include <mapnik/vertex.hpp> // for CommandType::SEG_MOVETO
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
#pragma GCC diagnostic pop
//stl
#include <tuple>

9
include/mapnik/json/positions_grammar.hpp
View file

@ -26,10 +26,17 @@
// mapnik
#include <mapnik/util/variant.hpp>
#include <mapnik/json/error_handler.hpp>
// spirit::qi
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>
#pragma GCC diagnostic pop
// stl
#include <tuple>
namespace mapnik { namespace json {

4
include/mapnik/json/topojson_grammar.hpp
View file

@ -30,8 +30,12 @@
#include <mapnik/json/value_converters.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#pragma GCC diagnostic pop
// stl
#include <vector>

4
include/mapnik/params_impl.hpp
View file

@ -30,8 +30,12 @@
#include <mapnik/util/conversions.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/optional.hpp>
#include <boost/lexical_cast.hpp>
#pragma GCC diagnostic pop
// stl
#include <string>

4
include/mapnik/path_expression_grammar.hpp
View file

@ -27,7 +27,11 @@
#include <mapnik/path_expression.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#pragma GCC diagnostic pop
// stl
#include <string>

4
include/mapnik/quad_tree.hpp
View file

@ -28,7 +28,11 @@
#include <mapnik/noncopyable.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/ptr_container/ptr_vector.hpp>
#pragma GCC diagnostic pop
// stl
#include <algorithm>

6
include/mapnik/sql_utils.hpp
View file

@ -27,7 +27,11 @@
#include <mapnik/util/trim.hpp> // for trim
// boost
#include <boost/algorithm/string/replace.hpp> // for ireplace_all, etc
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string/replace.hpp>
#pragma GCC diagnostic pop
// stl
#include <sstream>

4
include/mapnik/svg/geometry_svg_generator.hpp
View file

@ -33,6 +33,9 @@
#include <mapnik/util/container_adapter.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
@ -41,6 +44,7 @@
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/type_traits/remove_pointer.hpp>
#pragma GCC diagnostic pop
// adapted to conform to the concepts

4
include/mapnik/svg/output/svg_output_grammars.hpp
View file

@ -37,9 +37,13 @@ namespace mapnik { namespace svg {
}}
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/karma_nonterminal.hpp>
#include <boost/spirit/include/karma_rule.hpp>
#include <boost/fusion/adapted/struct.hpp>
#pragma GCC diagnostic pop
/*!
* mapnik::svg::path_output_attributes is adapted as a fusion sequence

6
include/mapnik/svg/output/svg_output_grammars_impl.hpp
View file

@ -25,8 +25,14 @@
// mapnik
#include <mapnik/svg/output/svg_output_grammars.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/karma.hpp>
#include <boost/fusion/include/std_pair.hpp>
#pragma GCC diagnostic pop
namespace mapnik { namespace svg {

5
include/mapnik/svg/svg_path_commands.hpp
View file

@ -27,11 +27,14 @@
#include <mapnik/global.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#pragma GCC diagnostic pop
namespace mapnik { namespace svg {

6
include/mapnik/svg/svg_transform_grammar.hpp
View file

@ -29,12 +29,16 @@
// agg
#include <agg_trans_affine.h>
// spirit
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
#pragma GCC diagnostic pop
namespace mapnik { namespace svg {

6
include/mapnik/symbolizer_utils.hpp
View file

@ -140,6 +140,8 @@ inline std::string symbolizer_name(symbolizer const& sym)
return type;
}
// https://github.com/mapnik/mapnik/issues/2324
/*
template <typename Meta>
class symbolizer_property_value_string : public util::static_visitor<std::string>
@ -194,7 +196,7 @@ public:
std::ostringstream ss;
if (expr)
{
ss << '\"' << "FIXME" /*mapnik::to_expression_string(*expr)*/ << '\"';
ss << '\"' << "FIXME" << '\"';
}
return ss.str();
}
@ -253,6 +255,8 @@ struct symbolizer_to_json : public util::static_visitor<std::string>
}
};
*/
namespace {
template <typename Symbolizer, typename T>

3
include/mapnik/util/container_adapter.hpp
View file

@ -29,7 +29,10 @@
#include <mapnik/util/path_iterator.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/support_container.hpp>
#pragma GCC diagnostic pop
namespace boost { namespace spirit { namespace traits {

4
include/mapnik/wkt/wkt_generator_grammar.hpp
View file

@ -30,6 +30,9 @@
#include <mapnik/util/container_adapter.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
@ -38,6 +41,7 @@
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc
#pragma GCC diagnostic pop
// stl
#include <tuple>

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

@ -23,9 +23,13 @@
#ifndef MAPNIK_WKT_GRAMMAR_HPP
#define MAPNIK_WKT_GRAMMAR_HPP
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/assert.hpp>
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/geometry.hpp>

6
plugins/input/csv/csv_utils.hpp
View file

@ -23,9 +23,13 @@
#ifndef MAPNIK_CSV_UTILS_DATASOURCE_HPP
#define MAPNIK_CSV_UTILS_DATASOURCE_HPP
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
#include <string>
#include <boost/algorithm/string.hpp>
#include <cstdio>
namespace csv_utils

8
plugins/input/geojson/geojson_datasource.hpp
View file

@ -35,8 +35,10 @@
// boost
#include <boost/optional.hpp>
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/geometries.hpp>
@ -47,7 +49,7 @@
#else
#include <boost/geometry/extensions/index/rtree/rtree.hpp>
#endif
#pragma clang diagnostic pop
#pragma GCC diagnostic pop
// stl
#include <memory>

4
plugins/input/ogr/ogr_datasource.cpp
View file

@ -34,7 +34,11 @@
#include <mapnik/utils.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
// stl
#include <fstream>

5
plugins/input/pgraster/pgraster_datasource.cpp
View file

@ -39,9 +39,12 @@
#include <mapnik/value_types.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#include <boost/tokenizer.hpp>
#include <boost/make_shared.hpp>
#pragma GCC diagnostic pop
// stl
#include <string>

4
plugins/input/postgis/postgis_datasource.cpp
View file

@ -36,9 +36,13 @@
#include <mapnik/value_types.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#include <boost/tokenizer.hpp>
#include <boost/regex.hpp>
#pragma GCC diagnostic pop
// stl
#include <memory>

9
plugins/input/python/python_datasource.cpp
View file

@ -7,10 +7,15 @@
#include <vector>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/stl_iterator.hpp>
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
#include "python_utils.hpp"
@ -103,8 +108,6 @@ mapnik::layer_descriptor python_datasource::get_descriptor() const
mapnik::datasource::datasource_t python_datasource::type() const
{
using return_type = boost::optional<mapnik::datasource::geometry_t>;
try
{
ensure_gil lock;

5
plugins/input/python/python_datasource.hpp
View file

@ -5,7 +5,12 @@
#include <mapnik/datasource.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
class python_datasource : public mapnik::datasource
{

5
plugins/input/python/python_featureset.hpp
View file

@ -6,8 +6,13 @@
#include <mapnik/feature.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#include <boost/python/stl_iterator.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/datasource.hpp>

5
plugins/input/python/python_utils.hpp
View file

@ -1,7 +1,12 @@
#ifndef PYTHON_UTILS_HPP
#define PYTHON_UTILS_HPP
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/python.hpp>
#pragma GCC diagnostic pop
// Use RAII to acquire and release the GIL as needed.
class ensure_gil

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

@ -29,11 +29,15 @@
#include "dbfile.hpp"
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#ifdef SHAPE_MEMORY_MAPPED_FILE
#include <boost/interprocess/mapped_region.hpp>
#include <mapnik/mapped_memory_cache.hpp>
#endif
#pragma GCC diagnostic pop
// stl
#include <cstdint>

4
plugins/input/shape/shape_datasource.cpp
View file

@ -26,7 +26,11 @@
// boost
#include <boost/version.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/debug.hpp>

4
plugins/input/shape/shape_utils.cpp
View file

@ -27,7 +27,11 @@
#include "shape_utils.hpp"
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
void setup_attributes(mapnik::context_ptr const& ctx,
std::set<std::string> const& names,

5
plugins/input/topojson/topojson_datasource.hpp
View file

@ -35,6 +35,10 @@
#include <mapnik/json/topology.hpp>
// boost
#include <boost/optional.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/geometries.hpp>
@ -45,6 +49,7 @@
#else
#include <boost/geometry/extensions/index/rtree/rtree.hpp>
#endif
#pragma GCC diagnostic pop
// stl
#include <vector>

7
plugins/input/topojson/topojson_featureset.cpp
View file

@ -29,14 +29,19 @@
#include <string>
#include <vector>
#include <fstream>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/range/adaptor/reversed.hpp>
#include <boost/range/adaptor/sliced.hpp>
// boost.geometry
#include <boost/geometry.hpp>
#include <boost/geometry/algorithms/simplify.hpp>
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/register/linestring.hpp>
#pragma GCC diagnostic pop
#include "topojson_featureset.hpp"

6
src/box2d.cpp
View file

@ -30,11 +30,13 @@
#include <iomanip>
// boost
// fusion
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/fusion/include/adapt_adt.hpp>
// spirit
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/support_adapt_adt_attributes.hpp>
#pragma GCC diagnostic pop
// agg
#include "agg_trans_affine.h"

6
src/color.cpp
View file

@ -29,13 +29,17 @@
#include "agg_color_rgba.h"
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#pragma GCC diagnostic pop
// stl
#include <sstream>

15
src/conversions.cpp
View file

@ -27,18 +27,21 @@
#include <cstring>
#include <algorithm>
#include <boost/spirit/include/qi.hpp>
#if _MSC_VER
#define snprintf _snprintf
#endif
// karma is used by default
#define MAPNIK_KARMA_TO_STRING
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#ifdef MAPNIK_KARMA_TO_STRING
#include <boost/spirit/include/karma.hpp>
#endif
#pragma GCC diagnostic pop
#if _MSC_VER
#define snprintf _snprintf
#endif
namespace mapnik {

5
src/dasharray_parser.cpp
View file

@ -22,11 +22,16 @@
// mapnik
#include <mapnik/util/dasharray_parser.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_stl.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#pragma GCC diagnostic pop
namespace mapnik {

4
src/datasource_cache.cpp
View file

@ -31,9 +31,13 @@
#include <mapnik/utils.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/filesystem/operations.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/predicate.hpp>
#pragma GCC diagnostic pop
// stl
#include <algorithm>

4
src/image_compositing.cpp
View file

@ -25,8 +25,12 @@
#include <mapnik/image_data.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wredeclared-class-member"
#include <boost/assign/list_of.hpp>
#include <boost/bimap.hpp>
#pragma GCC diagnostic pop
// agg
#include "agg_rendering_buffer.h"

5
src/image_filter_types.cpp
View file

@ -25,7 +25,12 @@
#include <mapnik/image_filter_grammar_impl.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/spirit/include/karma.hpp>
#pragma GCC diagnostic pop
// stl
#include <vector>

4
src/image_scaling.cpp
View file

@ -27,8 +27,12 @@
//#include <mapnik/span_image_filter.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wredeclared-class-member"
#include <boost/assign/list_of.hpp>
#include <boost/bimap.hpp>
#pragma GCC diagnostic pop
// agg
#include "agg_image_accessors.h"

3
src/jpeg_reader.cpp
View file

@ -31,9 +31,12 @@ extern "C"
}
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/iostreams/device/file.hpp>
#include <boost/iostreams/device/array.hpp>
#include <boost/iostreams/stream.hpp>
#pragma GCC diagnostic pop
// std
#include <cstdio>

5
src/load_map.cpp
View file

@ -61,11 +61,14 @@
// boost
#include <boost/optional.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/tokenizer.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/xml_parser.hpp>
#include <boost/static_assert.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
// agg
#include "agg_trans_affine.h"

4
src/png_reader.cpp
View file

@ -29,10 +29,12 @@ extern "C"
#include <png.h>
}
// boost
// iostreams
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/iostreams/device/file.hpp>
#include <boost/iostreams/device/array.hpp>
#include <boost/iostreams/stream.hpp>
#pragma GCC diagnostic pop
// stl
#include <cstring>

4
src/save_map.cpp
View file

@ -46,8 +46,12 @@
#include <mapnik/group/group_layout.hpp>
#include <mapnik/group/group_symbolizer_properties.hpp>
#include <mapnik/util/variant.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
#include <boost/optional.hpp>
#include <boost/version.hpp>
#include <boost/property_tree/ptree.hpp>

4
src/simplify.cpp
View file

@ -2,8 +2,12 @@
#include <mapnik/simplify.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wredeclared-class-member"
#include <boost/assign/list_of.hpp>
#include <boost/bimap.hpp>
#pragma GCC diagnostic pop
namespace mapnik
{

4
src/svg/svg_parser.cpp
View file

@ -31,11 +31,15 @@
#include "agg_span_gradient.h"
#include "agg_color_rgba.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/fusion/include/std_pair.hpp>
#include <boost/algorithm/string/predicate.hpp>
#pragma GCC diagnostic pop
#include <string>
#include <stdexcept>

5
src/text/font_feature_settings.cpp
View file

@ -25,8 +25,13 @@
#include <mapnik/config_error.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/spirit/include/qi.hpp>
#include <boost/version.hpp>
#pragma GCC diagnostic pop
// stl
#include <algorithm>

5
src/text/placements/simple.cpp
View file

@ -27,10 +27,15 @@
#include <mapnik/xml_node.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_stl.hpp>
#include <boost/property_tree/ptree.hpp>
#pragma GCC diagnostic pop
#include <cmath>

19
src/tiff_reader.cpp
View file

@ -24,19 +24,22 @@
#include <mapnik/debug.hpp>
#include <mapnik/image_reader.hpp>
// boost
#include <memory>
// iostreams
#include <boost/iostreams/device/file.hpp>
#include <boost/iostreams/device/array.hpp>
#include <boost/iostreams/stream.hpp>
extern "C"
{
#include <tiffio.h>
}
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/iostreams/device/file.hpp>
#include <boost/iostreams/device/array.hpp>
#include <boost/iostreams/stream.hpp>
#pragma GCC diagnostic pop
// stl
#include <memory>
namespace mapnik { namespace impl {
static toff_t tiff_seek_proc(thandle_t fd, toff_t off, int whence)

4
src/webp_reader.cpp
View file

@ -35,9 +35,13 @@ extern "C"
#pragma clang diagnostic pop
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/iostreams/device/file.hpp>
#include <boost/iostreams/device/array.hpp>
#include <boost/iostreams/stream.hpp>
#pragma GCC diagnostic pop
// stl
#include <fstream>

2
tests/cpp_tests/conversions_test.cpp
View file

@ -290,7 +290,7 @@ int main(int argc, char** argv)
values_container vc;
mapnik::value val2(1);
vc[val2] = 1;
BOOST_TEST_EQ( vc[1], 1 );
BOOST_TEST_EQ( (int)vc[1], (int)1 );
}
catch (std::exception const & ex)

7
utils/nik2img/nik2img.cpp
View file

@ -7,8 +7,15 @@
#include <mapnik/graphics.hpp>
#include <mapnik/datasource_cache.hpp>
#include <mapnik/font_engine_freetype.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/program_options.hpp>
#pragma GCC diagnostic pop
#include <string>
int main (int argc,char** argv)

11
utils/shapeindex/shapeindex.cpp
View file

@ -25,13 +25,18 @@
#include <vector>
#include <string>
#include <mapnik/util/fs.hpp>
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/program_options.hpp>
#include "quadtree.hpp"
#include "shapefile.hpp"
#include "shape_io.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/program_options.hpp>
#pragma GCC diagnostic pop
const int DEFAULT_DEPTH = 8;
const double DEFAULT_RATIO=0.55;

4
utils/svg2png/svg2png.cpp
View file

@ -35,8 +35,12 @@
#include <mapnik/svg/svg_renderer_agg.hpp>
#include <mapnik/svg/svg_path_attributes.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <boost/algorithm/string.hpp>
#include <boost/program_options.hpp>
#pragma GCC diagnostic pop
#include "agg_rasterizer_scanline_aa.h"
#include "agg_basics.h"