mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9912 from s0r00t/refactor/jobpool-avoid-redefine 

Avoid redefining JobPool::AddTask
This commit is contained in:
ζeh Matt 2019-08-20 10:54:20 +02:00 committed by GitHub
parent 917bff23ad 54dc91511e
commit 9897572f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/core/JobPool.hpp
View File

@ -70,18 +70,13 @@ public:
}
}
void AddTask(std::function<void()> workFn, std::function<void()> completionFn)
void AddTask(std::function<void()> workFn, std::function<void()> completionFn = nullptr)
{
unique_lock lock(_mutex);
_pending.emplace_back(workFn, completionFn);
_condPending.notify_one();
}
void AddTask(std::function<void()> workFn)
{
return AddTask(workFn, nullptr);
}
void Join(std::function<void()> reportFn = nullptr)
{
unique_lock lock(_mutex);