- Refactored RefCounted class to avoid virtual inheritance

- Removed extraneous includes and definitions from RefCounted.h
- Fixed all the places that were relying on RefCounted.h to be including the
  intrusive_ptr header file and were assuming that something had imported
  intrusive_ptr into the qpid namespace


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640479 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/cpp/src/qpid/broker/MessageStoreModule.h
index 160d681fab..abc0fbfd7a 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/cpp/src/qpid/broker/MessageStoreModule.h
@@ -24,8 +24,11 @@
 #include "MessageStore.h"
 #include "Queue.h"
 #include "RecoveryManager.h"
+
 #include "qpid/sys/Module.h"
 
+#include <boost/intrusive_ptr.hpp>
+
 namespace qpid {
 namespace broker {
 
@@ -55,16 +58,16 @@ public:
     void unbind(const PersistableExchange& exchange, const PersistableQueue& queue, 
                 const std::string& key, const framing::FieldTable& args);
     void recover(RecoveryManager& queues);
-    void stage(intrusive_ptr<PersistableMessage>& msg);
+    void stage(boost::intrusive_ptr<PersistableMessage>& msg);
     void destroy(PersistableMessage& msg);
-    void appendContent(intrusive_ptr<const PersistableMessage>& msg, const std::string& data);
+    void appendContent(boost::intrusive_ptr<const PersistableMessage>& msg, const std::string& data);
     void loadContent(const qpid::broker::PersistableQueue& queue, 
-	          intrusive_ptr<const PersistableMessage>& msg, std::string& data,
+	          boost::intrusive_ptr<const PersistableMessage>& msg, std::string& data,
               uint64_t offset, uint32_t length);
 
-    void enqueue(TransactionContext* ctxt, intrusive_ptr<PersistableMessage>& msg,
+    void enqueue(TransactionContext* ctxt, boost::intrusive_ptr<PersistableMessage>& msg,
                  const PersistableQueue& queue);
-    void dequeue(TransactionContext* ctxt, intrusive_ptr<PersistableMessage>& msg,
+    void dequeue(TransactionContext* ctxt, boost::intrusive_ptr<PersistableMessage>& msg,
                  const PersistableQueue& queue);
     u_int32_t outstandingQueueAIO(const PersistableQueue& queue);
     void flush(const qpid::broker::PersistableQueue& queue);