diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-04-21 22:07:04 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-04-21 22:07:04 +0000 |
| commit | 49058d80637096b65b198d4dce7fb98a1151d2b0 (patch) | |
| tree | 2d2c6d77130f2337015c66b62df2ec125d211320 /cpp/src/tests | |
| parent | 26d81efa13c8878f4584a721a3f0ea72ce27775f (diff) | |
| download | qpid-python-49058d80637096b65b198d4dce7fb98a1151d2b0.tar.gz | |
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
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/SocketProxy.h | 2 | ||||
| -rw-r--r-- | cpp/src/tests/exception_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/tests/SocketProxy.h b/cpp/src/tests/SocketProxy.h index 4582dc36fd..0c6f39d62e 100644 --- a/cpp/src/tests/SocketProxy.h +++ b/cpp/src/tests/SocketProxy.h @@ -76,7 +76,7 @@ class SocketProxy : private qpid::sys::Runnable if (closed) { return; } closed=true; } - if (thread.id() != qpid::sys::Thread::current().id()) { + if (thread && thread != qpid::sys::Thread::current()) { thread.join(); joined = true; } diff --git a/cpp/src/tests/exception_test.cpp b/cpp/src/tests/exception_test.cpp index 4dac8ee965..3536ffddbe 100644 --- a/cpp/src/tests/exception_test.cpp +++ b/cpp/src/tests/exception_test.cpp @@ -74,7 +74,7 @@ struct Catcher : public Runnable { } bool join() { - if (thread.id()) { + if (thread) { thread.join(); thread=Thread(); } |