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

3 files changed, 74 insertions, 74 deletions

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