summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/Connection.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-04-21 18:59:31 +0000
committerAlan Conway <aconway@apache.org>2008-04-21 18:59:31 +0000
commit3097509ae43d93c1832638f80ba2ad5810fbef44 (patch)
tree96a6a73a5ab8a54aa49983f0f20881964d7418b8 /cpp/src/qpid/broker/Connection.cpp
parent69a3af237753a91e9cf8dbb98e890131d53e3ee3 (diff)
downloadqpid-python-3097509ae43d93c1832638f80ba2ad5810fbef44.tar.gz
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
Diffstat (limited to 'cpp/src/qpid/broker/Connection.cpp')
-rw-r--r--cpp/src/qpid/broker/Connection.cpp6
1 files changed, 3 insertions, 3 deletions
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