12 files changed, 14 insertions, 10 deletions
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);