diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2020-10-15 16:52:14 +0200 |
|---|---|---|
| committer | Andrei Golubev <andrei.golubev@qt.io> | 2020-10-16 09:48:10 +0200 |
| commit | 59359f67828926c192247f1b041a0438d904c6b6 (patch) | |
| tree | 2c2c53dc9d17fc802519cfc2a220841908bb6a55 /src/corelib/thread | |
| parent | db3d097db2e2bd5fe545d570b49bfbe0754fbc16 (diff) | |
Remove redundant duplicate of EnableForNonVoid in QFutureWatcher
qfuturewatcher.h includes qfuture.h, which includes EnableForNonVoid
through qfuture_impl.h header. Thus, there is never a need to keep
the same alias in QFutureWatcher as it always can use one from QFuture
Change-Id: I293fd087aea1a21ef5bcfdf50cdefc176a9703d0
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qfuturewatcher.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h index d2b8eeace1..4a630dfbe8 100644 --- a/src/corelib/thread/qfuturewatcher.h +++ b/src/corelib/thread/qfuturewatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -131,12 +131,6 @@ private: virtual QFutureInterfaceBase &futureInterface() = 0; }; -namespace QtPrivate { - -template<class T> -using EnableForNonVoid = std::enable_if_t<!std::is_same_v<T, void>>; -} - template <typename T> class QFutureWatcher : public QFutureWatcherBase { |