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, 6 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/QueueHandle.cpp b/cpp/src/qpid/broker/QueueHandle.cpp
index 780eb6395c..5a5678df5a 100644
--- a/cpp/src/qpid/broker/QueueHandle.cpp
+++ b/cpp/src/qpid/broker/QueueHandle.cpp
@@ -23,22 +23,23 @@
 
 #include "QueueHandle.h"
 
-#include "qpid/messaging/PrivateImplRef.h"
+#include "PrivateImplRef.h"
+
+#include "qpid/asyncStore/QueueHandleImpl.h"
 
 namespace qpid {
 namespace broker {
 
-typedef qpid::messaging::PrivateImplRef<QueueHandle> PrivateImpl;
+typedef PrivateImplRef<QueueHandle> PrivateImpl;
 
 QueueHandle::QueueHandle(qpid::asyncStore::QueueHandleImpl* p) :
-        IdHandle()
+        Handle<qpid::asyncStore::QueueHandleImpl>()
 {
     PrivateImpl::ctor(*this, p);
 }
 
 QueueHandle::QueueHandle(const QueueHandle& r) :
-        qpid::messaging::Handle<qpid::asyncStore::QueueHandleImpl>(),
-        IdHandle()
+        Handle<qpid::asyncStore::QueueHandleImpl>()
 {
     PrivateImpl::copy(*this, r);
 }