diff options
Diffstat (limited to 'TAO/tests/Param_Test/ub_struct_seq.cpp')
-rw-r--r-- | TAO/tests/Param_Test/ub_struct_seq.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 0b6cbc779e7..be2efce2d3d 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -48,8 +48,8 @@ Test_Struct_Sequence::opname (void) const } void -Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Struct_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 (); @@ -57,7 +57,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_StructSeq); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::StructSeq *tmp; @@ -65,21 +65,21 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::StructSeq (*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::StructSeq (*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::StructSeq (*tmp); } int -Test_Struct_Sequence::init_parameters (Param_Test_ptr, - CORBA::Environment &) +Test_Struct_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -110,8 +110,8 @@ Test_Struct_Sequence::reset_parameters (void) } int -Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -119,8 +119,8 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref, this->ret_ = objref->test_struct_sequence (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -255,8 +255,8 @@ Test_Unbounded_Struct_Sequence::opname (void) const } void -Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_Struct_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 (); @@ -264,7 +264,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, req->set_return_type (Param_Test::_tc_PathSpec); - req->invoke (ACE_TRY_ENV); + req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Param_Test::PathSpec *tmp; @@ -272,21 +272,21 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req, this->ret_ = new Param_Test::PathSpec (*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::PathSpec (*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::PathSpec (*tmp); } int -Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr , - CORBA::Environment &) +Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr + TAO_ENV_ARG_DECL_NOT_USED) { Generator *gen = GENERATOR::instance (); // value generator @@ -318,14 +318,14 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void) } int -Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref, - CORBA::Environment &ACE_TRY_ENV) +Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref + TAO_ENV_ARG_DECL) { Param_Test::PathSpec_out out (this->out_.out ()); this->ret_ = objref->test_unbounded_struct_sequence (this->in_, this->inout_.inout (), - out, - ACE_TRY_ENV); + out + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; |