diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index 20e29d6f..e0d5c739 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -208,7 +208,7 @@ namespace detail { uint64 const Value64(static_cast(x) + static_cast(y)); uint64 const Max32((static_cast(1) << static_cast(32)) - static_cast(1)); - Carry = Value64 > Max32 ? 1 : 0; + Carry = Value64 > Max32 ? 1u : 0u; return static_cast(Value64 % (Max32 + static_cast(1))); } diff --git a/readme.md b/readme.md index 29bea16f..2f11ca8d 100644 --- a/readme.md +++ b/readme.md @@ -76,6 +76,10 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Deprecation: - Removed GLM_FORCE_SIZE_FUNC define +#### [GLM 0.9.7.5](https://github.com/g-truc/glm/tree/0.9.7) - 2016-0X-XX +##### Fixes: +- Fixed uaddCarry warning #497 + #### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19 ##### Fixes: - Fixed asinh and atanh warning with C++98 STL #484