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

Use std::void_t (C++17 feature)

Browse Source
This commit is contained in:
Mat Sutcliffe
2021-04-17 16:21:16 +01:00
parent b75e3859d4
commit 9964f44d25
2 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/inheritancetraits.h
View File

@@ -11,7 +11,6 @@
#ifndef BLACKMISC_INHERITANCE_TRAITS_H #ifndef BLACKMISC_INHERITANCE_TRAITS_H
#define BLACKMISC_INHERITANCE_TRAITS_H #define BLACKMISC_INHERITANCE_TRAITS_H
#include "blackmisc/typetraits.h" // for void_t
#include <type_traits> #include <type_traits>
template <typename T> template <typename T>
@@ -24,14 +23,14 @@ namespace BlackMisc
/*! /*!
* If T has a member typedef base_type, this trait will obtain it, otherwise void. * If T has a member typedef base_type, this trait will obtain it, otherwise void.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct TBaseOf struct TBaseOf
{ {
using type = void; //!< void using type = void; //!< void
}; };
//! \cond //! \cond
template <typename T> template <typename T>
struct TBaseOf<T, void_t<typename T::base_type>> struct TBaseOf<T, std::void_t<typename T::base_type>>
{ {
using type = typename T::base_type; //!< T::base_type using type = typename T::base_type; //!< T::base_type
}; };
@@ -50,14 +49,14 @@ namespace BlackMisc
/*! /*!
* If T has a member typedef base_type which has a member propertyByIndex, this trait will obtain it, otherwise void. * If T has a member typedef base_type which has a member propertyByIndex, this trait will obtain it, otherwise void.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct TIndexBaseOf struct TIndexBaseOf
{ {
using type = void; //!< void using type = void; //!< void
}; };
//! \cond //! \cond
template <typename T> template <typename T>
struct TIndexBaseOf<T, void_t<decltype(std::declval<typename T::base_type>().propertyByIndex(std::declval<CPropertyIndexRef>()))>> struct TIndexBaseOf<T, std::void_t<decltype(std::declval<typename T::base_type>().propertyByIndex(std::declval<CPropertyIndexRef>()))>>
{ {
using type = typename T::base_type; //!< T::base_type using type = typename T::base_type; //!< T::base_type
}; };

51
src/blackmisc/typetraits.h
View File

@@ -21,13 +21,6 @@ namespace BlackMisc
class CPropertyIndexRef; class CPropertyIndexRef;
//! \cond PRIVATE
// Own implementation of C++17 std::void_t, simple variadic alias
// template which is always void. Useful for expression SFINAE.
template <typename...>
using void_t = void;
//! \endcond
namespace Private namespace Private
{ {
//! \private Own implementation of C++17 std::is_nothrow_swappable. //! \private Own implementation of C++17 std::is_nothrow_swappable.
@@ -74,103 +67,103 @@ namespace BlackMisc
/*! /*!
* Trait to detect whether T contains a member function toQString. * Trait to detect whether T contains a member function toQString.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct THasToQString : public std::false_type {}; struct THasToQString : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct THasToQString<T, void_t<decltype(std::declval<T>().toQString())>> : public std::true_type {}; struct THasToQString<T, std::void_t<decltype(std::declval<T>().toQString())>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait which is true if the expression a.push_back(v) is valid when a and v are instances of T and T::value_type. * Trait which is true if the expression a.push_back(v) is valid when a and v are instances of T and T::value_type.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct THasPushBack : public std::false_type {}; struct THasPushBack : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct THasPushBack<T, void_t<decltype(std::declval<T>().push_back(std::declval<typename T::value_type>()))>> : public std::true_type {}; struct THasPushBack<T, std::void_t<decltype(std::declval<T>().push_back(std::declval<typename T::value_type>()))>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait to detect whether a class T has a static member function named getLogCategories. * Trait to detect whether a class T has a static member function named getLogCategories.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct THasGetLogCategories : public std::false_type {}; struct THasGetLogCategories : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct THasGetLogCategories<T, void_t<decltype(T::getLogCategories())>> : public std::true_type {}; struct THasGetLogCategories<T, std::void_t<decltype(T::getLogCategories())>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait to detect whether a class T can be used as a key in a QHash. * Trait to detect whether a class T can be used as a key in a QHash.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct TModelsQHashKey : public std::false_type {}; struct TModelsQHashKey : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct TModelsQHashKey<T, void_t<decltype(std::declval<T>() == std::declval<T>(), qHash(std::declval<T>()))>> : public std::true_type {}; struct TModelsQHashKey<T, std::void_t<decltype(std::declval<T>() == std::declval<T>(), qHash(std::declval<T>()))>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait to detect whether a class T can be used as a key in a QMap. * Trait to detect whether a class T can be used as a key in a QMap.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct TModelsQMapKey : public std::false_type {}; struct TModelsQMapKey : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct TModelsQMapKey<T, void_t<decltype(std::declval<T>() < std::declval<T>())>> : public std::true_type {}; struct TModelsQMapKey<T, std::void_t<decltype(std::declval<T>() < std::declval<T>())>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait which is true if the expression compare(a, b) is valid when a and b are instances of T and U. * Trait which is true if the expression compare(a, b) is valid when a and b are instances of T and U.
*/ */
template <typename T, typename U, typename = void_t<>> template <typename T, typename U, typename = std::void_t<>>
struct THasCompare : public std::false_type {}; struct THasCompare : public std::false_type {};
//! \cond //! \cond
template <typename T, typename U> template <typename T, typename U>
struct THasCompare<T, U, void_t<decltype(compare(std::declval<T>(), std::declval<U>()))>> : public std::true_type {}; struct THasCompare<T, U, std::void_t<decltype(compare(std::declval<T>(), std::declval<U>()))>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait which is true if the expression a.compareByPropertyIndex(b, i) is valid when a and b are instances of T, * Trait which is true if the expression a.compareByPropertyIndex(b, i) is valid when a and b are instances of T,
* and i is an instance of CPropertyIndexRef. * and i is an instance of CPropertyIndexRef.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct THasComparePropertyByIndex : public std::false_type {}; struct THasComparePropertyByIndex : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct THasComparePropertyByIndex<T, void_t<decltype(std::declval<T>().comparePropertyByIndex(std::declval<CPropertyIndexRef>(), std::declval<const T &>()))>> : public std::true_type {}; struct THasComparePropertyByIndex<T, std::void_t<decltype(std::declval<T>().comparePropertyByIndex(std::declval<CPropertyIndexRef>(), std::declval<const T &>()))>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait which is true if the expression a.propertyByIndex(i) is valid with a is an instance of T and i is an * Trait which is true if the expression a.propertyByIndex(i) is valid with a is an instance of T and i is an
* instance of CPropertyIndexRef. * instance of CPropertyIndexRef.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct THasPropertyByIndex : public std::false_type {}; struct THasPropertyByIndex : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct THasPropertyByIndex<T, void_t<decltype(std::declval<T>().propertyByIndex(std::declval<CPropertyIndexRef>()))>> : public std::true_type {}; struct THasPropertyByIndex<T, std::void_t<decltype(std::declval<T>().propertyByIndex(std::declval<CPropertyIndexRef>()))>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait which is true if the expression a == b is valid when a and b are instances of T and U. * Trait which is true if the expression a == b is valid when a and b are instances of T and U.
*/ */
template <typename T, typename U, typename = void_t<>> template <typename T, typename U, typename = std::void_t<>>
struct TIsEqualityComparable : public std::false_type {}; struct TIsEqualityComparable : public std::false_type {};
//! \cond //! \cond
template <typename T, typename U> template <typename T, typename U>
struct TIsEqualityComparable<T, U, void_t<decltype(std::declval<T>() == std::declval<U>())>> : public std::true_type {}; struct TIsEqualityComparable<T, U, std::void_t<decltype(std::declval<T>() == std::declval<U>())>> : public std::true_type {};
//! \endcond //! \endcond
/*! /*!
* Trait which is true if T has methods marshallToDbus and unmarshallFromDbus. * Trait which is true if T has methods marshallToDbus and unmarshallFromDbus.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct THasMarshallMethods : public std::false_type {}; struct THasMarshallMethods : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct THasMarshallMethods<T, void_t<decltype(std::declval<const T &>().marshallToDbus(std::declval<QDBusArgument &>()), struct THasMarshallMethods<T, std::void_t<decltype(std::declval<const T &>().marshallToDbus(std::declval<QDBusArgument &>()),
std::declval<T &>().unmarshallFromDbus(std::declval<const QDBusArgument &>()))>> : public std::true_type {}; std::declval<T &>().unmarshallFromDbus(std::declval<const QDBusArgument &>()))>> : public std::true_type {};
//! \endcond //! \endcond
@@ -189,11 +182,11 @@ namespace BlackMisc
/*! /*!
* Trait that detects if a type is QPrivateSignal. * Trait that detects if a type is QPrivateSignal.
*/ */
template <typename T, typename = void_t<>> template <typename T, typename = std::void_t<>>
struct TIsQPrivateSignal : public std::false_type {}; struct TIsQPrivateSignal : public std::false_type {};
//! \cond //! \cond
template <typename T> template <typename T>
struct TIsQPrivateSignal<T, void_t<typename Private::SyntheticDerived<T>::QPrivateSignal>> : public std::is_same<T, typename Private::SyntheticDerived<T>::QPrivateSignal> {}; struct TIsQPrivateSignal<T, std::void_t<typename Private::SyntheticDerived<T>::QPrivateSignal>> : public std::is_same<T, typename Private::SyntheticDerived<T>::QPrivateSignal> {};
//! \endcond //! \endcond
} }