organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-05 05:25:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge fcb626a122 into 33b4a621a6

Browse source
This commit is contained in:
Abdelrahman Ehab 2024-06-13 15:27:35 -04:00 • committed by GitHub
commit fa5a2dc3ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
glm/detail/func_integer.inl
View file

@ -192,6 +192,9 @@ namespace detail
return vec<L, uint, Q>(Value64 % (Max32 + static_cast<detail::uint64>(1)));
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wduplicated-branches"
// usubBorrow
GLM_FUNC_QUALIFIER uint usubBorrow(uint const& x, uint const& y, uint & Borrow)
{
@ -202,6 +205,8 @@ namespace detail
return static_cast<uint>((static_cast<detail::int64>(1) << static_cast<detail::int64>(32)) + (static_cast<detail::int64>(y) - static_cast<detail::int64>(x)));
}
#pragma GCC diagnostic pop
template<length_t L, qualifier Q>
GLM_FUNC_QUALIFIER vec<L, uint, Q> usubBorrow(vec<L, uint, Q> const& x, vec<L, uint, Q> const& y, vec<L, uint, Q>& Borrow)
{

4
glm/detail/qualifier.hpp
View file

@ -85,7 +85,7 @@ namespace detail
struct storage
{
typedef struct type {
T data[L];
T data[static_cast<size_t>(L)];
} type;
};
@ -94,7 +94,7 @@ namespace detail
struct storage<L, T, true>
{
typedef struct alignas(L * sizeof(T)) type {
T data[L];
T data[static_cast<size_t>(L)];
} type;
};