summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/CommunicatorI.h
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-12-18 14:48:29 -0500
committerJoe George <joe@zeroc.com>2015-12-18 14:48:29 -0500
commit3c07e69ea17223c7d5a8449ec9bb75d9bba40e07 (patch)
tree6101376459c3f62f9fe4dcbb7819729667209191 /cpp/src/Ice/CommunicatorI.h
parentC++11 Ice/ami test hangs on OS X (diff)
downloadice-3c07e69ea17223c7d5a8449ec9bb75d9bba40e07.tar.bz2
ice-3c07e69ea17223c7d5a8449ec9bb75d9bba40e07.tar.xz
ice-3c07e69ea17223c7d5a8449ec9bb75d9bba40e07.zip
ICE-6903 - "async" metadata changes
- Rename "async" metadata to "async-oneway" - Update C++11 mapping for "async-oneway".
Diffstat (limited to 'cpp/src/Ice/CommunicatorI.h')
-rw-r--r--cpp/src/Ice/CommunicatorI.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 277d573b04b..173effb3beb 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -75,10 +75,8 @@ public:
#ifdef ICE_CPP11_MAPPING
virtual ::std::function<void ()>
- flushBatchRequests_async(
- ::std::function<void ()> completed,
- ::std::function<void (std::exception_ptr)> exception = nullptr,
- ::std::function<void (bool)> sent = nullptr);
+ flushBatchRequests_async(::std::function<void (::std::exception_ptr)> exception,
+ ::std::function<void (bool)> sent);
#else
virtual AsyncResultPtr begin_flushBatchRequests();
virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0);