1 files changed, 20 insertions, 17 deletions

diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 3d5f431d407..64fbc26b3c2 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -47,16 +47,18 @@ Test_String_Sequence::opname (void) const
 }
 
 void
-Test_String_Sequence::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_String_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_String_Sequence::init_parameters (Param_Test_ptr ,
-                                       CORBA::Environment &)
+Test_String_Sequence::init_parameters (Param_Test_ptr objref,
+                                       CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   const char *choiceList[] =
   {
     "one",
@@ -91,20 +93,20 @@ Test_String_Sequence::reset_parameters (void)
 
 int
 Test_String_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   Param_Test::StrSeq_out out (this->out_.out ());
   this->ret_ = objref->test_strseq (this->in_.in (),
                                     this->inout_.inout (),
                                     out,
-                                    ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                    env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_String_Sequence::add_args (CORBA::NVList_ptr param_list,
                                 CORBA::NVList_ptr retval,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_StrSeq,
                      (void *) &this->in_.in (),
@@ -122,23 +124,23 @@ Test_String_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_StrSeq,
-                                                    &this->ret_.inout (), // see above
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_StrSeq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -165,8 +167,9 @@ Test_String_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_String_Sequence::check_validity (CORBA::Request_ptr )
+Test_String_Sequence::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }