1 files changed, 11 insertions, 11 deletions

diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index c19db80d81b..1b7edb51d8e 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -48,15 +48,15 @@ Test_Bounded_Array_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req,
-                                             CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
+                                             TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_ArraySeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Bounded_ArraySeq *tmp;
@@ -64,21 +64,21 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_ArraySeq (*tmp);
 }
 
 int
-Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr,
-                                              CORBA::Environment &)
+Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr
+                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -123,8 +123,8 @@ Test_Bounded_Array_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref,
-                                           CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref
+                                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -133,8 +133,8 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref,
       this->ret_ =
         objref->test_bounded_array_sequence (this->in_,
                                              this->inout_.inout (),
-                                             out,
-                                             ACE_TRY_ENV);
+                                             out
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;