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

start fixing gcc 4.9 -Wshadow warnings

Browse source
This commit is contained in:
Dane Springmeyer 2015-12-02 15:54:58 -05:00 • committed by artemp
parent fd257f85aa
commit 1ce9f76fa3
10 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/attribute.hpp
View file

@ -36,8 +36,8 @@ namespace mapnik {
struct attribute
{
std::string name_;
explicit attribute(std::string const& name)
: name_(name) {}
explicit attribute(std::string const& _name)
: name_(_name) {}
template <typename V ,typename F>
V const& value(F const& f) const

10
include/mapnik/color.hpp
View file

@ -55,11 +55,11 @@ public:
premultiplied_(false)
{}
color(std::uint8_t red, std::uint8_t green, std::uint8_t blue, std::uint8_t alpha = 0xff, bool premultiplied = false)
: red_(red),
green_(green),
blue_(blue),
alpha_(alpha),
color(std::uint8_t _red, std::uint8_t _green, std::uint8_t _blue, std::uint8_t _alpha = 0xff, bool premultiplied = false)
: red_(_red),
green_(_green),
blue_(_blue),
alpha_(_alpha),
premultiplied_(premultiplied)
{}

4
include/mapnik/enumeration.hpp
View file

@ -41,8 +41,8 @@ public:
illegal_enum_value():
what_() {}
illegal_enum_value( std::string const& what ) :
what_( what )
illegal_enum_value( std::string const& _what ) :
what_( _what )
{
}
virtual ~illegal_enum_value() throw() {}

4
include/mapnik/feature.hpp
View file

@ -101,8 +101,8 @@ public:
using cont_type = std::vector<value_type>;
using iterator = feature_kv_iterator;
feature_impl(context_ptr const& ctx, mapnik::value_integer id)
: id_(id),
feature_impl(context_ptr const& ctx, mapnik::value_integer _id)
: id_(_id),
ctx_(ctx),
data_(ctx_->mapping_.size()),
geom_(geometry::geometry_empty()),

10
include/mapnik/marker.hpp
View file

@ -70,9 +70,9 @@ public:
box2d<double> bounding_box() const
{
std::size_t width = bitmap_data_.width();
std::size_t height = bitmap_data_.height();
return box2d<double>(static_cast<double>(0), static_cast<double>(0), static_cast<double>(width), static_cast<double>(height));
std::size_t _width = bitmap_data_.width();
std::size_t _height = bitmap_data_.height();
return box2d<double>(static_cast<double>(0), static_cast<double>(0), static_cast<double>(_width), static_cast<double>(_height));
}
inline double width() const
@ -189,8 +189,8 @@ struct marker : marker_base
marker() = default;
template <typename T>
marker(T && data) noexcept
: marker_base(std::move(data)) {}
marker(T && _data) noexcept
: marker_base(std::move(_data)) {}
double width() const
{

12
include/mapnik/simplify_converter.hpp
View file

@ -76,16 +76,16 @@ struct sleeve
bool inside(vertex2d const& q)
{
bool inside=false;
bool _inside=false;
for (unsigned i=0;i<4;++i)
{
if ((((v[i+1].y <= q.y) && (q.y < v[i].y)) ||
((v[i].y <= q.y) && (q.y < v[i+1].y))) &&
(q.x < (v[i].x - v[i+1].x) * (q.y - v[i+1].y)/ (v[i].y - v[i+1].y) + v[i+1].x))
inside=!inside;
_inside=!_inside;
}
return inside;
return _inside;
}
};
@ -592,11 +592,11 @@ private:
}
// Slurp the points back out that haven't been marked as discarded
for (vertex2d const& vertex : vertices)
for (vertex2d const& v : vertices)
{
if (vertex.cmd != SEG_END)
if (v.cmd != SEG_END)
{
vertices_.emplace_back(vertex);
vertices_.emplace_back(v);
}
}

2
include/mapnik/svg/svg_path_adapter.hpp
View file

@ -49,7 +49,7 @@ public:
using self_type = path_adapter<VertexContainer>;
//--------------------------------------------------------------------
path_adapter(VertexContainer & vertices) : vertices_(vertices), iterator_(0) {}
path_adapter(VertexContainer & _vertices) : vertices_(_vertices), iterator_(0) {}
//void remove_all() { vertices_.remove_all(); iterator_ = 0; }
//void free_all() { vertices_.free_all(); iterator_ = 0; }

8
include/mapnik/transform_path_adapter.hpp
View file

@ -56,11 +56,11 @@ struct transform_path_adapter
using size_type = std::size_t;
using value_type = typename select_value_type<Geometry, void>::type;
transform_path_adapter(Transform const& t,
Geometry & geom,
transform_path_adapter(Transform const& _t,
Geometry & _geom,
proj_transform const& prj_trans)
: t_(&t),
geom_(geom),
: t_(&_t),
geom_(_geom),
prj_trans_(&prj_trans) {}
explicit transform_path_adapter(Geometry & geom)

14
include/mapnik/view_transform.hpp
View file

@ -44,15 +44,15 @@ private:
int offset_;
public:
view_transform(int width, int height, box2d<double> const& extent,
double offset_x = 0.0, double offset_y = 0.0)
: width_(width),
height_(height),
extent_(extent),
view_transform(int _width, int _height, box2d<double> const& _extent,
double _offset_x = 0.0, double _offset_y = 0.0)
: width_(_width),
height_(_height),
extent_(_extent),
sx_(extent_.width() > 0 ? static_cast<double>(width_) / extent_.width() : 1.0),
sy_(extent_.height() > 0 ? static_cast<double>(height_) / extent_.height() : 1.0),
offset_x_(offset_x),
offset_y_(offset_y),
offset_x_(_offset_x),
offset_y_(_offset_y),
offset_(0) {}
view_transform(view_transform const&) = default;

2
include/mapnik/warning_ignore.hpp
View file

@ -22,8 +22,8 @@
#pragma GCC diagnostic ignored "-Wunknown-pragmas" // clang+gcc
#pragma GCC diagnostic ignored "-Wno-unknown-pragmas" // clang
#pragma GCC diagnostic ignored "-Wno-pragmas" // gcc
#pragma GCC diagnostic ignored "-Wno-unknown-pragmas" // clang
#pragma GCC diagnostic ignored "-Wno-unsequenced"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-parameter"