Fix warnings when compiling with -Wshadow & clang

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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