diff options
Diffstat (limited to 'TAO/tests/Param_Test/recursive_struct.cpp')
-rw-r--r-- | TAO/tests/Param_Test/recursive_struct.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index 3f868f8aefb..cbe8190640b 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -47,8 +47,8 @@ Test_Recursive_Struct::opname (void) const } void -Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Recursive_Struct::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 (); @@ -56,7 +56,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_Recursive_Struct); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Recursive_Struct *tmp; @@ -64,21 +64,21 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Recursive_Struct (*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::Recursive_Struct (*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::Recursive_Struct (*tmp); } int -Test_Recursive_Struct::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Recursive_Struct::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { // The client calls init_parameters() before the first // call and reset_parameters() after each call. For this @@ -116,8 +116,8 @@ Test_Recursive_Struct::reset_parameters (void) } int -Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -125,8 +125,8 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_recursive_struct (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; |