Remove obsolescent (void) in functions with no parameters

52 files changed, 143 insertions, 143 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
index 6ef8f1f9542..d6c91c8e1a2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
@@ -9,20 +9,20 @@ Test_i::Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate(orb))
 }
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return 1;
 }
 
 void
-Test_i::terminate (void)
+Test_i::terminate ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received terminate and going to exit\n"));
   exit (0);
 }
 
 void
-Test_i::shutdown (void)
+Test_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown and going to exit\n"));
   orb_->shutdown ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
index 65826facc02..558200f8429 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
@@ -13,11 +13,11 @@ class  Test_i : public virtual POA_Test
 {
 public:
   Test_i (CORBA::ORB_ptr orb);
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
-  virtual void terminate (void);
+  virtual void terminate ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
index 45a56ca1902..d07865512f6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
@@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base
 {
 public:
   explicit ORB_Runner (CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) {}
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
@@ -49,7 +49,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs (void)
+activatePOAs ()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
index 7ac20a171bc..126f3aa8207 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
@@ -5,16 +5,16 @@ bug_689_regression_i::bug_689_regression_i (CORBA::ORB_ptr orb)
 {
 }
 
-bug_689_regression_i::~bug_689_regression_i (void)
+bug_689_regression_i::~bug_689_regression_i ()
 {
 }
 
 void
-bug_689_regression_i::shutdown (void)
+bug_689_regression_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
 
-void bug_689_regression_i::noop (void)
+void bug_689_regression_i::noop ()
 {
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
index 700e4bac6d3..a03bbf4ae0c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
@@ -7,11 +7,11 @@ class bug_689_regression_i: public POA_bug_689_regression
 {
 public:
   bug_689_regression_i (CORBA::ORB_ptr orb);
-  ~bug_689_regression_i (void);
+  ~bug_689_regression_i ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
-  virtual void noop (void);
+  virtual void noop ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
index 82931fecd4a..01466a89e1a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
@@ -21,14 +21,14 @@ public:
   {
   }
 
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ++n_;
     return n_;
   }
 };
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
   : server_name_()
   , second_name_()
 {
@@ -157,7 +157,7 @@ Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
index 8f1b13af35b..52f0b223f14 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h
@@ -11,12 +11,12 @@
 class Server_i
 {
 public:
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int argc, ACE_TCHAR **argv);
 
-  int run (void);
+  int run ();
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
index 3fa4c48d90d..f745ab49a69 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
@@ -17,7 +17,7 @@ PortableInterceptor::Current_var pic;
 PortableInterceptor::SlotId slot_id;
 const IOP::ServiceId service_id = 0xdeadbeef;
 
-int get_offset (void)
+int get_offset ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, ofs_lock, 0);
   int r = ofs;
@@ -33,7 +33,7 @@ public:
   Worker (Messenger_ptr m)
     : messenger(Messenger::_duplicate (m)) {}
 
-  int svc (void)
+  int svc ()
   {
     int offset = get_offset ();
     CORBA::String_var message = CORBA::string_dup( "Hello!" );
@@ -74,12 +74,12 @@ class Client_Req_Int
     public virtual ::CORBA::LocalObject
 {
 public:
-  virtual char * name (void)
+  virtual char * name ()
   {
     return CORBA::string_dup ("Client_Req_Int");
   }
 
-  virtual void destroy (void)
+  virtual void destroy ()
   {
   }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
index c1a7320f7d7..016356a7212 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp
@@ -18,7 +18,7 @@ Test_i::Test_i (Terminator &terminator)
 }
 
 // Implementation skeleton destructor
-Test_i::~Test_i (void)
+Test_i::~Test_i ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
index c84ce4087c6..95366a3b870 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h
@@ -19,7 +19,7 @@ public:
   Test_i (Terminator &terminator);
 
   //Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
index d8074e356af..0f72129c222 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp
@@ -12,7 +12,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 }
 
 int
-ORB_Task::svc (void)
+ORB_Task::svc ()
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index 147819b1617..60d7cf51eb5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -18,7 +18,7 @@ class Client_Task : public ACE_Task_Base
       caught_object_not_exist_ (false)
     {}
 
-    virtual int svc (void)
+    virtual int svc ()
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       ACE_Time_Value elapsed;
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
index 6a76a9bc053..90f4fe3953e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
@@ -2,37 +2,37 @@
 #include "ace/OS_NS_time.h"
 
 // Implementation skeleton constructor
-Test_Dummy_i::Test_Dummy_i (void)
+Test_Dummy_i::Test_Dummy_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Dummy_i::~Test_Dummy_i (void)
+Test_Dummy_i::~Test_Dummy_i ()
 {
 }
 
-char * Test_Dummy_i::getMessage (void)
+char * Test_Dummy_i::getMessage ()
 {
    // Add your implementation here
    return CORBA::string_dup("Test::Dummy---->Hello World");
 }
 
-Test_Time_i::Test_Time_i (void)
+Test_Time_i::Test_Time_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Time_i::~Test_Time_i (void)
+Test_Time_i::~Test_Time_i ()
 {
 }
 
-::CORBA::Long Test_Time_i::current_time (void)
+::CORBA::Long Test_Time_i::current_time ()
 {
    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n"));
    return CORBA::Long (ACE_OS::time (0));
 }
 
-void Test_Time_i::shutdown (void)
+void Test_Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%C\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index 536c7fe81a8..96ac6c0c134 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -12,12 +12,12 @@ class  Test_Dummy_i
 {
 public:
   // Constructor
-  Test_Dummy_i (void);
+  Test_Dummy_i ();
 
   // Destructor
-  virtual ~Test_Dummy_i (void);
+  virtual ~Test_Dummy_i ();
 
-  virtual  char * getMessage (void);
+  virtual  char * getMessage ();
 };
 
 class  Test_Time_i
@@ -25,14 +25,14 @@ class  Test_Time_i
 {
 public:
   // Constructor
-  Test_Time_i (void);
+  Test_Time_i ();
 
   // Destructor
-  virtual ~Test_Time_i (void);
+  virtual ~Test_Time_i ();
 
-  virtual ::CORBA::Long current_time (void);
+  virtual ::CORBA::Long current_time ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 #endif /* IMR_RECONNECTSERVER_H  */
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
index adc92c4336a..e07dd513d64 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
@@ -2,37 +2,37 @@
 #include "ace/OS_NS_time.h"
 
 // Implementation skeleton constructor
-Test_Dummy_i::Test_Dummy_i (void)
+Test_Dummy_i::Test_Dummy_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Dummy_i::~Test_Dummy_i (void)
+Test_Dummy_i::~Test_Dummy_i ()
 {
 }
 
-char * Test_Dummy_i::getMessage (void)
+char * Test_Dummy_i::getMessage ()
 {
    // Add your implementation here
    return CORBA::string_dup("Test::Dummy---->Hello World");
 }
 
-Test_Time_i::Test_Time_i (void)
+Test_Time_i::Test_Time_i ()
 {
 }
 
 // Implementation skeleton destructor
-Test_Time_i::~Test_Time_i (void)
+Test_Time_i::~Test_Time_i ()
 {
 }
 
-::CORBA::Long Test_Time_i::current_time (void)
+::CORBA::Long Test_Time_i::current_time ()
 {
    ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n"));
    return CORBA::Long (ACE_OS::time (0));
 }
 
-void Test_Time_i::shutdown (void)
+void Test_Time_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
index 53cef409396..30f78bed6e1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
@@ -13,12 +13,12 @@ class  Test_Dummy_i
 {
 public:
   // Constructor
-  Test_Dummy_i (void);
+  Test_Dummy_i ();
 
   // Destructor
-  virtual ~Test_Dummy_i (void);
+  virtual ~Test_Dummy_i ();
 
-  virtual  char * getMessage (void);
+  virtual  char * getMessage ();
 };
 
 class  Test_Time_i
@@ -26,14 +26,14 @@ class  Test_Time_i
 {
 public:
   // Constructor
-  Test_Time_i (void);
+  Test_Time_i ();
 
   // Destructor
-  virtual ~Test_Time_i (void);
+  virtual ~Test_Time_i ();
 
-  virtual ::CORBA::Long current_time (void);
+  virtual ::CORBA::Long current_time ();
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 };
 
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
index cbbdf490f3e..0dd19725ef2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
@@ -21,7 +21,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator)
 }
 
 // Implementation skeleton destructor
-Messenger_i::~Messenger_i (void)
+Messenger_i::~Messenger_i ()
 {
 }
 
@@ -47,7 +47,7 @@ Messenger_i::abort (CORBA::Short delay_secs)
 }
 
 void
-Messenger_i::shutdown (void)
+Messenger_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
index b9735f7c344..a27199fc3a3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
@@ -19,7 +19,7 @@ public:
   Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator);
 
   //Destructor
-  virtual ~Messenger_i (void);
+  virtual ~Messenger_i ();
 
   virtual CORBA::Boolean send_message (
     const char * user_name,
@@ -28,7 +28,7 @@ public:
 
   virtual void abort (CORBA::Short delay_secs);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 1fb635fa185..e9af2b8fcab 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -6,7 +6,7 @@
 
 
 // Constructor.
-Airplane_Client_i::Airplane_Client_i (void)
+Airplane_Client_i::Airplane_Client_i ()
   : argc_ (0),
     argv_ (0),
     server_key_ (ACE::strnew (ACE_TEXT("key0"))),
@@ -19,7 +19,7 @@ Airplane_Client_i::Airplane_Client_i (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Airplane_Client_i::parse_args (void)
+Airplane_Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:k:"));
   int c;
@@ -87,7 +87,7 @@ Airplane_Client_i::run ()
   return this->get_planes (this->loop_count_);
 }
 
-Airplane_Client_i::~Airplane_Client_i (void)
+Airplane_Client_i::~Airplane_Client_i ()
 {
   // Free resources
   CORBA::release (this->server_);
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
index 38262d362fd..7978e2c9329 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
@@ -29,8 +29,8 @@ class Airplane_Client_i
 {
 public:
   // = Constructor and destructor.
-  Airplane_Client_i (void);
-  ~Airplane_Client_i (void);
+  Airplane_Client_i ();
+  ~Airplane_Client_i ();
 
   /// Execute client example code.
   int run ();
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Ask the Paper Airplane Server for <count> planes.
   int get_planes (size_t count);
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 5a258383764..a624bc710de 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -13,7 +13,7 @@ Airplane_i::Airplane_i ()
 
 // Destructor
 
-Airplane_i::~Airplane_i (void)
+Airplane_i::~Airplane_i ()
 {
   // Nothing
 }
@@ -22,7 +22,7 @@ Airplane_i::~Airplane_i (void)
 // Returns a random plane and page number
 
 char *
-Airplane_i::get_plane (void)
+Airplane_i::get_plane ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 7856da64539..aaa7b985bda 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -42,10 +42,10 @@ public:
   Airplane_i ();
 
   /// Destructor
-  ~Airplane_i (void);
+  ~Airplane_i ();
 
   /// Returns a random plane.
-  virtual char *get_plane (void);
+  virtual char *get_plane ();
 };
 
 #endif /* AIRPLANE_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 30041bb9188..7b76fea438c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -14,7 +14,7 @@
 // The server name of the Aiprlane Server
 const char SERVER_NAME[] = "airplane_server";
 
-Airplane_Server_i::Airplane_Server_i (void)
+Airplane_Server_i::Airplane_Server_i ()
   : argc_ (0),
     argv_ (0),
     orb_ (),
@@ -30,7 +30,7 @@ Airplane_Server_i::Airplane_Server_i (void)
 }
 
 int
-Airplane_Server_i::parse_args (void)
+Airplane_Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:s:p:"));
   int c;
@@ -186,7 +186,7 @@ Airplane_Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Airplane_Server_i::run (void)
+Airplane_Server_i::run ()
 {
   try
     {
@@ -213,7 +213,7 @@ Airplane_Server_i::run (void)
   return 0;
 }
 
-Airplane_Server_i::~Airplane_Server_i (void)
+Airplane_Server_i::~Airplane_Server_i ()
 {
   delete this->server_impl_;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index d3c15ad3e94..d0bca514509 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -28,20 +28,20 @@ class Airplane_Server_i
 {
 public:
   /// Default constructor
-  Airplane_Server_i (void);
+  Airplane_Server_i ();
 
   /// Destructor
-  ~Airplane_Server_i (void);
+  ~Airplane_Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Number of command line arguments.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
index dd57ca7633d..d2b1849e3ac 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
@@ -15,13 +15,13 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::arm (void)
+Test_i::arm ()
 {
   this->armed_ = true;
 }
 
 void
-Test_i::trigger (void)
+Test_i::trigger ()
 {
   if (this->armed_)
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
index 4012e77da02..bc8e00c029a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
@@ -18,9 +18,9 @@ public:
   //Destructor
   virtual ~Test_i ();
 
-  virtual void arm (void);
+  virtual void arm ();
 
-  virtual void trigger (void);
+  virtual void trigger ();
 
   int exit_code () const;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
index 9112930c37a..64238368882 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
@@ -78,7 +78,7 @@ set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& to)
 }
 
 void
-do_restart_test (void)
+do_restart_test ()
 {
   CORBA::Object_var obj = orb->string_to_object (ior);
   ACE_ASSERT (!CORBA::is_nil(obj.in ()));
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
index f21f9e4d9af..b8b27e8c9a6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
@@ -26,7 +26,7 @@ Test_i::~Test_i ()
 }
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return this->server_num_;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
index c5ba93916d3..c106fa0e3e0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
@@ -23,7 +23,7 @@ public:
   //Destructor
   virtual ~Test_i ();
 
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
 private:
   void reset (PortableServer::POAManager_var &mgr, bool pause);
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
index d460ac4f087..e58eb515e65 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
@@ -47,7 +47,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
index a8f4c8691e3..f80fc476126 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
@@ -3,13 +3,13 @@
 #include "Test_i.h"
 
 CORBA::Short
-Test_i::get_server_num (void)
+Test_i::get_server_num ()
 {
   return 1;
 }
 
 void
-Test_i::terminate (void)
+Test_i::terminate ()
 {
   exit (0);
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
index 984bc38669f..b5ae6dc04cf 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
@@ -12,9 +12,9 @@
 class  Test_i : public virtual POA_Test
 {
 public:
-  virtual CORBA::Short get_server_num (void);
+  virtual CORBA::Short get_server_num ();
 
-  virtual void terminate (void);
+  virtual void terminate ();
 };
 
 #endif /* TEST_I_H_ */
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
index 293ae2579d8..9c2027df62c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
@@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base
 {
 public:
   ORB_Runner (CORBA::ORB_var orb) : orb_(orb) {}
-  int svc (void)
+  int svc ()
   {
     this->orb_->run ();
     return 0;
@@ -51,7 +51,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs (void)
+activatePOAs ()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
index 72c61382265..4a44f3048b1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
@@ -4,7 +4,7 @@
 #include "Test_i.h"
 
 CORBA::Long
-Test_i::server_pid (void)
+Test_i::server_pid ()
 {
   ACE_DEBUG ((LM_DEBUG, "(%P) server pid called\n"));
   return ACE_OS::getpid ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
index 77af1927e0d..58cc9f0a2ec 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
@@ -12,7 +12,7 @@
 class  Test_i : public virtual POA_Test
 {
 public:
-  virtual CORBA::Long server_pid (void);
+  virtual CORBA::Long server_pid ();
 };
 
 #endif /* TEST_I_H_ */
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
index 68068af2900..dc946f2142c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
@@ -40,7 +40,7 @@ createPOAs (ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
index 7269ac7ff9a..35ca8593ce2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
@@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 void
-do_test (void)
+do_test ()
 {
   CORBA::Object_var obj = orb->string_to_object (ior);
   Test_var test = Test::_narrow( obj.in () );
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
index 460050bc9ec..ccd4fe70e9b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
@@ -3,7 +3,7 @@
 #include "test_i.h"
 #include "ace/Log_Msg.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
 {
 }
 
@@ -12,7 +12,7 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::contact (void)
+Test_i::contact ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) Server contacted\n")));
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
index fdf55c85fd1..725882cf677 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
@@ -13,12 +13,12 @@ class  Test_i : public virtual POA_Test
 {
 public:
   //Constructor
-  Test_i (void);
+  Test_i ();
 
   //Destructor
-  virtual ~Test_i (void);
+  virtual ~Test_i ();
 
-  virtual void contact (void);
+  virtual void contact ();
 
 private:
 };
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index b755dbd223c..600d36516af 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -6,7 +6,7 @@
 
 
 // Constructor.
-Nestea_Client_i::Nestea_Client_i (void)
+Nestea_Client_i::Nestea_Client_i ()
   : argc_ (0)
   , argv_ (0)
   , server_key_ (ACE::strnew (ACE_TEXT("key0")))
@@ -19,7 +19,7 @@ Nestea_Client_i::Nestea_Client_i (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Nestea_Client_i::parse_args (void)
+Nestea_Client_i::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dsn:k:"));
   int c;
@@ -83,7 +83,7 @@ Nestea_Client_i::run ()
   return 0;
 }
 
-Nestea_Client_i::~Nestea_Client_i (void)
+Nestea_Client_i::~Nestea_Client_i ()
 {
   // Free resources
   CORBA::release (this->server_);
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
index 31c39f7fa7e..589ce0e3290 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
@@ -29,8 +29,8 @@ class Nestea_Client_i
 {
 public:
   // = Constructor and destructor.
-  Nestea_Client_i (void);
-  ~Nestea_Client_i (void);
+  Nestea_Client_i ();
+  ~Nestea_Client_i ();
 
   /// Execute client example code.
   int run ();
@@ -40,7 +40,7 @@ public:
 
 private:
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index bfc07642af8..f2e7dddaf24 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -22,7 +22,7 @@ Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename)
 }
 
 
-Nestea_i::~Nestea_i (void)
+Nestea_i::~Nestea_i ()
 {
   delete [] this->data_filename_;
 }
@@ -62,7 +62,7 @@ Nestea_i::crush (CORBA::Long cans)
 // Returns the number of cans in the bookshelf.
 
 CORBA::Long
-Nestea_i::bookshelf_size (void)
+Nestea_i::bookshelf_size ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n"));
@@ -73,7 +73,7 @@ Nestea_i::bookshelf_size (void)
 // Returns comments about your collection.
 
 char *
-Nestea_i::get_praise (void)
+Nestea_i::get_praise ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n"));
@@ -91,7 +91,7 @@ Nestea_i::get_praise (void)
 }
 
 void
-Nestea_i::shutdown (void)
+Nestea_i::shutdown ()
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Nestea_i::shutdown\n"));
@@ -102,7 +102,7 @@ Nestea_i::shutdown (void)
 // Saves bookshelf data to a file.
 
 int
-Nestea_i::save_data (void)
+Nestea_i::save_data ()
 {
   ACE_FILE_IO file;
   ACE_FILE_Connector connector;
@@ -128,7 +128,7 @@ Nestea_i::save_data (void)
 // Loads bookshelf data from a file.
 
 int
-Nestea_i::load_data (void)
+Nestea_i::load_data ()
 {
   ACE_FILE_IO file;
   ACE_FILE_Connector connector;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 3d3dcb1cad5..2c713a6e7d3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -39,7 +39,7 @@ public:
   Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename = ACE_TEXT("nestea.dat"));
 
   /// Destructor
-  virtual ~Nestea_i (void);
+  virtual ~Nestea_i ();
 
   /// Add <cans> number of cans to the bookshelf.
   virtual void drink (CORBA::Long cans);
@@ -48,18 +48,18 @@ public:
   virtual void crush (CORBA::Long cans);
 
   /// Returns the number of cans in the bookshelf.
-  virtual CORBA::Long bookshelf_size (void);
+  virtual CORBA::Long bookshelf_size ();
 
   /// Returns comments about your collection.
-  virtual char *get_praise (void);
+  virtual char *get_praise ();
 
-  virtual void shutdown(void);
+  virtual void shutdown();
 private:
   /// Saves bookshelf data to a file.
-  int save_data (void);
+  int save_data ();
 
   /// Loads bookshelf data from a file.
-  int load_data (void);
+  int load_data ();
 
   /// The name of the file to store the data in.
   ACE_TCHAR *data_filename_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 5499a7b070d..e53975115f0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -31,13 +31,13 @@ Nestea_Server_i::Nestea_Server_i (const char * /*filename*/)
   // Nothing
 }
 
-Nestea_Server_i::~Nestea_Server_i (void)
+Nestea_Server_i::~Nestea_Server_i ()
 {
   delete this->server_impl_;
 }
 
 int
-Nestea_Server_i::parse_args (void)
+Nestea_Server_i::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:"));
   int c;
@@ -192,7 +192,7 @@ Nestea_Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Nestea_Server_i::run (void)
+Nestea_Server_i::run ()
 {
   int status = 0;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index 523234cfb51..6101c21333a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -32,17 +32,17 @@ public:
   Nestea_Server_i (const char *filename = "nestea.dat");
 
   /// Destructor
-  ~Nestea_Server_i (void);
+  ~Nestea_Server_i ();
 
   /// Initialize the Server state - parsing arguments and waiting
   int init (int argc, ACE_TCHAR **argv);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Number of command line arguments.
   int argc_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
index 069f2f15399..ee6d0e6ea32 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
@@ -3,7 +3,7 @@
 #include "Test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-Test_i::Test_i (void)
+Test_i::Test_i ()
   : count_ (0)
 {
 }
@@ -13,14 +13,14 @@ Test_i::~Test_i ()
 }
 
 void
-Test_i::foo (void)
+Test_i::foo ()
 {
   ACE_DEBUG ((LM_DEBUG,"foo called\n"));
   ++this->count_;
 }
 
 CORBA::Short
-Test_i::get_call_count (void)
+Test_i::get_call_count ()
 {
   CORBA::Short r = this->count_;
   this->count_ = 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
index 0745ee56fd7..bb117cfc247 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
@@ -15,14 +15,14 @@ class  Test_i : public virtual POA_Test
 {
 public:
   //Constructor
-  Test_i (void);
+  Test_i ();
 
   //Destructor
   virtual ~Test_i ();
 
-  virtual void foo (void);
+  virtual void foo ();
 
-  virtual CORBA::Short get_call_count (void);
+  virtual CORBA::Short get_call_count ();
 
 private:
   CORBA::Short count_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
index 954d2d8c587..e62303e7d49 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
@@ -37,7 +37,7 @@ createPOAs(ACE_CString &base)
 }
 
 void
-activatePOAs(void)
+activatePOAs()
 {
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   mgr->activate ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 283eaaf36c0..d8031c07815 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -11,7 +11,7 @@ Ping_Death_Request_Interceptor::Ping_Death_Request_Interceptor (int *counter)
 {
 }
 
-Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor (void)
+Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor ()
 {
 }
 
@@ -22,13 +22,13 @@ Ping_Death_Request_Interceptor::set_poa (PortableServer::POA_ptr poa)
 }
 
 char *
-Ping_Death_Request_Interceptor::name (void)
+Ping_Death_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Ping_Death_Request_Interceptor::destroy (void)
+Ping_Death_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
index 913e58f89c1..9b1644338b2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
@@ -31,9 +31,9 @@ public:
   void set_poa (PortableServer::POA_ptr poa);
 
   // Canonical name of the interceptor.
-  virtual char * name (void);
+  virtual char * name ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index e2b30ccbff4..619b9f46068 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -21,7 +21,7 @@ public:
   }
   virtual ~test_i () {
   }
-  virtual CORBA::Long get (void)
+  virtual CORBA::Long get ()
   {
     ++n_;
     CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
@@ -38,7 +38,7 @@ public:
 // The server name of the Aiprlane Server
 static const char DEFAULT_SERVER_NAME[] = "TestObject";
 
-Server_i::Server_i (void)
+Server_i::Server_i ()
 : server_name_(DEFAULT_SERVER_NAME)
 , count_(1)
 {
@@ -163,7 +163,7 @@ Server_i::init (int argc, ACE_TCHAR** argv)
 }
 
 int
-Server_i::run (void)
+Server_i::run ()
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 1fbf4d27f2b..e7c6e2f8793 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -10,12 +10,12 @@
 class Server_i
 {
 public:
-  Server_i (void);
-  ~Server_i (void);
+  Server_i ();
+  ~Server_i ();
 
   int init (int argc, ACE_TCHAR **argv);
 
-  int run (void);
+  int run ();
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv[]);