summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
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/ConnectionI.cpp
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/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index a824fbf0107..f8b9475fd1b 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -815,22 +815,22 @@ Ice::ConnectionI::flushBatchRequests()
#ifdef ICE_CPP11_MAPPING
function<void ()>
-Ice::ConnectionI::flushBatchRequests_async(function<void ()>, function<void (exception_ptr)> exception,
- function<void (bool)> sent)
+Ice::ConnectionI::flushBatchRequests_async(function<void (exception_ptr)> exception,
+ function<void (bool)> sent)
{
class FlushBatchRequestsCallback : public CallbackBase
{
public:
-
+
FlushBatchRequestsCallback(function<void (exception_ptr)> exception,
- function<void (bool)> sent,
+ function<void (bool)> sent,
shared_ptr<Connection> connection) :
_exception(move(exception)),
_sent(move(sent)),
_connection(move(connection))
{
}
-
+
virtual void sent(const AsyncResultPtr& result) const
{
try
@@ -842,19 +842,19 @@ Ice::ConnectionI::flushBatchRequests_async(function<void ()>, function<void (exc
{
_exception(current_exception());
}
-
+
if(_sent)
{
_sent(result->sentSynchronously());
}
}
-
+
virtual bool hasSentCallback() const
{
return true;
}
-
+
virtual void
completed(const ::Ice::AsyncResultPtr& result) const
{
@@ -875,9 +875,9 @@ Ice::ConnectionI::flushBatchRequests_async(function<void ()>, function<void (exc
function<void (bool)> _sent;
shared_ptr<Connection> _connection;
};
-
+
auto self = dynamic_pointer_cast<ConnectionI>(shared_from_this());
-
+
auto result = make_shared<ConnectionFlushBatchAsync>(self, _communicator, _instance, __flushBatchRequests_name,
make_shared<FlushBatchRequestsCallback>(move(exception), move(sent), self));
result->invoke();