mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-01 09:16:35 +00:00
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
This commit is contained in:
parent
2617b75e15
commit
ef1d506054
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user