summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authormagumagu <magumagu9@gmail.com>2015-01-20 14:54:53 -0800
committermagumagu <magumagu9@gmail.com>2015-01-23 19:15:25 -0800
commit3aa3002010bf407e3f23f8338cf1869dd3bd43f0 (patch)
tree8b01cf97f3a14c0d3f2fc88319421ece5f3596db /Source/Core
parent0b1d8fae1b4d1a041c03e59fd09fc5e212c87af7 (diff)
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.)
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/BitField.h4
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