summaryrefslogtreecommitdiff
path: root/TAO/tests/Param_Test/ub_array_seq.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Param_Test/ub_array_seq.cpp')
-rw-r--r--TAO/tests/Param_Test/ub_array_seq.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index c21ca596b33..a4534a5129a 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -46,8 +46,8 @@ Test_Array_Sequence::opname (void) const
}
void
-Test_Array_Sequence::dii_req_invoke (CORBA::Request *req,
- CORBA::Environment &ACE_TRY_ENV)
+Test_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 ();
@@ -55,7 +55,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req,
req->set_return_type (Param_Test::_tc_ArraySeq);
- req->invoke (ACE_TRY_ENV);
+ req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
Param_Test::ArraySeq *tmp;
@@ -63,21 +63,21 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req,
this->ret_ = new Param_Test::ArraySeq (*tmp);
CORBA::NamedValue_ptr o2 =
- req->arguments ()->item (1, ACE_TRY_ENV);
+ req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
*o2->value () >>= tmp;
this->inout_ = new Param_Test::ArraySeq (*tmp);
CORBA::NamedValue_ptr o3 =
- req->arguments ()->item (2, ACE_TRY_ENV);
+ req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
*o3->value () >>= tmp;
this->out_ = new Param_Test::ArraySeq (*tmp);
}
int
-Test_Array_Sequence::init_parameters (Param_Test_ptr ,
- CORBA::Environment &)
+Test_Array_Sequence::init_parameters (Param_Test_ptr
+ TAO_ENV_ARG_DECL_NOT_USED)
{
Generator *gen = GENERATOR::instance (); // value generator
@@ -125,8 +125,8 @@ Test_Array_Sequence::reset_parameters (void)
}
int
-Test_Array_Sequence::run_sii_test (Param_Test_ptr objref,
- CORBA::Environment &ACE_TRY_ENV)
+Test_Array_Sequence::run_sii_test (Param_Test_ptr objref
+ TAO_ENV_ARG_DECL)
{
ACE_TRY
{
@@ -134,8 +134,8 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref,
this->ret_ = objref->test_array_sequence (this->in_,
this->inout_.inout (),
- out,
- ACE_TRY_ENV);
+ out
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
return 0;