diff options
author | Eric Lemanissier <eric.lemanissier@gmail.com> | 2017-01-16 12:22:43 +0100 |
---|---|---|
committer | Eric Lemanissier <eric.lemanissier@gmail.com> | 2017-02-17 13:57:30 +0000 |
commit | c5e687895dd2eba3106f697b6e92b84683402403 (patch) | |
tree | a9658c00cc2fd250b06ceff218e2c6cb65f2c432 /src/concurrent/qtconcurrentfunctionwrappers.h | |
parent | 1d6700171cf41c17983edff285c3658933610523 (diff) |
Adapt to the C++ SIC introduced by P0012: noexcept overloading
see 5a1b4832a2 for more detail
Task-number: QTBUG-58142
Change-Id: I51851ea9b4fe7b8eeadc452bc3dbb1ea00026d29
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/concurrent/qtconcurrentfunctionwrappers.h')
-rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index a08be69123..111933410b 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -192,6 +192,32 @@ QtConcurrent::ConstMemberFunctionWrapper<T, C> createFunctionWrapper(T (C::*func return QtConcurrent::ConstMemberFunctionWrapper<T, C>(func); } +#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 +template <typename T, typename U> +QtConcurrent::FunctionWrapper1<T, U> createFunctionWrapper(T (*func)(U) noexcept) +{ + return QtConcurrent::FunctionWrapper1<T, U>(func); +} + +template <typename T, typename C> +QtConcurrent::MemberFunctionWrapper<T, C> createFunctionWrapper(T (C::*func)() noexcept) +{ + return QtConcurrent::MemberFunctionWrapper<T, C>(func); +} + +template <typename T, typename C, typename U> +QtConcurrent::MemberFunctionWrapper1<T, C, U> createFunctionWrapper(T (C::*func)(U) noexcept) +{ + return QtConcurrent::MemberFunctionWrapper1<T, C, U>(func); +} + +template <typename T, typename C> +QtConcurrent::ConstMemberFunctionWrapper<T, C> createFunctionWrapper(T (C::*func)() const noexcept) +{ + return QtConcurrent::ConstMemberFunctionWrapper<T, C>(func); +} +#endif + struct PushBackWrapper { typedef void result_type; @@ -231,6 +257,20 @@ struct ReduceResultType<T(C::*)(U)> typedef C ResultType; }; +#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 +template <class U, class V> +struct ReduceResultType<void(*)(U&,V) noexcept> +{ + typedef U ResultType; +}; + +template <class T, class C, class U> +struct ReduceResultType<T(C::*)(U) noexcept> +{ + typedef C ResultType; +}; +#endif + template <class InputSequence, class MapFunctor> struct MapResultType { @@ -249,6 +289,20 @@ struct MapResultType<void, T(C::*)() const> typedef T ResultType; }; +#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 +template <class U, class V> +struct MapResultType<void, U (*)(V) noexcept> +{ + typedef U ResultType; +}; + +template <class T, class C> +struct MapResultType<void, T(C::*)() const noexcept> +{ + typedef T ResultType; +}; +#endif + #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS template <template <typename> class InputSequence, typename MapFunctor, typename T> @@ -269,6 +323,21 @@ struct MapResultType<InputSequence<T>, U(C::*)() const> typedef InputSequence<U> ResultType; }; +#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 + +template <template <typename> class InputSequence, class T, class U, class V> +struct MapResultType<InputSequence<T>, U (*)(V) noexcept> +{ + typedef InputSequence<U> ResultType; +}; + +template <template <typename> class InputSequence, class T, class U, class C> +struct MapResultType<InputSequence<T>, U(C::*)() const noexcept> +{ + typedef InputSequence<U> ResultType; +}; +#endif + #endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER template <class MapFunctor> @@ -289,6 +358,21 @@ struct MapResultType<QStringList, U(C::*)() const> typedef QList<U> ResultType; }; +#if defined(__cpp_noexcept_function_type) && __cpp_noexcept_function_type >= 201510 + +template <class U, class V> +struct MapResultType<QStringList, U (*)(V) noexcept> +{ + typedef QList<U> ResultType; +}; + +template <class U, class C> +struct MapResultType<QStringList, U(C::*)() const noexcept> +{ + typedef QList<U> ResultType; +}; +#endif + } // namespace QtPrivate. #endif //Q_QDOC |