diff options
Diffstat (limited to 'src/concurrent')
-rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 10 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentstoredfunctioncall.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index be95416759..c8aab34b87 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -108,19 +108,19 @@ struct ReduceResultType; template <class U, class V> struct ReduceResultType<void(*)(U&,V)> { - typedef U ResultType; + using ResultType = U; }; template <class T, class C, class U> struct ReduceResultType<T(C::*)(U)> { - typedef C ResultType; + using ResultType = C; }; template <class U, class V> struct ReduceResultType<std::function<void(U&, V)>> { - typedef U ResultType; + using ResultType = U; }; template <typename R, typename ...A> @@ -133,13 +133,13 @@ struct ReduceResultType<R(*)(A...)> template <class U, class V> struct ReduceResultType<void(*)(U&,V) noexcept> { - typedef U ResultType; + using ResultType = U; }; template <class T, class C, class U> struct ReduceResultType<T(C::*)(U) noexcept> { - typedef C ResultType; + using ResultType = C; }; #endif diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index 44a93360d8..f7e9e03e21 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -44,10 +44,10 @@ #ifndef QT_NO_CONCURRENT #include <QtConcurrent/qtconcurrentrunbase.h> -#include <type_traits> - #include <QtCore/qpromise.h> +#include <type_traits> + QT_BEGIN_NAMESPACE #ifndef Q_QDOC |