summaryrefslogtreecommitdiff
path: root/wx+/async_task.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <shieldwed@outlook.com>2019-12-14 15:52:53 +0000
committerDaniel Wilhelm <shieldwed@outlook.com>2019-12-14 15:52:53 +0000
commitcc75e50ca861529d50601d247fd66f806fcb23a8 (patch)
treee2c5c7b1f98e64011b1ee8ca4e9bb9157510dfe7 /wx+/async_task.h
parentMerge branch '10.17' into 'master' (diff)
parentadd upstream 10.18 (diff)
downloadFreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.gz
FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.bz2
FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.zip
Merge branch '10.18' into 'master'10.18
add upstream 10.18 See merge request opensource-tracking/FreeFileSync!15
Diffstat (limited to 'wx+/async_task.h')
-rw-r--r--wx+/async_task.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/wx+/async_task.h b/wx+/async_task.h
index 04eac61c..1599c4d7 100644
--- a/wx+/async_task.h
+++ b/wx+/async_task.h
@@ -85,7 +85,7 @@ public:
std::vector<std::unique_ptr<Task>> readyTasks; //Reentrancy; access to AsyncTasks::add is not protected! => evaluate outside eraseIf
- eraseIf(tasks_, [&](std::unique_ptr<Task>& task)
+ std::erase_if(tasks_, [&](std::unique_ptr<Task>& task)
{
if (task->resultReady())
{
bgstack15