Removed redundant void

146 files changed, 177 insertions, 177 deletions

diff --git a/TAO/tests/Alt_Mapping/options.cpp b/TAO/tests/Alt_Mapping/options.cpp
index fc146142491..923d6ed5fa7 100644
--- a/TAO/tests/Alt_Mapping/options.cpp
+++ b/TAO/tests/Alt_Mapping/options.cpp
@@ -127,7 +127,7 @@ Options::read_ior (ACE_TCHAR *filename)
 }
 
 char const *
-Options::param_test_ior (void) const
+Options::param_test_ior () const
 {
   return this->ior_.in ();
 }
@@ -151,13 +151,13 @@ Options::loop_count (void)
 }
 
 CORBA::Boolean
-Options::debug (void) const
+Options::debug () const
 {
   return this->debug_;
 }
 
 CORBA::Boolean
-Options::shutdown (void) const
+Options::shutdown () const
 {
   return this->shutdown_;
 }
diff --git a/TAO/tests/Alt_Mapping/options.h b/TAO/tests/Alt_Mapping/options.h
index 67596279459..8a6796c3cef 100644
--- a/TAO/tests/Alt_Mapping/options.h
+++ b/TAO/tests/Alt_Mapping/options.h
@@ -49,7 +49,7 @@ public:
   int parse_args (int argc, ACE_TCHAR **argv);
 
   /// return the IOR for the servant
-  char const * param_test_ior (void) const;
+  char const * param_test_ior () const;
 
   /// what test to run
   TEST_TYPE test_type (void);
@@ -61,10 +61,10 @@ public:
   CORBA::ULong loop_count (void);
 
   /// whether debug option is on or not
-  CORBA::Boolean debug (void) const;
+  CORBA::Boolean debug () const;
 
   /// If we should request the server to shutdown.
-  CORBA::Boolean shutdown (void) const;
+  CORBA::Boolean shutdown () const;
 
 private:
   /// Function to read the servant IOR from a file.
diff --git a/TAO/tests/Alt_Mapping/ub_string.cpp b/TAO/tests/Alt_Mapping/ub_string.cpp
index fc24fb6afd1..a1cb328c8a5 100644
--- a/TAO/tests/Alt_Mapping/ub_string.cpp
+++ b/TAO/tests/Alt_Mapping/ub_string.cpp
@@ -29,7 +29,7 @@ Test_Unbounded_String::~Test_Unbounded_String (void)
 }
 
 const char *
-Test_Unbounded_String::opname (void) const
+Test_Unbounded_String::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Alt_Mapping/ub_string.h b/TAO/tests/Alt_Mapping/ub_string.h
index f3d12300da0..7326aa8f5de 100644
--- a/TAO/tests/Alt_Mapping/ub_string.h
+++ b/TAO/tests/Alt_Mapping/ub_string.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Alt_Mapping_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Alt_Mapping_ptr objref);
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
index f282ddcd698..95673f39d4b 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
@@ -33,7 +33,7 @@ Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence (
 }
 
 const char *
-Test_Unbounded_Struct_Sequence::opname (void) const
+Test_Unbounded_Struct_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.h b/TAO/tests/Alt_Mapping/ub_struct_seq.h
index d4bc70446ce..973f9a0f186 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.h
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Alt_Mapping_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Alt_Mapping_ptr objref);
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index a0f249fbe80..9824af20cbb 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -71,7 +71,7 @@ public:
   ~Handler (void) {};
 
   /// Get the reply count
-  long reply_count (void) const
+  long reply_count () const
   {
     return reply_count_.value ();
   }
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 3947b758e4c..7b5cb6645c6 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -14,7 +14,7 @@ Coordinator::~Coordinator (void)
 }
 
 int
-Coordinator::has_all_peers (void) const
+Coordinator::has_all_peers () const
 {
   return this->peer_count_ == this->peer_max_;
 }
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 04c4f1fbd32..72e79a9389e 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -15,7 +15,7 @@ public:
 
 
   /// Check if all the peers have registered already
-  int has_all_peers (void) const;
+  int has_all_peers () const;
 
   /// Check a session on each peer
   void create_session_list (Test::Session_Control_ptr session_control,
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index 5d22fa39b08..5f205cd73a8 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -209,7 +209,7 @@ Session::destroy (void)
 }
 
 int
-Session::more_work (void) const
+Session::more_work () const
 {
   if (this->expected_messages_ > 0
       || this->active_thread_count_ > 0
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 7dad8676bc4..13fe7148e09 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -46,7 +46,7 @@ private:
   void terminate (CORBA::Boolean success);
 
   /// Return 1 if all the work in this session has been completed
-  int more_work (void) const;
+  int more_work () const;
 
   /// Make sure that all threads have connections avaiable to the
   /// other sessions.
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index cacbbd889db..bccb40f881d 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -7,7 +7,7 @@ Session_Control::Session_Control (CORBA::ULong session_count)
 }
 
 int
-Session_Control::all_sessions_finished (void) const
+Session_Control::all_sessions_finished () const
 {
   return this->session_count_ == 0;
 }
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index edb4799cc78..7b7791f5f67 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -20,7 +20,7 @@ public:
   virtual ~Session_Control (void);
 
   /// Return 1 when all sessions have finished
-  int all_sessions_finished (void) const;
+  int all_sessions_finished () const;
 
   // = The skeleton methods
   virtual void session_finished (CORBA::Boolean success);
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index 2dee638293e..df1cd5a53b2 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -28,7 +28,7 @@ Client_Task::Client_Task (ACE_Thread_Manager *thr_mgr,
 }
 
 bool
-Client_Task::done(void) const
+Client_Task::done() const
 {
   if (tasks_running_ == 0)
     return done_;
@@ -38,7 +38,7 @@ Client_Task::done(void) const
 }
 
 const char *
-Client_Task::ID (void) const
+Client_Task::ID () const
 {
   return id_.c_str ();
 }
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index 4bd2b296eef..0b130075d98 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -30,8 +30,8 @@ public:
   /// Thread entry point
   int svc (void);
 
-  bool done(void) const;
-  const char *ID (void) const;
+  bool done() const;
+  const char *ID () const;
 
 private:
   /// Make sure that all threads have connections available to
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index e00cf0ba178..7813458813f 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -14,7 +14,7 @@ Coordinator::~Coordinator (void)
 }
 
 int
-Coordinator::has_all_peers (void) const
+Coordinator::has_all_peers () const
 {
   return this->peer_count_ == this->peer_max_;
 }
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index 82b169f6b7e..15809cba47e 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -14,7 +14,7 @@ public:
   Coordinator (CORBA::ULong peer_count);
 
   /// Check if all the peers have registered already
-  int has_all_peers (void) const;
+  int has_all_peers () const;
 
   /// Check a session on each peer
   void create_session_list (Test::Session_Control_ptr session_control,
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 3e0e27a2a68..13edf85c678 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -195,7 +195,7 @@ Session::destroy (void)
 }
 
 int
-Session::more_work (void) const
+Session::more_work () const
 {
   if (this->expected_messages_ > 0
       || this->active_thread_count_ > 0
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 1ba68b85b77..7ee8c297f2e 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -45,7 +45,7 @@ private:
   void terminate (CORBA::Boolean success);
 
   /// Return 1 if all the work in this session has been completed
-  int more_work (void) const;
+  int more_work () const;
 
   /// Validate all the connections
   void validate_connections (void);
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index 5fcd3cfe35f..027bd658625 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -7,7 +7,7 @@ Session_Control::Session_Control (CORBA::ULong session_count)
 }
 
 int
-Session_Control::all_sessions_finished (void) const
+Session_Control::all_sessions_finished () const
 {
   return this->session_count_ == 0;
 }
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index edb4799cc78..7b7791f5f67 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -20,7 +20,7 @@ public:
   virtual ~Session_Control (void);
 
   /// Return 1 when all sessions have finished
-  int all_sessions_finished (void) const;
+  int all_sessions_finished () const;
 
   // = The skeleton methods
   virtual void session_finished (CORBA::Boolean success);
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
index 7960342ab5a..ad02084fb96 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
@@ -28,13 +28,13 @@ Sender_i::send_ready_message (void)
 }
 
 CORBA::ULong
-Sender_i::get_number_received (void) const
+Sender_i::get_number_received () const
 {
   return number_received_;
 }
 
 CORBA::ULong
-Sender_i::get_active_objects (void) const
+Sender_i::get_active_objects () const
 {
   return active_objects_;
 }
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h
index 0a18875b1ff..fc561ccfdd4 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.h
+++ b/TAO/tests/Bug_2677_Regression/DllORB.h
@@ -12,7 +12,7 @@ public:
   DllORB (void);
   virtual ~DllORB (void);
 
-  CORBA::ORB_ptr orb (void) const;
+  CORBA::ORB_ptr orb () const;
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h
index de48025da89..24dae5c923e 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.h
@@ -16,7 +16,7 @@ public:
   DllOrb (void);
   virtual ~DllOrb (void);
 
-  CORBA::ORB_ptr orb (void) const { return CORBA::ORB::_duplicate(mv_orb_.in()); }
+  CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); }
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 2e9a80a1bfe..44221124f40 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -201,7 +201,7 @@ public:
   Test_Resource_Factory ()
   {}
 
-  virtual ACE_Reactor_Impl* allocate_reactor_impl (void) const
+  virtual ACE_Reactor_Impl* allocate_reactor_impl () const
   {
     ACE_Reactor_Impl *impl = 0;
     ACE_NEW_RETURN (impl,
@@ -248,12 +248,12 @@ public:
   }
 
 protected:
-  virtual bool successful_i (void) const
+  virtual bool successful_i () const
   {
     return this->state_ == TAO_LF_Event::LFS_SUCCESS;
   }
 
-  virtual bool error_detected_i (void) const
+  virtual bool error_detected_i () const
   {
     return (this->state_ == TAO_LF_Event::LFS_FAILURE
             || this->state_ == TAO_LF_Event::LFS_TIMEOUT
@@ -264,7 +264,7 @@ protected:
     this->state_ = new_state;
   }
 
-  virtual bool is_state_final (void) const
+  virtual bool is_state_final () const
   {
     if (this->state_ == TAO_LF_Event::LFS_TIMEOUT ||
         this->state_ == TAO_LF_Event::LFS_FAILURE)
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h
index 1030d5b022d..5e320d6f9e9 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.h
@@ -16,7 +16,7 @@ public:
   DllOrb (void);
   virtual ~DllOrb (void);
 
-  CORBA::ORB_ptr orb (void) const { return CORBA::ORB::_duplicate(mv_orb_.in()); }
+  CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); }
 
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/Bug_3597_Regression/server.cpp b/TAO/tests/Bug_3597_Regression/server.cpp
index 30d0588d9c4..23276610023 100644
--- a/TAO/tests/Bug_3597_Regression/server.cpp
+++ b/TAO/tests/Bug_3597_Regression/server.cpp
@@ -19,7 +19,7 @@ public:
 
   virtual ssize_t log (ACE_Log_Record &log_record);
 
-  bool ok (void) const;
+  bool ok () const;
 
 private:
   bool ok_;
@@ -52,7 +52,7 @@ Backend::log (ACE_Log_Record &)
 }
 
 bool
-Backend::ok (void) const
+Backend::ok () const
 {
   return this->ok_;
 }
diff --git a/TAO/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp
index d28e168eedf..9b7d558812c 100644
--- a/TAO/tests/Bug_3953_Regression/client.cpp
+++ b/TAO/tests/Bug_3953_Regression/client.cpp
@@ -21,7 +21,7 @@ public:
                server_ptr s);
   int svc (void);
 
-  bool exception (void) const;
+  bool exception () const;
 
 private:
   client_var client_;
diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp
index 2fb5b3cd48c..dbe5c1ac4f4 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.cpp
+++ b/TAO/tests/Bug_3953_Regression/server_i.cpp
@@ -17,7 +17,7 @@ server_i::start (client_ptr c,
 }
 
 bool
-server_i::exception (void) const
+server_i::exception () const
 {
   return this->exception_;
 }
diff --git a/TAO/tests/Bug_3953_Regression/server_i.h b/TAO/tests/Bug_3953_Regression/server_i.h
index c8605f01478..7aa8275ab28 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.h
+++ b/TAO/tests/Bug_3953_Regression/server_i.h
@@ -13,7 +13,7 @@ public:
 
   void shutdown (void);
 
-  bool exception (void) const;
+  bool exception () const;
 private:
   int quiet_;
   // Be quiet.
diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp
index 33c6bae4274..bd29e654510 100644
--- a/TAO/tests/Client_Leaks/Client_Task.cpp
+++ b/TAO/tests/Client_Leaks/Client_Task.cpp
@@ -10,7 +10,7 @@ Client_Task::Client_Task (Test::Process_Factory_ptr process_factory,
 }
 
 int
-Client_Task::successful_calls (void) const
+Client_Task::successful_calls () const
 {
   return this->successful_calls_;
 }
diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h
index fb03f4a5bc7..a8da84944ea 100644
--- a/TAO/tests/Client_Leaks/Client_Task.h
+++ b/TAO/tests/Client_Leaks/Client_Task.h
@@ -19,7 +19,7 @@ public:
                int iterations);
 
   /// Return the total number of successful calls
-  int successful_calls (void) const;
+  int successful_calls () const;
 
   /// Thread entry point
   int svc (void);
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 1bc74d3fe5a..53128689442 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -31,7 +31,7 @@ Test_DynAny::~Test_DynAny (void)
 }
 
 const char*
-Test_DynAny::test_name (void) const
+Test_DynAny::test_name () const
 {
   return this->test_name_;
 }
diff --git a/TAO/tests/DynAny_Test/test_dynany.h b/TAO/tests/DynAny_Test/test_dynany.h
index d4bca09a771..c04e394ed54 100644
--- a/TAO/tests/DynAny_Test/test_dynany.h
+++ b/TAO/tests/DynAny_Test/test_dynany.h
@@ -21,7 +21,7 @@ public:
   Test_DynAny (CORBA::ORB_var orb, int debug);
   ~Test_DynAny (void);
 
-  const char* test_name (void) const;
+  const char* test_name () const;
 
   int run_test (void);
 
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index cd275a1d9a2..18a43659558 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -30,7 +30,7 @@ Test_DynArray::~Test_DynArray (void)
 }
 
 const char*
-Test_DynArray::test_name (void) const
+Test_DynArray::test_name () const
 {
   return this->test_name_;
 }
diff --git a/TAO/tests/DynAny_Test/test_dynarray.h b/TAO/tests/DynAny_Test/test_dynarray.h
index 9796ce4e693..50367b2a930 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.h
+++ b/TAO/tests/DynAny_Test/test_dynarray.h
@@ -20,7 +20,7 @@ public:
   Test_DynArray (CORBA::ORB_var orb, int debug);
   ~Test_DynArray (void);
 
-  const char* test_name (void) const;
+  const char* test_name () const;
 
   int run_test (void);
 
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 494522dc89d..9980259db9b 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -31,7 +31,7 @@ Test_DynEnum::~Test_DynEnum (void)
 }
 
 const char*
-Test_DynEnum::test_name (void) const
+Test_DynEnum::test_name () const
 {
   return this->test_name_;
 }
diff --git a/TAO/tests/DynAny_Test/test_dynenum.h b/TAO/tests/DynAny_Test/test_dynenum.h
index 4b4d2c9b44c..e6714028824 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.h
+++ b/TAO/tests/DynAny_Test/test_dynenum.h
@@ -20,7 +20,7 @@ public:
   Test_DynEnum (CORBA::ORB_var orb, int debug);
   ~Test_DynEnum (void);
 
-  const char* test_name (void) const;
+  const char* test_name () const;
 
   int run_test (void);
 
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 3c8eb33be0b..441ded57aca 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -61,7 +61,7 @@ Test_DynSequence::~Test_DynSequence (void)
 }
 
 const char*
-Test_DynSequence::test_name (void) const
+Test_DynSequence::test_name () const
 {
   return this->test_name_;
 }
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.h b/TAO/tests/DynAny_Test/test_dynsequence.h
index 327402b7e71..afe325722a6 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.h
+++ b/TAO/tests/DynAny_Test/test_dynsequence.h
@@ -20,7 +20,7 @@ public:
   Test_DynSequence (CORBA::ORB_var orb, int debug);
   ~Test_DynSequence (void);
 
-  const char* test_name (void) const;
+  const char* test_name () const;
 
   int run_test (void);
 
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1d7151f0eb4..915835bfa73 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -31,7 +31,7 @@ Test_DynStruct::~Test_DynStruct (void)
 }
 
 const char*
-Test_DynStruct::test_name (void) const
+Test_DynStruct::test_name () const
 {
   return this->test_name_;
 }
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.h b/TAO/tests/DynAny_Test/test_dynstruct.h
index a8b41721f7a..408d626dda8 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.h
+++ b/TAO/tests/DynAny_Test/test_dynstruct.h
@@ -20,7 +20,7 @@ public:
   Test_DynStruct (CORBA::ORB_var orb, int debug);
   ~Test_DynStruct (void);
 
-  const char* test_name (void) const;
+  const char* test_name () const;
 
   int run_test (void);
 
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index f95ecd1e332..f51f05ec3b9 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -30,7 +30,7 @@ Test_DynUnion::~Test_DynUnion (void)
 }
 
 const char*
-Test_DynUnion::test_name (void) const
+Test_DynUnion::test_name () const
 {
   return this->test_name_;
 }
diff --git a/TAO/tests/DynAny_Test/test_dynunion.h b/TAO/tests/DynAny_Test/test_dynunion.h
index deae61b0f60..77ddc0eeef2 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.h
+++ b/TAO/tests/DynAny_Test/test_dynunion.h
@@ -20,7 +20,7 @@ public:
   Test_DynUnion (CORBA::ORB_var orb, int debug);
   ~Test_DynUnion (void);
 
-  const char* test_name (void) const;
+  const char* test_name () const;
 
   int run_test (void);
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index 8f7a80057a5..d6ba365e769 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
@@ -21,7 +21,7 @@ public:
 
   virtual void shutdown (void);
 
-  int get_count (void) const;
+  int get_count () const;
 
 public:
   int count_;
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
index f7b15e2132c..25d0748febd 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
@@ -21,7 +21,7 @@ public:
 
   virtual void shutdown (void);
 
-  int get_count (void) const;
+  int get_count () const;
 
 public:
   int count_;
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index 80d96c756be..f7f449f47b6 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -84,7 +84,7 @@ public:
     cout << "Server: Descriptors::leak did not saturate fdset" << endl;
   }
 
-  bool ok (void) const
+  bool ok () const
   {
     return this->ok_;
   }
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 97770fe0546..4d22dcf690a 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -22,19 +22,19 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb,
 }
 
 int
-Client_Task::successful_calls (void) const
+Client_Task::successful_calls () const
 {
   return this->successful_calls_;
 }
 
 int
-Client_Task::timed_out_calls (void) const
+Client_Task::timed_out_calls () const
 {
   return this->timed_out_calls_;
 }
 
 int
-Client_Task::too_big_difference_calls (void) const
+Client_Task::too_big_difference_calls () const
 {
   return this->too_big_difference_;
 }
diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h
index 59bd1886a34..9bde5efdf45 100644
--- a/TAO/tests/MT_Timeout/Client_Task.h
+++ b/TAO/tests/MT_Timeout/Client_Task.h
@@ -38,14 +38,14 @@ public:
                CORBA::ULong timeout);
 
   /// Return the total number of successful calls
-  int successful_calls (void) const;
+  int successful_calls () const;
 
   /// Return the total number of timed out calls
-  int timed_out_calls (void) const;
+  int timed_out_calls () const;
 
   /// Return the number of calls with a too huge difference in
   /// timeout versus actual response arrival.
-  int too_big_difference_calls (void) const;
+  int too_big_difference_calls () const;
 
   /// Thread entry point
   int svc (void);
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
index 883d6c025a5..a3082202111 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
@@ -28,7 +28,7 @@ class DllOrb_Export DllOrb
     /// Destructor.
     ~DllOrb (void) throw ();
 
-    CORBA::ORB_ptr orb (void) const;
+    CORBA::ORB_ptr orb () const;
 
     virtual int init (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
index 4adee3cc6d7..ec627e5e18e 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
@@ -33,7 +33,7 @@ public:
   virtual ~Abstract_Worker (void);
   virtual int test_main (int argc,
                     ACE_TCHAR *argv[]) = 0;
-  virtual const ACE_TCHAR * kind (void) const = 0;
+  virtual const ACE_TCHAR * kind () const = 0;
 protected:
   ACE_TString ior_file_;
 };
@@ -47,7 +47,7 @@ public:
   Server_Worker ();
   ~Server_Worker (void);
   int test_main (int argc, ACE_TCHAR *argv[]);
-  const ACE_TCHAR * kind (void) const;
+  const ACE_TCHAR * kind () const;
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -62,7 +62,7 @@ public:
   Client_Worker ();
   ~Client_Worker (void);
   int test_main (int argc, ACE_TCHAR *argv[]);
-  const ACE_TCHAR * kind (void) const;
+  const ACE_TCHAR * kind () const;
 
 private:
   int parse_args (int argc, ACE_TCHAR *argv[]);
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index d5717fabb68..ca2e889c6c6 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -12,7 +12,7 @@ Client_Worker::Client_Worker ()
 }
 
 const ACE_TCHAR *
-Client_Worker::kind (void) const
+Client_Worker::kind () const
 {
   return ACE_TEXT ("Client");
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index 98caf3d4143..0323af204ae 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -13,7 +13,7 @@ Server_Worker::Server_Worker ()
 
 //
 const ACE_TCHAR *
-Server_Worker::kind (void) const
+Server_Worker::kind () const
 {
   return ACE_TEXT ("Server");
 }
diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
index 6e8ad2850e8..48d00ac8139 100644
--- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
+++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
@@ -40,17 +40,17 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt
         }
     };
 
-  size_t command_line_directives_count (void) const
+  size_t command_line_directives_count () const
   {
     return this->svc_queue_->size ();
   };
 
-  size_t service_config_files_count (void) const
+  size_t service_config_files_count () const
   {
     return this->svc_conf_file_queue_->size ();
   };
 
-  size_t services_count (void) const
+  size_t services_count () const
   {
     return this->repo_->current_size ();
   };
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index 1f1c34d115e..d6d92f509fa 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -310,7 +310,7 @@ DatabaseImpl::Employee::~Employee (void)
 }
 
 const char *
-DatabaseImpl::Employee::name (void) const
+DatabaseImpl::Employee::name () const
 {
   return this->name_;
 }
@@ -328,7 +328,7 @@ DatabaseImpl::Employee::name (const char* name)
 }
 
 CORBA::Long
-DatabaseImpl::Employee::id (void) const
+DatabaseImpl::Employee::id () const
 {
   return this->id_;
 }
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index b4da8da23ae..4bfdc8c8714 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -106,10 +106,10 @@ public:
 
     ~Employee (void);
 
-    const char *name (void) const;
+    const char *name () const;
     void name (const char* name);
 
-    CORBA::Long id (void) const;
+    CORBA::Long id () const;
     void id (CORBA::Long id);
 
 #if defined (ACE_HAS_NEW_NOTHROW)
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
index f84623cbe4f..c80c4284949 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
@@ -2,7 +2,7 @@
 #include "ace/WFMO_Reactor.h"
 
 ACE_Reactor_Impl *
-My_Resource_Factory::allocate_reactor_impl (void) const
+My_Resource_Factory::allocate_reactor_impl () const
 {
   errno = 0;
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
index 206c0a1ee8b..1b5094621f8 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
@@ -4,7 +4,7 @@
 class Alt_Resource_Factory_Export My_Resource_Factory : public TAO_Default_Resource_Factory
 {
 public:
-  ACE_Reactor_Impl *allocate_reactor_impl (void) const;
+  ACE_Reactor_Impl *allocate_reactor_impl () const;
 };
 
 ACE_FACTORY_DECLARE (Alt_Resource_Factory, My_Resource_Factory)
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 3500f89a4a7..3fd3c35123a 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -34,7 +34,7 @@ Test_Any::~Test_Any (void)
 }
 
 const char *
-Test_Any::opname (void) const
+Test_Any::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index 13d2b14703d..b0515dfb0ef 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -45,7 +45,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 266bca9e168..665479c78e3 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -36,7 +36,7 @@ Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence (void)
 }
 
 const char *
-Test_Bounded_Array_Sequence::opname (void) const
+Test_Bounded_Array_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h
index bd915a975f1..aa65c023b62 100644
--- a/TAO/tests/Param_Test/bd_array_seq.h
+++ b/TAO/tests/Param_Test/bd_array_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 195cad52c53..7354e5c44b6 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -33,7 +33,7 @@ Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence (void)
 }
 
 const char *
-Test_Bounded_Long_Sequence::opname (void) const
+Test_Bounded_Long_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index 525104c9351..fc0c65c72c6 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 6f896872412..4e0a2cf1bbd 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -33,7 +33,7 @@ Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence (void)
 }
 
 const char *
-Test_Bounded_Short_Sequence::opname (void) const
+Test_Bounded_Short_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index 0819447f430..f148bba9f5a 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index fc9dd8cce61..a7a4f410df2 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -33,7 +33,7 @@ Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence (void)
 }
 
 const char *
-Test_Bounded_String_Sequence::opname (void) const
+Test_Bounded_String_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index da9bb7a65c1..1b4fb023039 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index ce5976ddbab..66f62ecaf4f 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -41,7 +41,7 @@ Test_Bounded_String::~Test_Bounded_String (void)
 }
 
 const char *
-Test_Bounded_String::opname (void) const
+Test_Bounded_String::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index d9088cf2c7f..a7202b49cac 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 7a4cae63357..c91122d68ab 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -36,7 +36,7 @@ Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence (void)
 }
 
 const char *
-Test_Bounded_Struct_Sequence::opname (void) const
+Test_Bounded_Struct_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index 6f61d2a4b6c..bbda8071ff4 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 345f99c5133..544840dd110 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -34,7 +34,7 @@ Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence (void)
 }
 
 const char *
-Test_Bounded_WString_Sequence::opname (void) const
+Test_Bounded_WString_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h
index d190e6b8493..c9a754dde2e 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.h
+++ b/TAO/tests/Param_Test/bd_wstr_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index e756b2ae028..eab4463dedc 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -42,7 +42,7 @@ Test_Bounded_WString::~Test_Bounded_WString (void)
 }
 
 const char *
-Test_Bounded_WString::opname (void) const
+Test_Bounded_WString::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h
index 666230f90d9..7c691d97a4f 100644
--- a/TAO/tests/Param_Test/bd_wstring.h
+++ b/TAO/tests/Param_Test/bd_wstring.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index f03f3c91d50..044f92400d0 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -31,7 +31,7 @@ Test_Big_Union::~Test_Big_Union (void)
 }
 
 const char *
-Test_Big_Union::opname (void) const
+Test_Big_Union::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h
index 7a69d326b78..07e4deb5422 100644
--- a/TAO/tests/Param_Test/big_union.h
+++ b/TAO/tests/Param_Test/big_union.h
@@ -35,7 +35,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 7d3330c2258..7696218e2e5 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -39,7 +39,7 @@ Test_Complex_Any::~Test_Complex_Any (void)
 }
 
 const char *
-Test_Complex_Any::opname (void) const
+Test_Complex_Any::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h
index 8b43e72e771..b0ac49b1ecc 100644
--- a/TAO/tests/Param_Test/complex_any.h
+++ b/TAO/tests/Param_Test/complex_any.h
@@ -33,7 +33,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 616ef6659d6..d8760f9f6ef 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -33,7 +33,7 @@ Test_Exception::~Test_Exception (void)
 }
 
 const char *
-Test_Exception::opname (void) const
+Test_Exception::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index 726c7d97f4a..6bb02bd3d81 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -28,7 +28,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index 45f86f6f59d..b4e9cf443e7 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -30,7 +30,7 @@ Test_Fixed_Array::~Test_Fixed_Array (void)
 }
 
 const char *
-Test_Fixed_Array::opname (void) const
+Test_Fixed_Array::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index 7bfa844260a..f6cec4953e6 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index d8eea89b958..ad71a5f7a03 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -29,7 +29,7 @@ Test_Fixed_Struct::~Test_Fixed_Struct (void)
 }
 
 const char *
-Test_Fixed_Struct::opname (void) const
+Test_Fixed_Struct::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index 06e2685149d..ac0393a0303 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index 7a260e9fe93..4711438c044 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -34,7 +34,7 @@ Test_Multdim_Array::~Test_Multdim_Array (void)
 }
 
 const char *
-Test_Multdim_Array::opname (void) const
+Test_Multdim_Array::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h
index 340584fe9dd..af149eafb9e 100644
--- a/TAO/tests/Param_Test/multdim_array.h
+++ b/TAO/tests/Param_Test/multdim_array.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index b3f52f871a0..1424ce43835 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -34,7 +34,7 @@ Test_Nested_Struct::~Test_Nested_Struct (void)
 }
 
 const char *
-Test_Nested_Struct::opname (void) const
+Test_Nested_Struct::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index 75f44a1e616..2ca813c4142 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 0532a9e23e5..e879993797b 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -29,7 +29,7 @@ Test_ObjRef::~Test_ObjRef (void)
 }
 
 const char *
-Test_ObjRef::opname (void) const
+Test_ObjRef::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index f9934729b77..9f2aa04c937 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 41c48a99846..454cfb7b059 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -34,7 +34,7 @@ Test_Objref_Struct::~Test_Objref_Struct (void)
 }
 
 const char *
-Test_Objref_Struct::opname (void) const
+Test_Objref_Struct::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index 06757a3241c..a7b8fb748a3 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index 52dc12bd4ba..6db5429ab92 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -194,7 +194,7 @@ Options::read_ior (ACE_TCHAR *filename)
 }
 
 char const *
-Options::param_test_ior (void) const
+Options::param_test_ior () const
 {
   return this->ior_.in ();
 }
@@ -218,13 +218,13 @@ Options::loop_count (void)
 }
 
 CORBA::Boolean
-Options::debug (void) const
+Options::debug () const
 {
   return this->debug_;
 }
 
 CORBA::Boolean
-Options::shutdown (void) const
+Options::shutdown () const
 {
   return this->shutdown_;
 }
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index c96104fc824..1659ce72f23 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -83,7 +83,7 @@ public:
   int parse_args (int argc, ACE_TCHAR **argv);
 
   /// return the IOR for the servant
-  char const * param_test_ior (void) const;
+  char const * param_test_ior () const;
 
   /// what test to run
   TEST_TYPE test_type (void);
@@ -95,10 +95,10 @@ public:
   CORBA::ULong loop_count (void);
 
   /// whether debug option is on or not
-  CORBA::Boolean debug (void) const;
+  CORBA::Boolean debug () const;
 
   /// If we should request the server to shutdown.
-  CORBA::Boolean shutdown (void) const;
+  CORBA::Boolean shutdown () const;
 
 private:
   /// Function to read the servant IOR from a file.
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index e1c09e1bce0..83f03893c24 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -34,7 +34,7 @@ Test_Recursive_Struct::~Test_Recursive_Struct (void)
 }
 
 const char *
-Test_Recursive_Struct::opname (void) const
+Test_Recursive_Struct::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h
index b75de8f4494..3e4141324a1 100644
--- a/TAO/tests/Param_Test/recursive_struct.h
+++ b/TAO/tests/Param_Test/recursive_struct.h
@@ -34,7 +34,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 131bd96766a..3b19bc3033e 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -33,7 +33,7 @@ Test_Recursive_Union::~Test_Recursive_Union (void)
 }
 
 const char *
-Test_Recursive_Union::opname (void) const
+Test_Recursive_Union::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h
index dc8263bc8d6..8b62bfea172 100644
--- a/TAO/tests/Param_Test/recursive_union.h
+++ b/TAO/tests/Param_Test/recursive_union.h
@@ -33,7 +33,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 36848f636c4..3cf8c0d1d84 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -29,7 +29,7 @@ Test_Short::~Test_Short (void)
 }
 
 const char *
-Test_Short::opname (void) const
+Test_Short::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index c4880a118c1..3434515f78e 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index 4f2053fe554..a1f64a7c57c 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -31,7 +31,7 @@ Test_Small_Union::~Test_Small_Union (void)
 }
 
 const char *
-Test_Small_Union::opname (void) const
+Test_Small_Union::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h
index 0666aaa0526..5a0479ba21c 100644
--- a/TAO/tests/Param_Test/small_union.h
+++ b/TAO/tests/Param_Test/small_union.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index c610acd0abd..0e478e64972 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -29,7 +29,7 @@ Test_TypeCode::~Test_TypeCode (void)
 }
 
 const char *
-Test_TypeCode::opname (void) const
+Test_TypeCode::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index 66a4cff0e6a..93c83c58b7d 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index 5787515235c..d922962b7b5 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -37,7 +37,7 @@ Test_AnySeq::~Test_AnySeq (void)
 }
 
 const char *
-Test_AnySeq::opname (void) const
+Test_AnySeq::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index 335d49a1af7..50e8431a480 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index 509654d394f..f899067802b 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -34,7 +34,7 @@ Test_Array_Sequence::~Test_Array_Sequence (void)
 }
 
 const char *
-Test_Array_Sequence::opname (void) const
+Test_Array_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h
index 9e8d7a3e4fb..87701ffaee7 100644
--- a/TAO/tests/Param_Test/ub_array_seq.h
+++ b/TAO/tests/Param_Test/ub_array_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 96b1429e91c..21992565ad6 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -33,7 +33,7 @@ Test_Long_Sequence::~Test_Long_Sequence (void)
 }
 
 const char *
-Test_Long_Sequence::opname (void) const
+Test_Long_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index aa184c62905..4050e7dc570 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index de8da49add5..d92d3ae9f84 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -43,7 +43,7 @@ Test_ObjRef_Sequence::~Test_ObjRef_Sequence (void)
 }
 
 const char *
-Test_ObjRef_Sequence::opname (void) const
+Test_ObjRef_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index eceffb0640e..b9165d990cb 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 50cf2c2064f..9138a7f0acf 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -33,7 +33,7 @@ Test_Short_Sequence::~Test_Short_Sequence (void)
 }
 
 const char *
-Test_Short_Sequence::opname (void) const
+Test_Short_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index dd2f0c7f75b..1105cae9bf7 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 8fc56d50925..8ca94a0121d 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -33,7 +33,7 @@ Test_String_Sequence::~Test_String_Sequence (void)
 }
 
 const char *
-Test_String_Sequence::opname (void) const
+Test_String_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index 4b5c580d06e..a4340e8c5d5 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index 8034dfcad4c..024c7b6864e 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -41,7 +41,7 @@ Test_Unbounded_String::~Test_Unbounded_String (void)
 }
 
 const char *
-Test_Unbounded_String::opname (void) const
+Test_Unbounded_String::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index 18c4990da14..d633291c015 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -30,7 +30,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 7770f7fd5f5..274b08dd5af 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -35,7 +35,7 @@ Test_Struct_Sequence::~Test_Struct_Sequence (void)
 }
 
 const char *
-Test_Struct_Sequence::opname (void) const
+Test_Struct_Sequence::opname () const
 {
   return this->opname_;
 }
@@ -232,7 +232,7 @@ Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence (void)
 }
 
 const char *
-Test_Unbounded_Struct_Sequence::opname (void) const
+Test_Unbounded_Struct_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index b3afb229bab..4c3ac7ea6db 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
@@ -93,7 +93,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index 0aff960b0c8..5a8a760fa44 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -34,7 +34,7 @@ Test_WString_Sequence::~Test_WString_Sequence (void)
 }
 
 const char *
-Test_WString_Sequence::opname (void) const
+Test_WString_Sequence::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h
index 350d4811905..8e30b16baf3 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.h
+++ b/TAO/tests/Param_Test/ub_wstr_seq.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 300589237f6..2ac6eb0a5f7 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -42,7 +42,7 @@ Test_Unbounded_WString::~Test_Unbounded_WString (void)
 }
 
 const char *
-Test_Unbounded_WString::opname (void) const
+Test_Unbounded_WString::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h
index 4198984b8e3..9363e126dc9 100644
--- a/TAO/tests/Param_Test/ub_wstring.h
+++ b/TAO/tests/Param_Test/ub_wstring.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 25d28f27068..6f17cb122cd 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -25,7 +25,7 @@ Test_ULongLong::~Test_ULongLong (void)
 }
 
 const char *
-Test_ULongLong::opname (void) const
+Test_ULongLong::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index cef67dbda49..3ac6270a6a9 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -28,7 +28,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index aabb3698ed1..ada1500d3c4 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -31,7 +31,7 @@ Test_Var_Array::~Test_Var_Array (void)
 }
 
 const char *
-Test_Var_Array::opname (void) const
+Test_Var_Array::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index 3a09358eccb..6bdfb158f99 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -31,7 +31,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index b151e26ddb2..87ceee7b536 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -34,7 +34,7 @@ Test_Var_Struct::~Test_Var_Struct (void)
 }
 
 const char *
-Test_Var_Struct::opname (void) const
+Test_Var_Struct::opname () const
 {
   return this->opname_;
 }
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index c5f18f1d19b..810060418bd 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -32,7 +32,7 @@ public:
   int run_sii_test (Param_Test_ptr objref);
 
   /// return operation name
-  const char *opname (void) const;
+  const char *opname () const;
 
   /// set values for parameters
   int init_parameters (Param_Test_ptr objref);
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index 571249c85f8..f42f292c474 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
@@ -32,7 +32,7 @@ Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *)
 }
 
 CORBA::ULong
-Echo_Handler::replies (void) const
+Echo_Handler::replies () const
 {
   return this->replies_;
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
index 4a0aca20158..da7f3446d66 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
@@ -20,7 +20,7 @@ public:
   virtual void shutdown(void);
   virtual void shutdown_excep(::Messaging::ExceptionHolder * h);
 
-  CORBA::ULong replies (void) const;
+  CORBA::ULong replies () const;
 
 private:
   CORBA::ULong replies_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
index b6ec4f91abd..696af631cbd 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
@@ -10,13 +10,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (void)
 }
 
 CORBA::ULong
-Client_Request_Interceptor::receive_exception_count (void) const
+Client_Request_Interceptor::receive_exception_count () const
 {
   return this->receive_exception_count_;
 }
 
 CORBA::ULong
-Client_Request_Interceptor::request_count (void) const
+Client_Request_Interceptor::request_count () const
 {
   return this->request_count_;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
index 8b106735713..143f7b9f0c6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
@@ -61,9 +61,9 @@ public:
       PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
-  CORBA::ULong request_count (void) const;
+  CORBA::ULong request_count () const;
 
-  CORBA::ULong receive_exception_count (void) const;
+  CORBA::ULong receive_exception_count () const;
 
 private:
   /// The number of requests intercepted by this interceptor.
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
index 9dc0cb89b6e..617fef26373 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
@@ -27,7 +27,7 @@ public:
   void run_test (Test_Interceptors::Visual_ptr server);
 
   /// The status of the svc loop
-  int status (void) const;
+  int status () const;
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
index 8306c7f8a9a..ce62b3f44da 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
@@ -30,7 +30,7 @@ public:
   int svc (void);
 
   /// The status of the svc loop
-  int status (void) const;
+  int status () const;
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
index ff9d33073a1..6490e7cd1c6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
@@ -27,7 +27,7 @@ public:
   void run_test (Test_Interceptors::Visual_ptr server);
 
   /// The status of the svc loop
-  int status (void) const;
+  int status () const;
 
 private:
   const ACE_TCHAR *input_;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
index cc5cd7a8eb6..9915f4e1969 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
@@ -30,7 +30,7 @@ public:
   int svc (void);
 
   /// The status of the svc loop
-  int status (void) const;
+  int status () const;
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 479385bf9da..097c5217a69 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -27,7 +27,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 }
 
 bool
-Smart_Test_Proxy::can_convert_to_ior (void) const
+Smart_Test_Proxy::can_convert_to_ior () const
 {
   // Even though a smart proxy is local, this one can be stringified
   return true;
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index 6059b92b107..f749b8d668c 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -15,7 +15,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual bool can_convert_to_ior (void) const;
+  virtual bool can_convert_to_ior () const;
 
   virtual char* convert_to_ior (bool use_omg_ior_format,
                                 const char* ior_prefix) const;
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index ea06ddcb33e..bcc4987e608 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -20,7 +20,7 @@ Sender::dump_results (void)
 }
 
 bool
-Sender::is_done (void) const
+Sender::is_done () const
 {
   return this->is_done_;
 }
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index d0b38efbcfa..c403ab93083 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -20,7 +20,7 @@ public:
   void dump_results (void);
 
   /// Get the status of the flag..
-  bool is_done (void) const;
+  bool is_done () const;
 
   // = The skeleton methods
   virtual CORBA::Boolean get_data (CORBA::ULong size,
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
index d46efb35454..07b0831456d 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
@@ -51,7 +51,7 @@ public:
 public:
   /// Reports if unexpected errors have been encountered for the
   /// lifetime of the instance
-  bool is_successful (void) const;
+  bool is_successful () const;
 
 private:
   void test_transport_current (void);
diff --git a/TAO/tests/Transport_Cache_Manager/mock_transport.h b/TAO/tests/Transport_Cache_Manager/mock_transport.h
index 6ad84edf323..1a383b0dd59 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_transport.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_transport.h
@@ -2,11 +2,11 @@ class mock_transport
 {
 public:
   mock_transport () : id_(0), is_connected_(false), entry_(0), purging_order_ (0), purged_count_ (0) {}
-  size_t id (void) const {return id_;}
+  size_t id () const {return id_;}
   void id (size_t id) { this->id_ = id;}
-  unsigned long purging_order (void) const {return purging_order_;}
+  unsigned long purging_order () const {return purging_order_;}
   void purging_order (unsigned long purging_order) { this->purging_order_ = purging_order;}
-  bool is_connected (void) const {return is_connected_;}
+  bool is_connected () const {return is_connected_;}
   void is_connected (bool is_connected) { this->is_connected_ = is_connected;}
   ACE_Event_Handler::Reference_Count add_reference (void) {return 0;}
   ACE_Event_Handler::Reference_Count remove_reference (void) {return 0;}