diff options
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Forwarder.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp | 110 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h | 30 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Iterator.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Iterator.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Locator.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Locator.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Options.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 48 |
14 files changed, 125 insertions, 125 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp index d09725910c3..fd33d0a8f7e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp @@ -23,7 +23,7 @@ CORBA::Boolean ImR_Adapter_Activator::unknown_adapter ( PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,41 +38,41 @@ ImR_Adapter_Activator::unknown_adapter ( exception_message = "While PortableServer::POA::create_servant_retention_policy"; policies[0] = parent->create_servant_retention_policy - (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER); + (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy exception_message = "While PortableServer::POA::create_request_processing_policy"; policies[1] = parent->create_request_processing_policy - (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER); + (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - parent->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While create_POA"; PortableServer::POA_var child = parent->create_POA (name, poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While unknown_adapter::policy->destroy"; for (CORBA::ULong i = 0; i < policies.length (); ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } exception_message = "While child->the_activator"; - child->the_activator (this TAO_ENV_ARG_PARAMETER); + child->the_activator (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While unknown_adapter, set_servant_manager"; - child->set_servant_manager(this->servant_locator_ TAO_ENV_ARG_PARAMETER); + child->set_servant_manager(this->servant_locator_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h index 5d04049f033..62757907e07 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h @@ -36,7 +36,7 @@ public: virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 58513682945..ad8be8e9524 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -31,11 +31,11 @@ ImR_Forwarder::ImR_Forwarder (ImplRepo_i *imr_impl) ACE_TRY_NEW_ENV { CORBA::Object_var tmp = - orb->resolve_initial_references ("POACurrent" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_current_var_ = - PortableServer::Current::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); + PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -65,7 +65,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr poa, const char *, PortableServer::ServantLocator::Cookie & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); @@ -79,7 +79,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, ior = this->imr_impl_->activate_server_i (poa->the_name (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Add the key @@ -99,7 +99,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, if (OPTIONS::instance()->debug () >= 2) ACE_DEBUG ((LM_DEBUG, "Forwarding to %s\n", ior.c_str ())); - forward_obj = orb->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER); + forward_obj = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -136,7 +136,7 @@ ImR_Forwarder::postinvoke (const PortableServer::ObjectId &, const char * , PortableServer::ServantLocator::Cookie , PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { delete servant; diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h index a95348523b6..0bab6ef87d5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h @@ -39,7 +39,7 @@ public: PortableServer::POA_ptr poa, const char * operation, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); /// Called after the invocation finishes. @@ -48,7 +48,7 @@ public: const char * operation, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp index 6edb2e11821..b5a26810c3d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp @@ -13,7 +13,7 @@ run_standalone (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER); + int status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -22,10 +22,10 @@ run_standalone (void) } else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index 98bedf49b8e..9f21638073d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -46,7 +46,7 @@ ImplRepo_i::ImplRepo_i (void) char * ImplRepo_i::find_ior (const ACE_CString &object_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_TString endpoint; @@ -68,7 +68,7 @@ ImplRepo_i::find_ior (const ACE_CString &object_name ACE_TRY { endpoint = this->activate_server_i (poa_name.c_str (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -97,21 +97,21 @@ ImplRepo_i::find_ior (const ACE_CString &object_name void ImplRepo_i::activate_server (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound, ImplementationRepository::Administration::CannotActivate)) { // Since this is called through the Admin interface, we should ignore some // of the activation modes. Also ignore the return value. - this->activate_server_i (server, 0 TAO_ENV_ARG_PARAMETER); + this->activate_server_i (server, 0 ACE_ENV_ARG_PARAMETER); } ACE_TString ImplRepo_i::activate_server_i (const char *server, const int check_startup - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound, ImplementationRepository::Administration::CannotActivate)) @@ -158,11 +158,11 @@ ImplRepo_i::activate_server_i (const char *server, ACE_TRY { CORBA::Object_var object = - orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object (server_object_ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ImplementationRepository::ServerObject_var server_object = - ImplementationRepository::ServerObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + ImplementationRepository::ServerObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -174,7 +174,7 @@ ImplRepo_i::activate_server_i (const char *server, } // Check to see if we can ping it - server_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + server_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -229,7 +229,7 @@ ImplRepo_i::activate_server_i (const char *server, void ImplRepo_i::start_server_i (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound, ImplementationRepository::Administration::CannotActivate)) @@ -399,7 +399,7 @@ ImplRepo_i::ready_check (const char *server) ACE_TString ping_object_ior, location; ImplementationRepository::ServerObject_var ping_object; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // <end> is the end of the window where we can get a response before // timing out @@ -428,12 +428,12 @@ ImplRepo_i::ready_check (const char *server) ACE_TRY_EX (ping1) { CORBA::Object_var object = - orb->string_to_object (ping_object_ior.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ping_object_ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (ping1); ping_object = ImplementationRepository::ServerObject::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (ping1); if (CORBA::is_nil (ping_object.in ())) @@ -471,7 +471,7 @@ ImplRepo_i::ready_check (const char *server) if (OPTIONS::instance()->debug () >= 2) ACE_DEBUG ((LM_DEBUG, "Pinging Server...\n")); - ping_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER); + ping_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (ping2); if (OPTIONS::instance()->debug () >= 2) @@ -504,7 +504,7 @@ ImplRepo_i::ready_check (const char *server) void ImplRepo_i::register_server (const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::AlreadyRegistered)) { @@ -576,7 +576,7 @@ ImplRepo_i::register_server (const char *server, void ImplRepo_i::reregister_server (const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (OPTIONS::instance ()->readonly ()) @@ -628,7 +628,7 @@ ImplRepo_i::reregister_server (const char *server, void ImplRepo_i::remove_server (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -658,7 +658,7 @@ char * ImplRepo_i::server_is_running (const char *server, const char *location, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -673,7 +673,7 @@ ImplRepo_i::server_is_running (const char *server, // Get the stringified server_object_ior ACE_TCHAR *server_object_ior = orb->object_to_string (server_object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->repository_.update (server, location, server_object_ior) == 0) @@ -720,7 +720,7 @@ ImplRepo_i::server_is_running (const char *server, if (profile) { - new_location = profile->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + new_location = profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else @@ -751,7 +751,7 @@ ImplRepo_i::server_is_running (const char *server, void ImplRepo_i::server_is_shutting_down (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -774,18 +774,18 @@ ImplRepo_i::server_is_shutting_down (const char *server int -ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) +ImplRepo_i::init (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); ACE_TRY { CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + 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 ())) { @@ -793,12 +793,12 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) } else { - adapter->set_locator (this->locator_.in () TAO_ENV_ARG_PARAMETER); + adapter->set_locator (this->locator_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } CORBA::Object_var root_poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa_object.in ())) @@ -808,11 +808,11 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) // Get the POA object. this->root_poa_ = PortableServer::POA::_narrow (root_poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); @@ -821,20 +821,20 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) // Id Assignment policy policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->imr_poa_ = this->root_poa_->create_POA ("ImplRepoService", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! @@ -844,7 +844,7 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < policies.length (); ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -857,23 +857,23 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) this->imr_poa_->activate_object_with_id (imr_id.in (), this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IMR object CORBA::Object_var imr_obj = - this->imr_poa_->id_to_reference (imr_id.in () TAO_ENV_ARG_PARAMETER); + this->imr_poa_->id_to_reference (imr_id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // And its string this->imr_ior_ = - orb->object_to_string (imr_obj.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (imr_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register with INS. adapter->bind ("ImplRepoService", this->imr_ior_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (OPTIONS::instance ()->debug () >= 2) @@ -896,7 +896,7 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL) // Register the Adapter_Activator reference to be the RootPOA's // Adapter Activator. - this->root_poa_->the_activator (this->activator_ TAO_ENV_ARG_PARAMETER); + this->root_poa_->the_activator (this->activator_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get reactor instance from TAO. @@ -1025,18 +1025,18 @@ ImplRepo_i::setup_multicast (ACE_Reactor *reactor) int -ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL) +ImplRepo_i::fini (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); ACE_TRY { CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + 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 ())) { @@ -1045,14 +1045,14 @@ ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL) else { adapter->set_locator (IORTable::Locator::_nil () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } - this->imr_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->imr_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1066,13 +1066,13 @@ ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL) } int -ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL) +ImplRepo_i::run (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = OPTIONS::instance ()->orb (); PortableServer::POAManager_var poa_manager = - this->imr_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get a new iterator @@ -1108,7 +1108,7 @@ ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL) { if (activation == ImplementationRepository::AUTO_START) this->activate_server (server_entry->ext_id_.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1126,7 +1126,7 @@ ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL) } - orb->run (0 TAO_ENV_ARG_PARAMETER); + orb->run (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -1158,7 +1158,7 @@ ImplRepo_i::~ImplRepo_i (void) void ImplRepo_i::find (const char *server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -1202,7 +1202,7 @@ void ImplRepo_i::list (CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize the out variables, so if we return early, they will @@ -1285,9 +1285,9 @@ ImplRepo_i::list (CORBA::ULong how_many, ACE_TRY { PortableServer::ObjectId_var id = - this->root_poa_->activate_object (imr_iter TAO_ENV_ARG_PARAMETER); + this->root_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server_iterator = imr_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_iterator = imr_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1306,7 +1306,7 @@ ImplRepo_i::list (CORBA::ULong how_many, */ void ImplRepo_i::shutdown_server (const char *server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)) { @@ -1332,12 +1332,12 @@ ImplRepo_i::shutdown_server (const char *server ACE_TRY { CORBA::Object_var object = - orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER); + orb->string_to_object (server_object_ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ImplementationRepository::ServerObject_var server_object = ImplementationRepository::ServerObject::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -1349,7 +1349,7 @@ ImplRepo_i::shutdown_server (const char *server } // Call shutdown - server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Remove running info from repository diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h index bbc674f5454..7975ab0fd73 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h @@ -40,7 +40,7 @@ public: /// IOR_LookupTable_Callback method. Will return an IOR char *find_ior (const ACE_CString &object_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); // = Interface methods @@ -48,7 +48,7 @@ public: /// Starts up the server <server> if not already running. virtual void activate_server ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::NotFound, @@ -60,7 +60,7 @@ public: virtual void register_server ( const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::AlreadyRegistered @@ -70,20 +70,20 @@ public: virtual void reregister_server ( const char *server, const ImplementationRepository::StartupOptions &options - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Removes the server <server> from the repository. virtual void remove_server ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); /// Attempts to gracefully shut down the server, virtual void shutdown_server ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); @@ -93,14 +93,14 @@ public: const char *server, const char *location, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); /// What the server should call before it shuts down. virtual void server_is_shutting_down ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); @@ -108,7 +108,7 @@ public: virtual void find ( const char *server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::Administration::NotFound)); @@ -118,17 +118,17 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Initialize the Server state - parsing arguments and waiting. - int init (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Cleans up any state created by init (). - int fini (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Runs the orb. - int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: /// Implementation of activate_server. <check_startup> is a flag to check @@ -136,7 +136,7 @@ private: ACE_TString activate_server_i ( const char *server, const int check_startup - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::NotFound, @@ -146,7 +146,7 @@ private: /// This method starts the server process. void start_server_i ( const char *server - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, ImplementationRepository::Administration::NotFound, diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp index 3792e57cdca..7f89237359f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp @@ -37,7 +37,7 @@ ImR_Iterator::~ImR_Iterator () CORBA::Boolean ImR_Iterator::next_n (CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (server_list, @@ -95,7 +95,7 @@ ImR_Iterator::next_n (CORBA::ULong how_many, // Destroys the iterator. void -ImR_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index bd71a088a57..295d45020fc 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -41,12 +41,12 @@ public: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destroys the iterator. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp index dc20a2d05a5..701a2f0665e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp @@ -20,11 +20,11 @@ ImR_Locator::ImR_Locator (ImplRepo_i *repo) char * ImR_Locator::locate (const char *object_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_CString key (object_key); - return this->repo_->find_ior (key TAO_ENV_ARG_PARAMETER); + return this->repo_->find_ior (key ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.h b/TAO/orbsvcs/ImplRepo_Service/Locator.h index 3e022341c1e..b0e724a9b24 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator.h @@ -43,7 +43,7 @@ public: /// Locate the appropriate IOR. char * locate (const char *object_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp index 4d8c96055aa..246b02179ed 100644 --- a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp @@ -79,7 +79,7 @@ ImR_NT_Service::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -89,10 +89,10 @@ ImR_NT_Service::svc (void) else { report_status (SERVICE_RUNNING); - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp index 3e4b9bfbf9d..969df4d9eac 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Options.cpp @@ -250,7 +250,7 @@ Options::init (int argc, ACE_TCHAR *argv[]) this->orb_ = CORBA::ORB_init (orb_argc, orb_args.argv (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 95436d37a0d..6ef4001910f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -55,14 +55,14 @@ TAO_IMR_i::init (int argc, char **argv) const char *exception_message = "Null Message"; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -72,7 +72,7 @@ TAO_IMR_i::init (int argc, char **argv) // Get the ImplRepo object CORBA::Object_var implrepo_object = - orb_->resolve_initial_references ("ImplRepoService" TAO_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (implrepo_object.in ())) @@ -85,7 +85,7 @@ TAO_IMR_i::init (int argc, char **argv) exception_message = "While narrowing ImplRepo"; this->implrepo_ = ImplementationRepository::Administration::_narrow - (implrepo_object.in() TAO_ENV_ARG_PARAMETER); + (implrepo_object.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->op_->set_imr (this->implrepo_.in ()); @@ -615,11 +615,11 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv) int TAO_IMR_Op_Activate::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->activate_server - (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully Activated server <%s>\n", this->server_name_.c_str ())); @@ -657,11 +657,11 @@ TAO_IMR_Op_Add::run (void) startup_options.working_directory = CORBA::string_dup (this->working_dir_.c_str ()); startup_options.activation = this->activation_; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->register_server - (this->server_name_.c_str (), startup_options TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str (), startup_options ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully registered server <%s>\n", this->server_name_.c_str ())); @@ -693,10 +693,10 @@ TAO_IMR_Op_Autostart::run (void) ImplementationRepository::ServerInformationList_var server_list; ImplementationRepository::ServerInformationIterator_var server_iter; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->implrepo_->list (0, server_list, server_iter TAO_ENV_ARG_PARAMETER); + this->implrepo_->list (0, server_list, server_iter ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for more to be displayed @@ -708,7 +708,7 @@ TAO_IMR_Op_Autostart::run (void) { flag = server_iter->next_n (IR_LIST_CHUNK, server_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < server_list->length (); i++) @@ -716,7 +716,7 @@ TAO_IMR_Op_Autostart::run (void) ACE_TRY_EX (inside) { this->implrepo_->activate_server (server_list[i].server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (inside); } ACE_CATCHANY @@ -761,7 +761,7 @@ TAO_IMR_Op_IOR::run (void) } CORBA::String_var imr_str = - this->implrepo_->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + this->implrepo_->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Search for "corbaloc:" alone, without the protocol. This code @@ -830,7 +830,7 @@ TAO_IMR_Op_List::run (void) ImplementationRepository::ServerInformationList_var server_list; ImplementationRepository::ServerInformationIterator_var server_iter; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // If there is a server name, list only that server. Otherwise, look @@ -838,7 +838,7 @@ TAO_IMR_Op_List::run (void) if (this->server_name_.length () == 0) { this->implrepo_->list - (IR_LIST_CHUNK, server_list, server_iter TAO_ENV_ARG_PARAMETER); + (IR_LIST_CHUNK, server_list, server_iter ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < server_list->length (); i++) @@ -852,7 +852,7 @@ TAO_IMR_Op_List::run (void) while (flag) { flag = server_iter->next_n - (IR_LIST_CHUNK, server_list TAO_ENV_ARG_PARAMETER); + (IR_LIST_CHUNK, server_list ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < server_list->length (); i++) @@ -868,7 +868,7 @@ TAO_IMR_Op_List::run (void) ImplementationRepository::ServerInformation_var server_information; this->implrepo_->find - (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Display verbosely @@ -895,11 +895,11 @@ TAO_IMR_Op_List::run (void) int TAO_IMR_Op_Remove::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->remove_server - (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n", this->server_name_.c_str ())); @@ -928,11 +928,11 @@ TAO_IMR_Op_Remove::run (void) int TAO_IMR_Op_Shutdown::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->shutdown_server - (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n", this->server_name_.c_str ())); @@ -958,11 +958,11 @@ TAO_IMR_Op_Update::run (void) { ImplementationRepository::ServerInformation_var server_information; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->implrepo_->find - (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER); + (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Conditionally update the startup options @@ -981,7 +981,7 @@ TAO_IMR_Op_Update::run (void) this->implrepo_->reregister_server (this->server_name_.c_str (), server_information->startup - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->display_server_information (server_information.in ()); |