From 16b29b1d085070130fc8cf851a4eb33c2f06adda Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 6 Aug 2007 13:55:08 +0000 Subject: Channel dispatcher needs ti be joined on destruction. Also minor cleanup: removed redundant method and friend declarations. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@563136 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/client/ClientChannel.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'cpp/src/qpid/client/ClientChannel.h') diff --git a/cpp/src/qpid/client/ClientChannel.h b/cpp/src/qpid/client/ClientChannel.h index 5feba6262f..bf5e2aa0d9 100644 --- a/cpp/src/qpid/client/ClientChannel.h +++ b/cpp/src/qpid/client/ClientChannel.h @@ -76,9 +76,6 @@ class Channel : private sys::Runnable const bool transactional; framing::ProtocolVersion version; - uint16_t errorCode; - std::string errorText; - sys::Mutex stopLock; bool running; @@ -120,13 +117,11 @@ class Channel : private sys::Runnable void open(ConnectionImpl::shared_ptr, SessionCore::shared_ptr); void closeInternal(); - void peerClose(uint16_t, const std::string&); + void join(); // FIXME aconway 2007-02-23: Get rid of friendships. friend class Connection; - friend class BasicMessageChannel; // for sendAndReceive. - friend class MessageMessageChannel; // for sendAndReceive. - + public: /** * Creates a channel object. -- cgit v1.2.1