Mirrors/yuzu-fork
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu.git synced 2024-11-08 19:49:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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