diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 4916d7b5a..0f8935c5a 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -170,18 +170,6 @@ # define GLM_HAS_BITSCAN_WINDOWS 0 #endif -#if GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_NOEXCEPT 1 -#else -# define GLM_HAS_NOEXCEPT 0 -#endif - -#if GLM_HAS_NOEXCEPT -# define GLM_NOEXCEPT noexcept -#else -# define GLM_NOEXCEPT -#endif - /////////////////////////////////////////////////////////////////////////////////// // OpenMP #ifdef _OPENMP diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index d606fd9bd..ca9ec968f 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -27,8 +27,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 2; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat2x2.inl b/glm/detail/type_mat2x2.inl index d402589e4..f30c1e892 100644 --- a/glm/detail/type_mat2x2.inl +++ b/glm/detail/type_mat2x2.inl @@ -105,14 +105,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type const& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type const& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index 7122351d2..e444ac1ec 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -28,8 +28,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 2; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat2x3.inl b/glm/detail/type_mat2x3.inl index ba6152602..59fb622d0 100644 --- a/glm/detail/type_mat2x3.inl +++ b/glm/detail/type_mat2x3.inl @@ -105,14 +105,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type & mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type & mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type const& mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type const& mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 44652d017..93967398a 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -28,8 +28,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 2; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat2x4.inl b/glm/detail/type_mat2x4.inl index 47f7d298b..20a88bc91 100644 --- a/glm/detail/type_mat2x4.inl +++ b/glm/detail/type_mat2x4.inl @@ -107,14 +107,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type & mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type & mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type const& mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type const& mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index 4eb4b5b62..753b1b2ca 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -28,8 +28,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 3; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat3x2.inl b/glm/detail/type_mat3x2.inl index 8c1b8df89..e69cab919 100644 --- a/glm/detail/type_mat3x2.inl +++ b/glm/detail/type_mat3x2.inl @@ -108,14 +108,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type & mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type & mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type const& mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type const& mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp index e4586badc..6afc7f21f 100644 --- a/glm/detail/type_mat3x3.hpp +++ b/glm/detail/type_mat3x3.hpp @@ -27,8 +27,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 3; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat3x3.inl b/glm/detail/type_mat3x3.inl index a3fb21bbd..d961f040f 100644 --- a/glm/detail/type_mat3x3.inl +++ b/glm/detail/type_mat3x3.inl @@ -111,14 +111,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type & mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type & mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type const& mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type const& mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index bae2179c3..f2e6eff81 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -28,8 +28,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 3; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat3x4.inl b/glm/detail/type_mat3x4.inl index ea456a8c1..17b0a49cb 100644 --- a/glm/detail/type_mat3x4.inl +++ b/glm/detail/type_mat3x4.inl @@ -114,14 +114,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type & mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type & mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type const& mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type const& mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index e373292e0..d2b406495 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -28,8 +28,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 4; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat4x2.inl b/glm/detail/type_mat4x2.inl index a62af1ad0..4eb973da9 100644 --- a/glm/detail/type_mat4x2.inl +++ b/glm/detail/type_mat4x2.inl @@ -111,14 +111,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type & mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type & mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type const& mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type const& mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 2aeed9fc9..2d32f29bb 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -28,8 +28,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length() { return 4; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat4x3.inl b/glm/detail/type_mat4x3.inl index 0f60213e8..8e80c5632 100644 --- a/glm/detail/type_mat4x3.inl +++ b/glm/detail/type_mat4x3.inl @@ -111,14 +111,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type & mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type & mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type const& mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type const& mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index 4560597a5..cb1dbde00 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -27,8 +27,8 @@ namespace glm typedef length_t length_type; GLM_FUNC_DECL static constexpr length_type length(){return 4;} - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const noexcept; // -- Constructors -- diff --git a/glm/detail/type_mat4x4.inl b/glm/detail/type_mat4x4.inl index 9d4b8ceae..b772164b1 100644 --- a/glm/detail/type_mat4x4.inl +++ b/glm/detail/type_mat4x4.inl @@ -143,14 +143,14 @@ namespace glm // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::col_type & mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::col_type & mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::col_type const& mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::col_type const& mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 915d262be..f065b8a5b 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -49,8 +49,8 @@ namespace glm /// Return the count of components of a dual quaternion GLM_FUNC_DECL static constexpr length_type length(){return 2;} - GLM_FUNC_DECL part_type & operator[](length_type i); - GLM_FUNC_DECL part_type const& operator[](length_type i) const; + GLM_FUNC_DECL GLM_CONSTEXPR part_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL GLM_CONSTEXPR part_type const& operator[](length_type i) const noexcept; // -- Implicit basic constructors -- diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl index 9433edaaf..5e91dd1b5 100644 --- a/glm/gtx/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -8,14 +8,14 @@ namespace glm // -- Component accesses -- template - GLM_FUNC_QUALIFIER typename tdualquat::part_type & tdualquat::operator[](typename tdualquat::length_type i) + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tdualquat::part_type & tdualquat::operator[](typename tdualquat::length_type i) noexcept { assert(i >= 0 && i < this->length()); return (&real)[i]; } template - GLM_FUNC_QUALIFIER typename tdualquat::part_type const& tdualquat::operator[](typename tdualquat::length_type i) const + GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename tdualquat::part_type const& tdualquat::operator[](typename tdualquat::length_type i) const noexcept { assert(i >= 0 && i < this->length()); return (&real)[i]; diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp index a2ac98923..2784b50ab 100644 --- a/glm/gtx/hash.hpp +++ b/glm/gtx/hash.hpp @@ -63,91 +63,91 @@ namespace std template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::vec<1, T, Q> const& v) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::vec<1, T, Q> const& v) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::vec<2, T, Q> const& v) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::vec<2, T, Q> const& v) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::vec<3, T, Q> const& v) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::vec<3, T, Q> const& v) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::vec<4, T, Q> const& v) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::vec<4, T, Q> const& v) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::qua const& q) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::qua const& q) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::tdualquat const& q) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::tdualquat const& q) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<2, 2, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<2, 2, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<2, 3, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<2, 3, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<2, 4, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<2, 4, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<3, 2, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<3, 2, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<3, 3, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<3, 3, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<3, 4, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<3, 4, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<4, 2, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<4, 2, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<4, 3, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<4, 3, T,Q> const& m) const noexcept; }; template struct hash > { - GLM_FUNC_DECL size_t operator()(glm::mat<4, 4, T,Q> const& m) const GLM_NOEXCEPT; + GLM_FUNC_DECL size_t operator()(glm::mat<4, 4, T,Q> const& m) const noexcept; }; } // namespace std diff --git a/glm/gtx/hash.inl b/glm/gtx/hash.inl index bcadfe53e..594f63c3d 100644 --- a/glm/gtx/hash.inl +++ b/glm/gtx/hash.inl @@ -13,14 +13,14 @@ namespace detail namespace std { template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<1, T, Q> const& v) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<1, T, Q> const& v) const noexcept { hash hasher; return hasher(v.x); } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<2, T, Q> const& v) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<2, T, Q> const& v) const noexcept { size_t seed = 0; hash hasher; @@ -30,7 +30,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<3, T, Q> const& v) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<3, T, Q> const& v) const noexcept { size_t seed = 0; hash hasher; @@ -41,7 +41,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<4, T, Q> const& v) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::vec<4, T, Q> const& v) const noexcept { size_t seed = 0; hash hasher; @@ -53,7 +53,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::qua const& q) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::qua const& q) const noexcept { size_t seed = 0; hash hasher; @@ -65,7 +65,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::tdualquat const& q) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::tdualquat const& q) const noexcept { size_t seed = 0; hash > hasher; @@ -75,7 +75,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<2, 2, T, Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<2, 2, T, Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -85,7 +85,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<2, 3, T, Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<2, 3, T, Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -95,7 +95,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<2, 4, T, Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<2, 4, T, Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -105,7 +105,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<3, 2, T, Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<3, 2, T, Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -116,7 +116,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<3, 3, T, Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<3, 3, T, Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -127,7 +127,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<3, 4, T, Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<3, 4, T, Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -138,7 +138,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<4, 2, T,Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<4, 2, T,Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -150,7 +150,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<4, 3, T,Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<4, 3, T,Q> const& m) const noexcept { size_t seed = 0; hash > hasher; @@ -162,7 +162,7 @@ namespace std } template - GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<4, 4, T, Q> const& m) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER size_t hash >::operator()(glm::mat<4, 4, T, Q> const& m) const noexcept { size_t seed = 0; hash > hasher;