diff options
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp | 3 | ||||
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index 819f35b7f4f..3b49e2bd211 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -405,7 +405,7 @@ ImR_Activator_i::kill_server (const char* name, CORBA::Long lastpid, CORBA::Shor CORBA::Boolean ImR_Activator_i::still_alive (CORBA::Long pid) { - pid_t pt = static_cast<pid_t>(pid); + pid_t const pt = static_cast<pid_t>(pid); bool is_running = this->process_map_.find (pt) == 0; #if defined (ACE_WIN32) if (is_running) @@ -660,7 +660,6 @@ ImR_Activator_i::handle_exit (ACE_Process * process) return 0; } - int ImR_Activator_i::handle_timeout (const ACE_Time_Value &, const void * tok) { diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index 299cba88099..48fdd3544f5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -66,7 +66,7 @@ class Active_Pid_Setter; class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::ActivatorExt, public ACE_Event_Handler { - public: +public: friend class Active_Pid_Setter; ImR_Activator_i (void); @@ -96,8 +96,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac /// Shutdown the orb. void shutdown (bool signaled); - private: - +private: int init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts); void register_with_imr(ImplementationRepository::Activator_ptr activator); @@ -111,8 +110,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac bool in_upcall (void); - private: - +private: typedef ACE_Unbounded_Set<ACE_CString> UniqueServerList; typedef ACE_Hash_Map_Manager_Ex<pid_t, |