summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-10-03 19:19:03 +0200
committerbunnei <bunneidev@gmail.com>2015-10-03 19:19:03 +0200
commit5d635986bf789bcec9615d3750c6766dbff35d7e (patch)
treee189cab387b9d4b34a05ef71db4a84130f2f9484
parentMerge pull request #1095 from archshift/game-list (diff)
parentbit_field: Re-enable code on MSVC (diff)
downloadyuzu-5d635986bf789bcec9615d3750c6766dbff35d7e.tar
yuzu-5d635986bf789bcec9615d3750c6766dbff35d7e.tar.gz
yuzu-5d635986bf789bcec9615d3750c6766dbff35d7e.tar.bz2
yuzu-5d635986bf789bcec9615d3750c6766dbff35d7e.tar.lz
yuzu-5d635986bf789bcec9615d3750c6766dbff35d7e.tar.xz
yuzu-5d635986bf789bcec9615d3750c6766dbff35d7e.tar.zst
yuzu-5d635986bf789bcec9615d3750c6766dbff35d7e.zip
-rw-r--r--src/common/bit_field.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index d306ce9a9..66689f398 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -125,21 +125,10 @@ public:
// so that we can use this within unions
BitField() = default;
-#ifndef _WIN32
// We explicitly delete 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.
- // Ideally, we would just implement the copy assignment to copy only the
- // relevant bits, but this requires compiler support for unrestricted
- // unions.
- // MSVC 2013 has no support for this, hence we disable this code on
- // Windows (so that the default copy assignment operator will be used).
- // For any C++11 conformant compiler we delete the operator to make sure
- // we never use this inappropriate operator to begin with.
- // TODO: Implement this operator properly once all target compilers
- // support unrestricted unions.
BitField& operator=(const BitField&) = delete;
-#endif
FORCE_INLINE BitField& operator=(T val)
{