diff options
| author | Alan Conway <aconway@apache.org> | 2009-05-06 14:59:23 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-05-06 14:59:23 +0000 |
| commit | 51aa1c108e8b9c3b72aa1e81bcd9b41b3910c4b4 (patch) | |
| tree | 1180206db9b9e65f98ed470a8f45d94c403f2f12 /cpp/src/qpid/cluster/Connection.cpp | |
| parent | 5d89f0791bec9417c3dc59a1903a17a1f7e78e52 (diff) | |
| download | qpid-python-51aa1c108e8b9c3b72aa1e81bcd9b41b3910c4b4.tar.gz | |
Remove useless qpid/shared_ptr.h wrapper.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@772294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Connection.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Connection.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index c107552905..cc0af77029 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/cpp/src/qpid/cluster/Connection.cpp @@ -308,14 +308,14 @@ bool Connection::isUpdated() const { } -shared_ptr<broker::Queue> Connection::findQueue(const std::string& qname) { - shared_ptr<broker::Queue> queue = cluster.getBroker().getQueues().find(qname); +boost::shared_ptr<broker::Queue> Connection::findQueue(const std::string& qname) { + boost::shared_ptr<broker::Queue> queue = cluster.getBroker().getQueues().find(qname); if (!queue) throw Exception(QPID_MSG(cluster << " can't find queue " << qname)); return queue; } broker::QueuedMessage Connection::getUpdateMessage() { - shared_ptr<broker::Queue> updateq = findQueue(UpdateClient::UPDATE); + boost::shared_ptr<broker::Queue> updateq = findQueue(UpdateClient::UPDATE); assert(!updateq->isDurable()); broker::QueuedMessage m = updateq->get(); if (!m.payload) throw Exception(QPID_MSG(cluster << " empty update queue")); @@ -359,7 +359,7 @@ void Connection::deliveryRecord(const string& qname, } void Connection::queuePosition(const string& qname, const SequenceNumber& position) { - shared_ptr<broker::Queue> q = cluster.getBroker().getQueues().find(qname); + boost::shared_ptr<broker::Queue> q = cluster.getBroker().getQueues().find(qname); if (!q) throw InvalidArgumentException(QPID_MSG("Invalid queue name " << qname)); q->setPosition(position); } @@ -377,18 +377,21 @@ std::ostream& operator<<(std::ostream& o, const Connection& c) { } void Connection::txStart() { - txBuffer = make_shared_ptr(new broker::TxBuffer()); + txBuffer.reset(new broker::TxBuffer()); } void Connection::txAccept(const framing::SequenceSet& acked) { - txBuffer->enlist(make_shared_ptr(new broker::TxAccept(acked, semanticState().getUnacked()))); + txBuffer->enlist(boost::shared_ptr<broker::TxAccept>( + new broker::TxAccept(acked, semanticState().getUnacked()))); } void Connection::txDequeue(const std::string& queue) { - txBuffer->enlist(make_shared_ptr(new broker::RecoveredDequeue(findQueue(queue), getUpdateMessage().payload))); + txBuffer->enlist(boost::shared_ptr<broker::RecoveredDequeue>( + new broker::RecoveredDequeue(findQueue(queue), getUpdateMessage().payload))); } void Connection::txEnqueue(const std::string& queue) { - txBuffer->enlist(make_shared_ptr(new broker::RecoveredEnqueue(findQueue(queue), getUpdateMessage().payload))); + txBuffer->enlist(boost::shared_ptr<broker::RecoveredEnqueue>( + new broker::RecoveredEnqueue(findQueue(queue), getUpdateMessage().payload))); } void Connection::txPublish(const framing::Array& queues, bool delivered) { |