diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-09-03 21:43:12 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-09-03 21:46:08 +0200 |
| commit | 195942d58e664684be0b7bd7687106e53d6be879 (patch) | |
| tree | 4ca1ddb5cb93dbddd93e040d313a7e5e11fe5af8 /src/scheduler.cpp | |
| parent | Merge pull request #6374 (diff) | |
| parent | Replace boost::reverse_lock with our own. (diff) | |
| download | discoin-195942d58e664684be0b7bd7687106e53d6be879.tar.xz discoin-195942d58e664684be0b7bd7687106e53d6be879.zip | |
Merge pull request #6630
86270c8 Replace boost::reverse_lock with our own. (Casey Rodarmor)
Diffstat (limited to 'src/scheduler.cpp')
| -rw-r--r-- | src/scheduler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/scheduler.cpp b/src/scheduler.cpp index 06115f561..184ddc28a 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -4,9 +4,10 @@ #include "scheduler.h" +#include "reverselock.h" + #include <assert.h> #include <boost/bind.hpp> -#include <boost/thread/reverse_lock.hpp> #include <utility> CScheduler::CScheduler() : nThreadsServicingQueue(0), stopRequested(false), stopWhenEmpty(false) @@ -69,7 +70,7 @@ void CScheduler::serviceQueue() { // Unlock before calling f, so it can reschedule itself or another task // without deadlocking: - boost::reverse_lock<boost::unique_lock<boost::mutex> > rlock(lock); + reverse_lock<boost::unique_lock<boost::mutex> > rlock(lock); f(); } } catch (...) { |