From 9d149d677f7979cfe9a3980980ea4c22fe752ffc Mon Sep 17 00:00:00 2001 From: Felix Ungman Date: Wed, 25 Sep 2013 10:12:16 +0200 Subject: [PATCH 1/2] Fixed missing constexpr in quaternion length --- glm/gtc/quaternion.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index ab30875f..bf9a1634 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -61,7 +61,7 @@ namespace detail public: T x, y, z, w; - GLM_FUNC_DECL int length() const; + GLM_FUNC_DECL GLM_CONSTEXPR int length() const; // Constructors tquat(); From 19808e30e2b755bf9235d9c6051ca017b11f65e1 Mon Sep 17 00:00:00 2001 From: Felix Ungman Date: Wed, 25 Sep 2013 10:14:24 +0200 Subject: [PATCH 2/2] Fixed static_assert errors --- glm/core/func_common.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl index 10f2a4e2..b225b919 100644 --- a/glm/core/func_common.inl +++ b/glm/core/func_common.inl @@ -1075,7 +1075,7 @@ namespace detail ) { GLM_STATIC_ASSERT( - std::numeric_limits::is_iec559, + std::numeric_limits::is_iec559, "'frexp' only accept floating-point inputs"); return detail::tvec2( @@ -1091,7 +1091,7 @@ namespace detail ) { GLM_STATIC_ASSERT( - std::numeric_limits::is_iec559, + std::numeric_limits::is_iec559, "'frexp' only accept floating-point inputs"); return detail::tvec3( @@ -1108,7 +1108,7 @@ namespace detail ) { GLM_STATIC_ASSERT( - std::numeric_limits::is_iec559, + std::numeric_limits::is_iec559, "'frexp' only accept floating-point inputs"); return detail::tvec4(