Fixed missing value_type for dual quaternion, Fixed return type of du…

…al quaternion length
g-truc · Jun 28, 2014 · d84fa89 · d84fa89
1 parent 9a3f422
commit d84fa89
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
@@ -59,7 +59,7 @@ namespace detail
 	{
 		enum ctor{null};
 
-                typedef T value_type;
+		typedef T value_type;
 		typedef tvec4<bool, P> bool_type;
 
 	public:

diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp
@@ -57,13 +57,13 @@ namespace detail
 	struct tdualquat
 	{
 		enum ctor{null};
-
+		typedef T value_type;
 		typedef glm::detail::tquat<T, P> part_type;
 
 	public:
 		glm::detail::tquat<T, P> real, dual;
 
-		GLM_FUNC_DECL GLM_CONSTEXPR int length() const;
+		GLM_FUNC_DECL GLM_CONSTEXPR length_t length() const;
 
 		// Constructors
 		GLM_FUNC_DECL tdualquat();

diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl
@@ -33,7 +33,7 @@ namespace glm{
 namespace detail
 {
 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR int tdualquat<T, P>::length() const
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR length_t tdualquat<T, P>::length() const
 	{
 		return 8;
 	}

diff --git a/readme.txt b/readme.txt
@@ -40,6 +40,8 @@ http://glm.g-truc.net/glm.pdf
 GLM 0.9.5.5: 2014-XX-XX
 --------------------------------------------------------------------------------
 - Fixed std::nextafter not supported with C++11 on Android #213
+- Fixed missing value_type for dual quaternion
+- Fixed return type of dual quaternion length
 
 ================================================================================
 GLM 0.9.5.4: 2014-06-21