Browse Source

Fixed uaddCarry warning #497

Christophe Riccio 9 years ago
parent
commit
9770c9f73d
3 changed files with 7 additions and 3 deletions
  1. 1 1
      glm/detail/func_integer.inl
  2. 2 2
      glm/detail/setup.hpp
  3. 4 0
      readme.md

+ 1 - 1
glm/detail/func_integer.inl

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

+ 2 - 2
glm/detail/setup.hpp

@@ -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
 
 ///////////////////////////////////////////////////////////////////////////////////

+ 4 - 0
readme.md

@@ -51,6 +51,10 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 
 ## Release notes
 
+#### [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