diff options
| author | bunnei <bunneidev@gmail.com> | 2015-10-03 13:19:03 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-10-03 13:19:03 -0400 |
| commit | 5d635986bf789bcec9615d3750c6766dbff35d7e (patch) | |
| tree | e189cab387b9d4b34a05ef71db4a84130f2f9484 /src | |
| parent | 11a64acf236851f88a023bcfa1eecb02991bdccc (diff) | |
| parent | 845ac621b3adf0b3f98522a6ecfa7301ad276c9c (diff) | |
Merge pull request #1176 from lioncash/vs2015-code-junking-day
Obligatory "Throw out workarounds VS2013 once limited us to" PR
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/bit_field.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h index d306ce9a9c..66689f398d 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) { |