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

3 files changed, 68 insertions, 69 deletions

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