summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2017-01-20 12:57:21 -0500
committerJoe George <joe@zeroc.com>2017-01-20 12:57:21 -0500
commitb3150c712a630c797ef11a1a0937b033b11f569f (patch)
tree62bdfe0318745467e6b5e662d1817ac2743b0003 /cpp
parentUpdate Ice Builder for Gradle version to 1.3.17 (diff)
downloadice-b3150c712a630c797ef11a1a0937b033b11f569f.tar.bz2
ice-b3150c712a630c797ef11a1a0937b033b11f569f.tar.xz
ice-b3150c712a630c797ef11a1a0937b033b11f569f.zip
Fix cpp11 build
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/timeout/AllTests.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index 7f8b4c9c6d4..0c708db1155 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -458,14 +458,18 @@ allTests(const Ice::CommunicatorPtr& communicator)
try
{
timeout->ice_invocationTimeout(-2)->ice_ping();
+ #ifdef ICE_CPP11_MAPPING
+ timeout->ice_invocationTimeout(-2)->ice_pingAsync()->waitForCompleted();
+ #else
timeout->ice_invocationTimeout(-2)->begin_ice_ping()->waitForCompleted();
+ #endif
}
catch(const Ice::Exception&)
{
test(false);
}
- TimeoutPrx batchTimeout = timeout->ice_batchOneway();
+ TimeoutPrxPtr batchTimeout = timeout->ice_batchOneway();
batchTimeout->ice_ping();
batchTimeout->ice_ping();
batchTimeout->ice_ping();