citra-emu
/
citra
Archived
1
0
Fork 0
Code

bit_field: Re-enable code on MSVC

This commit is contained in:
Lioncash 2015-09-29 22:13:09 -04:00
parent a67df5ad94
commit 845ac621b3
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/bit_field.h
View File

@ -125,21 +125,10 @@ public:
// so that we can use this within unions // so that we can use this within unions
BitField() = default; BitField() = default;
#ifndef _WIN32
// We explicitly delete the copy assigment operator here, because the // We explicitly delete the copy assigment operator here, because the
// default copy assignment would copy the full storage value, rather than // default copy assignment would copy the full storage value, rather than
// just the bits relevant to this particular bit field. // 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; BitField& operator=(const BitField&) = delete;
#endif
FORCE_INLINE BitField& operator=(T val) FORCE_INLINE BitField& operator=(T val)
{ {