diff options
| author | Cory Fields <[email protected]> | 2015-06-15 15:46:02 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2015-06-15 16:29:57 -0400 |
| commit | 72bf90d770ce5b2653fd482928646cd6a9f5f6d7 (patch) | |
| tree | 9536337e8b387b85a5f0b48eaf1f4636d0dd6a18 /src/scheduler.cpp | |
| parent | Merge pull request #6274 (diff) | |
| download | discoin-72bf90d770ce5b2653fd482928646cd6a9f5f6d7.tar.xz discoin-72bf90d770ce5b2653fd482928646cd6a9f5f6d7.zip | |
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/scheduler.cpp')
| -rw-r--r-- | src/scheduler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/scheduler.cpp b/src/scheduler.cpp index c42eb7244..d5bb588b7 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 |