diff options
Diffstat (limited to 'TAO/tests/NestedUpcall/MT_Client_Test/client.cpp')
| -rw-r--r-- | TAO/tests/NestedUpcall/MT_Client_Test/client.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index 2ede15e0127..fb2c7d74986 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -146,7 +146,7 @@ MT_Client::parse_args (void) int MT_Client::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { for (unsigned long i = 0; i < this->iterations_; i++) @@ -159,8 +159,8 @@ MT_Client::run (void) // call the recursive object MT_Object for nested upcalls // testing this->mT_Object_var_->yadda (0, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -198,7 +198,7 @@ MT_Client::init (int argc, char **argv, this->client_number_ = client_number; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { char buf[64]; @@ -207,8 +207,8 @@ MT_Client::init (int argc, char **argv, this->orb_var_ = CORBA::ORB_init (this->argc_, this->argv_, - buf, - ACE_TRY_ENV); + buf + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -222,8 +222,8 @@ MT_Client::init (int argc, char **argv, CORBA::Object_var object_var = - this->orb_var_->string_to_object (this->object_key_, - ACE_TRY_ENV); + this->orb_var_->string_to_object (this->object_key_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) @@ -231,8 +231,8 @@ MT_Client::init (int argc, char **argv, "No proper object has been returned.\n"), -1); - this->mT_Object_var_ = MT_Object::_narrow (object_var.in(), - ACE_TRY_ENV); + this->mT_Object_var_ = MT_Object::_narrow (object_var.in() + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) @@ -246,7 +246,7 @@ MT_Client::init (int argc, char **argv, ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n")); CORBA::Object_var poa_object = - this->orb_var_->resolve_initial_references("RootPOA", ACE_TRY_ENV); + this->orb_var_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -255,14 +255,14 @@ MT_Client::init (int argc, char **argv, 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -282,14 +282,14 @@ MT_Client::init (int argc, char **argv, int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { TAO_ORB_Manager orb_manager; int r = orb_manager.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != 0) |