diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-16 13:54:33 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-16 13:55:47 +0200 |
commit | 7fe29d84bdd8d47f53684919e86ed35e619cda04 (patch) | |
tree | 9536337e8b387b85a5f0b48eaf1f4636d0dd6a18 | |
parent | c1fb0e1075f626ea23d832b07b2070e0638f4215 (diff) | |
parent | 72bf90d770ce5b2653fd482928646cd6a9f5f6d7 (diff) | |
download | bitcoin-7fe29d84bdd8d47f53684919e86ed35e619cda04.tar.xz |
Merge pull request #6285
72bf90d Fix scheduler build with some boost versions. (Cory Fields)
-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 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 |