Browse Source

Merge 0.9.7 branch

Christophe Riccio 9 years ago
parent
commit
79643cf4fa
2 changed files with 5 additions and 1 deletions
  1. 1 1
      glm/detail/func_integer.inl
  2. 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 Value64(static_cast<uint64>(x) + static_cast<uint64>(y));
 		uint64 const Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
 		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)));
 		return static_cast<uint32>(Value64 % (Max32 + static_cast<uint64>(1)));
 	}
 	}
 
 

+ 4 - 0
readme.md

@@ -76,6 +76,10 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 ##### Deprecation:
 ##### Deprecation:
 - Removed GLM_FORCE_SIZE_FUNC define
 - 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
 #### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19
 ##### Fixes:
 ##### Fixes:
 - Fixed asinh and atanh warning with C++98 STL #484
 - Fixed asinh and atanh warning with C++98 STL #484