yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #3126 from yuzu-emu/revert-3106-bitfield 

Revert "common/bit_field: Silence sign-conversion warnings"
This commit is contained in:
Fernando Sahmkow 2019-11-16 14:23:15 -04:00 committed by GitHub
parent 3026aec9bd 8ed0d92e32
commit 67a8bd1e70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/bit_field.h
View File

@ -135,8 +135,7 @@ public:
/// Constants to allow limited introspection of fields if needed
static constexpr std::size_t position = Position;
static constexpr std::size_t bits = Bits;
static constexpr StorageType mask = StorageType(
(std::numeric_limits<StorageType>::max() >> (8 * sizeof(T) - bits)) << position);
static constexpr StorageType mask = (((StorageType)~0) >> (8 * sizeof(T) - bits)) << position;
/**
* Formats a value by masking and shifting it according to the field parameters. A value
@ -144,7 +143,7 @@ public:
* the results together.
*/
static constexpr FORCE_INLINE StorageType FormatValue(const T& value) {
return (static_cast<StorageType>(value) << position) & mask;
return ((StorageType)value << position) & mask;
}
/**