N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1176 from lioncash/vs2015-code-junking-day

Browse source 
Obligatory "Throw out workarounds VS2013 once limited us to" PR
This commit is contained in:
bunnei 2015-10-03 13:19:03 -04:00
commit 5d635986bf
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)
{ {