1 files changed, 18 insertions, 29 deletions

diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index 81a771b66ea..2947a1221f0 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -20,7 +20,7 @@
 #include "small_union.h"
 
 ACE_RCSID (Param_Test,
-           small_union, 
+           small_union,
            "$Id$")
 
 // ************************************************************************
@@ -47,8 +47,7 @@ Test_Small_Union::opname (void) const
 }
 
 void
-Test_Small_Union::dii_req_invoke (CORBA::Request *req
-                                  ACE_ENV_ARG_DECL)
+Test_Small_Union::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -56,48 +55,43 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Small_Union);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Small_Union *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Small_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Small_Union (*tmp);
 }
 
 int
-Test_Small_Union::init_parameters (Param_Test_ptr objref
-                                   ACE_ENV_ARG_DECL)
+Test_Small_Union::init_parameters (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cobj_ = objref->make_coffee ();
 
       this->reset_parameters ();
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee");
+      sysex._tao_print_exception ("System Exception doing make_coffee");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "An exception caught in make_coffee");
+      ex._tao_print_exception (
+        "An exception caught in make_coffee");
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -131,26 +125,21 @@ Test_Small_Union::reset_parameters (void)
 }
 
 int
-Test_Small_Union::run_sii_test (Param_Test_ptr objref
-                                ACE_ENV_ARG_DECL)
+Test_Small_Union::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_small_union (this->in_,
                                            this->inout_,
-                                           this->out_
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           this->out_);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Small_Union::run_sii_test\n");
+      ex._tao_print_exception ("Test_Small_Union::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }