summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2019-11-16 07:29:37 +0100
committerGitHub <noreply@github.com>2019-11-16 07:29:37 +0100
commit8ed0d92e32db961fb6307ebaa31908a1f8e08461 (patch)
treeddfd5d15ff0a055cdd4b4aa5df85c0b2bfc56713
parentMerge pull request #3106 from lioncash/bitfield (diff)
downloadyuzu-8ed0d92e32db961fb6307ebaa31908a1f8e08461.tar
yuzu-8ed0d92e32db961fb6307ebaa31908a1f8e08461.tar.gz
yuzu-8ed0d92e32db961fb6307ebaa31908a1f8e08461.tar.bz2
yuzu-8ed0d92e32db961fb6307ebaa31908a1f8e08461.tar.lz
yuzu-8ed0d92e32db961fb6307ebaa31908a1f8e08461.tar.xz
yuzu-8ed0d92e32db961fb6307ebaa31908a1f8e08461.tar.zst
yuzu-8ed0d92e32db961fb6307ebaa31908a1f8e08461.zip
-rw-r--r--src/common/bit_field.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 2dbe37839..fd2bbbd99 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -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;
}
/**