From 0904870e37402718f4c39f5745a6c60e2057d9c6 Mon Sep 17 00:00:00 2001 From: Tom Kneiphof Date: Wed, 3 Apr 2024 21:58:27 +0200 Subject: [PATCH 1/3] Fix log2 func. qualifier --- glm/detail/func_exponential.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl index 2efcdc60..7b91f140 100644 --- a/glm/detail/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -14,7 +14,7 @@ namespace detail using std::log2; # else template - genType log2(genType Value) + GLM_FUNC_QUALIFIER genType log2(genType Value) { return std::log(Value) * static_cast(1.4426950408889634073599246810019); } From a2844eede81f92b7dfb327f831c0bc0dbb273078 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Mon, 8 Apr 2024 21:13:08 +0200 Subject: [PATCH 2/3] Use [[deprecated]] when CXX standard is at least 14 Fixes #1269 --- glm/detail/setup.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 68ff489b..5e94f2dc 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -594,7 +594,11 @@ # define GLM_DEPRECATED __declspec(deprecated) # define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef __declspec(align(alignment)) type name #elif GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG | GLM_COMPILER_INTEL) -# define GLM_DEPRECATED __attribute__((__deprecated__)) +# if GLM_LANG & GLM_LANG_CXX14_FLAG +# define GLM_DEPRECATED [[deprecated]] +# else +# define GLM_DEPRECATED __attribute__((__deprecated__)) +# endif # define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name __attribute__((aligned(alignment))) #elif (GLM_COMPILER & GLM_COMPILER_CUDA) || (GLM_COMPILER & GLM_COMPILER_HIP) # define GLM_DEPRECATED From 45008b225e28eb700fa0f7d3ff69b7c1db94fadf Mon Sep 17 00:00:00 2001 From: Forest Fox Date: Thu, 18 Apr 2024 07:31:23 +0300 Subject: [PATCH 3/3] Fixed vec equality check function from the compute_vector_decl.hpp file --- glm/detail/compute_vector_decl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/detail/compute_vector_decl.hpp b/glm/detail/compute_vector_decl.hpp index 00d7de5e..709f8e4a 100644 --- a/glm/detail/compute_vector_decl.hpp +++ b/glm/detail/compute_vector_decl.hpp @@ -159,8 +159,8 @@ namespace glm { GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec const& v1, vec const& v2) { bool b = true; - for (length_t i = 0; i < L; ++i) - b = b && detail::compute_equal::is_iec559>::call(v1.x, v2.x); + for (length_t i = 0; b && i < L; ++i) + b = detail::compute_equal::is_iec559>::call(v1[i], v2[i]); return b; } };