1 files changed, 16 insertions, 6 deletions

diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp b/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
index efe454c5be..889ee9ff75 100644
--- a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
+++ b/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
@@ -105,7 +105,7 @@ namespace Rdma {
     }
 
     QueuePair::QueuePair(boost::shared_ptr< ::rdma_cm_id > i) :
-        qpid::sys::IOHandle(new qpid::sys::IOHandlePrivate),
+        handle(new qpid::sys::IOHandle),
         pd(allocPd(i->verbs)),
         cchannel(mkCChannel(i->verbs)),
         scq(mkCq(i->verbs, DEFAULT_CQ_ENTRIES, 0, cchannel.get())),
@@ -113,7 +113,7 @@ namespace Rdma {
         outstandingSendEvents(0),
         outstandingRecvEvents(0)
     {
-        impl->fd = cchannel->fd;
+        handle->fd = cchannel->fd;
 
         // Set cq context to this QueuePair object so we can find
         // ourselves again
@@ -163,6 +163,11 @@ namespace Rdma {
         // The buffers vectors automatically deletes all the buffers we've allocated
     }
 
+    QueuePair::operator qpid::sys::IOHandle&() const
+    {
+        return *handle;
+    }
+
     // Create buffers to use for writing
     void QueuePair::createSendBuffers(int sendBufferCount, int bufferSize, int reserved)
     {
@@ -359,11 +364,11 @@ namespace Rdma {
     // Wrap the passed in rdma_cm_id with a Connection
     // this basically happens only on connection request
     Connection::Connection(::rdma_cm_id* i) :
-        qpid::sys::IOHandle(new qpid::sys::IOHandlePrivate),
+        handle(new qpid::sys::IOHandle),
         id(mkId(i)),
         context(0)
     {
-        impl->fd = id->channel->fd;
+        handle->fd = id->channel->fd;
 
         // Just overwrite the previous context as it will
         // have come from the listening connection
@@ -372,12 +377,12 @@ namespace Rdma {
     }
 
     Connection::Connection() :
-        qpid::sys::IOHandle(new qpid::sys::IOHandlePrivate),
+        handle(new qpid::sys::IOHandle),
         channel(mkEChannel()),
         id(mkId(channel.get(), this, RDMA_PS_TCP)),
         context(0)
     {
-        impl->fd = channel->fd;
+        handle->fd = channel->fd;
     }
 
     Connection::~Connection() {
@@ -385,6 +390,11 @@ namespace Rdma {
         id->context = 0;
     }
 
+    Connection::operator qpid::sys::IOHandle&() const
+    {
+        return *handle;
+    }
+
     void Connection::ensureQueuePair() {
         assert(id.get());