Renamed C++11 AMI/AMD suffix: _async to Async

20 files changed, 227 insertions, 187 deletions

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&);