From 49058d80637096b65b198d4dce7fb98a1151d2b0 Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Wed, 21 Apr 2010 22:07:04 +0000
Subject: QPID-2527: Remove Thread::id member as its uses are better
 implemented by comparison operators.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@936537 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/sys/PollableQueue.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cpp/src/qpid/sys/PollableQueue.h')

diff --git a/cpp/src/qpid/sys/PollableQueue.h b/cpp/src/qpid/sys/PollableQueue.h
index cb8c126fe6..81c2301c1e 100644
--- a/cpp/src/qpid/sys/PollableQueue.h
+++ b/cpp/src/qpid/sys/PollableQueue.h
@@ -132,7 +132,7 @@ template <class T> void PollableQueue<T>::push(const T& t) {
 
 template <class T> void PollableQueue<T>::dispatch(PollableCondition& cond) {
     ScopedLock l(lock);
-    assert(dispatcher.id() == 0);
+    assert(!dispatcher);
     dispatcher = Thread::current();
     process();
     dispatcher = Thread();
@@ -167,8 +167,8 @@ template <class T> void PollableQueue<T>::stop() {
     condition.clear();
     stopped = true;
     // Avoid deadlock if stop is called from the dispatch thread
-    if (dispatcher.id() != Thread::current().id())
-        while (dispatcher.id()) lock.wait();
+    if (dispatcher && dispatcher != Thread::current())
+        while (dispatcher) lock.wait();
 }
 
 }} // namespace qpid::sys
-- 
cgit v1.2.1