1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qfuture_impl.h: remove redundant declaration

Browse Source 
QtPrivate::watchContinuationImpl() is already declared in
qfutureinterface.h, which qfuture_impl.h already includes.

Fixes GCC -Wredundant-decls.

Amends 59e21a536f7f81625216dc7a621e7be59919da33.

Task-number: QTBUG-115583
Change-Id: I9c77209d2d10492f4d81aacc1f1da3201b5d1810
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Arno Rehn <a.rehn@menlosystems.com>
(cherry picked from commit 1941c11b6a633fe9a1416d7ff3e03bb5342b65da)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-04-30 10:08:43 +02:00 committed by Qt Cherry-pick Bot
parent 98046f48fa
commit 624fd64d1e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/thread/qfuture_impl.h
View File

@ -588,9 +588,6 @@ void Continuation<Function, ResultType, ParentResultType>::create(F &&func,
f->d.setContinuation(ContinuationWrapper(std::move(continuation)), fi.d);
}
// defined in qfutureinterface.cpp:
Q_CORE_EXPORT void watchContinuationImpl(const QObject *context, QSlotObjectBase *slotObj,
QFutureInterfaceBase &fi);
template <typename Continuation>
void watchContinuation(const QObject *context, Continuation &&c, QFutureInterfaceBase &fi)
{