From 9a8724925a22151a79bcc7eda6625e46ad01035b Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Fri, 30 Dec 2016 01:31:34 +0100
Subject: [PATCH] Uses L for length template argument #584

---
 glm/detail/_swizzle_func.hpp | 14 +++++++-------
 glm/detail/type_vec4.hpp     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/glm/detail/_swizzle_func.hpp b/glm/detail/_swizzle_func.hpp
index 3f166550..06103621 100644
--- a/glm/detail/_swizzle_func.hpp
+++ b/glm/detail/_swizzle_func.hpp
@@ -21,23 +21,23 @@
 		return vec<4, T, P>(this->A, this->B, this->C, this->D);			\
 	}
 
-#define GLM_SWIZZLE_GEN_VEC2_ENTRY_DEF(T, P, S, CONST, A, B)	\
+#define GLM_SWIZZLE_GEN_VEC2_ENTRY_DEF(T, P, L, CONST, A, B)	\
 	template <typename T>										\
-	vec<S, T, P> vec<S, T, P>::A ## B() CONST					\
+	vec<L, T, P> vec<L, T, P>::A ## B() CONST					\
 	{															\
 		return vec<2, T, P>(this->A, this->B);					\
 	}
 
-#define GLM_SWIZZLE_GEN_VEC3_ENTRY_DEF(T, P, S, CONST, A, B, C)		\
+#define GLM_SWIZZLE_GEN_VEC3_ENTRY_DEF(T, P, L, CONST, A, B, C)		\
 	template <typename T>											\
-	vec<3, T, P> vec<S, T, P>::A ## B ## C() CONST					\
+	vec<3, T, P> vec<L, T, P>::A ## B ## C() CONST					\
 	{																\
-		return vec<S, T, P>(this->A, this->B, this->C);				\
+		return vec<3, T, P>(this->A, this->B, this->C);				\
 	}
 
-#define GLM_SWIZZLE_GEN_VEC4_ENTRY_DEF(T, P, S, CONST, A, B, C, D)		\
+#define GLM_SWIZZLE_GEN_VEC4_ENTRY_DEF(T, P, L, CONST, A, B, C, D)		\
 	template <typename T>												\
-	vec<4, T, P> vec<S, T, P>::A ## B ## C ## D() CONST					\
+	vec<4, T, P> vec<L, T, P>::A ## B ## C ## D() CONST					\
 	{																	\
 		return vec<4, T, P>(this->A, this->B, this->C, this->D);		\
 	}
diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp
index 753e9096..40ce10fd 100644
--- a/glm/detail/type_vec4.hpp
+++ b/glm/detail/type_vec4.hpp
@@ -99,7 +99,7 @@ namespace glm
 
 		// -- Conversion scalar constructors --
 
-		/// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
+		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
 		template <typename A, typename B, typename C, typename D>
 		GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(A a, B b, C c, D d);
 		template <typename A, typename B, typename C, typename D>