ShuriZma
/
suyu
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #914 from yuriks/bitfield-mask 

Common: Fix mask generation in BitField
This commit is contained in:
Yuri Kunde Schlesner 2015-07-11 19:01:57 -07:00
parent e110e656b9 d5b5280501
commit b0d72e3de1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/bit_field.h
View File

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