QPID-3858: Refactor to tidy up several class design issues

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1362039 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 8 deletions

diff --git a/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h b/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h
index 1b3e034814..01f54c1c19 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h
@@ -28,13 +28,6 @@
 #include "qpid/broker/MessageHandle.h"
 #include "qpid/broker/PersistableMessage.h"
 
-#include <set>
-
-namespace qpid {
-namespace asyncStore {
-class AsyncStoreImpl;
-}}
-
 namespace tests {
 namespace storePerftools {
 namespace asyncPerf {
@@ -46,8 +39,10 @@ class SimpleMessage: public qpid::broker::PersistableMessage,
 {
 public:
     SimpleMessage(const char* msgData,
+                  const uint32_t msgSize);
+    SimpleMessage(const char* msgData,
                   const uint32_t msgSize,
-                  qpid::asyncStore::AsyncStoreImpl* store);
+                  qpid::broker::AsyncStore* store);
     virtual ~SimpleMessage();
     const qpid::broker::MessageHandle& getHandle() const;
     qpid::broker::MessageHandle& getHandle();
@@ -71,6 +66,8 @@ public:
 private:
     mutable uint64_t m_persistenceId;
     const std::string m_msg;
+    qpid::broker::AsyncStore* m_store;
+
     qpid::broker::MessageHandle m_msgHandle;
 };