flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 08:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #624 Implementation of Optional can always use unrestricted unions.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-03-20 00:33:44 +00:00
parent eb4df2d893
commit 34512cefbe
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/optional.h
View File

@@ -93,7 +93,6 @@ namespace BlackMisc
private: private:
bool m_isValid; bool m_isValid;
#if defined(Q_COMPILER_UNRESTRICTED_UNIONS)
T &dereference() { Q_ASSERT(m_isValid); return m_data.object; } T &dereference() { Q_ASSERT(m_isValid); return m_data.object; }
const T &dereference() const { Q_ASSERT(m_isValid); return m_data.object; } const T &dereference() const { Q_ASSERT(m_isValid); return m_data.object; }
union Data union Data
@@ -104,11 +103,6 @@ namespace BlackMisc
T object; T object;
}; };
Data m_data; Data m_data;
#else
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
}; };
/*! /*!