1 files changed, 8 insertions, 13 deletions

diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.h b/cpp/src/qpid/asyncStore/AsyncOperation.h
index 998d03955e..24f8baeb4d 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.h
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.h
@@ -50,34 +50,29 @@ public:
     AsyncOperation();
     AsyncOperation(const opCode op,
                    const qpid::broker::IdHandle* th,
-                   const qpid::broker::ResultCallback resCb,
-                   qpid::broker::BrokerAsyncContext* brokerCtxt);
+                   boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt);
     AsyncOperation(const opCode op,
                    const qpid::broker::IdHandle* th,
-                   const qpid::broker::DataSource* dataSrc,
-                   const qpid::broker::ResultCallback resCb,
-                   qpid::broker::BrokerAsyncContext* brokerCtxt);
+                   const qpid::broker::DataSource* const dataSrc,
+                   boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt);
     AsyncOperation(const opCode op,
                    const qpid::broker::IdHandle* th,
                    const qpid::broker::TxnHandle* txnHandle,
-                   const qpid::broker::ResultCallback resCb,
-                   qpid::broker::BrokerAsyncContext* brokerCtxt);
+                   boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt);
     AsyncOperation(const opCode op,
                    const qpid::broker::IdHandle* th,
-                   const qpid::broker::DataSource* dataSrc,
+                   const qpid::broker::DataSource* const dataSrc,
                    const qpid::broker::TxnHandle* txnHandle,
-                   const qpid::broker::ResultCallback resCb,
-                   qpid::broker::BrokerAsyncContext* brokerCtxt);
+                   boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt);
     virtual ~AsyncOperation();
     const char* getOpStr() const;
     static const char* getOpStr(const opCode op);
 
     opCode m_op;
     const qpid::broker::IdHandle* m_targetHandle;
-    const qpid::broker::DataSource* m_dataSrc;
+    const qpid::broker::DataSource* const m_dataSrc;
     const qpid::broker::TxnHandle* m_txnHandle;
-    const qpid::broker::ResultCallback m_resCb;
-    qpid::broker::BrokerAsyncContext* m_brokerCtxt;
+    boost::shared_ptr<qpid::broker::BrokerAsyncContext> const m_brokerCtxt;
 };
 
 }} // namespace qpid::asyncStore