3 files changed, 13 insertions, 10 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 09e053dc28..910699f913 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -46,10 +46,10 @@
 #include "qpid/management/IdAllocator.h"
 #include "qpid/management/ManagementBroker.h"
 #include "qpid/memory.h"
-#include "qpid/shared_ptr.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/LatencyTracker.h"
 
+#include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
 #include <boost/cast.hpp>
 #include <boost/current_function.hpp>
diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp
index 0067de8ec1..66d15fa56b 100644
--- a/cpp/src/qpid/cluster/ClusterPlugin.cpp
+++ b/cpp/src/qpid/cluster/ClusterPlugin.cpp
@@ -28,7 +28,6 @@
 #include "qpid/broker/Broker.h"
 #include "qpid/Plugin.h"
 #include "qpid/Options.h"
-#include "qpid/shared_ptr.h"
 #include "qpid/sys/AtomicValue.h"
 #include "qpid/log/Statement.h"
 
@@ -39,6 +38,7 @@
 #include "qpid/broker/SessionState.h"
 #include "qpid/client/ConnectionSettings.h"
 
+#include <boost/shared_ptr.hpp>
 #include <boost/utility/in_place_factory.hpp>
 #include <boost/scoped_ptr.hpp>
 
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) {