Fixed invocation timeouts/interrupt issues, addded AsyncResult.cancel()

1 files changed, 6 insertions, 6 deletions

diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index 095edda6123..c5bc6602766 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -42,11 +42,11 @@ public:
     virtual void finishBatchRequest(BasicStream*);
     virtual void abortBatchRequest();
 
-    virtual bool sendRequest(OutgoingMessageCallback*);
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncMessageCallbackPtr&);
+    virtual bool sendRequest(OutgoingBase*);
+    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&);
 
-    virtual void requestTimedOut(OutgoingMessageCallback*);
-    virtual void asyncRequestTimedOut(const OutgoingAsyncMessageCallbackPtr&);
+    virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
+    virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
 
     virtual Ice::ConnectionIPtr getConnection();
     virtual Ice::ConnectionIPtr waitForConnection();
@@ -69,8 +69,8 @@ private:
         {
         }
 
-        OutgoingMessageCallback* out;
-        OutgoingAsyncMessageCallbackPtr outAsync;
+        OutgoingBase* out;
+        OutgoingAsyncBasePtr outAsync;
         BasicStream* os;
     };