summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorZach Hilman <DarkLordZach@users.noreply.github.com>2020-04-24 08:54:45 -0400
committerGitHub <noreply@github.com>2020-04-24 08:54:45 -0400
commit6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0 (patch)
tree6163449db6bf315f86afff9f1d5f1dac1fad48c6 /src/common
parent8f548266cd0493a537ed7edf56c869bd7420953a (diff)
parente717a1df20b45dc9bd4b77bbbc3d54b1561189d3 (diff)
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.h2
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:
}
constexpr void Assign(const T& value) {
- storage = (static_cast<StorageType>(storage) & ~mask) | FormatValue(value);
+ storage = static_cast<StorageType>((storage & ~mask) | FormatValue(value));
}
constexpr T Value() const {