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; } }; 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); } 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