Fix scheduler build with some boost versions.
Some boost versions have a conflicting overload of wait_until that returns void. Explicitly use a template here to avoid hitting that overload.
This commit is contained in:
parent
c1fb0e1075
commit
72bf90d770
1 changed files with 3 additions and 1 deletions
|
@ -50,8 +50,10 @@ void CScheduler::serviceQueue()
|
||||||
// Keep waiting until timeout
|
// Keep waiting until timeout
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
// Some boost versions have a conflicting overload of wait_until that returns void.
|
||||||
|
// Explicitly use a template here to avoid hitting that overload.
|
||||||
while (!shouldStop() && !taskQueue.empty() &&
|
while (!shouldStop() && !taskQueue.empty() &&
|
||||||
newTaskScheduled.wait_until(lock, taskQueue.begin()->first) != boost::cv_status::timeout) {
|
newTaskScheduled.wait_until<>(lock, taskQueue.begin()->first) != boost::cv_status::timeout) {
|
||||||
// Keep waiting until timeout
|
// Keep waiting until timeout
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue