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

7 files changed, 8 insertions, 13 deletions

diff --git a/cpp/src/qpid/broker/AclModule.h b/cpp/src/qpid/broker/AclModule.h
index 4bb6ca12b4..a78b2d5b4a 100644
--- a/cpp/src/qpid/broker/AclModule.h
+++ b/cpp/src/qpid/broker/AclModule.h
@@ -21,9 +21,8 @@
  */
 
 
-
-#include "qpid/shared_ptr.h"
 #include "qpid/RefCounted.h"
+#include <boost/shared_ptr.hpp>
 #include <map>
 #include <set>
 #include <string>
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 3f9effc08f..a5379634b6 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -237,7 +237,7 @@ Broker::Broker(const Broker::Options& conf) :
         Exchange::shared_ptr mExchange = exchanges.get (qpid_management);
         Exchange::shared_ptr dExchange = exchanges.get (amq_direct);
         ((ManagementBroker*) managementAgent)->setExchange (mExchange, dExchange);
-        dynamic_pointer_cast<ManagementExchange>(mExchange)->setManagmentAgent
+        boost::dynamic_pointer_cast<ManagementExchange>(mExchange)->setManagmentAgent
             ((ManagementBroker*) managementAgent);
     }
     else
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h
index 96eff453c0..cd2513284a 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/cpp/src/qpid/broker/Message.h
@@ -28,8 +28,8 @@
 #include "qpid/framing/amqp_types.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Time.h"
-#include "qpid/shared_ptr.h"
 #include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
 #include <string>
 #include <vector>
 
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index 3c7c6d9afa..5e41fa3302 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -146,7 +146,7 @@ void SemanticState::startDtx(const std::string& xid, DtxManager& mgr, bool join)
         throw CommandInvalidException(QPID_MSG("Session has not been selected for use with dtx"));
     }
     dtxBuffer = DtxBuffer::shared_ptr(new DtxBuffer(xid));
-    txBuffer = static_pointer_cast<TxBuffer>(dtxBuffer);
+    txBuffer = boost::static_pointer_cast<TxBuffer>(dtxBuffer);
     if (join) {
         mgr.join(xid, dtxBuffer);
     } else {
@@ -214,7 +214,7 @@ void SemanticState::resumeDtx(const std::string& xid)
 
     checkDtxTimeout();
     dtxBuffer->setSuspended(false);
-    txBuffer = static_pointer_cast<TxBuffer>(dtxBuffer);
+    txBuffer = boost::static_pointer_cast<TxBuffer>(dtxBuffer);
 }
 
 void SemanticState::checkDtxTimeout()
diff --git a/cpp/src/qpid/broker/SemanticState.h b/cpp/src/qpid/broker/SemanticState.h
index c31a6978c9..9dd7cc914b 100644
--- a/cpp/src/qpid/broker/SemanticState.h
+++ b/cpp/src/qpid/broker/SemanticState.h
@@ -36,7 +36,6 @@
 #include "qpid/framing/Uuid.h"
 #include "qpid/sys/AggregateOutput.h"
 #include "qpid/sys/Mutex.h"
-#include "qpid/shared_ptr.h"
 #include "AclModule.h"
 
 #include <list>
diff --git a/cpp/src/qpid/broker/SessionAdapter.h b/cpp/src/qpid/broker/SessionAdapter.h
index 60a5a0f285..b9f8134856 100644
--- a/cpp/src/qpid/broker/SessionAdapter.h
+++ b/cpp/src/qpid/broker/SessionAdapter.h
@@ -102,10 +102,10 @@ class Queue;
                                            const std::string& routingKey,
                                            const framing::FieldTable& arguments);
       private:
-        void checkType(shared_ptr<Exchange> exchange, const std::string& type);
+        void checkType(boost::shared_ptr<Exchange> exchange, const std::string& type);
 
-        void checkAlternate(shared_ptr<Exchange> exchange,
-                            shared_ptr<Exchange> alternate);
+        void checkAlternate(boost::shared_ptr<Exchange> exchange,
+                            boost::shared_ptr<Exchange> alternate);
     };
 
     class QueueHandlerImpl : public QueueHandler,
diff --git a/cpp/src/qpid/broker/TxOpVisitor.h b/cpp/src/qpid/broker/TxOpVisitor.h
index a5f2a018c9..ceb894896e 100644
--- a/cpp/src/qpid/broker/TxOpVisitor.h
+++ b/cpp/src/qpid/broker/TxOpVisitor.h
@@ -21,7 +21,6 @@
  * under the License.
  *
  */
-#include "qpid/shared_ptr.h"
 
 namespace qpid {
 namespace broker {
@@ -71,8 +70,6 @@ struct TxOpConstVisitor
  * under the License.
  *
  */
-#include "qpid/shared_ptr.h"
-
 namespace qpid {
 namespace broker {