- 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@640479 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/cpp/src/tests/MessageUtils.h b/qpid/cpp/src/tests/MessageUtils.h
index 117473bb5e..3def8cd41b 100644
--- a/qpid/cpp/src/tests/MessageUtils.h
+++ b/qpid/cpp/src/tests/MessageUtils.h
@@ -29,10 +29,10 @@ using namespace framing;
 
 struct MessageUtils
 {
-    static intrusive_ptr<Message> createMessage(const string& exchange, const string& routingKey, 
+    static boost::intrusive_ptr<Message> createMessage(const string& exchange, const string& routingKey, 
                                              const string& messageId, uint64_t contentSize = 0)
     {
-        intrusive_ptr<Message> msg(new Message());
+        boost::intrusive_ptr<Message> msg(new Message());
 
         AMQFrame method(in_place<MessageTransferBody>(ProtocolVersion(), 0, exchange, 0, 0));
         AMQFrame header(in_place<AMQHeaderBody>());
@@ -46,7 +46,7 @@ struct MessageUtils
         return msg;
     }
 
-    static void addContent(intrusive_ptr<Message> msg, const string& data)
+    static void addContent(boost::intrusive_ptr<Message> msg, const string& data)
     {
         AMQFrame content(in_place<AMQContentBody>(data));
         msg->getFrames().append(content);