Skip to content
Permalink
Browse files

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.

Github-Pull: #6285
Rebased-From: 72bf90d
  • Loading branch information...
theuni authored and laanwj committed Jun 15, 2015
1 parent 2617b75 commit ef1d5060544fd4f468a19b090fabae5e3be84e1e
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/scheduler.cpp
@@ -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

0 comments on commit ef1d506

Please sign in to comment.
You can’t perform that action at this time.