diff --git a/include/mapnik/attribute_collector.hpp b/include/mapnik/attribute_collector.hpp index 5dc9d13283..bc70dd4599 100644 --- a/include/mapnik/attribute_collector.hpp +++ b/include/mapnik/attribute_collector.hpp @@ -47,7 +47,6 @@ #include // for text_placements // boost -#include #include #include @@ -62,12 +61,11 @@ struct expression_attributes : boost::static_visitor explicit expression_attributes(Container& names) : names_(names) {} - void operator() (value_type const& x) const + void operator() (value_type const& /*x*/) const { - boost::ignore_unused_variable_warning(x); } - void operator() (geometry_type_attribute const& type) const + void operator() (geometry_type_attribute const& /*type*/) const { // do nothing } diff --git a/include/mapnik/feature_style_processor_impl.hpp b/include/mapnik/feature_style_processor_impl.hpp index e2f62e1f6f..76f4f190c0 100644 --- a/include/mapnik/feature_style_processor_impl.hpp +++ b/include/mapnik/feature_style_processor_impl.hpp @@ -49,7 +49,6 @@ #include #include #include -#include // stl #include @@ -74,11 +73,8 @@ template <> // No-op specialization struct process_impl { template - static void process(T0 & ren, T1 const& sym, T2 & f, T3 const& tr) + static void process(T0 & /*ren*/, T1 const& /*sym*/, T2 & /*f*/, T3 const& /*tr*/) { - boost::ignore_unused_variable_warning(ren); - boost::ignore_unused_variable_warning(f); - boost::ignore_unused_variable_warning(tr); #ifdef MAPNIK_DEBUG std::clog << "NO-OP ...\n"; #endif diff --git a/include/mapnik/grid/grid_pixfmt.hpp b/include/mapnik/grid/grid_pixfmt.hpp index 30c43fcd23..5ad790b9b2 100644 --- a/include/mapnik/grid/grid_pixfmt.hpp +++ b/include/mapnik/grid/grid_pixfmt.hpp @@ -40,7 +40,7 @@ template struct blender_gray enum base_scale_e { base_shift = color_type::base_shift }; static AGG_INLINE void blend_pix(value_type* p, unsigned cv, - unsigned alpha, unsigned cover=0) + unsigned alpha, unsigned /*cover*/=0) { *p = (value_type)((((cv - calc_type(*p)) * alpha) + (calc_type(*p) << base_shift)) >> base_shift); } @@ -256,7 +256,7 @@ class pixfmt_alpha_blend_gray void blend_hline(int x, int y, unsigned len, const color_type& c, - agg::int8u cover) + agg::int8u /*cover*/) { value_type* p = (value_type*) m_rbuf->row_ptr(x, y, len) + x * Step + Offset; @@ -588,7 +588,7 @@ class pixfmt_alpha_blend_gray void blend_from_color(const SrcPixelFormatRenderer& from, const color_type& color, int xdst, int ydst, - int xsrc, int ysrc, + int /*xsrc*/, int ysrc, unsigned len, agg::int8u cover) { @@ -615,7 +615,7 @@ class pixfmt_alpha_blend_gray void blend_from_lut(const SrcPixelFormatRenderer& from, const color_type* color_lut, int xdst, int ydst, - int xsrc, int ysrc, + int /*xsrc*/, int ysrc, unsigned len, agg::int8u cover) { diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp index f2b8e83b5e..8abf326bec 100644 --- a/include/mapnik/grid/grid_renderer.hpp +++ b/include/mapnik/grid/grid_renderer.hpp @@ -73,8 +73,8 @@ class MAPNIK_DECL grid_renderer : public feature_style_processor const& query_extent); void end_layer_processing(layer const& lay); - void start_style_processing(feature_type_style const& st) {} - void end_style_processing(feature_type_style const& st) {} + void start_style_processing(feature_type_style const& /*st*/) {} + void end_style_processing(feature_type_style const& /*st*/) {} void render_marker(mapnik::feature_impl & feature, unsigned int step, pixel_position const& pos, marker const& marker, const agg::trans_affine & tr, double opacity, composite_mode_e comp_op); void process(point_symbolizer const& sym, diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp index 0af9e1479a..ad14c69361 100644 --- a/include/mapnik/placement_finder.hpp +++ b/include/mapnik/placement_finder.hpp @@ -57,8 +57,7 @@ template class placement_finder : mapnik::noncopyable { public: - placement_finder(feature_impl const& feature, - text_placement_info const& placement_info, + placement_finder(text_placement_info const& placement_info, string_info const& info, DetectorT & detector, box2d const& extent); diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp index f76e190720..1e98fee09b 100644 --- a/include/mapnik/svg/output/svg_renderer.hpp +++ b/include/mapnik/svg/output/svg_renderer.hpp @@ -79,8 +79,8 @@ class MAPNIK_DECL svg_renderer : public feature_style_processor const& query_extent); void end_layer_processing(layer const& lay); - void start_style_processing(feature_type_style const& st) {} - void end_style_processing(feature_type_style const& st) {} + void start_style_processing(feature_type_style const& /*st*/) {} + void end_style_processing(feature_type_style const& /*st*/) {} /*! * @brief Overloads that process each kind of symbolizer individually. @@ -115,9 +115,9 @@ class MAPNIK_DECL svg_renderer : public feature_style_processor const& symbol_bbox) + double /*opacity*/, + box2d const& /*symbol_bbox*/) { using namespace agg; diff --git a/include/mapnik/symbolizer_hash.hpp b/include/mapnik/symbolizer_hash.hpp index 7957434026..db89ff8a97 100644 --- a/include/mapnik/symbolizer_hash.hpp +++ b/include/mapnik/symbolizer_hash.hpp @@ -34,10 +34,9 @@ namespace mapnik { struct symbolizer_hash { template - static std::size_t value(T const& sym) + static std::size_t value(T const& /*sym*/) { - std::size_t seed = 0; - return seed; + return 0; } // specialisation for polygon_symbolizer static std::size_t value(polygon_symbolizer const& sym) diff --git a/include/mapnik/tiff_io.hpp b/include/mapnik/tiff_io.hpp index 18b6661807..9303aab5a0 100644 --- a/include/mapnik/tiff_io.hpp +++ b/include/mapnik/tiff_io.hpp @@ -146,16 +146,16 @@ static toff_t tiff_size_proc(thandle_t fd) return (toff_t)len; } -static tsize_t tiff_dummy_read_proc(thandle_t fd, tdata_t buf, tsize_t size) +static tsize_t tiff_dummy_read_proc(thandle_t /*fd*/, tdata_t /*buf*/, tsize_t /*size*/) { return 0; } -static void tiff_dummy_unmap_proc(thandle_t fd, tdata_t base, toff_t size) +static void tiff_dummy_unmap_proc(thandle_t /*fd*/, tdata_t /*base*/, toff_t /*size*/) { } -static int tiff_dummy_map_proc(thandle_t fd, tdata_t* pbase, toff_t* psize) +static int tiff_dummy_map_proc(thandle_t /*fd*/, tdata_t* /*pbase*/, toff_t* /*psize*/) { return 0; } diff --git a/include/mapnik/util/container_adapter.hpp b/include/mapnik/util/container_adapter.hpp index 5f98e995e4..d6c1bbc265 100644 --- a/include/mapnik/util/container_adapter.hpp +++ b/include/mapnik/util/container_adapter.hpp @@ -55,7 +55,7 @@ template <> struct end_container { static mapnik::util::path_iterator - call (mapnik::geometry_type const& g) + call (mapnik::geometry_type const& /*g*/) { return mapnik::util::path_iterator(); } diff --git a/include/mapnik/util/geometry_svg_generator.hpp b/include/mapnik/util/geometry_svg_generator.hpp index aec04fd8d6..107ad8eb1b 100644 --- a/include/mapnik/util/geometry_svg_generator.hpp +++ b/include/mapnik/util/geometry_svg_generator.hpp @@ -76,7 +76,7 @@ template <> struct end_container { static mapnik::util::path_iterator - call (path_type const& g) + call (path_type const& /*g*/) { return mapnik::util::path_iterator(); } diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp index 6eab9d00bd..9cb0d6e495 100644 --- a/include/mapnik/vertex_converters.hpp +++ b/include/mapnik/vertex_converters.hpp @@ -89,7 +89,7 @@ struct converter_traits typedef T0 geometry_type; typedef geometry_type conv_type; template - static void setup(geometry_type & geom, Args const& /*args*/) + static void setup(geometry_type & /*geom*/, Args const& /*args*/) { throw std::runtime_error("invalid call to setup"); } @@ -219,7 +219,7 @@ struct converter_traits typedef T geometry_type; typedef typename agg::conv_close_polygon conv_type; template - static void setup(geometry_type & geom, Args const& /*args*/) + static void setup(geometry_type & /*geom*/, Args const& /*args*/) { // no-op } diff --git a/include/mapnik/xml_attribute_cast.hpp b/include/mapnik/xml_attribute_cast.hpp index 20a411c474..76562f0c23 100644 --- a/include/mapnik/xml_attribute_cast.hpp +++ b/include/mapnik/xml_attribute_cast.hpp @@ -44,7 +44,7 @@ namespace mapnik { namespace detail { template struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& /*source*/) { std::string err_msg = (boost::format("No conversion from std::string to %s") % typeid(T).name()).str(); throw std::runtime_error(err_msg); @@ -55,7 +55,7 @@ struct do_xml_attribute_cast template <> struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { bool result; if (mapnik::util::string2bool(source, result)) @@ -68,7 +68,7 @@ struct do_xml_attribute_cast template <> struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { int result; if (mapnik::util::string2int(source, result)) @@ -82,7 +82,7 @@ struct do_xml_attribute_cast template <> struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { int result; if (mapnik::util::string2int(source, result)) @@ -98,7 +98,7 @@ struct do_xml_attribute_cast template <> struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { int result; if (mapnik::util::string2int(source, result)) @@ -111,7 +111,7 @@ struct do_xml_attribute_cast template <> struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { float result; if (mapnik::util::string2float(source, result)) @@ -124,7 +124,7 @@ struct do_xml_attribute_cast template <> struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { double result; if (mapnik::util::string2double(source, result)) @@ -137,7 +137,7 @@ struct do_xml_attribute_cast template struct do_xml_attribute_cast > { - static inline boost::optional > xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional > xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { typedef typename boost::optional > result_type; try @@ -168,7 +168,7 @@ struct do_xml_attribute_cast template <> struct do_xml_attribute_cast { - static inline boost::optional xml_attribute_cast_impl(xml_tree const& tree, std::string const& source) + static inline boost::optional xml_attribute_cast_impl(xml_tree const& /*tree*/, std::string const& source) { return boost::optional(source); }