summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-03-07 22:32:10 +0100
committerLioncash <mathew1800@gmail.com>2019-03-07 23:05:44 +0100
commite99a14862841841d74be8d0ea9426c2d23546b5e (patch)
tree60c2fb5b76547165dd900a82179577b08b4ff7f5
parentMerge pull request #2196 from DarkLordZach/web-applet-esc (diff)
downloadyuzu-e99a14862841841d74be8d0ea9426c2d23546b5e.tar
yuzu-e99a14862841841d74be8d0ea9426c2d23546b5e.tar.gz
yuzu-e99a14862841841d74be8d0ea9426c2d23546b5e.tar.bz2
yuzu-e99a14862841841d74be8d0ea9426c2d23546b5e.tar.lz
yuzu-e99a14862841841d74be8d0ea9426c2d23546b5e.tar.xz
yuzu-e99a14862841841d74be8d0ea9426c2d23546b5e.tar.zst
yuzu-e99a14862841841d74be8d0ea9426c2d23546b5e.zip
Diffstat (limited to '')
-rw-r--r--src/common/bit_field.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 21e07925d..7433c39ba 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -111,12 +111,6 @@
template <std::size_t Position, std::size_t Bits, typename T>
struct BitField {
private:
- // We hide the copy assigment operator here, because the default copy
- // assignment would copy the full storage value, rather than just the bits
- // relevant to this particular bit field.
- // We don't delete it because we want BitField to be trivially copyable.
- constexpr BitField& operator=(const BitField&) = default;
-
// UnderlyingType is T for non-enum types and the underlying type of T if
// T is an enumeration. Note that T is wrapped within an enable_if in the
// former case to workaround compile errors which arise when using
@@ -163,9 +157,13 @@ public:
BitField(T val) = delete;
BitField& operator=(T val) = delete;
- // Force default constructor to be created
- // so that we can use this within unions
- constexpr BitField() = default;
+ constexpr BitField() noexcept = default;
+
+ constexpr BitField(const BitField&) noexcept = default;
+ constexpr BitField& operator=(const BitField&) noexcept = default;
+
+ constexpr BitField(BitField&&) noexcept = default;
+ constexpr BitField& operator=(BitField&&) noexcept = default;
constexpr FORCE_INLINE operator T() const {
return Value();