From 15b8363e3074cc465686992beb73ca9fbfa22d4f Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Thu, 5 Nov 2015 16:16:33 +0000
Subject: [PATCH] refs #504 Fixed MSVC2013 compiler error regression.

---
 src/blackmisc/optional.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/blackmisc/optional.h b/src/blackmisc/optional.h
index 7d03d7e27..4a19c8061 100644
--- a/src/blackmisc/optional.h
+++ b/src/blackmisc/optional.h
@@ -101,9 +101,9 @@ namespace BlackMisc
         };
         Data m_data;
 #else
-        T &dereference() { Q_ASSERT(m_isValid); return *reinterpret_cast<T *>(m_bytes); }
-        const T &dereference() const { Q_ASSERT(m_isValid); return *reinterpret_cast<const T *>(m_bytes); }
-        typename std::aligned_storage<sizeof(T)>::type m_bytes[1];
+        T &dereference() { Q_ASSERT(m_isValid); return *reinterpret_cast<T *>(m_data.bytes); }
+        const T &dereference() const { Q_ASSERT(m_isValid); return *reinterpret_cast<const T *>(m_data.bytes); }
+        struct { typename std::aligned_storage<sizeof(T)>::type bytes[1]; } m_data;
 #endif
     };