Switched all regular PersistentMessage* and PersistentMessage& to intrusive_ptr<PersistentMessage>, so as to hook into the refcount for a message while it is in the store.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/qpid/cpp/src/tests/MessageBuilderTest.cpp b/qpid/cpp/src/tests/MessageBuilderTest.cpp
index 023aefc3fa..7335867140 100644
--- a/qpid/cpp/src/tests/MessageBuilderTest.cpp
+++ b/qpid/cpp/src/tests/MessageBuilderTest.cpp
@@ -38,7 +38,7 @@ class MessageBuilderTest : public CppUnit::TestCase
         enum Op {STAGE=1, APPEND=2};
 
         uint64_t id;
-        PersistableMessage* expectedMsg;        
+        intrusive_ptr<PersistableMessage> expectedMsg;        
         string expectedData;
         std::list<Op> ops;
         
@@ -64,17 +64,17 @@ class MessageBuilderTest : public CppUnit::TestCase
             ops.push_back(APPEND); 
         }
 
-        void stage(PersistableMessage& msg)
+        void stage(intrusive_ptr<PersistableMessage>& msg)
         {
             checkExpectation(STAGE);
-            CPPUNIT_ASSERT_EQUAL(expectedMsg, &msg);
-            msg.setPersistenceId(++id);
+            CPPUNIT_ASSERT_EQUAL(expectedMsg, msg);
+            msg->setPersistenceId(++id);
         }
 
-        void appendContent(const PersistableMessage& msg, const string& data)
+        void appendContent(intrusive_ptr<const PersistableMessage>& msg, const string& data)
         {
             checkExpectation(APPEND);
-            CPPUNIT_ASSERT_EQUAL((const PersistableMessage*) expectedMsg, &msg);
+            CPPUNIT_ASSERT_EQUAL(static_pointer_cast<const PersistableMessage>(expectedMsg), msg);
             CPPUNIT_ASSERT_EQUAL(expectedData, data);            
         }