Added support for invocation timeouts and ACM heartbeats

1 files changed, 10 insertions, 6 deletions

diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index d1319dc5df5..d1832427550 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -41,11 +41,11 @@ public:
     virtual void finishBatchRequest(BasicStream*);
     virtual void abortBatchRequest();
 
-    virtual Ice::ConnectionI* sendRequest(Outgoing*);
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncPtr&);
+    virtual bool sendRequest(OutgoingMessageCallback*);
+    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncMessageCallbackPtr&);
 
-    virtual bool flushBatchRequests(BatchOutgoing*);
-    virtual AsyncStatus flushAsyncBatchRequests(const BatchOutgoingAsyncPtr&);
+    virtual void requestTimedOut(OutgoingMessageCallback*);
+    virtual void asyncRequestTimedOut(const OutgoingAsyncMessageCallbackPtr&);
 
     virtual Ice::ConnectionIPtr getConnection(bool);
 
@@ -64,8 +64,12 @@ private:
 
     struct Request
     {
-        OutgoingAsyncPtr out;
-        BatchOutgoingAsyncPtr batchOut;
+        Request() : out(0), os(0)
+        {
+        }
+
+        OutgoingMessageCallback* out;
+        OutgoingAsyncMessageCallbackPtr outAsync;
         BasicStream* os;
     };