diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-09-30 14:12:02 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-10-02 17:54:39 +0200 |
| commit | 9a3f4afb700bb4fb6c4d26120de71fb61ffab032 (patch) | |
| tree | 5d9942baad0301712beb1f462eee6c7c6ca8432f /src/corelib/kernel/qobjectdefs_impl.h | |
| parent | a1e7c441de16cb4e8d6bdac39160759116ecd233 (diff) | |
Remove checks for features available in C++17
This patch removes most of the checks that are made using C++20
__cpp_* macros for features available in C++17 and earlier.
Library feature check macros (__cpp_lib_*) are unaffected.
Change-Id: I557b2bd0d4ff09b13837555e9880eb28e0355f64
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs_impl.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs_impl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h index c35d9aa7a7..a3068e1712 100644 --- a/src/corelib/kernel/qobjectdefs_impl.h +++ b/src/corelib/kernel/qobjectdefs_impl.h @@ -158,7 +158,6 @@ namespace QtPrivate { (o->*f)((*reinterpret_cast<typename RemoveRef<SignalArgs>::Type *>(arg[II+1]))...), ApplyReturnValue<R>(arg[0]); } }; -#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 template <int... II, typename... SignalArgs, typename R, typename... SlotArgs, typename SlotRet, class Obj> struct FunctorCall<IndexesList<II...>, List<SignalArgs...>, R, SlotRet (Obj::*)(SlotArgs...) noexcept> { static void call(SlotRet (Obj::*f)(SlotArgs...) noexcept, Obj *o, void **arg) { @@ -171,7 +170,6 @@ namespace QtPrivate { (o->*f)((*reinterpret_cast<typename RemoveRef<SignalArgs>::Type *>(arg[II+1]))...), ApplyReturnValue<R>(arg[0]); } }; -#endif template<class Obj, typename Ret, typename... Args> struct FunctionPointer<Ret (Obj::*) (Args...)> { @@ -210,7 +208,6 @@ namespace QtPrivate { } }; -#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 template<class Obj, typename Ret, typename... Args> struct FunctionPointer<Ret (Obj::*) (Args...) noexcept> { typedef Obj Object; @@ -247,7 +244,6 @@ namespace QtPrivate { FunctorCall<typename Indexes<ArgumentCount>::Value, SignalArgs, R, Function>::call(f, arg); } }; -#endif template<typename Function, int N> struct Functor { |