diff options
| author |  Zach Hilman | 2020-04-24 08:54:45 -0400 |
|---|---|---|
| committer |  GitHub | 2020-04-24 08:54:45 -0400 |
| commit | 6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0 (patch) | |
| tree | 6163449db6bf315f86afff9f1d5f1dac1fad48c6 /src/common | |
| parent | Merge pull request #3760 from Morph1984/trailing-filedir-separator (diff) | |
| parent | Fix -Wdeprecated-copy warning. (diff) | |
| download | yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.gz yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.xz yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.zip | |
Merge pull request #3786 from degasus/fix_warnings
Fix -Werror=conversion and -Wdeprecated-copy issues
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/bit_field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h index fd2bbbd99..26ae6c7fc 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h | |||
| @@ -180,7 +180,7 @@ public: | |||
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | constexpr void Assign(const T& value) { | 182 | constexpr void Assign(const T& value) { |
| 183 | storage = (static_cast<StorageType>(storage) & ~mask) | FormatValue(value); | 183 | storage = static_cast<StorageType>((storage & ~mask) | FormatValue(value)); |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | constexpr T Value() const { | 186 | constexpr T Value() const { |