diff options
Diffstat (limited to 'TAO/tests/Param_Test/multdim_array.cpp')
| -rw-r--r-- | TAO/tests/Param_Test/multdim_array.cpp | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp index 69b3f3e8f3a..70a10caa970 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -18,8 +18,8 @@ #include "multdim_array.h" -ACE_RCSID (Param_Test, - multdim_array, +ACE_RCSID (Param_Test, + multdim_array, "$Id$") // ************************************************************************ @@ -48,8 +48,7 @@ Test_Multdim_Array::opname (void) const } void -Test_Multdim_Array::dii_req_invoke (CORBA::Request *req - ACE_ENV_ARG_DECL) +Test_Multdim_Array::dii_req_invoke (CORBA::Request *req) { req->add_in_arg ("s1") <<= Param_Test::Multdim_Array_forany (this->in_.inout ()); req->add_inout_arg ("s2") <<= Param_Test::Multdim_Array_forany (this->inout_.inout ()); @@ -57,8 +56,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req req->set_return_type (Param_Test::_tc_Multdim_Array); - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + req->invoke (); Param_Test::Multdim_Array_forany forany; @@ -66,21 +64,19 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req Param_Test::Multdim_Array_copy (this->ret_, forany.in ()); CORBA::NamedValue_ptr o2 = - req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + req->arguments ()->item (1); *o2->value () >>= forany; Param_Test::Multdim_Array_copy (this->inout_, forany.in ()); CORBA::NamedValue_ptr o3 = - req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + req->arguments ()->item (2); *o3->value () >>= forany; Param_Test::Multdim_Array_copy (this->out_, forany.in ()); } int Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/ - ACE_ENV_ARG_DECL_NOT_USED/*env*/) +/*env*/) { Generator *gen = GENERATOR::instance (); // value generator @@ -135,24 +131,19 @@ Test_Multdim_Array::reset_parameters (void) } int -Test_Multdim_Array::run_sii_test (Param_Test_ptr objref - ACE_ENV_ARG_DECL) +Test_Multdim_Array::run_sii_test (Param_Test_ptr objref) { - ACE_TRY + try { this->ret_ = objref->test_multdim_array (this->in_.in (), this->inout_.inout (), - this->out_.inout () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->out_.inout ()); return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Test_Multdim_Array::run_sii_test\n"); + ex._tao_print_exception ("Test_Multdim_Array::run_sii_test\n"); } - ACE_ENDTRY; return -1; } |