diff options
| author | 2019-11-03 04:59:06 -0500 | |
|---|---|---|
| committer | 2019-11-03 04:59:06 -0500 | |
| commit | 2b4208254ef77af3501895226e1494853030d0dd (patch) | |
| tree | 04976dbac38caf289561b9fd9cefbb0f160c5b3c | |
| parent | Merge pull request #3064 from yuzu-emu/revert-3063-zero-init-padding (diff) | |
| parent | common/bit_field: Remove FORCE_INLINE calls (diff) | |
| download | yuzu-2b4208254ef77af3501895226e1494853030d0dd.tar.gz yuzu-2b4208254ef77af3501895226e1494853030d0dd.tar.xz yuzu-2b4208254ef77af3501895226e1494853030d0dd.zip | |
Merge pull request #3060 from FearlessTobi/patch-1
common/bit_field: Remove FORCE_INLINE calls
Diffstat (limited to '')
| -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: | |||
| 168 | constexpr BitField(BitField&&) noexcept = default; | 168 | constexpr BitField(BitField&&) noexcept = default; |
| 169 | constexpr BitField& operator=(BitField&&) noexcept = default; | 169 | constexpr BitField& operator=(BitField&&) noexcept = default; |
| 170 | 170 | ||
| 171 | constexpr FORCE_INLINE operator T() const { | 171 | constexpr operator T() const { |
| 172 | return Value(); | 172 | return Value(); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | constexpr FORCE_INLINE void Assign(const T& value) { | 175 | constexpr void Assign(const T& value) { |
| 176 | storage = (static_cast<StorageType>(storage) & ~mask) | FormatValue(value); | 176 | storage = (static_cast<StorageType>(storage) & ~mask) | FormatValue(value); |
| 177 | } | 177 | } |
| 178 | 178 | ||