From 3aa3002010bf407e3f23f8338cf1869dd3bd43f0 Mon Sep 17 00:00:00 2001 From: magumagu Date: Tue, 20 Jan 2015 14:54:53 -0800 Subject: Fix Intellisense error spam on Visual Studio. Intellisense doesn't like defines in PCH files, and it doesn't like the deleted constructor for BitField. (I think it's being overly strict about the "must have no non-default constructors" rule for classes in unions.) --- Source/Core/Common/BitField.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/Core') 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 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 -- cgit v1.2.3