diff options
Diffstat (limited to 'TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp')
| -rw-r--r-- | TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index fff693f2e46..6f83e38af9f 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -142,7 +142,7 @@ MT_Server::init (int argc, "MT_Server::init: ORB_Manager is nil!\n"), -1); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Call the init of TAO_ORB_Manager to create a child POA @@ -150,7 +150,7 @@ MT_Server::init (int argc, this->orb_manager_ptr_->init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -160,7 +160,7 @@ MT_Server::init (int argc, this->str_ = this->orb_manager_ptr_->activate_under_child_poa ("MT", &this->mT_Object_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -185,7 +185,7 @@ MT_Server::init (int argc, CORBA::Object_var object_var = orb_var->string_to_object (this->object_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) @@ -194,7 +194,7 @@ MT_Server::init (int argc, -1); this->mT_Object_var_ = MT_Object::_narrow (object_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) @@ -220,10 +220,10 @@ MT_Server::init (int argc, int MT_Server::run () { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = this->orb_manager_ptr_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + int r = this->orb_manager_ptr_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) @@ -245,12 +245,12 @@ MT_Server::~MT_Server (void) if (this->object_key_ != 0) ACE_OS::free (this->object_key_); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (this->orb_manager_ptr_) this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -266,7 +266,7 @@ MT_Server::run_ORB_briefly (void) { if (this->iterations_ > 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_DEBUG ((LM_DEBUG, @@ -276,12 +276,12 @@ MT_Server::run_ORB_briefly (void) for (unsigned int i = 0; i < this->iterations_; i++) { MT_Object_var tmp = - this->mT_Object_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mT_Object_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->mT_Object_var_->yadda (0, tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } |