Skip to content

Commit 1945c27

Browse files
authored
Merge branch 'g-truc:master' into master
2 parents a9f29d9 + 45008b2 commit 1945c27

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

glm/detail/compute_vector_decl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ namespace glm {
159159
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec<L, T, Q> const& v1, vec<L, T, Q> const& v2)
160160
{
161161
bool b = true;
162-
for (length_t i = 0; i < L; ++i)
163-
b = b && detail::compute_equal<T, std::numeric_limits<T>::is_iec559>::call(v1.x, v2.x);
162+
for (length_t i = 0; b && i < L; ++i)
163+
b = detail::compute_equal<T, std::numeric_limits<T>::is_iec559>::call(v1[i], v2[i]);
164164
return b;
165165
}
166166
};

glm/detail/func_exponential.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace detail
1414
using std::log2;
1515
# else
1616
template<typename genType>
17-
genType log2(genType Value)
17+
GLM_FUNC_QUALIFIER genType log2(genType Value)
1818
{
1919
return std::log(Value) * static_cast<genType>(1.4426950408889634073599246810019);
2020
}

glm/detail/setup.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,11 @@
594594
# define GLM_DEPRECATED __declspec(deprecated)
595595
# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef __declspec(align(alignment)) type name
596596
#elif GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG | GLM_COMPILER_INTEL)
597-
# define GLM_DEPRECATED __attribute__((__deprecated__))
597+
# if GLM_LANG & GLM_LANG_CXX14_FLAG
598+
# define GLM_DEPRECATED [[deprecated]]
599+
# else
600+
# define GLM_DEPRECATED __attribute__((__deprecated__))
601+
# endif
598602
# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name __attribute__((aligned(alignment)))
599603
#elif (GLM_COMPILER & GLM_COMPILER_CUDA) || (GLM_COMPILER & GLM_COMPILER_HIP)
600604
# define GLM_DEPRECATED

0 commit comments

Comments
 (0)