Browse Source

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.
pull/1/head
Cory Fields 8 years ago
parent
commit
72bf90d770
  1. 4
      src/scheduler.cpp

4
src/scheduler.cpp

@ -50,8 +50,10 @@ void CScheduler::serviceQueue() @@ -50,8 +50,10 @@ void CScheduler::serviceQueue()
// Keep waiting until timeout
}
#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() &&
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
}
#endif

Loading…
Cancel
Save