aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2015-06-15 15:46:02 -0400
committerWladimir J. van der Laan <laanwj@gmail.com>2015-06-16 13:57:21 +0200
commitef1d5060544fd4f468a19b090fabae5e3be84e1e (patch)
tree83c93e1eb652b826522631c22256ea5916e8397f /src
parent2617b75e15fc93a8a4652933fc56fdcc92851b9e (diff)
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: 72bf90d770ce5b2653fd482928646cd6a9f5f6d7
Diffstat (limited to 'src')
-rw-r--r--src/scheduler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index c42eb7244d..d5bb588b71 100644
--- a/src/scheduler.cpp
+++ b/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