From 8624e3837939ff378ecefcdf09cb144e196590be Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Wed, 16 Aug 2017 01:48:50 +0200
Subject: [PATCH] Fixed shadows template parameter warnings

---
 glm/detail/type_mat2x2.hpp | 8 ++++----
 glm/detail/type_mat2x3.hpp | 8 ++++----
 glm/detail/type_mat2x4.hpp | 8 ++++----
 glm/detail/type_mat3x2.hpp | 8 ++++----
 glm/detail/type_mat3x3.hpp | 8 ++++----
 glm/detail/type_mat3x4.hpp | 8 ++++----
 glm/detail/type_mat4x2.hpp | 8 ++++----
 glm/detail/type_mat4x3.hpp | 8 ++++----
 glm/detail/type_mat4x4.hpp | 8 ++++----
 glm/gtc/quaternion.hpp     | 8 ++++----
 10 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp
index 0571d31a..1d64c059 100644
--- a/glm/detail/type_mat2x2.hpp
+++ b/glm/detail/type_mat2x2.hpp
@@ -36,8 +36,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<2, 2, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<2, 2, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<2, 2, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T scalar);
 		GLM_FUNC_DECL mat(
@@ -61,8 +61,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 4, T, Q> const& x);
diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp
index 791ce7c1..8f3e4feb 100644
--- a/glm/detail/type_mat2x3.hpp
+++ b/glm/detail/type_mat2x3.hpp
@@ -37,8 +37,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<2, 3, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<2, 3, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<2, 3, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T scalar);
 		GLM_FUNC_DECL mat(
@@ -62,8 +62,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 3, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 3, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp
index a12a3d82..00e8d9b8 100644
--- a/glm/detail/type_mat2x4.hpp
+++ b/glm/detail/type_mat2x4.hpp
@@ -37,8 +37,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<2, 4, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<2, 4, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<2, 4, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T scalar);
 		GLM_FUNC_DECL mat(
@@ -64,8 +64,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 4, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 4, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp
index c37384c4..3fe00fda 100644
--- a/glm/detail/type_mat3x2.hpp
+++ b/glm/detail/type_mat3x2.hpp
@@ -37,8 +37,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<3, 2, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<3, 2, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<3, 2, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T scalar);
 		GLM_FUNC_DECL mat(
@@ -69,8 +69,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 2, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 2, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp
index 1cad819b..9d4c5ded 100644
--- a/glm/detail/type_mat3x3.hpp
+++ b/glm/detail/type_mat3x3.hpp
@@ -36,8 +36,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<3, 3, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<3, 3, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<3, 3, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T scalar);
 		GLM_FUNC_DECL mat(
@@ -68,8 +68,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 4, T, Q> const& x);
diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp
index 4dfab12d..cfebd867 100644
--- a/glm/detail/type_mat3x4.hpp
+++ b/glm/detail/type_mat3x4.hpp
@@ -37,8 +37,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<3, 4, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<3, 4, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<3, 4, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T scalar);
 		GLM_FUNC_DECL mat(
@@ -69,8 +69,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 4, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 4, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp
index edcd0784..0c9b3725 100644
--- a/glm/detail/type_mat4x2.hpp
+++ b/glm/detail/type_mat4x2.hpp
@@ -37,8 +37,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<4, 2, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<4, 2, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<4, 2, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T scalar);
 		GLM_FUNC_DECL mat(
@@ -74,8 +74,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 2, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 2, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp
index d92ce389..09228b71 100644
--- a/glm/detail/type_mat4x3.hpp
+++ b/glm/detail/type_mat4x3.hpp
@@ -37,8 +37,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<4, 3, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<4, 3, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<4, 3, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T const& x);
 		GLM_FUNC_DECL mat(
@@ -74,8 +74,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 3, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 3, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp
index 15baede2..92051725 100644
--- a/glm/detail/type_mat4x4.hpp
+++ b/glm/detail/type_mat4x4.hpp
@@ -36,8 +36,8 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT;
 		GLM_FUNC_DECL mat(mat<4, 4, T, Q> const& m) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL mat(mat<4, 4, T, Q> const& m);
+		template<qualifier P>
+		GLM_FUNC_DECL mat(mat<4, 4, T, P> const& m);
 
 		GLM_FUNC_DECL explicit mat(T const& x);
 		GLM_FUNC_DECL mat(
@@ -73,8 +73,8 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 4, U, Q> const& m);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 4, U, P> const& m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, Q> const& x);
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, Q> const& x);
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index d9947c6c..d3b55040 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -79,8 +79,8 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR tquat() GLM_DEFAULT;
 		GLM_FUNC_DECL GLM_CONSTEXPR tquat(tquat<T, Q> const& q) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL GLM_CONSTEXPR tquat(tquat<T, Q> const& q);
+		template<qualifier P>
+		GLM_FUNC_DECL GLM_CONSTEXPR tquat(tquat<T, P> const& q);
 
 		// -- Explicit basic constructors --
 
@@ -89,8 +89,8 @@ namespace glm
 
 		// -- Conversion constructors --
 
-		template<typename U, qualifier Q>
-		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tquat(tquat<U, Q> const& q);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tquat(tquat<U, P> const& q);
 
 		/// Explicit conversion operators
 #		if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS