summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorIevgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>2021-09-30 14:12:02 +0200
committerIevgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>2021-10-02 17:54:39 +0200
commit9a3f4afb700bb4fb6c4d26120de71fb61ffab032 (patch)
tree5d9942baad0301712beb1f462eee6c7c6ca8432f /src/concurrent
parenta1e7c441de16cb4e8d6bdac39160759116ecd233 (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/concurrent')
-rw-r--r--src/concurrent/qtconcurrentfunctionwrappers.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h
index 1c882d3f19..08966115d6 100644
--- a/src/concurrent/qtconcurrentfunctionwrappers.h
+++ b/src/concurrent/qtconcurrentfunctionwrappers.h
@@ -129,7 +129,6 @@ struct ReduceResultType<R(*)(A...)>
using ResultType = typename std::tuple_element<0, std::tuple<A...>>::type;
};
-#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510
template <class U, class V>
struct ReduceResultType<void(*)(U&,V) noexcept>
{
@@ -141,7 +140,6 @@ struct ReduceResultType<T(C::*)(U) noexcept>
{
using ResultType = C;
};
-#endif
template<class T, class Enable = void>
struct hasCallOperator : std::false_type