Browse Source

Merge branch 'master' of https://github.com/g-truc/glm

Christophe Riccio 11 years ago
parent
commit
a1e34d02ff
1 changed files with 1 additions and 1 deletions
  1. 1 1
      glm/detail/func_integer.inl

+ 1 - 1
glm/detail/func_integer.inl

@@ -212,7 +212,7 @@ namespace detail
 	GLM_FUNC_QUALIFIER vecType<uint, P> uaddCarry(vecType<uint, P> const & x, vecType<uint, P> const & y, vecType<uint, P> & Carry)
 	GLM_FUNC_QUALIFIER vecType<uint, P> uaddCarry(vecType<uint, P> const & x, vecType<uint, P> const & y, vecType<uint, P> & Carry)
 	{
 	{
 		vecType<uint64, P> Value64(vecType<uint64, P>(x) + vecType<uint64, P>(y));
 		vecType<uint64, P> Value64(vecType<uint64, P>(x) + vecType<uint64, P>(y));
-		vecType<uint64, P> Max32(static_cast<uint64>(1) << static_cast<uint64>(32) - static_cast<uint64>(1));
+		vecType<uint64, P> Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
 		Carry = mix(vecType<uint32, P>(0), vecType<uint32, P>(1), greaterThan(Value64, Max32));
 		Carry = mix(vecType<uint32, P>(0), vecType<uint32, P>(1), greaterThan(Value64, Max32));
 		return vecType<uint32,P>(Value64 % (Max32 + static_cast<uint64>(1)));
 		return vecType<uint32,P>(Value64 % (Max32 + static_cast<uint64>(1)));
 	}
 	}