diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index 8463d205..5505ffe5 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -55,45 +55,45 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x2() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x2(tmat2x2 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat2x2() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat2x2(tmat2x2 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x2(tmat2x2 const & m); + GLM_FUNC_DECL tmat2x2(tmat2x2 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x2(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x2(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x2( + GLM_FUNC_DECL explicit tmat2x2(T scalar); + GLM_FUNC_DECL tmat2x2( T const & x1, T const & y1, T const & x2, T const & y2); - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x2( + GLM_FUNC_DECL tmat2x2( col_type const & v1, col_type const & v2); // -- Conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x2( + GLM_FUNC_DECL tmat2x2( U const & x1, V const & y1, M const & x2, N const & y2); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x2( + GLM_FUNC_DECL tmat2x2( tvec2 const & v1, tvec2 const & v2); // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat2x2 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat2x2 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat3x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x2(tmat4x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat3x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat2x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat3x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat2x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat4x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat3x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat4x3 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat2x2.inl b/glm/detail/type_mat2x2.inl index 968366ae..da426ebb 100644 --- a/glm/detail/type_mat2x2.inl +++ b/glm/detail/type_mat2x2.inl @@ -54,7 +54,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2() + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0); @@ -65,7 +65,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x2 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -74,7 +74,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x2 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -85,14 +85,14 @@ namespace detail {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(T scalar) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(T scalar) { this->value[0] = col_type(scalar, 0); this->value[1] = col_type(0, scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2 + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2 ( T const & x0, T const & y0, T const & x1, T const & y1 @@ -103,7 +103,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(col_type const & v0, col_type const & v1) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(col_type const & v0, col_type const & v1) { this->value[0] = v0; this->value[1] = v1; @@ -113,7 +113,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2 + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2 ( X1 const & x1, Y1 const & y1, X2 const & x2, Y2 const & y2 @@ -125,7 +125,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tvec2 const & v1, tvec2 const & v2) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tvec2 const & v1, tvec2 const & v2) { this->value[0] = col_type(v1); this->value[1] = col_type(v2); @@ -135,63 +135,63 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x2 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat3x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat3x2 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat4x2 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat3x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2::tmat2x2(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat2x2::tmat2x2(tmat4x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl index ea1e618f..324520d9 100644 --- a/glm/gtx/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -71,7 +71,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(tdualquat const & d) + GLM_FUNC_QUALIFIER tdualquat::tdualquat(tdualquat const & d) : real(d.real) , dual(d.dual) {}