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

Removed workarounds in metaclass system that were needed for GCC 4.9 and old MSVC.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-10-12 23:45:12 +01:00
parent 77b6a1ccb0
commit 0b67466480
24 changed files with 29 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackmisc/metaclass.h
View File

@@ -12,8 +12,11 @@
#ifndef BLACKMISC_METACLASS_H
#define BLACKMISC_METACLASS_H
#include "blackmisc/metaclassprivate.h"
#include "blackmisc/invoke.h"
#include "blackmisc/integersequence.h"
#include <type_traits>
#include <functional>
#include <QString>
/*!
* \defgroup MetaClass Metaclass system
@@ -21,6 +24,25 @@
* members of value classes.
*/
//! \cond PRIVATE
// Work around MinGW problem with combination of constexpr and extern template
#if defined(Q_OS_WIN) && defined(Q_CC_GNU)
#define BLACK_NO_EXPORT_CONSTEXPR constexpr inline __attribute__((gnu_inline))
#else
#define BLACK_NO_EXPORT_CONSTEXPR constexpr
#endif
// MSVC, GCC, Clang all have non-standard extensions for skipping trailing
// commas in variadic macros, but the MSVC extension differs from the others.
#ifdef Q_CC_MSVC
#define BLACK_TRAILING_VA_ARGS(...) ,__VA_ARGS__
#else
#define BLACK_TRAILING_VA_ARGS(...) ,##__VA_ARGS__
#endif
//! \endcond
/*!
* Macro to define a nested metaclass that describes the attributes of its
* enclosing class. Use in the private section of the class.
@@ -142,7 +164,7 @@ namespace BlackMisc
}
//! Return name as QLatin1String.
Q_DECL_CONSTEXPR auto latin1Name() const { return QLatin1String(m_name); }
constexpr auto latin1Name() const { return QLatin1String(m_name); }
};
/*!
@@ -153,16 +175,16 @@ namespace BlackMisc
struct CMetaMemberList
{
//! Tuple of CMetaMember.
const Private::tuple<Members...> m_members;
const std::tuple<Members...> m_members;
//! Number of members.
static constexpr size_t c_size = sizeof...(Members);
//! Convenience method returning the member at index I.
template <size_t I>
constexpr auto at(std::integral_constant<size_t, I> = {}) const BLACK_TRAILING_RETURN(Private::get<I>(m_members))
constexpr auto at(std::integral_constant<size_t, I> = {}) const
{
return Private::get<I>(m_members);
return std::get<I>(m_members);
}
};
@@ -203,7 +225,7 @@ namespace BlackMisc
template <typename... Members>
constexpr static CMetaMemberList<Members...> makeMetaMemberList(Members... members)
{
return { Private::tuple<Members...>(members...) };
return { std::tuple<Members...>(members...) };
}
//! Return a CMetaMethod of type deduced from the type of the member.
@@ -256,7 +278,7 @@ namespace BlackMisc
template <size_t I>
using index = std::integral_constant<size_t, I>;
constexpr static auto members() BLACK_TRAILING_RETURN(MetaClass::getMemberList()) { return MetaClass::getMemberList(); }
constexpr static auto members() { return MetaClass::getMemberList(); }
};
namespace Private