archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

remove boost concept_check usage - refs #2346

Browse Source
This commit is contained in:
Dane Springmeyer 2014-08-08 13:15:57 -07:00
parent e33e0150ad
commit 1727fae6e7
9 changed files with 38 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/mapnik/image_filter.hpp
View File

@ -31,8 +31,6 @@
// boost
#include <boost/variant/static_visitor.hpp>
#include <boost/gil/gil_all.hpp>
#include <boost/concept_check.hpp>
// agg
#include "agg_basics.h"
@ -176,11 +174,8 @@ void process_channel_impl (Src const& src, Dst & dst, Conv const& k)
}
template <typename Src, typename Dst, typename Conv>
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 <typename Src, typename Dst>

11
include/mapnik/symbolizer.hpp
View File

@ -51,7 +51,6 @@
#include <functional>
// boost
#include <boost/variant/variant_fwd.hpp>
#include <boost/concept_check.hpp>
namespace agg { struct trans_affine; }
@ -163,10 +162,8 @@ struct evaluate_path_wrapper
{
using result_type = T;
template <typename T1, typename T2>
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 <typename T>
struct enumeration_result<T,false>
{
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<T>
}
template <typename T1>
auto operator() (T1 const& val) const -> result_type
auto operator() (T1 const&) const -> result_type
{
boost::ignore_unused_variable_warning(val);
return result_type();
}

3
include/mapnik/symbolizer_utils.hpp
View File

@ -127,9 +127,8 @@ struct symbolizer_name_impl : public boost::static_visitor<std::string>
{
public:
template <typename Symbolizer>
std::string operator () (Symbolizer const& sym) const
std::string operator () (Symbolizer const&) const
{
boost::ignore_unused_variable_warning(sym);
return symbolizer_traits<Symbolizer>::name();
}
};

2
include/mapnik/text/placements/dummy.hpp
View File

@ -25,8 +25,6 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/text/placements/base.hpp>
// boost
#include <boost/concept_check.hpp>
namespace mapnik
{

6
include/mapnik/transform_processor.hpp
View File

@ -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)

75
include/mapnik/value.hpp
View File

@ -31,7 +31,6 @@
// boost
#include <boost/variant/variant.hpp>
#include <boost/concept_check.hpp>
#include <boost/functional/hash.hpp>
#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<V>
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<V>
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<V>
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<V>
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<V>
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<V>
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<V>
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<value_bool> : public boost::static_visitor<value_bool>
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<value_double> : public boost::static_visitor<value_double>
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<value_integer> : public boost::static_visitor<value_integer>
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<std::string> : public boost::static_visitor<std::string>
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<value_unicode_string>
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<std::string>
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<bool>
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 <typename T>
bool operator() (T const& val) const
bool operator() (T const&) const
{
boost::ignore_unused_variable_warning(val);
return false;
}

3
src/parse_path.cpp
View File

@ -102,9 +102,8 @@ namespace path_processor_detail {
collect_ (std::set<std::string> & 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

14
src/save_map.cpp
View File

@ -51,7 +51,7 @@
#include <boost/optional.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/xml_parser.hpp>
#include <boost/concept_check.hpp>
// stl
#include <iostream>
@ -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("<xmlattr>.type", "int" );
}
void operator () ( mapnik::value_double val ) const
void operator () ( mapnik::value_double ) const
{
boost::ignore_unused_variable_warning(val);
node_.put("<xmlattr>.type", "float" );
}
void operator () ( std::string const& val ) const
void operator () ( std::string const& ) const
{
boost::ignore_unused_variable_warning(val);
node_.put("<xmlattr>.type", "string" );
}
void operator () ( mapnik::value_null val ) const
void operator () ( mapnik::value_null ) const
{
boost::ignore_unused_variable_warning(val);
node_.put("<xmlattr>.type", "string" );
}

3
src/transform_expression.cpp
View File

@ -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)