5 files changed, 16 insertions, 15 deletions
diff --git a/cpp/src/qpid/client/CompletionImpl.h b/cpp/src/qpid/client/CompletionImpl.h
index 119abc093a..cd88df79ed 100644
--- a/cpp/src/qpid/client/CompletionImpl.h
+++ b/cpp/src/qpid/client/CompletionImpl.h
@@ -24,6 +24,7 @@
 
 #include "qpid/RefCounted.h"
 #include "Future.h"
+#include <boost/shared_ptr.hpp>
 
 namespace qpid {
 namespace client {
@@ -33,7 +34,7 @@ class CompletionImpl : public RefCounted
 {
 public:
     CompletionImpl() {}
-    CompletionImpl(Future f, shared_ptr<SessionImpl> s) : future(f), session(s) {}
+    CompletionImpl(Future f, boost::shared_ptr<SessionImpl> s) : future(f), session(s) {}
 
     bool isComplete() { return future.isComplete(*session); }
     void wait() { future.wait(*session); }
@@ -41,7 +42,7 @@ public:
 
 protected:
     Future future;
-    shared_ptr<SessionImpl> session;
+    boost::shared_ptr<SessionImpl> session;
 };
 
 }} // namespace qpid::client
diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/src/qpid/client/Connection.cpp
index e8415403ca..b0d9406fad 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/cpp/src/qpid/client/Connection.cpp
@@ -28,7 +28,6 @@
 #include "qpid/log/Logger.h"
 #include "qpid/log/Options.h"
 #include "qpid/log/Statement.h"
-#include "qpid/shared_ptr.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
 
 #include <algorithm>
@@ -37,6 +36,7 @@
 #include <functional>
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
 
 using namespace qpid::framing;
 using namespace qpid::sys;
@@ -47,7 +47,7 @@ namespace client {
 
 Connection::Connection() : version(framing::highestProtocolVersion) {}
 
-Connection::~Connection(){ }
+Connection::~Connection() {}
 
 void Connection::open(
     const Url& url,
@@ -119,7 +119,7 @@ void Connection::open(const ConnectionSettings& settings)
     if (isOpen())
         throw Exception(QPID_MSG("Connection::open() was already called"));
 
-    impl = shared_ptr<ConnectionImpl>(new ConnectionImpl(version, settings));
+    impl = boost::shared_ptr<ConnectionImpl>(new ConnectionImpl(version, settings));
     impl->open();
     if ( failureCallback )
         impl->registerFailureCallback ( failureCallback );
diff --git a/cpp/src/qpid/client/SessionBase_0_10.h b/cpp/src/qpid/client/SessionBase_0_10.h
index b4f713dcb5..94686ff39f 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.h
+++ b/cpp/src/qpid/client/SessionBase_0_10.h
@@ -27,7 +27,6 @@
 #include "qpid/client/Message.h"
 #include "qpid/client/Completion.h"
 #include "qpid/client/TypedResult.h"
-#include "qpid/shared_ptr.h"
 #include "qpid/client/ClientImportExport.h"
 #include <string>
 
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/cpp/src/qpid/client/SessionImpl.cpp
index 5df376efa0..0c6af5d1ff 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/cpp/src/qpid/client/SessionImpl.cpp
@@ -37,6 +37,7 @@
 #include "qpid/sys/IntegerTypes.h"
 
 #include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace { const std::string EMPTY; }
 
@@ -51,7 +52,7 @@ typedef sys::Monitor::ScopedUnlock  UnLock;
 typedef sys::ScopedLock<sys::Semaphore>  Acquire;
 
 
-SessionImpl::SessionImpl(const std::string& name, shared_ptr<ConnectionImpl> conn)
+SessionImpl::SessionImpl(const std::string& name, boost::shared_ptr<ConnectionImpl> conn)
     : state(INACTIVE),
       detachedLifetime(0),
       maxFrameSize(conn->getNegotiatedSettings().maxFrameSize),
@@ -119,7 +120,7 @@ void SessionImpl::close() //user thread
     waitFor(DETACHED);
 }
 
-void SessionImpl::resume(shared_ptr<ConnectionImpl>) // user thread
+void SessionImpl::resume(boost::shared_ptr<ConnectionImpl>) // user thread
 {
     // weakPtr sessions should not be resumed.
     if (weakPtr) return;
@@ -770,7 +771,7 @@ void SessionImpl::setWeakPtr(bool weak) {
         connectionShared = connectionWeak.lock();
 }
 
-shared_ptr<ConnectionImpl> SessionImpl::getConnection()
+boost::shared_ptr<ConnectionImpl> SessionImpl::getConnection()
 {
     return connectionWeak.lock();
 }
diff --git a/cpp/src/qpid/client/SessionImpl.h b/cpp/src/qpid/client/SessionImpl.h
index 851bd2ec47..4120f24011 100644
--- a/cpp/src/qpid/client/SessionImpl.h
+++ b/cpp/src/qpid/client/SessionImpl.h
@@ -28,8 +28,6 @@
 
 #include "qpid/SessionId.h"
 #include "qpid/SessionState.h"
-#include "boost/shared_ptr.hpp"
-#include "boost/weak_ptr.hpp"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/ChannelHandler.h"
 #include "qpid/framing/SequenceNumber.h"
@@ -39,6 +37,8 @@
 #include "qpid/sys/StateMonitor.h"
 #include "qpid/sys/ExceptionHolder.h"
 
+#include <boost/weak_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 
 namespace qpid {
@@ -65,7 +65,7 @@ class SessionImpl : public framing::FrameHandler::InOutHandler,
                     private framing::AMQP_ClientOperations::MessageHandler
 {
 public:
-    SessionImpl(const std::string& name, shared_ptr<ConnectionImpl>);
+    SessionImpl(const std::string& name, boost::shared_ptr<ConnectionImpl>);
     ~SessionImpl();
 
 
@@ -79,7 +79,7 @@ public:
 
     void open(uint32_t detachedLifetime);
     void close();
-    void resume(shared_ptr<ConnectionImpl>);
+    void resume(boost::shared_ptr<ConnectionImpl>);
     void suspend();
 
     void assertOpen() const;
@@ -118,7 +118,7 @@ public:
     /** 
      * get the Connection associated with this connection
      */
-    shared_ptr<ConnectionImpl> getConnection();
+    boost::shared_ptr<ConnectionImpl> getConnection();
 
 private:
     enum State {
@@ -209,7 +209,7 @@ private:
     const uint64_t maxFrameSize;
     const SessionId id;
 
-    shared_ptr<ConnectionImpl> connectionShared;
+    boost::shared_ptr<ConnectionImpl> connectionShared;
     boost::weak_ptr<ConnectionImpl> connectionWeak;
     bool weakPtr;