16 files changed, 111 insertions, 111 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index dcae5824b66..1a3ee36d37a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -230,7 +230,7 @@ Activator_Options::init_from_registry (void)
 }
 
 void
-Activator_Options::print_usage (void) const
+Activator_Options::print_usage () const
 {
   ORBSVCS_ERROR ((LM_ERROR,
               "Usage:\n"
@@ -393,67 +393,67 @@ Activator_Options::load_registry_options ()
 }
 
 bool
-Activator_Options::service (void) const
+Activator_Options::service () const
 {
   return this->service_;
 }
 
 bool
-Activator_Options::notify_imr (void) const
+Activator_Options::notify_imr () const
 {
   return this->notify_imr_;
 }
 
 unsigned int
-Activator_Options::induce_delay (void) const
+Activator_Options::induce_delay () const
 {
   return this->induce_delay_;
 }
 
 unsigned int
-Activator_Options::debug (void) const
+Activator_Options::debug () const
 {
   return this->debug_;
 }
 
 const ACE_TString&
-Activator_Options::ior_filename (void) const
+Activator_Options::ior_filename () const
 {
   return this->ior_output_file_;
 }
 
 Activator_Options::SERVICE_COMMAND
-Activator_Options::service_command (void) const
+Activator_Options::service_command () const
 {
   return this->service_command_;
 }
 
 const char*
-Activator_Options::cmdline (void) const
+Activator_Options::cmdline () const
 {
   return this->cmdline_.c_str ();
 }
 
 const ACE_CString&
-Activator_Options::name (void) const
+Activator_Options::name () const
 {
   return this->name_;
 }
 
 int
-Activator_Options::env_buf_len (void) const
+Activator_Options::env_buf_len () const
 {
   return this->env_buf_len_;
 }
 
 int
-Activator_Options::max_env_vars (void) const
+Activator_Options::max_env_vars () const
 {
   return this->max_env_vars_;
 }
 
 bool
-Activator_Options::detach_child (void) const
+Activator_Options::detach_child () const
 {
   return this->detach_child_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
index e68d48075fc..6149c8f469d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
@@ -54,44 +54,44 @@ public:
   int init_from_registry();
 
   /// Service Mode
-  bool service (void) const;
+  bool service () const;
 
   /// Notify the ImR when server processes die.
   /// @note Currently this only works on Unix.
-  bool notify_imr (void) const;
+  bool notify_imr () const;
 
   /// When notifying of child death, pause this number of milliseconds
   /// to simulate a heavily loaded server.
-  unsigned int induce_delay (void) const;
+  unsigned int induce_delay () const;
 
   /// Debug level for the Implementation Repository.
-  unsigned int debug (void) const;
+  unsigned int debug () const;
 
   /// Returns the file where the IOR should be stored.
-  const ACE_TString& ior_filename (void) const;
+  const ACE_TString& ior_filename () const;
 
   /// The nt service command to run (install/remove)
-  SERVICE_COMMAND service_command(void) const;
+  SERVICE_COMMAND service_command() const;
 
   /// Save the command line arguments as registry settings. (Windows only)
   int save_registry_options ();
 
-  const char* cmdline(void) const;
+  const char* cmdline() const;
 
-  const ACE_CString& name(void) const;
+  const ACE_CString& name() const;
 
-  int env_buf_len (void) const;
+  int env_buf_len () const;
 
-  int max_env_vars (void) const;
+  int max_env_vars () const;
 
-  bool detach_child (void) const;
+  bool detach_child () const;
 
 private:
   /// Parses and pulls out arguments for the ImR
   int parse_args (int &argc, ACE_TCHAR *argv[]);
 
   /// Print the usage information.
-  void print_usage (void) const;
+  void print_usage () const;
 
   /// Loads options from the registry
   int load_registry_options ();
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 513f5d2e2de..75a1cf2ce32 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -51,14 +51,14 @@ AsyncAccessManager::started_running (void)
 }
 
 bool
-AsyncAccessManager::is_terminating (void) const
+AsyncAccessManager::is_terminating () const
 {
   return this->status_ == ImplementationRepository::AAM_ACTIVE_TERMINATE ||
     remove_on_death_rh_ != 0;
 }
 
 bool
-AsyncAccessManager::is_running (void) const
+AsyncAccessManager::is_running () const
 {
   if (this->info_->is_mode (ImplementationRepository::PER_CLIENT))
     {
@@ -392,7 +392,7 @@ AsyncAccessManager::status_name (ImplementationRepository::AAM_Status s)
 }
 
 ImplementationRepository::AAM_Status
-AsyncAccessManager::status (void) const
+AsyncAccessManager::status () const
 {
   return this->status_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
index f5fa9b4d8ef..dc2d5716bf6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h
@@ -58,13 +58,13 @@ class Locator_Export AsyncAccessManager
 
   void started_running (void);
 
-  bool is_terminating (void) const;
-  bool is_running (void) const;
+  bool is_terminating () const;
+  bool is_running () const;
   bool has_server (const char *name) const;
   void remote_state (ImplementationRepository::AAM_Status s);
 
   void add_interest (ImR_ResponseHandler *rh, bool manual);
-  ImplementationRepository::AAM_Status status (void) const;
+  ImplementationRepository::AAM_Status status () const;
   bool force_remove_rh (ImR_ResponseHandler *rh);
 
   void activator_replied_start_running (bool success, int pid);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 83356ae9f9b..d9cf14c4a7d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -354,7 +354,7 @@ ImR_Locator_i::shutdown (bool wait_for_completion)
 }
 
 const Options *
-ImR_Locator_i::opts (void) const
+ImR_Locator_i::opts () const
 {
   return this->opts_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index f0c363f4c96..abc250a2aa1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -59,7 +59,7 @@ public:
   void shutdown (bool wait_for_completion);
 
   /// Access the options
-  const Options *opts (void) const;
+  const Options *opts () const;
 
   static int debug (void);
   // Note : See the IDL for descriptions of the operations.
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 310e331b8a5..a9684eabc99 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -21,7 +21,7 @@ LiveListener::~LiveListener (void)
 }
 
 const char *
-LiveListener::server (void) const
+LiveListener::server () const
 {
   return this->server_.c_str ();
 }
@@ -96,7 +96,7 @@ LiveEntry::set_reping_limit (int max)
 }
 
 bool
-LiveEntry::reping_available (void) const
+LiveEntry::reping_available () const
 {
   return this->repings_ < this->max_retry_;
 }
@@ -218,7 +218,7 @@ LiveEntry::reset_status (void)
 }
 
 LiveStatus
-LiveEntry::status (void) const
+LiveEntry::status () const
 {
   if (!this->may_ping_)
     {
@@ -308,13 +308,13 @@ LiveEntry::status (LiveStatus l)
 }
 
 const ACE_Time_Value &
-LiveEntry::next_check (void) const
+LiveEntry::next_check () const
 {
   return this->next_check_;
 }
 
 const char *
-LiveEntry::server_name (void) const
+LiveEntry::server_name () const
 {
   return this->server_.c_str();
 }
@@ -326,13 +326,13 @@ LiveEntry::set_pid (int pid)
 }
 
 int
-LiveEntry::pid (void) const
+LiveEntry::pid () const
 {
   return this->pid_;
 }
 
 bool
-LiveEntry::may_ping (void) const
+LiveEntry::may_ping () const
 {
   return this->may_ping_;
 }
@@ -685,7 +685,7 @@ LC_TimeoutGuard::~LC_TimeoutGuard (void)
     }
 }
 
-bool LC_TimeoutGuard::blocked (void) const
+bool LC_TimeoutGuard::blocked () const
 {
   return this->blocked_;
 }
@@ -757,7 +757,7 @@ LiveCheck::shutdown (void)
 }
 
 const ACE_Time_Value &
-LiveCheck::ping_interval (void) const
+LiveCheck::ping_interval () const
 {
   return this->ping_interval_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
index 4d0602ddfca..610b942a4ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
@@ -83,7 +83,7 @@ class Locator_Export LiveListener
   virtual bool status_changed (LiveStatus status) = 0;
 
   /// Accessor for the server name. Used by the LiveCheck to associate a listener
-  const char *server (void) const;
+  const char *server () const;
 
   LiveListener *_add_ref (void);
   void _remove_ref (void);
@@ -121,7 +121,7 @@ class Locator_Export LiveEntry
   void release_callback (void);
   void add_listener (LiveListener *ll);
   void remove_listener (LiveListener *ll);
-  LiveStatus status (void) const;
+  LiveStatus status () const;
   void status (LiveStatus l);
   void reset_status (void);
 
@@ -131,16 +131,16 @@ class Locator_Export LiveEntry
   void update_listeners (void);
   bool validate_ping (bool &want_reping, ACE_Time_Value &next);
   void do_ping (PortableServer::POA_ptr poa);
-  const ACE_Time_Value &next_check (void) const;
+  const ACE_Time_Value &next_check () const;
   static void set_reping_limit (int max);
-  bool reping_available (void) const;
+  bool reping_available () const;
   int next_reping (void);
   void max_retry_msec (int max);
-  const char *server_name (void) const;
+  const char *server_name () const;
   void set_pid (int pid);
   bool has_pid (int pid) const;
-  int pid (void) const;
-  bool may_ping (void) const;
+  int pid () const;
+  bool may_ping () const;
 
  private:
   LiveCheck *owner_;
@@ -225,7 +225,7 @@ class Locator_Export LC_TimeoutGuard
   ~LC_TimeoutGuard (void);
 
   /// Returns true if the in handle timeout in the owner was already set.
-  bool blocked (void) const;
+  bool blocked () const;
 
  private:
   LiveCheck *owner_;
@@ -272,7 +272,7 @@ class Locator_Export LiveCheck : public ACE_Event_Handler
   void remove_listener (LiveListener *listener);
   bool schedule_ping (LiveEntry *entry);
   LiveStatus is_alive (const char *server);
-  const ACE_Time_Value &ping_interval (void) const;
+  const ACE_Time_Value &ping_interval () const;
 
  private:
   void enter_handle_timeout (void);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index 51667657123..ae17ac4ad0a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -367,7 +367,7 @@ Options::init_from_registry (void)
 
 
 void
-Options::print_usage (void) const
+Options::print_usage () const
 {
   ORBSVCS_ERROR ((LM_ERROR,
     ACE_TEXT ("Usage:\n")
@@ -666,71 +666,71 @@ Options::load_registry_options ()
 }
 
 bool
-Options::service (void) const
+Options::service () const
 {
   return this->service_;
 }
 
 unsigned int
-Options::debug (void) const
+Options::debug () const
 {
   return this->debug_;
 }
 
 const ACE_TString&
-Options::ior_filename (void) const
+Options::ior_filename () const
 {
   return this->ior_output_file_;
 }
 
 bool
-Options::multicast (void) const
+Options::multicast () const
 {
   return this->multicast_;
 }
 
 Options::SERVICE_COMMAND
-Options::service_command(void) const
+Options::service_command() const
 {
   return this->service_command_;
 }
 
 const char*
-Options::cmdline(void) const {
+Options::cmdline() const {
   return this->cmdline_.c_str ();
 }
 
 const ACE_TString&
-Options::persist_file_name(void) const {
+Options::persist_file_name() const {
   return this->persist_file_name_;
 }
 
 ACE_Time_Value
-Options::startup_timeout (void) const
+Options::startup_timeout () const
 {
   return this->startup_timeout_;
 }
 
 bool
-Options::ping_external (void) const
+Options::ping_external () const
 {
   return this->ping_external_;
 }
 
 ACE_Time_Value
-Options::ping_interval (void) const
+Options::ping_interval () const
 {
   return this->ping_interval_;
 }
 
 ACE_Time_Value
-Options::ping_timeout (void) const
+Options::ping_timeout () const
 {
   return this->ping_timeout_;
 }
 
 LiveCheck *
-Options::pinger (void) const
+Options::pinger () const
 {
   return this->pinger_;
 }
@@ -742,55 +742,55 @@ Options::pinger (LiveCheck *p)
 }
 
 Options::RepoMode
-Options::repository_mode (void) const
+Options::repository_mode () const
 {
   return this->repo_mode_;
 }
 
 bool
-Options::repository_erase (void) const
+Options::repository_erase () const
 {
   return this->erase_repo_;
 }
 
 bool
-Options::readonly (void) const
+Options::readonly () const
 {
   return this->readonly_;
 }
 
 bool
-Options::unregister_if_address_reused (void) const
+Options::unregister_if_address_reused () const
 {
   return this->unregister_if_address_reused_;
 }
 
 bool
-Options::lockout (void) const
+Options::lockout () const
 {
   return this->lockout_;
 }
 
 bool
-Options::throw_shutdown_exceptions (void) const
+Options::throw_shutdown_exceptions () const
 {
   return this->throw_shutdown_exceptions_;
 }
 
 Options::ImrType
-Options::imr_type (void) const
+Options::imr_type () const
 {
   return this->imr_type_;
 }
 
 const ACE_CString &
-Options::ft_endpoint (void) const
+Options::ft_endpoint () const
 {
   return this->ft_endpoint_;
 }
 
 ACE_Time_Value
-Options::ft_update_delay (void) const
+Options::ft_update_delay () const
 {
   return this->ft_update_delay_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 0000bb2bc7b..ce0cb52bef6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -49,30 +49,30 @@ public:
   int init_from_registry();
 
   /// Service Mode
-  bool service (void) const;
+  bool service () const;
 
   /// Debug level for the Implementation Repository.
-  unsigned int debug (void) const;
+  unsigned int debug () const;
 
   /// Returns the file where the IOR should be stored.
-  const ACE_TString& ior_filename (void) const;
+  const ACE_TString& ior_filename () const;
 
   /// Will we listen for multicast location requests?
-  bool multicast (void) const;
+  bool multicast () const;
 
   /// The nt service command to run (install/remove)
-  SERVICE_COMMAND service_command(void) const;
+  SERVICE_COMMAND service_command() const;
 
   int save_registry_options();
 
-  const char* cmdline(void) const;
+  const char* cmdline() const;
 
   /// File that contains the activator related information
   /// that the persistent locator has to save.
-  const ACE_TString& persist_file_name(void) const;
+  const ACE_TString& persist_file_name() const;
 
   /// Do we allow modifications to the servers?
-  bool readonly (void) const;
+  bool readonly () const;
 
   /// Which type of repository is to be used?
   enum RepoMode {
@@ -82,13 +82,13 @@ public:
     REPO_HEAP_FILE,
     REPO_REGISTRY
   };
-  RepoMode repository_mode (void) const;
+  RepoMode repository_mode () const;
 
   /// Do we wish to clear out the repository
-  bool repository_erase (void) const;
+  bool repository_erase () const;
 
   /// Returns the timeout value for program starting.
-  ACE_Time_Value startup_timeout (void) const;
+  ACE_Time_Value startup_timeout () const;
 
   /// Servers may be started externally to the ImR but register with it
   /// so that clients may still be forwarded to it. Traditionally, such
@@ -99,39 +99,39 @@ public:
   /// active servers, so enabling the ping_external_ option will override
   /// the assumption of liveness and actively ping, based on the existing
   /// rules, all registered servers.
-  bool ping_external (void) const;
+  bool ping_external () const;
 
   /// If the server hasn't been verified for a while, then we'll
   /// ping it. Note : No timers are currently used. We simply ping()
   /// during indirect invocations, if this interval has elapsed.
-  ACE_Time_Value ping_interval (void) const;
+  ACE_Time_Value ping_interval () const;
 
   /// When pinging, this is the timeout
-  ACE_Time_Value ping_timeout (void) const;
+  ACE_Time_Value ping_timeout () const;
 
-  LiveCheck *pinger (void) const;
+  LiveCheck *pinger () const;
   void pinger (LiveCheck *);
 
-  bool unregister_if_address_reused (void) const;
+  bool unregister_if_address_reused () const;
 
-  bool lockout (void) const;
+  bool lockout () const;
 
-  bool throw_shutdown_exceptions (void) const;
+  bool throw_shutdown_exceptions () const;
 
   /// Indicate what type of ImR Locator this is.
   enum ImrType { BACKUP_IMR, PRIMARY_IMR, STANDALONE_IMR };
-  ImrType imr_type(void) const;
+  ImrType imr_type() const;
 
-  const ACE_CString &ft_endpoint (void) const;
+  const ACE_CString &ft_endpoint () const;
 
-  ACE_Time_Value ft_update_delay (void) const;
+  ACE_Time_Value ft_update_delay () const;
 
 private:
   /// Parses and pulls out arguments for the ImR
   int parse_args (int &argc, ACE_TCHAR *argv[]);
 
   /// Print the usage information.
-  void print_usage (void) const;
+  void print_usage () const;
 
   /// Run a service command.
   int run_service_command (const ACE_TString& cmdline);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 91a58124f98..2c41bddea40 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -651,7 +651,7 @@ Locator_Repository::servers (void)
 }
 
 const Locator_Repository::SIMap&
-Locator_Repository::servers (void) const
+Locator_Repository::servers () const
 {
   return server_infos_;
 }
@@ -663,7 +663,7 @@ Locator_Repository::activators (void)
 }
 
 const Locator_Repository::AIMap&
-Locator_Repository::activators (void) const
+Locator_Repository::activators () const
 {
   return activator_infos_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
index aef0d6c3983..45dd43ffbff 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -114,13 +114,13 @@ public:
 
   /// Returns the internal hash map containing the server information.
   SIMap& servers(void);
-  const SIMap& servers(void) const;
+  const SIMap& servers() const;
   /// Returns the internal hash map containing the activator information.
   AIMap& activators(void);
-  const AIMap& activators(void) const;
+  const AIMap& activators() const;
 
   /// Indicate the persistence mode for the repository
-  virtual const ACE_TCHAR* repo_mode(void) const = 0;
+  virtual const ACE_TCHAR* repo_mode() const = 0;
 
   /// Convert to lower case
   static ACE_CString lcase (const ACE_CString& s);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 293d0f9511a..254fbf91d31 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -105,7 +105,7 @@ Server_Info::active_info (void)
 }
 
 const Server_Info *
-Server_Info::active_info (void) const
+Server_Info::active_info () const
 {
   return this->alt_info_.null() ? this : this->alt_info_.get();
 }
@@ -123,7 +123,7 @@ Server_Info::is_mode (ImplementationRepository::ActivationMode m) const
 }
 
 ImplementationRepository::ActivationMode
-Server_Info::mode (void) const
+Server_Info::mode () const
 {
   return this->active_info ()->activation_mode_;
 }
@@ -146,7 +146,7 @@ Server_Info::is_server (const char *name) const
 }
 
 bool
-Server_Info::is_running (void) const
+Server_Info::is_running () const
 {
   return !CORBA::is_nil (this->server.in()) || this->ior.length () > 0;
 }
@@ -265,7 +265,7 @@ Server_Info::setImRInfo (ImplementationRepository::ServerInformation* info) cons
 }
 
 ImplementationRepository::ServerInformation*
-Server_Info::createImRServerInfo (void) const
+Server_Info::createImRServerInfo () const
 {
   ImplementationRepository::ServerInformation* info;
   ACE_NEW_THROW_EX (info,
@@ -325,7 +325,7 @@ Server_Info::update_options (const ImplementationRepository::StartupOptions &opt
 }
 
 const char *
-Server_Info::ping_id (void) const
+Server_Info::ping_id () const
 {
   return this->active_info ()->key_name_.c_str();
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
index 69badf3be32..069b8764293 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
@@ -53,16 +53,16 @@ struct Server_Info
 
   /// Convert to the corba type
   void setImRInfo (ImplementationRepository::ServerInformation* info) const;
-  ImplementationRepository::ServerInformation* createImRServerInfo(void) const;
+  ImplementationRepository::ServerInformation* createImRServerInfo() const;
 
   void reset_runtime (void);
 
   bool is_server (const char *name) const;
   bool has_peer (const char *name) const;
   bool is_mode (ImplementationRepository::ActivationMode m) const;
-  ImplementationRepository::ActivationMode mode (void) const;
+  ImplementationRepository::ActivationMode mode () const;
 
-  bool is_running (void) const;
+  bool is_running () const;
   bool start_allowed (void);
   void started (bool success);
 
@@ -75,9 +75,9 @@ struct Server_Info
                     ImplementationRepository::ServerObject_ptr svrobj);
 
   Server_Info *active_info (void);
-  const Server_Info *active_info (void) const;
+  const Server_Info *active_info () const;
 
-  const char * ping_id (void) const;
+  const char * ping_id () const;
 
   static bool parse_id (const char * id,
                         ACE_CString& server_id,
diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
index 9c5234063f9..daf9eb94551 100644
--- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
+++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
@@ -66,7 +66,7 @@ public:
   const Server_Info_Ptr& edit(bool active = true);
 
   /// Indicate it Server_Info_Ptr is null
-  bool null(void) const;
+  bool null() const;
 
 private:
   const UpdateableServerInfo& operator=(const UpdateableServerInfo& );
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
index 6cf01c7d8a7..8a327299054 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
@@ -47,7 +47,7 @@ public:
   virtual ~XML_Backing_Store (void);
 
   /// indicate the XML filename as the persistence mode for the repository
-  virtual const ACE_TCHAR* repo_mode (void) const;
+  virtual const ACE_TCHAR* repo_mode () const;
 
   /// create the Server_Info server object
   /// @param info the source Server_Info data