mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-15 14:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings when compiling with -Wshadow & clang

Browse Source 
Fix a handful of places where parameters shadow fields.
This commit is contained in:
Loren Brichter 2013-05-21 23:08:35 -04:00
parent bc9aaa4033
commit 0d826a27ad
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glm/core/_detail.hpp
View File

@ -136,12 +136,12 @@ namespace detail
i(0)
{}
GLM_FUNC_QUALIFIER uif32(float f) :
f(f)
GLM_FUNC_QUALIFIER uif32(float f_) :
f(f_)
{}
GLM_FUNC_QUALIFIER uif32(unsigned int i) :
i(i)
GLM_FUNC_QUALIFIER uif32(unsigned int i_) :
i(i_)
{}
float f;
@ -154,12 +154,12 @@ namespace detail
i(0)
{}
GLM_FUNC_QUALIFIER uif64(double f) :
f(f)
GLM_FUNC_QUALIFIER uif64(double f_) :
f(f_)
{}
GLM_FUNC_QUALIFIER uif64(uint64 i) :
i(i)
GLM_FUNC_QUALIFIER uif64(uint64 i_) :
i(i_)
{}
double f;

4
glm/core/type_vec1.inl
View File

@ -883,9 +883,9 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER tref1<T>::tref1
(
T & x
T & x_
) :
x(x)
x(x_)
{}
template <typename T>

8
glm/core/type_vec2.inl
View File

@ -972,11 +972,11 @@ namespace detail
template <typename T>
tref2<T>::tref2
(
T & x,
T & y
T & x_,
T & y_
) :
x(x),
y(y)
x(x_),
y(y_)
{}
template <typename T>

8
glm/core/type_vec3.inl
View File

@ -1092,10 +1092,10 @@ namespace detail
// tref definition
template <typename T>
GLM_FUNC_QUALIFIER tref3<T>::tref3(T & x, T & y, T & z) :
x(x),
y(y),
z(z)
GLM_FUNC_QUALIFIER tref3<T>::tref3(T & x_, T & y_, T & z_) :
x(x_),
y(y_),
z(z_)
{}
template <typename T>

16
glm/core/type_vec4.inl
View File

@ -1309,15 +1309,15 @@ namespace detail
template <typename T>
tref4<T>::tref4
(
T & x,
T & y,
T & z,
T & w
T & x_,
T & y_,
T & z_,
T & w_
) :
x(x),
y(y),
z(z),
w(w)
x(x_),
y(y_),
z(z_),
w(w_)
{}
template <typename T>

16
glm/gtc/quaternion.inl
View File

@ -60,15 +60,15 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER tquat<T>::tquat
(
value_type const & w,
value_type const & x,
value_type const & y,
value_type const & z
value_type const & w_,
value_type const & x_,
value_type const & y_,
value_type const & z_
) :
x(x),
y(y),
z(z),
w(w)
x(x_),
y(y_),
z(z_),
w(w_)
{}
//////////////////////////////////////////////////////////////