summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/asyncStore/AsyncOperation.cpp
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2012-05-14 18:05:26 +0000
committerKim van der Riet <kpvdr@apache.org>2012-05-14 18:05:26 +0000
commit220841d24ff48f27339000e887d5465a53c39013 (patch)
tree4ea950b9e87d1c98027cb2ae1d5be4bf31cb6722 /cpp/src/qpid/asyncStore/AsyncOperation.cpp
parent22c507ad66f2101c6d3f46207344746ec3b6e36c (diff)
downloadqpid-python-220841d24ff48f27339000e887d5465a53c39013.tar.gz
QPID-3858: More restructuring: Renamed XXXContext to XXXAsyncContext for all async store context classes, also avoids name clash with TransactionContext, an existing non-async context class.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1338318 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/asyncStore/AsyncOperation.cpp')
-rw-r--r--cpp/src/qpid/asyncStore/AsyncOperation.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.cpp b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
index 87d3713b96..19b15b12d0 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
@@ -24,7 +24,6 @@
#include "AsyncOperation.h"
#include "qpid/Exception.h"
-#include "qpid/broker/BrokerContext.h" // for delete in d'tor
#include <sstream>
@@ -43,7 +42,7 @@ AsyncOperation::AsyncOperation() :
AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(0),
@@ -56,7 +55,7 @@ AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::DataSource* dataSrc,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(dataSrc),
@@ -69,7 +68,7 @@ AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::TxnHandle* txnHandle,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(0),
@@ -83,7 +82,7 @@ AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::DataSource* dataSrc,
const qpid::broker::TxnHandle* txnHandle,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(dataSrc),