Merge branch '0.9.1' into 0.9.2

This commit is contained in:
Christophe Riccio 2011-05-07 16:00:15 +01:00
commit 7e8942759e

View File

@ -267,7 +267,7 @@ namespace glm
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'bitfieldExtract' only accept integer values"); GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'bitfieldExtract' only accept integer values");
assert(Offset + Bits <= sizeof(genIUType)); assert(Offset + Bits <= (sizeof(genIUType) << 3));
genIUType Result(0); genIUType Result(0);
if(std::numeric_limits<genIUType>::is_signed) if(std::numeric_limits<genIUType>::is_signed)