Remove obsolescent (void) in functions with no parameters

8 files changed, 22 insertions, 22 deletions

diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index 7c427559c30..b09c3d471ea 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   try
     {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
index b72e0b2835b..e2771dc35d1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
@@ -21,7 +21,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   void run_test (Test_Interceptors::Visual_ptr server);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index c1ed4d78e36..02379f9d593 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
 }
 
 int
-Server_Task::svc (void)
+Server_Task::svc ()
 {
  try
    {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
index 23dfac6b088..4d610d156c7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -27,7 +27,7 @@ public:
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
 private:
   /// Output file for IOR
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 948d7cbffa9..d3bc9c6d76f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -10,7 +10,7 @@ const char *reply_msg = "The Echo_Request_Interceptor reply message";
 CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
 CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
 
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
+Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
   : myname_ ("Echo_Client_Interceptor")
 {
 }
@@ -20,13 +20,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (void)
+Echo_Client_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (void)
+Echo_Client_Request_Interceptor::destroy ()
 {
 }
 
@@ -163,7 +163,7 @@ Echo_Client_Request_Interceptor::receive_exception (
               exception_id.in ()));
 }
 
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
+Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
   : myname_ ("Echo_Server_Interceptor")
 {
 }
@@ -173,13 +173,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (void)
+Echo_Server_Request_Interceptor::name ()
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (void)
+Echo_Server_Request_Interceptor::destroy ()
 {
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 84d7fffcbd4..48808b448be 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -24,15 +24,15 @@ class Echo_Client_Request_Interceptor
 {
   // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Client_Request_Interceptor (void);
+  Echo_Client_Request_Interceptor ();
   // ctor.
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void send_poll (
       PortableInterceptor::ClientRequestInfo_ptr);
@@ -59,15 +59,15 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
+  Echo_Server_Request_Interceptor ();
   // cotr.
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr);
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 24d6b91041f..bf3e91814a7 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -22,21 +22,21 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (void)
+Visual_i::user ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
   throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (void)
+Visual_i::system ()
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (void)
+Visual_i::shutdown ()
 {
   this->_remove_ref ();
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
index 6029ec925fd..5a33574f133 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
@@ -30,11 +30,11 @@ public:
                          CORBA::Long one,
                          CORBA::Long two);
 
-  void user (void);
+  void user ();
 
-  void system (void);
+  void system ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB pointer (for shutdown.)