1 files changed, 14 insertions, 16 deletions

diff --git a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
index a11b23888a..9ad67cc925 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
@@ -24,35 +24,33 @@
 #ifndef tests_storePerftools_asyncPerf_QueuedMessage_h_
 #define tests_storePerftools_asyncPerf_QueuedMessage_h_
 
-#include "MockPersistableMessage.h"
-
 #include "qpid/broker/EnqueueHandle.h"
+
 #include <boost/shared_ptr.hpp>
 
 namespace tests {
 namespace storePerftools {
 namespace asyncPerf {
 
-class MockTransactionContext;
-typedef boost::shared_ptr<MockTransactionContext> MockTransactionContextPtr;
+class MockPersistableMessage;
+class MockPersistableQueue;
 
 class QueuedMessage
 {
 public:
-    QueuedMessage(MockPersistableMessage::shared_ptr msg,
-                  qpid::broker::EnqueueHandle& enqHandle,
-                  MockTransactionContextPtr txn);
-    virtual ~QueuedMessage();
-    MockPersistableMessage::shared_ptr getMessage() const;
-    qpid::broker::EnqueueHandle getEnqueueHandle() const;
-    MockTransactionContextPtr getTransactionContext() const;
-    bool isTransactional() const;
-    void clearTransaction();
-
+    QueuedMessage();
+    QueuedMessage(MockPersistableQueue* q,
+                  boost::shared_ptr<MockPersistableMessage> msg);
+    QueuedMessage(const QueuedMessage& qm);
+    ~QueuedMessage();
+    QueuedMessage& operator=(const QueuedMessage& rhs);
+    boost::shared_ptr<MockPersistableMessage> payload() const;
+    const qpid::broker::EnqueueHandle& enqHandle() const;
+    qpid::broker::EnqueueHandle& enqHandle();
 protected:
-    MockPersistableMessage::shared_ptr m_msg;
+    MockPersistableQueue* m_queue;
+    boost::shared_ptr<MockPersistableMessage> m_msg;
     qpid::broker::EnqueueHandle m_enqHandle;
-    MockTransactionContextPtr m_txn;
 };
 
 }}} // namespace tests::storePerfTools