Fixed .length() that should return a int and not a size_t

ago%!(EXTRA string=12 years) · d3f0262a27
parent b9266c07b0
commit d3f0262a27
9 changed files with 9 additions and 8 deletions
--- 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
--- 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;
 	}
--- 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
--- 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;
 	}
--- 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
--- 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;
 	}
--- 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
--- 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;
 	}
--- 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