Remove redundant void

29 files changed, 145 insertions, 145 deletions

diff --git a/ACE/ace/Addr.h b/ACE/ace/Addr.h
index e7760cd2f33..bfdea64446d 100644
--- a/ACE/ace/Addr.h
+++ b/ACE/ace/Addr.h
@@ -34,12 +34,12 @@ public:
   ACE_Addr (int type = -1, int size = -1);
 
   /// Destructor.
-  virtual ~ACE_Addr (void);
+  virtual ~ACE_Addr ();
 
   // = Get/set the size of the address.
 
   /// Return the size of the address.
-  int get_size (void) const;
+  int get_size () const;
 
   /// Sets the size of the address.
   void set_size (int size);
@@ -47,13 +47,13 @@ public:
   // = Get/set the type of the address.
 
   /// Get the type of the address.
-  int get_type (void) const;
+  int get_type () const;
 
   /// Set the type of the address.
   void set_type (int type);
 
   /// Return a pointer to the address.
-  virtual void *get_addr (void) const;
+  virtual void *get_addr () const;
 
   /// Set a pointer to the address.
   virtual void set_addr (const void *, int len);
@@ -73,10 +73,10 @@ public:
 
   /// Returns a hash value.  This should be overwritten by a subclass
   /// that can produce a better hash value.
-  virtual unsigned long hash (void) const;
+  virtual unsigned long hash () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Addr.inl b/ACE/ace/Addr.inl
index ad6f03e216a..1df00e9ab41 100644
--- a/ACE/ace/Addr.inl
+++ b/ACE/ace/Addr.inl
@@ -19,7 +19,7 @@ ACE_Addr::operator != (const ACE_Addr &sap) const
 
 /// Return the size of the address.
 ACE_INLINE int
-ACE_Addr::get_size (void) const
+ACE_Addr::get_size () const
 {
   return this->addr_size_;
 }
@@ -33,7 +33,7 @@ ACE_Addr::set_size (int size)
 
 /// Return the type of the address.
 ACE_INLINE int
-ACE_Addr::get_type (void) const
+ACE_Addr::get_type () const
 {
   return this->addr_type_;
 }
@@ -46,7 +46,7 @@ ACE_Addr::set_type (int type)
 }
 
 ACE_INLINE unsigned long
-ACE_Addr::hash (void) const
+ACE_Addr::hash () const
 {
   return 0;
 }
diff --git a/ACE/ace/FILE.h b/ACE/ace/FILE.h
index e128eda3a0d..0396afad974 100644
--- a/ACE/ace/FILE.h
+++ b/ACE/ace/FILE.h
@@ -50,14 +50,14 @@ class ACE_Export ACE_FILE : public ACE_IO_SAP
 public:
   /// Close the ACE_FILE handle without removing the ACE_FILE from
   /// the file system.
-  int close (void);
+  int close ();
 
   /// Close and remove the ACE_FILE from the file system.
-  int remove (void);
+  int remove ();
 
   /// Remove the ACE_FILE from the file system without closing the
   /// ACE_FILE handle.
-  int unlink (void);
+  int unlink ();
 
   /// Get information on this ACE_FILE.
   int get_info (ACE_FILE_Info *finfo);
@@ -83,7 +83,7 @@ public:
                   int whence = SEEK_CUR);
 
   /// Return an offset for the file handle.
-  ACE_OFF_T tell (void);
+  ACE_OFF_T tell ();
 
   /**
    * Disable signal @a signum
@@ -100,7 +100,7 @@ public:
   int get_remote_addr (ACE_Addr &) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -108,7 +108,7 @@ public:
 protected:
   /// Ensure that this class is only created by the
   /// ACE_FILE_Connector.
-  ACE_FILE (void);
+  ACE_FILE ();
 
   /// File we are "connected" with...
   ACE_FILE_Addr addr_;
diff --git a/ACE/ace/FILE_Addr.h b/ACE/ace/FILE_Addr.h
index 79c14d4cbce..bb14decca74 100644
--- a/ACE/ace/FILE_Addr.h
+++ b/ACE/ace/FILE_Addr.h
@@ -32,7 +32,7 @@ class ACE_Export ACE_FILE_Addr : public ACE_Addr
 {
 public:
   /// Default constructor.
-  ACE_FILE_Addr (void);
+  ACE_FILE_Addr ();
 
   /// Copy constructor.
   ACE_FILE_Addr (const ACE_FILE_Addr &sa);
@@ -51,7 +51,7 @@ public:
   ACE_FILE_Addr &operator= (const ACE_FILE_Addr &);
 
   /// Return a pointer to the address.
-  virtual void *get_addr (void) const;
+  virtual void *get_addr () const;
 
   /// Transform the current address into string format.
   virtual int addr_to_string (ACE_TCHAR *addr, size_t) const;
@@ -63,10 +63,10 @@ public:
   bool operator != (const ACE_FILE_Addr &SAP) const;
 
   /// Return the path name used for the rendezvous point.
-  const ACE_TCHAR *get_path_name (void) const;
+  const ACE_TCHAR *get_path_name () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FILE_Addr.inl b/ACE/ace/FILE_Addr.inl
index c873ba8b08b..828ef066669 100644
--- a/ACE/ace/FILE_Addr.inl
+++ b/ACE/ace/FILE_Addr.inl
@@ -23,7 +23,7 @@ ACE_FILE_Addr::operator != (const ACE_FILE_Addr &sap) const
 // Return the path name used for the rendezvous point.
 
 ACE_INLINE const ACE_TCHAR *
-ACE_FILE_Addr::get_path_name (void) const
+ACE_FILE_Addr::get_path_name () const
 {
   return this->filename_;
 }
diff --git a/ACE/ace/FILE_Connector.h b/ACE/ace/FILE_Connector.h
index 76e78156070..22dd23f48dd 100644
--- a/ACE/ace/FILE_Connector.h
+++ b/ACE/ace/FILE_Connector.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_FILE_Connector
 {
 public:
   /// Default constructor.
-  ACE_FILE_Connector (void);
+  ACE_FILE_Connector ();
 
   /**
    * Actively ``connect'' and produce a @a new_io ACE_FILE_IO object
@@ -90,7 +90,7 @@ public:
   bool reset_new_handle (ACE_HANDLE handle);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/FILE_IO.h b/ACE/ace/FILE_IO.h
index 371e1bda0cb..f53b02dbf5f 100644
--- a/ACE/ace/FILE_IO.h
+++ b/ACE/ace/FILE_IO.h
@@ -45,7 +45,7 @@ public:
   friend class ACE_FILE_Connector;
 
   /// Default constructor.
-  ACE_FILE_IO (void);
+  ACE_FILE_IO ();
 
   /// send upto @a n bytes in @a buf.
   ssize_t send (const void *buf, size_t n) const;
@@ -148,7 +148,7 @@ public:
                    int n) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h
index 29c87f8cf55..1388d424a97 100644
--- a/ACE/ace/INET_Addr.h
+++ b/ACE/ace/INET_Addr.h
@@ -37,7 +37,7 @@ class ACE_Export ACE_INET_Addr : public ACE_Addr
 {
 public:
   /// Default constructor.
-  ACE_INET_Addr (void);
+  ACE_INET_Addr ();
 
   /// Copy constructor.
   ACE_INET_Addr (const ACE_INET_Addr &);
@@ -109,7 +109,7 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
-  ~ACE_INET_Addr (void);
+  ~ACE_INET_Addr ();
 
   // = Direct initialization methods.
 
@@ -210,8 +210,8 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /// Return a pointer to the underlying network address.
-  virtual void *get_addr (void) const;
-  int get_addr_size(void) const;
+  virtual void *get_addr () const;
+  int get_addr_size() const;
 
   /// Set a pointer to the address.
   virtual void set_addr (const void *, int len);
@@ -284,7 +284,7 @@ public:
 #endif /* (ACE_LINUX || ACE_WIN32) && ACE_HAS_IPV6 */
 
   /// Return the port number, converting it into host byte-order.
-  u_short get_port_number (void) const;
+  u_short get_port_number () const;
 
   /**
    * Return the character representation of the name of the host,
@@ -309,7 +309,7 @@ public:
    * (2) use the "reentrant" version of get_host_name() described
    * above.
    */
-  const char *get_host_name (void) const;
+  const char *get_host_name () const;
 
   /**
    * Return the "dotted decimal" Internet address representation of
@@ -326,20 +326,20 @@ public:
    * using strdup() or (2) use the "reentrant" version of
    * get_host_addr() described above.
    */
-  const char *get_host_addr (void) const;
+  const char *get_host_addr () const;
 
   /// Return the 4-byte IP address, converting it into host byte
   /// order.
-  ACE_UINT32 get_ip_address (void) const;
+  ACE_UINT32 get_ip_address () const;
 
   /// Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY.
-  bool is_any (void) const;
+  bool is_any () const;
 
   /// Return @c true if the IP address is IPv4/IPv6 loopback address.
-  bool is_loopback (void) const;
+  bool is_loopback () const;
 
   /// Return @c true if the IP address is IPv4/IPv6 multicast address.
-  bool is_multicast (void) const;
+  bool is_multicast () const;
 
 #if defined (ACE_HAS_IPV6)
   /// Return @c true if the IP address is IPv6 linklocal address.
@@ -375,17 +375,17 @@ public:
   bool is_ip_equal (const ACE_INET_Addr &SAP) const;
 
   /// Computes and returns hash value.
-  virtual u_long hash (void) const;
+  virtual u_long hash () const;
 
   /// If there is another address to examine, move to it and return true;
   /// else return false.
-  bool next (void);
+  bool next ();
 
   /// Reset the set of address so they can be scanned again using next().
-  void reset (void);
+  void reset ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -396,12 +396,12 @@ private:
 
   // Methods to gain access to the actual address of
   // the underlying internet address structure.
-  void *ip_addr_pointer (void) const;
-  int ip_addr_size (void) const;
-  int determine_type (void) const;
+  void *ip_addr_pointer () const;
+  int ip_addr_size () const;
+  int determine_type () const;
 
   /// Initialize underlying inet_addr_ to default values
-  void reset_i (void);
+  void reset_i ();
 
   /// Underlying representation.
   /// This union uses the knowledge that the two structures share the
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index 96bbb161b67..f8aa3f42a1e 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -7,7 +7,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-ACE_INET_Addr::reset_i (void)
+ACE_INET_Addr::reset_i ()
 {
   ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_));
   if (this->get_type() == AF_INET)
@@ -32,7 +32,7 @@ ACE_INET_Addr::reset_i (void)
 }
 
 ACE_INLINE int
-ACE_INET_Addr::determine_type (void) const
+ACE_INET_Addr::determine_type () const
 {
 #if defined (ACE_HAS_IPV6)
 #  if defined (ACE_USES_IPV4_IPV6_MIGRATION)
@@ -46,7 +46,7 @@ ACE_INET_Addr::determine_type (void) const
 }
 
 ACE_INLINE void *
-ACE_INET_Addr::ip_addr_pointer (void) const
+ACE_INET_Addr::ip_addr_pointer () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == PF_INET)
@@ -59,7 +59,7 @@ ACE_INET_Addr::ip_addr_pointer (void) const
 }
 
 ACE_INLINE int
-ACE_INET_Addr::ip_addr_size (void) const
+ACE_INET_Addr::ip_addr_size () const
 {
   // Since this size value is used to pass to other host db-type
   // functions (gethostbyaddr, etc.) the length is of int type.
@@ -78,7 +78,7 @@ ACE_INET_Addr::ip_addr_size (void) const
 // Return the port number, converting it into host byte order...
 
 ACE_INLINE u_short
-ACE_INET_Addr::get_port_number (void) const
+ACE_INET_Addr::get_port_number () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_port_number");
 #if defined (ACE_HAS_IPV6)
@@ -96,7 +96,7 @@ ACE_INET_Addr::get_port_number (void) const
 }
 
 ACE_INLINE int
-ACE_INET_Addr::get_addr_size (void) const
+ACE_INET_Addr::get_addr_size () const
 {
   ACE_TRACE ("ACE_INET_Addr::get_addr_size");
 #if defined (ACE_HAS_IPV6)
@@ -181,7 +181,7 @@ ACE_INET_Addr::set (const wchar_t addr[], int address_family)
 
 // Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY.
 ACE_INLINE bool
-ACE_INET_Addr::is_any (void) const
+ACE_INET_Addr::is_any () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == AF_INET6)
@@ -193,7 +193,7 @@ ACE_INET_Addr::is_any (void) const
 
 // Return @c true if the IP address is IPv4/IPv6 loopback address.
 ACE_INLINE bool
-ACE_INET_Addr::is_loopback (void) const
+ACE_INET_Addr::is_loopback () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type () == AF_INET6)
@@ -206,7 +206,7 @@ ACE_INET_Addr::is_loopback (void) const
 
 // Return @c true if the IP address is IPv4/IPv6 multicast address.
 ACE_INLINE bool
-ACE_INET_Addr::is_multicast (void) const
+ACE_INET_Addr::is_multicast () const
 {
 #if defined (ACE_HAS_IPV6)
   if (this->get_type() == AF_INET6)
diff --git a/ACE/ace/IO_SAP.h b/ACE/ace/IO_SAP.h
index 7c3cbe5498e..81a4679145f 100644
--- a/ACE/ace/IO_SAP.h
+++ b/ACE/ace/IO_SAP.h
@@ -38,7 +38,7 @@ public:
   };
 
   /// Default dtor.
-  ~ACE_IO_SAP (void);
+  ~ACE_IO_SAP ();
 
   /// Interface for ioctl.
   int control (int cmd, void *) const;
@@ -60,20 +60,20 @@ public:
   int disable (int value) const;
 
   /// Get the underlying handle.
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const;
 
   /// Set the underlying handle.
   void set_handle (ACE_HANDLE handle);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 protected:
   /// Ensure that ACE_IO_SAP is an abstract base class.
-  ACE_IO_SAP (void);
+  ACE_IO_SAP ();
 
 private:
   /// Underlying I/O handle.
diff --git a/ACE/ace/IO_SAP.inl b/ACE/ace/IO_SAP.inl
index d3472bb974c..12d8a50e397 100644
--- a/ACE/ace/IO_SAP.inl
+++ b/ACE/ace/IO_SAP.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_IO_SAP::~ACE_IO_SAP (void)
+ACE_IO_SAP::~ACE_IO_SAP ()
 {
   ACE_TRACE ("ACE_IO_SAP::~ACE_IO_SAP");
 }
@@ -12,7 +12,7 @@ ACE_IO_SAP::~ACE_IO_SAP (void)
 // Used to return the underlying handle_.
 
 ACE_INLINE ACE_HANDLE
-ACE_IO_SAP::get_handle (void) const
+ACE_IO_SAP::get_handle () const
 {
   ACE_TRACE ("ACE_IO_SAP::get_handle");
   return this->handle_;
diff --git a/ACE/ace/IPC_SAP.h b/ACE/ace/IPC_SAP.h
index e70ec0a7e8c..dce2fabb6fc 100644
--- a/ACE/ace/IPC_SAP.h
+++ b/ACE/ace/IPC_SAP.h
@@ -50,13 +50,13 @@ public:
   int disable (int value) const;
 
   /// Get the underlying handle.
-  ACE_HANDLE get_handle (void) const;
+  ACE_HANDLE get_handle () const;
 
   /// Set the underlying handle.
   void set_handle (ACE_HANDLE handle);
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -64,7 +64,7 @@ public:
 protected:
   // = Ensure that ACE_IPC_SAP is an abstract base class.
   /// Default constructor.
-  ACE_IPC_SAP (void);
+  ACE_IPC_SAP ();
 
   /// Protected destructor.
   /**
@@ -72,7 +72,7 @@ protected:
    * operator delete() from being called through a base class
    * ACE_IPC_SAP pointer/reference.
    */
-  ~ACE_IPC_SAP (void);
+  ~ACE_IPC_SAP ();
 
 private:
   /// Underlying I/O handle.
diff --git a/ACE/ace/IPC_SAP.inl b/ACE/ace/IPC_SAP.inl
index 8419609148e..fe06636a02e 100644
--- a/ACE/ace/IPC_SAP.inl
+++ b/ACE/ace/IPC_SAP.inl
@@ -4,13 +4,13 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_IPC_SAP::~ACE_IPC_SAP (void)
+ACE_IPC_SAP::~ACE_IPC_SAP ()
 {
   // ACE_TRACE ("ACE_IPC_SAP::~ACE_IPC_SAP");
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_IPC_SAP::get_handle (void) const
+ACE_IPC_SAP::get_handle () const
 {
   ACE_TRACE ("ACE_IPC_SAP::get_handle");
   return this->handle_;
diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h
index e68279e5450..4096dccf969 100644
--- a/ACE/ace/Log_Record.h
+++ b/ACE/ace/Log_Record.h
@@ -58,7 +58,7 @@ public:
    * Create a Log_Record and set its priority, time stamp, and
    * process id.
    */
-  ACE_Log_Record (void);
+  ACE_Log_Record ();
   ACE_Log_Record (ACE_Log_Priority lp,
                   time_t time_stamp,
                   long pid);
@@ -67,7 +67,7 @@ public:
                   long pid);
 
   /// Default dtor.
-  ~ACE_Log_Record (void);
+  ~ACE_Log_Record ();
 
   /// Write the contents of the logging record to the appropriate
   /// FILE if the corresponding type is enabled.
@@ -103,13 +103,13 @@ public:
   static void priority_name (ACE_Log_Priority p, const ACE_TCHAR *name);
 
   /// Get the type of the Log_Record.
-  ACE_UINT32 type (void) const;
+  ACE_UINT32 type () const;
 
   /// Set the type of the Log_Record.
   void type (ACE_UINT32);
 
   /// Get the category of the Log_Record.
-  ACE_Log_Category_TSS* category (void) const;
+  ACE_Log_Category_TSS* category () const;
   /// Set the category of the Log_Record.
   void category (ACE_Log_Category_TSS*);
 
@@ -118,7 +118,7 @@ public:
    * as the base 2 logarithm of <type_> (which must be a power of 2,
    * as defined by the enums in ACE_Log_Priority).
    */
-  u_long priority (void) const;
+  u_long priority () const;
 
   /// Set the priority of the Log_Record <type_> (which must be a
   /// power of 2, as defined by the enums in ACE_Log_Priority).
@@ -126,26 +126,26 @@ public:
 
   /// Get the total length of the Log_Record, which includes the
   /// size of the various data member fields.
-  long length (void) const;
+  long length () const;
 
   /// Set the total length of the Log_Record, which needs to account for
   /// the size of the various data member fields.
   void length (long);
 
   /// Get the time stamp of the Log_Record.
-  ACE_Time_Value time_stamp (void) const;
+  ACE_Time_Value time_stamp () const;
 
   /// Set the time stamp of the Log_Record.
   void time_stamp (const ACE_Time_Value &ts);
 
   /// Get the process id of the Log_Record.
-  long pid (void) const;
+  long pid () const;
 
   /// Set the process id of the Log_Record.
   void pid (long);
 
   /// Get the message data of the Log_Record.
-  const ACE_TCHAR *msg_data (void) const;
+  const ACE_TCHAR *msg_data () const;
 
   /// Set the message data of the record. If @a data is longer than the
   /// current msg_data_ buffer, a new msg_data_ buffer is allocated to
@@ -154,17 +154,17 @@ public:
 
   /// Get the size of the message data of the Log_Record, including
   /// a byte for the NUL.
-  size_t msg_data_len (void) const;
+  size_t msg_data_len () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
   /// Round up to the alignment restrictions.
-  void round_up (void);
+  void round_up ();
 
   /**
    * Total length of the logging record in bytes.  This field *must*
diff --git a/ACE/ace/Log_Record.inl b/ACE/ace/Log_Record.inl
index dfd7e75b5b6..9c46fae907b 100644
--- a/ACE/ace/Log_Record.inl
+++ b/ACE/ace/Log_Record.inl
@@ -11,7 +11,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Log_Record::~ACE_Log_Record (void)
+ACE_Log_Record::~ACE_Log_Record ()
 {
   if (this->msg_data_)
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -22,7 +22,7 @@ ACE_Log_Record::~ACE_Log_Record (void)
 }
 
 ACE_INLINE ACE_UINT32
-ACE_Log_Record::type (void) const
+ACE_Log_Record::type () const
 {
   ACE_TRACE ("ACE_Log_Record::type");
   return this->type_;
@@ -37,7 +37,7 @@ ACE_Log_Record::category (ACE_Log_Category_TSS* t)
 
 
 ACE_INLINE ACE_Log_Category_TSS*
-ACE_Log_Record::category (void) const
+ACE_Log_Record::category () const
 {
   ACE_TRACE ("ACE_Log_Record::category");
   return this->category_;
@@ -51,7 +51,7 @@ ACE_Log_Record::type (ACE_UINT32 t)
 }
 
 ACE_INLINE long
-ACE_Log_Record::length (void) const
+ACE_Log_Record::length () const
 {
   ACE_TRACE ("ACE_Log_Record::length");
   return (long) this->length_;
@@ -65,7 +65,7 @@ ACE_Log_Record::length (long l)
 }
 
 ACE_INLINE ACE_Time_Value
-ACE_Log_Record::time_stamp (void) const
+ACE_Log_Record::time_stamp () const
 {
   ACE_TRACE ("ACE_Log_Record::time_stamp");
   return ACE_Time_Value (this->secs_, (long) this->usecs_);
@@ -80,7 +80,7 @@ ACE_Log_Record::time_stamp (const ACE_Time_Value &ts)
 }
 
 ACE_INLINE long
-ACE_Log_Record::pid (void) const
+ACE_Log_Record::pid () const
 {
   ACE_TRACE ("ACE_Log_Record::pid");
   return (long) this->pid_;
@@ -94,14 +94,14 @@ ACE_Log_Record::pid (long p)
 }
 
 ACE_INLINE const ACE_TCHAR *
-ACE_Log_Record::msg_data (void) const
+ACE_Log_Record::msg_data () const
 {
   ACE_TRACE ("ACE_Log_Record::msg_data");
   return this->msg_data_;
 }
 
 ACE_INLINE size_t
-ACE_Log_Record::msg_data_len (void) const
+ACE_Log_Record::msg_data_len () const
 {
   ACE_TRACE ("ACE_Log_Record::msg_data_len");
   return ACE_OS::strlen (this->msg_data_) + 1;
diff --git a/ACE/ace/SOCK.h b/ACE/ace/SOCK.h
index 8fa3942c4b1..62ef4b9121c 100644
--- a/ACE/ace/SOCK.h
+++ b/ACE/ace/SOCK.h
@@ -59,7 +59,7 @@ public:
    * @return The result of closing the socket; 0 if the handle value
    *         was already ACE_INVALID_HANDLE.
    */
-  int close (void);
+  int close ();
 
   /// Return the local endpoint address in the referenced ACE_Addr.
   /// Returns 0 if successful, else -1.
@@ -73,7 +73,7 @@ public:
   int get_remote_addr (ACE_Addr &) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -114,7 +114,7 @@ protected:
 
   /// Default constructor is protected to prevent instances of this class
   /// from being defined.
-  ACE_SOCK (void);
+  ACE_SOCK ();
 
   /// Protected destructor.
   /**
@@ -122,7 +122,7 @@ protected:
    * operator delete() from being called through a base class ACE_SOCK
    * pointer/reference.
    */
-  ~ACE_SOCK (void);
+  ~ACE_SOCK ();
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SOCK.inl b/ACE/ace/SOCK.inl
index 74875bd41c3..6d55989b218 100644
--- a/ACE/ace/SOCK.inl
+++ b/ACE/ace/SOCK.inl
@@ -4,7 +4,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SOCK::~ACE_SOCK (void)
+ACE_SOCK::~ACE_SOCK ()
 {
   // ACE_TRACE ("ACE_SOCK::~ACE_SOCK");
 }
diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h
index b05375a3ca4..1dc947fb9cf 100644
--- a/ACE/ace/SOCK_Acceptor.h
+++ b/ACE/ace/SOCK_Acceptor.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK
 {
 public:
   /// Default constructor.
-  ACE_SOCK_Acceptor (void);
+  ACE_SOCK_Acceptor ();
 
   /**
    * Initialize a passive-mode BSD-style acceptor socket (no QoS).
@@ -98,10 +98,10 @@ public:
             int ipv6_only = 0);
 
   /// Close the socket.  Returns 0 on success and -1 on failure.
-  int close (void);
+  int close ();
 
   /// Default dtor.
-  ~ACE_SOCK_Acceptor (void);
+  ~ACE_SOCK_Acceptor ();
 
   // = Passive connection <accept> methods.
   /**
@@ -143,7 +143,7 @@ public:
   typedef ACE_SOCK_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Acceptor.inl b/ACE/ace/SOCK_Acceptor.inl
index bf6822a3e0f..525336c28ed 100644
--- a/ACE/ace/SOCK_Acceptor.inl
+++ b/ACE/ace/SOCK_Acceptor.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor (void)
+ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor ()
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor");
 }
diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h
index e84410257fc..2a7dde20db4 100644
--- a/ACE/ace/SOCK_Connector.h
+++ b/ACE/ace/SOCK_Connector.h
@@ -42,7 +42,7 @@ class ACE_Export ACE_SOCK_Connector
 {
 public:
   /// Default constructor.
-  ACE_SOCK_Connector (void);
+  ACE_SOCK_Connector ();
 
   /**
    * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream
@@ -247,7 +247,7 @@ public:
 #endif  // ACE_HAS_WINCE
 
   /// Default destructor.
-  ~ACE_SOCK_Connector (void);
+  ~ACE_SOCK_Connector ();
 
   // = Completion routine.
   /**
@@ -274,7 +274,7 @@ public:
   typedef ACE_SOCK_Stream PEER_STREAM;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Connector.inl b/ACE/ace/SOCK_Connector.inl
index ff1c7031182..d00f8d889f0 100644
--- a/ACE/ace/SOCK_Connector.inl
+++ b/ACE/ace/SOCK_Connector.inl
@@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // the specified REMOTE_SAP address using a blocking open.
 
 ACE_INLINE
-ACE_SOCK_Connector::~ACE_SOCK_Connector (void)
+ACE_SOCK_Connector::~ACE_SOCK_Connector ()
 {
   ACE_TRACE ("ACE_SOCK_Connector::~ACE_SOCK_Connector");
 }
@@ -13,7 +13,7 @@ ACE_SOCK_Connector::~ACE_SOCK_Connector (void)
 // Do-nothing constructor...
 
 ACE_INLINE
-ACE_SOCK_Connector::ACE_SOCK_Connector (void)
+ACE_SOCK_Connector::ACE_SOCK_Connector ()
 {
   ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
 }
diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h
index 0ea281bb3ef..ee1f460f4b1 100644
--- a/ACE/ace/SOCK_IO.h
+++ b/ACE/ace/SOCK_IO.h
@@ -48,10 +48,10 @@ class ACE_Export ACE_SOCK_IO : public ACE_SOCK
 {
 public:
   /// Constructor.
-  ACE_SOCK_IO (void);
+  ACE_SOCK_IO ();
 
   /// Destructor.
-  ~ACE_SOCK_IO (void);
+  ~ACE_SOCK_IO ();
 
   /// Recv an @a n byte buffer from the connected socket.
   ssize_t recv (void *buf,
@@ -119,7 +119,7 @@ public:
                 ACE_OVERLAPPED *overlapped) const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_IO.inl b/ACE/ace/SOCK_IO.inl
index eec644cd71f..9fd9a63d9f8 100644
--- a/ACE/ace/SOCK_IO.inl
+++ b/ACE/ace/SOCK_IO.inl
@@ -6,13 +6,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Send an n byte message to the connected socket.
 
 ACE_INLINE
-ACE_SOCK_IO::ACE_SOCK_IO (void)
+ACE_SOCK_IO::ACE_SOCK_IO ()
 {
   // ACE_TRACE ("ACE_SOCK_IO::ACE_SOCK_IO");
 }
 
 ACE_INLINE
-ACE_SOCK_IO::~ACE_SOCK_IO (void)
+ACE_SOCK_IO::~ACE_SOCK_IO ()
 {
   // ACE_TRACE ("ACE_SOCK_IO::~ACE_SOCK_IO");
 }
diff --git a/ACE/ace/SOCK_Stream.h b/ACE/ace/SOCK_Stream.h
index ae0c6969c2b..35203184249 100644
--- a/ACE/ace/SOCK_Stream.h
+++ b/ACE/ace/SOCK_Stream.h
@@ -40,13 +40,13 @@ class ACE_Export ACE_SOCK_Stream : public ACE_SOCK_IO
 public:
   // Initialization and termination methods.
   /// Constructor.
-  ACE_SOCK_Stream (void);
+  ACE_SOCK_Stream ();
 
   /// Constructor (sets the underlying ACE_HANDLE with @a h).
   ACE_SOCK_Stream (ACE_HANDLE h);
 
   /// Destructor.
-  ~ACE_SOCK_Stream (void);
+  ~ACE_SOCK_Stream ();
 
   /** @name Counted send/receive methods
    *
@@ -153,23 +153,23 @@ public:
 
   // = Selectively close endpoints.
   /// Close down the reader.
-  int close_reader (void);
+  int close_reader ();
 
   /// Close down the writer.
-  int close_writer (void);
+  int close_writer ();
 
   /**
    * Close down the socket (we need this to make things work correctly
    * on Win32, which requires use to do a close_writer() before doing
    * the close to avoid losing data).
    */
-  int close (void);
+  int close ();
 
   // = Meta-type info
   typedef ACE_INET_Addr PEER_ADDR;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/SOCK_Stream.inl b/ACE/ace/SOCK_Stream.inl
index fe25fdde36e..f2aad80ad3e 100644
--- a/ACE/ace/SOCK_Stream.inl
+++ b/ACE/ace/SOCK_Stream.inl
@@ -5,7 +5,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_SOCK_Stream::ACE_SOCK_Stream (void)
+ACE_SOCK_Stream::ACE_SOCK_Stream ()
 {
   // ACE_TRACE ("ACE_SOCK_Stream::ACE_SOCK_Stream");
 }
@@ -18,13 +18,13 @@ ACE_SOCK_Stream::ACE_SOCK_Stream (ACE_HANDLE h)
 }
 
 ACE_INLINE
-ACE_SOCK_Stream::~ACE_SOCK_Stream (void)
+ACE_SOCK_Stream::~ACE_SOCK_Stream ()
 {
   // ACE_TRACE ("ACE_SOCK_Stream::~ACE_SOCK_Stream");
 }
 
 ACE_INLINE int
-ACE_SOCK_Stream::close_reader (void)
+ACE_SOCK_Stream::close_reader ()
 {
   ACE_TRACE ("ACE_SOCK_Stream::close_reader");
   if (this->get_handle () != ACE_INVALID_HANDLE)
@@ -36,7 +36,7 @@ ACE_SOCK_Stream::close_reader (void)
 // Shut down just the writing end of a ACE_SOCK.
 
 ACE_INLINE int
-ACE_SOCK_Stream::close_writer (void)
+ACE_SOCK_Stream::close_writer ()
 {
   ACE_TRACE ("ACE_SOCK_Stream::close_writer");
   if (this->get_handle () != ACE_INVALID_HANDLE)
diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h
index 2a64168c1ce..c4299437c51 100644
--- a/ACE/ace/Signal.h
+++ b/ACE/ace/Signal.h
@@ -55,13 +55,13 @@ public:
   /// full.
   ACE_Sig_Set (int fill = 0);
 
-  ~ACE_Sig_Set (void);
+  ~ACE_Sig_Set ();
 
   /// Create a set that excludes all signals defined by the system.
-  int empty_set (void);
+  int empty_set ();
 
   /// Create a set that includes all signals defined by the system.
-  int fill_set (void);
+  int fill_set ();
 
   /// Adds the individual signal specified by @a signo to the set.
   int sig_add (int signo);
@@ -76,10 +76,10 @@ public:
   operator sigset_t *();
 
   /// Returns a copy of the underlying @c sigset_t.
-  sigset_t sigset (void) const;
+  sigset_t sigset () const;
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -98,7 +98,7 @@ class ACE_Export ACE_Sig_Action
 {
 public:
   /// Default constructor.  Initializes everything to 0.
-  ACE_Sig_Action (void);
+  ACE_Sig_Action ();
 
   /// Assigns the various fields of a @c sigaction struct but doesn't
   /// register for signal handling via the @c sigaction function.
@@ -158,7 +158,7 @@ public:
   ACE_Sig_Action &operator = (ACE_Sig_Action&&)  = default;
 
   /// Default dtor.
-  ~ACE_Sig_Action (void);
+  ~ACE_Sig_Action ();
 
   // = Signal action management.
   /// Register @c this as the current disposition and store old
@@ -178,30 +178,30 @@ public:
   void set (struct sigaction *);
 
   /// Get current signal action.
-  struct sigaction *get (void);
+  struct sigaction *get ();
   operator struct sigaction *();
 
   /// Set current signal flags.
   void flags (int);
 
   /// Get current signal flags.
-  int flags (void);
+  int flags ();
 
   /// Set current signal mask.
   void mask (sigset_t *);
   void mask (ACE_Sig_Set &);
 
   /// Get current signal mask.
-  sigset_t *mask (void);
+  sigset_t *mask ();
 
   /// Set current signal handler (pointer to function).
   void handler (ACE_SignalHandler);
 
   /// Get current signal handler (pointer to function).
-  ACE_SignalHandler handler (void);
+  ACE_SignalHandler handler ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
@@ -226,10 +226,10 @@ public:
   ACE_Sig_Guard (ACE_Sig_Set *mask = 0, bool condition = true);
 
   /// Restore blocked signals.
-  ~ACE_Sig_Guard (void);
+  ~ACE_Sig_Guard ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Signal.inl b/ACE/ace/Signal.inl
index 64ac6c049e5..11fb1550967 100644
--- a/ACE/ace/Signal.inl
+++ b/ACE/ace/Signal.inl
@@ -45,14 +45,14 @@ ACE_Sig_Set::ACE_Sig_Set (ACE_Sig_Set *ss)
 }
 
 ACE_INLINE int
-ACE_Sig_Set::empty_set (void)
+ACE_Sig_Set::empty_set ()
 {
   ACE_TRACE ("ACE_Sig_Set::empty_set");
   return ACE_OS::sigemptyset (&this->sigset_);
 }
 
 ACE_INLINE int
-ACE_Sig_Set::fill_set (void)
+ACE_Sig_Set::fill_set ()
 {
   ACE_TRACE ("ACE_Sig_Set::fill_set");
   return ACE_OS::sigfillset (&this->sigset_);
@@ -80,21 +80,21 @@ ACE_Sig_Set::is_member (int signo) const
 }
 
 ACE_INLINE
-ACE_Sig_Set::operator sigset_t *(void)
+ACE_Sig_Set::operator sigset_t *()
 {
   ACE_TRACE ("ACE_Sig_Set::operator sigset_t *");
   return &this->sigset_;
 }
 
 ACE_INLINE sigset_t
-ACE_Sig_Set::sigset (void) const
+ACE_Sig_Set::sigset () const
 {
   ACE_TRACE ("ACE_Sig_Set::sigset");
   return this->sigset_;
 }
 
 ACE_INLINE int
-ACE_Sig_Action::flags (void)
+ACE_Sig_Action::flags ()
 {
   ACE_TRACE ("ACE_Sig_Action::flags");
   return this->sa_.sa_flags;
@@ -108,7 +108,7 @@ ACE_Sig_Action::flags (int flags)
 }
 
 ACE_INLINE sigset_t *
-ACE_Sig_Action::mask (void)
+ACE_Sig_Action::mask ()
 {
   ACE_TRACE ("ACE_Sig_Action::mask");
   return &this->sa_.sa_mask;
@@ -130,7 +130,7 @@ ACE_Sig_Action::mask (ACE_Sig_Set &ss)
 }
 
 ACE_INLINE ACE_SignalHandler
-ACE_Sig_Action::handler (void)
+ACE_Sig_Action::handler ()
 {
   ACE_TRACE ("ACE_Sig_Action::handler");
   return ACE_SignalHandler (this->sa_.sa_handler);
@@ -155,7 +155,7 @@ ACE_Sig_Action::set (struct sigaction *sa)
 }
 
 ACE_INLINE struct sigaction *
-ACE_Sig_Action::get (void)
+ACE_Sig_Action::get ()
 {
   ACE_TRACE ("ACE_Sig_Action::get");
   return &this->sa_;
diff --git a/ACE/ace/Sock_Connect.h b/ACE/ace/Sock_Connect.h
index 54011147474..394338d5800 100644
--- a/ACE/ace/Sock_Connect.h
+++ b/ACE/ace/Sock_Connect.h
@@ -74,7 +74,7 @@ namespace ACE
 
   /// Routine to return a handle from which @c ioctl requests can be
   /// made.  Caller must close the handle.
-  extern ACE_Export ACE_HANDLE get_handle (void);
+  extern ACE_Export ACE_HANDLE get_handle ();
 
   /// Returns @c true if IPv4 is enabled on the current host; @c false
   /// if not.
@@ -85,7 +85,7 @@ namespace ACE
    * succeeds, and @c false if it fails. Caches the result so it only
      gets checked once.
    */
-  extern ACE_Export bool ipv4_enabled (void);
+  extern ACE_Export bool ipv4_enabled ();
 
   /**
    * Returns 1 if IPv6 is enabled on the current host; 0 if not.
@@ -95,7 +95,7 @@ namespace ACE
    * returning 1 if it succeeds, and 0 if it fails. Caches the result
    * so it only gets checked once.
    */
-  extern ACE_Export int ipv6_enabled (void);
+  extern ACE_Export int ipv6_enabled ();
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Trace.h b/ACE/ace/Trace.h
index dee73c6ed33..eb49cf2fdb0 100644
--- a/ACE/ace/Trace.h
+++ b/ACE/ace/Trace.h
@@ -42,29 +42,29 @@ public:
 
   /// Perform the second part of the trace, which prints out the NAME
   /// as the function is exited.
-  ~ACE_Trace (void);
+  ~ACE_Trace ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
   // = Control the tracing level.
   /// Determine if tracing is enabled or not
-  static bool is_tracing(void);
+  static bool is_tracing();
 
   /// Enable the tracing facility.
-  static void start_tracing (void);
+  static void start_tracing ();
 
   /// Disable the tracing facility.
-  static void stop_tracing (void);
+  static void stop_tracing ();
 
   /// Change the nesting indentation level.
   static void set_nesting_indent (int indent);
 
   /// Get the nesting indentation level.
-  static int get_nesting_indent (void);
+  static int get_nesting_indent ();
 
   /// Dump the state of an object.
-  void dump (void) const;
+  void dump () const;
 
 private:
   // Keeps track of how deeply the call stack is nested (this is