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

start using -Wsign-compare and -Wshadow + fix heaps of warnings - refs #2907

Browse source
This commit is contained in:
Dane Springmeyer 2015-06-12 14:51:18 -07:00
parent 8d3d136da7
commit 0d86afff36
53 changed files with 104 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -1770,8 +1770,8 @@ if not preconfigured:
env.Append(CPPDEFINES = ndebug_defines)
# Common flags for g++/clang++ CXX compiler.
# TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion -Wshadow viable
common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
# TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion viable
common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
if 'clang++' in env['CXX']:
common_cxx_flags += ' -Wno-unknown-pragmas -Wno-unsequenced '

8
benchmark/test_polygon_clipping.cpp
View file

@ -246,10 +246,10 @@ public:
std::string expect = expected_+".png";
std::string actual = expected_+"_actual.png";
mapnik::geometry::multi_polygon<double> mp;
for (auto const& geom: result)
for (auto const& _geom: result)
{
//std::clog << boost::geometry::dsv(geom) << "\n";
mp.emplace_back(geom);
mp.emplace_back(_geom);
}
mapnik::geometry::geometry<double> geom2(mp);
auto env = mapnik::geometry::envelope(geom2);
@ -287,9 +287,9 @@ public:
std::deque<mapnik::geometry::polygon<double> > result;
boost::geometry::intersection(extent_,poly,result);
unsigned count = 0;
for (auto const& geom : result)
for (auto const& _geom : result)
{
mapnik::geometry::polygon_vertex_adapter<double> va(geom);
mapnik::geometry::polygon_vertex_adapter<double> va(_geom);
unsigned cmd;
double x,y;
while ((cmd = va.vertex(&x, &y)) != mapnik::SEG_END) {

1
include/mapnik/attribute_collector.hpp
View file

@ -42,6 +42,7 @@
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/algorithm/string/replace.hpp>
#pragma GCC diagnostic pop

4
include/mapnik/cairo/cairo_image_util.hpp
View file

@ -41,8 +41,8 @@ static inline void cairo_image_to_rgba8(mapnik::image_rgba8 & data,
throw std::runtime_error("Unable to convert this Cairo format to rgba8 image");
}
if (cairo_image_surface_get_width(&*surface) != data.width() ||
cairo_image_surface_get_height(&*surface) != data.height())
if (cairo_image_surface_get_width(&*surface) != static_cast<int>(data.width()) ||
cairo_image_surface_get_height(&*surface) != static_cast<int>(data.height()))
{
throw std::runtime_error("Mismatch in dimensions: size of image must match side of cairo surface");
}

1
include/mapnik/css_color_grammar.hpp
View file

@ -31,6 +31,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp>
#include <boost/spirit/include/phoenix_core.hpp>

1
include/mapnik/expression_grammar.hpp
View file

@ -34,6 +34,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/support_locals.hpp>
#include <boost/spirit/include/phoenix_function.hpp>

8
include/mapnik/expression_node.hpp
View file

@ -86,8 +86,8 @@ struct unary_function_call
{
using argument_type = expr_node;
unary_function_call() = default;
unary_function_call(unary_function_impl fun, argument_type const& arg)
: fun(fun), arg(arg) {}
unary_function_call(unary_function_impl _fun, argument_type const& _arg)
: fun(_fun), arg(_arg) {}
unary_function_impl fun;
argument_type arg;
@ -97,8 +97,8 @@ struct binary_function_call
{
using argument_type = expr_node;
binary_function_call() = default;
binary_function_call(binary_function_impl fun, argument_type const& arg1, argument_type const& arg2)
: fun(fun), arg1(arg1), arg2(arg2) {}
binary_function_call(binary_function_impl _fun, argument_type const& _arg1, argument_type const& _arg2)
: fun(_fun), arg1(_arg1), arg2(_arg2) {}
binary_function_impl fun;
argument_type arg1;
argument_type arg2;

1
include/mapnik/geometry_adapters.hpp
View file

@ -28,6 +28,7 @@
// undef B0 to workaround https://svn.boost.org/trac/boost/ticket/10467
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#undef B0
#include <boost/geometry/geometries/register/linestring.hpp>
#include <boost/geometry/geometries/register/point.hpp>

1
include/mapnik/geometry_correct.hpp
View file

@ -31,6 +31,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/geometry/algorithms/correct.hpp>
#pragma GCC diagnostic pop

1
include/mapnik/image_filter.hpp
View file

@ -33,6 +33,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wc++11-narrowing"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/gil/gil_all.hpp>
#pragma GCC diagnostic pop

1
include/mapnik/image_filter_grammar.hpp
View file

@ -27,6 +27,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/fusion/include/adapt_struct.hpp>
#pragma GCC diagnostic pop

1
include/mapnik/image_util.hpp
View file

@ -30,6 +30,7 @@
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/algorithm/string/predicate.hpp>
#include <boost/optional.hpp>
#pragma GCC diagnostic pop

1
include/mapnik/json/extract_bounding_box_grammar.hpp
View file

@ -32,6 +32,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>

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

@ -30,6 +30,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix.hpp>
#pragma GCC diagnostic pop

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

@ -32,6 +32,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc

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

@ -33,6 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>

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

@ -28,6 +28,10 @@
#include <mapnik/feature_kv_iterator.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
@ -37,6 +41,7 @@
#include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/fusion/include/at.hpp>
#include <boost/fusion/include/cons.hpp>
#pragma GCC diagnostic pop
namespace mapnik { namespace json {

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

@ -33,6 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#pragma GCC diagnostic pop

3
include/mapnik/json/topology.hpp
View file

@ -26,9 +26,12 @@
#include <mapnik/json/generic_json.hpp>
#include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/fusion/include/adapt_struct.hpp>
#include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/optional.hpp>
#pragma GCC diagnostic pop
#include <tuple>
#include <vector>

2
include/mapnik/offset_converter.hpp
View file

@ -292,7 +292,7 @@ private:
std::vector<vertex2d> points;
std::vector<vertex2d> close_points;
bool is_polygon = false;
int cpt = 0;
std::size_t cpt = 0;
v0.cmd = geom_.vertex(&v0.x, &v0.y);
v1.x = v0.x;
v1.y = v0.y;

1
include/mapnik/params_impl.hpp
View file

@ -33,6 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/optional.hpp>
#include <boost/lexical_cast.hpp>
#pragma GCC diagnostic pop

1
include/mapnik/path_expression_grammar.hpp
View file

@ -30,6 +30,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#pragma GCC diagnostic pop

1
include/mapnik/proj_strategy.hpp
View file

@ -31,6 +31,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/numeric/conversion/cast.hpp>

1
include/mapnik/quad_tree.hpp
View file

@ -31,6 +31,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/ptr_container/ptr_vector.hpp>
#pragma GCC diagnostic pop

4
include/mapnik/renderer_common/process_group_symbolizer.hpp
View file

@ -341,10 +341,10 @@ void render_group_symbolizer(group_symbolizer const& sym,
render_thunk_extractor extractor(bounds, thunks, *sub_feature, common.vars_, prj_trans,
virtual_renderer, clipping_extent);
for (auto const& sym : *rule)
for (auto const& _sym : *rule)
{
// TODO: construct layout and obtain bounding box
util::apply_visitor(extractor, sym);
util::apply_visitor(extractor, _sym);
}
// add the bounding box to the layout manager

1
include/mapnik/sql_utils.hpp
View file

@ -30,6 +30,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/algorithm/string/replace.hpp>
#pragma GCC diagnostic pop

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

@ -37,6 +37,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>

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

@ -40,6 +40,7 @@ namespace mapnik { namespace svg {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma_nonterminal.hpp>
#include <boost/spirit/include/karma_rule.hpp>
#include <boost/fusion/adapted/struct.hpp>

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

@ -30,6 +30,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma.hpp>
#include <boost/fusion/include/std_pair.hpp>
#pragma GCC diagnostic pop

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

@ -30,6 +30,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/include/phoenix_core.hpp>

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

@ -33,6 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/spirit/include/phoenix_core.hpp>

4
include/mapnik/symbolizer_utils.hpp
View file

@ -461,8 +461,8 @@ struct set_symbolizer_property_impl<Symbolizer, T, true>
auto result = pre_evaluate_expression<value>(*val);
if (std::get<1>(result))
{
boost::optional<value_type> enum_val = detail::enum_traits<value_type>::from_string(std::get<0>(result).to_string());
if (enum_val)
boost::optional<value_type> enum_val2 = detail::enum_traits<value_type>::from_string(std::get<0>(result).to_string());
if (enum_val2)
{
put(sym, key, *enum_val);
}

4
include/mapnik/text/itemizer.hpp
View file

@ -86,8 +86,8 @@ public:
private:
template<typename T> struct run : util::noncopyable
{
run(T const& data, unsigned start, unsigned end)
: start(start), end(end), data(data) {}
run(T const& _data, unsigned _start, unsigned _end)
: start(_start), end(_end), data(_data) {}
unsigned start;
unsigned end;
T data;

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

@ -31,6 +31,7 @@
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/support_container.hpp>
#pragma GCC diagnostic pop

2
include/mapnik/vertex_cache.hpp
View file

@ -47,7 +47,7 @@ class MAPNIK_DECL vertex_cache : util::noncopyable
{
struct segment
{
segment(double x, double y, double length) : pos(x, y), length(length) {}
segment(double x, double y, double _length) : pos(x, y), length(_length) {}
pixel_position pos; //Last point of this segment, first point is implicitly defined by the previous segement in this vector
double length;
};

22
include/mapnik/vertex_converters.hpp
View file

@ -351,17 +351,17 @@ struct dispatcher : util::noncopyable
struct arguments : util::noncopyable
{
arguments(box2d<double> const& bbox, symbolizer_base const& sym, view_transform const& tr,
proj_transform const& prj_trans, agg::trans_affine const& affine_trans, feature_impl const& feature,
attributes const& vars, double scale_factor)
: bbox(bbox),
sym(sym),
tr(tr),
prj_trans(prj_trans),
affine_trans(affine_trans),
feature(feature),
vars(vars),
scale_factor(scale_factor) {}
arguments(box2d<double> const& _bbox, symbolizer_base const& _sym, view_transform const& _tr,
proj_transform const& _prj_trans, agg::trans_affine const& _affine_trans, feature_impl const& _feature,
attributes const& _vars, double _scale_factor)
: bbox(_bbox),
sym(_sym),
tr(_tr),
prj_trans(_prj_trans),
affine_trans(_affine_trans),
feature(_feature),
vars(_vars),
scale_factor(_scale_factor) {}
box2d<double> const& bbox;
symbolizer_base const& sym;

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

@ -33,6 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
#include <boost/math/special_functions/trunc.hpp> // for vc++ and android whose c++11 libs lack std::trunc

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

@ -29,6 +29,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/assert.hpp>
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_function.hpp>

16
plugins/input/geojson/geojson_datasource.cpp
View file

@ -55,7 +55,10 @@
#include <mapnik/json/extract_bounding_box_grammar_impl.hpp>
#if defined(SHAPE_MEMORY_MAPPED_FILE)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/interprocess/mapped_region.hpp>
#pragma GCC diagnostic pop
#include <mapnik/mapped_memory_cache.hpp>
#endif
@ -210,12 +213,11 @@ void geojson_datasource::initialise_index(Iterator start, Iterator end)
extent_ = box;
// parse first feature to extract attributes schema.
// NOTE: this doesn't yield correct answer for geoJSON in general, just an indication
Iterator itr = start + geometry_index.first;
Iterator end = itr + geometry_index.second;
Iterator itr2 = start + geometry_index.first;
Iterator end2 = itr + geometry_index.second;
mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,1));
boost::spirit::standard::space_type space;
if (!boost::spirit::qi::phrase_parse(itr, end, (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space))
if (!boost::spirit::qi::phrase_parse(itr2, end2, (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space))
{
throw std::runtime_error("Failed to parse geojson feature");
}
@ -351,13 +353,13 @@ boost::optional<mapnik::datasource_geometry_t> geojson_datasource::get_geometry_
std::fread(json.data(), size, 1, file.get());
using chr_iterator_type = char const*;
chr_iterator_type start = json.data();
chr_iterator_type end = start + json.size();
chr_iterator_type start2 = json.data();
chr_iterator_type end2 = start2 + json.size();
using namespace boost::spirit;
standard::space_type space;
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx,1));
if (!qi::phrase_parse(start, end, (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space))
if (!qi::phrase_parse(start2, end2, (geojson_datasource_static_feature_grammar)(boost::phoenix::ref(*feature)), space))
{
throw std::runtime_error("Failed to parse geojson feature");
}

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

@ -39,6 +39,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/version.hpp>
#include <boost/geometry/index/rtree.hpp>
#pragma GCC diagnostic pop

3
plugins/input/ogr/ogr_datasource.hpp
View file

@ -41,7 +41,10 @@
#include <string>
// ogr
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#include <ogrsf_frmts.h>
#pragma GCC diagnostic pop
#include "ogr_layer_ptr.hpp"
class ogr_datasource : public mapnik::datasource

6
plugins/input/ogr/ogr_featureset.hpp
View file

@ -29,11 +29,11 @@
#include <mapnik/unicode.hpp>
#include <mapnik/geom_util.hpp>
// boost
// ogr
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#include <ogrsf_frmts.h>
#pragma GCC diagnostic pop
class ogr_featureset : public mapnik::Featureset
{

3
plugins/input/ogr/ogr_index_featureset.cpp
View file

@ -35,8 +35,11 @@
// boost
#ifdef SHAPE_MEMORY_MAPPED_FILE
#include <mapnik/mapped_memory_cache.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/interprocess/mapped_region.hpp>
#include <boost/interprocess/streams/bufferstream.hpp>
#pragma GCC diagnostic pop
#endif
// ogr

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

@ -39,6 +39,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry.hpp>
#include <boost/version.hpp>

1
src/color.cpp
View file

@ -32,6 +32,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/spirit/include/phoenix_core.hpp>

1
src/conversions.cpp
View file

@ -33,6 +33,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/qi.hpp>
#ifdef MAPNIK_KARMA_TO_STRING
#include <boost/spirit/include/karma.hpp>

1
src/image_filter_types.cpp
View file

@ -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/spirit/include/karma.hpp>
#pragma GCC diagnostic pop

3
src/mapped_memory_cache.cpp
View file

@ -29,8 +29,11 @@
// boost
#include <boost/assert.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/interprocess/mapped_region.hpp>
#include <boost/interprocess/file_mapping.hpp>
#pragma GCC diagnostic pop
namespace mapnik
{

5
src/svg/output/svg_generator.cpp
View file

@ -28,7 +28,12 @@
#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"
#pragma GCC diagnostic ignored "-Wshadow"
#include <boost/spirit/include/karma.hpp>
#pragma GCC diagnostic pop
namespace mapnik { namespace svg {

2
test/data-visual

@ -1 +1 @@
Subproject commit a8a922990aa671369fdce51fe4bfe5447cead4d4
Subproject commit 8e70a97b35fdb687bbfe4027713e302b86e8420a

6
test/visual/config.hpp
View file

@ -35,10 +35,10 @@ namespace visual_tests
struct map_size
{
map_size(int width, int height) : width(width), height(height) { }
map_size(int _width, int _height) : width(_width), height(_height) { }
map_size() { }
unsigned width;
unsigned height;
unsigned width = 0;
unsigned height = 0;
};
struct config

4
test/visual/renderer.hpp
View file

@ -195,8 +195,8 @@ template <typename Renderer>
class renderer
{
public:
renderer(boost::filesystem::path const & output_dir, boost::filesystem::path const & reference_dir, bool overwrite)
: ren(), output_dir(output_dir), reference_dir(reference_dir), overwrite(overwrite)
renderer(boost::filesystem::path const & _output_dir, boost::filesystem::path const & _reference_dir, bool _overwrite)
: ren(), output_dir(_output_dir), reference_dir(_reference_dir), overwrite(_overwrite)
{
}

4
test/visual/report.hpp
View file

@ -40,7 +40,7 @@ public:
{
}
console_report(std::ostream & s) : s(s)
console_report(std::ostream & _s) : s(_s)
{
}
@ -68,7 +68,7 @@ public:
class html_report
{
public:
html_report(std::ostream & s) : s(s)
html_report(std::ostream & _s) : s(_s)
{
}