aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2015-06-15 15:46:02 -0400
committerCory Fields <cory-nospam-@coryfields.com>2015-06-15 16:29:57 -0400
commit72bf90d770ce5b2653fd482928646cd6a9f5f6d7 (patch)
tree9536337e8b387b85a5f0b48eaf1f4636d0dd6a18 /src
parentc1fb0e1075f626ea23d832b07b2070e0638f4215 (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.
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