Merge pull request #2738 from lioncash/bitfield

Common: Fix BitField mask generation.
This commit is contained in:
shuffle2 2015-10-03 18:21:24 -07:00
commit 0fdaacc7e0

View File

@ -146,7 +146,7 @@ public:
if (std::numeric_limits<T>::is_signed)
{
std::size_t shift = 8 * sizeof(T) - bits;
return (T)(((storage & GetMask()) << (shift - position)) >> shift);
return (T)((storage << (shift - position)) >> shift);
}
else
{
@ -173,7 +173,7 @@ private:
__forceinline StorageType GetMask() const
{
return ((~(StorageTypeU)0) >> (8 * sizeof(T) - bits)) << position;
return (((StorageTypeU)~0) >> (8 * sizeof(T) - bits)) << position;
}
StorageType storage;