diff options
| author | Mat M <mathew1800@gmail.com> | 2019-11-03 04:59:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 04:59:06 -0500 |
| commit | 2b4208254ef77af3501895226e1494853030d0dd (patch) | |
| tree | 04976dbac38caf289561b9fd9cefbb0f160c5b3c /src/common/bit_field.h | |
| parent | 84887b0088f4d139e9fef71ba21a6129adf4f946 (diff) | |
| parent | a81987a7cb9c4a42bdbaff1e32ce1ba2d8264f5c (diff) | |
Merge pull request #3060 from FearlessTobi/patch-1
common/bit_field: Remove FORCE_INLINE calls
Diffstat (limited to 'src/common/bit_field.h')
| -rw-r--r-- | src/common/bit_field.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h index 902e668e3..8131d1f95 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -168,11 +168,11 @@ public: constexpr BitField(BitField&&) noexcept = default; constexpr BitField& operator=(BitField&&) noexcept = default; - constexpr FORCE_INLINE operator T() const { + constexpr operator T() const { return Value(); } - constexpr FORCE_INLINE void Assign(const T& value) { + constexpr void Assign(const T& value) { storage = (static_cast<StorageType>(storage) & ~mask) | FormatValue(value); } |