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

fix -Wshadow warnings caught by g++-5

Browse source
This commit is contained in:
Dane Springmeyer 2016-09-03 09:58:40 -07:00
parent e580d0b1d6
commit 3741a7f348
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/image_view_any.hpp
View file

@ -47,9 +47,9 @@ struct MAPNIK_DECL image_view_any : image_view_base
image_view_any() = default;
template <typename T>
image_view_any(T && data)
image_view_any(T && _data)
noexcept(std::is_nothrow_constructible<image_view_base, T && >::value)
: image_view_base(std::forward<T>(data)) {}
: image_view_base(std::forward<T>(_data)) {}
std::size_t width() const;
std::size_t height() const;

3
include/mapnik/warning_ignore.hpp
View file

@ -28,7 +28,8 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wredeclared-class-member"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" // gcc5
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wc++11-narrowing"
#pragma GCC diagnostic ignored "-Wsign-conversion"