From d3f0262a2730a4c72b848c599f117d5d0405325c Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Sun, 8 Sep 2013 00:25:26 +0200
Subject: [PATCH] Fixed .length() that should return a int and not a size_t

---
 glm/core/type_vec1.hpp | 2 +-
 glm/core/type_vec1.inl | 2 +-
 glm/core/type_vec2.hpp | 2 +-
 glm/core/type_vec2.inl | 2 +-
 glm/core/type_vec3.hpp | 2 +-
 glm/core/type_vec3.inl | 2 +-
 glm/core/type_vec4.hpp | 2 +-
 glm/core/type_vec4.inl | 2 +-
 readme.txt             | 1 +
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/glm/core/type_vec1.hpp b/glm/core/type_vec1.hpp
index a3dabf04..fd07f5c7 100644
--- a/glm/core/type_vec1.hpp
+++ b/glm/core/type_vec1.hpp
@@ -46,7 +46,7 @@ namespace detail
 		typedef tvec1<T, P> type;
 		typedef tvec1<bool, P> bool_type;
 
-		GLM_FUNC_DECL GLM_CONSTEXPR size_type length() const;
+		GLM_FUNC_DECL GLM_CONSTEXPR int length() const;
 
 		//////////////////////////////////////
 		// Data
diff --git a/glm/core/type_vec1.inl b/glm/core/type_vec1.inl
index 09a6a1d5..330f5ec0 100644
--- a/glm/core/type_vec1.inl
+++ b/glm/core/type_vec1.inl
@@ -30,7 +30,7 @@ namespace glm{
 namespace detail
 {
 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec1<T, P>::size_type tvec1<T, P>::length() const
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR int tvec1<T, P>::length() const
 	{
 		return 1;
 	}
diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp
index d0c4404b..6b06828e 100644
--- a/glm/core/type_vec2.hpp
+++ b/glm/core/type_vec2.hpp
@@ -46,7 +46,7 @@ namespace detail
 		typedef tvec2<T, P> type;
 		typedef tvec2<bool, P> bool_type;
 
-		GLM_FUNC_DECL GLM_CONSTEXPR size_type length() const;
+		GLM_FUNC_DECL GLM_CONSTEXPR int length() const;
 
 		//////////////////////////////////////
 		// Data
diff --git a/glm/core/type_vec2.inl b/glm/core/type_vec2.inl
index 1d437fec..36ba51b2 100644
--- a/glm/core/type_vec2.inl
+++ b/glm/core/type_vec2.inl
@@ -30,7 +30,7 @@ namespace glm{
 namespace detail
 {
 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec2<T, P>::size_type tvec2<T, P>::length() const
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR int tvec2<T, P>::length() const
 	{
 		return 2;
 	}
diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp
index da9ff39a..0c5615bf 100644
--- a/glm/core/type_vec3.hpp
+++ b/glm/core/type_vec3.hpp
@@ -46,7 +46,7 @@ namespace detail
 		typedef tvec3<T, P> type;
 		typedef tvec3<bool, P> bool_type;
 
-		GLM_FUNC_DECL GLM_CONSTEXPR size_type length() const;
+		GLM_FUNC_DECL GLM_CONSTEXPR int length() const;
 
 		//////////////////////////////////////
 		// Data
diff --git a/glm/core/type_vec3.inl b/glm/core/type_vec3.inl
index b94731d1..ff0f2c1e 100644
--- a/glm/core/type_vec3.inl
+++ b/glm/core/type_vec3.inl
@@ -30,7 +30,7 @@ namespace glm{
 namespace detail
 {
 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec3<T, P>::size_type tvec3<T, P>::length() const
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR int tvec3<T, P>::length() const
 	{
 		return 3;
 	}
diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp
index 6c26bc6b..9f0ece97 100644
--- a/glm/core/type_vec4.hpp
+++ b/glm/core/type_vec4.hpp
@@ -46,7 +46,7 @@ namespace detail
 		typedef tvec4<T, P> type;
 		typedef tvec4<bool, P> bool_type;
 
-		GLM_FUNC_DECL GLM_CONSTEXPR size_type length() const;
+		GLM_FUNC_DECL GLM_CONSTEXPR int length() const;
 
 		//////////////////////////////////////
 		// Data
diff --git a/glm/core/type_vec4.inl b/glm/core/type_vec4.inl
index c06d0b63..f739f29f 100644
--- a/glm/core/type_vec4.inl
+++ b/glm/core/type_vec4.inl
@@ -30,7 +30,7 @@ namespace glm{
 namespace detail
 {
 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tvec4<T, P>::size_type tvec4<T, P>::length() const
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR int tvec4<T, P>::length() const
 	{
 		return 4;
 	}
diff --git a/readme.txt b/readme.txt
index d18dc8e3..4c782d23 100644
--- a/readme.txt
+++ b/readme.txt
@@ -54,6 +54,7 @@ GLM 0.9.5.0: 2013-XX-XX
 - Removed l-value swizzle operators
 - Clean up compiler detection code for unsupported compilers
 - Uses C++ casts
+- Fixed .length() that should return a int and not a size_t
 
 ================================================================================
 GLM 0.9.4.6: 2013-08-XX