summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionRequestHandler.h
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-09-03 11:01:11 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-09-03 11:01:11 -0230
commit3b0588532354adf7bf3b86e611a8ae4996bfe6ad (patch)
tree253961cb83af7bc3b1dfc7633a8f934789476cd1 /cpp/src/Ice/ConnectionRequestHandler.h
parentMore work on ICE-2400: the send log thread now uses a separate communicator t... (diff)
downloadice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.bz2
ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.tar.xz
ice-3b0588532354adf7bf3b86e611a8ae4996bfe6ad.zip
- C#, Java: Removed Outgoing, fixed generated code to make synchronous
requests using AMI. - Java: AsyncResult is now an interface. - Added --arg to allTests.py. - Fixed operations, adapterDeactivation and metrics test to work with background IO. - Added Collocated interrupt test. - Added support for batch oneway requests using AMI. - Added test in operations for batch oneway requests using AMI.
Diffstat (limited to 'cpp/src/Ice/ConnectionRequestHandler.h')
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index 234dbf5f5a6..d8d4b1f2ae5 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -34,7 +34,8 @@ public:
virtual void requestTimedOut(OutgoingMessageCallback*);
virtual void asyncRequestTimedOut(const OutgoingAsyncMessageCallbackPtr&);
- virtual Ice::ConnectionIPtr getConnection(bool);
+ virtual Ice::ConnectionIPtr getConnection();
+ virtual Ice::ConnectionIPtr waitForConnection();
private: