diff options
Diffstat (limited to 'TAO/orbsvcs/tests/IOR_MCast/server_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/IOR_MCast/server_i.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index da83e55d580..365034c059e 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp @@ -24,7 +24,7 @@ Server_i::~Server_i (void) int Server_i::init (int &argc, char **&argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -36,26 +36,26 @@ Server_i::init (int &argc, CORBA::ORB_init (this->argc_, this->argv_, "" /* the ORB name, it can be anything! */ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the RootPOA. CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down to the correct reference. PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set a POA Manager. PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA Manager. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior; @@ -68,11 +68,11 @@ Server_i::init (int &argc, server_i._this (); CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) @@ -83,20 +83,20 @@ Server_i::init (int &argc, { ior = this->orb_->object_to_string (mcast_server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - adapter->bind ("MCASTServer", ior.in () TAO_ENV_ARG_PARAMETER); + adapter->bind ("MCASTServer", ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Enable such that the server can listen for multicast requests // at the specified address. this->enable_multicast (ior.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; //Destroy the POA, waiting until the destruction terminates. @@ -115,7 +115,7 @@ Server_i::init (int &argc, int Server_i::enable_multicast (const char *ior - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_TRY |