Author: kgiusti
Date: Tue Mar 8 22:43:53 2011
New Revision: 1079590
URL: http://svn.apache.org/viewvc?rev=1079590&view=rev
Log:
QPID-3073: fix to allow older versions of boost to compile.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/AsyncCompletion.h
qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/AsyncCompletion.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/AsyncCompletion.h?rev=1079590&r1=1079589&r2=1079590&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/AsyncCompletion.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/AsyncCompletion.h Tue Mar 8 22:43:53
2011
@@ -103,14 +103,14 @@ class AsyncCompletion
void invokeCallback(bool sync) {
qpid::sys::Mutex::ScopedLock l(callbackLock);
if (active) {
- if (callback) {
+ if (callback.get()) {
inCallback = true;
{
qpid::sys::Mutex::ScopedUnlock ul(callbackLock);
callback->completed(sync);
}
inCallback = false;
- callback.reset();
+ callback = boost::intrusive_ptr<Callback>();
callbackLock.notifyAll();
}
active = false;
@@ -192,7 +192,7 @@ class AsyncCompletion
virtual void cancel() {
qpid::sys::Mutex::ScopedLock l(callbackLock);
while (inCallback) callbackLock.wait();
- callback.reset();
+ callback = boost::intrusive_ptr<Callback>();
active = false;
}
};
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=1079590&r1=1079589&r2=1079590&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Tue Mar 8 22:43:53
2011
@@ -464,7 +464,7 @@ void SessionState::IncompleteIngressMsgX
session->completeRcvMsg(id, requiresAccept, requiresSync);
}
}
- completerContext.reset(); // ??? KAG optional ???
+ completerContext = boost::intrusive_ptr<AsyncCommandCompleter>();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
