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

---
 glm/detail/type_vec1.hpp | 4 ++--
 glm/gtc/quaternion.hpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp
index a869fe3d..8c7566a1 100644
--- a/glm/detail/type_vec1.hpp
+++ b/glm/detail/type_vec1.hpp
@@ -87,8 +87,8 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR vec() GLM_DEFAULT;
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR vec(vec const& v) GLM_DEFAULT;
-		template<qualifier Q>
-		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR vec(vec<1, T, Q> const& v);
+		template<qualifier P>
+		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR vec(vec<1, T, P> const& v);
 
 		// -- Explicit basic constructors --
 
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index d3b55040..34e3d568 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -53,7 +53,7 @@ namespace glm
 			union
 			{
 				struct { T x, y, z, w;};
-				typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<P>::value>::type data;
+				typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<Q>::value>::type data;
 			};
 		
 #			if GLM_COMPILER & GLM_COMPILER_CLANG