QPID-3858: WIP: Moving Simple* test classes into the correct namespaces so as to correspond with broker classes.

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

4 files changed, 11 insertions, 12 deletions

diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
index aa66e7adb8..2ee1d23025 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
@@ -75,7 +75,7 @@ AsyncStoreImpl::createTxnHandle()
 }
 
 qpid::broker::TxnHandle
-AsyncStoreImpl::createTxnHandle(qpid::broker::TxnBuffer* tb)
+AsyncStoreImpl::createTxnHandle(qpid::broker::SimpleTxnBuffer* tb)
 {
     return qpid::broker::TxnHandle(new TxnHandleImpl(tb));
 }
@@ -90,7 +90,7 @@ AsyncStoreImpl::createTxnHandle(const std::string& xid,
 qpid::broker::TxnHandle
 AsyncStoreImpl::createTxnHandle(const std::string& xid,
                                 const bool tpcFlag,
-                                qpid::broker::TxnBuffer* tb)
+                                qpid::broker::SimpleTxnBuffer* tb)
 {
     return qpid::broker::TxnHandle(new TxnHandleImpl(xid, tpcFlag, tb));
 }
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
index eb3f090ad7..40a7552a68 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
@@ -42,8 +42,7 @@ class Poller;
 
 namespace asyncStore {
 
-class AsyncStoreImpl : public qpid::broker::AsyncTransactionalStore,
-                       public qpid::broker::AsyncStore
+class AsyncStoreImpl : public qpid::broker::AsyncStore
 {
 public:
     AsyncStoreImpl(boost::shared_ptr<qpid::sys::Poller> poller,
@@ -59,12 +58,12 @@ public:
     // --- Interface from AsyncTransactionalStore ---
 
     qpid::broker::TxnHandle createTxnHandle();
-    qpid::broker::TxnHandle createTxnHandle(qpid::broker::TxnBuffer* tb);
+    qpid::broker::TxnHandle createTxnHandle(qpid::broker::SimpleTxnBuffer* tb);
     qpid::broker::TxnHandle createTxnHandle(const std::string& xid,
                                             const bool tpcFlag);
     qpid::broker::TxnHandle createTxnHandle(const std::string& xid,
                                             const bool tpcFlag,
-                                            qpid::broker::TxnBuffer* tb);
+                                            qpid::broker::SimpleTxnBuffer* tb);
 
     void submitPrepare(qpid::broker::TxnHandle& txnHandle,
                        boost::shared_ptr<qpid::broker::TpcTxnAsyncContext> TxnCtxt);
diff --git a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
index dd644b29bd..50dce1b2af 100644
--- a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
@@ -31,7 +31,7 @@ TxnHandleImpl::TxnHandleImpl() :
         m_txnBuffer(0)
 {}
 
-TxnHandleImpl::TxnHandleImpl(qpid::broker::TxnBuffer* tb) :
+TxnHandleImpl::TxnHandleImpl(qpid::broker::SimpleTxnBuffer* tb) :
         m_tpcFlag(false),
         m_txnBuffer(tb)
 {}
@@ -44,7 +44,7 @@ TxnHandleImpl::TxnHandleImpl(const std::string& xid, const bool tpcFlag) :
 
 TxnHandleImpl::TxnHandleImpl(const std::string& xid,
                              const bool tpcFlag,
-                             qpid::broker::TxnBuffer* tb) :
+                             qpid::broker::SimpleTxnBuffer* tb) :
         m_xid(xid),
         m_tpcFlag(tpcFlag),
         m_txnBuffer(tb)
diff --git a/cpp/src/qpid/asyncStore/TxnHandleImpl.h b/cpp/src/qpid/asyncStore/TxnHandleImpl.h
index e1f8afff3e..ce23665d5b 100644
--- a/cpp/src/qpid/asyncStore/TxnHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/TxnHandleImpl.h
@@ -33,7 +33,7 @@
 namespace qpid {
 
 namespace broker {
-class TxnBuffer;
+class SimpleTxnBuffer;
 }
 
 namespace asyncStore {
@@ -42,9 +42,9 @@ class TxnHandleImpl : public virtual qpid::RefCounted
 {
 public:
     TxnHandleImpl();
-    TxnHandleImpl(qpid::broker::TxnBuffer* tb);
+    TxnHandleImpl(qpid::broker::SimpleTxnBuffer* tb);
     TxnHandleImpl(const std::string& xid, const bool tpcFlag);
-    TxnHandleImpl(const std::string& xid, const bool tpcFlag, qpid::broker::TxnBuffer* tb);
+    TxnHandleImpl(const std::string& xid, const bool tpcFlag, qpid::broker::SimpleTxnBuffer* tb);
     virtual ~TxnHandleImpl();
     const std::string& getXid() const;
     bool is2pc() const;
@@ -52,7 +52,7 @@ public:
 private:
     std::string m_xid;
     bool m_tpcFlag;
-    qpid::broker::TxnBuffer* const m_txnBuffer;
+    qpid::broker::SimpleTxnBuffer* const m_txnBuffer;
 };
 
 }} // namespace qpid::asyncStore