diff options
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index 146b3685b8b..56f611ccf5a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -883,7 +883,8 @@ ImR_Activator_i::init (ACE_ENV_SINGLE_ARG_DECL) if (reactor != 0) { - if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1) + if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, + reactor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, "The ACE_Process_Manager didnt get initialized\n"), @@ -902,10 +903,11 @@ ImR_Activator_i::init (ACE_ENV_SINGLE_ARG_DECL) // We need to send the list of our persisted server names to the Locator // so that it knows we are managing them. - auto_ptr<Server_Repository::HASH_IMR_MAP::ITERATOR> server_iter(this->repository_.new_iterator()); + auto_ptr<Server_Repository::HASH_IMR_MAP::ITERATOR> + server_iter(this->repository_.new_iterator()); if (server_iter.get () == 0) { - ACE_THROW (CORBA::NO_MEMORY ()); + ACE_THROW_RETURN (CORBA::NO_MEMORY (), -1); } ImplementationRepository::Locator::ServerNameList server_names; server_names.length(this->repository_.get_repository_size()); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 997c7200e81..0a231e9134f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -317,7 +317,7 @@ ImR_Locator_i::register_activator (const char* activator, // object_ref is set to the removed activator. void ImR_Locator_i::unregister_activator (const char * activator, - CORBA::Long token + CORBA::Long /* token */ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { |