summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorTony Wasserka <NeoBrainX@gmail.com>2014-07-16 09:39:52 +0200
committerTony Wasserka <NeoBrainX@gmail.com>2014-07-16 12:47:33 +0200
commit0da8e2eacc95164e3c1d32c8177cc044ed0f1930 (patch)
tree9e43235f35576d5bf966b78e36a36d2d119b898f /src/common
parentBitField: Add a static_assert. (diff)
downloadyuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar
yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar.gz
yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar.bz2
yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar.lz
yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar.xz
yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar.zst
yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/bit_field.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 52f0d8be6..b6f0179c6 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -142,7 +142,7 @@ public:
__forceinline BitField& operator=(T val)
{
- storage = (storage & ~GetMask()) | ((val << position) & GetMask());
+ storage = (storage & ~GetMask()) | (((StorageType)val << position) & GetMask());
return *this;
}