From 3097509ae43d93c1832638f80ba2ad5810fbef44 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 21 Apr 2008 18:59:31 +0000 Subject: Better workaround for boost::ptr_map incompatibility between boost 1.33 and 1.34, based on public properties of ptr::map types rather than version numbers. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@650221 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Connection.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/broker/Connection.cpp') diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index ef1100a2ec..cfa722e130 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -40,7 +40,7 @@ using namespace boost; using namespace qpid::sys; using namespace qpid::framing; using namespace qpid::sys; -using namespace qpid::ptr_map; +using qpid::ptr_map_ptr; using qpid::management::ManagementAgent; using qpid::management::ManagementObject; using qpid::management::Manageable; @@ -143,7 +143,7 @@ void Connection::idleIn(){} void Connection::closed(){ // Physically closed, suspend open sessions. try { for (ChannelMap::iterator i = channels.begin(); i != channels.end(); ++i) - get_pointer(i)->localSuspend(); + ptr_map_ptr(i)->localSuspend(); while (!exclusiveQueues.empty()) { Queue::shared_ptr q(exclusiveQueues.front()); q->releaseExclusiveOwnership(); @@ -186,7 +186,7 @@ SessionHandler& Connection::getChannel(ChannelId id) { if (i == channels.end()) { i = channels.insert(id, new SessionHandler(*this, id)).first; } - return *get_pointer(i); + return *ptr_map_ptr(i); } ManagementObject::shared_ptr Connection::GetManagementObject (void) const -- cgit v1.2.1