Merge branch '0.9.2' of ssh://ogl-math.git.sourceforge.net/gitroot/ogl-math/ogl-math into 0.9.2

ago%!(EXTRA string=14 years) · 317a14aadd
parent 9385876f51 d46aa44034
commit 317a14aadd
2 changed files with 3 additions and 3 deletions
--- 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)
--- a/glm/gtc/quaternion.inl
+++ b/glm/gtc/quaternion.inl
@ -88,7 +88,7 @@ namespace detail{
 		tmat3x3<T> const & m
 	)
    {
-		*this = toQuat(m);
+		*this = gtc::quaternion::quat_cast(m);
    }

    template <typename T> 
@ -97,7 +97,7 @@ namespace detail{
 		tmat4x4<T> const & m
 	)
    {
-		*this = toQuat(m);
+		*this = gtc::quaternion::quat_cast(m);
    }

    //////////////////////////////////////////////////////////////