diff --git a/include/mapnik/image_filter.hpp b/include/mapnik/image_filter.hpp index 35fa4d257..50ccb0772 100644 --- a/include/mapnik/image_filter.hpp +++ b/include/mapnik/image_filter.hpp @@ -31,8 +31,6 @@ // boost #include #include -#include - // agg #include "agg_basics.h" @@ -176,11 +174,8 @@ void process_channel_impl (Src const& src, Dst & dst, Conv const& k) } template -void process_channel (Src const& src, Dst & dst, Conv const& k) +void process_channel (Src const&, Dst &, Conv const&) { - boost::ignore_unused_variable_warning(src); - boost::ignore_unused_variable_warning(dst); - boost::ignore_unused_variable_warning(k); } template diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp index a84d7c7be..ad3a0c9bb 100644 --- a/include/mapnik/symbolizer.hpp +++ b/include/mapnik/symbolizer.hpp @@ -51,7 +51,6 @@ #include // boost #include -#include namespace agg { struct trans_affine; } @@ -163,10 +162,8 @@ struct evaluate_path_wrapper { using result_type = T; template - result_type operator() (T1 const& expr, T2 const& feature) const + result_type operator() (T1 const&, T2 const&) const { - boost::ignore_unused_variable_warning(expr); - boost::ignore_unused_variable_warning(feature); return result_type(); } @@ -291,9 +288,8 @@ template struct enumeration_result { using result_type = T; - static result_type convert(enumeration_wrapper const& e) + static result_type convert(enumeration_wrapper const&) { - boost::ignore_unused_variable_warning(e); return result_type();// FAIL } }; @@ -425,9 +421,8 @@ struct extract_value : public boost::static_visitor } template - auto operator() (T1 const& val) const -> result_type + auto operator() (T1 const&) const -> result_type { - boost::ignore_unused_variable_warning(val); return result_type(); } diff --git a/include/mapnik/symbolizer_utils.hpp b/include/mapnik/symbolizer_utils.hpp index d92375da2..ee788a85e 100644 --- a/include/mapnik/symbolizer_utils.hpp +++ b/include/mapnik/symbolizer_utils.hpp @@ -127,9 +127,8 @@ struct symbolizer_name_impl : public boost::static_visitor { public: template - std::string operator () (Symbolizer const& sym) const + std::string operator () (Symbolizer const&) const { - boost::ignore_unused_variable_warning(sym); return symbolizer_traits::name(); } }; diff --git a/include/mapnik/text/placements/dummy.hpp b/include/mapnik/text/placements/dummy.hpp index 6d54f3f29..d3ed4aac3 100644 --- a/include/mapnik/text/placements/dummy.hpp +++ b/include/mapnik/text/placements/dummy.hpp @@ -25,8 +25,6 @@ // mapnik #include #include -// boost -#include namespace mapnik { diff --git a/include/mapnik/transform_processor.hpp b/include/mapnik/transform_processor.hpp index 343531cd9..063ac1f6e 100644 --- a/include/mapnik/transform_processor.hpp +++ b/include/mapnik/transform_processor.hpp @@ -57,9 +57,8 @@ struct transform_processor attribute_collector(Container& names) : collect_(names) {} - void operator() (identity_node const& node) const + void operator() (identity_node const&) const { - boost::ignore_unused_variable_warning(node); } void operator() (matrix_node const& node) const @@ -113,9 +112,8 @@ struct transform_processor vars_(v), scale_factor_(scale_factor) {} - void operator() (identity_node const& node) + void operator() (identity_node const&) { - boost::ignore_unused_variable_warning(node); } void operator() (matrix_node const& node) diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp index 31cfca2a6..5c96e257f 100644 --- a/include/mapnik/value.hpp +++ b/include/mapnik/value.hpp @@ -31,7 +31,6 @@ // boost #include -#include #include #include "hash_variant.hpp" @@ -179,9 +178,8 @@ struct not_equals // back compatibility shim to equate empty string with null for != test // https://github.com/mapnik/mapnik/issues/1859 // TODO - consider removing entire specialization at Mapnik 3.x - bool operator() (value_null lhs, value_unicode_string const& rhs) const + bool operator() (value_null, value_unicode_string const& rhs) const { - boost::ignore_unused_variable_warning(lhs); if (rhs.isEmpty()) return false; return true; } @@ -354,15 +352,13 @@ struct add : public boost::static_visitor return lhs + rhs; } - value_type operator() (value_unicode_string const& lhs, value_null rhs) const + value_type operator() (value_unicode_string const& lhs, value_null) const { - boost::ignore_unused_variable_warning(rhs); return lhs; } - value_type operator() (value_null lhs, value_unicode_string const& rhs) const + value_type operator() (value_null, value_unicode_string const& rhs) const { - boost::ignore_unused_variable_warning(lhs); return rhs; } @@ -418,11 +414,9 @@ struct sub : public boost::static_visitor return lhs - rhs ; } - value_type operator() (value_unicode_string const& lhs, - value_unicode_string const& rhs) const + value_type operator() (value_unicode_string const&, + value_unicode_string const&) const { - boost::ignore_unused_variable_warning(lhs); - boost::ignore_unused_variable_warning(rhs); return value_type(); } @@ -457,11 +451,9 @@ struct mult : public boost::static_visitor return lhs * rhs; } - value_type operator() (value_unicode_string const& lhs, - value_unicode_string const& rhs) const + value_type operator() (value_unicode_string const&, + value_unicode_string const&) const { - boost::ignore_unused_variable_warning(lhs); - boost::ignore_unused_variable_warning(rhs); return value_type(); } @@ -475,10 +467,8 @@ struct mult : public boost::static_visitor return lhs * rhs; } - value_type operator() (value_bool lhs, value_bool rhs) const + value_type operator() (value_bool, value_bool) const { - boost::ignore_unused_variable_warning(lhs); - boost::ignore_unused_variable_warning(rhs); return value_integer(0); } }; @@ -500,18 +490,14 @@ struct div: public boost::static_visitor return lhs / rhs; } - value_type operator() (value_bool lhs, value_bool rhs) const + value_type operator() (value_bool, value_bool) const { - boost::ignore_unused_variable_warning(lhs); - boost::ignore_unused_variable_warning(rhs); return false; } - value_type operator() (value_unicode_string const& lhs, - value_unicode_string const& rhs) const + value_type operator() (value_unicode_string const&, + value_unicode_string const&) const { - boost::ignore_unused_variable_warning(lhs); - boost::ignore_unused_variable_warning(rhs); return value_type(); } @@ -544,19 +530,15 @@ struct mod: public boost::static_visitor return lhs % rhs; } - value_type operator() (value_unicode_string const& lhs, - value_unicode_string const& rhs) const + value_type operator() (value_unicode_string const&, + value_unicode_string const&) const { - boost::ignore_unused_variable_warning(lhs); - boost::ignore_unused_variable_warning(rhs); return value_type(); } - value_type operator() (value_bool lhs, - value_bool rhs) const + value_type operator() (value_bool, + value_bool) const { - boost::ignore_unused_variable_warning(lhs); - boost::ignore_unused_variable_warning(rhs); return false; } @@ -597,9 +579,8 @@ struct negate : public boost::static_visitor return val ? value_integer(-1) : value_integer(0); } - value_type operator() (value_unicode_string const& ustr) const + value_type operator() (value_unicode_string const&) const { - boost::ignore_unused_variable_warning(ustr); return value_type(); } }; @@ -621,9 +602,8 @@ struct convert : public boost::static_visitor return !ustr.isEmpty(); } - value_bool operator() (value_null const& val) const + value_bool operator() (value_null const&) const { - boost::ignore_unused_variable_warning(val); return false; } @@ -667,9 +647,8 @@ struct convert : public boost::static_visitor return operator()(utf8); } - value_double operator() (value_null const& val) const + value_double operator() (value_null const&) const { - boost::ignore_unused_variable_warning(val); return 0.0; } }; @@ -707,9 +686,8 @@ struct convert : public boost::static_visitor return operator()(utf8); } - value_integer operator() (value_null const& val) const + value_integer operator() (value_null const&) const { - boost::ignore_unused_variable_warning(val); return value_integer(0); } }; @@ -740,9 +718,8 @@ struct convert : public boost::static_visitor return str; } - std::string operator() (value_null const& val) const + std::string operator() (value_null const&) const { - boost::ignore_unused_variable_warning(val); return ""; } }; @@ -771,9 +748,8 @@ struct to_unicode : public boost::static_visitor return value_unicode_string(str.c_str()); } - value_unicode_string operator() (value_null const& val) const + value_unicode_string operator() (value_null const&) const { - boost::ignore_unused_variable_warning(val); return value_unicode_string(""); } }; @@ -806,9 +782,8 @@ struct to_expression_string : public boost::static_visitor return val ? "true":"false"; } - std::string operator() (value_null const& val) const + std::string operator() (value_null const&) const { - boost::ignore_unused_variable_warning(val); return "null"; } }; @@ -996,16 +971,14 @@ struct is_null : public boost::static_visitor return val.is_null(); } - bool operator() (value_null const& val) const + bool operator() (value_null const&) const { - boost::ignore_unused_variable_warning(val); return true; } template - bool operator() (T const& val) const + bool operator() (T const&) const { - boost::ignore_unused_variable_warning(val); return false; } diff --git a/src/parse_path.cpp b/src/parse_path.cpp index f12889bb5..d5f25da4e 100644 --- a/src/parse_path.cpp +++ b/src/parse_path.cpp @@ -102,9 +102,8 @@ namespace path_processor_detail { collect_ (std::set & cont) : cont_(cont) {} - void operator() (std::string const& token) const + void operator() (std::string const&) const { - boost::ignore_unused_variable_warning(token); } void operator() (attribute const& attr) const diff --git a/src/save_map.cpp b/src/save_map.cpp index 356b09275..fa2df5a2e 100644 --- a/src/save_map.cpp +++ b/src/save_map.cpp @@ -51,7 +51,7 @@ #include #include #include -#include + // stl #include @@ -488,27 +488,23 @@ public: serialize_type( boost::property_tree::ptree & node): node_(node) {} - void operator () ( mapnik::value_integer val ) const + void operator () ( mapnik::value_integer ) const { - boost::ignore_unused_variable_warning(val); node_.put(".type", "int" ); } - void operator () ( mapnik::value_double val ) const + void operator () ( mapnik::value_double ) const { - boost::ignore_unused_variable_warning(val); node_.put(".type", "float" ); } - void operator () ( std::string const& val ) const + void operator () ( std::string const& ) const { - boost::ignore_unused_variable_warning(val); node_.put(".type", "string" ); } - void operator () ( mapnik::value_null val ) const + void operator () ( mapnik::value_null ) const { - boost::ignore_unused_variable_warning(val); node_.put(".type", "string" ); } diff --git a/src/transform_expression.cpp b/src/transform_expression.cpp index f235255d4..69f831296 100644 --- a/src/transform_expression.cpp +++ b/src/transform_expression.cpp @@ -38,9 +38,8 @@ struct transform_node_to_expression_string transform_node_to_expression_string(std::ostringstream& os) : os_(os) {} - void operator() (identity_node const& node) const + void operator() (identity_node const&) const { - boost::ignore_unused_variable_warning(node); } void operator() (matrix_node const& node)