diff options
Diffstat (limited to 'TAO/tests/Collocation/Collocation_Tester.cpp')
| -rw-r--r-- | TAO/tests/Collocation/Collocation_Tester.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp index 7dba0e02c44..c179cc0c9dd 100644 --- a/TAO/tests/Collocation/Collocation_Tester.cpp +++ b/TAO/tests/Collocation/Collocation_Tester.cpp @@ -21,19 +21,19 @@ Collocation_Test::Collocation_Test (void) } void -Collocation_Test::shutdown (CORBA::Environment &ACE_TRY_ENV) +Collocation_Test::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->root_poa_->destroy (1, 1, ACE_TRY_ENV); + this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->orb_->destroy (ACE_TRY_ENV); + this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int -Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) +Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL) { // Initialize the ORB. - this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); int result = this->parse_args (argc, argv); @@ -42,52 +42,52 @@ Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // Get an Object reference to RootPOA. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Narrow the Object reference to a POA reference this->root_poa_ = - PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the POAManager of RootPOA this->poa_manager_ = - this->root_poa_->the_POAManager (ACE_TRY_ENV); + this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the diamond servant and its base classes under RootPOA. PortableServer::ObjectId_var id = - this->root_poa_->activate_object (&this->top_servant_, - ACE_TRY_ENV); + this->root_poa_->activate_object (&this->top_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // // We only care about the most derived class here. -// this->diamond_obj_ = this->diamond_servant_._this (ACE_TRY_ENV); +// this->diamond_obj_ = this->diamond_servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); // ACE_CHECK_RETURN (-1); id = - this->root_poa_->activate_object (&this->diamond_servant_, - ACE_TRY_ENV); + this->root_poa_->activate_object (&this->diamond_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We only care about the most derived class here. - this->diamond_obj_ = this->root_poa_->id_to_reference (id.in (), - ACE_TRY_ENV); + this->diamond_obj_ = this->root_poa_->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); id = - this->root_poa_->activate_object (&this->left_servant_, - ACE_TRY_ENV); + this->root_poa_->activate_object (&this->left_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); id = - this->root_poa_->activate_object (&this->right_servant_, - ACE_TRY_ENV); + this->root_poa_->activate_object (&this->right_servant_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::String_var str = - this->orb_->object_to_string (this->diamond_obj_.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (this->diamond_obj_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n", @@ -106,37 +106,37 @@ Collocation_Test::parse_args (int /*argc*/, } int -Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV) +Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL) { Diamond::Top_var top = - Diamond::Top::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV); + Diamond::Top::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Left_var left = - Diamond::Left::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV); + Diamond::Left::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Right_var right = - Diamond::Right::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV); + Diamond::Right::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Diamond::Buttom_var buttom = - Diamond::Buttom::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV); + Diamond::Buttom::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - CORBA::String_var str = top->shape (ACE_TRY_ENV); + CORBA::String_var str = top->shape (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ())); - str = left->shape (ACE_TRY_ENV); + str = left->shape (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ())); - str = right->shape (ACE_TRY_ENV); + str = right->shape (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ())); - str = buttom->shape (ACE_TRY_ENV); + str = buttom->shape (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ())); @@ -144,12 +144,12 @@ Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV) } int -Collocation_Test::run (CORBA::Environment &ACE_TRY_ENV) +Collocation_Test::run (TAO_ENV_SINGLE_ARG_DECL) { - this->poa_manager_->activate (ACE_TRY_ENV); + this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->test_narrow (ACE_TRY_ENV); + this->test_narrow (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; |