1 files changed, 23 insertions, 46 deletions

diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index 8b945a68c1b..b640b83b7c6 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -21,7 +21,7 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy_poa (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void test_poa (PortableServer::POA_ptr poa);
@@ -36,49 +36,38 @@ test_i::test_poa (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
+test_i::destroy_poa (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 1;
   this->poa_->destroy (etherealize_objects,
-                       wait_for_completion
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       wait_for_completion);
 }
 
 PortableServer::POA_ptr
 init_orb (int argc,
           char **argv,
-          const char *orb_name
-          ACE_ENV_ARG_DECL)
+          const char *orb_name)
 {
   // Initialize the ORB first.
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        orb_name
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                        orb_name);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    orb->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    PortableServer::POA::_narrow (obj.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  poa_manager->activate ();
 
   return root_poa._retn ();
 }
@@ -87,49 +76,41 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       PortableServer::POA_var first_poa =
         init_orb (argc,
                   argv,
-                  "first ORB"
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                  "first ORB");
 
       PortableServer::POA_var second_poa =
         init_orb (argc,
                   argv,
-                  "second ORB"
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                  "second ORB");
 
       test_i servant;
-      test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object = servant._this ();
 
       int expected_exception_raised = 0;
 
-      ACE_TRY_EX (first_poa)
+      try
         {
           servant.test_poa (first_poa.in ());
 
-          test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (first_poa);
+          test_object->destroy_poa ();
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch (const CORBA::BAD_INV_ORDER& )
         {
           // This is the correct exception! Ignore
           expected_exception_raised = 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type");
+          ex._tao_print_exception (
+            "Exception caught of incorrect type");
           return -1;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
 
       // Make sure an exception was raised and it was of the correct
       // type.
@@ -140,19 +121,15 @@ main (int argc,
 
       servant.test_poa (second_poa.in ());
 
-      test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_object->destroy_poa ();
 
-      first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      first_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception caught");
+      ex._tao_print_exception ("Unexpected exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }