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

rename a few variables to avoid likely clashes

Browse source
This commit is contained in:
Dane Springmeyer 2014-03-09 21:29:52 -07:00
parent 19c2b76e10
commit dc8a13c44e
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/feature.hpp
View file

@ -90,7 +90,7 @@ private:
typedef context<std::map<std::string,std::size_t> > context_type;
typedef std::shared_ptr<context_type> context_ptr;
static const value default_value;
static const value default_feature_value;
class MAPNIK_DECL feature_impl : private mapnik::noncopyable
{
@ -166,14 +166,14 @@ public:
if (itr != ctx_->mapping_.end())
return get(itr->second);
else
return default_value;
return default_feature_value;
}
inline value_type const& get(std::size_t index) const
{
if (index < data_.size())
return data_[index];
return default_value;
return default_feature_value;
}
inline std::size_t size() const

8
include/mapnik/symbolizer.hpp
View file

@ -347,7 +347,7 @@ bool has_key(symbolizer_base const& sym, keys key)
}
template <typename T>
T get(symbolizer_base const& sym, keys key, mapnik::feature_impl const& feature, T const& default_value = T())
T get(symbolizer_base const& sym, keys key, mapnik::feature_impl const& feature, T const& _default_value = T())
{
typedef symbolizer_base::cont_type::const_iterator const_iterator;
const_iterator itr = sym.properties.find(key);
@ -355,7 +355,7 @@ T get(symbolizer_base const& sym, keys key, mapnik::feature_impl const& feature,
{
return boost::apply_visitor(extract_value<T>(feature), itr->second);
}
return default_value;
return _default_value;
}
template <typename T>
@ -371,7 +371,7 @@ boost::optional<T> get_optional(symbolizer_base const& sym, keys key, mapnik::fe
}
template <typename T>
T get(symbolizer_base const& sym, keys key, T const& default_value = T())
T get(symbolizer_base const& sym, keys key, T const& _default_value = T())
{
typedef symbolizer_base::cont_type::const_iterator const_iterator;
const_iterator itr = sym.properties.find(key);
@ -379,7 +379,7 @@ T get(symbolizer_base const& sym, keys key, T const& default_value = T())
{
return boost::apply_visitor(extract_raw_value<T>(), itr->second);
}
return default_value;
return _default_value;
}
template <typename T>

2
include/mapnik/xml_node.hpp
View file

@ -114,7 +114,7 @@ public:
boost::optional<T> get_opt_attr(std::string const& name) const;
template <typename T>
T get_attr(std::string const& name, T const& default_value) const;
T get_attr(std::string const& name, T const& default_opt_value) const;
template <typename T>
T get_attr(std::string const& name) const;