diff options
Diffstat (limited to 'TAO/tests/Param_Test/bd_short_seq.cpp')
| -rw-r--r-- | TAO/tests/Param_Test/bd_short_seq.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index 8d585809a4a..21836ba0f74 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -47,15 +47,15 @@ Test_Bounded_Short_Sequence::opname (void) const } void -Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req + TAO_ENV_ARG_DECL) { req->add_in_arg ("s1") <<= this->in_.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_Short_Seq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::Bounded_Short_Seq *tmp; @@ -63,24 +63,23 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::Bounded_Short_Seq (*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_Short_Seq (*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_Short_Seq (*tmp); } int -Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/, - CORBA::Environment & /*env*/) +Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/ + TAO_ENV_ARG_DECL_NOT_USED /*env*/) { // ACE_UNUSED_ARG (objref); - // ACE_UNUSED_ARG (env); // get some sequence length (32 in this case) CORBA::ULong len = this->in_->maximum (); @@ -119,8 +118,8 @@ Test_Bounded_Short_Sequence::reset_parameters (void) } int -Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -128,8 +127,8 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_bounded_short_sequence (this->in_.in (), this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; |