diff options
78 files changed, 2206 insertions, 2064 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 150b8be12ff..a3b11f6ebce 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -183,10 +183,10 @@ class ICE_API BlobjectAsync : public virtual Object public: #ifdef ICE_CPP11_MAPPING - virtual void ice_invoke_async(std::vector<Byte>, - std::function<void (bool, std::vector<Byte>)>, - std::function<void (std::exception_ptr)>, - const Current&) = 0; + virtual void ice_invokeAsync(std::vector<Byte>, + std::function<void (bool, std::vector<Byte>)>, + std::function<void (std::exception_ptr)>, + const Current&) = 0; #else virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::vector<Byte>&, const Current&) = 0; #endif @@ -198,10 +198,10 @@ class ICE_API BlobjectArrayAsync : public virtual Object public: #ifdef ICE_CPP11_MAPPING - virtual void ice_invoke_async(std::pair<const Byte*, const Byte*>, - std::function<void (bool, std::pair<const Byte*, const Byte*>)>, - std::function<void (std::exception_ptr)>, - const Current&) = 0; + virtual void ice_invokeAsync(std::pair<const Byte*, const Byte*>, + std::function<void (bool, std::pair<const Byte*, const Byte*>)>, + std::function<void (std::exception_ptr)>, + const Current&) = 0; #else virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::pair<const Byte*, const Byte*>&, const Current&) = 0; diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index b8a772d5114..ab369eb6e37 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -267,17 +267,17 @@ public: } ::std::function<void()> - ice_isA_async(const ::std::string& typeId, - ::std::function<void (bool)> response, - ::std::function<void (::std::exception_ptr)> ex = nullptr, - ::std::function<void (bool)> sent = nullptr, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_isAAsync(const ::std::string& typeId, + ::std::function<void (bool)> response, + ::std::function<void (::std::exception_ptr)> ex = nullptr, + ::std::function<void (bool)> sent = nullptr, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) { return makeLambdaOutgoing<bool>(response, ex, sent, this, &ObjectPrx::__ice_isA, typeId, ctx); } template<template<typename> class P = std::promise> auto - ice_isA_async(const ::std::string& typeId, const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_isAAsync(const ::std::string& typeId, const ::Ice::Context& ctx = ::Ice::noExplicitContext) -> decltype(std::declval<P<bool>>().get_future()) { return makePromiseOutgoing<bool, P>(false, this, &ObjectPrx::__ice_isA, typeId, ctx); @@ -293,16 +293,16 @@ public: } ::std::function<void()> - ice_ping_async(::std::function<void ()> response, - ::std::function<void (::std::exception_ptr)> ex = nullptr, - ::std::function<void (bool)> sent = nullptr, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_pingAsync(::std::function<void ()> response, + ::std::function<void (::std::exception_ptr)> ex = nullptr, + ::std::function<void (bool)> sent = nullptr, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) { return makeLambdaOutgoing(response, ex, sent, this, &ObjectPrx::__ice_ping, ctx); } template<template<typename> class P = std::promise> - auto ice_ping_async(const ::Ice::Context& ctx = ::Ice::noExplicitContext) + auto ice_pingAsync(const ::Ice::Context& ctx = ::Ice::noExplicitContext) -> decltype(std::declval<P<void>>().get_future()) { return makePromiseOutgoing<P>(false, this, &ObjectPrx::__ice_ping, ctx); @@ -318,16 +318,16 @@ public: } ::std::function<void()> - ice_ids_async(::std::function<void (::std::vector<::std::string>)> response, - ::std::function<void (::std::exception_ptr)> ex = nullptr, - ::std::function<void (bool)> sent = nullptr, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_idsAsync(::std::function<void (::std::vector<::std::string>)> response, + ::std::function<void (::std::exception_ptr)> ex = nullptr, + ::std::function<void (bool)> sent = nullptr, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) { return makeLambdaOutgoing<::std::vector<::std::string>>(response, ex, sent, this, &ObjectPrx::__ice_ids, ctx); } template<template<typename> class P = std::promise> auto - ice_ids_async(const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_idsAsync(const ::Ice::Context& ctx = ::Ice::noExplicitContext) -> decltype(std::declval<P<::std::vector<::std::string>>>().get_future()) { return makePromiseOutgoing<::std::vector<::std::string>, P>(false, this, &ObjectPrx::__ice_ids, ctx); @@ -343,16 +343,16 @@ public: } ::std::function<void ()> - ice_id_async(::std::function<void (::std::string)> response, - ::std::function<void (::std::exception_ptr)> ex = nullptr, - ::std::function<void (bool)> sent = nullptr, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_idAsync(::std::function<void (::std::string)> response, + ::std::function<void (::std::exception_ptr)> ex = nullptr, + ::std::function<void (bool)> sent = nullptr, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) { return makeLambdaOutgoing<::std::string>(response, ex, sent, this, &ObjectPrx::__ice_id, ctx); } template<template<typename> class P = std::promise> - auto ice_id_async(const ::Ice::Context& ctx = ::Ice::noExplicitContext) + auto ice_idAsync(const ::Ice::Context& ctx = ::Ice::noExplicitContext) -> decltype(std::declval<P<::std::string>>().get_future()) { return makePromiseOutgoing<::std::string, P>(false, this, &ObjectPrx::__ice_id, ctx); @@ -399,13 +399,13 @@ public: } ::std::function<void ()> - ice_invoke_async(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector<::Ice::Byte>& inP, - ::std::function<void (bool, ::std::vector<::Ice::Byte>)> response, - ::std::function<void (::std::exception_ptr)> ex = nullptr, - ::std::function<void (bool)> sent = nullptr, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_invokeAsync(const ::std::string& operation, + ::Ice::OperationMode mode, + const ::std::vector<::Ice::Byte>& inP, + ::std::function<void (bool, ::std::vector<::Ice::Byte>)> response, + ::std::function<void (::std::exception_ptr)> ex = nullptr, + ::std::function<void (bool)> sent = nullptr, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) { using Outgoing = ::IceInternal::InvokeLambdaOutgoing<Result_ice_invoke>; ::std::function<void(Result_ice_invoke&&)> r; @@ -422,20 +422,20 @@ public: } template<template<typename> class P = std::promise> auto - ice_invoke_async(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::vector<::Ice::Byte>& inP, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_invokeAsync(const ::std::string& operation, + ::Ice::OperationMode mode, + const ::std::vector<::Ice::Byte>& inP, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) -> decltype(std::declval<P<Result_ice_invoke>>().get_future()) { - return ice_invoke_async(operation, mode, ::IceInternal::makePair(inP), ctx); + return ice_invokeAsync(operation, mode, ::IceInternal::makePair(inP), ctx); } template<template<typename> class P = std::promise> auto - ice_invoke_async(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inP, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_invokeAsync(const ::std::string& operation, + ::Ice::OperationMode mode, + const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inP, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) -> decltype(std::declval<P<Result_ice_invoke>>().get_future()) { using Outgoing = ::IceInternal::InvokePromiseOutgoing<P<Result_ice_invoke>, Result_ice_invoke>; @@ -451,13 +451,13 @@ public: }; ::std::function<void ()> - ice_invoke_async(const ::std::string& operation, - ::Ice::OperationMode mode, - const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inP, - ::std::function<void (bool, ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>)> response, - ::std::function<void (::std::exception_ptr)> ex = nullptr, - ::std::function<void (bool)> sent = nullptr, - const ::Ice::Context& ctx = ::Ice::noExplicitContext) + ice_invokeAsync(const ::std::string& operation, + ::Ice::OperationMode mode, + const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inP, + ::std::function<void (bool, ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>)> response, + ::std::function<void (::std::exception_ptr)> ex = nullptr, + ::std::function<void (bool)> sent = nullptr, + const ::Ice::Context& ctx = ::Ice::noExplicitContext) { using Outgoing = ::IceInternal::InvokeLambdaOutgoing<Result_ice_invoke_zerocopy>; ::std::function<void(Result_ice_invoke_zerocopy&&)> r; @@ -538,13 +538,13 @@ public: ::std::shared_ptr<::Ice::Connection> ice_getConnection() { - return ice_getConnection_async().get(); + return ice_getConnectionAsync().get(); } ::std::function<void ()> - ice_getConnection_async(::std::function<void (::std::shared_ptr<::Ice::Connection>)> response, - ::std::function<void (::std::exception_ptr)> ex = nullptr, - ::std::function<void (bool)> sent = nullptr) + ice_getConnectionAsync(::std::function<void (::std::shared_ptr<::Ice::Connection>)> response, + ::std::function<void (::std::exception_ptr)> ex = nullptr, + ::std::function<void (bool)> sent = nullptr) { using LambdaOutgoing = ::IceInternal::ProxyGetConnectionLambda; auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), @@ -558,7 +558,7 @@ public: } template<template<typename> class P = std::promise> auto - ice_getConnection_async() -> decltype(std::declval<P<::std::shared_ptr<::Ice::Connection>>>().get_future()) + ice_getConnectionAsync() -> decltype(std::declval<P<::std::shared_ptr<::Ice::Connection>>>().get_future()) { using PromiseOutgoing = ::IceInternal::ProxyGetConnectionPromise<P<::std::shared_ptr<::Ice::Connection>>>; auto outAsync = ::std::make_shared<PromiseOutgoing>(shared_from_this(), @@ -576,12 +576,12 @@ public: bool ice_flushBatchRequests() { - return ice_flushBatchRequests_async().get(); + return ice_flushBatchRequestsAsync().get(); } std::function<void ()> - ice_flushBatchRequests_async(::std::function<void (::std::exception_ptr)> ex, - ::std::function<void (bool)> sent = nullptr) + ice_flushBatchRequestsAsync(::std::function<void (::std::exception_ptr)> ex, + ::std::function<void (bool)> sent = nullptr) { using LambdaOutgoing = ::IceInternal::ProxyFlushBatchLambda; auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), ex, sent); @@ -590,7 +590,7 @@ public: } template<template<typename> class P = std::promise> auto - ice_flushBatchRequests_async() -> decltype(std::declval<P<bool>>().get_future()) + ice_flushBatchRequestsAsync() -> decltype(std::declval<P<bool>>().get_future()) { using PromiseOutgoing = ::IceInternal::ProxyFlushBatchPromise<P<bool>>; auto outAsync = ::std::make_shared<PromiseOutgoing>(shared_from_this()); diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index 691c1917500..fb81ed52fce 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -3272,10 +3272,11 @@ Global {01C495B5-93BE-424E-BB7C-5110A3952A75}.Release|x64.Build.0 = Release|x64 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|Win32 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.ActiveCfg = Release|x64 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.ActiveCfg = Debug|x64 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.ActiveCfg = Debug|Win32 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.Build.0 = Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|x64.ActiveCfg = Debug|x64 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|x64.Build.0 = Debug|x64 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|Win32.ActiveCfg = Release|Win32 @@ -3284,10 +3285,11 @@ Global {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Release|x64.Build.0 = Release|x64 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|Win32 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.ActiveCfg = Release|x64 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.ActiveCfg = Debug|x64 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.Build.0 = Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|x64.ActiveCfg = Debug|x64 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|x64.Build.0 = Debug|x64 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|Win32.ActiveCfg = Release|Win32 @@ -3296,10 +3298,11 @@ Global {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Release|x64.Build.0 = Release|x64 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|Win32 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.ActiveCfg = Release|x64 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.ActiveCfg = Debug|x64 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.ActiveCfg = Debug|Win32 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.Build.0 = Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|x64.ActiveCfg = Debug|x64 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|x64.Build.0 = Debug|x64 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|Win32.ActiveCfg = Release|Win32 @@ -3308,10 +3311,11 @@ Global {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Release|x64.Build.0 = Release|x64 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|Win32 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.ActiveCfg = Release|x64 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.ActiveCfg = Debug|x64 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.ActiveCfg = Debug|Win32 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.Build.0 = Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|x64.ActiveCfg = Debug|x64 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|x64.Build.0 = Debug|x64 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index 81191ae7b75..53f5750836a 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -117,7 +117,7 @@ BatchRequestQueue::finishBatchRequest(OutputStream* os, const Ice::ObjectPrxPtr& if(_maxSize > 0 && _batchStream.b.size() >= _maxSize) { #ifdef ICE_CPP11_MAPPING - proxy->ice_flushBatchRequests_async(); + proxy->ice_flushBatchRequestsAsync(); #else proxy->begin_ice_flushBatchRequests(); #endif diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 7242be5a167..c2d07f217ed 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -212,11 +212,11 @@ const ::std::string __flushBatchRequests_name = "flushBatchRequests"; void Ice::CommunicatorI::flushBatchRequests() { - Communicator::flushBatchRequests_async().get(); + Communicator::flushBatchRequestsAsync().get(); } ::std::function<void ()> -Ice::CommunicatorI::flushBatchRequests_async(function<void (exception_ptr)> ex, function<void (bool)> sent) +Ice::CommunicatorI::flushBatchRequestsAsync(function<void (exception_ptr)> ex, function<void (bool)> sent) { class CommunicatorFlushBatchLambda : public CommunicatorFlushBatchAsync, public LambdaInvoke { diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 28015b424d3..cc5a536cbfb 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -69,8 +69,8 @@ public: #ifdef ICE_CPP11_MAPPING virtual ::std::function<void ()> - flushBatchRequests_async(::std::function<void (::std::exception_ptr)>, - ::std::function<void (bool)> = nullptr); + flushBatchRequestsAsync(::std::function<void (::std::exception_ptr)>, + ::std::function<void (bool)> = nullptr); #else virtual AsyncResultPtr begin_flushBatchRequests(); virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0); diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index b2c3288956a..3322d30421e 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -805,11 +805,11 @@ Ice::ConnectionI::getBatchRequestQueue() const void Ice::ConnectionI::flushBatchRequests() { - Connection::flushBatchRequests_async().get(); + Connection::flushBatchRequestsAsync().get(); } std::function<void ()> -Ice::ConnectionI::flushBatchRequests_async(::std::function<void (::std::exception_ptr)> ex, +Ice::ConnectionI::flushBatchRequestsAsync(::std::function<void (::std::exception_ptr)> ex, ::std::function<void (bool)> sent) { class ConnectionFlushBatchLambda : public ConnectionFlushBatchAsync, public LambdaInvoke diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 2fc9fb9877b..d4a0ea2101e 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -192,7 +192,7 @@ public: #ifdef ICE_CPP11_MAPPING virtual std::function<void ()> - flushBatchRequests_async(::std::function<void (::std::exception_ptr)>, + flushBatchRequestsAsync(::std::function<void (::std::exception_ptr)>, ::std::function<void (bool)> = nullptr); #else virtual AsyncResultPtr begin_flushBatchRequests(); diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index 3fcbd5aa3a6..e768b442330 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -47,7 +47,7 @@ public: { #ifdef ICE_CPP11_MAPPING LocatorInfo::RequestPtr request = this; - _locatorInfo->getLocator()->findObjectById_async( + _locatorInfo->getLocator()->findObjectByIdAsync( _ref->getIdentity(), [request](const ObjectPrxPtr& object) { @@ -94,7 +94,7 @@ public: { #ifdef ICE_CPP11_MAPPING LocatorInfo::RequestPtr request = this; - _locatorInfo->getLocator()->findAdapterById_async(_ref->getAdapterId(), + _locatorInfo->getLocator()->findAdapterByIdAsync(_ref->getAdapterId(), [request](const shared_ptr<Ice::ObjectPrx>& object) { request->response(object); diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index 516178f3aa0..4f193c91903 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -416,7 +416,7 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, try { auto self = shared_from_this(); - remoteLogger->init_async(logger->getPrefix(), initLogMessages, + remoteLogger->initAsync(logger->getPrefix(), initLogMessages, [self, logger, remoteLogger]() { if(self->_traceLevel > 1) @@ -855,7 +855,7 @@ LoggerAdminLoggerI::run() #ifdef ICE_CPP11_MAPPING RemoteLoggerPrxPtr remoteLogger = *p; auto self = shared_from_this(); - remoteLogger->log_async(job->logMessage, + remoteLogger->logAsync(job->logMessage, [self, remoteLogger]() { if(self->_loggerAdmin->getTraceLevel() > 1) diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index b4bd4597fbe..f5fae21f3ff 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -392,7 +392,7 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current) auto async = IncomingAsync::create(in); try { - ice_invoke_async(vector<Byte>(inEncaps, inEncaps + sz), + ice_invokeAsync(vector<Byte>(inEncaps, inEncaps + sz), [async](bool ok, const vector<Byte>& outEncaps) { if(async->__validateResponse(ok)) @@ -474,7 +474,7 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current) auto async = IncomingAsync::create(in); try { - ice_invoke_async(inEncaps, + ice_invokeAsync(inEncaps, [async](bool ok, const pair<const Byte*, const Byte*>& outEncaps) { if(async->__validateResponse(ok)) diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp index 521137e4fd2..016ef526c68 100644 --- a/cpp/src/Ice/PropertiesAdminI.cpp +++ b/cpp/src/Ice/PropertiesAdminI.cpp @@ -53,10 +53,10 @@ PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&) void #ifdef ICE_CPP11_MAPPING -PropertiesAdminI::setProperties_async(PropertyDict props, - function<void ()> response, - function<void (exception_ptr)>, - const Current&) +PropertiesAdminI::setPropertiesAsync(PropertyDict props, + function<void ()> response, + function<void (exception_ptr)>, + const Current&) #else PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr& cb, const PropertyDict& props, const Current&) diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h index 8128af9d41c..b534d39e45a 100644 --- a/cpp/src/Ice/PropertiesAdminI.h +++ b/cpp/src/Ice/PropertiesAdminI.h @@ -28,10 +28,10 @@ public: #ifdef ICE_CPP11_MAPPING virtual std::string getProperty(std::string, const Ice::Current&); virtual Ice::PropertyDict getPropertiesForPrefix(std::string, const Ice::Current&); - virtual void setProperties_async(::Ice::PropertyDict, - ::std::function<void ()>, - ::std::function<void (::std::exception_ptr)>, - const Ice::Current&); + virtual void setPropertiesAsync(::Ice::PropertyDict, + ::std::function<void ()>, + ::std::function<void (::std::exception_ptr)>, + const Ice::Current&); #else virtual std::string getProperty(const std::string&, const Ice::Current&); virtual Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&); diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index 32d5182db29..bd4bc46ff43 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -201,7 +201,7 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr& #ifdef ICE_CPP11_MAPPING RouterInfoPtr self = this; - _router->getClientProxy_async( + _router->getClientProxyAsync( [self, callback](const Ice::ObjectPrxPtr& proxy) { self->getClientProxyResponse(proxy, callback); @@ -295,7 +295,7 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxy #ifdef ICE_CPP11_MAPPING RouterInfoPtr self = this; - _router->addProxies_async(proxies, + _router->addProxiesAsync(proxies, [self, cookie](const Ice::ObjectProxySeq& proxies) { self->addProxyResponse(proxies, cookie); diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index e7b4a7fac99..9fe98f1a29e 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -300,7 +300,7 @@ IceBox::ServiceManagerI::addObserver(ICE_IN(ServiceObserverPrxPtr) observer, con if(activeServices.size() > 0) { #ifdef ICE_CPP11_MAPPING - observer->servicesStarted_async(activeServices, nullptr, makeObserverCompletedCallback(observer)); + observer->servicesStartedAsync(activeServices, nullptr, makeObserverCompletedCallback(observer)); #else observer->begin_servicesStarted(activeServices, _observerCompletedCB); #endif @@ -935,7 +935,7 @@ IceBox::ServiceManagerI::servicesStarted(const vector<string>& services, const s { for(auto p : observers) { - p->servicesStarted_async(services, nullptr, makeObserverCompletedCallback(p)); + p->servicesStartedAsync(services, nullptr, makeObserverCompletedCallback(p)); } } } @@ -947,7 +947,7 @@ IceBox::ServiceManagerI::servicesStopped(const vector<string>& services, const s { for(auto p : observers) { - p->servicesStopped_async(services, nullptr, makeObserverCompletedCallback(p)); + p->servicesStoppedAsync(services, nullptr, makeObserverCompletedCallback(p)); } } } diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp index 831d86478e9..a3406228c9c 100644 --- a/cpp/src/IceDiscovery/LocatorI.cpp +++ b/cpp/src/IceDiscovery/LocatorI.cpp @@ -25,17 +25,17 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) : #ifdef ICE_CPP11_MAPPING -void -LocatorRegistryI::setAdapterDirectProxy_async(string adapterId, +void +LocatorRegistryI::setAdapterDirectProxyAsync(string adapterId, shared_ptr<ObjectPrx> proxy, function<void ()> response, function<void (exception_ptr)>, const Ice::Current&) #else -void -LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, - const std::string& adapterId, - const ObjectPrxPtr& proxy, +void +LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, + const std::string& adapterId, + const ObjectPrxPtr& proxy, const Current&) #endif { @@ -57,7 +57,7 @@ LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapt #ifdef ICE_CPP11_MAPPING void -LocatorRegistryI::setReplicatedAdapterDirectProxy_async(string adapterId, +LocatorRegistryI::setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, shared_ptr<ObjectPrx> proxy, function<void ()> response, @@ -69,7 +69,7 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async( const AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb, const std::string& adapterId, const std::string& replicaGroupId, - const ObjectPrxPtr& proxy, + const ObjectPrxPtr& proxy, const Current&) #endif { @@ -105,8 +105,8 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async( } #ifdef ICE_CPP11_MAPPING -void -LocatorRegistryI::setServerProcessProxy_async(string, +void +LocatorRegistryI::setServerProcessProxyAsync(string, shared_ptr<ProcessPrx>, function<void ()> response, function<void (exception_ptr)>, @@ -116,8 +116,8 @@ LocatorRegistryI::setServerProcessProxy_async(string, } #else void -LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb, - const std::string&, +LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb, + const std::string&, const ProcessPrxPtr&, const Current&) { @@ -125,7 +125,7 @@ LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServe } #endif -Ice::ObjectPrxPtr +Ice::ObjectPrxPtr LocatorRegistryI::findObject(const Ice::Identity& id) const { Lock sync(*this); @@ -175,7 +175,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const return prx->ice_adapterId(adapterIds[0]); } -Ice::ObjectPrxPtr +Ice::ObjectPrxPtr LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) const { Lock sync(*this); @@ -215,7 +215,7 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con return prx->ice_endpoints(endpoints); } } - + isReplicaGroup = false; return 0; } @@ -225,8 +225,8 @@ LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrxPtr& regist } #ifdef ICE_CPP11_MAPPING -void -LocatorI::findObjectById_async(Ice::Identity id, +void +LocatorI::findObjectByIdAsync(Ice::Identity id, function<void (const shared_ptr<ObjectPrx>&)> response, function<void (exception_ptr)>, const Ice::Current&) const @@ -235,7 +235,7 @@ LocatorI::findObjectById_async(Ice::Identity id, } void -LocatorI::findAdapterById_async(string adapterId, +LocatorI::findAdapterByIdAsync(string adapterId, function<void (const shared_ptr<ObjectPrx>&)> response, function<void (exception_ptr)>, const Ice::Current&) const @@ -243,26 +243,25 @@ LocatorI::findAdapterById_async(string adapterId, _lookup->findAdapter(response, adapterId); } #else -void -LocatorI::findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, - const Identity& id, +void +LocatorI::findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb, + const Identity& id, const Current&) const { _lookup->findObject(cb, id); } -void -LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, - const std::string& adapterId, +void +LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, + const std::string& adapterId, const Current&) const { _lookup->findAdapter(cb, adapterId); } #endif -LocatorRegistryPrxPtr +LocatorRegistryPrxPtr LocatorI::getRegistry(const Current&) const { return _registry; } - diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h index 4f17f79a187..8b30b8a963b 100644 --- a/cpp/src/IceDiscovery/LocatorI.h +++ b/cpp/src/IceDiscovery/LocatorI.h @@ -23,41 +23,41 @@ class LocatorRegistryI : public Ice::LocatorRegistry, private IceUtil::Mutex public: LocatorRegistryI(const Ice::CommunicatorPtr&); - + #ifdef ICE_CPP11_MAPPING - virtual void - setAdapterDirectProxy_async(std::string, - std::shared_ptr<Ice::ObjectPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void + setAdapterDirectProxyAsync(std::string, + std::shared_ptr<Ice::ObjectPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); virtual void - setReplicatedAdapterDirectProxy_async(std::string, - std::string, - std::shared_ptr<Ice::ObjectPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + setReplicatedAdapterDirectProxyAsync(std::string, + std::string, + std::shared_ptr<Ice::ObjectPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void - setServerProcessProxy_async(std::string, - std::shared_ptr<Ice::ProcessPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void + setServerProcessProxyAsync(std::string, + std::shared_ptr<Ice::ProcessPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); #else - virtual void - setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, + virtual void + setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, const Ice::ObjectPrx&, const Ice::Current&); virtual void setReplicatedAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&, - const std::string&, const std::string&, const Ice::ObjectPrx&, + const std::string&, const std::string&, const Ice::ObjectPrx&, const Ice::Current&); - virtual void - setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, + virtual void + setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, const Ice::ProcessPrx&, const Ice::Current&); #endif Ice::ObjectPrxPtr findObject(const Ice::Identity&) const; @@ -81,30 +81,30 @@ public: LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrxPtr&); #ifdef ICE_CPP11_MAPPING - virtual void - findObjectById_async(Ice::Identity, + virtual void + findObjectByIdAsync(Ice::Identity, + std::function<void (const std::shared_ptr<Ice::ObjectPrx>&)>, + std::function<void (std::exception_ptr)>, + const Ice::Current&) const; + + virtual void + findAdapterByIdAsync(std::string, std::function<void (const std::shared_ptr<Ice::ObjectPrx>&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) const; - - virtual void - findAdapterById_async(std::string, - std::function<void (const std::shared_ptr<Ice::ObjectPrx>&)>, - std::function<void (std::exception_ptr)>, - const Ice::Current&) const; #else - virtual void - findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, + virtual void + findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, const Ice::Current&) const; - virtual void - findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, + virtual void + findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, const Ice::Current&) const; #endif virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const; private: - + LookupIPtr _lookup; Ice::LocatorRegistryPrxPtr _registry; }; diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp index 655b3e5eb17..4499e997118 100644 --- a/cpp/src/IceDiscovery/LookupI.cpp +++ b/cpp/src/IceDiscovery/LookupI.cpp @@ -193,7 +193,7 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I try { #ifdef ICE_CPP11_MAPPING - reply->foundObjectById_async(id, proxy); + reply->foundObjectByIdAsync(id, proxy); #else reply->begin_foundObjectById(id, proxy); #endif @@ -229,7 +229,7 @@ LookupI::findAdapterById(const string& domainId, const string& adapterId, const try { #ifdef ICE_CPP11_MAPPING - reply->foundAdapterById_async(adapterId, proxy, isReplicaGroup); + reply->foundAdapterByIdAsync(adapterId, proxy, isReplicaGroup); #else reply->begin_foundAdapterById(adapterId, proxy, isReplicaGroup); #endif @@ -256,7 +256,7 @@ LookupI::findObject(function<void (const shared_ptr<Ice::ObjectPrx>&)> response, { try { - _lookup->findObjectById_async(_domainId, id, _lookupReply); + _lookup->findObjectByIdAsync(_domainId, id, _lookupReply); _timer->schedule(p->second, _timeout); } catch(const Ice::LocalException&) @@ -281,7 +281,7 @@ LookupI::findAdapter(function<void (const shared_ptr<Ice::ObjectPrx>&)> response { try { - _lookup->findAdapterById_async(_domainId, adapterId, _lookupReply); + _lookup->findAdapterByIdAsync(_domainId, adapterId, _lookupReply); _timer->schedule(p->second, _timeout); } catch(const Ice::LocalException&) @@ -390,7 +390,7 @@ LookupI::objectRequestTimedOut(const ObjectRequestPtr& request) try { #ifdef ICE_CPP11_MAPPING - _lookup->findObjectById_async(_domainId, request->getId(), _lookupReply); + _lookup->findObjectByIdAsync(_domainId, request->getId(), _lookupReply); #else _lookup->begin_findObjectById(_domainId, request->getId(), _lookupReply); #endif @@ -422,7 +422,7 @@ LookupI::adapterRequestTimedOut(const AdapterRequestPtr& request) try { #ifdef ICE_CPP11_MAPPING - _lookup->findAdapterById_async(_domainId, request->getId(), _lookupReply); + _lookup->findAdapterByIdAsync(_domainId, request->getId(), _lookupReply); #else _lookup->begin_findAdapterById(_domainId, request->getId(), _lookupReply); #endif diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp index 893d1cd6465..72e05063eba 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.cpp +++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp @@ -18,9 +18,9 @@ using namespace IceLocatorDiscovery; #ifndef ICE_LOCATOR_DISCOVERY_API # ifdef ICE_LOCATOR_DISCOVERY_API_EXPORTS -# define ICE_LOCATOR_DISCOVERY_API ICE_DECLSPEC_EXPORT +# define ICE_LOCATOR_DISCOVERY_API ICE_DECLSPEC_EXPORT # else -# define ICE_LOCATOR_DISCOVERY_API /**/ +# define ICE_LOCATOR_DISCOVERY_API /**/ # endif #endif @@ -118,7 +118,7 @@ protected: }; ICE_DEFINE_PTR(RequestPtr, Request); -class LocatorI : public Ice::BlobjectArrayAsync, +class LocatorI : public Ice::BlobjectArrayAsync, public IceUtil::TimerTask, private IceUtil::Monitor<IceUtil::Mutex>, public Ice::EnableSharedFromThis<LocatorI> @@ -129,10 +129,10 @@ public: void setLookupReply(const LookupReplyPrxPtr&); #ifdef ICE_CPP11_MAPPING - virtual void ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*>, - function<void (bool, pair<const Ice::Byte*, const Ice::Byte*>)>, - function<void (exception_ptr)>, - const Ice::Current&); + virtual void ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*>, + function<void (bool, pair<const Ice::Byte*, const Ice::Byte*>)>, + function<void (exception_ptr)>, + const Ice::Current&); #else virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const pair<const Ice::Byte*, const Ice::Byte*>&, const Ice::Current&); @@ -194,19 +194,19 @@ public: #ifdef ICE_CPP11_MAPPING virtual void - findObjectById_async(::Ice::Identity, - function<void (const shared_ptr<::Ice::ObjectPrx>&)> response, - function<void (exception_ptr)>, - const Ice::Current&) const + findObjectByIdAsync(::Ice::Identity, + function<void (const shared_ptr<::Ice::ObjectPrx>&)> response, + function<void (exception_ptr)>, + const Ice::Current&) const { response(nullptr); } virtual void - findAdapterById_async(string, - function<void (const shared_ptr<::Ice::ObjectPrx>&)> response, - function<void (exception_ptr)>, - const Ice::Current&) const + findAdapterByIdAsync(string, + function<void (const shared_ptr<::Ice::ObjectPrx>&)> response, + function<void (exception_ptr)>, + const Ice::Current&) const { response(nullptr); } @@ -303,8 +303,8 @@ PluginI::initialize() #ifdef ICE_CPP11_MAPPING promise<bool> sent; promise<void> completed; - - lookupPrx->ice_getConnection_async( + + lookupPrx->ice_getConnectionAsync( [&](shared_ptr<Ice::Connection>) { completed.set_value(); @@ -371,34 +371,34 @@ Request::invoke(const Ice::LocatorPrxPtr& l) try { auto self = shared_from_this(); - l->ice_invoke_async(_operation, _mode, _inParams, - [self](bool ok, vector<Ice::Byte> outParams) - { - pair<const Ice::Byte*, const Ice::Byte*> outPair; - if(outParams.empty()) - { - outPair.first = outPair.second = 0; - } - else - { - outPair.first = &outParams[0]; - outPair.second = outPair.first + outParams.size(); - } - self->response(ok, move(outPair)); - }, - [self](exception_ptr e) - { - try - { - rethrow_exception(e); - } - catch(const Ice::Exception& ex) - { - self->exception(ex); - } - }, - nullptr, - _context); + l->ice_invokeAsync(_operation, _mode, _inParams, + [self](bool ok, vector<Ice::Byte> outParams) + { + pair<const Ice::Byte*, const Ice::Byte*> outPair; + if(outParams.empty()) + { + outPair.first = outPair.second = 0; + } + else + { + outPair.first = &outParams[0]; + outPair.second = outPair.first + outParams.size(); + } + self->response(ok, move(outPair)); + }, + [self](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const Ice::Exception& ex) + { + self->exception(ex); + } + }, + nullptr, + _context); } catch(const Ice::LocalException& ex) { @@ -410,7 +410,7 @@ Request::invoke(const Ice::LocatorPrxPtr& l) assert(_exception); // Don't retry if the proxy didn't change _exceptionCB(_exception); } - + #else if(l != _locatorPrx) { @@ -559,12 +559,12 @@ LocatorI::setLookupReply(const LookupReplyPrxPtr& lookupReply) #ifdef ICE_CPP11_MAPPING void -LocatorI::ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*> inParams, - function<void (bool, pair<const Ice::Byte*, const Ice::Byte*>)> responseCB, - function<void (exception_ptr)> exceptionCB, - const Ice::Current& current) +LocatorI::ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*> inParams, + function<void (bool, pair<const Ice::Byte*, const Ice::Byte*>)> responseCB, + function<void (exception_ptr)> exceptionCB, + const Ice::Current& current) { - invoke(nullptr, make_shared<Request>(this, current.operation, current.mode, inParams, current.ctx, + invoke(nullptr, make_shared<Request>(this, current.operation, current.mode, inParams, current.ctx, move(responseCB), move(exceptionCB))); } #else @@ -685,7 +685,7 @@ LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request) try { #ifdef ICE_CPP11_MAPPING - _lookup->findLocator_async(_instanceName, _lookupReply); // Send multicast request. + _lookup->findLocatorAsync(_instanceName, _lookupReply); // Send multicast request. #else _lookup->begin_findLocator(_instanceName, _lookupReply); // Send multicast request. #endif @@ -713,7 +713,7 @@ LocatorI::runTimerTask() try { #ifdef ICE_CPP11_MAPPING - _lookup->findLocator_async(_instanceName, _lookupReply); // Send multicast request. + _lookup->findLocatorAsync(_instanceName, _lookupReply); // Send multicast request. #else _lookup->begin_findLocator(_instanceName, _lookupReply); // Send multicast request. #endif diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 8dce5096a56..4fedc671cfa 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -4108,9 +4108,12 @@ Slice::Exception::Exception(const ContainerPtr& container, const string& name, c DataMemberPtr Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool optional, int tag, const SyntaxTreeBasePtr& defaultValueType, const string& defaultValue, - const string& defaultLiteral) + const string& defaultLiteral, bool checkName) { - checkIdentifier(name); + if(checkName) + { + checkIdentifier(name); + } ContainedList matches = _unit->findContents(thisScope() + name); if(!matches.empty()) diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h index ece0c696e02..def1bd40abe 100644 --- a/cpp/src/Slice/Parser.h +++ b/cpp/src/Slice/Parser.h @@ -750,7 +750,7 @@ class Struct : public virtual Container, public virtual Constructed public: DataMemberPtr createDataMember(const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&, - const std::string&, const std::string&); + const std::string&, const std::string&, bool = true); DataMemberList dataMembers() const; DataMemberList classDataMembers() const; virtual ContainedType containedType() const; diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 852b2fa81fc..28899335797 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -15,6 +15,7 @@ #include <IceUtil/Iterator.h> #include <IceUtil/InputUtil.h> #include <IceUtil/StringConverter.h> +#include <IceUtil/StringUtil.h> #include <Slice/Checksum.h> #include <Slice/FileTracker.h> @@ -452,6 +453,17 @@ writeDataMemberInitializers(IceUtilInternal::Output& C, const DataMemberList& me } } +string +resultStructName(const string& name, const string& scope = "") +{ + string stName = IceUtilInternal::toUpper(name.substr(0, 1)) + name.substr(1) + "Result"; + if(!scope.empty()) + { + stName = scope + "::" + stName; + } + return stName; +} + } Slice::Gen::Gen(const string& base, const string& headerExtension, const string& sourceExtension, @@ -788,9 +800,6 @@ Slice::Gen::generate(const UnitPtr& p) Cpp11TypesVisitor typesVisitor(H, C, _dllExport); p->visit(&typesVisitor, false); - Cpp11ProxyVisitor proxyVisitor(H, C, _dllExport); - p->visit(&proxyVisitor, false); - Cpp11LocalObjectVisitor localObjectVisitor(H, C, _dllExport); p->visit(&localObjectVisitor, false); @@ -800,6 +809,9 @@ Slice::Gen::generate(const UnitPtr& p) Cpp11ValueVisitor valueVisitor(H, C, _dllExport); p->visit(&valueVisitor, false); + Cpp11ProxyVisitor proxyVisitor(H, C, _dllExport); + p->visit(&proxyVisitor, false); + Cpp11StreamVisitor streamVisitor(H, C, _dllExport); p->visit(&streamVisitor, false); @@ -5586,8 +5598,8 @@ Slice::Gen::Cpp11DeclVisitor::visitOperation(const OperationPtr& p) } } -Slice::Gen::Cpp11TypesVisitor::Cpp11TypesVisitor(Output& h, Output& c, const string& dllExport) : - H(h), C(c), _dllExport(dllExport), _doneStaticSymbol(false), _useWstring(false) +Slice::Gen::Cpp11TypesVisitor::Cpp11TypesVisitor(Output& h, Output& c, const string& dllExport, int useWstring) : + H(h), C(c), _dllExport(dllExport), _doneStaticSymbol(false), _useWstring(useWstring) { } @@ -6264,25 +6276,12 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) } else { - futureT = "Result_" + name; - } - - if(lambdaOutParams.size() > 1) - { - // We need to generate a Result_ struct. - H << sp; - H << nl << "struct Result_" << name; - H << sb; - for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q) - { - string typeString = typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true); - H << nl << typeString << " " << fixKwd((*q)->name()) << ";"; - } - if(ret) + string resultScope = cl->scope() + cl->name(); + if(!cl->isInterface()) { - H << nl << retS << " " << returnValueS << ";"; + resultScope += "Disp"; } - H << eb << ";"; + futureT = resultStructName(name, resultScope); } string deprecateSymbol = getDeprecateSymbol(p, cl); @@ -6311,11 +6310,11 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) } if(futureT == "void") { - H << nl << "makePromiseOutgoing"; + H << "makePromiseOutgoing"; } else { - H << nl << "makePromiseOutgoing<" << futureT << ">"; + H << "makePromiseOutgoing<" << futureT << ">"; } H << spar << "true, this" << string("&" + scoped + "__" + name); for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q) @@ -6356,7 +6355,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) // H << sp; H << nl << "::std::function<void ()>"; - H << nl << name << "_async("; + H << nl << name << "Async("; H.useCurrentPosAsIndent(); if(!lambdaParamsDecl.empty()) { @@ -6423,7 +6422,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) // H << sp; H << nl << "template<template<typename> class P = ::std::promise>"; - H << nl << deprecateSymbol << "auto " << name << "_async" << spar << futureParamsDecl; + H << nl << deprecateSymbol << "auto " << name << "Async" << spar << futureParamsDecl; H << "const ::Ice::Context& __ctx = Ice::noExplicitContext" << epar; H.inc(); H << nl << "-> decltype(::std::declval<P<" << futureT << ">>().get_future())"; @@ -7035,7 +7034,7 @@ Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p) H << sp; H << nl << "virtual ::std::function<void ()>"; - H << nl << name << "_async("; + H << nl << name << "Async("; H.useCurrentPosAsIndent(); for(vector<string>::const_iterator i = paramsDeclAMI.begin(); i != paramsDeclAMI.end(); ++i) { @@ -7051,7 +7050,7 @@ Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p) H << sp; H << nl << "template<template<typename> class P = ::std::promise>"; - H << nl << deprecateSymbol << "auto " << name << "_async" << spar << paramsDeclAMI << epar; + H << nl << deprecateSymbol << "auto " << name << "Async" << spar << paramsDeclAMI << epar; H.inc(); H << nl << "-> decltype(::std::declval<P<bool>>().get_future())"; H.dec(); @@ -7059,7 +7058,7 @@ Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p) H << nl << "using Promise = P<bool>;"; H << nl << "auto __promise = ::std::make_shared<Promise>();"; - H << nl << name << "_async("; + H << nl << name << "Async("; H.useCurrentPosAsIndent(); for(vector<string>::const_iterator i = paramsDeclAMI.begin(); i != paramsDeclAMI.end(); ++i) { @@ -7333,7 +7332,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) ParamDeclList inParams; ParamDeclList outParams; ParamDeclList paramList = p->parameters(); - vector< string> outDecls; + vector<string> outDecls; for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q) { string paramName = fixKwd(string(paramPrefix) + (*q)->name()); @@ -7367,6 +7366,45 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) args += (isMovable(type) && !isOutParam) ? ("::std::move(" + paramName + ")") : paramName; } + if((outParams.size() > 1) || (ret && outParams.size() > 0)) + { + // + // Generate OpNameResult struct + // + StructPtr st = cl->createStruct(resultStructName(name), false, Slice::Dummy); + st->setMetaData(cl->getMetaData()); + + if(ret) + { + string returnValue = "returnValue"; + for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q) + { + if((*q)->name() == returnValue) + { + returnValue = string("_") + returnValue; + break; + } + } + DataMemberPtr dm = + st->createDataMember(returnValue, ret, p->returnIsOptional(), p->returnTag(), 0, "", "", false); + dm->setMetaData(p->getMetaData()); + } + + for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q) + { + DataMemberPtr dm = + st->createDataMember((*q)->name(), (*q)->type(), (*q)->optional(), (*q)->tag(), 0, "", ""); + dm->setMetaData((*q)->getMetaData()); + } + + // + // Generate C++ struct + // + Cpp11TypesVisitor typesVisitor(H, C, _dllExport, _useWstring); + st->visit(&typesVisitor, false); + } + + if(!paramList.empty()) { params += ", "; @@ -7448,7 +7486,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) } else { - H << nl << deprecateSymbol << "virtual void " << name << "_async("; + H << nl << deprecateSymbol << "virtual void " << name << "Async("; H.useCurrentPosAsIndent(); H << paramsAMD; if(!paramsAMD.empty()) @@ -7563,7 +7601,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) C << nl << "try"; C << sb; - C << nl << name << "_async("; + C << nl << name << "Async("; C.useCurrentPosAsIndent(); if(!argsAMD.empty()) { @@ -8284,7 +8322,7 @@ Slice::Gen::Cpp11ImplVisitor::visitClassDefStart(const ClassDefPtr& p) string responseParams; string responseParamsDecl; - H << sp << nl << "virtual void " << opName << "_async("; + H << sp << nl << "virtual void " << opName << "Async("; H.useCurrentPosAsIndent(); for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q) { @@ -8323,7 +8361,7 @@ Slice::Gen::Cpp11ImplVisitor::visitClassDefStart(const ClassDefPtr& p) H << nl << "const Ice::Current&)" << isConst << ';'; H.restoreIndent(); - C << sp << nl << "void" << nl << scope << name << "I::" << opName << "_async("; + C << sp << nl << "void" << nl << scope << name << "I::" << opName << "Async("; C.useCurrentPosAsIndent(); for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q) { diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index 114f13781c0..e1d00e60976 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -369,7 +369,7 @@ private: { public: - Cpp11TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); + Cpp11TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, int = 0); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index d0dd61ebfe3..3a02ae53b68 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -60,7 +60,7 @@ allTests(const CommunicatorPtr& communicator) cout << "creating/activating/deactivating object adapter in one operation... " << flush; obj->transient(); #ifdef ICE_CPP11_MAPPING - obj->transient_async().get(); + obj->transientAsync().get(); #else obj->end_transient(obj->begin_transient()); #endif @@ -74,7 +74,7 @@ allTests(const CommunicatorPtr& communicator) initData.properties = communicator->getProperties()->clone(); Ice::CommunicatorHolder comm = Ice::initialize(initData); #ifdef ICE_CPP11_MAPPING - comm->stringToProxy("test:" + getTestEndpoint(communicator, 0))->ice_ping_async(); + comm->stringToProxy("test:" + getTestEndpoint(communicator, 0))->ice_pingAsync(); #else comm->stringToProxy("test:" + getTestEndpoint(communicator, 0))->begin_ice_ping(); #endif diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index ac9869eda56..986dd601e6e 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -903,11 +903,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) cout << "testing lambda API... " << flush; { { - p->ice_isA_async(Test::TestIntf::ice_staticId(), nullptr); + p->ice_isAAsync(Test::TestIntf::ice_staticId(), nullptr); } { promise<bool> promise; - p->ice_isA_async(Test::TestIntf::ice_staticId(), + p->ice_isAAsync(Test::TestIntf::ice_staticId(), [&](bool value) { promise.set_value(value); @@ -916,7 +916,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<bool> promise; - p->ice_isA_async(Test::TestIntf::ice_staticId(), + p->ice_isAAsync(Test::TestIntf::ice_staticId(), [&](bool value) { promise.set_value(value); @@ -930,7 +930,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<bool> promise; - p->ice_isA_async(Test::TestIntf::ice_staticId(), + p->ice_isAAsync(Test::TestIntf::ice_staticId(), [&](bool value) { promise.set_value(value); @@ -941,11 +941,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { - p->ice_ping_async(nullptr); + p->ice_pingAsync(nullptr); } { promise<void> promise; - p->ice_ping_async( + p->ice_pingAsync( [&]() { promise.set_value(); @@ -954,7 +954,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->ice_ping_async( + p->ice_pingAsync( [&]() { promise.set_value(); @@ -967,7 +967,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->ice_ping_async( + p->ice_pingAsync( [&]() { promise.set_value(); @@ -977,11 +977,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { - p->ice_id_async(nullptr); + p->ice_idAsync(nullptr); } { promise<string> promise; - p->ice_id_async( + p->ice_idAsync( [&](const string& id) { promise.set_value(id); @@ -990,7 +990,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<string> promise; - p->ice_id_async( + p->ice_idAsync( [&](const string& id) { promise.set_value(id); @@ -1003,7 +1003,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<string> promise; - p->ice_id_async( + p->ice_idAsync( [&](const string& id) { promise.set_value(id); @@ -1013,11 +1013,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { - p->ice_ids_async(nullptr); + p->ice_idsAsync(nullptr); } { promise<vector<string>> promise; - p->ice_ids_async( + p->ice_idsAsync( [&](const vector<string>& ids) { promise.set_value(ids); @@ -1026,7 +1026,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<vector<string>> promise; - p->ice_ids_async( + p->ice_idsAsync( [&](const vector<string>& ids) { promise.set_value(ids); @@ -1039,7 +1039,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<vector<string>> promise; - p->ice_ids_async( + p->ice_idsAsync( [&](const vector<string>& ids) { promise.set_value(ids); @@ -1051,11 +1051,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { { - p->ice_getConnection_async(nullptr); + p->ice_getConnectionAsync(nullptr); } { promise<Ice::ConnectionPtr> promise; - p->ice_getConnection_async( + p->ice_getConnectionAsync( [&](const Ice::ConnectionPtr& connection) { promise.set_value(connection); @@ -1064,7 +1064,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<Ice::ConnectionPtr> promise; - p->ice_getConnection_async( + p->ice_getConnectionAsync( [&](const Ice::ConnectionPtr& connection) { promise.set_value(connection); @@ -1078,11 +1078,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { - p->op_async(nullptr); + p->opAsync(nullptr); } { promise<void> promise; - p->op_async( + p->opAsync( [&]() { promise.set_value(); @@ -1091,7 +1091,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->op_async( + p->opAsync( [&]() { promise.set_value(); @@ -1104,7 +1104,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->op_async( + p->opAsync( [&]() { promise.set_value(); @@ -1114,11 +1114,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { - p->opWithResult_async(nullptr); + p->opWithResultAsync(nullptr); } { promise<int> promise; - p->opWithResult_async( + p->opWithResultAsync( [&](int result) { promise.set_value(result); @@ -1127,7 +1127,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<int> promise; - p->opWithResult_async( + p->opWithResultAsync( [&](int result) { promise.set_value(result); @@ -1140,7 +1140,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<int> promise; - p->opWithResult_async( + p->opWithResultAsync( [&](int result) { promise.set_value(result); @@ -1150,11 +1150,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { - p->opWithUE_async(nullptr); + p->opWithUEAsync(nullptr); } { promise<void> promise; - p->opWithUE_async( + p->opWithUEAsync( nullptr, [&](const exception_ptr& ex) { @@ -1172,7 +1172,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->opWithUE_async( + p->opWithUEAsync( [&]() { promise.set_value(); @@ -1193,7 +1193,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->opWithUE_async( + p->opWithUEAsync( nullptr, [&](const exception_ptr& ex) { @@ -1212,11 +1212,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { - p->opWithResultAndUE_async(nullptr); + p->opWithResultAndUEAsync(nullptr); } { promise<void> promise; - p->opWithResultAndUE_async( + p->opWithResultAndUEAsync( nullptr, [&](const exception_ptr& ex) { @@ -1237,7 +1237,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->opWithResultAndUE_async( + p->opWithResultAndUEAsync( [&](int) { promise.set_value(); @@ -1261,7 +1261,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } { promise<void> promise; - p->opWithResultAndUE_async( + p->opWithResultAndUEAsync( nullptr, [&](const exception_ptr& ex) { @@ -1288,29 +1288,29 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) cout << "testing future API... " << flush; { - test(p->ice_isA_async(Test::TestIntf::ice_staticId()).get()); - test(p->ice_isA_async(Test::TestIntf::ice_staticId(), ctx).get()); + test(p->ice_isAAsync(Test::TestIntf::ice_staticId()).get()); + test(p->ice_isAAsync(Test::TestIntf::ice_staticId(), ctx).get()); - p->ice_ping_async().get(); - p->ice_ping_async(ctx).get(); + p->ice_pingAsync().get(); + p->ice_pingAsync(ctx).get(); - test(p->ice_ids_async().get().size() == 2); - test(p->ice_ids_async(ctx).get().size() == 2); + test(p->ice_idsAsync().get().size() == 2); + test(p->ice_idsAsync(ctx).get().size() == 2); if(!collocated) { - test(p->ice_getConnection_async().get()); + test(p->ice_getConnectionAsync().get()); } - p->op_async().get(); - p->op_async(ctx).get(); + p->opAsync().get(); + p->opAsync(ctx).get(); - test(p->opWithResult_async().get() == 15); - test(p->opWithResult_async(ctx).get() == 15); + test(p->opWithResultAsync().get() == 15); + test(p->opWithResultAsync(ctx).get() == 15); try { - p->opWithUE_async().get(); + p->opWithUEAsync().get(); test(false); } catch(const Test::TestIntfException&) @@ -1319,7 +1319,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { - p->opWithUE_async(ctx).get(); + p->opWithUEAsync(ctx).get(); test(false); } catch(const Test::TestIntfException&) @@ -1328,7 +1328,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { - p->opWithResultAndUE_async().get(); + p->opWithResultAndUEAsync().get(); test(false); } catch(const Test::TestIntfException&) @@ -1340,7 +1340,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { - p->opWithResultAndUE_async(ctx).get(); + p->opWithResultAndUEAsync(ctx).get(); test(false); } catch(const Test::TestIntfException&) @@ -1358,7 +1358,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<void> promise; - indirect->op_async( + indirect->opAsync( [&]() { promise.set_value(); @@ -1381,7 +1381,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { promise<int> promise; - p->ice_oneway()->opWithResult_async( + p->ice_oneway()->opWithResultAsync( [&](int value) { promise.set_value(value); @@ -1412,7 +1412,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { promise<void> promise; - p2->op_async( + p2->opAsync( [&]() { promise.set_value(); @@ -1434,7 +1434,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) cout << "testing local exceptions with future API... " << flush; { auto indirect = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy")); - auto r = indirect->op_async(); + auto r = indirect->opAsync(); try { r.get(); @@ -1447,7 +1447,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { - p->ice_oneway()->opWithResult_async().get(); + p->ice_oneway()->opWithResultAsync().get(); test(false); } catch(const IceUtil::IllegalArgumentException&) @@ -1468,7 +1468,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { - p2->op_async(); + p2->opAsync(); test(false); } catch(const Ice::CommunicatorDestroyedException&) @@ -1485,7 +1485,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<bool> promise; - i->ice_isA_async(Test::TestIntf::ice_staticId(), + i->ice_isAAsync(Test::TestIntf::ice_staticId(), [&](bool value) { promise.set_value(value); @@ -1506,7 +1506,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<void> promise; - i->op_async( + i->opAsync( [&]() { promise.set_value(); @@ -1528,7 +1528,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<void> promise; - i->opWithUE_async( + i->opWithUEAsync( [&]() { promise.set_value(); @@ -1551,7 +1551,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Ensures no exception is called when response is received { promise<bool> promise; - p->ice_isA_async( + p->ice_isAAsync( Test::TestIntf::ice_staticId(), [&](bool value) { @@ -1573,7 +1573,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<void> promise; - p->op_async( + p->opAsync( [&]() { promise.set_value(); @@ -1595,7 +1595,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // If response is a user exception, it should be received. { promise<void> promise; - p->opWithUE_async( + p->opWithUEAsync( [&]() { promise.set_value(); @@ -1623,7 +1623,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<bool> response; promise<bool> sent; - p->ice_isA_async("", + p->ice_isAAsync("", [&](bool value) { response.set_value(value); @@ -1645,7 +1645,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<void> response; promise<bool> sent; - p->ice_ping_async( + p->ice_pingAsync( [&]() { response.set_value(); @@ -1667,7 +1667,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<string> response; promise<bool> sent; - p->ice_id_async( + p->ice_idAsync( [&](string value) { response.set_value(value); @@ -1689,7 +1689,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<vector<string>> response; promise<bool> sent; - p->ice_ids_async( + p->ice_idsAsync( [&](vector<string> value) { response.set_value(value); @@ -1711,7 +1711,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<void> response; promise<bool> sent; - p->op_async( + p->opAsync( [&]() { response.set_value(); @@ -1739,7 +1739,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { auto s = make_shared<promise<bool>>(); auto f = s->get_future(); - p->opWithPayload_async( + p->opWithPayloadAsync( seq, [](){}, [s](const exception_ptr& ex) @@ -1775,7 +1775,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { { promise<void> promise; - p->op_async( + p->opAsync( [&, i]() { promise.set_value(); @@ -1799,7 +1799,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<void> promise; - p->op_async(nullptr, nullptr, + p->opAsync(nullptr, nullptr, [&, i](bool) { promise.set_value(); @@ -1828,7 +1828,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) b1->opBatch(); auto id = this_thread::get_id(); promise<void> promise; - b1->ice_flushBatchRequests_async( + b1->ice_flushBatchRequestsAsync( [&](const exception_ptr& ex) { promise.set_exception(ex); @@ -1852,7 +1852,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) auto id = this_thread::get_id(); promise<void> promise; - b1->ice_flushBatchRequests_async( + b1->ice_flushBatchRequestsAsync( [&](const exception_ptr& ex) { promise.set_exception(ex); @@ -1883,7 +1883,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) auto id = this_thread::get_id(); promise<void> promise; - b1->ice_getConnection()->flushBatchRequests_async( + b1->ice_getConnection()->flushBatchRequestsAsync( [&](const exception_ptr& ex) { promise.set_exception(ex); @@ -1902,7 +1902,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Ensure it also works with a twoway proxy auto id = this_thread::get_id(); promise<void> promise; - p->ice_getConnection()->flushBatchRequests_async( + p->ice_getConnection()->flushBatchRequestsAsync( [&](const exception_ptr& ex) { promise.set_exception(ex); @@ -1925,7 +1925,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) b1->ice_getConnection()->close(false); promise<void> promise; - b1->ice_getConnection()->flushBatchRequests_async( + b1->ice_getConnection()->flushBatchRequestsAsync( [&](exception_ptr ex) { promise.set_exception(move(ex)); @@ -1960,7 +1960,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) b1->opBatch(); b1->opBatch(); - communicator->flushBatchRequests_async().get(); + communicator->flushBatchRequestsAsync().get(); test(p->waitForBatch(2)); } @@ -1976,7 +1976,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<void> promise; auto id = this_thread::get_id(); - communicator->flushBatchRequests_async( + communicator->flushBatchRequestsAsync( [&](exception_ptr ex) { promise.set_exception(move(ex)); @@ -2004,7 +2004,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<void> promise; auto id = this_thread::get_id(); - communicator->flushBatchRequests_async( + communicator->flushBatchRequestsAsync( [&](exception_ptr ex) { promise.set_exception(move(ex)); @@ -2038,7 +2038,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<void> promise; auto id = this_thread::get_id(); - communicator->flushBatchRequests_async( + communicator->flushBatchRequestsAsync( [&](exception_ptr ex) { promise.set_exception(move(ex)); @@ -2075,7 +2075,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) promise<void> promise; auto id = this_thread::get_id(); - communicator->flushBatchRequests_async( + communicator->flushBatchRequestsAsync( [&](exception_ptr ex) { promise.set_exception(move(ex)); @@ -2099,7 +2099,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) testController->holdAdapter(); { promise<void> promise; - auto cancel = p->ice_ping_async( + auto cancel = p->ice_pingAsync( [&]() { promise.set_value(); @@ -2127,7 +2127,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { promise<void> promise; - auto cancel = p->ice_id_async( + auto cancel = p->ice_idAsync( [&](string) { promise.set_value(); diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp index 29f12169332..f5fdc059870 100644 --- a/cpp/test/Ice/background/AllTests.cpp +++ b/cpp/test/Ice/background/AllTests.cpp @@ -172,7 +172,7 @@ public: _background->ice_twoway()->ice_ping(); } #ifdef ICE_CPP11_MAPPING - _background->op_async(); + _background->opAsync(); #else _background->begin_op(); #endif @@ -282,8 +282,8 @@ allTests(const Ice::CommunicatorPtr& communicator) promise<void> p1; promise<void> p2; - bg->op_async([&p1](){ p1.set_value(); }, [&p1](exception_ptr e){ p1.set_exception(e); }); - bg->op_async([&p2](){ p2.set_value(); }, [&p2](exception_ptr e){ p2.set_exception(e); }); + bg->opAsync([&p1](){ p1.set_value(); }, [&p1](exception_ptr e){ p1.set_exception(e); }); + bg->opAsync([&p2](){ p2.set_value(); }, [&p2](exception_ptr e){ p2.set_exception(e); }); auto f1 = p1.get_future(); auto f2 = p2.get_future(); @@ -340,8 +340,8 @@ allTests(const Ice::CommunicatorPtr& communicator) promise<void> p1; promise<void> p2; - bg->op_async([&p1](){ p1.set_value(); }, [&p1](exception_ptr e){ p1.set_exception(e); }); - bg->op_async([&p2](){ p2.set_value(); }, [&p2](exception_ptr e){ p2.set_exception(e); }); + bg->opAsync([&p1](){ p1.set_value(); }, [&p1](exception_ptr e){ p1.set_exception(e); }); + bg->opAsync([&p2](){ p2.set_value(); }, [&p2](exception_ptr e){ p2.set_exception(e); }); auto f1 = p1.get_future(); auto f2 = p2.get_future(); @@ -378,14 +378,14 @@ allTests(const Ice::CommunicatorPtr& communicator) backgroundController->buffered(true); #ifdef ICE_CPP11_MAPPING - background->op_async(); + background->opAsync(); background->ice_getCachedConnection()->close(true); - background->op_async(); + background->opAsync(); vector<future<void>> results; for(int i = 0; i < 10000; ++i) { - auto f = background->op_async(); + auto f = background->opAsync(); if(i % 50 == 0) { backgroundController->holdAdapter(); @@ -479,7 +479,7 @@ connectTests(const ConfigurationPtr& configuration, const Test::BackgroundPrxPtr { promise<void> completed; promise<bool> sent; - prx->op_async( + prx->opAsync( [&completed]() { test(false); @@ -500,7 +500,7 @@ connectTests(const ConfigurationPtr& configuration, const Test::BackgroundPrxPtr promise<void> completed; promise<bool> sent; - prx->op_async( + prx->opAsync( [&completed]() { test(false); @@ -625,7 +625,7 @@ initializeTests(const ConfigurationPtr& configuration, promise<bool> sent; promise<void> completed; - prx->op_async( + prx->opAsync( []() { test(false); @@ -875,7 +875,7 @@ validationTests(const ConfigurationPtr& configuration, promise<bool> sent; promise<void> completed; - prx->op_async( + prx->opAsync( []() { test(false); @@ -948,7 +948,7 @@ validationTests(const ConfigurationPtr& configuration, configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); #ifdef ICE_CPP11_MAPPING promise<void> completed; - background->op_async( + background->opAsync( []() { test(false); @@ -995,7 +995,7 @@ validationTests(const ConfigurationPtr& configuration, promise<bool> s1; promise<bool> s2; - background->op_async( + background->opAsync( [&p1]() { p1.set_value(); @@ -1009,7 +1009,7 @@ validationTests(const ConfigurationPtr& configuration, s1.set_value(value); }); - background->op_async( + background->opAsync( [&p2]() { p2.set_value(); @@ -1159,7 +1159,7 @@ validationTests(const ConfigurationPtr& configuration, backgroundBatchOneway->op(); ctl->resumeAdapter(); #ifdef ICE_CPP11_MAPPING - backgroundBatchOneway->ice_flushBatchRequests_async(); + backgroundBatchOneway->ice_flushBatchRequestsAsync(); #else backgroundBatchOneway->begin_ice_flushBatchRequests(); #endif @@ -1172,7 +1172,7 @@ validationTests(const ConfigurationPtr& configuration, backgroundBatchOneway->opWithPayload(seq); ctl->resumeAdapter(); #ifdef ICE_CPP11_MAPPING - backgroundBatchOneway->ice_flushBatchRequests_async().get(); + backgroundBatchOneway->ice_flushBatchRequestsAsync().get(); #else r = backgroundBatchOneway->begin_ice_flushBatchRequests(); // @@ -1226,7 +1226,7 @@ readWriteTests(const ConfigurationPtr& configuration, #ifdef ICE_CPP11_MAPPING promise<bool> sent; promise<void> completed; - prx->op_async( + prx->opAsync( []() { test(false); @@ -1285,7 +1285,7 @@ readWriteTests(const ConfigurationPtr& configuration, configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); #ifdef ICE_CPP11_MAPPING promise<void> completed; - background->op_async( + background->opAsync( []() { test(false); @@ -1375,7 +1375,7 @@ readWriteTests(const ConfigurationPtr& configuration, #ifdef ICE_CPP11_MAPPING promise<void> completed; promise<bool> sent; - prx->op_async( + prx->opAsync( []() { test(false); @@ -1438,7 +1438,7 @@ readWriteTests(const ConfigurationPtr& configuration, configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); #ifdef ICE_CPP11_MAPPING promise<void> completed; - background->op_async( + background->opAsync( []() { test(false); @@ -1483,7 +1483,7 @@ readWriteTests(const ConfigurationPtr& configuration, configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); #ifdef ICE_CPP11_MAPPING promise<void> completed; - background->op_async( + background->opAsync( []() { test(false); @@ -1547,7 +1547,7 @@ readWriteTests(const ConfigurationPtr& configuration, // Fill up the receive and send buffers for(int i = 0; i < 200; ++i) // 2MB { - backgroundOneway->opWithPayload_async( + backgroundOneway->opWithPayloadAsync( seq, []() { @@ -1561,7 +1561,7 @@ readWriteTests(const ConfigurationPtr& configuration, promise<void> c1; promise<bool> s1; - background->op_async( + background->opAsync( [&c1]() { c1.set_value(); @@ -1579,7 +1579,7 @@ readWriteTests(const ConfigurationPtr& configuration, promise<void> c2; promise<bool> s2; - background->op_async( + background->opAsync( [&c2]() { c2.set_value(); @@ -1597,7 +1597,7 @@ readWriteTests(const ConfigurationPtr& configuration, test(fs2.wait_for(chrono::milliseconds(0)) != future_status::ready); promise<bool> s3; - backgroundOneway->opWithPayload_async(seq, + backgroundOneway->opWithPayloadAsync(seq, [](){ test(false); }, [](exception_ptr){ test(false); }, [&s3](bool value){ s3.set_value(value); }); @@ -1605,7 +1605,7 @@ readWriteTests(const ConfigurationPtr& configuration, test(fs3.wait_for(chrono::milliseconds(0)) != future_status::ready); promise<bool> s4; - backgroundOneway->opWithPayload_async(seq, + backgroundOneway->opWithPayloadAsync(seq, [](){ test(false); }, [](exception_ptr){ test(false); }, [&s4](bool value){ s4.set_value(value); }); diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index 62556a9cb40..a15140bb1c4 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -24,10 +24,10 @@ public: #ifdef ICE_CPP11_MAPPING virtual void - findAdapterById_async(string, - function<void (const shared_ptr<Ice::ObjectPrx>&)> response, - function<void (exception_ptr)>, - const Ice::Current& current) const + findAdapterByIdAsync(string, + function<void (const shared_ptr<Ice::ObjectPrx>&)> response, + function<void (exception_ptr)>, + const Ice::Current& current) const { _controller->checkCallPause(current); Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); @@ -35,10 +35,10 @@ public: } virtual void - findObjectById_async(Ice::Identity id, - function<void (const shared_ptr<Ice::ObjectPrx>&)> response, - function<void (exception_ptr)>, - const Ice::Current& current) const + findObjectByIdAsync(Ice::Identity id, + function<void (const shared_ptr<Ice::ObjectPrx>&)> response, + function<void (exception_ptr)>, + const Ice::Current& current) const { _controller->checkCallPause(current); Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index 49bb4b6ae7f..e2f8a0e24a4 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -68,7 +68,7 @@ string getAdapterNameWithAMI(const TestIntfPrxPtr& test) { #ifdef ICE_CPP11_MAPPING - return test->getAdapterName_async().get(); + return test->getAdapterNameAsync().get(); #else GetAdapterNameCBPtr cb = new GetAdapterNameCB(); test->begin_getAdapterName( @@ -280,7 +280,7 @@ allTests(const Ice::CommunicatorPtr& communicator) for(i = 0; i < proxies.size(); i++) { #ifdef ICE_CPP11_MAPPING - proxies[i]->getAdapterName_async(); + proxies[i]->getAdapterNameAsync(); #else proxies[i]->begin_getAdapterName(); #endif diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp index f3de9e90647..67f4e56555c 100644 --- a/cpp/test/Ice/custom/TestAMDI.cpp +++ b/cpp/test/Ice/custom/TestAMDI.cpp @@ -18,66 +18,66 @@ TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING void -TestIntfI::opDoubleArray_async(std::pair<const Ice::Double*, const Ice::Double*> in, - std::function<void (const Test::DoubleSeq&, const Test::DoubleSeq&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opDoubleArrayAsync(std::pair<const Ice::Double*, const Ice::Double*> in, + std::function<void (const Test::DoubleSeq&, const Test::DoubleSeq&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::DoubleSeq out(in.first, in.second); response(out, out); } void -TestIntfI::opBoolArray_async(std::pair<const bool*, const bool*> in, - std::function<void (const Test::BoolSeq&, const Test::BoolSeq&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opBoolArrayAsync(std::pair<const bool*, const bool*> in, + std::function<void (const Test::BoolSeq&, const Test::BoolSeq&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::BoolSeq out(in.first, in.second); response(out, out); } void -TestIntfI::opByteArray_async(std::pair<const Ice::Byte*, const Ice::Byte*> in, - std::function<void (const std::pair<const Ice::Byte*, const Ice::Byte*>&, - const std::pair<const Ice::Byte*, const Ice::Byte*>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opByteArrayAsync(std::pair<const Ice::Byte*, const Ice::Byte*> in, + std::function<void (const std::pair<const Ice::Byte*, const Ice::Byte*>&, + const std::pair<const Ice::Byte*, const Ice::Byte*>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opVariableArray_async(std::pair<const Test::Variable*, const Test::Variable*> in, - std::function<void (const Test::VariableList&, const Test::VariableList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opVariableArrayAsync(std::pair<const Test::Variable*, const Test::Variable*> in, + std::function<void (const Test::VariableList&, const Test::VariableList&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::VariableList out(in.first, in.second); response(out, out); } void -TestIntfI::opBoolRange_async(std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator> in, - std::function<void (const Test::BoolSeq&, const Test::BoolSeq&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opBoolRangeAsync(std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator> in, + std::function<void (const Test::BoolSeq&, const Test::BoolSeq&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::BoolSeq out(in.first, in.second); response(out, out); } void -TestIntfI::opByteRange_async(std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> in, - std::function<void (const std::pair<Test::ByteList::const_iterator, - Test::ByteList::const_iterator>&, - const std::pair<Test::ByteList::const_iterator, - Test::ByteList::const_iterator>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opByteRangeAsync(std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> in, + std::function<void (const std::pair<Test::ByteList::const_iterator, + Test::ByteList::const_iterator>&, + const std::pair<Test::ByteList::const_iterator, + Test::ByteList::const_iterator>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opVariableRange_async(std::pair<Test::VariableList::const_iterator, - Test::VariableList::const_iterator> in, - std::function<void (const Test::VariableList&, const Test::VariableList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opVariableRangeAsync(std::pair<Test::VariableList::const_iterator, + Test::VariableList::const_iterator> in, + std::function<void (const Test::VariableList&, const Test::VariableList&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::VariableList out(in.first, in.second); response(out, out); @@ -85,232 +85,232 @@ TestIntfI::opVariableRange_async(std::pair<Test::VariableList::const_iterator, void -TestIntfI::opByteRangeType_async(std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> in, - std::function<void (const Test::ByteList&, const Test::ByteList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opByteRangeTypeAsync(std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> in, + std::function<void (const Test::ByteList&, const Test::ByteList&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::ByteList out(in.first, in.second); response(out, out); } void -TestIntfI::opVariableRangeType_async(std::pair<std::deque<Test::Variable>::const_iterator, - std::deque<Test::Variable>::const_iterator> in, - std::function<void (const Test::VariableList&, - const Test::VariableList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opVariableRangeTypeAsync(std::pair<std::deque<Test::Variable>::const_iterator, + std::deque<Test::Variable>::const_iterator> in, + std::function<void (const Test::VariableList&, + const Test::VariableList&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::VariableList out(in.first, in.second); response(out, out); } void -TestIntfI::opBoolSeq_async(std::deque<bool> in, - std::function<void (const std::deque<bool>&, const std::deque<bool>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opBoolSeqAsync(std::deque<bool> in, + std::function<void (const std::deque<bool>&, const std::deque<bool>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opBoolList_async(Test::BoolList in, - std::function<void (const Test::BoolList&, const Test::BoolList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opBoolListAsync(Test::BoolList in, + std::function<void (const Test::BoolList&, const Test::BoolList&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opByteSeq_async(std::deque<Ice::Byte> in, - std::function<void (const std::deque<Ice::Byte>&, const std::deque<Ice::Byte>&)> response, +TestIntfI::opByteSeqAsync(std::deque<Ice::Byte> in, + std::function<void (const std::deque<Ice::Byte>&, const std::deque<Ice::Byte>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) +{ + response(in, in); +} + +void +TestIntfI::opByteListAsync(Test::ByteList in, + std::function<void (const Test::ByteList&, const Test::ByteList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opByteList_async(Test::ByteList in, - std::function<void (const Test::ByteList&, const Test::ByteList&)> response, +TestIntfI::opMyByteSeqAsync(MyByteSeq in, + std::function<void (const MyByteSeq&, const MyByteSeq&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opMyByteSeq_async(MyByteSeq in, - std::function<void (const MyByteSeq&, const MyByteSeq&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opStringAsync(Util::string_view in, + std::function<void (const Util::string_view&, const Util::string_view&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opString_async(Util::string_view in, - std::function<void (const Util::string_view&, const Util::string_view&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opStringSeqAsync(std::deque<std::string> in, + std::function<void (const std::deque<std::string>&, const std::deque<std::string>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opStringSeq_async(std::deque<std::string> in, - std::function<void (const std::deque<std::string>&, const std::deque<std::string>&)> response, +TestIntfI::opStringListAsync(Test::StringList in, + std::function<void (const Test::StringList&, const Test::StringList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opStringList_async(Test::StringList in, - std::function<void (const Test::StringList&, const Test::StringList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opFixedSeqAsync(std::deque<Test::Fixed> in, + std::function<void (const std::deque<Test::Fixed>&, + const std::deque<Test::Fixed>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opFixedSeq_async(std::deque<Test::Fixed> in, - std::function<void (const std::deque<Test::Fixed>&, - const std::deque<Test::Fixed>&)> response, +TestIntfI::opFixedListAsync(Test::FixedList in, + std::function<void (const Test::FixedList&, const Test::FixedList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } + void -TestIntfI::opFixedList_async(Test::FixedList in, - std::function<void (const Test::FixedList&, const Test::FixedList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opVariableSeqAsync(std::deque<Test::Variable> in, + std::function<void (const std::deque<Test::Variable>&, + const std::deque<Test::Variable>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } - void -TestIntfI::opVariableSeq_async(std::deque<Test::Variable> in, - std::function<void (const std::deque<Test::Variable>&, - const std::deque<Test::Variable>&)> response, +TestIntfI::opVariableListAsync(Test::VariableList in, + std::function<void (const Test::VariableList&, const Test::VariableList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opVariableList_async(Test::VariableList in, - std::function<void (const Test::VariableList&, const Test::VariableList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opStringStringDictSeqAsync(std::deque<Test::StringStringDict> in, + std::function<void (const std::deque<Test::StringStringDict>&, + const std::deque<Test::StringStringDict>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opStringStringDictSeq_async(std::deque<Test::StringStringDict> in, - std::function<void (const std::deque<Test::StringStringDict>&, - const std::deque<Test::StringStringDict>&)> response, +TestIntfI::opStringStringDictListAsync(Test::StringStringDictList in, + std::function<void (const Test::StringStringDictList&, + const Test::StringStringDictList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opStringStringDictList_async(Test::StringStringDictList in, - std::function<void (const Test::StringStringDictList&, - const Test::StringStringDictList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opESeqAsync(std::deque<Test::E> in, + std::function<void (const std::deque<Test::E>&, const std::deque<Test::E>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opESeq_async(std::deque<Test::E> in, - std::function<void (const std::deque<Test::E>&, const std::deque<Test::E>&)> response, +TestIntfI::opEListAsync(Test::EList in, + std::function<void (const Test::EList&, const Test::EList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opEList_async(Test::EList in, - std::function<void (const Test::EList&, const Test::EList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opCPrxSeqAsync(std::deque<std::shared_ptr<Ice::ObjectPrx>> in, + std::function<void (const std::deque<std::shared_ptr<Ice::ObjectPrx>>&, + const std::deque<std::shared_ptr<Ice::ObjectPrx>>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opCPrxSeq_async(std::deque<std::shared_ptr<Ice::ObjectPrx>> in, - std::function<void (const std::deque<std::shared_ptr<Ice::ObjectPrx>>&, - const std::deque<std::shared_ptr<Ice::ObjectPrx>>&)> response, +TestIntfI::opCPrxListAsync(Test::CPrxList in, + std::function<void (const Test::CPrxList&, const Test::CPrxList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opCPrxList_async(Test::CPrxList in, - std::function<void (const Test::CPrxList&, const Test::CPrxList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opCSeqAsync(std::deque<std::shared_ptr<Test::C>> in, + std::function<void (const std::deque<std::shared_ptr<Test::C>>&, + const std::deque<std::shared_ptr<Test::C>>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opCSeq_async(std::deque<std::shared_ptr<Test::C>> in, - std::function<void (const std::deque<std::shared_ptr<Test::C>>&, - const std::deque<std::shared_ptr<Test::C>>&)> response, +TestIntfI::opCListAsync(Test::CList in, + std::function<void (const Test::CList&, const Test::CList&)> response, std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opCList_async(Test::CList in, - std::function<void (const Test::CList&, const Test::CList&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) -{ - response(in, in); -} - -void -TestIntfI::opClassStruct_async(Test::ClassStruct in1, Test::ClassStructSeq in2, - std::function<void (const Test::ClassStruct&, - const Test::ClassStruct&, const Test::ClassStructSeq&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opClassStructAsync(Test::ClassStruct in1, Test::ClassStructSeq in2, + std::function<void (const Test::ClassStruct&, + const Test::ClassStruct&, const Test::ClassStructSeq&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in1, in1, in2); } void -TestIntfI::opOutArrayByteSeq_async(Test::ByteSeq in, - std::function<void (const std::pair<const Ice::Byte*, const Ice::Byte*>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opOutArrayByteSeqAsync(Test::ByteSeq in, + std::function<void (const std::pair<const Ice::Byte*, const Ice::Byte*>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(std::make_pair(in.data(), in.data() + in.size())); } void -TestIntfI::opOutRangeByteSeq_async(Test::ByteSeq in, - std::function<void (const std::pair<Test::ByteSeq::const_iterator, - Test::ByteSeq::const_iterator>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opOutRangeByteSeqAsync(Test::ByteSeq in, + std::function<void (const std::pair<Test::ByteSeq::const_iterator, + Test::ByteSeq::const_iterator>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(std::make_pair(in.begin(), in.end())); } void -TestIntfI::opIntStringDict_async(Test::IntStringDict in, - std::function<void (const Test::IntStringDict&, const Test::IntStringDict&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opIntStringDictAsync(Test::IntStringDict in, + std::function<void (const Test::IntStringDict&, const Test::IntStringDict&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opVarDict_async(Test::CustomMap<std::string, Ice::Int> in, - std::function<void (const Test::CustomMap<Ice::Long, Ice::Long>&, - const Test::CustomMap<std::string, Ice::Int>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opVarDictAsync(Test::CustomMap<std::string, Ice::Int> in, + std::function<void (const Test::CustomMap<Ice::Long, Ice::Long>&, + const Test::CustomMap<std::string, Ice::Int>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { Test::CustomMap<Ice::Long, Ice::Long> result; for(Ice::Long i = 0; i < 1000; ++i) @@ -321,44 +321,44 @@ TestIntfI::opVarDict_async(Test::CustomMap<std::string, Ice::Int> in, } void -TestIntfI::opCustomIntStringDict_async(std::map<Ice::Int, ::Util::string_view> in, - std::function<void (const std::map<Ice::Int, ::Util::string_view>&, - const std::map<Ice::Int, ::Util::string_view>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opCustomIntStringDictAsync(std::map<Ice::Int, ::Util::string_view> in, + std::function<void (const std::map<Ice::Int, ::Util::string_view>&, + const std::map<Ice::Int, ::Util::string_view>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opShortBuffer_async(Test::ShortBuffer in, - std::function<void (const Test::ShortBuffer&, const Test::ShortBuffer&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opShortBufferAsync(Test::ShortBuffer in, + std::function<void (const Test::ShortBuffer&, const Test::ShortBuffer&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opBoolBuffer_async(Test::CustomBuffer<bool> in, - std::function<void (const Test::CustomBuffer<bool>&, - const Test::CustomBuffer<bool>&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opBoolBufferAsync(Test::CustomBuffer<bool> in, + std::function<void (const Test::CustomBuffer<bool>&, + const Test::CustomBuffer<bool>&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -TestIntfI::opBufferStruct_async(Test::BufferStruct in, - std::function<void (const Test::BufferStruct&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::opBufferStructAsync(Test::BufferStruct in, + std::function<void (const Test::BufferStruct&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in); } void -TestIntfI::shutdown_async(std::function<void ()> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +TestIntfI::shutdownAsync(std::function<void ()> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { _communicator->shutdown(); response(); @@ -421,7 +421,7 @@ TestIntfI::opByteRange_async(const Test::AMD_TestIntf_opByteRangePtr& opByteRang void TestIntfI::opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr& opVariableRangeCB, const std::pair<Test::VariableList::const_iterator, - Test::VariableList::const_iterator>& inSeq, + Test::VariableList::const_iterator>& inSeq, const Ice::Current&) { Test::VariableList outSeq(inSeq.first, inSeq.second); @@ -440,7 +440,7 @@ TestIntfI::opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr& op void TestIntfI::opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTypePtr& opVariableRangeTypeCB, const std::pair<std::deque<Test::Variable>::const_iterator, - std::deque<Test::Variable>::const_iterator>& inSeq, + std::deque<Test::Variable>::const_iterator>& inSeq, const Ice::Current&) { Test::VariableList outSeq; @@ -498,8 +498,8 @@ TestIntfI::opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr& opMyByteSe void TestIntfI::opString_async(const Test::AMD_TestIntf_opStringPtr& opStringCB, - const Util::string_view& inString, - const Ice::Current&) + const Util::string_view& inString, + const Ice::Current&) { opStringCB->ice_response(inString, inString); } @@ -614,8 +614,8 @@ TestIntfI::opCPrxList_async(const Test::AMD_TestIntf_opCPrxListPtr& opCPrxListCB void TestIntfI::opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr& opCSeqCB, - const std::deque<Test::CPtr>& inSeq, - const Ice::Current&) + const std::deque<Test::CPtr>& inSeq, + const Ice::Current&) { std::deque<Test::CPtr> outSeq(inSeq); opCSeqCB->ice_response(outSeq, outSeq); @@ -623,8 +623,8 @@ TestIntfI::opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr& opCSeqCB, void TestIntfI::opCList_async(const Test::AMD_TestIntf_opCListPtr& opCListCB, - const Test::CList& inSeq, - const Ice::Current&) + const Test::CList& inSeq, + const Ice::Current&) { Test::CList outSeq(inSeq); opCListCB->ice_response(outSeq, outSeq); @@ -646,7 +646,7 @@ TestIntfI::opOutArrayByteSeq_async(const Test::AMD_TestIntf_opOutArrayByteSeqPtr const Ice::Current&) { cb->ice_response(std::pair<const Ice::Byte*, - const Ice::Byte*>(&inS[0], &inS[0] + inS.size())); + const Ice::Byte*>(&inS[0], &inS[0] + inS.size())); } void @@ -655,7 +655,7 @@ TestIntfI::opOutRangeByteSeq_async(const Test::AMD_TestIntf_opOutRangeByteSeqPtr const Ice::Current&) { cb->ice_response(std::pair<Test::ByteSeq::const_iterator, - Test::ByteSeq::const_iterator>(inS.begin(), inS.end())); + Test::ByteSeq::const_iterator>(inS.begin(), inS.end())); } void @@ -668,8 +668,8 @@ TestIntfI::opIntStringDict_async(const Test::AMD_TestIntf_opIntStringDictPtr& cb void TestIntfI::opVarDict_async(const Test::AMD_TestIntf_opVarDictPtr& cb, - const Test::CustomMap<std::string, Ice::Int>& inDict, - const Ice::Current&) + const Test::CustomMap<std::string, Ice::Int>& inDict, + const Ice::Current&) { Test::CustomMap<Ice::Long, Ice::Long> result; for(Ice::Long i = 0; i < 1000; ++i) diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h index 5987a408456..696d2fbdc4c 100644 --- a/cpp/test/Ice/custom/TestAMDI.h +++ b/cpp/test/Ice/custom/TestAMDI.h @@ -20,211 +20,211 @@ public: #ifdef ICE_CPP11_MAPPING - void opDoubleArray_async(std::pair<const ::Ice::Double*, const ::Ice::Double*>, - std::function<void (const ::Test::DoubleSeq&, const ::Test::DoubleSeq&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opDoubleArrayAsync(std::pair<const ::Ice::Double*, const ::Ice::Double*>, + std::function<void (const ::Test::DoubleSeq&, const ::Test::DoubleSeq&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opBoolArray_async(std::pair<const bool*, const bool*>, - std::function<void (const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opBoolArrayAsync(std::pair<const bool*, const bool*>, + std::function<void (const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opByteArray_async(std::pair<const ::Ice::Byte*, const ::Ice::Byte*>, - std::function<void (const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, - const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opByteArrayAsync(std::pair<const ::Ice::Byte*, const ::Ice::Byte*>, + std::function<void (const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, + const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; + + void opVariableArrayAsync(std::pair<const ::Test::Variable*, const ::Test::Variable*>, + std::function<void (const ::Test::VariableList&, const ::Test::VariableList&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opVariableArray_async(std::pair<const ::Test::Variable*, const ::Test::Variable*>, - std::function<void (const ::Test::VariableList&, const ::Test::VariableList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opBoolRangeAsync(std::pair< ::Test::BoolSeq::const_iterator, ::Test::BoolSeq::const_iterator>, + std::function<void (const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opBoolRange_async(std::pair< ::Test::BoolSeq::const_iterator, ::Test::BoolSeq::const_iterator>, - std::function<void (const ::Test::BoolSeq&, const ::Test::BoolSeq&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opByteRangeAsync(std::pair< ::Test::ByteList::const_iterator, ::Test::ByteList::const_iterator>, + std::function<void (const std::pair< ::Test::ByteList::const_iterator, + ::Test::ByteList::const_iterator>&, + const std::pair< ::Test::ByteList::const_iterator, + ::Test::ByteList::const_iterator>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; + + void opVariableRangeAsync(std::pair< ::Test::VariableList::const_iterator, + ::Test::VariableList::const_iterator>, + std::function<void (const ::Test::VariableList&, const ::Test::VariableList&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opByteRange_async(std::pair< ::Test::ByteList::const_iterator, ::Test::ByteList::const_iterator>, - std::function<void (const std::pair< ::Test::ByteList::const_iterator, - ::Test::ByteList::const_iterator>&, - const std::pair< ::Test::ByteList::const_iterator, - ::Test::ByteList::const_iterator>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opVariableRange_async(std::pair< ::Test::VariableList::const_iterator, - ::Test::VariableList::const_iterator>, - std::function<void (const ::Test::VariableList&, const ::Test::VariableList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opByteRangeTypeAsync(std::pair< ::Test::ByteList::const_iterator, ::Test::ByteList::const_iterator>, + std::function<void (const ::Test::ByteList&, const ::Test::ByteList&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opByteRangeType_async(std::pair< ::Test::ByteList::const_iterator, ::Test::ByteList::const_iterator>, - std::function<void (const ::Test::ByteList&, const ::Test::ByteList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opVariableRangeTypeAsync(std::pair<std::deque< ::Test::Variable>::const_iterator, + std::deque< ::Test::Variable>::const_iterator>, + std::function<void (const ::Test::VariableList&, + const ::Test::VariableList&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opVariableRangeType_async(std::pair<std::deque< ::Test::Variable>::const_iterator, - std::deque< ::Test::Variable>::const_iterator>, - std::function<void (const ::Test::VariableList&, - const ::Test::VariableList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opBoolSeqAsync(std::deque<bool>, + std::function<void (const std::deque<bool>&, const std::deque<bool>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opBoolSeq_async(std::deque<bool>, - std::function<void (const std::deque<bool>&, const std::deque<bool>&)>, + void opBoolListAsync(::Test::BoolList, + std::function<void (const ::Test::BoolList&, const ::Test::BoolList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opBoolList_async(::Test::BoolList, - std::function<void (const ::Test::BoolList&, const ::Test::BoolList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opByteSeqAsync(std::deque< ::Ice::Byte>, + std::function<void (const std::deque< ::Ice::Byte>&, const std::deque< ::Ice::Byte>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opByteSeq_async(std::deque< ::Ice::Byte>, - std::function<void (const std::deque< ::Ice::Byte>&, const std::deque< ::Ice::Byte>&)>, + void opByteListAsync(::Test::ByteList, + std::function<void (const ::Test::ByteList&, const ::Test::ByteList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opByteList_async(::Test::ByteList, - std::function<void (const ::Test::ByteList&, const ::Test::ByteList&)>, + void opMyByteSeqAsync(MyByteSeq, + std::function<void (const MyByteSeq&, const MyByteSeq&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opMyByteSeq_async(MyByteSeq, - std::function<void (const MyByteSeq&, const MyByteSeq&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; - + void opStringAsync(Util::string_view, + std::function<void (const Util::string_view&, const Util::string_view&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opString_async(Util::string_view, - std::function<void (const Util::string_view&, const Util::string_view&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opStringSeqAsync(std::deque<std::string>, + std::function<void (const std::deque<std::string>&, const std::deque<std::string>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opStringSeq_async(std::deque<std::string>, - std::function<void (const std::deque<std::string>&, const std::deque<std::string>&)>, + void opStringListAsync(::Test::StringList, + std::function<void (const ::Test::StringList&, const ::Test::StringList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opStringList_async(::Test::StringList, - std::function<void (const ::Test::StringList&, const ::Test::StringList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opFixedSeqAsync(std::deque< ::Test::Fixed>, + std::function<void (const std::deque< ::Test::Fixed>&, + const std::deque< ::Test::Fixed>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opFixedSeq_async(std::deque< ::Test::Fixed>, - std::function<void (const std::deque< ::Test::Fixed>&, - const std::deque< ::Test::Fixed>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opFixedListAsync(::Test::FixedList, + std::function<void (const ::Test::FixedList&, const ::Test::FixedList&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opFixedList_async(::Test::FixedList, - std::function<void (const ::Test::FixedList&, const ::Test::FixedList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opVariableSeqAsync(std::deque< ::Test::Variable>, + std::function<void (const std::deque< ::Test::Variable>&, + const std::deque< ::Test::Variable>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opVariableSeq_async(std::deque< ::Test::Variable>, - std::function<void (const std::deque< ::Test::Variable>&, - const std::deque< ::Test::Variable>&)>, + void opVariableListAsync(::Test::VariableList, + std::function<void (const ::Test::VariableList&, const ::Test::VariableList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opVariableList_async(::Test::VariableList, - std::function<void (const ::Test::VariableList&, const ::Test::VariableList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + + void opStringStringDictSeqAsync(std::deque< ::Test::StringStringDict>, + std::function<void (const std::deque< ::Test::StringStringDict>&, + const std::deque< ::Test::StringStringDict>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opStringStringDictSeq_async(std::deque< ::Test::StringStringDict>, - std::function<void (const std::deque< ::Test::StringStringDict>&, - const std::deque< ::Test::StringStringDict>&)>, + void opStringStringDictListAsync(::Test::StringStringDictList, + std::function<void (const ::Test::StringStringDictList&, + const ::Test::StringStringDictList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opStringStringDictList_async(::Test::StringStringDictList, - std::function<void (const ::Test::StringStringDictList&, - const ::Test::StringStringDictList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opESeqAsync(std::deque< ::Test::E>, + std::function<void (const std::deque< ::Test::E>&, const std::deque< ::Test::E>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opESeq_async(std::deque< ::Test::E>, - std::function<void (const std::deque< ::Test::E>&, const std::deque< ::Test::E>&)>, + void opEListAsync(::Test::EList, + std::function<void (const ::Test::EList&, const ::Test::EList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opEList_async(::Test::EList, - std::function<void (const ::Test::EList&, const ::Test::EList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opCPrxSeqAsync(std::deque<std::shared_ptr<Ice::ObjectPrx>>, + std::function<void (const std::deque<std::shared_ptr<Ice::ObjectPrx>>&, + const std::deque<std::shared_ptr<Ice::ObjectPrx>>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opCPrxSeq_async(std::deque<std::shared_ptr<Ice::ObjectPrx>>, - std::function<void (const std::deque<std::shared_ptr<Ice::ObjectPrx>>&, - const std::deque<std::shared_ptr<Ice::ObjectPrx>>&)>, + void opCPrxListAsync(::Test::CPrxList, + std::function<void (const ::Test::CPrxList&, const ::Test::CPrxList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opCPrxList_async(::Test::CPrxList, - std::function<void (const ::Test::CPrxList&, const ::Test::CPrxList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opCSeqAsync(std::deque<std::shared_ptr<Test::C>>, + std::function<void (const std::deque<std::shared_ptr<Test::C>>&, + const std::deque<std::shared_ptr<Test::C>>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opCSeq_async(std::deque<std::shared_ptr<Test::C>>, - std::function<void (const std::deque<std::shared_ptr<Test::C>>&, - const std::deque<std::shared_ptr<Test::C>>&)>, + void opCListAsync(::Test::CList, + std::function<void (const ::Test::CList&, const ::Test::CList&)>, std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opCList_async(::Test::CList, - std::function<void (const ::Test::CList&, const ::Test::CList&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; - - - void opClassStruct_async(::Test::ClassStruct, ::Test::ClassStructSeq, - std::function<void (const ::Test::ClassStruct&, - const ::Test::ClassStruct&, const ::Test::ClassStructSeq&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opClassStructAsync(::Test::ClassStruct, ::Test::ClassStructSeq, + std::function<void (const ::Test::ClassStruct&, + const ::Test::ClassStruct&, const ::Test::ClassStructSeq&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opOutArrayByteSeq_async(::Test::ByteSeq, - std::function<void (const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opOutArrayByteSeqAsync(::Test::ByteSeq, + std::function<void (const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opOutRangeByteSeq_async(::Test::ByteSeq, - std::function<void (const std::pair< ::Test::ByteSeq::const_iterator, - ::Test::ByteSeq::const_iterator>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opOutRangeByteSeqAsync(::Test::ByteSeq, + std::function<void (const std::pair< ::Test::ByteSeq::const_iterator, + ::Test::ByteSeq::const_iterator>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opIntStringDict_async(::Test::IntStringDict, - std::function<void (const ::Test::IntStringDict&, const ::Test::IntStringDict&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opIntStringDictAsync(::Test::IntStringDict, + std::function<void (const ::Test::IntStringDict&, const ::Test::IntStringDict&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opVarDict_async(::Test::CustomMap<std::string, ::Ice::Int>, - std::function<void (const ::Test::CustomMap< ::Ice::Long, ::Ice::Long>&, - const ::Test::CustomMap<std::string, ::Ice::Int>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opVarDictAsync(::Test::CustomMap<std::string, ::Ice::Int>, + std::function<void (const ::Test::CustomMap< ::Ice::Long, ::Ice::Long>&, + const ::Test::CustomMap<std::string, ::Ice::Int>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opCustomIntStringDict_async(std::map< ::Ice::Int, ::Util::string_view>, - std::function<void (const std::map< ::Ice::Int, ::Util::string_view>&, - const std::map< ::Ice::Int, ::Util::string_view>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opCustomIntStringDictAsync(std::map< ::Ice::Int, ::Util::string_view>, + std::function<void (const std::map< ::Ice::Int, ::Util::string_view>&, + const std::map< ::Ice::Int, ::Util::string_view>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opShortBuffer_async(::Test::ShortBuffer, - std::function<void (const ::Test::ShortBuffer&, const ::Test::ShortBuffer&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opShortBufferAsync(::Test::ShortBuffer, + std::function<void (const ::Test::ShortBuffer&, const ::Test::ShortBuffer&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opBoolBuffer_async(::Test::CustomBuffer<bool>, - std::function<void (const ::Test::CustomBuffer<bool>&, - const ::Test::CustomBuffer<bool>&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opBoolBufferAsync(::Test::CustomBuffer<bool>, + std::function<void (const ::Test::CustomBuffer<bool>&, + const ::Test::CustomBuffer<bool>&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opBufferStruct_async(::Test::BufferStruct, - std::function<void (const ::Test::BufferStruct&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opBufferStructAsync(::Test::BufferStruct, + std::function<void (const ::Test::BufferStruct&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void shutdown_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void shutdownAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; #else @@ -254,7 +254,7 @@ public: virtual void opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr&, const std::pair<Test::VariableList::const_iterator, - Test::VariableList::const_iterator>&, + Test::VariableList::const_iterator>&, const Ice::Current&); virtual void opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr&, @@ -263,7 +263,7 @@ public: virtual void opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTypePtr&, const std::pair<std::deque<Test::Variable>::const_iterator, - std::deque<Test::Variable>::const_iterator>&, + std::deque<Test::Variable>::const_iterator>&, const Ice::Current&); virtual void opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr&, diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp index a63b8f1027b..08becc717e8 100644 --- a/cpp/test/Ice/custom/WstringAMDI.cpp +++ b/cpp/test/Ice/custom/WstringAMDI.cpp @@ -12,50 +12,50 @@ #ifdef ICE_CPP11_MAPPING void -Test1::WstringClassI::opString_async(std::wstring in, - std::function<void (const std::wstring&, const std::wstring&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +Test1::WstringClassI::opStringAsync(std::wstring in, + std::function<void (const std::wstring&, const std::wstring&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -Test1::WstringClassI::opStruct_async(Test1::WstringStruct in, - std::function<void (const Test1::WstringStruct&, const Test1::WstringStruct&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +Test1::WstringClassI::opStructAsync(Test1::WstringStruct in, + std::function<void (const Test1::WstringStruct&, const Test1::WstringStruct&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -Test1::WstringClassI::throwExcept_async(std::wstring in, - std::function<void ()>, - std::function<void (std::exception_ptr)> error, const Ice::Current&) +Test1::WstringClassI::throwExceptAsync(std::wstring in, + std::function<void ()>, + std::function<void (std::exception_ptr)> error, const Ice::Current&) { Test1::WstringException ex(in); error(std::make_exception_ptr(ex)); } void -Test2::WstringClassI::opString_async(std::wstring in, - std::function<void (const std::wstring&, const std::wstring&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +Test2::WstringClassI::opStringAsync(std::wstring in, + std::function<void (const std::wstring&, const std::wstring&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -Test2::WstringClassI::opStruct_async(Test2::WstringStruct in, - std::function<void (const Test2::WstringStruct&, const Test2::WstringStruct&)> response, - std::function<void (std::exception_ptr)>, const Ice::Current&) +Test2::WstringClassI::opStructAsync(Test2::WstringStruct in, + std::function<void (const Test2::WstringStruct&, const Test2::WstringStruct&)> response, + std::function<void (std::exception_ptr)>, const Ice::Current&) { response(in, in); } void -Test2::WstringClassI::throwExcept_async(std::wstring in, - std::function<void ()>, - std::function<void (std::exception_ptr)> error, const Ice::Current&) +Test2::WstringClassI::throwExceptAsync(std::wstring in, + std::function<void ()>, + std::function<void (std::exception_ptr)> error, const Ice::Current&) { Test2::WstringException ex(in); diff --git a/cpp/test/Ice/custom/WstringAMDI.h b/cpp/test/Ice/custom/WstringAMDI.h index e26c34cc995..2e92755c42c 100644 --- a/cpp/test/Ice/custom/WstringAMDI.h +++ b/cpp/test/Ice/custom/WstringAMDI.h @@ -20,17 +20,17 @@ class WstringClassI : public virtual WstringClassDisp { public: - void opString_async(std::wstring, - std::function<void (const std::wstring&, const std::wstring&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opStringAsync(std::wstring, + std::function<void (const std::wstring&, const std::wstring&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opStruct_async(::Test1::WstringStruct, - std::function<void (const ::Test1::WstringStruct&, const ::Test1::WstringStruct&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opStructAsync(::Test1::WstringStruct, + std::function<void (const ::Test1::WstringStruct&, const ::Test1::WstringStruct&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void throwExcept_async(std::wstring, - std::function<void ()>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void throwExceptAsync(std::wstring, + std::function<void ()>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; }; #else class WstringClassI : public virtual WstringClass @@ -59,17 +59,17 @@ class WstringClassI : public virtual WstringClassDisp { public: - void opString_async(std::wstring, - std::function<void (const std::wstring&, const std::wstring&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opStringAsync(std::wstring, + std::function<void (const std::wstring&, const std::wstring&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void opStruct_async(::Test2::WstringStruct, - std::function<void (const ::Test2::WstringStruct&, const ::Test2::WstringStruct&)>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void opStructAsync(::Test2::WstringStruct, + std::function<void (const ::Test2::WstringStruct&, const ::Test2::WstringStruct&)>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; - void throwExcept_async(std::wstring, - std::function<void ()>, - std::function<void (std::exception_ptr)>, const Ice::Current&) override; + void throwExceptAsync(std::wstring, + std::function<void ()>, + std::function<void (std::exception_ptr)>, const Ice::Current&) override; }; #else diff --git a/cpp/test/Ice/dispatcher/AllTests.cpp b/cpp/test/Ice/dispatcher/AllTests.cpp index b4ec7f46bb0..7b79b132f9f 100644 --- a/cpp/test/Ice/dispatcher/AllTests.cpp +++ b/cpp/test/Ice/dispatcher/AllTests.cpp @@ -130,7 +130,7 @@ allTests(const Ice::CommunicatorPtr& communicator) CallbackPtr cb = ICE_MAKE_SHARED(Callback); #ifdef ICE_CPP11_MAPPING - p->op_async( + p->opAsync( [cb]() { cb->response(); @@ -149,7 +149,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cb->check(); auto i = p->ice_adapterId("dummy"); - i->op_async( + i->opAsync( [cb]() { cb->response(); @@ -172,7 +172,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Expect InvocationTimeoutException. // auto to = p->ice_invocationTimeout(250); - to->sleep_async(500, + to->sleepAsync(500, [cb]() { cb->responseEx(); @@ -206,7 +206,7 @@ allTests(const Ice::CommunicatorPtr& communicator) auto fs = s->get_future(); auto c = make_shared<promise<void>>(); - p->opWithPayload_async(seq, + p->opWithPayloadAsync(seq, [=]() { c->set_value(); diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index a000cc34b03..18cd9d7539b 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -1151,7 +1151,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching exact types with new AMI mapping... " << flush; #ifdef ICE_CPP11_MAPPING { - auto f = thrower->throwAasA_async(1); + auto f = thrower->throwAasAAsync(1); try { f.get(); @@ -1172,7 +1172,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - auto f = thrower->throwAorDasAorD_async(1); + auto f = thrower->throwAorDasAorDAsync(1); try { f.get(); @@ -1189,7 +1189,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - auto f = thrower->throwAorDasAorD_async(-1); + auto f = thrower->throwAorDasAorDAsync(-1); try { f.get(); @@ -1205,7 +1205,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } } { - auto f = thrower->throwBasB_async(1, 2); + auto f = thrower->throwBasBAsync(1, 2); try { f.get(); @@ -1222,7 +1222,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } } { - auto f = thrower->throwCasC_async(1, 2, 3); + auto f = thrower->throwCasCAsync(1, 2, 3); try { f.get(); @@ -1240,7 +1240,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } } { - auto f = thrower->throwModA_async(1, 2); + auto f = thrower->throwModAAsync(1, 2); try { f.get(); @@ -1266,7 +1266,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // { promise<bool> sent; - thrower->throwAasA_async(1, + thrower->throwAasAAsync(1, []() { test(false); @@ -1281,7 +1281,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { promise<bool> sent; - thrower->throwAorDasAorD_async(1, + thrower->throwAorDasAorDAsync(1, []() { test(false); @@ -1296,7 +1296,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { promise<bool> sent; - thrower->throwAorDasAorD_async(-1, + thrower->throwAorDasAorDAsync(-1, []() { test(false); @@ -1311,7 +1311,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { promise<bool> sent; - thrower->throwBasB_async(1, 2, + thrower->throwBasBAsync(1, 2, []() { test(false); @@ -1326,7 +1326,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { promise<bool> sent; - thrower->throwCasC_async(1, 2, 3, + thrower->throwCasCAsync(1, 2, 3, []() { test(false); @@ -1341,7 +1341,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { promise<bool> sent; - thrower->throwModA_async(1, 2, + thrower->throwModAAsync(1, 2, []() { test(false); @@ -1402,7 +1402,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching derived types with new AMI mapping... " << flush; #ifdef ICE_CPP11_MAPPING { - auto f = thrower->throwBasA_async(1, 2); + auto f = thrower->throwBasAAsync(1, 2); try { f.get(); @@ -1419,7 +1419,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - auto f = thrower->throwCasA_async(1, 2, 3); + auto f = thrower->throwCasAAsync(1, 2, 3); try { f.get(); @@ -1437,7 +1437,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - auto f = thrower->throwCasB_async(1, 2, 3); + auto f = thrower->throwCasBAsync(1, 2, 3); try { f.get(); @@ -1485,7 +1485,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching unknown user exception with new AMI mapping... " << flush; #ifdef ICE_CPP11_MAPPING { - auto f = thrower->throwUndeclaredA_async(1); + auto f = thrower->throwUndeclaredAAsync(1); try { f.get(); @@ -1507,7 +1507,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - auto f = thrower->throwUndeclaredB_async(1, 2); + auto f = thrower->throwUndeclaredBAsync(1, 2); try { f.get(); @@ -1523,7 +1523,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - auto f = thrower->throwUndeclaredC_async(1, 2, 3); + auto f = thrower->throwUndeclaredCAsync(1, 2, 3); try { f.get(); @@ -1570,7 +1570,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING id = communicator->stringToIdentity("does not exist"); shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower->ice_identity(id)); - auto f = thrower2->throwAasA_async(1); + auto f = thrower2->throwAasAAsync(1); try { f.get(); @@ -1601,7 +1601,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower, "no such facet"); - auto f = thrower2->throwAasA_async(1); + auto f = thrower2->throwAasAAsync(1); try { f.get(); @@ -1627,7 +1627,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING shared_ptr<WrongOperationPrx> thrower4 = Ice::uncheckedCast<WrongOperationPrx>(thrower); - auto f = thrower4->noSuchOperation_async(); + auto f = thrower4->noSuchOperationAsync(); try { f.get(); @@ -1656,7 +1656,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching unknown local exception with new AMI mapping... " << flush; #ifdef ICE_CPP11_MAPPING { - auto f = thrower->throwLocalException_async(); + auto f = thrower->throwLocalExceptionAsync(); try { f.get(); @@ -1672,7 +1672,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - auto f = thrower->throwLocalExceptionIdempotent_async(); + auto f = thrower->throwLocalExceptionIdempotentAsync(); try { f.get(); @@ -1713,7 +1713,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - auto f = thrower->throwNonIceException_async(); + auto f = thrower->throwNonIceExceptionAsync(); try { f.get(); diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index db8039e9c6e..deb949defee 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -30,35 +30,35 @@ ThrowerI::ThrowerI() #ifdef ICE_CPP11_MAPPING void -ThrowerI::shutdown_async(function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current& current) +ThrowerI::shutdownAsync(function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current& current) { current.adapter->getCommunicator()->shutdown(); response(); } void -ThrowerI::supportsUndeclaredExceptions_async(function<void (bool)> response, - function<void (exception_ptr)>, - const Ice::Current&) +ThrowerI::supportsUndeclaredExceptionsAsync(function<void (bool)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(true); } void -ThrowerI::supportsAssertException_async(function<void (bool)> response, - function<void (exception_ptr)>, - const Ice::Current&) +ThrowerI::supportsAssertExceptionAsync(function<void (bool)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(false); } void -ThrowerI::throwAasA_async(int a, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwAasAAsync(int a, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -73,10 +73,10 @@ ThrowerI::throwAasA_async(int a, } void -ThrowerI::throwAorDasAorD_async(int a, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwAorDasAorDAsync(int a, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -100,10 +100,10 @@ ThrowerI::throwAorDasAorD_async(int a, } void -ThrowerI::throwBasA_async(int a, int b, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwBasAAsync(int a, int b, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -119,10 +119,10 @@ ThrowerI::throwBasA_async(int a, int b, } void -ThrowerI::throwCasA_async(int a, int b, int c, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwCasAAsync(int a, int b, int c, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -139,10 +139,10 @@ ThrowerI::throwCasA_async(int a, int b, int c, } void -ThrowerI::throwBasB_async(int a, int b, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwBasBAsync(int a, int b, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -158,10 +158,10 @@ ThrowerI::throwBasB_async(int a, int b, } void -ThrowerI::throwCasB_async(int a, int b, int c, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwCasBAsync(int a, int b, int c, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -178,10 +178,10 @@ ThrowerI::throwCasB_async(int a, int b, int c, } void -ThrowerI::throwCasC_async(int a, int b, int c, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwCasCAsync(int a, int b, int c, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -198,10 +198,10 @@ ThrowerI::throwCasC_async(int a, int b, int c, } void -ThrowerI::throwModA_async(int a, int a2, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwModAAsync(int a, int a2, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { Mod::A ex; ex.aMem = a; @@ -210,10 +210,10 @@ ThrowerI::throwModA_async(int a, int a2, } void -ThrowerI::throwUndeclaredA_async(int a, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwUndeclaredAAsync(int a, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -228,10 +228,10 @@ ThrowerI::throwUndeclaredA_async(int a, } void -ThrowerI::throwUndeclaredB_async(int a, int b, - function<void ()>, - function<void (exception_ptr)>, - const Ice::Current&) +ThrowerI::throwUndeclaredBAsync(int a, int b, + function<void ()>, + function<void (exception_ptr)>, + const Ice::Current&) { B ex; ex.aMem = a; @@ -240,10 +240,10 @@ ThrowerI::throwUndeclaredB_async(int a, int b, } void -ThrowerI::throwUndeclaredC_async(int a, int b, int c, - function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwUndeclaredCAsync(int a, int b, int c, + function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -260,9 +260,9 @@ ThrowerI::throwUndeclaredC_async(int a, int b, int c, } void -ThrowerI::throwLocalException_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwLocalExceptionAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -275,9 +275,9 @@ ThrowerI::throwLocalException_async(function<void ()>, } void -ThrowerI::throwNonIceException_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwNonIceExceptionAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -290,26 +290,26 @@ ThrowerI::throwNonIceException_async(function<void ()>, } void -ThrowerI::throwAssertException_async(function<void ()>, - function<void (exception_ptr)>, - const Ice::Current&) +ThrowerI::throwAssertExceptionAsync(function<void ()>, + function<void (exception_ptr)>, + const Ice::Current&) { assert(false); // No supported in C++ } void -ThrowerI::throwMemoryLimitException_async(ICE_IN(Ice::ByteSeq), - function<void (const Ice::ByteSeq&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +ThrowerI::throwMemoryLimitExceptionAsync(ICE_IN(Ice::ByteSeq), + function<void (const Ice::ByteSeq&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(Ice::ByteSeq(1024 * 20)); // 20 KB. } void -ThrowerI::throwLocalExceptionIdempotent_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwLocalExceptionIdempotentAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -323,9 +323,9 @@ ThrowerI::throwLocalExceptionIdempotent_async(function<void ()>, } void -ThrowerI::throwAfterResponse_async(function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current&) +ThrowerI::throwAfterResponseAsync(function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(); @@ -333,9 +333,9 @@ ThrowerI::throwAfterResponse_async(function<void ()> response, } void -ThrowerI::throwAfterException_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwAfterExceptionAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -349,9 +349,9 @@ ThrowerI::throwAfterException_async(function<void ()>, } void -ThrowerI::throwE_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwEAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -364,9 +364,9 @@ ThrowerI::throwE_async(function<void ()>, } void -ThrowerI::throwF_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwFAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -379,9 +379,9 @@ ThrowerI::throwF_async(function<void ()>, } void -ThrowerI::throwG_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwGAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { @@ -398,9 +398,9 @@ ThrowerI::throwG_async(function<void ()>, } void -ThrowerI::throwH_async(function<void ()>, - function<void (exception_ptr)> exception, - const Ice::Current&) +ThrowerI::throwHAsync(function<void ()>, + function<void (exception_ptr)> exception, + const Ice::Current&) { try { diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h index 4db8fe0b079..182fe8f6de6 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.h +++ b/cpp/test/Ice/exceptions/TestAMDI.h @@ -23,117 +23,117 @@ public: ThrowerI(); #ifdef ICE_CPP11_MAPPING - virtual void shutdown_async(std::function<void ()>, + virtual void shutdownAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void supportsUndeclaredExceptionsAsync(std::function<void (bool)>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void supportsAssertExceptionAsync(std::function<void (bool)>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwAasAAsync(int, + std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void supportsUndeclaredExceptions_async(std::function<void (bool)>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwAorDasAorDAsync(int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void supportsAssertException_async(std::function<void (bool)>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwBasAAsync(int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwCasAAsync(int, int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwAasA_async(int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwBasBAsync(int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwCasBAsync(int, int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwCasCAsync(int, int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwModAAsync(int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwAorDasAorD_async(int, + virtual void throwUndeclaredAAsync(int, std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void throwBasA_async(int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwCasA_async(int, int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwBasB_async(int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwCasB_async(int, int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwCasC_async(int, int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwModA_async(int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwUndeclaredA_async(int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwUndeclaredB_async(int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwUndeclaredC_async(int, int, int, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void throwLocalException_async(std::function<void ()>, + virtual void throwUndeclaredBAsync(int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwUndeclaredCAsync(int, int, int, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwLocalExceptionAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void throwNonIceExceptionAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void throwNonIceException_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwAssertExceptionAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwAssertException_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwMemoryLimitExceptionAsync(ICE_IN(Ice::ByteSeq), + std::function<void (const Ice::ByteSeq&)>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwMemoryLimitException_async(ICE_IN(Ice::ByteSeq), - std::function<void (const Ice::ByteSeq&)>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwLocalExceptionIdempotentAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwLocalExceptionIdempotent_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwAfterResponseAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwAfterResponse_async(std::function<void ()>, + virtual void throwAfterExceptionAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - - virtual void throwAfterException_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - virtual void throwE_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwEAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwF_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwFAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwG_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwGAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void throwH_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void throwHAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); #else virtual void shutdown_async(const Test::AMD_Thrower_shutdownPtr&, const Ice::Current&); diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp index 1f39786b990..f50229d8cdb 100644 --- a/cpp/test/Ice/faultTolerance/AllTests.cpp +++ b/cpp/test/Ice/faultTolerance/AllTests.cpp @@ -156,7 +156,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) #ifdef ICE_CPP11_MAPPING try { - int pid = obj->pid_async().get(); + int pid = obj->pidAsync().get(); test(pid != oldPid); cout << "ok" << endl; oldPid = pid; @@ -190,7 +190,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) cout << "shutting down server #" << i << " with AMI... " << flush; try { - obj->shutdown_async().get(); + obj->shutdownAsync().get(); } catch(const exception&) { @@ -231,7 +231,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) cout << "aborting server #" << i << " with AMI... " << flush; try { - obj->abort_async().get(); + obj->abortAsync().get(); test(false); } catch(const exception&) @@ -272,7 +272,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) cout << "aborting server #" << i << " and #" << i + 1 << " with idempotent AMI call... " << flush; try { - obj->idempotentAbort_async().get(); + obj->idempotentAbortAsync().get(); test(false); } catch(const exception&) diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp index a9a83b9d897..8c32502e43c 100644 --- a/cpp/test/Ice/hold/AllTests.cpp +++ b/cpp/test/Ice/hold/AllTests.cpp @@ -138,7 +138,7 @@ allTests(const Ice::CommunicatorPtr& communicator) completed = make_shared<promise<void>>(); auto sent = make_shared<promise<bool>>(); auto expected = value; - hold->set_async(value + 1, IceUtilInternal::random(5), + hold->setAsync(value + 1, IceUtilInternal::random(5), [cond, expected, completed](int value) { if(value != expected) @@ -211,7 +211,7 @@ allTests(const Ice::CommunicatorPtr& communicator) completed = make_shared<promise<void>>(); auto sent = make_shared<promise<bool>>(); auto expected = value; - holdSerialized->set_async( + holdSerialized->setAsync( value + 1, IceUtilInternal::random(1), [cond, expected, completed](int value) @@ -276,7 +276,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { completed = make_shared<promise<void>>(); // Create a new proxy for each request - holdSerialized->ice_oneway()->setOneway_async(value + 1, value, + holdSerialized->ice_oneway()->setOnewayAsync(value + 1, value, nullptr, [](exception_ptr) { diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp index 7842a5ab726..34d803ac5b9 100644 --- a/cpp/test/Ice/interceptor/MyObjectI.cpp +++ b/cpp/test/Ice/interceptor/MyObjectI.cpp @@ -82,11 +82,11 @@ MyObjectI::badSystemAdd(int, int, const Ice::Current&) #ifdef ICE_CPP11_MAPPING void -MyObjectI::amdAdd_async(int x, - int y, - function<void (int)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyObjectI::amdAddAsync(int x, + int y, + function<void (int)> response, + function<void (exception_ptr)>, + const Ice::Current&) { thread t( [x, y, response]() @@ -98,11 +98,11 @@ MyObjectI::amdAdd_async(int x, } void -MyObjectI::amdAddWithRetry_async(int x, - int y, - function<void (int)> response, - function<void (exception_ptr)>, - const Ice::Current& current) +MyObjectI::amdAddWithRetryAsync(int x, + int y, + function<void (int)> response, + function<void (exception_ptr)>, + const Ice::Current& current) { thread t( [x, y, response]() @@ -121,11 +121,11 @@ MyObjectI::amdAddWithRetry_async(int x, } void -MyObjectI::amdBadAdd_async(int x, - int y, - function<void (int)>, - function<void (exception_ptr)> error, - const Ice::Current&) +MyObjectI::amdBadAddAsync(int x, + int y, + function<void (int)>, + function<void (exception_ptr)> error, + const Ice::Current&) { thread t( [x, y, error]() @@ -144,11 +144,11 @@ MyObjectI::amdBadAdd_async(int x, } void -MyObjectI::amdNotExistAdd_async(int x, - int y, - function<void (int)>, - function<void (exception_ptr)> error, - const Ice::Current&) +MyObjectI::amdNotExistAddAsync(int x, + int y, + function<void (int)>, + function<void (exception_ptr)> error, + const Ice::Current&) { thread t( [x, y, error]() @@ -167,11 +167,11 @@ MyObjectI::amdNotExistAdd_async(int x, } void -MyObjectI::amdBadSystemAdd_async(int x, - int y, - function<void (int)>, - function<void (exception_ptr)> error, - const Ice::Current&) +MyObjectI::amdBadSystemAddAsync(int x, + int y, + function<void (int)>, + function<void (exception_ptr)> error, + const Ice::Current&) { thread t( [x, y, error]() diff --git a/cpp/test/Ice/interceptor/MyObjectI.h b/cpp/test/Ice/interceptor/MyObjectI.h index 872796677c0..f6bb4425bdf 100644 --- a/cpp/test/Ice/interceptor/MyObjectI.h +++ b/cpp/test/Ice/interceptor/MyObjectI.h @@ -38,11 +38,11 @@ public: virtual int badSystemAdd(int, int, const Ice::Current&); #ifdef ICE_CPP11_MAPPING - virtual void amdAdd_async(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void amdAddWithRetry_async(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void amdBadAdd_async(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void amdNotExistAdd_async(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void amdBadSystemAdd_async(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); + virtual void amdAddAsync(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); + virtual void amdAddWithRetryAsync(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); + virtual void amdBadAddAsync(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); + virtual void amdNotExistAddAsync(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); + virtual void amdBadSystemAddAsync(int, int, std::function<void (int)>, std::function<void (std::exception_ptr)>, const Ice::Current&); #else virtual void amdAdd_async(const Test::AMD_MyObject_amdAddPtr&, int, int, const Ice::Current&); virtual void amdAddWithRetry_async(const Test::AMD_MyObject_amdAddWithRetryPtr&, int, int, const Ice::Current&); diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp index a63ef7bb449..40e66f5f77f 100644 --- a/cpp/test/Ice/invoke/AllTests.cpp +++ b/cpp/test/Ice/invoke/AllTests.cpp @@ -386,7 +386,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { Ice::ByteSeq inEncaps; - batchOneway->ice_invoke_async("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, + batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, [](bool, const vector<Ice::Byte>) { test(false); @@ -406,17 +406,17 @@ allTests(const Ice::CommunicatorPtr& communicator) // { Ice::ByteSeq inEncaps; - test(batchOneway->ice_invoke_async("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); - test(batchOneway->ice_invoke_async("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); - test(batchOneway->ice_invoke_async("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); - test(batchOneway->ice_invoke_async("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); + test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); + test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); + test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); + test(batchOneway->ice_invokeAsync("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps).get().ok); batchOneway->ice_flushBatchRequests(); } { promise<bool> completed; Ice::ByteSeq inEncaps, outEncaps; - oneway->ice_invoke_async( + oneway->ice_invokeAsync( "opOneway", OperationMode::Normal, inEncaps, @@ -439,7 +439,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { Ice::ByteSeq inEncaps, outEncaps; - auto completed = oneway->ice_invoke_async("opOneway", OperationMode::Normal, inEncaps); + auto completed = oneway->ice_invokeAsync("opOneway", OperationMode::Normal, inEncaps); test(completed.get().ok); } @@ -452,7 +452,7 @@ allTests(const Ice::CommunicatorPtr& communicator) out.endEncapsulation(); out.finished(inEncaps); - cl->ice_invoke_async("opString", OperationMode::Normal, inEncaps, + cl->ice_invokeAsync("opString", OperationMode::Normal, inEncaps, [&](bool ok, vector<Ice::Byte> outParams) { outEncaps = move(outParams); @@ -484,7 +484,7 @@ allTests(const Ice::CommunicatorPtr& communicator) out.endEncapsulation(); out.finished(inEncaps); - auto result = cl->ice_invoke_async("opString", OperationMode::Normal, inEncaps).get(); + auto result = cl->ice_invokeAsync("opString", OperationMode::Normal, inEncaps).get(); test(result.ok); Ice::InputStream in(communicator, result.outParams); @@ -510,7 +510,7 @@ allTests(const Ice::CommunicatorPtr& communicator) pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); - cl->ice_invoke_async("opString", OperationMode::Normal, inPair, + cl->ice_invokeAsync("opString", OperationMode::Normal, inPair, [&](bool ok, pair<const Ice::Byte*, const Ice::Byte*> outParams) { vector<Ice::Byte>(outParams.first, outParams.second).swap(outEncaps); @@ -539,7 +539,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // // repeat with the future API. // - // TODO: we don't currently support zero-copy with promised based ice_invoke_async + // TODO: we don't currently support zero-copy with promised based ice_invokeAsync // { // Ice::ByteSeq inEncaps, outEncaps; // Ice::OutputStream out(communicator); @@ -550,7 +550,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); - // auto result = cl->ice_invoke_async("opString", OperationMode::Normal, inPair).get(); + // auto result = cl->ice_invokeAsync("opString", OperationMode::Normal, inPair).get(); // test(result.ok); // vector<Ice::Byte>(result.outParams.first, result.outParams.second).swap(outEncaps); // Ice::InputStream in(communicator, outEncaps); @@ -568,7 +568,7 @@ allTests(const Ice::CommunicatorPtr& communicator) promise<void> sent; Ice::ByteSeq inEncaps, outEncaps; - cl->ice_invoke_async("opException", OperationMode::Normal, inEncaps, + cl->ice_invokeAsync("opException", OperationMode::Normal, inEncaps, [&](bool ok, vector<Ice::Byte> outParams) { outEncaps = move(outParams); @@ -605,7 +605,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // { Ice::ByteSeq inEncaps; - auto result = cl->ice_invoke_async("opException", OperationMode::Normal, inEncaps).get(); + auto result = cl->ice_invokeAsync("opException", OperationMode::Normal, inEncaps).get(); test(!result.ok); Ice::InputStream in(communicator, result.outParams); diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp index 81cc84bc057..421c8505061 100644 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -88,7 +88,7 @@ BlobjectI::ice_invoke(const vector<Ice::Byte>& inEncaps, vector<Ice::Byte>& outE bool BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps, vector<Ice::Byte>& outEncaps, - const Ice::Current& current) + const Ice::Current& current) { Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); return invokeInternal(in, outEncaps, current); @@ -96,10 +96,10 @@ BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEnc #ifdef ICE_CPP11_MAPPING void -BlobjectAsyncI::ice_invoke_async(vector<Ice::Byte> inEncaps, - function<void (bool, vector<Ice::Byte>)> response, - function<void (exception_ptr)>, - const Ice::Current& current) +BlobjectAsyncI::ice_invokeAsync(vector<Ice::Byte> inEncaps, + function<void (bool, vector<Ice::Byte>)> response, + function<void (exception_ptr)>, + const Ice::Current& current) { Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector<Ice::Byte> outEncaps; @@ -108,10 +108,10 @@ BlobjectAsyncI::ice_invoke_async(vector<Ice::Byte> inEncaps, } void -BlobjectArrayAsyncI::ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*> inEncaps, - function<void (bool, pair<const Ice::Byte*, const Ice::Byte*>)> response, - function<void (exception_ptr)>, - const Ice::Current& current) +BlobjectArrayAsyncI::ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*> inEncaps, + function<void (bool, pair<const Ice::Byte*, const Ice::Byte*>)> response, + function<void (exception_ptr)>, + const Ice::Current& current) { Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector<Ice::Byte> outEncaps; diff --git a/cpp/test/Ice/invoke/BlobjectI.h b/cpp/test/Ice/invoke/BlobjectI.h index 858c584db0c..6506758b838 100644 --- a/cpp/test/Ice/invoke/BlobjectI.h +++ b/cpp/test/Ice/invoke/BlobjectI.h @@ -32,20 +32,20 @@ class BlobjectAsyncI : public Ice::BlobjectAsync { public: - virtual void ice_invoke_async(std::vector<Ice::Byte>, - std::function<void (bool, std::vector<Ice::Byte>)>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void ice_invokeAsync(std::vector<Ice::Byte>, + std::function<void (bool, std::vector<Ice::Byte>)>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); }; class BlobjectArrayAsyncI : public Ice::BlobjectArrayAsync { public: - virtual void ice_invoke_async(std::pair<const Ice::Byte*, const Ice::Byte*>, - std::function<void (bool, std::pair<const Ice::Byte*, const Ice::Byte*>)>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void ice_invokeAsync(std::pair<const Ice::Byte*, const Ice::Byte*>, + std::function<void (bool, std::pair<const Ice::Byte*, const Ice::Byte*>)>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); }; #else class BlobjectAsyncI : public Ice::BlobjectAsync @@ -60,7 +60,7 @@ class BlobjectArrayAsyncI : public Ice::BlobjectArrayAsync { public: - virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, + virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const std::pair<const Ice::Byte*, const Ice::Byte*>&, const Ice::Current&); }; #endif diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 1f6f43dbd1d..2a6966a80a6 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -331,7 +331,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) for(i = 0; i < 1000; i++) { auto result = make_shared<promise<void>>(); - hello->sayHello_async( + hello->sayHelloAsync( [result]() { result->set_value(); @@ -357,7 +357,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) for(i = 0; i < 1000; i++) { auto result = make_shared<promise<void>>(); - hello->sayHello_async( + hello->sayHelloAsync( [result]() { test(false); diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp index 5a41718ca6c..0305124cbc9 100644 --- a/cpp/test/Ice/location/ServerLocator.cpp +++ b/cpp/test/Ice/location/ServerLocator.cpp @@ -20,14 +20,14 @@ ServerLocatorRegistry::ServerLocatorRegistry() #ifdef ICE_CPP11_MAPPING void -ServerLocatorRegistry::setAdapterDirectProxy_async(string adapter, ::shared_ptr<::Ice::ObjectPrx> object, - function<void ()> response, - function<void (exception_ptr)>, - const ::Ice::Current&) +ServerLocatorRegistry::setAdapterDirectProxyAsync(string adapter, ::shared_ptr<::Ice::ObjectPrx> object, + function<void ()> response, + function<void (exception_ptr)>, + const ::Ice::Current&) #else -void +void ServerLocatorRegistry::setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, - const std::string& adapter, const ::Ice::ObjectPrx& object, + const std::string& adapter, const ::Ice::ObjectPrx& object, const ::Ice::Current&) #endif { @@ -42,21 +42,21 @@ ServerLocatorRegistry::setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistr #ifdef ICE_CPP11_MAPPING response(); #else - cb->ice_response(); + cb->ice_response(); #endif } #ifdef ICE_CPP11_MAPPING void -ServerLocatorRegistry::setReplicatedAdapterDirectProxy_async(string adapter, string replicaGroup, shared_ptr<Ice::ObjectPrx> object, - function<void ()> response, - function<void (exception_ptr)>, - const ::Ice::Current&) +ServerLocatorRegistry::setReplicatedAdapterDirectProxyAsync(string adapter, string replicaGroup, shared_ptr<Ice::ObjectPrx> object, + function<void ()> response, + function<void (exception_ptr)>, + const ::Ice::Current&) #else void ServerLocatorRegistry::setReplicatedAdapterDirectProxy_async( const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb, - const string& adapter, const string& replicaGroup, const ::Ice::ObjectPrx& object, + const string& adapter, const string& replicaGroup, const ::Ice::ObjectPrx& object, const ::Ice::Current&) #endif { @@ -79,11 +79,11 @@ ServerLocatorRegistry::setReplicatedAdapterDirectProxy_async( #ifdef ICE_CPP11_MAPPING void -ServerLocatorRegistry::setServerProcessProxy_async(string, - shared_ptr<Ice::ProcessPrx>, - function<void ()> response, - function<void (exception_ptr)>, - const ::Ice::Current&) +ServerLocatorRegistry::setServerProcessProxyAsync(string, + shared_ptr<Ice::ProcessPrx>, + function<void ()> response, + function<void (exception_ptr)>, + const ::Ice::Current&) { response(); } @@ -94,7 +94,7 @@ ServerLocatorRegistry::addObject(shared_ptr<Ice::ObjectPrx> object, const ::Ice: addObject(object); } #else -void +void ServerLocatorRegistry::setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr& cb, const string&, const Ice::ProcessPrx&, const ::Ice::Current&) { @@ -146,13 +146,13 @@ ServerLocator::ServerLocator(const ServerLocatorRegistryPtr& registry, const ::I #ifdef ICE_CPP11_MAPPING void -ServerLocator::findObjectById_async(::Ice::Identity id, - function<void (const shared_ptr<Ice::ObjectPrx>&)> response, - function<void (exception_ptr)>, - const ::Ice::Current&) const +ServerLocator::findObjectByIdAsync(::Ice::Identity id, + function<void (const shared_ptr<Ice::ObjectPrx>&)> response, + function<void (exception_ptr)>, + const ::Ice::Current&) const #else void -ServerLocator::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& response, const Ice::Identity& id, +ServerLocator::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& response, const Ice::Identity& id, const Ice::Current&) const #endif { @@ -169,10 +169,10 @@ ServerLocator::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& re #ifdef ICE_CPP11_MAPPING void -ServerLocator::findAdapterById_async(string id, - function<void (const shared_ptr<Ice::ObjectPrx>&)> response, - function<void (exception_ptr)>, - const ::Ice::Current& current) const +ServerLocator::findAdapterByIdAsync(string id, + function<void (const shared_ptr<Ice::ObjectPrx>&)> response, + function<void (exception_ptr)>, + const ::Ice::Current& current) const { ++const_cast<int&>(_requestCount); if(id == "TestAdapter10" || id == "TestAdapter10-2") @@ -189,7 +189,7 @@ ServerLocator::findAdapterById_async(string id, } #else void -ServerLocator::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& response, const string& id, +ServerLocator::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& response, const string& id, const Ice::Current& current) const { ++const_cast<int&>(_requestCount); diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h index 6def6f3b92c..15ed39a4897 100644 --- a/cpp/test/Ice/location/ServerLocator.h +++ b/cpp/test/Ice/location/ServerLocator.h @@ -19,22 +19,22 @@ class ServerLocatorRegistry : public Test::TestLocatorRegistry public: ServerLocatorRegistry(); - - + + #ifdef ICE_CPP11_MAPPING - virtual void setAdapterDirectProxy_async(std::string, std::shared_ptr<::Ice::ObjectPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - virtual void setReplicatedAdapterDirectProxy_async(std::string, std::string, std::shared_ptr<Ice::ObjectPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void setServerProcessProxy_async(std::string, std::shared_ptr<Ice::ProcessPrx>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void setAdapterDirectProxyAsync(std::string, std::shared_ptr<::Ice::ObjectPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + virtual void setReplicatedAdapterDirectProxyAsync(std::string, std::string, std::shared_ptr<Ice::ObjectPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void setServerProcessProxyAsync(std::string, std::shared_ptr<Ice::ProcessPrx>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); void addObject(std::shared_ptr<::Ice::ObjectPrx>, const ::Ice::Current&); #else virtual void setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, @@ -46,7 +46,7 @@ public: const ::std::string&, const ::Ice::ProcessPrx&, const ::Ice::Current&); void addObject(const ::Ice::ObjectPrx&, const ::Ice::Current&); #endif - + // // Internal method // @@ -55,7 +55,7 @@ public: void addObject(const ::Ice::ObjectPrxPtr&); private: - + ::std::map< ::std::string, ::Ice::ObjectPrxPtr> _adapters; ::std::map< ::Ice::Identity, ::Ice::ObjectPrxPtr> _objects; }; @@ -68,20 +68,20 @@ public: ServerLocator(const ::ServerLocatorRegistryPtr&, const ::Ice::LocatorRegistryPrxPtr&); #ifdef ICE_CPP11_MAPPING - virtual void findObjectById_async(::Ice::Identity, + virtual void findObjectByIdAsync(::Ice::Identity, std::function<void (const std::shared_ptr<Ice::ObjectPrx>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&) const; - virtual void findAdapterById_async(::std::string, + virtual void findAdapterByIdAsync(::std::string, std::function<void (const std::shared_ptr<Ice::ObjectPrx>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&) const; #else - virtual void findObjectById_async(const ::Ice::AMD_Locator_findObjectByIdPtr&, const ::Ice::Identity&, + virtual void findObjectById_async(const ::Ice::AMD_Locator_findObjectByIdPtr&, const ::Ice::Identity&, const ::Ice::Current&) const; - virtual void findAdapterById_async(const ::Ice::AMD_Locator_findAdapterByIdPtr&, const ::std::string&, + virtual void findAdapterById_async(const ::Ice::AMD_Locator_findAdapterByIdPtr&, const ::std::string&, const ::Ice::Current&) const; #endif virtual ::Ice::LocatorRegistryPrxPtr getRegistry(const ::Ice::Current&) const; @@ -89,7 +89,7 @@ public: virtual int getRequestCount(const Ice::Current&) const; private: - + ServerLocatorRegistryPtr _registry; ::Ice::LocatorRegistryPrxPtr _registryPrx; int _requestCount; diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp index e9146817ad2..08e6ba8e8af 100644 --- a/cpp/test/Ice/metrics/AllTests.cpp +++ b/cpp/test/Ice/metrics/AllTests.cpp @@ -908,13 +908,13 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt #ifdef ICE_CPP11_MAPPING try { - metrics->op_async().get(); + metrics->opAsync().get(); } catch(const Ice::Exception&) { } - metrics->op_async( + metrics->opAsync( [cb]() { cb->response(); @@ -953,7 +953,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt #ifdef ICE_CPP11_MAPPING try { - metrics->opWithUserException_async().get(); + metrics->opWithUserExceptionAsync().get(); test(false); } catch(const Test::UserEx&) @@ -963,7 +963,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt { test(false); } - metrics->opWithUserException_async( + metrics->opWithUserExceptionAsync( [cb]() { cb->response(); @@ -1010,13 +1010,13 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt #ifdef ICE_CPP11_MAPPING try { - metrics->opWithRequestFailedException_async().get(); + metrics->opWithRequestFailedExceptionAsync().get(); test(false); } catch(const Ice::RequestFailedException&) { } - metrics->opWithRequestFailedException_async( + metrics->opWithRequestFailedExceptionAsync( [cb]() { cb->response(); @@ -1063,13 +1063,13 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt #ifdef ICE_CPP11_MAPPING try { - metrics->opWithLocalException_async().get(); + metrics->opWithLocalExceptionAsync().get(); test(false); } catch(const Ice::LocalException&) { } - metrics->opWithLocalException_async( + metrics->opWithLocalExceptionAsync( [cb]() { cb->response(); @@ -1116,13 +1116,13 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt #ifdef ICE_CPP11_MAPPING try { - metrics->opWithUnknownException_async().get(); + metrics->opWithUnknownExceptionAsync().get(); test(false); } catch(const Ice::UnknownException&) { } - metrics->opWithUnknownException_async( + metrics->opWithUnknownExceptionAsync( [cb]() { cb->response(); @@ -1170,13 +1170,13 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt #ifdef ICE_CPP11_MAPPING try { - metrics->fail_async().get(); + metrics->failAsync().get(); test(false); } catch(const Ice::ConnectionLostException&) { } - metrics->fail_async( + metrics->failAsync( [cb]() { cb->response(); @@ -1291,8 +1291,8 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt MetricsPrxPtr metricsOneway = metrics->ice_oneway(); metricsOneway->op(); #ifdef ICE_CPP11_MAPPING - metricsOneway->op_async().get(); - metricsOneway->op_async( + metricsOneway->opAsync().get(); + metricsOneway->opAsync( [cb]() { cb->response(); diff --git a/cpp/test/Ice/metrics/TestAMDI.cpp b/cpp/test/Ice/metrics/TestAMDI.cpp index 51d2e385fa1..df9890f3e6f 100644 --- a/cpp/test/Ice/metrics/TestAMDI.cpp +++ b/cpp/test/Ice/metrics/TestAMDI.cpp @@ -14,20 +14,20 @@ using namespace std; #ifdef ICE_CPP11_MAPPING void -MetricsI::op_async(function<void ()> response, function<void (exception_ptr)>, const Ice::Current&) +MetricsI::opAsync(function<void ()> response, function<void (exception_ptr)>, const Ice::Current&) { response(); } void -MetricsI::fail_async(function<void ()> response, function<void (exception_ptr)>, const Ice::Current& current) +MetricsI::failAsync(function<void ()> response, function<void (exception_ptr)>, const Ice::Current& current) { current.con->close(true); response(); } void -MetricsI::opWithUserException_async(function<void ()>, function<void (exception_ptr)> error, const Ice::Current&) +MetricsI::opWithUserExceptionAsync(function<void ()>, function<void (exception_ptr)> error, const Ice::Current&) { try { @@ -40,7 +40,7 @@ MetricsI::opWithUserException_async(function<void ()>, function<void (exception_ } void -MetricsI::opWithRequestFailedException_async(function<void ()>, function<void (exception_ptr)> error, +MetricsI::opWithRequestFailedExceptionAsync(function<void ()>, function<void (exception_ptr)> error, const Ice::Current&) { try @@ -54,7 +54,7 @@ MetricsI::opWithRequestFailedException_async(function<void ()>, function<void (e } void -MetricsI::opWithLocalException_async(function<void ()>, function<void (exception_ptr)> error, const Ice::Current&) +MetricsI::opWithLocalExceptionAsync(function<void ()>, function<void (exception_ptr)> error, const Ice::Current&) { try { @@ -67,13 +67,13 @@ MetricsI::opWithLocalException_async(function<void ()>, function<void (exception } void -MetricsI::opWithUnknownException_async(function<void ()>, function<void (exception_ptr)>, const Ice::Current&) +MetricsI::opWithUnknownExceptionAsync(function<void ()>, function<void (exception_ptr)>, const Ice::Current&) { throw "Test"; } void -MetricsI::opByteS_async(Test::ByteSeq, function<void ()> response, function<void (exception_ptr)>, const Ice::Current&) +MetricsI::opByteSAsync(Test::ByteSeq, function<void ()> response, function<void (exception_ptr)>, const Ice::Current&) { response(); } diff --git a/cpp/test/Ice/metrics/TestAMDI.h b/cpp/test/Ice/metrics/TestAMDI.h index 77e420bcdb0..5d3dc11ecb8 100644 --- a/cpp/test/Ice/metrics/TestAMDI.h +++ b/cpp/test/Ice/metrics/TestAMDI.h @@ -17,23 +17,23 @@ class MetricsI : public Test::Metrics public: #ifdef ICE_CPP11_MAPPING - virtual void op_async(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); + virtual void opAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void fail_async(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); + virtual void failAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opWithUserException_async(std::function<void ()>, std::function<void (std::exception_ptr)>, + virtual void opWithUserExceptionAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opWithRequestFailedException_async(std::function<void ()>, std::function<void (std::exception_ptr)>, + virtual void opWithRequestFailedExceptionAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opWithLocalException_async(std::function<void ()>, std::function<void (std::exception_ptr)>, + virtual void opWithLocalExceptionAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opWithUnknownException_async(std::function<void ()>, std::function<void (std::exception_ptr)>, + virtual void opWithUnknownExceptionAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opByteS_async(Test::ByteSeq, std::function<void ()>, std::function<void (std::exception_ptr)>, + virtual void opByteSAsync(Test::ByteSeq, std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); #else virtual void op_async(const Test::AMD_Metrics_opPtr&, const Ice::Current&); diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp index 631302bfd80..9547ed388de 100644 --- a/cpp/test/Ice/operations/BatchOneways.cpp +++ b/cpp/test/Ice/operations/BatchOneways.cpp @@ -40,7 +40,7 @@ public: if(_size + request.getSize() > 25000) { #ifdef ICE_CPP11_MAPPING - request.getProxy()->ice_flushBatchRequests_async(); + request.getProxy()->ice_flushBatchRequestsAsync(); #else request.getProxy()->begin_ice_flushBatchRequests(); #endif diff --git a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp index 04ef6354642..9adb2be5c7b 100644 --- a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp +++ b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp @@ -98,7 +98,7 @@ batchOnewaysAMI(const Test::MyClassPrxPtr& p) #ifdef ICE_CPP11_MAPPING promise<void> prom; - batch->ice_flushBatchRequests_async(nullptr, + batch->ice_flushBatchRequestsAsync(nullptr, [&](bool sentSynchronously) { test(sentSynchronously); @@ -108,7 +108,7 @@ batchOnewaysAMI(const Test::MyClassPrxPtr& p) for(int i = 0; i < 30; ++i) { - batch->opByteSOneway_async(bs1, nullptr, [](exception_ptr){ test(false); }); + batch->opByteSOnewayAsync(bs1, nullptr, [](exception_ptr){ test(false); }); } int count = 0; @@ -124,34 +124,34 @@ batchOnewaysAMI(const Test::MyClassPrxPtr& p) shared_ptr<Test::MyClassPrx> batch1 = Ice::uncheckedCast<Test::MyClassPrx>(p->ice_batchOneway()); shared_ptr<Test::MyClassPrx> batch2 = Ice::uncheckedCast<Test::MyClassPrx>(p->ice_batchOneway()); - batch1->ice_ping_async().get(); - batch2->ice_ping_async().get(); - batch1->ice_flushBatchRequests_async().get(); + batch1->ice_pingAsync().get(); + batch2->ice_pingAsync().get(); + batch1->ice_flushBatchRequestsAsync().get(); batch1->ice_getConnection()->close(false); - batch1->ice_ping_async().get(); - batch2->ice_ping_async().get(); + batch1->ice_pingAsync().get(); + batch2->ice_pingAsync().get(); batch1->ice_getConnection(); batch2->ice_getConnection(); - batch1->ice_ping_async().get(); + batch1->ice_pingAsync().get(); batch1->ice_getConnection()->close(false); - batch1->ice_ping_async().get(); - batch2->ice_ping_async().get(); + batch1->ice_pingAsync().get(); + batch2->ice_pingAsync().get(); } Ice::Identity identity; identity.name = "invalid"; auto batch3 = batch->ice_identity(identity); - batch3->ice_ping_async(); - batch3->ice_flushBatchRequests_async().get(); + batch3->ice_pingAsync(); + batch3->ice_flushBatchRequestsAsync().get(); // Make sure that a bogus batch request doesn't cause troubles to other ones. - batch3->ice_ping_async(); - batch->ice_ping_async(); - batch->ice_flushBatchRequests_async().get(); - batch->ice_ping_async(); + batch3->ice_pingAsync(); + batch->ice_pingAsync(); + batch->ice_flushBatchRequestsAsync().get(); + batch->ice_pingAsync(); #else batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); // Empty flush diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp index 919a74b7887..4d322b4eef4 100644 --- a/cpp/test/Ice/operations/OnewaysAMI.cpp +++ b/cpp/test/Ice/operations/OnewaysAMI.cpp @@ -87,7 +87,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->ice_ping_async( + p->ice_pingAsync( nullptr, [](exception_ptr) { @@ -109,7 +109,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) try { #ifdef ICE_CPP11_MAPPING - p->ice_isA_async(Test::MyClass::ice_staticId(), + p->ice_isAAsync(Test::MyClass::ice_staticId(), [&](bool) { test(false); @@ -123,12 +123,12 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { } } - + { try { #ifdef ICE_CPP11_MAPPING - p->ice_id_async( + p->ice_idAsync( [&](string) { test(false); @@ -142,12 +142,12 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { } } - + { try { #ifdef ICE_CPP11_MAPPING - p->ice_ids_async( + p->ice_idsAsync( [&](vector<string>) { }); @@ -164,7 +164,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opVoid_async( + p->opVoidAsync( nullptr, [](exception_ptr) { @@ -185,7 +185,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opIdempotent_async( + p->opIdempotentAsync( nullptr, [](exception_ptr) { @@ -206,7 +206,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opNonmutating_async( + p->opNonmutatingAsync( nullptr, [](exception_ptr) { @@ -228,7 +228,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) try { #ifdef ICE_CPP11_MAPPING - p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f), + p->opByteAsync(Ice::Byte(0xff), Ice::Byte(0x0f), [](Ice::Byte, Ice::Byte) { test(false); @@ -245,7 +245,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) #ifdef ICE_CPP11_MAPPING { CallbackPtr cb = new Callback; - p->ice_ping_async(nullptr, + p->ice_pingAsync(nullptr, [=](exception_ptr e) { try @@ -259,7 +259,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) }, [=](bool sent) { - cb->sent(sent); + cb->sent(sent); }); cb->check(); @@ -267,29 +267,29 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { try { - p->ice_isA_async(Test::MyClass::ice_staticId()); + p->ice_isAAsync(Test::MyClass::ice_staticId()); test(false); } catch(const IceUtil::IllegalArgumentException&) { } } - + { try { - p->ice_id_async(); + p->ice_idAsync(); test(false); } catch(const IceUtil::IllegalArgumentException&) { } } - + { try { - p->ice_ids_async(); + p->ice_idsAsync(); test(false); } catch(const IceUtil::IllegalArgumentException&) diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index 900fee03e90..5c45abfd016 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -92,9 +92,9 @@ private: }; void -MyDerivedClassI::shutdown_async(function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current& current) +MyDerivedClassI::shutdownAsync(function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current& current) { { IceUtil::Mutex::Lock sync(_opVoidMutex); @@ -110,18 +110,18 @@ MyDerivedClassI::shutdown_async(function<void ()> response, } void -MyDerivedClassI::delay_async(Ice::Int ms, function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::delayAsync(Ice::Int ms, function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current&) { IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(ms)); response(); } void -MyDerivedClassI::opVoid_async(function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current& current) +MyDerivedClassI::opVoidAsync(function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current& current) { test(current.mode == OperationMode::Normal); @@ -138,88 +138,88 @@ MyDerivedClassI::opVoid_async(function<void ()> response, void -MyDerivedClassI::opByte_async(Ice::Byte p1, - Ice::Byte p2, - function<void (Ice::Byte, Ice::Byte)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteAsync(Ice::Byte p1, + Ice::Byte p2, + function<void (Ice::Byte, Ice::Byte)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(p1, p1 ^ p2); } void -MyDerivedClassI::opBool_async(bool p1, - bool p2, - function<void (bool, bool)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opBoolAsync(bool p1, + bool p2, + function<void (bool, bool)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(p2, p1); } void -MyDerivedClassI::opShortIntLong_async(short p1, - int p2, - long long int p3, - function<void (long long int, short, int, long long int)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opShortIntLongAsync(short p1, + int p2, + long long int p3, + function<void (long long int, short, int, long long int)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(p3, p1, p2, p3); } void -MyDerivedClassI::opFloatDouble_async(float p1, - double p2, - function<void (double, float, double)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opFloatDoubleAsync(float p1, + double p2, + function<void (double, float, double)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(p2, p1, p2); } void -MyDerivedClassI::opString_async(string p1, - string p2, - function<void (const string&, const string&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringAsync(string p1, + string p2, + function<void (const string&, const string&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(p1 + " " + p2, p2 + " " + p1); } void -MyDerivedClassI::opMyEnum_async(Test::MyEnum p1, - function<void (Test::MyEnum, Test::MyEnum)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyEnumAsync(Test::MyEnum p1, + function<void (Test::MyEnum, Test::MyEnum)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(MyEnum::enum3, p1); } void -MyDerivedClassI::opMyClass_async(shared_ptr<Test::MyClassPrx> p1, - function<void (const shared_ptr<Test::MyClassPrx>&, - const shared_ptr<Test::MyClassPrx>&, - const shared_ptr<Test::MyClassPrx>&)> response, - function<void (exception_ptr)>, - const Ice::Current& current) +MyDerivedClassI::opMyClassAsync(shared_ptr<Test::MyClassPrx> p1, + function<void (const shared_ptr<Test::MyClassPrx>&, + const shared_ptr<Test::MyClassPrx>&, + const shared_ptr<Test::MyClassPrx>&)> response, + function<void (exception_ptr)>, + const Ice::Current& current) { auto p2 = p1; auto p3 = uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); response(uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy(current.id)), p2, p3); } void -MyDerivedClassI::opStruct_async(Test::Structure p1, - Test::Structure p2, - function<void (const Test::Structure&, const Test::Structure&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStructAsync(Test::Structure p1, + Test::Structure p2, + function<void (const Test::Structure&, const Test::Structure&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::Structure p3 = p1; p3.s.s = "a new string"; @@ -227,11 +227,11 @@ MyDerivedClassI::opStruct_async(Test::Structure p1, } void -MyDerivedClassI::opByteS_async(Test::ByteS p1, - Test::ByteS p2, - function<void (const Test::ByteS&, const Test::ByteS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteSAsync(Test::ByteS p1, + Test::ByteS p2, + function<void (const Test::ByteS&, const Test::ByteS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ByteS p3; p3.resize(p1.size()); @@ -242,11 +242,11 @@ MyDerivedClassI::opByteS_async(Test::ByteS p1, } void -MyDerivedClassI::opBoolS_async(Test::BoolS p1, - Test::BoolS p2, - function<void (const Test::BoolS&, const Test::BoolS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opBoolSAsync(Test::BoolS p1, + Test::BoolS p2, + function<void (const Test::BoolS&, const Test::BoolS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::BoolS p3 = p1; std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); @@ -257,15 +257,15 @@ MyDerivedClassI::opBoolS_async(Test::BoolS p1, } void -MyDerivedClassI::opShortIntLongS_async(Test::ShortS p1, - Test::IntS p2, - Test::LongS p3, - function<void (const Test::LongS&, - const Test::ShortS&, - const Test::IntS&, - const Test::LongS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opShortIntLongSAsync(Test::ShortS p1, + Test::IntS p2, + Test::LongS p3, + function<void (const Test::LongS&, + const Test::ShortS&, + const Test::IntS&, + const Test::LongS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ShortS p4 = p1; Test::IntS p5; @@ -277,13 +277,13 @@ MyDerivedClassI::opShortIntLongS_async(Test::ShortS p1, } void -MyDerivedClassI::opFloatDoubleS_async(Test::FloatS p1, - Test::DoubleS p2, - function<void (const Test::DoubleS&, - const Test::FloatS&, - const Test::DoubleS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opFloatDoubleSAsync(Test::FloatS p1, + Test::DoubleS p2, + function<void (const Test::DoubleS&, + const Test::FloatS&, + const Test::DoubleS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::FloatS p3 = p1; Test::DoubleS p4; @@ -295,11 +295,11 @@ MyDerivedClassI::opFloatDoubleS_async(Test::FloatS p1, } void -MyDerivedClassI::opStringS_async(Test::StringS p1, - Test::StringS p2, - function<void (const Test::StringS&, const Test::StringS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringSAsync(Test::StringS p1, + Test::StringS p2, + function<void (const Test::StringS&, const Test::StringS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringS p3 = p1; std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); @@ -310,11 +310,11 @@ MyDerivedClassI::opStringS_async(Test::StringS p1, } void -MyDerivedClassI::opByteSS_async(Test::ByteSS p1, - Test::ByteSS p2, - function<void (const Test::ByteSS&, const Test::ByteSS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteSSAsync(Test::ByteSS p1, + Test::ByteSS p2, + function<void (const Test::ByteSS&, const Test::ByteSS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ByteSS p3; p3.resize(p1.size()); @@ -325,11 +325,11 @@ MyDerivedClassI::opByteSS_async(Test::ByteSS p1, } void -MyDerivedClassI::opBoolSS_async(Test::BoolSS p1, - Test::BoolSS p2, - function<void (const Test::BoolSS&, const Test::BoolSS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opBoolSSAsync(Test::BoolSS p1, + Test::BoolSS p2, + function<void (const Test::BoolSS&, const Test::BoolSS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { auto p3 = p1; std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); @@ -340,15 +340,15 @@ MyDerivedClassI::opBoolSS_async(Test::BoolSS p1, } void -MyDerivedClassI::opShortIntLongSS_async(Test::ShortSS p1, - Test::IntSS p2, - Test::LongSS p3, - function<void (const Test::LongSS&, - const Test::ShortSS&, - const Test::IntSS&, - const Test::LongSS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opShortIntLongSSAsync(Test::ShortSS p1, + Test::IntSS p2, + Test::LongSS p3, + function<void (const Test::LongSS&, + const Test::ShortSS&, + const Test::IntSS&, + const Test::LongSS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { auto p4 = p1; Test::IntSS p5; @@ -360,13 +360,13 @@ MyDerivedClassI::opShortIntLongSS_async(Test::ShortSS p1, } void -MyDerivedClassI::opFloatDoubleSS_async(Test::FloatSS p1, - Test::DoubleSS p2, - function<void (const Test::DoubleSS&, - const Test::FloatSS&, - const Test::DoubleSS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opFloatDoubleSSAsync(Test::FloatSS p1, + Test::DoubleSS p2, + function<void (const Test::DoubleSS&, + const Test::FloatSS&, + const Test::DoubleSS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::FloatSS p3 = p1; Test::DoubleSS p4; @@ -378,11 +378,11 @@ MyDerivedClassI::opFloatDoubleSS_async(Test::FloatSS p1, } void -MyDerivedClassI::opStringSS_async(Test::StringSS p1, - Test::StringSS p2, - function<void (const Test::StringSS&, const Test::StringSS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringSSAsync(Test::StringSS p1, + Test::StringSS p2, + function<void (const Test::StringSS&, const Test::StringSS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringSS p3 = p1; std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); @@ -393,10 +393,10 @@ MyDerivedClassI::opStringSS_async(Test::StringSS p1, } void -MyDerivedClassI::opStringSSS_async(Test::StringSSS p1, Test::StringSSS p2, - function<void (const Test::StringSSS&, const Test::StringSSS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringSSSAsync(Test::StringSSS p1, Test::StringSSS p2, + function<void (const Test::StringSSS&, const Test::StringSSS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringSSS p3 = p1; std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); @@ -407,10 +407,10 @@ MyDerivedClassI::opStringSSS_async(Test::StringSSS p1, Test::StringSSS p2, } void -MyDerivedClassI::opByteBoolD_async(Test::ByteBoolD p1, Test::ByteBoolD p2, - function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteBoolDAsync(Test::ByteBoolD p1, Test::ByteBoolD p2, + function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ByteBoolD p3 = p1; Test::ByteBoolD r = p1; @@ -419,10 +419,10 @@ MyDerivedClassI::opByteBoolD_async(Test::ByteBoolD p1, Test::ByteBoolD p2, } void -MyDerivedClassI::opShortIntD_async(Test::ShortIntD p1, Test::ShortIntD p2, - function<void (const Test::ShortIntD&, const Test::ShortIntD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opShortIntDAsync(Test::ShortIntD p1, Test::ShortIntD p2, + function<void (const Test::ShortIntD&, const Test::ShortIntD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ShortIntD p3 = p1; Test::ShortIntD r = p1; @@ -431,10 +431,10 @@ MyDerivedClassI::opShortIntD_async(Test::ShortIntD p1, Test::ShortIntD p2, } void -MyDerivedClassI::opLongFloatD_async(Test::LongFloatD p1, Test::LongFloatD p2, - function<void (const Test::LongFloatD&, const Test::LongFloatD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opLongFloatDAsync(Test::LongFloatD p1, Test::LongFloatD p2, + function<void (const Test::LongFloatD&, const Test::LongFloatD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::LongFloatD p3 = p1; Test::LongFloatD r = p1; @@ -443,10 +443,10 @@ MyDerivedClassI::opLongFloatD_async(Test::LongFloatD p1, Test::LongFloatD p2, } void -MyDerivedClassI::opStringStringD_async(Test::StringStringD p1, Test::StringStringD p2, - function<void (const Test::StringStringD&, const Test::StringStringD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringStringDAsync(Test::StringStringD p1, Test::StringStringD p2, + function<void (const Test::StringStringD&, const Test::StringStringD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringStringD p3 = p1; Test::StringStringD r = p1; @@ -455,10 +455,10 @@ MyDerivedClassI::opStringStringD_async(Test::StringStringD p1, Test::StringStrin } void -MyDerivedClassI::opStringMyEnumD_async(Test::StringMyEnumD p1, Test::StringMyEnumD p2, - function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringMyEnumDAsync(Test::StringMyEnumD p1, Test::StringMyEnumD p2, + function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringMyEnumD p3 = p1; Test::StringMyEnumD r = p1; @@ -467,10 +467,10 @@ MyDerivedClassI::opStringMyEnumD_async(Test::StringMyEnumD p1, Test::StringMyEnu } void -MyDerivedClassI::opMyEnumStringD_async(Test::MyEnumStringD p1, Test::MyEnumStringD p2, - function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyEnumStringDAsync(Test::MyEnumStringD p1, Test::MyEnumStringD p2, + function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::MyEnumStringD p3 = p1; Test::MyEnumStringD r = p1; @@ -479,11 +479,11 @@ MyDerivedClassI::opMyEnumStringD_async(Test::MyEnumStringD p1, Test::MyEnumStrin } void -MyDerivedClassI::opMyStructMyEnumD_async(Test::MyStructMyEnumD p1, Test::MyStructMyEnumD p2, - function<void (const Test::MyStructMyEnumD&, - const Test::MyStructMyEnumD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyStructMyEnumDAsync(Test::MyStructMyEnumD p1, Test::MyStructMyEnumD p2, + function<void (const Test::MyStructMyEnumD&, + const Test::MyStructMyEnumD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::MyStructMyEnumD p3 = p1; Test::MyStructMyEnumD r = p1; @@ -492,11 +492,11 @@ MyDerivedClassI::opMyStructMyEnumD_async(Test::MyStructMyEnumD p1, Test::MyStruc } void -MyDerivedClassI::opByteBoolDS_async(Test::ByteBoolDS p1, - Test::ByteBoolDS p2, - function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteBoolDSAsync(Test::ByteBoolDS p1, + Test::ByteBoolDS p2, + function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ByteBoolDS p3 = p2; std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); @@ -507,11 +507,11 @@ MyDerivedClassI::opByteBoolDS_async(Test::ByteBoolDS p1, } void -MyDerivedClassI::opShortIntDS_async(Test::ShortIntDS p1, - Test::ShortIntDS p2, - function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opShortIntDSAsync(Test::ShortIntDS p1, + Test::ShortIntDS p2, + function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ShortIntDS p3 = p2; std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); @@ -522,11 +522,11 @@ MyDerivedClassI::opShortIntDS_async(Test::ShortIntDS p1, } void -MyDerivedClassI::opLongFloatDS_async(Test::LongFloatDS p1, - Test::LongFloatDS p2, - function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opLongFloatDSAsync(Test::LongFloatDS p1, + Test::LongFloatDS p2, + function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::LongFloatDS p3 = p2; std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); @@ -537,11 +537,11 @@ MyDerivedClassI::opLongFloatDS_async(Test::LongFloatDS p1, } void -MyDerivedClassI::opStringStringDS_async(Test::StringStringDS p1, - Test::StringStringDS p2, - function<void (const Test::StringStringDS&, const Test::StringStringDS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringStringDSAsync(Test::StringStringDS p1, + Test::StringStringDS p2, + function<void (const Test::StringStringDS&, const Test::StringStringDS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringStringDS p3 = p2; std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); @@ -552,11 +552,11 @@ MyDerivedClassI::opStringStringDS_async(Test::StringStringDS p1, } void -MyDerivedClassI::opStringMyEnumDS_async(Test::StringMyEnumDS p1, - Test::StringMyEnumDS p2, - function<void (const Test::StringMyEnumDS&, const Test::StringMyEnumDS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringMyEnumDSAsync(Test::StringMyEnumDS p1, + Test::StringMyEnumDS p2, + function<void (const Test::StringMyEnumDS&, const Test::StringMyEnumDS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringMyEnumDS p3 = p2; std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); @@ -567,11 +567,11 @@ MyDerivedClassI::opStringMyEnumDS_async(Test::StringMyEnumDS p1, } void -MyDerivedClassI::opMyEnumStringDS_async(Test::MyEnumStringDS p1, - Test::MyEnumStringDS p2, - function<void (const Test::MyEnumStringDS&, const Test::MyEnumStringDS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyEnumStringDSAsync(Test::MyEnumStringDS p1, + Test::MyEnumStringDS p2, + function<void (const Test::MyEnumStringDS&, const Test::MyEnumStringDS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::MyEnumStringDS p3 = p2; std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); @@ -582,12 +582,12 @@ MyDerivedClassI::opMyEnumStringDS_async(Test::MyEnumStringDS p1, } void -MyDerivedClassI::opMyStructMyEnumDS_async(Test::MyStructMyEnumDS p1, - Test::MyStructMyEnumDS p2, - function<void (const Test::MyStructMyEnumDS&, - const Test::MyStructMyEnumDS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyStructMyEnumDSAsync(Test::MyStructMyEnumDS p1, + Test::MyStructMyEnumDS p2, + function<void (const Test::MyStructMyEnumDS&, + const Test::MyStructMyEnumDS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::MyStructMyEnumDS p3 = p2; std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); @@ -598,11 +598,11 @@ MyDerivedClassI::opMyStructMyEnumDS_async(Test::MyStructMyEnumDS p1, } void -MyDerivedClassI::opByteByteSD_async(Test::ByteByteSD p1, - Test::ByteByteSD p2, - function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteByteSDAsync(Test::ByteByteSD p1, + Test::ByteByteSD p2, + function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ByteByteSD p3 = p2; Test::ByteByteSD r; @@ -611,11 +611,11 @@ MyDerivedClassI::opByteByteSD_async(Test::ByteByteSD p1, } void -MyDerivedClassI::opBoolBoolSD_async(Test::BoolBoolSD p1, - Test::BoolBoolSD p2, - function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opBoolBoolSDAsync(Test::BoolBoolSD p1, + Test::BoolBoolSD p2, + function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::BoolBoolSD p3 = p2; Test::BoolBoolSD r; @@ -624,11 +624,11 @@ MyDerivedClassI::opBoolBoolSD_async(Test::BoolBoolSD p1, } void -MyDerivedClassI::opShortShortSD_async(Test::ShortShortSD p1, - Test::ShortShortSD p2, - function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opShortShortSDAsync(Test::ShortShortSD p1, + Test::ShortShortSD p2, + function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::ShortShortSD p3 = p2; Test::ShortShortSD r; @@ -637,11 +637,11 @@ MyDerivedClassI::opShortShortSD_async(Test::ShortShortSD p1, } void -MyDerivedClassI::opIntIntSD_async(Test::IntIntSD p1, - Test::IntIntSD p2, - function<void (const Test::IntIntSD&, const Test::IntIntSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opIntIntSDAsync(Test::IntIntSD p1, + Test::IntIntSD p2, + function<void (const Test::IntIntSD&, const Test::IntIntSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::IntIntSD p3 = p2; Test::IntIntSD r; @@ -650,11 +650,11 @@ MyDerivedClassI::opIntIntSD_async(Test::IntIntSD p1, } void -MyDerivedClassI::opLongLongSD_async(Test::LongLongSD p1, - Test::LongLongSD p2, - function<void (const Test::LongLongSD&, const Test::LongLongSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opLongLongSDAsync(Test::LongLongSD p1, + Test::LongLongSD p2, + function<void (const Test::LongLongSD&, const Test::LongLongSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::LongLongSD p3 = p2; Test::LongLongSD r; @@ -663,11 +663,11 @@ MyDerivedClassI::opLongLongSD_async(Test::LongLongSD p1, } void -MyDerivedClassI::opStringFloatSD_async(Test::StringFloatSD p1, - Test::StringFloatSD p2, - function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringFloatSDAsync(Test::StringFloatSD p1, + Test::StringFloatSD p2, + function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringFloatSD p3 = p2; Test::StringFloatSD r; @@ -676,12 +676,12 @@ MyDerivedClassI::opStringFloatSD_async(Test::StringFloatSD p1, } void -MyDerivedClassI::opStringDoubleSD_async(Test::StringDoubleSD p1, - Test::StringDoubleSD p2, - function<void (const Test::StringDoubleSD&, - const Test::StringDoubleSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringDoubleSDAsync(Test::StringDoubleSD p1, + Test::StringDoubleSD p2, + function<void (const Test::StringDoubleSD&, + const Test::StringDoubleSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringDoubleSD p3 = p2; Test::StringDoubleSD r; @@ -690,12 +690,12 @@ MyDerivedClassI::opStringDoubleSD_async(Test::StringDoubleSD p1, } void -MyDerivedClassI::opStringStringSD_async(Test::StringStringSD p1, - Test::StringStringSD p2, - function<void (const Test::StringStringSD&, - const Test::StringStringSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringStringSDAsync(Test::StringStringSD p1, + Test::StringStringSD p2, + function<void (const Test::StringStringSD&, + const Test::StringStringSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringStringSD p3 = p2; Test::StringStringSD r; @@ -704,12 +704,12 @@ MyDerivedClassI::opStringStringSD_async(Test::StringStringSD p1, } void -MyDerivedClassI::opMyEnumMyEnumSD_async(Test::MyEnumMyEnumSD p1, - Test::MyEnumMyEnumSD p2, - function<void (const Test::MyEnumMyEnumSD&, - const Test::MyEnumMyEnumSD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyEnumMyEnumSDAsync(Test::MyEnumMyEnumSD p1, + Test::MyEnumMyEnumSD p2, + function<void (const Test::MyEnumMyEnumSD&, + const Test::MyEnumMyEnumSD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::MyEnumMyEnumSD p3 = p2; Test::MyEnumMyEnumSD r; @@ -718,10 +718,10 @@ MyDerivedClassI::opMyEnumMyEnumSD_async(Test::MyEnumMyEnumSD p1, } void -MyDerivedClassI::opIntS_async(Test::IntS s, - function<void (const Test::IntS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opIntSAsync(Test::IntS s, + function<void (const Test::IntS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::IntS r; std::transform(s.begin(), s.end(), std::back_inserter(r), std::negate<int>()); @@ -729,10 +729,10 @@ MyDerivedClassI::opIntS_async(Test::IntS s, } void -MyDerivedClassI::opByteSOneway_async(Test::ByteS, - function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteSOnewayAsync(Test::ByteS, + function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current&) { IceUtil::Mutex::Lock sync(_mutex); ++_opByteSOnewayCallCount; @@ -740,9 +740,9 @@ MyDerivedClassI::opByteSOneway_async(Test::ByteS, } void -MyDerivedClassI::opByteSOnewayCallCount_async(function<void (int)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteSOnewayCallCountAsync(function<void (int)> response, + function<void (exception_ptr)>, + const Ice::Current&) { IceUtil::Mutex::Lock sync(_mutex); response(_opByteSOnewayCallCount); @@ -750,20 +750,20 @@ MyDerivedClassI::opByteSOnewayCallCount_async(function<void (int)> response, } void -MyDerivedClassI::opContext_async(function<void (const Ice::Context&)> response, - function<void (exception_ptr)>, - const Ice::Current& current) +MyDerivedClassI::opContextAsync(function<void (const Ice::Context&)> response, + function<void (exception_ptr)>, + const Ice::Current& current) { Test::StringStringD r = current.ctx; response(r); } void -MyDerivedClassI::opDoubleMarshaling_async(Ice::Double p1, - Test::DoubleS p2, - function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opDoubleMarshalingAsync(Ice::Double p1, + Test::DoubleS p2, + function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current&) { Ice::Double d = 1278312346.0 / 13.0; test(p1 == d); @@ -775,152 +775,152 @@ MyDerivedClassI::opDoubleMarshaling_async(Ice::Double p1, } void -MyDerivedClassI::opIdempotent_async(function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current& current) +MyDerivedClassI::opIdempotentAsync(function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current& current) { test(current.mode == OperationMode::Idempotent); response(); } void -MyDerivedClassI::opNonmutating_async(function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current& current) +MyDerivedClassI::opNonmutatingAsync(function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current& current) { test(current.mode == OperationMode::Nonmutating); response(); } void -MyDerivedClassI::opDerived_async(function<void ()> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opDerivedAsync(function<void ()> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(); } void -MyDerivedClassI::opByte1_async(Ice::Byte b, - function<void (Ice::Byte)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByte1Async(Ice::Byte b, + function<void (Ice::Byte)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(b); } void -MyDerivedClassI::opShort1_async(Ice::Short s, - function<void (Ice::Short)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opShort1Async(Ice::Short s, + function<void (Ice::Short)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(s); } void -MyDerivedClassI::opInt1_async(Ice::Int i, - function<void (Ice::Int)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opInt1Async(Ice::Int i, + function<void (Ice::Int)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(i); } void -MyDerivedClassI::opLong1_async(Ice::Long l, - function<void (Ice::Long)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opLong1Async(Ice::Long l, + function<void (Ice::Long)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(l); } void -MyDerivedClassI::opFloat1_async(Ice::Float f, - function<void (Ice::Float)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opFloat1Async(Ice::Float f, + function<void (Ice::Float)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(f); } void -MyDerivedClassI::opDouble1_async(Ice::Double d, - function<void (Ice::Double)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opDouble1Async(Ice::Double d, + function<void (Ice::Double)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(d); } void -MyDerivedClassI::opString1_async(string s, - function<void (const string&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opString1Async(string s, + function<void (const string&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(s); } void -MyDerivedClassI::opStringS1_async(Test::StringS seq, - function<void (const Test::StringS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringS1Async(Test::StringS seq, + function<void (const Test::StringS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(seq); } void -MyDerivedClassI::opByteBoolD1_async(Test::ByteBoolD dict, - function<void (const Test::ByteBoolD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteBoolD1Async(Test::ByteBoolD dict, + function<void (const Test::ByteBoolD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(dict); } void -MyDerivedClassI::opStringS2_async(Test::StringS seq, - function<void (const Test::StringS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringS2Async(Test::StringS seq, + function<void (const Test::StringS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(seq); } void -MyDerivedClassI::opByteBoolD2_async(Test::ByteBoolD dict, - function<void (const Test::ByteBoolD&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opByteBoolD2Async(Test::ByteBoolD dict, + function<void (const Test::ByteBoolD&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(dict); } void -MyDerivedClassI::opMyStruct1_async(Test::MyStruct1 s, - function<void (const Test::MyStruct1&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyStruct1Async(Test::MyStruct1 s, + function<void (const Test::MyStruct1&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(s); } void -MyDerivedClassI::opMyClass1_async(shared_ptr<Test::MyClass1> c, - function<void (const shared_ptr<Test::MyClass1>&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opMyClass1Async(shared_ptr<Test::MyClass1> c, + function<void (const shared_ptr<Test::MyClass1>&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { response(c); } void -MyDerivedClassI::opStringLiterals_async(function<void (const Test::StringS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opStringLiteralsAsync(function<void (const Test::StringS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::StringS data; data.push_back(Test::s0); @@ -962,9 +962,9 @@ MyDerivedClassI::opStringLiterals_async(function<void (const Test::StringS&)> re } void -MyDerivedClassI::opWStringLiterals_async(function<void (const Test::WStringS&)> response, - function<void (exception_ptr)>, - const Ice::Current&) +MyDerivedClassI::opWStringLiteralsAsync(function<void (const Test::WStringS&)> response, + function<void (exception_ptr)>, + const Ice::Current&) { Test::WStringS data; data.push_back(Test::ws0); diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h index 7aa1705c662..313ba44dcb7 100644 --- a/cpp/test/Ice/operations/TestAMDI.h +++ b/cpp/test/Ice/operations/TestAMDI.h @@ -38,355 +38,355 @@ public: #endif #ifdef ICE_CPP11_MAPPING - virtual void shutdown_async(::std::function<void ()>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void shutdownAsync(::std::function<void ()>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void delayAsync(Ice::Int, + ::std::function<void ()>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void delay_async(Ice::Int, - ::std::function<void ()>, + virtual void opVoidAsync(::std::function<void ()>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opVoid_async(::std::function<void ()>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opByteAsync(Ice::Byte, Ice::Byte, + ::std::function<void (Ice::Byte, Ice::Byte)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opBoolAsync(bool, bool, + ::std::function<void (bool, bool)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opShortIntLongAsync(short, int, long long int, + ::std::function<void (long long int, short, int, long long int)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opFloatDoubleAsync(float, double, + ::std::function<void (double, float, double)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opStringAsync(std::string, std::string, + ::std::function<void (const ::std::string&, const ::std::string&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opByte_async(Ice::Byte, Ice::Byte, - ::std::function<void (Ice::Byte, Ice::Byte)>, + virtual void opMyEnumAsync(Test::MyEnum, + std::function<void (Test::MyEnum, Test::MyEnum)>, + std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opMyClassAsync(std::shared_ptr<Test::MyClassPrx>, + std::function<void (const std::shared_ptr<Test::MyClassPrx>&, + const std::shared_ptr<Test::MyClassPrx>&, + const std::shared_ptr<Test::MyClassPrx>&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opStructAsync(Test::Structure, Test::Structure, + ::std::function<void (const Test::Structure&, const Test::Structure&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opByteSAsync(Test::ByteS, Test::ByteS, + ::std::function<void (const Test::ByteS&, const Test::ByteS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opBool_async(bool, bool, - ::std::function<void (bool, bool)>, + virtual void opBoolSAsync(Test::BoolS, Test::BoolS, + ::std::function<void (const Test::BoolS&, const Test::BoolS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opShortIntLong_async(short, int, long long int, - ::std::function<void (long long int, short, int, long long int)>, + virtual void opShortIntLongSAsync(Test::ShortS, Test::IntS, Test::LongS, + ::std::function<void (const Test::LongS&, + const Test::ShortS&, + const Test::IntS&, + const Test::LongS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opFloatDouble_async(float, double, - ::std::function<void (double, float, double)>, + virtual void opFloatDoubleSAsync(Test::FloatS, Test::DoubleS, + ::std::function<void (const Test::DoubleS&, + const Test::FloatS&, + const Test::DoubleS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opString_async(std::string, std::string, - ::std::function<void (const ::std::string&, const ::std::string&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opMyEnum_async(Test::MyEnum, - std::function<void (Test::MyEnum, Test::MyEnum)>, - std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opMyClass_async(std::shared_ptr<Test::MyClassPrx>, - std::function<void (const std::shared_ptr<Test::MyClassPrx>&, - const std::shared_ptr<Test::MyClassPrx>&, - const std::shared_ptr<Test::MyClassPrx>&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opStruct_async(Test::Structure, Test::Structure, - ::std::function<void (const Test::Structure&, const Test::Structure&)>, + virtual void opStringSAsync(Test::StringS, Test::StringS, + ::std::function<void (const Test::StringS&, const Test::StringS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opByteS_async(Test::ByteS, Test::ByteS, - ::std::function<void (const Test::ByteS&, const Test::ByteS&)>, + virtual void opByteSSAsync(Test::ByteSS, Test::ByteSS, + ::std::function<void (const Test::ByteSS&, const Test::ByteSS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opBoolS_async(Test::BoolS, Test::BoolS, - ::std::function<void (const Test::BoolS&, const Test::BoolS&)>, + virtual void opBoolSSAsync(Test::BoolSS, Test::BoolSS, + ::std::function<void (const Test::BoolSS&, const Test::BoolSS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opShortIntLongS_async(Test::ShortS, Test::IntS, Test::LongS, - ::std::function<void (const Test::LongS&, - const Test::ShortS&, - const Test::IntS&, - const Test::LongS&)>, + virtual void opShortIntLongSSAsync(Test::ShortSS, Test::IntSS, Test::LongSS, + ::std::function<void (const Test::LongSS&, + const Test::ShortSS&, + const Test::IntSS&, + const Test::LongSS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opFloatDoubleS_async(Test::FloatS, Test::DoubleS, - ::std::function<void (const Test::DoubleS&, - const Test::FloatS&, - const Test::DoubleS&)>, + virtual void opFloatDoubleSSAsync(Test::FloatSS, Test::DoubleSS, + ::std::function<void (const Test::DoubleSS&, + const Test::FloatSS&, + const Test::DoubleSS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringS_async(Test::StringS, Test::StringS, - ::std::function<void (const Test::StringS&, const Test::StringS&)>, + virtual void opStringSSAsync(Test::StringSS, Test::StringSS, + ::std::function<void (const Test::StringSS&, const Test::StringSS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opByteSS_async(Test::ByteSS, Test::ByteSS, - ::std::function<void (const Test::ByteSS&, const Test::ByteSS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opBoolSS_async(Test::BoolSS, Test::BoolSS, - ::std::function<void (const Test::BoolSS&, const Test::BoolSS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opShortIntLongSS_async(Test::ShortSS, Test::IntSS, Test::LongSS, - ::std::function<void (const Test::LongSS&, - const Test::ShortSS&, - const Test::IntSS&, - const Test::LongSS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opStringSSSAsync(Test::StringSSS, Test::StringSSS, + ::std::function<void (const Test::StringSSS&, const Test::StringSSS&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opFloatDoubleSS_async(Test::FloatSS, Test::DoubleSS, - ::std::function<void (const Test::DoubleSS&, - const Test::FloatSS&, - const Test::DoubleSS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opByteBoolDAsync(Test::ByteBoolD, Test::ByteBoolD, + ::std::function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opStringSS_async(Test::StringSS, Test::StringSS, - ::std::function<void (const Test::StringSS&, const Test::StringSS&)>, + virtual void opShortIntDAsync(Test::ShortIntD, Test::ShortIntD, + ::std::function<void (const Test::ShortIntD&, const Test::ShortIntD&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringSSS_async(Test::StringSSS, Test::StringSSS, - ::std::function<void (const Test::StringSSS&, const Test::StringSSS&)>, + virtual void opLongFloatDAsync(Test::LongFloatD, Test::LongFloatD, + ::std::function<void (const Test::LongFloatD&, const Test::LongFloatD&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opByteBoolD_async(Test::ByteBoolD, Test::ByteBoolD, - ::std::function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)>, + virtual void opStringStringDAsync(Test::StringStringD, Test::StringStringD, + ::std::function<void (const Test::StringStringD&, const Test::StringStringD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opStringMyEnumDAsync(Test::StringMyEnumD, Test::StringMyEnumD, + ::std::function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opMyEnumStringDAsync(Test::MyEnumStringD, Test::MyEnumStringD, + ::std::function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opMyStructMyEnumDAsync(Test::MyStructMyEnumD, Test::MyStructMyEnumD, + ::std::function<void (const Test::MyStructMyEnumD&, + const Test::MyStructMyEnumD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opByteBoolDSAsync(Test::ByteBoolDS, Test::ByteBoolDS, + ::std::function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opShortIntD_async(Test::ShortIntD, Test::ShortIntD, - ::std::function<void (const Test::ShortIntD&, const Test::ShortIntD&)>, + virtual void opShortIntDSAsync(Test::ShortIntDS, Test::ShortIntDS, + ::std::function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opLongFloatD_async(Test::LongFloatD, Test::LongFloatD, - ::std::function<void (const Test::LongFloatD&, const Test::LongFloatD&)>, + virtual void opLongFloatDSAsync(Test::LongFloatDS, Test::LongFloatDS, + ::std::function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringStringD_async(Test::StringStringD, Test::StringStringD, - ::std::function<void (const Test::StringStringD&, const Test::StringStringD&)>, + virtual void opStringStringDSAsync(Test::StringStringDS, Test::StringStringDS, + ::std::function<void (const Test::StringStringDS&, const Test::StringStringDS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringMyEnumD_async(Test::StringMyEnumD, Test::StringMyEnumD, - ::std::function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)>, + virtual void opStringMyEnumDSAsync(Test::StringMyEnumDS, Test::StringMyEnumDS, + ::std::function<void (const Test::StringMyEnumDS&, + const Test::StringMyEnumDS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opMyEnumStringD_async(Test::MyEnumStringD, Test::MyEnumStringD, - ::std::function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)>, + virtual void opMyEnumStringDSAsync(Test::MyEnumStringDS, Test::MyEnumStringDS, + ::std::function<void (const Test::MyEnumStringDS&, + const Test::MyEnumStringDS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opMyStructMyEnumD_async(Test::MyStructMyEnumD, Test::MyStructMyEnumD, - ::std::function<void (const Test::MyStructMyEnumD&, - const Test::MyStructMyEnumD&)>, + virtual void opMyStructMyEnumDSAsync(Test::MyStructMyEnumDS, Test::MyStructMyEnumDS, + ::std::function<void (const Test::MyStructMyEnumDS&, + const Test::MyStructMyEnumDS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opByteBoolDS_async(Test::ByteBoolDS, Test::ByteBoolDS, - ::std::function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opByteByteSDAsync(Test::ByteByteSD, Test::ByteByteSD, + ::std::function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opShortIntDS_async(Test::ShortIntDS, Test::ShortIntDS, - ::std::function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opBoolBoolSDAsync(Test::BoolBoolSD, Test::BoolBoolSD, + ::std::function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opLongFloatDS_async(Test::LongFloatDS, Test::LongFloatDS, - ::std::function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)>, + virtual void opShortShortSDAsync(Test::ShortShortSD, Test::ShortShortSD, + ::std::function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringStringDS_async(Test::StringStringDS, Test::StringStringDS, - ::std::function<void (const Test::StringStringDS&, const Test::StringStringDS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opStringMyEnumDS_async(Test::StringMyEnumDS, Test::StringMyEnumDS, - ::std::function<void (const Test::StringMyEnumDS&, - const Test::StringMyEnumDS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opMyEnumStringDS_async(Test::MyEnumStringDS, Test::MyEnumStringDS, - ::std::function<void (const Test::MyEnumStringDS&, - const Test::MyEnumStringDS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opMyStructMyEnumDS_async(Test::MyStructMyEnumDS, Test::MyStructMyEnumDS, - ::std::function<void (const Test::MyStructMyEnumDS&, - const Test::MyStructMyEnumDS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opByteByteSD_async(Test::ByteByteSD, Test::ByteByteSD, - ::std::function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opIntIntSDAsync(Test::IntIntSD, Test::IntIntSD, + ::std::function<void (const Test::IntIntSD&, const Test::IntIntSD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opBoolBoolSD_async(Test::BoolBoolSD, Test::BoolBoolSD, - ::std::function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opLongLongSDAsync(Test::LongLongSD, Test::LongLongSD, + ::std::function<void (const Test::LongLongSD&, const Test::LongLongSD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opShortShortSD_async(Test::ShortShortSD, Test::ShortShortSD, - ::std::function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)>, + virtual void opStringFloatSDAsync(Test::StringFloatSD, Test::StringFloatSD, + ::std::function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opIntIntSD_async(Test::IntIntSD, Test::IntIntSD, - ::std::function<void (const Test::IntIntSD&, const Test::IntIntSD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opLongLongSD_async(Test::LongLongSD, Test::LongLongSD, - ::std::function<void (const Test::LongLongSD&, const Test::LongLongSD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opStringFloatSD_async(Test::StringFloatSD, Test::StringFloatSD, - ::std::function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)>, + virtual void opStringDoubleSDAsync(Test::StringDoubleSD, Test::StringDoubleSD, + ::std::function<void (const Test::StringDoubleSD&, + const Test::StringDoubleSD&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringDoubleSD_async(Test::StringDoubleSD, Test::StringDoubleSD, - ::std::function<void (const Test::StringDoubleSD&, - const Test::StringDoubleSD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opStringStringSDAsync(Test::StringStringSD, Test::StringStringSD, + ::std::function<void (const Test::StringStringSD&, + const Test::StringStringSD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opStringStringSD_async(Test::StringStringSD, Test::StringStringSD, - ::std::function<void (const Test::StringStringSD&, - const Test::StringStringSD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opMyEnumMyEnumSDAsync(Test::MyEnumMyEnumSD, Test::MyEnumMyEnumSD, + ::std::function<void (const Test::MyEnumMyEnumSD&, + const Test::MyEnumMyEnumSD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opMyEnumMyEnumSD_async(Test::MyEnumMyEnumSD, Test::MyEnumMyEnumSD, - ::std::function<void (const Test::MyEnumMyEnumSD&, - const Test::MyEnumMyEnumSD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opIntSAsync(Test::IntS, + ::std::function<void (const Test::IntS&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opIntS_async(Test::IntS, - ::std::function<void (const Test::IntS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opByteSOnewayAsync(Test::ByteS, + ::std::function<void ()>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opByteSOneway_async(Test::ByteS, - ::std::function<void ()>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opByteSOnewayCallCountAsync(::std::function<void (int)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opByteSOnewayCallCount_async(::std::function<void (int)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opContextAsync(::std::function<void (const Ice::Context&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opContext_async(::std::function<void (const Ice::Context&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opDoubleMarshalingAsync(Ice::Double, Test::DoubleS, + ::std::function<void ()>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opDoubleMarshaling_async(Ice::Double, Test::DoubleS, - ::std::function<void ()>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opIdempotentAsync(::std::function<void ()>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opIdempotent_async(::std::function<void ()>, + virtual void opNonmutatingAsync(::std::function<void ()>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opNonmutating_async(::std::function<void ()>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opDerivedAsync(::std::function<void ()>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opDerived_async(::std::function<void ()>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opByte1Async(Ice::Byte, + ::std::function<void (Ice::Byte)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opByte1_async(Ice::Byte, - ::std::function<void (Ice::Byte)>, + virtual void opShort1Async(Ice::Short, + ::std::function<void (Ice::Short)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opShort1_async(Ice::Short, - ::std::function<void (Ice::Short)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opInt1Async(Ice::Int, + ::std::function<void (Ice::Int)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opInt1_async(Ice::Int, - ::std::function<void (Ice::Int)>, + virtual void opLong1Async(Ice::Long, + ::std::function<void (Ice::Long)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opLong1_async(Ice::Long, - ::std::function<void (Ice::Long)>, + virtual void opFloat1Async(Ice::Float, + ::std::function<void (Ice::Float)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opFloat1_async(Ice::Float, - ::std::function<void (Ice::Float)>, + virtual void opDouble1Async(Ice::Double, + ::std::function<void (Ice::Double)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opDouble1_async(Ice::Double, - ::std::function<void (Ice::Double)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opString1Async(std::string, + ::std::function<void (const ::std::string&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opString1_async(std::string, - ::std::function<void (const ::std::string&)>, + virtual void opStringS1Async(Test::StringS, + ::std::function<void (const Test::StringS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringS1_async(Test::StringS, - ::std::function<void (const Test::StringS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opByteBoolD1_async(Test::ByteBoolD, - ::std::function<void (const Test::ByteBoolD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); - - virtual void opStringS2_async(Test::StringS, - ::std::function<void (const Test::StringS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opByteBoolD1Async(Test::ByteBoolD, + ::std::function<void (const Test::ByteBoolD&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opByteBoolD2_async(Test::ByteBoolD, - ::std::function<void (const Test::ByteBoolD&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); + virtual void opStringS2Async(Test::StringS, + ::std::function<void (const Test::StringS&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); - virtual void opMyStruct1_async(Test::MyStruct1, - ::std::function<void (const Test::MyStruct1&)>, + virtual void opByteBoolD2Async(Test::ByteBoolD, + ::std::function<void (const Test::ByteBoolD&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opMyClass1_async(::std::shared_ptr<Test::MyClass1>, - ::std::function<void (const ::std::shared_ptr<Test::MyClass1>&)>, + virtual void opMyStruct1Async(Test::MyStruct1, + ::std::function<void (const Test::MyStruct1&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void opStringLiterals_async(::std::function<void (const Test::StringS&)>, + virtual void opMyClass1Async(::std::shared_ptr<Test::MyClass1>, + ::std::function<void (const ::std::shared_ptr<Test::MyClass1>&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opStringLiteralsAsync(::std::function<void (const Test::StringS&)>, + ::std::function<void (std::exception_ptr)>, + const Ice::Current&); + + virtual void opWStringLiteralsAsync(::std::function<void (const Test::WStringS&)>, ::std::function<void (std::exception_ptr)>, const Ice::Current&); - - virtual void opWStringLiterals_async(::std::function<void (const Test::WStringS&)>, - ::std::function<void (std::exception_ptr)>, - const Ice::Current&); #else virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&, const Ice::Current&); diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 157bcb39888..467f51bff5e 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -1061,7 +1061,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->ice_ping_async( + p->ice_pingAsync( [&]() { cb->ping(); @@ -1079,7 +1079,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->ice_isA_async( + p->ice_isAAsync( Test::MyClass::ice_staticId(), [&](bool v) { @@ -1098,7 +1098,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->ice_id_async( + p->ice_idAsync( [&](string id) { cb->id(move(id)); @@ -1116,7 +1116,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->ice_ids_async( + p->ice_idsAsync( [&](vector<string> ids) { cb->ids(move(ids)); @@ -1135,7 +1135,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opVoid_async( + p->opVoidAsync( [&]() { cb->opVoid(); @@ -1154,7 +1154,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f), + p->opByteAsync(Ice::Byte(0xff), Ice::Byte(0x0f), [&](Ice::Byte b1, Ice::Byte b2) { cb->opByte(b1, b2); @@ -1172,7 +1172,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opBool_async(true, false, + p->opBoolAsync(true, false, [&](bool b1, bool b2) { cb->opBool(b1, b2); @@ -1190,7 +1190,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opShortIntLong_async(10, 11, 12, + p->opShortIntLongAsync(10, 11, 12, [&](long long int l1, short s1, int i1, long long int l2) { cb->opShortIntLong(l1, s1, i1, l2); @@ -1207,7 +1207,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opFloatDouble_async(3.14f, 1.1E10, + p->opFloatDoubleAsync(3.14f, 1.1E10, [&](double d1, float f1, double d2) { cb->opFloatDouble(d1, f1, d2); @@ -1224,7 +1224,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opString_async("hello", "world", + p->opStringAsync("hello", "world", [&](string s1, string s2) { cb->opString(move(s1), move(s2)); @@ -1242,7 +1242,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opMyEnum_async(MyEnum::enum2, + p->opMyEnumAsync(MyEnum::enum2, [&](MyEnum e1, MyEnum e2) { cb->opMyEnum(e1, e2); @@ -1260,7 +1260,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback(communicator); #ifdef ICE_CPP11_MAPPING - p->opMyClass_async(p, + p->opMyClassAsync(p, [&](shared_ptr<MyClassPrx> c1, shared_ptr<MyClassPrx> c2, shared_ptr<MyClassPrx> c3) { cb->opMyClass(move(c1), move(c2), move(c3)); @@ -1287,7 +1287,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback(communicator); #ifdef ICE_CPP11_MAPPING - p->opStruct_async(si1, si2, + p->opStructAsync(si1, si2, [&](Test::Structure si3, Test::Structure si4) { cb->opStruct(move(si3), move(si4)); @@ -1318,7 +1318,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opByteS_async(bsi1, bsi2, + p->opByteSAsync(bsi1, bsi2, [&](Test::ByteS bsi3, Test::ByteS bsi4) { cb->opByteS(move(bsi3), move(bsi4)); @@ -1345,7 +1345,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opBoolS_async(bsi1, bsi2, + p->opBoolSAsync(bsi1, bsi2, [&](Test::BoolS bsi3, Test::BoolS bsi4) { cb->opBoolS(move(bsi3), move(bsi4)); @@ -1380,7 +1380,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opShortIntLongS_async(ssi, isi, lsi, + p->opShortIntLongSAsync(ssi, isi, lsi, [&](Test::LongS lsi1, Test::ShortS ssi1, Test::IntS isi1, Test::LongS lsi2) { cb->opShortIntLongS(move(lsi1), move(ssi1), move(isi1), move(lsi2)); @@ -1407,7 +1407,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opFloatDoubleS_async(fsi, dsi, + p->opFloatDoubleSAsync(fsi, dsi, [&](Test::DoubleS dsi1, Test::FloatS fsi1, Test::DoubleS dsi2) { cb->opFloatDoubleS(move(dsi1), move(fsi1), move(dsi2)); @@ -1433,7 +1433,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringS_async(ssi1, ssi2, + p->opStringSAsync(ssi1, ssi2, [&](Test::StringS ssi3, Test::StringS ssi4) { cb->opStringS(move(ssi3), move(ssi4)); @@ -1465,7 +1465,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opByteSS_async(bsi1, bsi2, + p->opByteSSAsync(bsi1, bsi2, [&](Test::ByteSS bsi3, Test::ByteSS bsi4) { cb->opByteSS(move(bsi3), move(bsi4)); @@ -1497,7 +1497,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opBoolSS_async(bsi1, bsi2, + p->opBoolSSAsync(bsi1, bsi2, [&](Test::BoolSS bsi3, Test::BoolSS bsi4) { cb->opBoolSS(move(bsi3), move(bsi4)); @@ -1531,7 +1531,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opShortIntLongSS_async(ssi, isi, lsi, + p->opShortIntLongSSAsync(ssi, isi, lsi, [&](Test::LongSS lsi1, Test::ShortSS ssi1, Test::IntSS isi1, Test::LongSS lsi2) { cb->opShortIntLongSS(move(lsi1), move(ssi1), move(isi1), move(lsi2)); @@ -1561,7 +1561,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opFloatDoubleSS_async(fsi, dsi, + p->opFloatDoubleSSAsync(fsi, dsi, [&](Test::DoubleSS dsi1, Test::FloatSS fsi1, Test::DoubleSS dsi2) { cb->opFloatDoubleSS(move(dsi1), move(fsi1), move(dsi2)); @@ -1589,7 +1589,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringSS_async(ssi1, ssi2, + p->opStringSSAsync(ssi1, ssi2, [&](Test::StringSS ssi3, Test::StringSS ssi4) { cb->opStringSS(move(ssi3), move(ssi4)); @@ -1614,7 +1614,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opByteBoolD_async(di1, di2, + p->opByteBoolDAsync(di1, di2, [&](Test::ByteBoolD di3, Test::ByteBoolD di4) { cb->opByteBoolD(move(di3), move(di4)); @@ -1639,7 +1639,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opShortIntD_async(di1, di2, + p->opShortIntDAsync(di1, di2, [&](Test::ShortIntD di3, Test::ShortIntD di4) { cb->opShortIntD(move(di3), move(di4)); @@ -1664,7 +1664,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opLongFloatD_async(di1, di2, + p->opLongFloatDAsync(di1, di2, [&](Test::LongFloatD di3, Test::LongFloatD di4) { cb->opLongFloatD(move(di3), move(di4)); @@ -1689,7 +1689,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringStringD_async(di1, di2, + p->opStringStringDAsync(di1, di2, [&](Test::StringStringD di3, Test::StringStringD di4) { cb->opStringStringD(move(di3), move(di4)); @@ -1714,7 +1714,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringMyEnumD_async(di1, di2, + p->opStringMyEnumDAsync(di1, di2, [&](Test::StringMyEnumD di3, Test::StringMyEnumD di4) { cb->opStringMyEnumD(move(di3), move(di4)); @@ -1744,7 +1744,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opMyStructMyEnumD_async(di1, di2, + p->opMyStructMyEnumDAsync(di1, di2, [&](Test::MyStructMyEnumD di3, Test::MyStructMyEnumD di4) { cb->opMyStructMyEnumD(move(di3), move(di4)); @@ -1781,7 +1781,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opByteBoolDS_async(dsi1, dsi2, + p->opByteBoolDSAsync(dsi1, dsi2, [&](Test::ByteBoolDS dsi3, Test::ByteBoolDS dsi4) { cb->opByteBoolDS(move(dsi3), move(dsi4)); @@ -1817,7 +1817,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opShortIntDS_async(dsi1, dsi2, + p->opShortIntDSAsync(dsi1, dsi2, [&](Test::ShortIntDS dsi3, Test::ShortIntDS dsi4) { cb->opShortIntDS(move(dsi3), move(dsi4)); @@ -1853,7 +1853,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opLongFloatDS_async(dsi1, dsi2, + p->opLongFloatDSAsync(dsi1, dsi2, [&](Test::LongFloatDS dsi3, Test::LongFloatDS dsi4) { cb->opLongFloatDS(move(dsi3), move(dsi4)); @@ -1889,7 +1889,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringStringDS_async(dsi1, dsi2, + p->opStringStringDSAsync(dsi1, dsi2, [&](Test::StringStringDS dsi3, Test::StringStringDS dsi4) { cb->opStringStringDS(move(dsi3), move(dsi4)); @@ -1926,7 +1926,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringMyEnumDS_async(dsi1, dsi2, + p->opStringMyEnumDSAsync(dsi1, dsi2, [&](Test::StringMyEnumDS dsi3, Test::StringMyEnumDS dsi4) { cb->opStringMyEnumDS(move(dsi3), move(dsi4)); @@ -1960,7 +1960,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opMyEnumStringDS_async(dsi1, dsi2, + p->opMyEnumStringDSAsync(dsi1, dsi2, [&](Test::MyEnumStringDS dsi3, Test::MyEnumStringDS dsi4) { cb->opMyEnumStringDS(move(dsi3), move(dsi4)); @@ -2002,7 +2002,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opMyStructMyEnumDS_async(dsi1, dsi2, + p->opMyStructMyEnumDSAsync(dsi1, dsi2, [&](Test::MyStructMyEnumDS dsi3, MyStructMyEnumDS dsi4) { cb->opMyStructMyEnumDS(move(dsi3), move(dsi4)); @@ -2036,7 +2036,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opByteByteSD_async(sdi1, sdi2, + p->opByteByteSDAsync(sdi1, sdi2, [&](Test::ByteByteSD sdi3, Test::ByteByteSD sdi4) { cb->opByteByteSD(move(sdi3), move(sdi4)); @@ -2069,7 +2069,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opBoolBoolSD_async(sdi1, sdi2, + p->opBoolBoolSDAsync(sdi1, sdi2, [&](Test::BoolBoolSD sdi3, Test::BoolBoolSD sdi4) { cb->opBoolBoolSD(move(sdi3), move(sdi4)); @@ -2105,7 +2105,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opShortShortSD_async(sdi1, sdi2, + p->opShortShortSDAsync(sdi1, sdi2, [&](Test::ShortShortSD sdi3, Test::ShortShortSD sdi4) { cb->opShortShortSD(move(sdi3), move(sdi4)); @@ -2141,7 +2141,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opIntIntSD_async(sdi1, sdi2, + p->opIntIntSDAsync(sdi1, sdi2, [&](Test::IntIntSD sdi3, Test::IntIntSD sdi4) { cb->opIntIntSD(move(sdi3), move(sdi4)); @@ -2177,7 +2177,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opLongLongSD_async(sdi1, sdi2, + p->opLongLongSDAsync(sdi1, sdi2, [&](Test::LongLongSD sdi3, Test::LongLongSD sdi4) { cb->opLongLongSD(move(sdi3), move(sdi4)); @@ -2213,7 +2213,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringFloatSD_async(sdi1, sdi2, + p->opStringFloatSDAsync(sdi1, sdi2, [&](Test::StringFloatSD sdi3, Test::StringFloatSD sdi4) { cb->opStringFloatSD(move(sdi3), move(sdi4)); @@ -2249,7 +2249,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringDoubleSD_async(sdi1, sdi2, + p->opStringDoubleSDAsync(sdi1, sdi2, [&](Test::StringDoubleSD sdi3, Test::StringDoubleSD sdi4) { cb->opStringDoubleSD(move(sdi3), move(sdi4)); @@ -2287,7 +2287,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opStringStringSD_async(sdi1, sdi2, + p->opStringStringSDAsync(sdi1, sdi2, [&](Test::StringStringSD sdi3, Test::StringStringSD sdi4) { cb->opStringStringSD(move(sdi3), move(sdi4)); @@ -2323,7 +2323,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opMyEnumMyEnumSD_async(sdi1, sdi2, + p->opMyEnumMyEnumSDAsync(sdi1, sdi2, [&](Test::MyEnumMyEnumSD sdi3, Test::MyEnumMyEnumSD sdi4) { cb->opMyEnumMyEnumSD(move(sdi3), move(sdi4)); @@ -2349,7 +2349,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& } CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opIntS_async(s, + p->opIntSAsync(s, [&](Test::IntS s1) { cb->opIntS(s1); @@ -2373,7 +2373,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(p->ice_getContext().empty()); #ifdef ICE_CPP11_MAPPING promise<void> prom; - p->opContext_async( + p->opContextAsync( [&](Ice::Context c) { test(c != ctx); @@ -2394,7 +2394,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(p->ice_getContext().empty()); #ifdef ICE_CPP11_MAPPING promise<void> prom; - p->opContext_async( + p->opContextAsync( [&](Ice::Context c) { test(c == ctx); @@ -2416,7 +2416,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { #ifdef ICE_CPP11_MAPPING promise<void> prom; - p2->opContext_async( + p2->opContextAsync( [&](Ice::Context c) { test(c == ctx); @@ -2437,7 +2437,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx)); #ifdef ICE_CPP11_MAPPING promise<void> prom; - p2->opContext_async( + p2->opContextAsync( [&](Ice::Context c) { test(c == ctx); @@ -2483,7 +2483,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { #ifdef ICE_CPP11_MAPPING promise<void> prom; - p->opContext_async( + p->opContextAsync( [&](Ice::Context c) { test(c == ctx); @@ -2507,7 +2507,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { #ifdef ICE_CPP11_MAPPING promise<void> prom; - p->opContext_async( + p->opContextAsync( [&](Ice::Context c) { test(c == ctx); @@ -2547,7 +2547,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { #ifdef ICE_CPP11_MAPPING promise<void> prom; - p->opContext_async( + p->opContextAsync( [&](Ice::Context c) { test(c == prxContext); @@ -2569,7 +2569,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { #ifdef ICE_CPP11_MAPPING promise<void> prom; - p->opContext_async( + p->opContextAsync( [&](Ice::Context c) { test(c == combined); @@ -2599,7 +2599,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& Test::DoubleS ds(5, d); CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opDoubleMarshaling_async(d, ds, + p->opDoubleMarshalingAsync(d, ds, [&]() { cb->opDoubleMarshaling(); @@ -2616,7 +2616,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opIdempotent_async( + p->opIdempotentAsync( [&]() { cb->opIdempotent(); @@ -2633,7 +2633,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - p->opNonmutating_async( + p->opNonmutatingAsync( [&]() { cb->opNonmutating(); @@ -2652,7 +2652,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& test(derived); CallbackPtr cb = new Callback; #ifdef ICE_CPP11_MAPPING - derived->opDerived_async( + derived->opDerivedAsync( [&]() { cb->opDerived(); @@ -2670,7 +2670,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->ice_ping_async(); + auto f = p->ice_pingAsync(); try { f.get(); @@ -2690,7 +2690,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->ice_isA_async(Test::MyClass::ice_staticId()); + auto f = p->ice_isAAsync(Test::MyClass::ice_staticId()); try { cb->isA(f.get()); @@ -2708,7 +2708,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->ice_id_async(); + auto f = p->ice_idAsync(); try { cb->id(f.get()); @@ -2726,7 +2726,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->ice_ids_async(); + auto f = p->ice_idsAsync(); try { cb->ids(f.get()); @@ -2744,7 +2744,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opVoid_async(); + auto f = p->opVoidAsync(); try { f.get(); @@ -2763,7 +2763,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f)); + auto f = p->opByteAsync(Ice::Byte(0xff), Ice::Byte(0x0f)); try { auto r = f.get(); @@ -2782,7 +2782,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opBool_async(true, false); + auto f = p->opBoolAsync(true, false); try { auto r = f.get(); @@ -2801,7 +2801,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opShortIntLong_async(10, 11, 12); + auto f = p->opShortIntLongAsync(10, 11, 12); try { auto r = f.get(); @@ -2820,7 +2820,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opFloatDouble_async(3.14f, 1.1E10); + auto f = p->opFloatDoubleAsync(3.14f, 1.1E10); try { auto r = f.get(); @@ -2839,7 +2839,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opString_async("hello", "world"); + auto f = p->opStringAsync("hello", "world"); try { auto r = f.get(); @@ -2858,7 +2858,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opMyEnum_async(Test::MyEnum::enum2); + auto f = p->opMyEnumAsync(Test::MyEnum::enum2); try { auto r = f.get(); @@ -2877,7 +2877,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback(communicator); - auto f = p->opMyClass_async(p); + auto f = p->opMyClassAsync(p); try { auto r = f.get(); @@ -2905,7 +2905,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& si2.s.s = "def"; CallbackPtr cb = new Callback(communicator); - auto f = p->opStruct_async(si1, si2); + auto f = p->opStructAsync(si1, si2); try { auto r = f.get(); @@ -2937,7 +2937,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& bsi2.push_back(Ice::Byte(0xf4)); CallbackPtr cb = new Callback; - auto f = p->opByteS_async(bsi1, bsi2); + auto f = p->opByteSAsync(bsi1, bsi2); try { auto r = f.get(); @@ -2965,7 +2965,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& bsi2.push_back(false); CallbackPtr cb = new Callback; - auto f = p->opBoolS_async(bsi1, bsi2); + auto f = p->opBoolSAsync(bsi1, bsi2); try { auto r = f.get(); @@ -3001,7 +3001,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& lsi.push_back(20); CallbackPtr cb = new Callback; - auto f = p->opShortIntLongS_async(ssi, isi, lsi); + auto f = p->opShortIntLongSAsync(ssi, isi, lsi); try { auto r = f.get(); @@ -3030,7 +3030,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi.push_back(Ice::Double(1.3E10)); CallbackPtr cb = new Callback; - auto f = p->opFloatDoubleS_async(fsi, dsi); + auto f = p->opFloatDoubleSAsync(fsi, dsi); try { auto r = f.get(); @@ -3058,7 +3058,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& ssi2.push_back("xyz"); CallbackPtr cb = new Callback; - auto f = p->opStringS_async(ssi1, ssi2); + auto f = p->opStringSAsync(ssi1, ssi2); try { auto r = f.get(); @@ -3091,7 +3091,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& bsi2[1].push_back(Ice::Byte(0xf1)); CallbackPtr cb = new Callback; - auto f = p->opByteSS_async(bsi1, bsi2); + auto f = p->opByteSSAsync(bsi1, bsi2); try { auto r = f.get(); @@ -3122,7 +3122,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi[0].push_back(Ice::Double(1.3E10)); CallbackPtr cb = new Callback; - auto f = p->opFloatDoubleSS_async(fsi, dsi); + auto f = p->opFloatDoubleSSAsync(fsi, dsi); try { auto r = f.get(); @@ -3152,7 +3152,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& ssi2[2].push_back("xyz"); CallbackPtr cb = new Callback; - auto f = p->opStringSS_async(ssi1, ssi2); + auto f = p->opStringSSAsync(ssi1, ssi2); try { auto r = f.get(); @@ -3179,7 +3179,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[101] = true; CallbackPtr cb = new Callback; - auto f = p->opByteBoolD_async(di1, di2); + auto f = p->opByteBoolDAsync(di1, di2); try { auto r = f.get(); @@ -3206,7 +3206,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[1101] = 0; CallbackPtr cb = new Callback; - auto f = p->opShortIntD_async(di1, di2); + auto f = p->opShortIntDAsync(di1, di2); try { auto r = f.get(); @@ -3233,7 +3233,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[999999130] = Ice::Float(0.5); CallbackPtr cb = new Callback; - auto f = p->opLongFloatD_async(di1, di2); + auto f = p->opLongFloatDAsync(di1, di2); try { auto r = f.get(); @@ -3260,7 +3260,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2["BAR"] = "abc 0.5"; CallbackPtr cb = new Callback; - auto f = p->opStringStringD_async(di1, di2); + auto f = p->opStringStringDAsync(di1, di2); try { auto r = f.get(); @@ -3287,7 +3287,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2); CallbackPtr cb = new Callback; - auto f = p->opStringMyEnumD_async(di1, di2); + auto f = p->opStringMyEnumDAsync(di1, di2); try { auto r = f.get(); @@ -3319,7 +3319,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& di2[s23] = ICE_ENUM(Test::MyEnum, enum2); CallbackPtr cb = new Callback; - auto f = p->opMyStructMyEnumD_async(di1, di2); + auto f = p->opMyStructMyEnumDAsync(di1, di2); try { auto r = f.get(); @@ -3358,7 +3358,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = new Callback; - auto f = p->opByteBoolDS_async(dsi1, dsi2); + auto f = p->opByteBoolDSAsync(dsi1, dsi2); try { auto r = f.get(); @@ -3396,7 +3396,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = new Callback; - auto f = p->opShortIntDS_async(dsi1, dsi2); + auto f = p->opShortIntDSAsync(dsi1, dsi2); try { auto r = f.get(); @@ -3434,7 +3434,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = new Callback; - auto f = p->opLongFloatDS_async(dsi1, dsi2); + auto f = p->opLongFloatDSAsync(dsi1, dsi2); try { auto r = f.get(); @@ -3472,7 +3472,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = new Callback; - auto f = p->opStringStringDS_async(dsi1, dsi2); + auto f = p->opStringStringDSAsync(dsi1, dsi2); try { auto r = f.get(); @@ -3510,7 +3510,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = new Callback; - auto f = p->opStringMyEnumDS_async(dsi1, dsi2); + auto f = p->opStringMyEnumDSAsync(dsi1, dsi2); try { auto r = f.get(); @@ -3546,7 +3546,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = new Callback; - auto f = p->opMyEnumStringDS_async(dsi1, dsi2); + auto f = p->opMyEnumStringDSAsync(dsi1, dsi2); try { auto r = f.get(); @@ -3590,7 +3590,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& dsi2[0] = di3; CallbackPtr cb = new Callback; - auto f = p->opMyStructMyEnumDS_async(dsi1, dsi2); + auto f = p->opMyStructMyEnumDSAsync(dsi1, dsi2); try { auto r = f.get(); @@ -3626,7 +3626,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[Ice::Byte(0xf1)] = si3; CallbackPtr cb = new Callback; - auto f = p->opByteByteSD_async(sdi1, sdi2); + auto f = p->opByteByteSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3661,7 +3661,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[false] = si1; CallbackPtr cb = new Callback; - auto f = p->opBoolBoolSD_async(sdi1, sdi2); + auto f = p->opBoolBoolSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3699,7 +3699,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[4] = si3; CallbackPtr cb = new Callback; - auto f = p->opShortShortSD_async(sdi1, sdi2); + auto f = p->opShortShortSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3737,7 +3737,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[400] = si3; CallbackPtr cb = new Callback; - auto f = p->opIntIntSD_async(sdi1, sdi2); + auto f = p->opIntIntSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3775,7 +3775,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[999999992] = si3; CallbackPtr cb = new Callback; - auto f = p->opLongLongSD_async(sdi1, sdi2); + auto f = p->opLongLongSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3813,7 +3813,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2["aBc"] = si3; CallbackPtr cb = new Callback; - auto f = p->opStringFloatSD_async(sdi1, sdi2); + auto f = p->opStringFloatSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3851,7 +3851,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[""] = si3; CallbackPtr cb = new Callback; - auto f = p->opStringDoubleSD_async(sdi1, sdi2); + auto f = p->opStringDoubleSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3891,7 +3891,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2["ghi"] = si3; CallbackPtr cb = new Callback; - auto f = p->opStringStringSD_async(sdi1, sdi2); + auto f = p->opStringStringSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3930,7 +3930,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& sdi2[ICE_ENUM(Test::MyEnum, enum1)] = si3; CallbackPtr cb = new Callback; - auto f = p->opMyEnumMyEnumSD_async(sdi1, sdi2); + auto f = p->opMyEnumMyEnumSDAsync(sdi1, sdi2); try { auto r = f.get(); @@ -3958,7 +3958,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& s.push_back(i); } CallbackPtr cb = new Callback; - auto f = p->opIntS_async(s); + auto f = p->opIntSAsync(s); try { cb->opIntS(f.get()); @@ -3979,7 +3979,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& Ice::Double d = 1278312346.0 / 13.0; Test::DoubleS ds(5, d); CallbackPtr cb = new Callback; - auto f = p->opDoubleMarshaling_async(d, ds); + auto f = p->opDoubleMarshalingAsync(d, ds); try { f.get(); @@ -3998,7 +3998,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opIdempotent_async(); + auto f = p->opIdempotentAsync(); try { f.get(); @@ -4017,7 +4017,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& { CallbackPtr cb = new Callback; - auto f = p->opNonmutating_async(); + auto f = p->opNonmutatingAsync(); try { f.get(); @@ -4038,7 +4038,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p); test(derived); CallbackPtr cb = new Callback; - auto f = derived->opDerived_async(); + auto f = derived->opDerivedAsync(); try { f.get(); diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index c405ea2bb9b..c00acdd2541 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj @@ -113,6 +113,46 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> <ItemGroup> <IceBuilder Include="..\..\Test.ice" /> </ItemGroup> diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj index 89c364a2b39..4ced22678da 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj @@ -115,41 +115,49 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj index a83788a7ef4..001f07a8523 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj @@ -115,41 +115,49 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj index c77f7e79084..4f814b964cd 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj @@ -114,6 +114,36 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <TargetName>Ice_operations_client</TargetName> </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\..\AllTests.cpp" /> <ClCompile Include="..\..\..\BatchOneways.cpp" /> diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj index d31de1bbaf2..2f79b10ab17 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj @@ -117,31 +117,37 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj index 2bfba18156d..d23e375648a 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj @@ -118,26 +118,31 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> <WindowsMetadataFile /> @@ -147,6 +152,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 36a02ffc738..0bcaccfff27 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -966,7 +966,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Test::MyClassPrxPtr cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13)); cl13->ice_ping(); #ifdef ICE_CPP11_MAPPING - cl13->ice_ping_async().get(); + cl13->ice_pingAsync().get(); #else cl13->end_ice_ping(cl13->begin_ice_ping()); #endif @@ -1044,7 +1044,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13)); cl13->ice_ping(); #ifdef ICE_CPP11_MAPPING - cl13->ice_ping_async().get(); + cl13->ice_pingAsync().get(); #else cl13->end_ice_ping(cl13->begin_ice_ping()); #endif diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp index dafc480b067..8ed80f009f2 100644 --- a/cpp/test/Ice/proxy/TestAMDI.cpp +++ b/cpp/test/Ice/proxy/TestAMDI.cpp @@ -19,7 +19,7 @@ MyDerivedClassI::MyDerivedClassI() #ifdef ICE_CPP11_MAPPING void -MyDerivedClassI::echo_async( +MyDerivedClassI::echoAsync( shared_ptr<Ice::ObjectPrx> obj, function<void (const shared_ptr<Ice::ObjectPrx>&)> response, function<void (exception_ptr)>, @@ -29,7 +29,7 @@ MyDerivedClassI::echo_async( } void -MyDerivedClassI::shutdown_async( +MyDerivedClassI::shutdownAsync( function<void ()> response, function<void (exception_ptr)>, const Ice::Current& current) @@ -39,7 +39,7 @@ MyDerivedClassI::shutdown_async( } void -MyDerivedClassI::getContext_async( +MyDerivedClassI::getContextAsync( function<void (const Ice::Context&)> response, function<void (exception_ptr)>, const Ice::Current&) diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h index b21e0ead930..69f674c6be7 100644 --- a/cpp/test/Ice/proxy/TestAMDI.h +++ b/cpp/test/Ice/proxy/TestAMDI.h @@ -24,18 +24,18 @@ public: MyDerivedClassI(); #ifdef ICE_CPP11_MAPPING - virtual void echo_async( + virtual void echoAsync( std::shared_ptr<Ice::ObjectPrx>, ::std::function<void (const ::std::shared_ptr<Ice::ObjectPrx>&)>, ::std::function<void (::std::exception_ptr)>, const Ice::Current&); - virtual void shutdown_async( + virtual void shutdownAsync( ::std::function<void ()>, ::std::function<void (::std::exception_ptr)>, const Ice::Current&); - virtual void getContext_async( + virtual void getContextAsync( ::std::function<void (const Ice::Context&)>, ::std::function<void (::std::exception_ptr)>, const Ice::Current&); diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp index 8b748d9a9bb..bf2469e3be9 100644 --- a/cpp/test/Ice/retry/AllTests.cpp +++ b/cpp/test/Ice/retry/AllTests.cpp @@ -151,7 +151,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cout << "calling regular AMI operation with first proxy... " << flush; #ifdef ICE_CPP11_MAPPING - retry1->op_async(false, + retry1->opAsync(false, [cb1]() { cb1->response(); @@ -178,7 +178,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cout << "calling AMI operation to kill connection with second proxy... " << flush; #ifdef ICE_CPP11_MAPPING - retry2->op_async(true, + retry2->opAsync(true, [cb2]() { cb2->response(); @@ -205,7 +205,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c cout << "calling regular AMI operation with first proxy again... " << flush; #ifdef ICE_CPP11_MAPPING - retry1->op_async(false, + retry1->opAsync(false, [cb1]() { cb1->response(); @@ -229,14 +229,14 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c testFailureCount(0); testRetryCount(0); cout << "ok" << endl; - + cout << "testing idempotent operation... " << flush; test(retry1->opIdempotent(4) == 4); testInvocationCount(1); testFailureCount(0); testRetryCount(4); #ifdef ICE_CPP11_MAPPING - test(retry1->opIdempotent_async(4).get() == 4); + test(retry1->opIdempotentAsync(4).get() == 4); #else test(retry1->end_opIdempotent(retry1->begin_opIdempotent(4)) == 4); #endif @@ -260,7 +260,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c try { #ifdef ICE_CPP11_MAPPING - retry1->opNotIdempotent_async().get(); + retry1->opNotIdempotentAsync().get(); #else retry1->end_opNotIdempotent(retry1->begin_opNotIdempotent()); #endif @@ -292,7 +292,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c try { #ifdef ICE_CPP11_MAPPING - retry1->opSystemException_async().get(); + retry1->opSystemExceptionAsync().get(); #else retry1->end_opSystemException(retry1->begin_opSystemException()); #endif @@ -325,7 +325,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c // No more than 2 retries before timeout kicks-in RetryPrxPtr prx = retry2->ice_invocationTimeout(500); #ifdef ICE_CPP11_MAPPING - prx->opIdempotent_async(4).get(); + prx->opIdempotentAsync(4).get(); #else prx->end_opIdempotent(prx->begin_opIdempotent(4)); #endif diff --git a/cpp/test/Ice/servantLocator/TestAMDI.cpp b/cpp/test/Ice/servantLocator/TestAMDI.cpp index 97dbce25a0b..5b674278c11 100644 --- a/cpp/test/Ice/servantLocator/TestAMDI.cpp +++ b/cpp/test/Ice/servantLocator/TestAMDI.cpp @@ -16,57 +16,57 @@ using namespace Ice; #ifdef ICE_CPP11_MAPPING void -TestAMDI::requestFailedException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::requestFailedExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::unknownUserException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::unknownUserExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::unknownLocalException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::unknownLocalExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::unknownException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::unknownExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::userException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::userExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::localException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::localExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::stdException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::stdExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::cppException_async(function<void ()> response, function<void (exception_ptr)>, const Current&) +TestAMDI::cppExceptionAsync(function<void ()> response, function<void (exception_ptr)>, const Current&) { response(); } void -TestAMDI::unknownExceptionWithServantException_async(function<void ()>, - function<void (exception_ptr)> error, - const Current&) +TestAMDI::unknownExceptionWithServantExceptionAsync(function<void ()>, + function<void (exception_ptr)> error, + const Current&) { try { @@ -79,10 +79,10 @@ TestAMDI::unknownExceptionWithServantException_async(function<void ()>, } void -TestAMDI::impossibleException_async(bool _cpp_throw, - function<void (const string&)> response, - function<void (exception_ptr)> error, - const Current&) +TestAMDI::impossibleExceptionAsync(bool _cpp_throw, + function<void (const string&)> response, + function<void (exception_ptr)> error, + const Current&) { if(_cpp_throw) { @@ -106,10 +106,10 @@ TestAMDI::impossibleException_async(bool _cpp_throw, } void -TestAMDI::intfUserException_async(bool _cpp_throw, - function<void (const string&)> response, - function<void (exception_ptr)> error, - const Current&) +TestAMDI::intfUserExceptionAsync(bool _cpp_throw, + function<void (const string&)> response, + function<void (exception_ptr)> error, + const Current&) { if(_cpp_throw) { @@ -133,18 +133,18 @@ TestAMDI::intfUserException_async(bool _cpp_throw, } void -TestAMDI::asyncResponse_async(function<void ()> response, - function<void (exception_ptr)>, - const Current&) +TestAMDI::asyncResponseAsync(function<void ()> response, + function<void (exception_ptr)>, + const Current&) { response(); throw Ice::ObjectNotExistException(__FILE__, __LINE__); } void -TestAMDI::asyncException_async(function<void ()> response, - function<void (exception_ptr)> error, - const Current&) +TestAMDI::asyncExceptionAsync(function<void ()> response, + function<void (exception_ptr)> error, + const Current&) { try { @@ -158,9 +158,9 @@ TestAMDI::asyncException_async(function<void ()> response, } void -TestAMDI::shutdown_async(function<void ()> response, - function<void (exception_ptr)> error, - const Current& current) +TestAMDI::shutdownAsync(function<void ()> response, + function<void (exception_ptr)> error, + const Current& current) { current.adapter->deactivate(); response(); diff --git a/cpp/test/Ice/servantLocator/TestAMDI.h b/cpp/test/Ice/servantLocator/TestAMDI.h index 353a9647482..da5784195d2 100644 --- a/cpp/test/Ice/servantLocator/TestAMDI.h +++ b/cpp/test/Ice/servantLocator/TestAMDI.h @@ -17,74 +17,74 @@ class TestAMDI : public Test::TestIntf public: #ifdef ICE_CPP11_MAPPING - virtual void requestFailedException_async( + virtual void requestFailedExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void unknownUserException_async( + virtual void unknownUserExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void unknownLocalException_async( + virtual void unknownLocalExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void unknownException_async( + virtual void unknownExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void userException_async( + virtual void userExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void localException_async( + virtual void localExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void stdException_async( + virtual void stdExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void cppException_async( + virtual void cppExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void unknownExceptionWithServantException_async( + virtual void unknownExceptionWithServantExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void impossibleException_async( + virtual void impossibleExceptionAsync( bool, std::function<void (const std::string&)>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void intfUserException_async( + virtual void intfUserExceptionAsync( bool, std::function<void (const std::string&)>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void asyncResponse_async( + virtual void asyncResponseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void asyncException_async( + virtual void asyncExceptionAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); - virtual void shutdown_async( + virtual void shutdownAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const Ice::Current&); diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp index 37e49781bd3..28e11dae7b4 100644 --- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp +++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp @@ -396,7 +396,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->baseAsBase_async(); + auto result = test->baseAsBaseAsync(); try { result.get(); @@ -443,7 +443,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "slicing of unknown derived (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->unknownDerivedAsBase_async(); + auto result = test->unknownDerivedAsBaseAsync(); try { result.get(); @@ -491,7 +491,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "non-slicing of known derived as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->knownDerivedAsBase_async(); + auto result = test->knownDerivedAsBaseAsync(); try { result.get(); @@ -539,7 +539,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "non-slicing of known derived as derived (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->knownDerivedAsKnownDerived_async(); + auto result = test->knownDerivedAsKnownDerivedAsync(); try { result.get(); @@ -586,7 +586,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "slicing of unknown intermediate as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->unknownIntermediateAsBase_async(); + auto result = test->unknownIntermediateAsBaseAsync(); try { result.get(); @@ -634,7 +634,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "slicing of known intermediate as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->knownIntermediateAsBase_async(); + auto result = test->knownIntermediateAsBaseAsync(); try { result.get(); @@ -684,7 +684,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "slicing of known most derived as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->knownMostDerivedAsBase_async(); + auto result = test->knownMostDerivedAsBaseAsync(); try { result.get(); @@ -734,7 +734,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "non-slicing of known intermediate as intermediate (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->knownIntermediateAsKnownIntermediate_async(); + auto result = test->knownIntermediateAsKnownIntermediateAsync(); try { result.get(); @@ -784,7 +784,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "non-slicing of known most derived as intermediate (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->knownMostDerivedAsKnownIntermediate_async(); + auto result = test->knownMostDerivedAsKnownIntermediateAsync(); try { result.get(); @@ -835,7 +835,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "non-slicing of known most derived as most derived (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->knownMostDerivedAsKnownMostDerived_async(); + auto result = test->knownMostDerivedAsKnownMostDerivedAsync(); try { result.get(); @@ -885,7 +885,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "slicing of unknown most derived, known intermediate as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->unknownMostDerived1AsBase_async(); + auto result = test->unknownMostDerived1AsBaseAsync(); try { result.get(); @@ -934,7 +934,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "slicing of unknown most derived, known intermediate as intermediate (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->unknownMostDerived1AsKnownIntermediate_async(); + auto result = test->unknownMostDerived1AsKnownIntermediateAsync(); try { result.get(); @@ -982,7 +982,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "slicing of unknown most derived, unknown intermediate as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto result = test->unknownMostDerived2AsBase_async(); + auto result = test->unknownMostDerived2AsBaseAsync(); try { result.get(); diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp index f68d00b791a..4c88d61ecb8 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp @@ -20,7 +20,7 @@ TestI::TestI() #ifdef ICE_CPP11_MAPPING void -TestI::baseAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::baseAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -35,7 +35,7 @@ TestI::baseAsBase_async(function<void ()>, function<void (exception_ptr)> error, } void -TestI::unknownDerivedAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::unknownDerivedAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -51,7 +51,7 @@ TestI::unknownDerivedAsBase_async(function<void ()>, function<void (exception_pt } void -TestI::knownDerivedAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::knownDerivedAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -67,7 +67,7 @@ TestI::knownDerivedAsBase_async(function<void ()>, function<void (exception_ptr) } void -TestI::knownDerivedAsKnownDerived_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::knownDerivedAsKnownDerivedAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -83,7 +83,7 @@ TestI::knownDerivedAsKnownDerived_async(function<void ()>, function<void (except } void -TestI::unknownIntermediateAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::unknownIntermediateAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -99,7 +99,7 @@ TestI::unknownIntermediateAsBase_async(function<void ()>, function<void (excepti } void -TestI::knownIntermediateAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::knownIntermediateAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -115,7 +115,7 @@ TestI::knownIntermediateAsBase_async(function<void ()>, function<void (exception } void -TestI::knownMostDerivedAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::knownMostDerivedAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -132,8 +132,8 @@ TestI::knownMostDerivedAsBase_async(function<void ()>, function<void (exception_ } void -TestI::knownIntermediateAsKnownIntermediate_async(function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::knownIntermediateAsKnownIntermediateAsync(function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -149,8 +149,8 @@ TestI::knownIntermediateAsKnownIntermediate_async(function<void ()>, function<vo } void -TestI::knownMostDerivedAsKnownIntermediate_async(function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::knownMostDerivedAsKnownIntermediateAsync(function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -168,8 +168,8 @@ TestI::knownMostDerivedAsKnownIntermediate_async(function<void ()>, function<voi void TestI:: -knownMostDerivedAsKnownMostDerived_async(function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +knownMostDerivedAsKnownMostDerivedAsync(function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -186,7 +186,7 @@ knownMostDerivedAsKnownMostDerived_async(function<void ()>, function<void (excep } void -TestI::unknownMostDerived1AsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::unknownMostDerived1AsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -203,8 +203,8 @@ TestI::unknownMostDerived1AsBase_async(function<void ()>, function<void (excepti } void -TestI::unknownMostDerived1AsKnownIntermediate_async(function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::unknownMostDerived1AsKnownIntermediateAsync(function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -221,7 +221,7 @@ TestI::unknownMostDerived1AsKnownIntermediate_async(function<void ()>, function< } void -TestI::unknownMostDerived2AsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::unknownMostDerived2AsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -238,8 +238,8 @@ TestI::unknownMostDerived2AsBase_async(function<void ()>, function<void (excepti } void -TestI::unknownMostDerived2AsBaseCompact_async(function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::unknownMostDerived2AsBaseCompactAsync(function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -256,7 +256,7 @@ TestI::unknownMostDerived2AsBaseCompact_async(function<void ()>, function<void ( } void -TestI::knownPreservedAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::knownPreservedAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -273,8 +273,8 @@ TestI::knownPreservedAsBase_async(function<void ()>, function<void (exception_pt } void -TestI::knownPreservedAsKnownPreserved_async(function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::knownPreservedAsKnownPreservedAsync(function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -290,9 +290,9 @@ TestI::knownPreservedAsKnownPreserved_async(function<void ()>, function<void (ex } void -TestI::relayKnownPreservedAsBase_async(shared_ptr<RelayPrx> r, - function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::relayKnownPreservedAsBaseAsync(shared_ptr<RelayPrx> r, + function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -306,9 +306,9 @@ TestI::relayKnownPreservedAsBase_async(shared_ptr<RelayPrx> r, } void -TestI::relayKnownPreservedAsKnownPreserved_async(shared_ptr<RelayPrx> r, - function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::relayKnownPreservedAsKnownPreservedAsync(shared_ptr<RelayPrx> r, + function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -322,7 +322,7 @@ TestI::relayKnownPreservedAsKnownPreserved_async(shared_ptr<RelayPrx> r, } void -TestI::unknownPreservedAsBase_async(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) +TestI::unknownPreservedAsBaseAsync(function<void ()>, function<void (exception_ptr)> error, const ::Ice::Current&) { try { @@ -341,8 +341,8 @@ TestI::unknownPreservedAsBase_async(function<void ()>, function<void (exception_ } void -TestI::unknownPreservedAsKnownPreserved_async(function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::unknownPreservedAsKnownPreservedAsync(function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -361,9 +361,9 @@ TestI::unknownPreservedAsKnownPreserved_async(function<void ()>, function<void ( } void -TestI::relayUnknownPreservedAsBase_async(shared_ptr<RelayPrx> r, - function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::relayUnknownPreservedAsBaseAsync(shared_ptr<RelayPrx> r, + function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -377,9 +377,9 @@ TestI::relayUnknownPreservedAsBase_async(shared_ptr<RelayPrx> r, } void -TestI::relayUnknownPreservedAsKnownPreserved_async(shared_ptr<RelayPrx> r, - function<void ()>, function<void (exception_ptr)> error, - const ::Ice::Current&) +TestI::relayUnknownPreservedAsKnownPreservedAsync(shared_ptr<RelayPrx> r, + function<void ()>, function<void (exception_ptr)> error, + const ::Ice::Current&) { try { @@ -393,7 +393,7 @@ TestI::relayUnknownPreservedAsKnownPreserved_async(shared_ptr<RelayPrx> r, } void -TestI::shutdown_async(function<void ()> response, function<void (exception_ptr)>, const ::Ice::Current& current) +TestI::shutdownAsync(function<void ()> response, function<void (exception_ptr)>, const ::Ice::Current& current) { current.adapter->getCommunicator()->shutdown(); response(); diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.h b/cpp/test/Ice/slicing/exceptions/TestAMDI.h index aa8a5f6d7af..b721e08aef3 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h @@ -18,121 +18,121 @@ public: TestI(); #ifdef ICE_CPP11_MAPPING - virtual void baseAsBase_async( + virtual void baseAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownDerivedAsBase_async( + virtual void unknownDerivedAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownDerivedAsBase_async( + virtual void knownDerivedAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownDerivedAsKnownDerived_async( + virtual void knownDerivedAsKnownDerivedAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownIntermediateAsBase_async( + virtual void unknownIntermediateAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownIntermediateAsBase_async( + virtual void knownIntermediateAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownMostDerivedAsBase_async( + virtual void knownMostDerivedAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownIntermediateAsKnownIntermediate_async( + virtual void knownIntermediateAsKnownIntermediateAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownMostDerivedAsKnownIntermediate_async( + virtual void knownMostDerivedAsKnownIntermediateAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownMostDerivedAsKnownMostDerived_async( + virtual void knownMostDerivedAsKnownMostDerivedAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownMostDerived1AsBase_async( + virtual void unknownMostDerived1AsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownMostDerived1AsKnownIntermediate_async( + virtual void unknownMostDerived1AsKnownIntermediateAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownMostDerived2AsBase_async( + virtual void unknownMostDerived2AsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownMostDerived2AsBaseCompact_async( + virtual void unknownMostDerived2AsBaseCompactAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownPreservedAsBase_async( + virtual void knownPreservedAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void knownPreservedAsKnownPreserved_async( + virtual void knownPreservedAsKnownPreservedAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void relayKnownPreservedAsBase_async( + virtual void relayKnownPreservedAsBaseAsync( std::shared_ptr<::Test::RelayPrx>, std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void relayKnownPreservedAsKnownPreserved_async( + virtual void relayKnownPreservedAsKnownPreservedAsync( std::shared_ptr<::Test::RelayPrx>, std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownPreservedAsBase_async( + virtual void unknownPreservedAsBaseAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void unknownPreservedAsKnownPreserved_async( + virtual void unknownPreservedAsKnownPreservedAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void relayUnknownPreservedAsBase_async( + virtual void relayUnknownPreservedAsBaseAsync( std::shared_ptr<::Test::RelayPrx>, std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void relayUnknownPreservedAsKnownPreserved_async( + virtual void relayUnknownPreservedAsKnownPreservedAsync( std::shared_ptr<::Test::RelayPrx>, std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void shutdown_async( + virtual void shutdownAsync( std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index b01eb592df2..cf6f1d45d9e 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -627,7 +627,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "base as Object (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->SBaseAsObject_async(); + auto f = test->SBaseAsObjectAsync(); try { auto o = f.get(); @@ -670,7 +670,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING try { - auto sb = test->SBaseAsSBase_async().get(); + auto sb = test->SBaseAsSBaseAsync().get(); test(sb->sb == "SBase.sb"); } catch(...) @@ -707,7 +707,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "base with known derived as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->SBSKnownDerivedAsSBase_async(); + auto f = test->SBSKnownDerivedAsSBaseAsync(); try { shared_ptr<SBase> sb = f.get(); @@ -749,7 +749,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "base with known derived as known derived (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->SBSKnownDerivedAsSBSKnownDerived_async(); + auto f = test->SBSKnownDerivedAsSBSKnownDerivedAsync(); try { SBSKnownDerivedPtr sbskd = test->SBSKnownDerivedAsSBSKnownDerived(); @@ -828,7 +828,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "base with unknown derived as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->SBSUnknownDerivedAsSBase_async(); + auto f = test->SBSUnknownDerivedAsSBaseAsync(); try { SBasePtr sb = f.get(); @@ -852,7 +852,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // This test succeeds for the 1.0 encoding. // #ifdef ICE_CPP11_MAPPING - auto f = test->SBSUnknownDerivedAsSBaseCompact_async(); + auto f = test->SBSUnknownDerivedAsSBaseCompactAsync(); try { SBasePtr sb = f.get(); @@ -877,7 +877,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // be sliced to a known type. // #ifdef ICE_CPP11_MAPPING - auto f = test->SBSUnknownDerivedAsSBaseCompact_async(); + auto f = test->SBSUnknownDerivedAsSBaseCompactAsync(); try { f.get(); @@ -914,7 +914,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { - auto f = test->SUnknownAsObject_async(); + auto f = test->SUnknownAsObjectAsync(); try { f.get(); @@ -930,7 +930,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } else { - auto f = test->SUnknownAsObject_async(); + auto f = test->SUnknownAsObjectAsync(); try { shared_ptr<Ice::Value> v = f.get(); @@ -987,7 +987,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "one-element cycle (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->oneElementCycle_async(); + auto f = test->oneElementCycleAsync(); try { auto b = f.get(); @@ -1035,7 +1035,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "two-element cycle (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->twoElementCycle_async(); + auto f = test->twoElementCycleAsync(); try { auto b1 = f.get(); @@ -1097,7 +1097,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "known derived pointer slicing as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->D1AsB_async(); + auto f = test->D1AsBAsync(); try { auto b1 = f.get(); @@ -1159,7 +1159,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "known derived pointer slicing as derived (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->D1AsD1_async(); + auto f = test->D1AsD1Async(); try { auto d1 = f.get(); @@ -1219,7 +1219,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "unknown derived pointer slicing as base (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->D2AsB_async(); + auto f = test->D2AsBAsync(); try { auto b2 = test->D2AsB(); @@ -1283,7 +1283,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "param ptr slicing with known first (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->paramTest1_async(); + auto f = test->paramTest1Async(); try { auto result = f.get(); @@ -1365,7 +1365,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "return value identity with known first (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->returnTest1_async(); + auto f = test->returnTest1Async(); try { auto result = f.get(); @@ -1403,7 +1403,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "return value identity with unknown first (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->returnTest2_async(); + auto f = test->returnTest2Async(); try { auto result = f.get(); @@ -1489,7 +1489,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif #ifdef ICE_CPP11_MAPPING - auto f = test->returnTest3_async(d1, d3); + auto f = test->returnTest3Async(d1, d3); auto b1 = f.get(); #else CallbackPtr cb = new Callback; @@ -1595,7 +1595,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif #ifdef ICE_CPP11_MAPPING - auto f = test->returnTest3_async(d3, d1); + auto f = test->returnTest3Async(d3, d1); auto b1 = f.get(); #else CallbackPtr cb = new Callback; @@ -1666,7 +1666,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "remainder unmarshaling (3 instances) (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->paramTest3_async(); + auto f = test->paramTest3Async(); try { auto result = f.get(); @@ -1729,7 +1729,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "remainder unmarshaling (4 instances) (AMI)... " << flush; { #ifdef ICE_CPP11_MAPPING - auto f = test->paramTest4_async(); + auto f = test->paramTest4Async(); try { auto result = f.get(); @@ -1816,7 +1816,7 @@ allTests(const Ice::CommunicatorPtr& communicator) b2->pb = b1; #ifdef ICE_CPP11_MAPPING - auto r = test->returnTest3_async(d3, b2).get(); + auto r = test->returnTest3Async(d3, b2).get(); #else CallbackPtr cb = new Callback; test->begin_returnTest3(d3, b2, @@ -1903,7 +1903,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif #ifdef ICE_CPP11_MAPPING - auto r = test->returnTest3_async(d3, d12).get(); + auto r = test->returnTest3Async(d3, d12).get(); #else CallbackPtr cb = new Callback; test->begin_returnTest3(d3, d12, @@ -2074,7 +2074,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #endif #ifdef ICE_CPP11_MAPPING - ss = test->sequenceTest_async(ss1, ss2).get(); + ss = test->sequenceTestAsync(ss1, ss2).get(); #else CallbackPtr cb = new Callback; test->begin_sequenceTest(ss1, ss2, @@ -2201,7 +2201,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } #ifdef ICE_CPP11_MAPPING - auto result = test->dictionaryTest_async(bin).get(); + auto result = test->dictionaryTestAsync(bin).get(); r = result.returnValue; bout = result.bout; #else @@ -2276,7 +2276,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING try { - test->throwBaseAsBase_async().get(); + test->throwBaseAsBaseAsync().get(); test(false); } catch(const BaseException& ex) @@ -2333,7 +2333,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING try { - test->throwDerivedAsBase_async().get(); + test->throwDerivedAsBaseAsync().get(); test(false); } catch(const DerivedException& ex) @@ -2396,7 +2396,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING try { - test->throwDerivedAsDerived_async().get(); + test->throwDerivedAsDerivedAsync().get(); test(false); } catch(const DerivedException& e) @@ -2454,7 +2454,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING try { - test->throwUnknownDerivedAsBase_async().get(); + test->throwUnknownDerivedAsBaseAsync().get(); test(false); } catch(const BaseException& e) @@ -2671,7 +2671,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING try { - pd = dynamic_pointer_cast<PDerived>(test->exchangePBase_async(pd).get()); + pd = dynamic_pointer_cast<PDerived>(test->exchangePBaseAsync(pd).get()); test(pd); test(pd->pi == 3); test(pd->ps == "preserved"); @@ -2699,7 +2699,7 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING try { - auto r = test->exchangePBase_async(pu).get(); + auto r = test->exchangePBaseAsync(pu).get(); auto p2 = dynamic_pointer_cast<PCUnknown>(r); test(!p2); test(r->pi == 3); @@ -2727,14 +2727,14 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { - auto r = test->exchangePBase_async(pcd).get(); + auto r = test->exchangePBaseAsync(pcd).get(); auto p2 = dynamic_pointer_cast<PCDerived>(r); test(!p2); test(r->pi == 3); } else { - auto r = test->exchangePBase_async(pcd).get(); + auto r = test->exchangePBaseAsync(pcd).get(); auto p2 = dynamic_pointer_cast<PCDerived>(r); test(p2); test(p2->pi == 3); @@ -2770,14 +2770,14 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { - auto r = test->exchangePBase_async(pcd).get(); + auto r = test->exchangePBaseAsync(pcd).get(); auto p2 = dynamic_pointer_cast<CompactPCDerived>(r); test(!p2); test(r->pi == 3); } else { - auto r = test->exchangePBase_async(pcd).get(); + auto r = test->exchangePBaseAsync(pcd).get(); auto p2 = dynamic_pointer_cast<CompactPCDerived>(r); test(p2); test(p2->pi == 3); @@ -2828,14 +2828,14 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifdef ICE_CPP11_MAPPING if(test->ice_getEncodingVersion() == Ice::Encoding_1_0) { - auto r = test->exchangePBase_async(pcd).get(); + auto r = test->exchangePBaseAsync(pcd).get(); auto p2 = dynamic_pointer_cast<PCDerived>(r); test(!p2); test(r->pi == 3); } else { - auto r = test->exchangePBase_async(pcd).get(); + auto r = test->exchangePBaseAsync(pcd).get(); auto p3 = dynamic_pointer_cast<PCDerived3>(r); test(p3); test(p3->pi == 3); diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp index ede464338e6..d72d2121eda 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp @@ -21,7 +21,7 @@ TestI::TestI() #ifdef ICE_CPP11_MAPPING void -TestI::SBaseAsObject_async(function<void (const shared_ptr<Ice::Value>&)> response, +TestI::SBaseAsObjectAsync(function<void (const shared_ptr<Ice::Value>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -31,7 +31,7 @@ TestI::SBaseAsObject_async(function<void (const shared_ptr<Ice::Value>&)> respon } void -TestI::SBaseAsSBase_async(function<void (const shared_ptr<Test::SBase>&)> response, +TestI::SBaseAsSBaseAsync(function<void (const shared_ptr<Test::SBase>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -41,7 +41,7 @@ TestI::SBaseAsSBase_async(function<void (const shared_ptr<Test::SBase>&)> respon } void -TestI::SBSKnownDerivedAsSBase_async(function<void (const shared_ptr<Test::SBase>&)> response, +TestI::SBSKnownDerivedAsSBaseAsync(function<void (const shared_ptr<Test::SBase>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -52,7 +52,7 @@ TestI::SBSKnownDerivedAsSBase_async(function<void (const shared_ptr<Test::SBase> } void -TestI::SBSKnownDerivedAsSBSKnownDerived_async(function<void (const shared_ptr<Test::SBSKnownDerived>&)> response, +TestI::SBSKnownDerivedAsSBSKnownDerivedAsync(function<void (const shared_ptr<Test::SBSKnownDerived>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -64,7 +64,7 @@ TestI::SBSKnownDerivedAsSBSKnownDerived_async(function<void (const shared_ptr<Te void -TestI::SBSUnknownDerivedAsSBase_async(function<void (const shared_ptr<Test::SBase>&)> response, +TestI::SBSUnknownDerivedAsSBaseAsync(function<void (const shared_ptr<Test::SBase>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -75,7 +75,7 @@ TestI::SBSUnknownDerivedAsSBase_async(function<void (const shared_ptr<Test::SBas } void -TestI::SBSUnknownDerivedAsSBaseCompact_async(function<void (const shared_ptr<Test::SBase>&)> response, +TestI::SBSUnknownDerivedAsSBaseCompactAsync(function<void (const shared_ptr<Test::SBase>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -87,7 +87,7 @@ TestI::SBSUnknownDerivedAsSBaseCompact_async(function<void (const shared_ptr<Tes void -TestI::SUnknownAsObject_async(function<void (const shared_ptr<Ice::Value>&)> response, +TestI::SUnknownAsObjectAsync(function<void (const shared_ptr<Ice::Value>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -97,7 +97,7 @@ TestI::SUnknownAsObject_async(function<void (const shared_ptr<Ice::Value>&)> res } void -TestI::checkSUnknown_async(Ice::ValuePtr obj, +TestI::checkSUnknownAsync(Ice::ValuePtr obj, function<void ()> response, function<void (exception_ptr)>, const ::Ice::Current& current) @@ -117,7 +117,7 @@ TestI::checkSUnknown_async(Ice::ValuePtr obj, void -TestI::oneElementCycle_async(function<void (const shared_ptr<Test::B>&)> response, +TestI::oneElementCycleAsync(function<void (const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -128,7 +128,7 @@ TestI::oneElementCycle_async(function<void (const shared_ptr<Test::B>&)> respons } void -TestI::twoElementCycle_async(function<void (const shared_ptr<Test::B>&)> response, +TestI::twoElementCycleAsync(function<void (const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -142,7 +142,7 @@ TestI::twoElementCycle_async(function<void (const shared_ptr<Test::B>&)> respons } void -TestI::D1AsB_async(function<void (const shared_ptr<Test::B>&)> response, +TestI::D1AsBAsync(function<void (const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -161,7 +161,7 @@ TestI::D1AsB_async(function<void (const shared_ptr<Test::B>&)> response, void -TestI::D1AsD1_async(function<void (const shared_ptr<Test::D1>&)> response, +TestI::D1AsD1Async(function<void (const shared_ptr<Test::D1>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -179,7 +179,7 @@ TestI::D1AsD1_async(function<void (const shared_ptr<Test::D1>&)> response, } void -TestI::D2AsB_async(function<void (const shared_ptr<Test::B>&)> response, +TestI::D2AsBAsync(function<void (const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -197,7 +197,7 @@ TestI::D2AsB_async(function<void (const shared_ptr<Test::B>&)> response, } void -TestI::paramTest1_async(function<void (const shared_ptr<Test::B>&, +TestI::paramTest1Async(function<void (const shared_ptr<Test::B>&, const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) @@ -216,7 +216,7 @@ TestI::paramTest1_async(function<void (const shared_ptr<Test::B>&, } void -TestI::paramTest2_async(function<void (const shared_ptr<Test::B>&, const shared_ptr<Test::B>&)> response, +TestI::paramTest2Async(function<void (const shared_ptr<Test::B>&, const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -234,7 +234,7 @@ TestI::paramTest2_async(function<void (const shared_ptr<Test::B>&, const shared_ } void -TestI::paramTest3_async(function<void (const shared_ptr<Test::B>&, +TestI::paramTest3Async(function<void (const shared_ptr<Test::B>&, const shared_ptr<Test::B>&, const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, @@ -268,7 +268,7 @@ TestI::paramTest3_async(function<void (const shared_ptr<Test::B>&, } void -TestI::paramTest4_async(function<void (const shared_ptr<Test::B>&, +TestI::paramTest4Async(function<void (const shared_ptr<Test::B>&, const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) @@ -284,7 +284,7 @@ TestI::paramTest4_async(function<void (const shared_ptr<Test::B>&, } void -TestI::returnTest1_async(function<void (const shared_ptr<Test::B>&, +TestI::returnTest1Async(function<void (const shared_ptr<Test::B>&, const shared_ptr<Test::B>&, const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, @@ -305,7 +305,7 @@ TestI::returnTest1_async(function<void (const shared_ptr<Test::B>&, void -TestI::returnTest2_async(function<void (const shared_ptr<Test::B>&, +TestI::returnTest2Async(function<void (const shared_ptr<Test::B>&, const shared_ptr<Test::B>&, const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, @@ -325,7 +325,7 @@ TestI::returnTest2_async(function<void (const shared_ptr<Test::B>&, } void -TestI::returnTest3_async(shared_ptr<::Test::B> p1, +TestI::returnTest3Async(shared_ptr<::Test::B> p1, shared_ptr<::Test::B>, function<void (const shared_ptr<Test::B>&)> response, function<void (exception_ptr)>, @@ -336,7 +336,7 @@ TestI::returnTest3_async(shared_ptr<::Test::B> p1, void -TestI::sequenceTest_async(shared_ptr<::Test::SS1> p1, +TestI::sequenceTestAsync(shared_ptr<::Test::SS1> p1, shared_ptr<::Test::SS2> p2, function<void (const ::Test::SS3&)> response, function<void (exception_ptr)>, @@ -350,7 +350,7 @@ TestI::sequenceTest_async(shared_ptr<::Test::SS1> p1, void -TestI::dictionaryTest_async(Test::BDict bin, +TestI::dictionaryTestAsync(Test::BDict bin, function<void (const ::Test::BDict&, const ::Test::BDict&)> response, function<void (exception_ptr)>, const ::Ice::Current&) @@ -383,7 +383,7 @@ TestI::dictionaryTest_async(Test::BDict bin, } void -TestI::exchangePBase_async(shared_ptr<::Test::PBase> pb, +TestI::exchangePBaseAsync(shared_ptr<::Test::PBase> pb, function<void (const shared_ptr<::Test::PBase>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) @@ -393,7 +393,7 @@ TestI::exchangePBase_async(shared_ptr<::Test::PBase> pb, void -TestI::PBSUnknownAsPreserved_async(function<void (const shared_ptr<::Test::Preserved>&)> response, +TestI::PBSUnknownAsPreservedAsync(function<void (const shared_ptr<::Test::Preserved>&)> response, function<void (exception_ptr)>, const ::Ice::Current& current) { @@ -414,7 +414,7 @@ TestI::PBSUnknownAsPreserved_async(function<void (const shared_ptr<::Test::Prese } void -TestI::checkPBSUnknown_async(shared_ptr<::Test::Preserved> p, +TestI::checkPBSUnknownAsync(shared_ptr<::Test::Preserved> p, function<void ()> response, function<void (exception_ptr)>, const ::Ice::Current& current) @@ -439,7 +439,7 @@ TestI::checkPBSUnknown_async(shared_ptr<::Test::Preserved> p, } void -TestI::PBSUnknownAsPreservedWithGraph_async(function<void (const shared_ptr<::Test::Preserved>&)> response, +TestI::PBSUnknownAsPreservedWithGraphAsync(function<void (const shared_ptr<::Test::Preserved>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -457,7 +457,7 @@ TestI::PBSUnknownAsPreservedWithGraph_async(function<void (const shared_ptr<::Te void -TestI::checkPBSUnknownWithGraph_async(shared_ptr<::Test::Preserved> p, +TestI::checkPBSUnknownWithGraphAsync(shared_ptr<::Test::Preserved> p, function<void ()> response, function<void (exception_ptr)>, const ::Ice::Current& current) @@ -484,7 +484,7 @@ TestI::checkPBSUnknownWithGraph_async(shared_ptr<::Test::Preserved> p, } void -TestI::PBSUnknown2AsPreservedWithGraph_async(function<void (const shared_ptr<::Test::Preserved>&)> response, +TestI::PBSUnknown2AsPreservedWithGraphAsync(function<void (const shared_ptr<::Test::Preserved>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -497,7 +497,7 @@ TestI::PBSUnknown2AsPreservedWithGraph_async(function<void (const shared_ptr<::T } void -TestI::checkPBSUnknown2WithGraph_async(shared_ptr<::Test::Preserved> p, +TestI::checkPBSUnknown2WithGraphAsync(shared_ptr<::Test::Preserved> p, function<void ()> response, function<void (exception_ptr)>, const ::Ice::Current& current) @@ -521,7 +521,7 @@ TestI::checkPBSUnknown2WithGraph_async(shared_ptr<::Test::Preserved> p, } void -TestI::exchangePNode_async(shared_ptr<::Test::PNode> pn, +TestI::exchangePNodeAsync(shared_ptr<::Test::PNode> pn, function<void (const shared_ptr<::Test::PNode>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) @@ -530,7 +530,7 @@ TestI::exchangePNode_async(shared_ptr<::Test::PNode> pn, } void -TestI::throwBaseAsBase_async(function<void ()>, +TestI::throwBaseAsBaseAsync(function<void ()>, function<void (exception_ptr)> exception, const ::Ice::Current&) { @@ -550,7 +550,7 @@ TestI::throwBaseAsBase_async(function<void ()>, } void -TestI::throwDerivedAsBase_async(function<void ()>, +TestI::throwDerivedAsBaseAsync(function<void ()>, function<void (exception_ptr)> exception, const ::Ice::Current&) { @@ -576,7 +576,7 @@ TestI::throwDerivedAsBase_async(function<void ()>, } void -TestI::throwDerivedAsDerived_async(function<void ()>, +TestI::throwDerivedAsDerivedAsync(function<void ()>, function<void (exception_ptr)> exception, const ::Ice::Current&) { @@ -602,7 +602,7 @@ TestI::throwDerivedAsDerived_async(function<void ()>, } void -TestI::throwUnknownDerivedAsBase_async(function<void ()>, +TestI::throwUnknownDerivedAsBaseAsync(function<void ()>, function<void (exception_ptr)> exception, const ::Ice::Current&) { @@ -628,7 +628,7 @@ TestI::throwUnknownDerivedAsBase_async(function<void ()>, } void -TestI::throwPreservedException_async(function<void ()>, +TestI::throwPreservedExceptionAsync(function<void ()>, function<void (exception_ptr)> exception, const ::Ice::Current&) { @@ -649,7 +649,7 @@ TestI::throwPreservedException_async(function<void ()>, } void -TestI::useForward_async(function<void (const shared_ptr<::Test::Forward>&)> response, +TestI::useForwardAsync(function<void (const shared_ptr<::Test::Forward>&)> response, function<void (exception_ptr)>, const ::Ice::Current&) { @@ -660,7 +660,7 @@ TestI::useForward_async(function<void (const shared_ptr<::Test::Forward>&)> resp } void -TestI::shutdown_async(function<void ()> response, +TestI::shutdownAsync(function<void ()> response, function<void (exception_ptr)>, const ::Ice::Current& current) { diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h index 1b7a89766c0..06ac8e8cf43 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.h +++ b/cpp/test/Ice/slicing/objects/TestAMDI.h @@ -18,174 +18,174 @@ public: TestI(); #ifdef ICE_CPP11_MAPPING - virtual void SBaseAsObject_async(std::function<void (const std::shared_ptr<Ice::Value>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void SBaseAsSBase_async(std::function<void (const std::shared_ptr<Test::SBase>&)>, + virtual void SBaseAsObjectAsync(std::function<void (const std::shared_ptr<Ice::Value>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void SBSKnownDerivedAsSBase_async(std::function<void (const std::shared_ptr<Test::SBase>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void SBSKnownDerivedAsSBSKnownDerived_async(std::function<void (const std::shared_ptr<Test::SBSKnownDerived>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void SBaseAsSBaseAsync(std::function<void (const std::shared_ptr<Test::SBase>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void SBSUnknownDerivedAsSBase_async(std::function<void (const std::shared_ptr<Test::SBase>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void SBSKnownDerivedAsSBaseAsync(std::function<void (const std::shared_ptr<Test::SBase>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void SBSUnknownDerivedAsSBaseCompact_async(std::function<void (const std::shared_ptr<Test::SBase>&)>, + virtual void SBSKnownDerivedAsSBSKnownDerivedAsync(std::function<void (const std::shared_ptr<Test::SBSKnownDerived>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void SUnknownAsObject_async(std::function<void (const std::shared_ptr<Ice::Value>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void SBSUnknownDerivedAsSBaseAsync(std::function<void (const std::shared_ptr<Test::SBase>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void checkSUnknown_async(std::shared_ptr<Ice::Value>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void SBSUnknownDerivedAsSBaseCompactAsync(std::function<void (const std::shared_ptr<Test::SBase>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void oneElementCycle_async(std::function<void (const std::shared_ptr<Test::B>&)>, + virtual void SUnknownAsObjectAsync(std::function<void (const std::shared_ptr<Ice::Value>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void twoElementCycle_async(std::function<void (const std::shared_ptr<Test::B>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void checkSUnknownAsync(std::shared_ptr<Ice::Value>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void D1AsB_async(std::function<void (const std::shared_ptr<Test::B>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void oneElementCycleAsync(std::function<void (const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void twoElementCycleAsync(std::function<void (const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void D1AsD1_async(std::function<void (const std::shared_ptr<Test::D1>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void D1AsBAsync(std::function<void (const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void D2AsB_async(std::function<void (const std::shared_ptr<Test::B>&)>, + virtual void D1AsD1Async(std::function<void (const std::shared_ptr<Test::D1>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void paramTest1_async(std::function<void (const std::shared_ptr<Test::B>&, - const std::shared_ptr<Test::B>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void D2AsBAsync(std::function<void (const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void paramTest1Async(std::function<void (const std::shared_ptr<Test::B>&, + const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void paramTest2Async(std::function<void (const std::shared_ptr<Test::B>&, + const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void paramTest2_async(std::function<void (const std::shared_ptr<Test::B>&, + virtual void paramTest3Async(std::function<void (const std::shared_ptr<Test::B>&, + const std::shared_ptr<Test::B>&, + const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void paramTest4Async(std::function<void (const std::shared_ptr<Test::B>&, + const std::shared_ptr<Test::B>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void returnTest1Async(std::function<void (const std::shared_ptr<Test::B>&, + const std::shared_ptr<Test::B>&, const std::shared_ptr<Test::B>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void paramTest3_async(std::function<void (const std::shared_ptr<Test::B>&, + virtual void returnTest2Async(std::function<void (const std::shared_ptr<Test::B>&, const std::shared_ptr<Test::B>&, const std::shared_ptr<Test::B>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void paramTest4_async(std::function<void (const std::shared_ptr<Test::B>&, - const std::shared_ptr<Test::B>&)>, + virtual void returnTest3Async(std::shared_ptr<::Test::B>, + std::shared_ptr<::Test::B>, + std::function<void (const std::shared_ptr<Test::B>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void returnTest1_async(std::function<void (const std::shared_ptr<Test::B>&, - const std::shared_ptr<Test::B>&, - const std::shared_ptr<Test::B>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void returnTest2_async(std::function<void (const std::shared_ptr<Test::B>&, - const std::shared_ptr<Test::B>&, - const std::shared_ptr<Test::B>&)>, + virtual void sequenceTestAsync(std::shared_ptr<::Test::SS1>, + std::shared_ptr<::Test::SS2>, + std::function<void (const ::Test::SS3&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void returnTest3_async(std::shared_ptr<::Test::B>, - std::shared_ptr<::Test::B>, - std::function<void (const std::shared_ptr<Test::B>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void dictionaryTestAsync(Test::BDict, + std::function<void (const ::Test::BDict&, const ::Test::BDict&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void sequenceTest_async(std::shared_ptr<::Test::SS1>, - std::shared_ptr<::Test::SS2>, - std::function<void (const ::Test::SS3&)>, + virtual void exchangePBaseAsync(std::shared_ptr<::Test::PBase>, + std::function<void (const std::shared_ptr<::Test::PBase>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void dictionaryTest_async(Test::BDict, - std::function<void (const ::Test::BDict&, const ::Test::BDict&)>, + virtual void PBSUnknownAsPreservedAsync(std::function<void (const std::shared_ptr<::Test::Preserved>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); + + virtual void checkPBSUnknownAsync(std::shared_ptr<::Test::Preserved>, + std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void exchangePBase_async(std::shared_ptr<::Test::PBase>, - std::function<void (const std::shared_ptr<::Test::PBase>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void PBSUnknownAsPreserved_async(std::function<void (const std::shared_ptr<::Test::Preserved>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void PBSUnknownAsPreservedWithGraphAsync(std::function<void (const std::shared_ptr<::Test::Preserved>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void checkPBSUnknown_async(std::shared_ptr<::Test::Preserved>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void checkPBSUnknownWithGraphAsync(std::shared_ptr<::Test::Preserved>, + std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void PBSUnknownAsPreservedWithGraph_async(std::function<void (const std::shared_ptr<::Test::Preserved>&)>, + virtual void PBSUnknown2AsPreservedWithGraphAsync(std::function<void (const std::shared_ptr<::Test::Preserved>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void checkPBSUnknownWithGraph_async(std::shared_ptr<::Test::Preserved>, + virtual void checkPBSUnknown2WithGraphAsync(std::shared_ptr<::Test::Preserved>, std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); - virtual void PBSUnknown2AsPreservedWithGraph_async(std::function<void (const std::shared_ptr<::Test::Preserved>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void checkPBSUnknown2WithGraph_async(std::shared_ptr<::Test::Preserved>, - std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); - - virtual void exchangePNode_async(std::shared_ptr<::Test::PNode>, - std::function<void (const std::shared_ptr<::Test::PNode>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void exchangePNodeAsync(std::shared_ptr<::Test::PNode>, + std::function<void (const std::shared_ptr<::Test::PNode>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void throwBaseAsBase_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void throwBaseAsBaseAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void throwDerivedAsBase_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void throwDerivedAsBaseAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void throwDerivedAsDerived_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void throwDerivedAsDerivedAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void throwUnknownDerivedAsBase_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void throwUnknownDerivedAsBaseAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void throwPreservedException_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void throwPreservedExceptionAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void useForward_async(std::function<void (const std::shared_ptr<::Test::Forward>&)>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); + virtual void useForwardAsync(std::function<void (const std::shared_ptr<::Test::Forward>&)>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); - virtual void shutdown_async(std::function<void ()>, - std::function<void (std::exception_ptr)>, - const ::Ice::Current&); -#else + virtual void shutdownAsync(std::function<void ()>, + std::function<void (std::exception_ptr)>, + const ::Ice::Current&); +#else virtual void SBaseAsObject_async(const ::Test::AMD_TestIntf_SBaseAsObjectPtr&, const ::Ice::Current&); virtual void SBaseAsSBase_async(const ::Test::AMD_TestIntf_SBaseAsSBasePtr&, const ::Ice::Current&); virtual void SBSKnownDerivedAsSBase_async(const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBasePtr&, diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp index e262395b30e..a68c64c764d 100644 --- a/cpp/test/Ice/slicing/objects/TestI.cpp +++ b/cpp/test/Ice/slicing/objects/TestI.cpp @@ -364,7 +364,7 @@ TestI::checkPBSUnknown(ICE_IN(Test::PreservedPtr) p, const Ice::Current& current #ifdef ICE_CPP11_MAPPING void -TestI::PBSUnknownAsPreservedWithGraph_async(function<void (const shared_ptr<Test::Preserved>&)> response, +TestI::PBSUnknownAsPreservedWithGraphAsync(function<void (const shared_ptr<Test::Preserved>&)> response, function<void (exception_ptr)>, const Ice::Current&) #else @@ -414,7 +414,7 @@ TestI::checkPBSUnknownWithGraph(ICE_IN(Test::PreservedPtr) p, const Ice::Current #ifdef ICE_CPP11_MAPPING void -TestI::PBSUnknown2AsPreservedWithGraph_async(function<void (const shared_ptr<Test::Preserved>&)> response, +TestI::PBSUnknown2AsPreservedWithGraphAsync(function<void (const shared_ptr<Test::Preserved>&)> response, function<void (exception_ptr)>, const Ice::Current&) #else @@ -538,7 +538,7 @@ TestI::throwUnknownDerivedAsBase(const ::Ice::Current&) #ifdef ICE_CPP11_MAPPING void -TestI::throwPreservedException_async(function<void ()>, +TestI::throwPreservedExceptionAsync(function<void ()>, function<void (exception_ptr)> exception, const ::Ice::Current&) #else diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h index 0e955af5838..827d8d628ca 100644 --- a/cpp/test/Ice/slicing/objects/TestI.h +++ b/cpp/test/Ice/slicing/objects/TestI.h @@ -57,7 +57,7 @@ public: virtual void checkPBSUnknown(ICE_IN(::Test::PreservedPtr), const ::Ice::Current&); #ifdef ICE_CPP11_MAPPING - virtual void PBSUnknownAsPreservedWithGraph_async(std::function<void (const std::shared_ptr<Test::Preserved>&)>, + virtual void PBSUnknownAsPreservedWithGraphAsync(std::function<void (const std::shared_ptr<Test::Preserved>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); #else @@ -67,7 +67,7 @@ public: virtual void checkPBSUnknownWithGraph(ICE_IN(::Test::PreservedPtr), const ::Ice::Current&); #ifdef ICE_CPP11_MAPPING - virtual void PBSUnknown2AsPreservedWithGraph_async(std::function<void (const std::shared_ptr<Test::Preserved>&)>, + virtual void PBSUnknown2AsPreservedWithGraphAsync(std::function<void (const std::shared_ptr<Test::Preserved>&)>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); #else @@ -83,7 +83,7 @@ public: virtual void throwDerivedAsDerived(const ::Ice::Current&); virtual void throwUnknownDerivedAsBase(const ::Ice::Current&); #ifdef ICE_CPP11_MAPPING - virtual void throwPreservedException_async(std::function<void ()>, + virtual void throwPreservedExceptionAsync(std::function<void ()>, std::function<void (std::exception_ptr)>, const ::Ice::Current&); #else diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 1aeea30adc0..5ca0e493ce7 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -197,7 +197,7 @@ allTests(const Ice::CommunicatorPtr& communicator) TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_invocationTimeout(100)); #ifdef ICE_CPP11_MAPPING - auto f = to->sleep_async(750); + auto f = to->sleepAsync(750); try { f.get(); @@ -223,7 +223,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_invocationTimeout(500)); #ifdef ICE_CPP11_MAPPING - auto f = to->sleep_async(250); + auto f = to->sleepAsync(250); try { f.get(); @@ -267,7 +267,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { con = to->ice_getConnection(); #ifdef ICE_CPP11_MAPPING - to->sleep_async(750).get(); + to->sleepAsync(750).get(); #else to->end_sleep(to->begin_sleep(750)); #endif @@ -445,7 +445,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { #ifdef ICE_CPP11_MAPPING - timeout->sleep_async(300).get(); + timeout->sleepAsync(300).get(); #else timeout->end_sleep(timeout->begin_sleep(300)); #endif @@ -462,7 +462,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Keep the server thread pool busy. #ifdef ICE_CPP11_MAPPING - timeout->ice_invocationTimeout(-1)->sleep_async(300); + timeout->ice_invocationTimeout(-1)->sleepAsync(300); #else timeout->ice_invocationTimeout(-1)->begin_sleep(300); #endif @@ -481,14 +481,14 @@ allTests(const Ice::CommunicatorPtr& communicator) // Keep the server thread pool busy. #ifdef ICE_CPP11_MAPPING - timeout->ice_invocationTimeout(-1)->sleep_async(300); + timeout->ice_invocationTimeout(-1)->sleepAsync(300); #else timeout->ice_invocationTimeout(-1)->begin_sleep(300); #endif try { #ifdef ICE_CPP11_MAPPING - batchTimeout->ice_flushBatchRequests_async().get(); + batchTimeout->ice_flushBatchRequestsAsync().get(); #else batchTimeout->end_ice_flushBatchRequests(batchTimeout->begin_ice_flushBatchRequests()); #endif diff --git a/cpp/test/Ice/udp/TestI.cpp b/cpp/test/Ice/udp/TestI.cpp index 2bb12a18dda..23f7523ad2b 100644 --- a/cpp/test/Ice/udp/TestI.cpp +++ b/cpp/test/Ice/udp/TestI.cpp @@ -64,7 +64,7 @@ TestIntfI::pingBiDir(ICE_IN(Ice::Identity) id, const Ice::Current& current) // Send the reply through the incoming connection. // #ifdef ICE_CPP11_MAPPING - Ice::uncheckedCast<Test::PingReplyPrx>(current.con->createProxy(id))->reply_async(); + Ice::uncheckedCast<Test::PingReplyPrx>(current.con->createProxy(id))->replyAsync(); #else Test::PingReplyPrx::uncheckedCast(current.con->createProxy(id))->begin_reply(); #endif diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp index f092da3c7fa..3fc7c6a9f1f 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/keyword/Client.cpp @@ -18,10 +18,10 @@ class breakI : public _cpp_and::_cpp_break public: #ifdef ICE_CPP11_MAPPING - virtual void case_async(::Ice::Int, - function<void (int)> response, - function<void (exception_ptr)>, - const ::Ice::Current&) + virtual void caseAsync(::Ice::Int, + function<void (int)> response, + function<void (exception_ptr)>, + const ::Ice::Current&) { response(0); } @@ -63,10 +63,10 @@ class doI : public _cpp_and::_cpp_do { public: #ifdef ICE_CPP11_MAPPING - virtual void case_async(::Ice::Int, - function<void (int)>, - function<void (const exception_ptr&)>, - const ::Ice::Current&) + virtual void caseAsync(::Ice::Int, + function<void (int)>, + function<void (const exception_ptr&)>, + const ::Ice::Current&) { } #else |