diff options
Diffstat (limited to 'messagebus')
-rw-r--r-- | messagebus/src/vespa/messagebus/routablequeue.cpp | 2 | ||||
-rw-r--r-- | messagebus/src/vespa/messagebus/routablequeue.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/messagebus/src/vespa/messagebus/routablequeue.cpp b/messagebus/src/vespa/messagebus/routablequeue.cpp index 9ec6d36f688..6d72b7f9538 100644 --- a/messagebus/src/vespa/messagebus/routablequeue.cpp +++ b/messagebus/src/vespa/messagebus/routablequeue.cpp @@ -46,7 +46,7 @@ RoutableQueue::dequeue(duration timeout) duration left = timeout; std::unique_lock guard(_lock); while (_queue.size() == 0 && left > duration::zero()) { - if ((_cond.wait_for(guard, left) == std::cv_status::no_timeout) || (_queue.size() > 0)) { + if ((_cond.wait_for(guard, left) == std::cv_status::timeout) || (_queue.size() > 0)) { break; } duration elapsed = (steady_clock::now() - startTime); diff --git a/messagebus/src/vespa/messagebus/routablequeue.h b/messagebus/src/vespa/messagebus/routablequeue.h index 0c3edc1a597..b7007792b34 100644 --- a/messagebus/src/vespa/messagebus/routablequeue.h +++ b/messagebus/src/vespa/messagebus/routablequeue.h @@ -31,8 +31,6 @@ private: Queue<Routable*> _queue; public: - RoutableQueue(const RoutableQueue &) = delete; - RoutableQueue &operator=(const RoutableQueue &) = delete; /** * Create an empty queue. **/ @@ -41,7 +39,7 @@ public: /** * The destructor will delete any objects still on the queue. **/ - virtual ~RoutableQueue(); + ~RoutableQueue() override; /** * Obtain the number of elements currently in this queue. Note |