diff options
Diffstat (limited to 'TAO/performance-tests/POA/Demux/demux_test_server.cpp')
| -rw-r--r-- | TAO/performance-tests/POA/Demux/demux_test_server.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index ec61f957ee0..52c2607319b 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -46,7 +46,7 @@ Demux_Test_Server::~Demux_Test_Server (void) int Demux_Test_Server::init (int argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { printf ("here\n"); @@ -58,7 +58,7 @@ Demux_Test_Server::init (int argc, char *argv [] { // get the underlying ORB this->orb_ = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(GET_ORB); } ACE_CATCHANY @@ -78,7 +78,7 @@ Demux_Test_Server::init (int argc, char *argv [] temp = this->orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(GET_ROOT_POA); if (CORBA::is_nil (temp.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -87,7 +87,7 @@ Demux_Test_Server::init (int argc, char *argv [] this->root_poa_ = PortableServer::POA::_narrow (temp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (GET_ROOT_POA); } ACE_CATCHANY @@ -104,7 +104,7 @@ Demux_Test_Server::init (int argc, char *argv [] { this->poa_mgr_ = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (GET_POA_MGR); } ACE_CATCHANY @@ -147,7 +147,7 @@ Demux_Test_Server::init (int argc, char *argv [] policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -156,7 +156,7 @@ Demux_Test_Server::init (int argc, char *argv [] policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK_EX (POLICY); @@ -169,7 +169,7 @@ Demux_Test_Server::init (int argc, char *argv [] policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -178,7 +178,7 @@ Demux_Test_Server::init (int argc, char *argv [] policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK_EX (POLICY); @@ -230,7 +230,7 @@ Demux_Test_Server::init (int argc, char *argv [] this->child_poa_[i] = prev_poa->create_POA (poa_name, this->poa_mgr_.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (CREATE_POA); } ACE_CATCHANY @@ -258,7 +258,7 @@ Demux_Test_Server::init (int argc, char *argv [] //id = this->child_poa_[i]->activate_object (&this->demux_test_[j], id = this->child_poa_[i]->activate_object (demux_test_i_ptr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (ACTIVATE_OBJ); } ACE_CATCHANY @@ -274,11 +274,11 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_TRY_EX (IOR) { CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (IOR); CORBA::String_var ior = this->orb_->object_to_string - (demux_var.in () TAO_ENV_ARG_PARAMETER); + (demux_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (IOR); @@ -319,16 +319,16 @@ Demux_Test_Server::init (int argc, char *argv [] this->child_poa_[i]->activate_object_with_id (oid.in (), demux_test_i_ptr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object reference for demux_test_i impl object. - CORBA::Object_var demux_var = demux_test_i_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var demux_var = demux_test_i_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = this->orb_->object_to_string - (demux_var.in () TAO_ENV_ARG_PARAMETER); + (demux_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -359,7 +359,7 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_TRY_EX (ACTIVATE) { - this->poa_mgr_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_mgr_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (ACTIVATE); } @@ -468,11 +468,11 @@ Demux_Test_Server::init_naming_service (void) // The main program for Demux_Test int -Demux_Test_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Demux_Test_Server::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |