From 845ac621b3adf0b3f98522a6ecfa7301ad276c9c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 29 Sep 2015 22:13:09 -0400 Subject: [PATCH] bit_field: Re-enable code on MSVC --- src/common/bit_field.h | 11 ----------- 1 file changed, 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) {