1 files changed, 13 insertions, 27 deletions

diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index e7e9b391e0d..5584458efcb 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -14,7 +14,7 @@ main (int, char *[])
   int niterations = 10;
   int norbs = 10;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       for (int i = 0; i != niterations; ++i)
         {
@@ -25,21 +25,16 @@ main (int, char *[])
 
               int argc = 0;
               CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ORB_init (argc, 0, buf);
 
               CORBA::Object_var object =
-                orb->string_to_object ("DLL:Test_Object"
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->string_to_object ("DLL:Test_Object");
 
               Test_var test =
-                Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                Test::_narrow (object.in ());
 
               CORBA::Long count =
-                test->instance_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                test->instance_count ();
 
               if (count != norbs*i + j + 1)
                 {
@@ -48,8 +43,7 @@ main (int, char *[])
                               "(%d != %d)\n",
                               count, norbs * i + j + 1));
                 }
-              test->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test->destroy ();
             }
         }
 
@@ -60,31 +54,23 @@ main (int, char *[])
 
           int argc = 0;
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::ORB_init (argc, 0, buf);
 
           CORBA::Object_var obj =
-            orb->resolve_initial_references ("RootPOA"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RootPOA");
 
           PortableServer::POA_var poa =
-            PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            PortableServer::POA::_narrow (obj.in ());
 
-          poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          poa->destroy (1, 1);
 
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "main()");
+      ex._tao_print_exception ("main()");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }