mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed uaddCarry warning #497

Browse Source
This commit is contained in:
Christophe Riccio
2016-04-24 14:56:44 +02:00
parent 407d671954
commit 9770c9f73d
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/func_integer.inl
View File

@@ -208,7 +208,7 @@ namespace detail
{
uint64 const Value64(static_cast<uint64>(x) + static_cast<uint64>(y));
uint64 const Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
Carry = Value64 > Max32 ? 1 : 0;
Carry = Value64 > Max32 ? 1u : 0u;
return static_cast<uint32>(Value64 % (Max32 + static_cast<uint64>(1)));
}

4
glm/detail/setup.hpp
View File

@@ -42,11 +42,11 @@
#define GLM_VERSION_MAJOR 0
#define GLM_VERSION_MINOR 9
#define GLM_VERSION_PATCH 7
#define GLM_VERSION_REVISION 4
#define GLM_VERSION_REVISION 5
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED))
# define GLM_MESSAGE_VERSION_DISPLAYED
# pragma message ("GLM: version 0.9.7.4")
# pragma message ("GLM: version 0.9.7.5")
#endif//GLM_MESSAGE
///////////////////////////////////////////////////////////////////////////////////