- 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, 4 insertions, 2 deletions

diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/cpp/src/qpid/broker/MessageBuilder.h
index 5bf6b1939a..395de024ab 100644
--- a/cpp/src/qpid/broker/MessageBuilder.h
+++ b/cpp/src/qpid/broker/MessageBuilder.h
@@ -25,6 +25,8 @@
 #include "qpid/framing/SequenceNumber.h"
 #include "qpid/RefCounted.h"
 
+#include <boost/intrusive_ptr.hpp>
+
 namespace qpid {
     namespace broker {
         class Message;
@@ -34,13 +36,13 @@ namespace qpid {
         public:
             MessageBuilder(MessageStore* const store, uint64_t stagingThreshold);
             void handle(framing::AMQFrame& frame);
-            intrusive_ptr<Message> getMessage() { return message; }
+            boost::intrusive_ptr<Message> getMessage() { return message; }
             void start(const framing::SequenceNumber& id);
             void end();
         private:
             enum State {DORMANT, METHOD, HEADER, CONTENT};
             State state;
-            intrusive_ptr<Message> message;
+            boost::intrusive_ptr<Message> message;
             MessageStore* const store;
             const uint64_t stagingThreshold;
             bool staging;