diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-18 10:13:22 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-22 13:58:53 +0000 |
| commit | 157be588f7f3b6273b776c9a61ec8eddbd74c0d7 (patch) | |
| tree | 4b03154c0f70355bc02d22d0a619d688f40314c0 /src | |
| parent | 34369b5e90cfc15d247a09fac8d7d3c4de2f1310 (diff) | |
Replace usage of std::result_of with decltype
It's slated for removal in c++20
Fixes: QTBUG-82240
Change-Id: I7b35c151413b131ca49b2c09b6382efc3fc8ccb6
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit fb6acf08bbd7a68d027282251747620b942bd1d6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 059bb44e10..441e38c4da 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -532,7 +532,7 @@ struct Q_CORE_EXPORT QMetaObject static typename std::enable_if<!QtPrivate::FunctionPointer<Func>::IsPointerToMemberFunction && QtPrivate::FunctionPointer<Func>::ArgumentCount == -1 && !std::is_convertible<Func, const char*>::value, bool>::type - invokeMethod(QObject *context, Func function, typename std::result_of<Func()>::type *ret) + invokeMethod(QObject *context, Func function, decltype(function()) *ret) { return invokeMethodImpl(context, new QtPrivate::QFunctorSlotObjectWithNoArgs<Func, decltype(function())>(std::move(function)), |