diff options
| author |  Tony Wasserka | 2014-07-16 09:39:52 +0200 |
|---|---|---|
| committer | Tony Wasserka | 2014-07-16 12:47:33 +0200 |
| commit | 0da8e2eacc95164e3c1d32c8177cc044ed0f1930 (patch) | |
| tree | 9e43235f35576d5bf966b78e36a36d2d119b898f /src/common/bit_field.h | |
| parent | BitField: Add a static_assert. (diff) | |
| download | yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar.gz yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.tar.xz yuzu-0da8e2eacc95164e3c1d32c8177cc044ed0f1930.zip | |
BitField: Cast enum values to proper integer type.
Diffstat (limited to '')
| -rw-r--r-- | src/common/bit_field.h | 2 |
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: | |||
| 142 | 142 | ||
| 143 | __forceinline BitField& operator=(T val) | 143 | __forceinline BitField& operator=(T val) |
| 144 | { | 144 | { |
| 145 | storage = (storage & ~GetMask()) | ((val << position) & GetMask()); | 145 | storage = (storage & ~GetMask()) | (((StorageType)val << position) & GetMask()); |
| 146 | return *this; | 146 | return *this; |
| 147 | } | 147 | } |
| 148 | 148 | ||