diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h index bf980716465..460637fcf6f 100644 --- a/src/corelib/thread/qfuture_impl.h +++ b/src/corelib/thread/qfuture_impl.h @@ -535,18 +535,18 @@ void Continuation::create(F &&func, fi.setLaunchAsync(launchAsync); - auto continuation = [func = std::forward(func), fi, promise = QPromise(fi), pool, + auto continuation = [func = std::forward(func), fi, promise_ = QPromise(fi), pool, launchAsync](const QFutureInterfaceBase &parentData) mutable { const auto parent = QFutureInterface(parentData).future(); Continuation *continuationJob = nullptr; if (launchAsync) { auto asyncJob = new AsyncContinuation( - std::forward(func), parent, std::move(promise), pool); + std::forward(func), parent, std::move(promise_), pool); fi.setRunnable(asyncJob); continuationJob = asyncJob; } else { continuationJob = new SyncContinuation( - std::forward(func), parent, std::move(promise)); + std::forward(func), parent, std::move(promise_)); } bool isLaunched = continuationJob->execute(); @@ -573,11 +573,11 @@ void Continuation::create(F &&func, fi.setLaunchAsync(true); fi.setThreadPool(pool); - auto continuation = [func = std::forward(func), promise = QPromise(fi), + auto continuation = [func = std::forward(func), promise_ = QPromise(fi), pool](const QFutureInterfaceBase &parentData) mutable { const auto parent = QFutureInterface(parentData).future(); auto continuationJob = new AsyncContinuation( - std::forward(func), parent, std::move(promise), pool); + std::forward(func), parent, std::move(promise_), pool); bool isLaunched = continuationJob->execute(); // If continuation is successfully launched, AsyncContinuation will be deleted // by the QThreadPool which has started it. @@ -615,9 +615,9 @@ void Continuation::create(F &&func, // continuation callback is destroyed. The promise that is created in the capture list is // destroyed and, if it is not yet finished, cancelled. auto continuation = [func = std::forward(func), parent = *f, - promise = QPromise(fi)]() mutable { + promise_ = QPromise(fi)]() mutable { SyncContinuation continuationJob( - std::forward(func), parent, std::move(promise)); + std::forward(func), parent, std::move(promise_)); continuationJob.execute(); }; @@ -687,11 +687,11 @@ void FailureHandler::create(F &&function, QFuture(function), promise = QPromise(fi)]( + auto failureContinuation = [function = std::forward(function), promise_ = QPromise(fi)]( const QFutureInterfaceBase &parentData) mutable { const auto parent = QFutureInterface(parentData).future(); FailureHandler failureHandler(std::forward(function), - parent, std::move(promise)); + parent, std::move(promise_)); failureHandler.run(); }; @@ -707,9 +707,9 @@ void FailureHandler::create(F &&function, QFuture(function), - parent = *future, promise = QPromise(fi)]() mutable { + parent = *future, promise_ = QPromise(fi)]() mutable { FailureHandler failureHandler( - std::forward(function), parent, std::move(promise)); + std::forward(function), parent, std::move(promise_)); failureHandler.run(); };