diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index e528eb72..4bae9150 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -723,11 +723,15 @@ # define GLM_DEFAULT_CTOR #endif -#if GLM_HAS_CONSTEXPR +#if GLM_HAS_CONSTEXPR_PARTIAL # define GLM_CONSTEXPR constexpr -# define GLM_RELAXED_CONSTEXPR constexpr #else # define GLM_CONSTEXPR +#endif + +#if GLM_HAS_CONSTEXPR +# define GLM_RELAXED_CONSTEXPR constexpr +#else # define GLM_RELAXED_CONSTEXPR const #endif diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 4f16fd6d..15ec39a1 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -61,7 +61,7 @@ namespace glm template GLM_FUNC_DECL tmat4x3(tmat4x3 const & m); - GLM_FUNC_DECL explicit tmat4x3(ctor); + GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x3(ctor); GLM_FUNC_DECL explicit tmat4x3(T const & x); GLM_FUNC_DECL tmat4x3( T const & x0, T const & y0, T const & z0, diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index d176f41c..fa5b18d4 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -75,7 +75,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER tquat::tquat() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat::tquat() # ifndef GLM_FORCE_NO_CTOR_INIT : x(0), y(0), z(0), w(1) # endif diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl index b5880748..ea1e618f 100644 --- a/glm/gtx/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -61,7 +61,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER tdualquat::tdualquat() + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat() # ifndef GLM_FORCE_NO_CTOR_INIT : real(tquat()) , dual(tquat(0, 0, 0, 0)) @@ -71,7 +71,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER tdualquat::tdualquat(tdualquat const & d) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(tdualquat const & d) : real(d.real) , dual(d.dual) {}