From c3660133a207e7179a0c5f27e44cf1e2c7cf936a Mon Sep 17 00:00:00 2001
From: Kenneth Anthony Giusti <kgiusti@apache.org>
Date: Tue, 8 Mar 2011 22:43:53 +0000
Subject: QPID-3073: fix to allow older versions of boost to compile.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1079590 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/AsyncCompletion.h | 6 +++---
 cpp/src/qpid/broker/SessionState.cpp  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/qpid/broker/AsyncCompletion.h b/cpp/src/qpid/broker/AsyncCompletion.h
index 3190861e14..fef994438f 100644
--- a/cpp/src/qpid/broker/AsyncCompletion.h
+++ b/cpp/src/qpid/broker/AsyncCompletion.h
@@ -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;
     }
 };
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index 1ed3277aae..18dbf63487 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -464,7 +464,7 @@ void SessionState::IncompleteIngressMsgXfer::completed(bool sync)
             session->completeRcvMsg(id, requiresAccept, requiresSync);
         }
     }
-    completerContext.reset();  // ??? KAG optional ???
+    completerContext = boost::intrusive_ptr<AsyncCommandCompleter>();
 }
 
 
-- 
cgit v1.2.1