From b2cb4fe479d4ccf8fe91834849e4172a59c46812 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 27 Aug 2011 15:34:28 +0100 Subject: [PATCH 1/2] Fixed ticket #124 cast from mat* to quat undefined error --- glm/gtc/quaternion.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index e846fdc4..a4760ca6 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -88,7 +88,7 @@ namespace detail{ tmat3x3 const & m ) { - *this = toQuat(m); + *this = gtc::quaternion::quat_cast(m); } template @@ -97,7 +97,7 @@ namespace detail{ tmat4x4 const & m ) { - *this = toQuat(m); + *this = gtc::quaternion::quat_cast(m); } ////////////////////////////////////////////////////////////// From d46aa4403459be4c464b1efea73e99e77c5bea4b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 27 Aug 2011 15:39:26 +0100 Subject: [PATCH 2/2] Fixed warning, ticket #118 --- glm/core/_detail.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/core/_detail.hpp b/glm/core/_detail.hpp index 0748a83d..4d6a57ed 100644 --- a/glm/core/_detail.hpp +++ b/glm/core/_detail.hpp @@ -18,7 +18,7 @@ namespace detail { class thalf; -#if(__STDC_VERSION__ && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available +#if(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available typedef int64_t sint64; typedef uint64_t uint64; #elif(GLM_COMPILER & GLM_COMPILER_VC)