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

fix -Wshadow warnings

Browse source
This commit is contained in:
Dane Springmeyer 2015-10-01 12:10:29 -07:00
parent dd89552bc5
commit be22a67b60
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/text/placements/base.hpp
View file

@ -45,7 +45,7 @@ class MAPNIK_DECL text_placement_info : util::noncopyable
public:
// Constructor. Takes the parent text_placements object as a parameter
// to read defaults from it.
text_placement_info(text_placements const* parent, double scale_factor_);
text_placement_info(text_placements const* parent, double _scale_factor);
// Get next placement.
// This function is also called before the first placement is tried.
// Each class has to return at least one position!
@ -87,7 +87,7 @@ public:
// return text_placement_info_ptr(new text_placement_info_XXX(this));
// }
virtual text_placement_info_ptr get_placement_info(double scale_factor, feature_impl const& feature, attributes const& vars) const = 0;
virtual text_placement_info_ptr get_placement_info(double _scale_factor, feature_impl const& feature, attributes const& vars) const = 0;
// Get a list of all expressions used in any placement.
// This function is used to collect attributes.

6
include/mapnik/text/placements/dummy.hpp
View file

@ -37,7 +37,7 @@ struct attribute;
class MAPNIK_DECL text_placements_dummy: public text_placements
{
public:
text_placement_info_ptr get_placement_info(double scale_factor, feature_impl const& feature, attributes const& vars) const;
text_placement_info_ptr get_placement_info(double _scale_factor, feature_impl const& feature, attributes const& vars) const;
friend class text_placement_info_dummy;
};
@ -45,8 +45,8 @@ public:
class MAPNIK_DECL text_placement_info_dummy : public text_placement_info
{
public:
text_placement_info_dummy(text_placements_dummy const* parent, double scale_factor)
: text_placement_info(parent, scale_factor),
text_placement_info_dummy(text_placements_dummy const* parent, double _scale_factor)
: text_placement_info(parent, _scale_factor),
state(0) {}
bool next() const;
private:

4
include/mapnik/text/placements/simple.hpp
View file

@ -40,7 +40,7 @@ public:
text_placements_simple(symbolizer_base::value_type const& positions,
std::vector<directions_e> && direction,
std::vector<int> && text_sizes);
text_placement_info_ptr get_placement_info(double scale_factor, feature_impl const& feature, attributes const& vars) const;
text_placement_info_ptr get_placement_info(double _scale_factor, feature_impl const& feature, attributes const& vars) const;
std::string get_positions() const;
static text_placements_ptr from_xml(xml_node const& xml, fontset_map const& fontsets, bool is_shield);
void init_positions(std::string const& positions) const;
@ -58,7 +58,7 @@ class text_placement_info_simple : public text_placement_info
public:
text_placement_info_simple(text_placements_simple const* parent,
std::string const& evaluated_positions,
double scale_factor);
double _scale_factor);
bool next() const;
protected:
bool next_position_only() const;

2
test/visual/report.hpp
View file

@ -59,7 +59,7 @@ public:
{
}
console_short_report(std::ostream & s) : console_report(s)
console_short_report(std::ostream & _s) : console_report(_s)
{
}