diff options
| author | skidau <skidau@gmail.com> | 2015-01-25 15:44:30 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-01-25 15:44:30 +1100 |
| commit | 0aef1d27aa03e79e2cecb96a3bbf540f3ddb4aa0 (patch) | |
| tree | 17172047a8817f13266a1044d753d107509a601e /Source/Core | |
| parent | d7a875222804cb9ab6fda6041d12190ec7d8aab2 (diff) | |
| parent | 3aa3002010bf407e3f23f8338cf1869dd3bd43f0 (diff) | |
Merge pull request #1933 from magumagu/intellisense-error-fix
Fix Intellisense error spam on Visual Studio.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/BitField.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/Common/BitField.h b/Source/Core/Common/BitField.h index 9e1f094db4..c6044be558 100644 --- a/Source/Core/Common/BitField.h +++ b/Source/Core/Common/BitField.h @@ -115,10 +115,14 @@ template<std::size_t position, std::size_t bits, typename T> struct BitField { private: +#ifndef _WIN32 // This constructor might be considered ambiguous: // Would it initialize the storage or just the bitfield? // Hence, delete it. Use the assignment operator to set bitfield values! + // MSVC 2013 Intellisense complains that this declaration isn't allowed + // in a union member, so disable it on Windows. BitField(T val) = delete; +#endif public: // Force default constructor to be created |