Merge pull request #1941 from knutpett/knutpett/remove_void_part2

Part 2: Remove obsolescent (void) in functions with no parameters

55 files changed, 146 insertions, 146 deletions

diff --git a/ACE/examples/APG/Containers/DataElement.h b/ACE/examples/APG/Containers/DataElement.h
index b6a5712add4..79bfe13ce78 100644
--- a/ACE/examples/APG/Containers/DataElement.h
+++ b/ACE/examples/APG/Containers/DataElement.h
@@ -36,7 +36,7 @@ public:
 
   void setData (int val) { data_ = val; }
 
-  static int numOfActiveObjects (void) { return count_; }
+  static int numOfActiveObjects () { return count_; }
 
  private:
   int data_;
diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp
index 58c092215ca..7ea76a5c9a6 100644
--- a/ACE/examples/APG/Reactor/HAStatus.cpp
+++ b/ACE/examples/APG/Reactor/HAStatus.cpp
@@ -42,7 +42,7 @@ protected:
 class ClientService : public ACE_Event_Handler
 {
 public:
-  ACE_SOCK_Stream &peer (void) { return this->sock_; }
+  ACE_SOCK_Stream &peer () { return this->sock_; }
 
   //FUZZ: disable check_for_lack_ACE_OS
   int open ();
diff --git a/ACE/examples/APG/Shared_Memory/Malloc.cpp b/ACE/examples/APG/Shared_Memory/Malloc.cpp
index 9c7e0073a04..abad7302c1d 100644
--- a/ACE/examples/APG/Shared_Memory/Malloc.cpp
+++ b/ACE/examples/APG/Shared_Memory/Malloc.cpp
@@ -29,9 +29,9 @@ public:
   }
 
   ~Record () { g_allocator->free (name_); }
-  char* name(void) { return name_; }
-  int id1 (void) { return id1_; }
-  int id2 (void) { return id2_; }
+  char* name() { return name_; }
+  int id1 () { return id1_; }
+  int id2 () { return id2_; }
 
 private:
   int id1_;
diff --git a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp
index 3ab6d0f08a2..e9da843f997 100644
--- a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp
+++ b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp
@@ -34,9 +34,9 @@ public:
 
   ~Record() { g_allocator->free (name_.addr ()); }
 
-  char *name (void) { return name_; }
-  int id1 (void) { return id1_; }
-  int id2 (void) { return id2_; }
+  char *name () { return name_; }
+  int id1 () { return id1_; }
+  int id2 () { return id2_; }
 
 private:
   int id1_;
diff --git a/ACE/examples/APG/Shared_Memory/Record.h b/ACE/examples/APG/Shared_Memory/Record.h
index 5c360524489..cdcf0a30613 100644
--- a/ACE/examples/APG/Shared_Memory/Record.h
+++ b/ACE/examples/APG/Shared_Memory/Record.h
@@ -28,9 +28,9 @@ public:
     ACE_OS::strcpy (recName_, name);
     this->name_ = recName_;
   }
-  char *name (void) { return recName_; }
-  int id1 (void) { return id1_; }
-  int id2 (void) { return id2_; }
+  char *name () { return recName_; }
+  int id1 () { return id1_; }
+  int id2 () { return id2_; }
 
 private:
   int id1_;
diff --git a/ACE/examples/APG/Streams/RecordingDevice.h b/ACE/examples/APG/Streams/RecordingDevice.h
index f060b78a904..2ca368f9ee1 100644
--- a/ACE/examples/APG/Streams/RecordingDevice.h
+++ b/ACE/examples/APG/Streams/RecordingDevice.h
@@ -35,10 +35,10 @@ public:
   }
 
   // Answer the incoming call
-  virtual int answer_call (void) = 0;
+  virtual int answer_call () = 0;
 
   // Fetch some form of caller identification at the hardware level.
-  virtual CallerId *retrieve_callerId (void) = 0;
+  virtual CallerId *retrieve_callerId () = 0;
 
   // Fetch the message at the location specified by 'addr' and play
   // it for the caller.
diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp
index 8f1172ba6e9..16288868fa6 100644
--- a/ACE/examples/APG/ThreadPools/Futures.cpp
+++ b/ACE/examples/APG/ThreadPools/Futures.cpp
@@ -80,7 +80,7 @@ class Worker;
 class IManager
 {
 public:
-  virtual ~IManager (void) { }
+  virtual ~IManager () { }
 
   virtual int return_to_work (Worker *worker) = 0;
 };
diff --git a/ACE/examples/APG/ThreadPools/ThreadPool.cpp b/ACE/examples/APG/ThreadPools/ThreadPool.cpp
index 112ca57c991..ba3b0d711ec 100644
--- a/ACE/examples/APG/ThreadPools/ThreadPool.cpp
+++ b/ACE/examples/APG/ThreadPools/ThreadPool.cpp
@@ -17,7 +17,7 @@ class Worker;
 class IManager
 {
 public:
-  virtual ~IManager (void) { }
+  virtual ~IManager () { }
 
   virtual int return_to_work (Worker *worker) = 0;
 };
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.inl b/ACE/examples/ASX/Event_Server/Event_Server/Options.inl
index ac5e90a4ab4..4ae59b39977 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.inl
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.inl
@@ -12,7 +12,7 @@ Options::supplier_port (u_short port)
 }
 
 inline u_short
-Options::supplier_port (void)
+Options::supplier_port ()
 {
   return this->supplier_port_;
 }
@@ -24,19 +24,19 @@ Options::consumer_port (u_short port)
 }
 
 inline u_short
-Options::consumer_port (void)
+Options::consumer_port ()
 {
   return this->consumer_port_;
 }
 
 inline void
-Options::start_timer (void)
+Options::start_timer ()
 {
   this->itimer_.start ();
 }
 
 inline void
-Options::stop_timer (void)
+Options::stop_timer ()
 {
   this->itimer_.stop ();
 }
@@ -48,7 +48,7 @@ Options::thr_count (size_t count)
 }
 
 inline size_t
-Options::thr_count (void)
+Options::thr_count ()
 {
   return this->thr_count_;
 }
@@ -60,7 +60,7 @@ Options::initial_queue_length (size_t length)
 }
 
 inline size_t
-Options::initial_queue_length (void)
+Options::initial_queue_length ()
 {
   return this->initial_queue_length_;
 }
@@ -72,7 +72,7 @@ Options::high_water_mark (size_t size)
 }
 
 inline size_t
-Options::high_water_mark (void)
+Options::high_water_mark ()
 {
   return this->high_water_mark_;
 }
@@ -84,7 +84,7 @@ Options::low_water_mark (size_t size)
 }
 
 inline size_t
-Options::low_water_mark (void)
+Options::low_water_mark ()
 {
   return this->low_water_mark_;
 }
@@ -96,7 +96,7 @@ Options::message_size (size_t size)
 }
 
 inline size_t
-Options::message_size (void)
+Options::message_size ()
 {
   return this->message_size_;
 }
@@ -108,7 +108,7 @@ Options::iterations (size_t n)
 }
 
 inline size_t
-Options::iterations (void)
+Options::iterations ()
 {
   return this->iterations_;
 }
@@ -120,19 +120,19 @@ Options::t_flags (long flag)
 }
 
 inline long
-Options::t_flags (void)
+Options::t_flags ()
 {
   return this->t_flags_;
 }
 
 inline int
-Options::debug (void)
+Options::debug ()
 {
   return this->debugging_;
 }
 
 inline int
-Options::verbose (void)
+Options::verbose ()
 {
   return this->verbosity_;
 }
diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
index a6ef0d47449..77c1437ff54 100644
--- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -29,7 +29,7 @@ class Common_Task : public MT_Task
   //   Methods that are common to the producer and consumer.
 {
 public:
-  Common_Task (void) {}
+  Common_Task () {}
 
   //FUZZ: disable check_for_lack_ACE_OS
   // ACE_Task hooks
@@ -43,7 +43,7 @@ public:
 class Producer : public Common_Task
 {
 public:
-  Producer (void) {}
+  Producer () {}
 
   // Read data from stdin and pass to consumer.
   virtual int svc ();
@@ -54,7 +54,7 @@ class Consumer : public Common_Task
   //    Define the Consumer interface.
 {
 public:
-  Consumer (void) {}
+  Consumer () {}
 
   virtual int put (ACE_Message_Block *mb,
                    ACE_Time_Value *tv = 0);
@@ -74,7 +74,7 @@ class Filter : public MT_Task
   //    line.
 {
 public:
-  Filter (void): count_ (1) {}
+  Filter (): count_ (1) {}
 
   virtual int put (ACE_Message_Block *mb,
                    ACE_Time_Value *tv = 0);
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.inl b/ACE/examples/ASX/UPIPE_Event_Server/Options.inl
index 8d10d96b186..8d9e9b5c663 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Options.inl
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.inl
@@ -13,7 +13,7 @@ Options::supplier_port (const ACE_TCHAR *port)
 }
 
 inline const ACE_TCHAR *
-Options::supplier_port (void)
+Options::supplier_port ()
 {
   return this->supplier_port_;
 }
@@ -25,7 +25,7 @@ Options::supplier_file (const ACE_TCHAR *file)
 }
 
 inline const ACE_TCHAR *
-Options::supplier_file (void)
+Options::supplier_file ()
 {
   return this->supplier_file_;
 }
@@ -37,7 +37,7 @@ Options::consumer_file (const ACE_TCHAR *file)
 }
 
 inline const ACE_TCHAR *
-Options::consumer_file (void)
+Options::consumer_file ()
 {
   return this->consumer_file_;
 }
@@ -49,19 +49,19 @@ Options::consumer_port (const ACE_TCHAR *port)
 }
 
 inline const ACE_TCHAR *
-Options::consumer_port (void)
+Options::consumer_port ()
 {
   return this->consumer_port_;
 }
 
 inline void
-Options::start_timer (void)
+Options::start_timer ()
 {
   this->itimer_.start ();
 }
 
 inline void
-Options::stop_timer (void)
+Options::stop_timer ()
 {
   this->itimer_.stop ();
 }
@@ -73,7 +73,7 @@ Options::thr_count (size_t count)
 }
 
 inline size_t
-Options::thr_count (void)
+Options::thr_count ()
 {
   return this->thr_count_;
 }
@@ -85,7 +85,7 @@ Options::initial_queue_length (size_t length)
 }
 
 inline size_t
-Options::initial_queue_length (void)
+Options::initial_queue_length ()
 {
   return this->initial_queue_length_;
 }
@@ -97,7 +97,7 @@ Options::high_water_mark (size_t size)
 }
 
 inline size_t
-Options::high_water_mark (void)
+Options::high_water_mark ()
 {
   return this->high_water_mark_;
 }
@@ -109,7 +109,7 @@ Options::low_water_mark (size_t size)
 }
 
 inline size_t
-Options::low_water_mark (void)
+Options::low_water_mark ()
 {
   return this->low_water_mark_;
 }
@@ -121,7 +121,7 @@ Options::message_size (size_t size)
 }
 
 inline size_t
-Options::message_size (void)
+Options::message_size ()
 {
   return this->message_size_;
 }
@@ -133,7 +133,7 @@ Options::iterations (size_t n)
 }
 
 inline size_t
-Options::iterations (void)
+Options::iterations ()
 {
   return this->iterations_;
 }
@@ -145,19 +145,19 @@ Options::t_flags (long flag)
 }
 
 inline long
-Options::t_flags (void)
+Options::t_flags ()
 {
   return this->t_flags_;
 }
 
 inline int
-Options::debug (void)
+Options::debug ()
 {
   return this->debugging_;
 }
 
 inline int
-Options::verbose (void)
+Options::verbose ()
 {
   return this->verbosity_;
 }
diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
index 1a1ac517dbb..09f17d712e1 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
@@ -215,7 +215,7 @@ public:
 protected:
   /// Creates a new message block, carrying data read from the
   /// underlying input device.
-  virtual ACE_Message_Block *create_input_message (void) = 0;
+  virtual ACE_Message_Block *create_input_message () = 0;
 
   /**
    * Sends a newly created message block, carrying data read from the
diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
index 14a289ea0c9..931ec9ea65c 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
@@ -73,10 +73,10 @@ public:
   virtual ssize_t read_input (char *buf, size_t bufsiz);
 
   /// Prints the user interface for the driver to STDERR.
-  virtual int display_menu (void)=0;
+  virtual int display_menu () = 0;
 
   /// Initializes values and operations for the driver.
-  virtual int init (void)=0;
+  virtual int init () = 0;
 
   /// Get count of packets to send in a transmission.
   u_long packet_count ();
diff --git a/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
index f4e2165b8bf..2ca3e6e97bf 100644
--- a/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
+++ b/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
@@ -67,7 +67,7 @@ public:
     : handler_ (handler), ssl_ctx_ (0), ssl_ (0) {}
 
   // Destructor frees the SSL resources.
-  virtual ~AC_CLD_Connector (void) {
+  virtual ~AC_CLD_Connector () {
     SSL_free (ssl_);
     SSL_CTX_free (ssl_ctx_);
   }
diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index abffe9238a5..3122d0a87da 100644
--- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -192,7 +192,7 @@ void AIO_Input_Handler::handle_read_stream
 
 /********************************************************/
 
-void AIO_CLD_Acceptor::close (void) {
+void AIO_CLD_Acceptor::close () {
   ACE_Unbounded_Set_Iterator<AIO_Input_Handler *>
     iter (clients_.begin ());
   AIO_Input_Handler **ih;
@@ -200,7 +200,7 @@ void AIO_CLD_Acceptor::close (void) {
     delete *ih;
 }
 
-AIO_Input_Handler * AIO_CLD_Acceptor::make_handler (void) {
+AIO_Input_Handler * AIO_CLD_Acceptor::make_handler () {
   AIO_Input_Handler *ih;
   ACE_NEW_RETURN (ih, AIO_Input_Handler (this), 0);
   if (clients_.insert (ih) == -1)
@@ -318,7 +318,7 @@ int AIO_Client_Logging_Daemon::fini () {
   return 0;
 }
 
-int AIO_Client_Logging_Daemon::svc (void) {
+int AIO_Client_Logging_Daemon::svc () {
   if (acceptor_.open (cld_addr_) == -1) return -1;
   if (CLD_CONNECTOR::instance ()->connect (sld_addr_) == 0)
     ACE_Proactor::instance ()->proactor_run_event_loop ();
diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h
index 5ab6fbc034b..351cb467962 100644
--- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h
+++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h
@@ -95,7 +95,7 @@ public:
   { open (); }
 
   // Destructor frees the SSL resources.
-  virtual ~AIO_CLD_Connector (void) {
+  virtual ~AIO_CLD_Connector () {
     SSL_free (ssl_);
     SSL_CTX_free (ssl_ctx_);
     proactor ()->cancel_timer (*this);
@@ -108,7 +108,7 @@ public:
      const ACE_INET_Addr &remote, const ACE_INET_Addr& local);
 
   // Re-establish a connection to the logging server.
-  int reconnect (void) { return connect (remote_addr_); }
+  int reconnect () { return connect (remote_addr_); }
 
 protected:
   // Hook method called on timer expiration - retry connect
diff --git a/ACE/examples/C++NPv2/TPC_Logging_Server.h b/ACE/examples/C++NPv2/TPC_Logging_Server.h
index d4628813e7d..9ae3590a512 100644
--- a/ACE/examples/C++NPv2/TPC_Logging_Server.h
+++ b/ACE/examples/C++NPv2/TPC_Logging_Server.h
@@ -30,7 +30,7 @@ public:
 
   virtual int open (void *);
 
-  virtual int svc (void) {
+  virtual int svc () {
     for (;;)
       switch (logging_handler_.log_record ()) {
       case -1: return -1; // Error.
@@ -63,7 +63,7 @@ public:
     : PARENT (r), ssl_ctx_ (0), ssl_ (0) {}
 
   // Destructor frees the SSL resources.
-  virtual ~TPC_Logging_Acceptor (void) {
+  virtual ~TPC_Logging_Acceptor () {
     SSL_free (this->ssl_);
     SSL_CTX_free (this->ssl_ctx_);
   }
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 39ee9d5d3b4..221c55d4f15 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -81,7 +81,7 @@ protected:
   // <run> methods to get the header and the buffer to read the data.
   // This method factors out common code.
 
-  virtual int run (void) = 0;
+  virtual int run () = 0;
   // Hook method called by the <svc> template method to do the actual
   // protocol.  Must be overridden by the subclass.
 
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index 8ff0fde8a55..e0a0c87b0f9 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -82,7 +82,7 @@ protected:
   // <run> methods to get the header and the buffer to read the data.
   // This method factors out common code.
 
-  virtual int run (void) = 0;
+  virtual int run () = 0;
   // Hook method called by the <svc> template method to do the actual
   // protocol.  Must be overridden by the subclass.
 
diff --git a/ACE/examples/Misc/test_dump.h b/ACE/examples/Misc/test_dump.h
index bd7bb5ff9e3..6d4a3a5c6c8 100644
--- a/ACE/examples/Misc/test_dump.h
+++ b/ACE/examples/Misc/test_dump.h
@@ -10,8 +10,8 @@
 class SOCK
 {
 public:
-  SOCK (void) { ACE_REGISTER_OBJECT (SOCK); }
-  ~SOCK (void) { ACE_REMOVE_OBJECT; }
+  SOCK () { ACE_REGISTER_OBJECT (SOCK); }
+  ~SOCK () { ACE_REMOVE_OBJECT; }
 
   void dump () const {
     ACE_DEBUG ((LM_DEBUG, "hello from SOCK = %@\n", this));
@@ -23,8 +23,8 @@ public:
 class SOCK_Acceptor : public SOCK
 {
 public:
-  SOCK_Acceptor (void) { ACE_REGISTER_OBJECT (SOCK_Acceptor); }
-  ~SOCK_Acceptor (void) { ACE_REMOVE_OBJECT; }
+  SOCK_Acceptor () { ACE_REGISTER_OBJECT (SOCK_Acceptor); }
+  ~SOCK_Acceptor () { ACE_REMOVE_OBJECT; }
 
   void dump () const {
     ACE_DEBUG ((LM_DEBUG, "hello from SOCK_Acceptor = %@\n", this));
@@ -36,8 +36,8 @@ public:
 class SOCK_Stream : public SOCK
 {
 public:
-  SOCK_Stream (void) { ACE_REGISTER_OBJECT (SOCK_Stream); }
-  ~SOCK_Stream (void) { ACE_REMOVE_OBJECT; }
+  SOCK_Stream () { ACE_REGISTER_OBJECT (SOCK_Stream); }
+  ~SOCK_Stream () { ACE_REMOVE_OBJECT; }
 
   void dump () const {
     ACE_DEBUG ((LM_DEBUG, "hello from SOCK_Stream = %@\n", this));
diff --git a/ACE/examples/Misc/test_trace.cpp b/ACE/examples/Misc/test_trace.cpp
index c2d6a5caaa0..32f062d5d85 100644
--- a/ACE/examples/Misc/test_trace.cpp
+++ b/ACE/examples/Misc/test_trace.cpp
@@ -73,7 +73,7 @@ extern "C"
 void
 exithook ()
 {
-  ACE_TRACE ("void exithook (void)");
+  ACE_TRACE ("void exithook ()");
 
   ACE_DEBUG ((LM_DEBUG,
               "we're outta here!\n"));
diff --git a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp
index 9915f0bb167..5aa6707297a 100644
--- a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp
+++ b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp
@@ -4,8 +4,8 @@
 class ACE_Test_Sig_Handler
 {
 public:
-  ACE_Test_Sig_Handler (void) {}
-  virtual ~ACE_Test_Sig_Handler (void) {}
+  ACE_Test_Sig_Handler () {}
+  virtual ~ACE_Test_Sig_Handler () {}
   virtual ACE_HANDLE get_handle () const { return 0; }
   virtual void set_handle (ACE_HANDLE) {}
   virtual int handle_async_io (ACE_HANDLE) { return 0; }
diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp
index 5c92b416e25..88419f00de5 100644
--- a/ACE/examples/Reactor/Proactor/post_completions.cpp
+++ b/ACE/examples/Reactor/Proactor/post_completions.cpp
@@ -118,10 +118,10 @@ class My_Handler : public  ACE_Handler
 {
 public:
   /// Constructor.
-  My_Handler (void) {}
+  My_Handler () {}
 
   /// Destructor.
-  virtual ~My_Handler (void) {}
+  virtual ~My_Handler () {}
 };
 
 /**
@@ -134,10 +134,10 @@ class My_Task: public ACE_Task <ACE_NULL_SYNCH>
 {
 public:
   /// Constructor.
-  My_Task (void) {}
+  My_Task () {}
 
   /// Destructor.
-  virtual ~My_Task (void) {}
+  virtual ~My_Task () {}
 
   //FUZZ: disable check_for_lack_ACE_OS
   int open (void *proactor)
diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
index 87cef5d5197..853750bbb6c 100644
--- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -42,7 +42,7 @@ public:
     {}
 
   /// Destructor.
-  virtual ~My_Task (void) {}
+  virtual ~My_Task () {}
 
   //FUZZ: disable check_for_lack_ACE_OS
   // If time_flag is zero do the eventloop indefinitely, otherwise do
diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
index d0c7da1fe4c..247dbe9e072 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
@@ -82,7 +82,7 @@ static int initial_read_size = BUFSIZ;
 class MyTask: public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  int svc (void) ;
+  int svc () ;
 };
 
 
diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
index 293d64a64e7..369d3699737 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
@@ -88,10 +88,10 @@ static u_short port = ACE_DEFAULT_SERVER_PORT;
 class MyTask: public ACE_Task<ACE_MT_SYNCH>
 {
 public:
-  MyTask (void) : threads_ (0), proactor_ (0) {}
+  MyTask () : threads_ (0), proactor_ (0) {}
 
   int svc ();
-  void waitready (void) { event_.wait (); }
+  void waitready () { event_.wait (); }
 
 private:
   ACE_Recursive_Thread_Mutex mutex_;
@@ -192,7 +192,7 @@ public:
   virtual void open (ACE_HANDLE handle,
                      ACE_Message_Block &message_block);
 
-  static long get_number_sessions (void) { return sessions_; }
+  static long get_number_sessions () { return sessions_; }
 
 protected:
   // These methods are called by the framework
diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp
index 2499d06156d..c02a4a68bf4 100644
--- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp
@@ -23,8 +23,8 @@ AcceptHandler::~AcceptHandler() {
     ACE_TRACE("AcceptHandler::~AcceptHandler()");
 }
 
-int AcceptHandler::open(void) {
-    ACE_TRACE("AcceptHandler::open(void)");
+int AcceptHandler::open() {
+    ACE_TRACE("AcceptHandler::open()");
 
     // create the local address used for the service (PORT is from common.h)
     ACE_INET_Addr addr(PORT);
@@ -52,7 +52,7 @@ int AcceptHandler::open(void) {
 }
 
 ACE_HANDLE AcceptHandler::get_handle() const {
-    ACE_TRACE("AcceptHandler::get_handle(void)");
+    ACE_TRACE("AcceptHandler::get_handle()");
     return mAcceptor.get_handle();
 }
 
diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
index 198796067e2..cb688852485 100644
--- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
@@ -44,13 +44,13 @@ ReadHandler::~ReadHandler() {
     delete[] mData;
 }
 
-ACE_SOCK_Stream &ReadHandler::getStream(void) {
-    ACE_TRACE("ReadHandler::getStream(void)");
+ACE_SOCK_Stream &ReadHandler::getStream() {
+    ACE_TRACE("ReadHandler::getStream()");
     return mStream;
 }
 
 ACE_HANDLE ReadHandler::get_handle() const {
-    ACE_TRACE("ReadHandler::get_handle(void)");
+    ACE_TRACE("ReadHandler::get_handle()");
     return mStream.get_handle();
 }
 
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl
index b043d4cc003..5347dcaec9b 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl
@@ -6,12 +6,12 @@
 #include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
-Handle_Broadcast::~Handle_Broadcast (void)
+Handle_Broadcast::~Handle_Broadcast ()
 {
 }
 
 ACE_INLINE
-Handle_Broadcast::Handle_Broadcast (void)
+Handle_Broadcast::Handle_Broadcast ()
 {
 }
 
@@ -78,7 +78,7 @@ Handle_Broadcast::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_Broadcast::fini (void)
+Handle_Broadcast::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl
index 856a2ffa99a..ef1707d6df5 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
-Handle_L_CODgram::Handle_L_CODgram (void)
+Handle_L_CODgram::Handle_L_CODgram ()
 {
 }
 
@@ -69,7 +69,7 @@ Handle_L_CODgram::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_L_CODgram::fini(void)
+Handle_L_CODgram::fini()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl
index c53e6841a64..b101c79b0ce 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
-Handle_L_Dgram::Handle_L_Dgram (void)
+Handle_L_Dgram::Handle_L_Dgram ()
 {
 }
 
@@ -71,7 +71,7 @@ Handle_L_Dgram::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_L_Dgram::fini (void)
+Handle_L_Dgram::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK);
 }
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl
index 1684001b85f..9fd9052c570 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl
@@ -7,7 +7,7 @@
 #include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
-Handle_L_FIFO::Handle_L_FIFO (void)
+Handle_L_FIFO::Handle_L_FIFO ()
 {
 }
 
@@ -70,7 +70,7 @@ Handle_L_FIFO::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_L_FIFO::fini (void)
+Handle_L_FIFO::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl
index e9bc4503657..34cca37478b 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl
@@ -5,12 +5,12 @@
 #include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
-Handle_L_Pipe::~Handle_L_Pipe (void)
+Handle_L_Pipe::~Handle_L_Pipe ()
 {
 }
 
 ACE_INLINE
-Handle_L_Pipe::Handle_L_Pipe (void)
+Handle_L_Pipe::Handle_L_Pipe ()
 {
 }
 
@@ -73,7 +73,7 @@ Handle_L_Pipe::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_L_Pipe::fini (void)
+Handle_L_Pipe::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
index 7981fb6519a..93c6fec50da 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl
@@ -12,7 +12,7 @@
 
 
 ACE_INLINE
-Handle_L_SPIPE::Handle_L_SPIPE (void)
+Handle_L_SPIPE::Handle_L_SPIPE ()
 {
 }
 
@@ -75,7 +75,7 @@ Handle_L_SPIPE::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_L_SPIPE::fini (void)
+Handle_L_SPIPE::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl
index 4cb5b66e16e..7e65e837497 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl
@@ -6,12 +6,12 @@
 #include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
-Handle_L_Stream::~Handle_L_Stream (void)
+Handle_L_Stream::~Handle_L_Stream ()
 {
 }
 
 ACE_INLINE
-Handle_L_Stream::Handle_L_Stream (void)
+Handle_L_Stream::Handle_L_Stream ()
 {
   if (Handle_L_Stream::login_name == 0) {
 #if !defined(ACE_LACKS_CUSERID)
@@ -85,7 +85,7 @@ Handle_L_Stream::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_L_Stream::fini (void)
+Handle_L_Stream::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl
index f4ac2cb07d2..3e339c733f9 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_unistd.h"
 
 ACE_INLINE
-Handle_R_Dgram::Handle_R_Dgram (void)
+Handle_R_Dgram::Handle_R_Dgram ()
 {
 }
 
@@ -64,7 +64,7 @@ Handle_R_Dgram::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_R_Dgram::fini (void)
+Handle_R_Dgram::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl
index 59582edb6a2..a61cda4cce7 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl
@@ -8,7 +8,7 @@
 #include "ace/Truncate.h"
 
 ACE_INLINE
-Handle_R_Stream::Handle_R_Stream (void)
+Handle_R_Stream::Handle_R_Stream ()
 {
   if (Handle_R_Stream::login_name == 0) {
 #if !defined(ACE_LACKS_CUSERID)
@@ -90,7 +90,7 @@ Handle_R_Stream::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_R_Stream::fini (void)
+Handle_R_Stream::fini ()
 {
   return ACE_Reactor::instance ()->remove_handler
     (this, ACE_Event_Handler::ACCEPT_MASK);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl
index ca8f917ad5b..be717e91838 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl
@@ -6,7 +6,7 @@
 #include "ace/Truncate.h"
 
 ACE_INLINE
-Handle_Timeout::Handle_Timeout (void): count (0)
+Handle_Timeout::Handle_Timeout () : count (0)
 {
 }
 
@@ -63,7 +63,7 @@ Handle_Timeout::init (int argc, ACE_TCHAR *argv[])
 }
 
 ACE_INLINE int
-Handle_Timeout::fini (void)
+Handle_Timeout::fini ()
 {
   return 0;
 }
diff --git a/ACE/examples/Shared_Malloc/test_persistence.cpp b/ACE/examples/Shared_Malloc/test_persistence.cpp
index 661d37abb30..058305ce9b3 100644
--- a/ACE/examples/Shared_Malloc/test_persistence.cpp
+++ b/ACE/examples/Shared_Malloc/test_persistence.cpp
@@ -27,7 +27,7 @@ static ACE_TCHAR backing_store[MAXPATHLEN + 1] = ACE_TEXT ("");
 class Employee
 {
 public:
-  Employee (void): name_ (0), id_ (0) {}
+  Employee () : name_ (0), id_ (0) {}
 
   Employee (const char *name, u_long id) : id_ (id)
   {
@@ -36,7 +36,7 @@ public:
     ACE_OS::strcpy (this->name_, name);
   }
 
-  ~Employee (void) { shmem_allocator->free (this->name_); }
+  ~Employee () { shmem_allocator->free (this->name_); }
 
   const char *name () const { return this->name_; }
 
@@ -84,7 +84,7 @@ private:
 class GUI_Handler
 {
 public:
-  GUI_Handler (void) { menu (); }
+  GUI_Handler () { menu (); }
 
   ~GUI_Handler ()
   {
diff --git a/ACE/examples/Smart_Pointers/Gadget.h b/ACE/examples/Smart_Pointers/Gadget.h
index 9fca7c5c22c..a6150d152bc 100644
--- a/ACE/examples/Smart_Pointers/Gadget.h
+++ b/ACE/examples/Smart_Pointers/Gadget.h
@@ -32,10 +32,10 @@ public:
   /// Remove a random part from the gadget. Responsibility for ownership of the
   /// part is automatically returned to the caller since we are returning a
   /// Gadget_Part_var.
-  virtual Gadget_Part_var remove_part (void) = 0;
+  virtual Gadget_Part_var remove_part () = 0;
 
   /// Ask the gadget to print information about the parts that it contains.
-  virtual void list_parts (void) = 0;
+  virtual void list_parts () = 0;
 };
 
 // The Gadget_var smart pointer has shared (reference counted) ownership
diff --git a/ACE/examples/Smart_Pointers/Gadget_Part.h b/ACE/examples/Smart_Pointers/Gadget_Part.h
index c2ff23b0df2..958fb039f63 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Part.h
+++ b/ACE/examples/Smart_Pointers/Gadget_Part.h
@@ -26,10 +26,10 @@ public:
   virtual ~Gadget_Part ();
 
   /// Ask the part to print information about itself.
-  virtual void print_info (void) = 0;
+  virtual void print_info () = 0;
 
   /// Ask the part to remove itself from the gadget that contains it.
-  virtual void remove_from_owner (void) = 0;
+  virtual void remove_from_owner () = 0;
 };
 
 // The Gadget_Part_var smart pointer has shared (reference counted) ownership
diff --git a/ACE/examples/Smart_Pointers/Widget.h b/ACE/examples/Smart_Pointers/Widget.h
index b838fa35877..41006fd2eab 100644
--- a/ACE/examples/Smart_Pointers/Widget.h
+++ b/ACE/examples/Smart_Pointers/Widget.h
@@ -29,10 +29,10 @@ public:
 
   /// Remove a random part from the widget. Ownership of the part is returned
   /// to the caller.
-  virtual Widget_Part *remove_part (void) = 0;
+  virtual Widget_Part *remove_part () = 0;
 
   /// Ask the widget to print information about the parts that it contains.
-  virtual void list_parts (void) = 0;
+  virtual void list_parts () = 0;
 };
 
 #endif /* WIDGET_H */
diff --git a/ACE/examples/Smart_Pointers/Widget_Part.h b/ACE/examples/Smart_Pointers/Widget_Part.h
index 818ebe7685a..4661e0b013f 100644
--- a/ACE/examples/Smart_Pointers/Widget_Part.h
+++ b/ACE/examples/Smart_Pointers/Widget_Part.h
@@ -22,10 +22,10 @@ public:
   virtual ~Widget_Part ();
 
   /// Ask the part to print information about itself.
-  virtual void print_info (void) = 0;
+  virtual void print_info () = 0;
 
   /// Ask the part to remove itself from the widget that contains it.
-  virtual void remove_from_owner (void) = 0;
+  virtual void remove_from_owner () = 0;
 };
 
 #endif /* WIDGET_PART_H */
diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/test.h b/ACE/examples/System_V_IPC/SV_Message_Queues/test.h
index a6fc1e39efc..1355d51ddff 100644
--- a/ACE/examples/System_V_IPC/SV_Message_Queues/test.h
+++ b/ACE/examples/System_V_IPC/SV_Message_Queues/test.h
@@ -22,13 +22,13 @@ public:
     ACE_OS::strncpy (this->mtext_, text, MSGSZ);
   }
 
-  long pid (void) { return this->pid_; }
+  long pid () { return this->pid_; }
   void pid (long p) { this->pid_ = p; }
-  char *user (void) { return this->username_; }
+  char *user () { return this->username_; }
   void user (char user[]) { ACE_OS::strncpy (this->username_, user, 9); }
-  char *text (void) { return this->mtext_; }
+  char *text () { return this->mtext_; }
   void text (char text[]) { ACE_OS::strncpy (this->mtext_, text, MSGSZ); }
-  int length (void) { return sizeof *this - sizeof this->mtext_ + ACE_OS::strlen (this->mtext_) + 1; }
+  int length () { return sizeof *this - sizeof this->mtext_ + ACE_OS::strlen (this->mtext_) + 1; }
 
 protected:
   long  pid_;
diff --git a/ACE/examples/Threads/TSS_Data.h b/ACE/examples/Threads/TSS_Data.h
index b676f85d30d..3ea13e5f4b1 100644
--- a/ACE/examples/Threads/TSS_Data.h
+++ b/ACE/examples/Threads/TSS_Data.h
@@ -24,7 +24,7 @@
 class TSS_Data
 {
 public:
-  void *data (void) { return this->data_; }
+  void *data () { return this->data_; }
   void data (void *v) { this->data_ = v; }
 
 private:
diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp
index 92f8387a135..20d6c54332a 100644
--- a/ACE/examples/Threads/future1.cpp
+++ b/ACE/examples/Threads/future1.cpp
@@ -166,8 +166,8 @@ class Method_Request_end : public ACE_Method_Request
 {
 public:
   Method_Request_end (Scheduler *new_scheduler): scheduler_ (new_scheduler) {}
-  virtual ~Method_Request_end (void) {}
-  virtual int call (void) { return -1; }
+  virtual ~Method_Request_end () {}
+  virtual int call () { return -1; }
 
 private:
   /// Keep track of our scheduler.
diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp
index f90f14b2382..e8e19fe5cd0 100644
--- a/ACE/examples/Threads/future2.cpp
+++ b/ACE/examples/Threads/future2.cpp
@@ -167,8 +167,8 @@ class Method_Request_end : public ACE_Method_Request
 {
 public:
   Method_Request_end (Scheduler *new_Scheduler): scheduler_ (new_Scheduler) {}
-  virtual ~Method_Request_end (void) {}
-  virtual int call (void) { return -1; }
+  virtual ~Method_Request_end () {}
+  virtual int call () { return -1; }
 
 private:
   /// Keep track of our scheduler.
diff --git a/ACE/examples/Threads/task_five.cpp b/ACE/examples/Threads/task_five.cpp
index 9122a3e060a..a999638939a 100644
--- a/ACE/examples/Threads/task_five.cpp
+++ b/ACE/examples/Threads/task_five.cpp
@@ -33,7 +33,7 @@ class Test_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
   Test_Task (ACE_Thread_Manager * = ACE_Thread_Manager::instance ());
-  ~Test_Task (void) {};
+  ~Test_Task () {};
 
   //FUZZ: disable check_for_lack_ACE_OS
   int open (void * = 0);
diff --git a/ACE/examples/Threads/thread_specific.h b/ACE/examples/Threads/thread_specific.h
index f17c21a8751..d5adaca8370 100644
--- a/ACE/examples/Threads/thread_specific.h
+++ b/ACE/examples/Threads/thread_specific.h
@@ -13,10 +13,10 @@
 class Errno
 {
 public:
-  int error (void) { return this->errno_; }
+  int error () { return this->errno_; }
   void error (int i) { this->errno_ = i; }
 
-  int line (void) { return this->lineno_; }
+  int line () { return this->lineno_; }
   void line (int l) { this->lineno_ = l; }
 
   // Errno::flags_ is a static variable, so we've got to protect it
diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp
index 4a41d84f596..74ab7782476 100644
--- a/ACE/examples/Threads/tss1.cpp
+++ b/ACE/examples/Threads/tss1.cpp
@@ -43,8 +43,8 @@ template <ACE_SYNCH_DECL>
 class Tester: public ACE_Task<ACE_SYNCH_USE>
 {
 public:
-  Tester (void) {}
-  ~Tester (void) {}
+  Tester () {}
+  ~Tester () {}
 
   virtual int svc ();
 
diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h
index 86bd29fe908..d19f4015e73 100644
--- a/ACE/examples/Timer_Queue/Driver.h
+++ b/ACE/examples/Timer_Queue/Driver.h
@@ -104,10 +104,10 @@ public:
   // = Template Methods.
 
   /// Prints the user interface for the driver to STDOUT.
-  virtual int display_menu (void)=0;
+  virtual int display_menu () = 0;
 
   /// Initializes values and operations for the driver.
-  virtual int init (void)=0;
+  virtual int init () = 0;
 
 protected:
   /// timer queue
diff --git a/ACE/examples/Web_Crawler/Command_Processor.h b/ACE/examples/Web_Crawler/Command_Processor.h
index f6bff11ff74..18fb594c0ba 100644
--- a/ACE/examples/Web_Crawler/Command_Processor.h
+++ b/ACE/examples/Web_Crawler/Command_Processor.h
@@ -36,8 +36,8 @@ public:
   virtual ~Command ();
 
   /// This is the entry point to execute the command.
-  virtual int execute (void) = 0;
-  virtual int destroy (void) = 0;
+  virtual int execute () = 0;
+  virtual int destroy () = 0;
 };
 
 /**
diff --git a/ACE/examples/Web_Crawler/URL.h b/ACE/examples/Web_Crawler/URL.h
index 9d6c517bd82..796c7bf6fd2 100644
--- a/ACE/examples/Web_Crawler/URL.h
+++ b/ACE/examples/Web_Crawler/URL.h
@@ -49,7 +49,7 @@ public:
 
   /// Send a <GET> command to fetch the contents in the URI from the
   /// server.
-  virtual ssize_t send_request (void) = 0;
+  virtual ssize_t send_request () = 0;
 
   /// Returns the URL that we represent.
   virtual const ACE_URL_Addr &url_addr () const = 0;
diff --git a/ACE/examples/Web_Crawler/URL_Visitor.h b/ACE/examples/Web_Crawler/URL_Visitor.h
index 88fcd023325..a7b9590f1fb 100644
--- a/ACE/examples/Web_Crawler/URL_Visitor.h
+++ b/ACE/examples/Web_Crawler/URL_Visitor.h
@@ -45,7 +45,7 @@ public:
   virtual ~URL_Processing_Strategy ();
 
   /// Perform the strategy.
-  virtual int execute (void) = 0;
+  virtual int execute () = 0;
 
   virtual int destroy ();
 
@@ -136,10 +136,10 @@ public:
 
   // = Factory Methods.
   /// Factory Method that makes the header iterator.
-  virtual URL_Iterator *make_header_iterator (void) = 0;
+  virtual URL_Iterator *make_header_iterator () = 0;
 
   /// Factory Method that makes the body iterator.
-  virtual URL_Iterator *make_body_iterator (void) = 0;
+  virtual URL_Iterator *make_body_iterator () = 0;
 
   /// Factory Method that makes the header processing strategy.
   virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &) = 0;
@@ -148,7 +148,7 @@ public:
   virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &) = 0;
 
   /// Close down the resources.
-  virtual int destroy (void) = 0;
+  virtual int destroy () = 0;
 
 protected:
   /// Stash the URL so we don't have to pass it around.
@@ -235,7 +235,7 @@ public:
   // virtual int visit (FTP_URL &http_url) = 0;
 
   /// Cleanup the resources.
-  virtual int destroy (void) = 0;
+  virtual int destroy () = 0;
 
 protected:
   /// Make the appropriate <URL_Visitation_Strategy_Factory>.
@@ -386,8 +386,8 @@ class Auto_Destroyer
 {
 public:
   Auto_Destroyer (T *t): t_ (t) {}
-  T *operator-> (void) { return this->t_; }
-  T *operator *(void) { return this->t_; }
+  T *operator-> () { return this->t_; }
+  T *operator *() { return this->t_; }
   void operator= (T *t)
   {
     if (this->t_ != 0)
diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h
index af0d48a8317..f56b0fc676a 100644
--- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h
+++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h
@@ -34,11 +34,11 @@ public:
   virtual ~URL_Visitor_Factory ();
 
   /// Factory Method that makes the appropriate type of <URL_Visitor>.
-  virtual URL_Visitor *make_visitor (void) = 0;
+  virtual URL_Visitor *make_visitor () = 0;
 
   /// Factory Method that makes the appropriate type of
   /// <Command_Processor>.
-  virtual Command_Processor *make_command_processor (void) = 0;
+  virtual Command_Processor *make_command_processor () = 0;
 };
 
 /**