QPID-3858: WIP - tidy-up: protected to private in classes except where required

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

55 files changed, 120 insertions, 98 deletions

diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.cpp b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
index 0d8ff1535e..bcaac5c548 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
@@ -90,6 +90,12 @@ AsyncOperation::getOpStr() const
     return getOpStr(m_op);
 }
 
+boost::shared_ptr<qpid::broker::BrokerAsyncContext>
+AsyncOperation::getBrokerContext() const
+{
+    return m_brokerCtxt;
+}
+
 //static
 const char*
 AsyncOperation::getOpStr(const opCode op)
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.h b/cpp/src/qpid/asyncStore/AsyncOperation.h
index 24f8baeb4d..188750e910 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.h
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.h
@@ -67,7 +67,9 @@ public:
     virtual ~AsyncOperation();
     const char* getOpStr() const;
     static const char* getOpStr(const opCode op);
+    boost::shared_ptr<qpid::broker::BrokerAsyncContext> getBrokerContext() const;
 
+private:
     opCode m_op;
     const qpid::broker::IdHandle* m_targetHandle;
     const qpid::broker::DataSource* const m_dataSrc;
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
index 60365e0e8a..3f2058a94c 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
@@ -116,7 +116,7 @@ public:
                             uint64_t offset,
                             const uint64_t length);
 
-protected:
+private:
     boost::shared_ptr<qpid::sys::Poller> m_poller;
     AsyncStoreOptions m_opts;
     RunState m_runState;
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
index 6dac318d14..7037ca226f 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
@@ -57,7 +57,7 @@ void
 AsyncStoreOptions::validate()
 {}
 
-//static
+// private static
 std::string&
 AsyncStoreOptions::getDefaultStoreDir()
 {
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreOptions.h b/cpp/src/qpid/asyncStore/AsyncStoreOptions.h
index bc1b6a2f9f..2849e3d2c6 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreOptions.h
+++ b/cpp/src/qpid/asyncStore/AsyncStoreOptions.h
@@ -48,7 +48,7 @@ public:
 
     std::string m_storeDir;
 
-protected:
+private:
     // Static initialization race condition avoidance with static instance of Plugin class (using construct-on-first-use idiom).
     static std::string& getDefaultStoreDir();
 };
diff --git a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h
index 82f3e5c47e..f976b6d246 100644
--- a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.h
@@ -41,7 +41,7 @@ public:
     EnqueueHandleImpl(qpid::broker::MessageHandle& msgHandle,
                       qpid::broker::QueueHandle& queueHandle);
     virtual ~EnqueueHandleImpl();
-protected:
+private:
     qpid::broker::MessageHandle& m_msgHandle;
     qpid::broker::QueueHandle& m_queueHandle;
 };
diff --git a/cpp/src/qpid/asyncStore/EventHandleImpl.h b/cpp/src/qpid/asyncStore/EventHandleImpl.h
index 9ed841b8c0..1c6bc52f9f 100644
--- a/cpp/src/qpid/asyncStore/EventHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/EventHandleImpl.h
@@ -41,7 +41,7 @@ public:
                     const std::string& key = std::string());
     virtual ~EventHandleImpl();
     const std::string& getKey() const;
-protected:
+private:
     qpid::broker::QueueHandle& m_queueHandle;
     std::string m_key;
 };
diff --git a/cpp/src/qpid/asyncStore/MessageHandleImpl.h b/cpp/src/qpid/asyncStore/MessageHandleImpl.h
index 0907ac5e65..eb80fca2d4 100644
--- a/cpp/src/qpid/asyncStore/MessageHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/MessageHandleImpl.h
@@ -39,7 +39,7 @@ class MessageHandleImpl : public virtual qpid::RefCounted
 public:
     MessageHandleImpl(const qpid::broker::DataSource* dataSrc);
     virtual ~MessageHandleImpl();
-protected:
+private:
     const qpid::broker::DataSource* m_dataSrc;
 };
 
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.cpp b/cpp/src/qpid/asyncStore/OperationQueue.cpp
index a455e445ab..4eabf82004 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.cpp
+++ b/cpp/src/qpid/asyncStore/OperationQueue.cpp
@@ -46,13 +46,13 @@ OperationQueue::submit(boost::shared_ptr<const AsyncOperation> op)
     m_opQueue.push(op);
 }
 
-// protected
+// private
 OperationQueue::OpQueue::Batch::const_iterator
 OperationQueue::handle(const OperationQueue::OpQueue::Batch& e)
 {
     for (OpQueue::Batch::const_iterator i = e.begin(); i != e.end(); ++i) {
 //std::cout << "<-- OperationQueue::handle() Op=" << (*i)->getOpStr() << std::endl << std::flush;
-        boost::shared_ptr<qpid::broker::BrokerAsyncContext> bc = (*i)->m_brokerCtxt;
+        boost::shared_ptr<qpid::broker::BrokerAsyncContext> bc = (*i)->getBrokerContext();
         if (bc) {
             qpid::broker::AsyncResultQueue* const arq = bc->getAsyncResultQueue();
             if (arq) {
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.h b/cpp/src/qpid/asyncStore/OperationQueue.h
index 23f1c0ee13..d2bd5d0f26 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.h
+++ b/cpp/src/qpid/asyncStore/OperationQueue.h
@@ -39,7 +39,7 @@ public:
     virtual ~OperationQueue();
     void submit(boost::shared_ptr<const AsyncOperation> op);
 
-protected:
+private:
     typedef qpid::sys::PollableQueue<boost::shared_ptr<const AsyncOperation> > OpQueue;
     OpQueue m_opQueue;
 
diff --git a/cpp/src/qpid/asyncStore/Plugin.h b/cpp/src/qpid/asyncStore/Plugin.h
index cbb0bfdadb..7cf500a122 100644
--- a/cpp/src/qpid/asyncStore/Plugin.h
+++ b/cpp/src/qpid/asyncStore/Plugin.h
@@ -40,7 +40,7 @@ public:
     virtual void initialize(Target& target);
     void finalize();
     virtual qpid::Options* getOptions();
-protected:
+private:
     boost::shared_ptr<qpid::asyncStore::AsyncStoreImpl> m_store;
     qpid::asyncStore::AsyncStoreOptions m_options;
 };
diff --git a/cpp/src/qpid/asyncStore/QueueHandleImpl.h b/cpp/src/qpid/asyncStore/QueueHandleImpl.h
index 9046a33877..a8a1862554 100644
--- a/cpp/src/qpid/asyncStore/QueueHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/QueueHandleImpl.h
@@ -41,7 +41,7 @@ public:
 
     const std::string& getName() const;
 
-protected:
+private:
     const std::string m_name;
     const qpid::types::Variant::Map& m_opts;
 
diff --git a/cpp/src/qpid/asyncStore/RunState.cpp b/cpp/src/qpid/asyncStore/RunState.cpp
index 3605a0c2e1..737d8eb367 100644
--- a/cpp/src/qpid/asyncStore/RunState.cpp
+++ b/cpp/src/qpid/asyncStore/RunState.cpp
@@ -105,6 +105,7 @@ RunState::s_toStr(const RunState_t s)
     }
 }
 
+// private
 void
 RunState::set(const RunState_t s)
 {
diff --git a/cpp/src/qpid/asyncStore/RunState.h b/cpp/src/qpid/asyncStore/RunState.h
index 959e47449d..dfa331ea1a 100644
--- a/cpp/src/qpid/asyncStore/RunState.h
+++ b/cpp/src/qpid/asyncStore/RunState.h
@@ -73,7 +73,7 @@ public:
     void setStopped();
     virtual const char* getAsStr() const;
     static const char* s_toStr(const RunState_t s);
-protected:
+private:
     virtual void set(const RunState_t s);
 
 };
diff --git a/cpp/src/qpid/asyncStore/TxnHandleImpl.h b/cpp/src/qpid/asyncStore/TxnHandleImpl.h
index d001fd1916..b28eb0cd4b 100644
--- a/cpp/src/qpid/asyncStore/TxnHandleImpl.h
+++ b/cpp/src/qpid/asyncStore/TxnHandleImpl.h
@@ -38,7 +38,7 @@ public:
     virtual ~TxnHandleImpl();
     const std::string& getXid() const;
     bool is2pc() const;
-protected:
+private:
     std::string m_xid;
     bool m_tpcFlag;
 };
diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
index 8c99ce8ef2..ab391146f9 100644
--- a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
+++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
@@ -45,7 +45,7 @@ AsyncResultQueueImpl::submit(boost::shared_ptr<AsyncResultHandle> arh)
     m_resQueue.push(arh);
 }
 
-// protected
+// private
 AsyncResultQueueImpl::ResultQueue::Batch::const_iterator
 AsyncResultQueueImpl::handle(const ResultQueue::Batch& e)
 {
diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.h b/cpp/src/qpid/broker/AsyncResultQueueImpl.h
index fc93c2d806..01fff6a53a 100644
--- a/cpp/src/qpid/broker/AsyncResultQueueImpl.h
+++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.h
@@ -40,7 +40,7 @@ public:
     virtual ~AsyncResultQueueImpl();
     virtual void submit(boost::shared_ptr<AsyncResultHandle> arh);
 
-protected:
+private:
     typedef qpid::sys::PollableQueue<boost::shared_ptr<const AsyncResultHandle> > ResultQueue;
     ResultQueue m_resQueue;
 
diff --git a/cpp/src/qpid/broker/ConfigHandle.cpp b/cpp/src/qpid/broker/ConfigHandle.cpp
index 8d7a2f1e7d..13f7e7fa94 100644
--- a/cpp/src/qpid/broker/ConfigHandle.cpp
+++ b/cpp/src/qpid/broker/ConfigHandle.cpp
@@ -31,6 +31,7 @@ namespace broker {
 typedef qpid::messaging::PrivateImplRef<ConfigHandle> PrivateImpl;
 
 ConfigHandle::ConfigHandle(qpid::asyncStore::ConfigHandleImpl* p) :
+        qpid::messaging::Handle<qpid::asyncStore::ConfigHandleImpl>(),
         IdHandle()
 {
     PrivateImpl::ctor(*this, p);
diff --git a/cpp/src/qpid/broker/ConfigHandle.h b/cpp/src/qpid/broker/ConfigHandle.h
index 67009bf57a..52a9d672d5 100644
--- a/cpp/src/qpid/broker/ConfigHandle.h
+++ b/cpp/src/qpid/broker/ConfigHandle.h
@@ -32,7 +32,8 @@
 namespace qpid {
 namespace broker {
 
-class ConfigHandle : public qpid::messaging::Handle<qpid::asyncStore::ConfigHandleImpl>, public IdHandle
+class ConfigHandle : public qpid::messaging::Handle<qpid::asyncStore::ConfigHandleImpl>,
+                     public IdHandle
 {
 public:
     ConfigHandle(qpid::asyncStore::ConfigHandleImpl* p = 0);
diff --git a/cpp/src/qpid/broker/EnqueueHandle.cpp b/cpp/src/qpid/broker/EnqueueHandle.cpp
index 10d53c51e0..3b8e2d5b30 100644
--- a/cpp/src/qpid/broker/EnqueueHandle.cpp
+++ b/cpp/src/qpid/broker/EnqueueHandle.cpp
@@ -31,6 +31,7 @@ namespace broker {
 typedef qpid::messaging::PrivateImplRef<EnqueueHandle> PrivateImpl;
 
 EnqueueHandle::EnqueueHandle(qpid::asyncStore::EnqueueHandleImpl* p) :
+        qpid::messaging::Handle<qpid::asyncStore::EnqueueHandleImpl>(),
         IdHandle()
 {
     PrivateImpl::ctor(*this, p);
diff --git a/cpp/src/qpid/broker/EnqueueHandle.h b/cpp/src/qpid/broker/EnqueueHandle.h
index 6053d1879c..cdd07e246b 100644
--- a/cpp/src/qpid/broker/EnqueueHandle.h
+++ b/cpp/src/qpid/broker/EnqueueHandle.h
@@ -32,7 +32,8 @@
 namespace qpid {
 namespace broker {
 
-class EnqueueHandle : public qpid::messaging::Handle<qpid::asyncStore::EnqueueHandleImpl>, public IdHandle
+class EnqueueHandle : public qpid::messaging::Handle<qpid::asyncStore::EnqueueHandleImpl>,
+                      public IdHandle
 {
 public:
     EnqueueHandle(qpid::asyncStore::EnqueueHandleImpl* p = 0);
diff --git a/cpp/src/qpid/broker/EventHandle.cpp b/cpp/src/qpid/broker/EventHandle.cpp
index 09f0ef0b28..97d5920837 100644
--- a/cpp/src/qpid/broker/EventHandle.cpp
+++ b/cpp/src/qpid/broker/EventHandle.cpp
@@ -31,6 +31,7 @@ namespace broker {
 typedef qpid::messaging::PrivateImplRef<EventHandle> PrivateImpl;
 
 EventHandle::EventHandle(qpid::asyncStore::EventHandleImpl* p) :
+        qpid::messaging::Handle<qpid::asyncStore::EventHandleImpl>(),
         IdHandle()
 {
     PrivateImpl::ctor(*this, p);
diff --git a/cpp/src/qpid/broker/EventHandle.h b/cpp/src/qpid/broker/EventHandle.h
index 8ded98be4a..20e7773502 100644
--- a/cpp/src/qpid/broker/EventHandle.h
+++ b/cpp/src/qpid/broker/EventHandle.h
@@ -32,7 +32,8 @@
 namespace qpid {
 namespace broker {
 
-class EventHandle : public qpid::messaging::Handle<qpid::asyncStore::EventHandleImpl>, public IdHandle
+class EventHandle : public qpid::messaging::Handle<qpid::asyncStore::EventHandleImpl>,
+                    public IdHandle
 {
 public:
     EventHandle(qpid::asyncStore::EventHandleImpl* p = 0);
diff --git a/cpp/src/qpid/broker/IdHandle.cpp b/cpp/src/qpid/broker/IdHandle.cpp
index 07bd49293d..ebb8f9a3c6 100644
--- a/cpp/src/qpid/broker/IdHandle.cpp
+++ b/cpp/src/qpid/broker/IdHandle.cpp
@@ -26,9 +26,6 @@
 namespace qpid {
 namespace broker {
 
-IdHandle::IdHandle()
-{}
-
 IdHandle::~IdHandle()
 {}
 
diff --git a/cpp/src/qpid/broker/IdHandle.h b/cpp/src/qpid/broker/IdHandle.h
index e28d9472be..ddf94a2396 100644
--- a/cpp/src/qpid/broker/IdHandle.h
+++ b/cpp/src/qpid/broker/IdHandle.h
@@ -29,7 +29,6 @@ namespace broker {
 
 class IdHandle {
 public:
-    IdHandle();
     virtual ~IdHandle();
 };
 
diff --git a/cpp/src/qpid/broker/TxnHandle.cpp b/cpp/src/qpid/broker/TxnHandle.cpp
index 4ba41c4cbd..1e6cd2ac6f 100644
--- a/cpp/src/qpid/broker/TxnHandle.cpp
+++ b/cpp/src/qpid/broker/TxnHandle.cpp
@@ -31,6 +31,7 @@ namespace broker {
 typedef qpid::messaging::PrivateImplRef<TxnHandle> PrivateImpl;
 
 TxnHandle::TxnHandle(qpid::asyncStore::TxnHandleImpl* p) :
+        qpid::messaging::Handle<qpid::asyncStore::TxnHandleImpl>(),
         IdHandle()
 {
     PrivateImpl::ctor(*this, p);
diff --git a/cpp/src/qpid/broker/TxnHandle.h b/cpp/src/qpid/broker/TxnHandle.h
index 5981b89026..34a9c69434 100644
--- a/cpp/src/qpid/broker/TxnHandle.h
+++ b/cpp/src/qpid/broker/TxnHandle.h
@@ -32,7 +32,8 @@
 namespace qpid {
 namespace broker {
 
-class TxnHandle : public qpid::messaging::Handle<qpid::asyncStore::TxnHandleImpl>, public IdHandle
+class TxnHandle : public qpid::messaging::Handle<qpid::asyncStore::TxnHandleImpl>,
+                  public IdHandle
 {
 public:
     TxnHandle(qpid::asyncStore::TxnHandleImpl* p = 0);
diff --git a/cpp/src/tests/storePerftools/asyncPerf/AtomicCounter.h b/cpp/src/tests/storePerftools/asyncPerf/AtomicCounter.h
index b777234616..d354c729dc 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/AtomicCounter.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/AtomicCounter.h
@@ -77,7 +77,7 @@ public:
         }
     }
 
-protected:
+private:
     T m_cnt;
     mutable qpid::sys::Mutex m_cntMutex;
     qpid::sys::Condition m_cntCondition;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h b/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h
index 11da0d80bd..6b41ad9181 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h
@@ -49,7 +49,7 @@ public:
     boost::shared_ptr<MockPersistableQueue> getQueue() const;
     void destroy();
 
-protected:
+private:
     boost::shared_ptr<MockPersistableMessage> m_msg;
     const qpid::asyncStore::AsyncOperation::opCode m_op;
     boost::shared_ptr<MockPersistableQueue> m_q;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h
index 30305fbe1a..f11b605244 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h
@@ -42,7 +42,7 @@ public:
 
     void* runConsumers();
     static void* startConsumers(void* ptr);
-protected:
+private:
     const TestOptions& m_perfTestParams;
     boost::shared_ptr<MockPersistableQueue> m_queue;
 };
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.h b/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.h
index 93ca099923..75f422779e 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.h
@@ -48,7 +48,7 @@ public:
     uint32_t size();
     bool push(const QueuedMessage& added, QueuedMessage& removed);
     bool consume(QueuedMessage& msg);
-protected:
+private:
     std::deque<QueuedMessage> m_messages;
     qpid::sys::Mutex m_msgMutex;
 
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h
index 1b1f9b63fd..5cb6d7c5f8 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h
@@ -50,7 +50,7 @@ public:
     virtual ~MessageProducer();
     void* runProducers();
     static void* startProducers(void* ptr);
-protected:
+private:
     const TestOptions& m_perfTestParams;
     const char* m_msgData;
     qpid::asyncStore::AsyncStoreImpl* m_store;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.h b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.h
index fc1c3ee47a..abaa93d3e3 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.h
@@ -67,7 +67,7 @@ public:
     virtual uint64_t getSize();
     virtual void write(char* target);
 
-protected:
+private:
     mutable uint64_t m_persistenceId;
     const std::string m_msg;
     qpid::broker::MessageHandle m_msgHandle;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.cpp b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.cpp
index 1106069560..4b22d63fe4 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.cpp
@@ -160,7 +160,6 @@ MockPersistableQueue::deliver(boost::shared_ptr<MockPersistableMessage> msg)
 {
     QueuedMessage qm(this, msg);
     if(enqueue((MockTransactionContext*)0, qm)) {
-        // TODO: Do we need to wait for the enqueue to complete before push()ing the msg?
         push(qm);
     }
 }
@@ -315,7 +314,7 @@ MockPersistableQueue::ScopedUse::~ScopedUse()
     }
 }
 
-// protected
+// private
 void
 MockPersistableQueue::push(QueuedMessage& qm,
                            bool /*isRecovery*/)
@@ -326,7 +325,7 @@ MockPersistableQueue::push(QueuedMessage& qm,
 
 // --- End Members & methods in msg handling path from qpid::Queue ---
 
-// protected
+// private
 bool
 MockPersistableQueue::asyncEnqueue(MockTransactionContext* txn,
                                    QueuedMessage& qm)
@@ -345,7 +344,7 @@ MockPersistableQueue::asyncEnqueue(MockTransactionContext* txn,
     return true;
 }
 
-// protected
+// private
 bool
 MockPersistableQueue::asyncDequeue(MockTransactionContext* txn,
                                    QueuedMessage& qm)
@@ -363,7 +362,7 @@ MockPersistableQueue::asyncDequeue(MockTransactionContext* txn,
     return true;
 }
 
-// protected
+// private
 void
 MockPersistableQueue::destroyCheck(const std::string& opDescr) const
 {
@@ -374,7 +373,7 @@ MockPersistableQueue::destroyCheck(const std::string& opDescr) const
     }
 }
 
-// protected
+// private
 void
 MockPersistableQueue::createComplete(const boost::shared_ptr<QueueAsyncContext> qc)
 {
@@ -383,7 +382,7 @@ MockPersistableQueue::createComplete(const boost::shared_ptr<QueueAsyncContext>
     --m_asyncOpCounter;
 }
 
-// protected
+// private
 void
 MockPersistableQueue::flushComplete(const boost::shared_ptr<QueueAsyncContext> qc)
 {
@@ -392,7 +391,7 @@ MockPersistableQueue::flushComplete(const boost::shared_ptr<QueueAsyncContext> q
     --m_asyncOpCounter;
 }
 
-// protected
+// private
 void
 MockPersistableQueue::destroyComplete(const boost::shared_ptr<QueueAsyncContext> qc)
 {
@@ -402,6 +401,7 @@ MockPersistableQueue::destroyComplete(const boost::shared_ptr<QueueAsyncContext>
     m_destroyed = true;
 }
 
+// private
 void
 MockPersistableQueue::enqueueComplete(const boost::shared_ptr<QueueAsyncContext> qc)
 {
@@ -410,6 +410,7 @@ MockPersistableQueue::enqueueComplete(const boost::shared_ptr<QueueAsyncContext>
     --m_asyncOpCounter;
 }
 
+// private
 void
 MockPersistableQueue::dequeueComplete(const boost::shared_ptr<QueueAsyncContext> qc)
 {
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.h b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.h
index bb68015b95..860d98b867 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.h
@@ -98,7 +98,7 @@ public:
     virtual uint64_t getSize();
     virtual void write(char* target);
 
-protected:
+private:
     const std::string m_name;
     qpid::asyncStore::AsyncStoreImpl* m_store;
     qpid::broker::AsyncResultQueue& m_resultQueue;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.cpp b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.cpp
index 0ac0c7732f..7e0db4a154 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.cpp
@@ -181,7 +181,7 @@ MockTransactionContext::commit()
 }
 
 
-// protected
+// private
 void
 MockTransactionContext::localPrepare()
 {
@@ -193,7 +193,7 @@ MockTransactionContext::localPrepare()
 //std::cout << "*TXN* localPrepare: xid=" << m_txnHandle.getXid() << "; 2PC=" << (m_txnHandle.is2pc()?"T":"F") << std::endl;
 }
 
-// protected
+// private
 void
 MockTransactionContext::setLocalXid()
 {
@@ -206,7 +206,7 @@ MockTransactionContext::setLocalXid()
     m_xid.assign(uuidStr);
 }
 
-// protected
+// private
 void
 MockTransactionContext::prepareComplete(const TransactionAsyncContext* /*tc*/)
 {
@@ -220,7 +220,7 @@ MockTransactionContext::prepareComplete(const TransactionAsyncContext* /*tc*/)
 }
 
 
-// protected
+// private
 void
 MockTransactionContext::abortComplete(const TransactionAsyncContext* tc)
 {
@@ -229,7 +229,7 @@ MockTransactionContext::abortComplete(const TransactionAsyncContext* tc)
 }
 
 
-// protected
+// private
 void
 MockTransactionContext::commitComplete(const TransactionAsyncContext* tc)
 {
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.h b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.h
index d727caede6..c57a37e084 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.h
@@ -66,7 +66,7 @@ public:
     void abort();
     void commit();
 
-protected:
+private:
     std::string m_xid;
     bool m_tpcFlag;
     qpid::asyncStore::AsyncStoreImpl* m_store;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
index 09518c7c61..0c91b29a1e 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
@@ -67,42 +67,6 @@ PerfTest::~PerfTest()
 }
 
 void
-PerfTest::prepareStore()
-{
-    m_store = new qpid::asyncStore::AsyncStoreImpl(m_poller, m_storeOpts);
-    m_store->initialize();
-}
-
-void
-PerfTest::destroyStore()
-{
-    if (m_store) {
-        delete m_store;
-    }
-}
-
-void
-PerfTest::prepareQueues()
-{
-    for (uint16_t i = 0; i < m_testOpts.m_numQueues; ++i) {
-        std::ostringstream qname;
-        qname << "queue_" << std::setw(4) << std::setfill('0') << i;
-        boost::shared_ptr<MockPersistableQueue> mpq(new MockPersistableQueue(qname.str(), m_queueArgs, m_store, m_resultQueue));
-        mpq->asyncCreate();
-        m_queueList.push_back(mpq);
-    }
-}
-
-void
-PerfTest::destroyQueues()
-{
-    while (m_queueList.size() > 0) {
-        m_queueList.front()->asyncDestroy(m_testOpts.m_destroyQueuesOnCompletion);
-        m_queueList.pop_front();
-    }
-}
-
-void
 PerfTest::run()
 {
     if (m_testOpts.m_durable) {
@@ -150,6 +114,46 @@ PerfTest::toStream(std::ostream& os) const
     os << m_testResult << std::endl;
 }
 
+// private
+void
+PerfTest::prepareStore()
+{
+    m_store = new qpid::asyncStore::AsyncStoreImpl(m_poller, m_storeOpts);
+    m_store->initialize();
+}
+
+// private
+void
+PerfTest::destroyStore()
+{
+    if (m_store) {
+        delete m_store;
+    }
+}
+
+// private
+void
+PerfTest::prepareQueues()
+{
+    for (uint16_t i = 0; i < m_testOpts.m_numQueues; ++i) {
+        std::ostringstream qname;
+        qname << "queue_" << std::setw(4) << std::setfill('0') << i;
+        boost::shared_ptr<MockPersistableQueue> mpq(new MockPersistableQueue(qname.str(), m_queueArgs, m_store, m_resultQueue));
+        mpq->asyncCreate();
+        m_queueList.push_back(mpq);
+    }
+}
+
+// private
+void
+PerfTest::destroyQueues()
+{
+    while (m_queueList.size() > 0) {
+        m_queueList.front()->asyncDestroy(m_testOpts.m_destroyQueuesOnCompletion);
+        m_queueList.pop_front();
+    }
+}
+
 }}} // namespace tests::storePerftools::asyncPerf
 
 // -----------------------------------------------------------------
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
index 651d97f9fc..8957d05792 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
@@ -62,7 +62,7 @@ public:
     void run();
     void toStream(std::ostream& os = std::cout) const;
 
-protected:
+private:
     const TestOptions& m_testOpts;
     const qpid::asyncStore::AsyncStoreOptions& m_storeOpts;
     TestResult m_testResult;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h b/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h
index ab68b6b39f..b7a2205307 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h
@@ -60,7 +60,7 @@ public:
     void invokeCallback(const qpid::broker::AsyncResultHandle* const arh) const;
     void destroy();
 
-protected:
+private:
     boost::shared_ptr<MockPersistableQueue> m_q;
     boost::shared_ptr<MockPersistableMessage> m_msg;
     const qpid::asyncStore::AsyncOperation::opCode m_op;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
index 9ad67cc925..f7b44e046b 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
@@ -47,7 +47,8 @@ public:
     boost::shared_ptr<MockPersistableMessage> payload() const;
     const qpid::broker::EnqueueHandle& enqHandle() const;
     qpid::broker::EnqueueHandle& enqHandle();
-protected:
+
+private:
     MockPersistableQueue* m_queue;
     boost::shared_ptr<MockPersistableMessage> m_msg;
     qpid::broker::EnqueueHandle m_enqHandle;
diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
index dccfc4fcbf..8c1f2976bf 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
@@ -75,6 +75,7 @@ TestOptions::printVals(std::ostream& os) const
     os << "      Destroy queues on test completion [--destroy-queues]: " << (m_destroyQueuesOnCompletion ? "true" : "false") << std::endl;
 }
 
+// private
 void
 TestOptions::doAddOptions()
 {
diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.h b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.h
index b7e1c0a7a8..fa28bf4947 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.h
@@ -52,7 +52,7 @@ public:
     bool m_durable;                                 ///< Use durable queues and messages for test
     bool m_destroyQueuesOnCompletion;               ///< Destroy durable queues on completion of test
 
-protected:
+private:
     static uint16_t s_defaultEnqTxnBlkSize;         ///< Default transaction block size for enqueues
     static uint16_t s_defaultDeqTxnBlkSize;         ///< Default transaction block size for dequeues
     static bool s_defaultDurable;                   ///< Default flag for using durable queues and messages for test
diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestResult.h b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
index dc491b074d..b2ad49daf7 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
@@ -81,7 +81,7 @@ public:
      */
     void toStream(std::ostream& os = std::cout) const;
 
-protected:
+private:
     TestOptions m_testOpts;     ///< Test parameters used for performance calculations
 
 };
diff --git a/cpp/src/tests/storePerftools/asyncPerf/TransactionAsyncContext.h b/cpp/src/tests/storePerftools/asyncPerf/TransactionAsyncContext.h
index 2b4f189f41..b1e74d6844 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/TransactionAsyncContext.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/TransactionAsyncContext.h
@@ -46,7 +46,7 @@ public:
     boost::shared_ptr<MockTransactionContext> getTransactionContext() const;
     void destroy();
 
-protected:
+private:
     boost::shared_ptr<MockTransactionContext> m_tc;
     const qpid::asyncStore::AsyncOperation::opCode m_op;
 };
diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.cpp b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
index 5bb61b6519..9edf384b07 100644
--- a/cpp/src/tests/storePerftools/common/PerftoolError.cpp
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
@@ -131,7 +131,7 @@ PerftoolError::toStream(std::ostream& os) const
     os << what();
 }
 
-// protected
+// private
 void
 PerftoolError::formatWhatStr() throw ()
 {
@@ -162,14 +162,14 @@ PerftoolError::formatWhatStr() throw ()
     } catch (...) {}
 }
 
-// protected
+// private
 const char*
 PerftoolError::className()
 {
     return s_className;
 }
 
-//static
+// private static
 const char* PerftoolError::s_className = "PerftoolError";
 
 // --- Static definitions ---
@@ -190,7 +190,7 @@ PerftoolError::s_errorMessage(const uint32_t err_no) throw ()
     return s_errorMapIterator->second;
 }
 
-// protected static
+// private static
 bool
 PerftoolError::s_initialize()
 {
diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.h b/cpp/src/tests/storePerftools/common/PerftoolError.h
index d4740f8d1d..913bbbb7be 100644
--- a/cpp/src/tests/storePerftools/common/PerftoolError.h
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.h
@@ -97,7 +97,7 @@ public:
     static const char* s_errorMessage(const uint32_t err_no) throw ();
 
 
-protected:
+private:
     uint32_t m_errCode;                                 ///< Error or failure code, taken from JournalErrors.
     std::string m_errMsg;                               ///< Additional information pertaining to the error or failure.
     std::string m_throwingClass;                        ///< Name of the class throwing the error.
@@ -113,7 +113,6 @@ protected:
     static errorMap_t s_errorMap;                       ///< Map of error messages
     static errorMapCitr_t s_errorMapIterator;           ///< Const iterator
 
-private:
     static const char* s_className;                     ///< Name of this class, used in formatting error messages.
     static bool s_initializedFlag;                      ///< Dummy flag, used to initialize map.
 
diff --git a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
index 8312174cad..143588941c 100644
--- a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
+++ b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
@@ -48,7 +48,7 @@ ScopedTimer::~ScopedTimer()
     m_elapsed = _s_getDoubleTime(stopTime) - _s_getDoubleTime(m_startTime);
 }
 
-// static
+// private static
 double ScopedTimer::_s_getDoubleTime(const ::timespec& ts)
 {
     return ts.tv_sec + (double(ts.tv_nsec) / 1e9);
diff --git a/cpp/src/tests/storePerftools/common/ScopedTimer.h b/cpp/src/tests/storePerftools/common/ScopedTimer.h
index dd056cf726..063f7d35dc 100644
--- a/cpp/src/tests/storePerftools/common/ScopedTimer.h
+++ b/cpp/src/tests/storePerftools/common/ScopedTimer.h
@@ -70,7 +70,7 @@ public:
      */
     virtual ~ScopedTimer();
 
-protected:
+private:
     double& m_elapsed;      ///< Ref to elapsed time, will be written on destruction of ScopedTimer instances
     ::timespec m_startTime; ///< Start time, set on construction
 
diff --git a/cpp/src/tests/storePerftools/common/TestOptions.cpp b/cpp/src/tests/storePerftools/common/TestOptions.cpp
index 39e3434a6c..5e72fafc6f 100644
--- a/cpp/src/tests/storePerftools/common/TestOptions.cpp
+++ b/cpp/src/tests/storePerftools/common/TestOptions.cpp
@@ -83,6 +83,7 @@ TestOptions::validate()
     }
 }
 
+// private
 void
 TestOptions::doAddOptions()
 {
diff --git a/cpp/src/tests/storePerftools/common/TestOptions.h b/cpp/src/tests/storePerftools/common/TestOptions.h
index 217e0ca2f9..d673790786 100644
--- a/cpp/src/tests/storePerftools/common/TestOptions.h
+++ b/cpp/src/tests/storePerftools/common/TestOptions.h
@@ -50,7 +50,7 @@ public:
     uint16_t m_numEnqThreadsPerQueue;               ///< Number of enqueue threads per queue
     uint16_t m_numDeqThreadsPerQueue;               ///< Number of dequeue threads per queue
 
-protected:
+private:
     static uint32_t s_defaultNumMsgs;               ///< Default number of messages to be sent
     static uint32_t s_defaultMsgSize;               ///< Default message size in bytes
     static uint16_t s_defaultNumQueues;             ///< Default number of queues to test simultaneously
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/Journal.h b/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
index acf1e43486..4803e4ecf6 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
@@ -153,7 +153,7 @@ public:
      */
     void X_AIO_RD_CALLBACK(std::vector<uint16_t>& buffPageCtrlBlkIndexList);
 
-protected:
+private:
     const uint32_t m_numMsgs;                       ///< Number of messages to be processed by this journal instance
     const uint32_t m_msgSize;                       ///< Size of each message (in bytes)
     const char* m_msgData;                          ///< Pointer to message content to be used for each message.
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
index 9e322686ca..ba7c95e821 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
@@ -71,6 +71,7 @@ PerfTest::~PerfTest()
     delete[] m_msgData;
 }
 
+// private
 void
 PerfTest::prepareJournals(std::vector<Journal*>& jrnlList)
 {
@@ -111,6 +112,7 @@ PerfTest::prepareJournals(std::vector<Journal*>& jrnlList)
     }
 }
 
+// private
 void
 PerfTest::destroyJournals(std::vector<Journal*>& jrnlList)
 {
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.h b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.h
index d713cb837f..3db512d3db 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.h
@@ -77,7 +77,7 @@ public:
      */
     void toStream(std::ostream& os = std::cout) const;
 
-protected:
+private:
     const tests::storePerftools::common::TestParameters& m_testParams; ///< Ref to a struct containing test params
     const JournalParameters& m_jrnlParams;      ///< Ref to a struct containing the journal parameters
     TestResult m_testResult;                    ///< Journal performance object
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/TestResult.h b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.h
index 620a7dcedd..518a342a55 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/TestResult.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.h
@@ -82,7 +82,7 @@ public:
      */
     void toStream(std::ostream& os = std::cout) const;
 
-protected:
+private:
     tests::storePerftools::common::TestParameters m_testParams; ///< Test parameters used for performance calculations
 
 };