1 files changed, 18 insertions, 15 deletions

diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 25ea7fccd89..d1251ab4b7d 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -48,18 +48,20 @@ Test_Var_Struct::opname (void) const
 }
 
 void
-Test_Var_Struct::dii_req_invoke (CORBA::Request *req,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Test_Var_Struct::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Var_Struct::init_parameters (Param_Test_ptr ,
-                                  CORBA::Environment &)
+Test_Var_Struct::init_parameters (Param_Test_ptr objref,
+                                  CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
 
@@ -89,20 +91,20 @@ Test_Var_Struct::reset_parameters (void)
 
 int
 Test_Var_Struct::run_sii_test (Param_Test_ptr objref,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   Param_Test::Var_Struct_out out (this->out_.out ());
   this->ret_ = objref->test_var_struct (this->in_,
                                         this->inout_.inout (),
                                         out,
-                                        ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                        env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Var_Struct::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_Var_Struct,
                     &this->in_,
@@ -120,23 +122,23 @@ Test_Var_Struct::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
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Var_Struct,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Var_Struct,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -170,8 +172,9 @@ Test_Var_Struct::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Var_Struct::check_validity (CORBA::Request_ptr )
+Test_Var_Struct::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }