diff options
Diffstat (limited to 'TAO/tests/Param_Test/any.cpp')
| -rw-r--r-- | TAO/tests/Param_Test/any.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index e12c722c98f..af6bddcb277 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -48,7 +48,7 @@ Test_Any::opname (void) const } void -Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) +Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL) { req->add_in_arg ("o1") <<= this->in_; req->add_inout_arg ("o2") <<= this->inout_; @@ -56,7 +56,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) req->set_return_type (CORBA::_tc_any); - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const CORBA::Any *tmp; @@ -64,13 +64,13 @@ Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL) this->ret_ = new CORBA::Any (*tmp); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; this->inout_ = CORBA::Any (*tmp); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER); + req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; this->out_ = new CORBA::Any (*tmp); @@ -93,12 +93,12 @@ static const CORBA::TypeCode_ptr any_table [] = int Test_Any::init_parameters (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { // get access to a Coffee Object - this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->reset_parameters (); @@ -270,14 +270,14 @@ Test_Any::reset_parameters (void) int Test_Any::run_sii_test (Param_Test_ptr objref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->ret_ = objref->test_any (this->in_, this->inout_, this->out_.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |