Remove obsolescent (void) in functions with no parameters

45 files changed, 218 insertions, 218 deletions

diff --git a/ACE/ACEXML/apps/svcconf/Svcconf.cpp b/ACE/ACEXML/apps/svcconf/Svcconf.cpp
index ad6bc5c4190..66f74adb4b5 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf.cpp
@@ -7,7 +7,7 @@
 #if (ACE_USES_CLASSIC_SVC_CONF == 0)
 
 extern "C" ACE_Proper_Export_Flag ACE_XML_Svc_Conf *
-_ACEXML_create_XML_Svc_Conf_Object (void)
+_ACEXML_create_XML_Svc_Conf_Object ()
 {
   ACE_XML_Svc_Conf *retp = 0;
 
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index 6a4e85d3b61..0f6e9ae5153 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -17,7 +17,7 @@
 # include "Svcconf_Handler.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void)
+ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler ()
   : in_stream_def_ (0),
     in_module_ (0),
     stream_svc_type_ (0),
@@ -25,7 +25,7 @@ ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void)
 {
 }
 
-ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler (void)
+ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler ()
 {
 }
 
@@ -37,7 +37,7 @@ ACEXML_Svcconf_Handler::characters (const ACEXML_Char *,
 }
 
 void
-ACEXML_Svcconf_Handler::endDocument (void)
+ACEXML_Svcconf_Handler::endDocument ()
 {
 }
 
@@ -290,7 +290,7 @@ ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char *)
 }
 
 void
-ACEXML_Svcconf_Handler::startDocument (void)
+ACEXML_Svcconf_Handler::startDocument ()
 {
 }
 
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h
index b1eadf5bb2c..e123c027c8b 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h
+++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.h
@@ -24,42 +24,42 @@ public:
    * Set/get name of a parsed entity.
    */
   int name (const ACEXML_Char *n);
-  const ACEXML_Char *name (void);
+  const ACEXML_Char *name ();
 
   /**
    * Set/get type of a dynamic node.
    */
   int service_type (int type);
-  int service_type (void);
+  int service_type ();
 
   /**
    * Set/Get active status.
    */
   int active (int a);
-  int active (void);
+  int active ();
 
   /**
    * Set/get initializer path.
    */
   int path (const ACEXML_Char *n);
-  const ACEXML_Char *path (void);
+  const ACEXML_Char *path ();
 
   /**
    * Set/get initializer init function.
    */
   int init_func (const ACEXML_Char *n);
-  const ACEXML_Char *init_func (void);
+  const ACEXML_Char *init_func ();
 
   /**
    * Set/get initializer init parameter.
    */
   int init_params (const ACEXML_Char *n);
-  const ACEXML_Char *init_params (void);
+  const ACEXML_Char *init_params ();
 
   /**
    * Reset Parsed_Info.
    */
-  void reset (void);
+  void reset ();
 
 protected:
   ACEXML_Char *name_;
@@ -84,12 +84,12 @@ public:
   /*
    * Default constructor.
    */
-  ACEXML_Svcconf_Handler (void);
+  ACEXML_Svcconf_Handler ();
 
   /*
    * Default destructor.
    */
-  virtual ~ACEXML_Svcconf_Handler (void);
+  virtual ~ACEXML_Svcconf_Handler ();
 
   // Methods inherit from ACEXML_ContentHandler.
 
@@ -103,7 +103,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void);
+  virtual void endDocument ();
 
   /*
    * Receive notification of the end of an element.
@@ -143,7 +143,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void)
+  virtual void startDocument ()
     ;
 
   /*
diff --git a/ACE/ACEXML/common/Attributes.cpp b/ACE/ACEXML/common/Attributes.cpp
index ae09b5ccdd4..97d4c8c5872 100644
--- a/ACE/ACEXML/common/Attributes.cpp
+++ b/ACE/ACEXML/common/Attributes.cpp
@@ -1,5 +1,5 @@
 #include "Attributes.h"
 
-ACEXML_Attributes::~ACEXML_Attributes (void)
+ACEXML_Attributes::~ACEXML_Attributes ()
 {
 }
diff --git a/ACE/ACEXML/common/AttributesImpl.cpp b/ACE/ACEXML/common/AttributesImpl.cpp
index 6d48f903f83..b33568ec4e9 100644
--- a/ACE/ACEXML/common/AttributesImpl.cpp
+++ b/ACE/ACEXML/common/AttributesImpl.cpp
@@ -21,7 +21,7 @@ ACEXML_AttributesImpl::ACEXML_AttributesImpl (const
     this->attrs_[i] = attrs.attrs_[i];
 }
 
-ACEXML_AttributesImpl::~ACEXML_AttributesImpl (void)
+ACEXML_AttributesImpl::~ACEXML_AttributesImpl ()
 {
 }
 
@@ -115,7 +115,7 @@ ACEXML_AttributesImpl::getIndex (const ACEXML_Char *uri,
 }
 
 size_t
-ACEXML_AttributesImpl::getLength (void)
+ACEXML_AttributesImpl::getLength ()
 {
   return this->attrs_.size ();
 }
diff --git a/ACE/ACEXML/common/AttributesImpl.h b/ACE/ACEXML/common/AttributesImpl.h
index b746878062c..304558abf94 100644
--- a/ACE/ACEXML/common/AttributesImpl.h
+++ b/ACE/ACEXML/common/AttributesImpl.h
@@ -41,7 +41,7 @@ public:
   friend class ACEXML_AttributesImpl;
 
   /// Default constructor.
-  ACEXML_Attribute (void);
+  ACEXML_Attribute ();
 
   /// Copy constructor.
   ACEXML_Attribute (const ACEXML_Attribute &attr);
@@ -54,7 +54,7 @@ public:
                     const ACEXML_Char *value);
 
   /// Destructor.
-  ~ACEXML_Attribute (void);
+  ~ACEXML_Attribute ();
 
   /// Set all members.
   void setAttribute (const ACEXML_Char *uri,
@@ -147,7 +147,7 @@ public:
    */
   ACEXML_AttributesImpl (int size = ACEXML_AttributesImpl_Default_Size);
   ACEXML_AttributesImpl (const ACEXML_AttributesImpl &attrs);
-  virtual ~ACEXML_AttributesImpl (void);
+  virtual ~ACEXML_AttributesImpl ();
 
   /**
    * Add a new attribute using the argument(s) supplied.
@@ -190,7 +190,7 @@ public:
   /**
    * Return the number of attributes in the list.
    */
-  virtual size_t getLength (void);
+  virtual size_t getLength ();
 
   /**
    * Look up an attribute's local name by index.
diff --git a/ACE/ACEXML/common/CharStream.cpp b/ACE/ACEXML/common/CharStream.cpp
index 00c1f32ab54..09dc0905fa5 100644
--- a/ACE/ACEXML/common/CharStream.cpp
+++ b/ACE/ACEXML/common/CharStream.cpp
@@ -2,6 +2,6 @@
 
 #include "ACEXML/common/CharStream.h"
 
-ACEXML_CharStream::~ACEXML_CharStream (void)
+ACEXML_CharStream::~ACEXML_CharStream ()
 {
 }
diff --git a/ACE/ACEXML/common/ContentHandler.cpp b/ACE/ACEXML/common/ContentHandler.cpp
index d114e6a9b53..f28ee6a1780 100644
--- a/ACE/ACEXML/common/ContentHandler.cpp
+++ b/ACE/ACEXML/common/ContentHandler.cpp
@@ -1,5 +1,5 @@
 #include "ContentHandler.h"
 
-ACEXML_ContentHandler::~ACEXML_ContentHandler (void)
+ACEXML_ContentHandler::~ACEXML_ContentHandler ()
 {
 }
diff --git a/ACE/ACEXML/common/DTDHandler.cpp b/ACE/ACEXML/common/DTDHandler.cpp
index 282ebf0cde6..e8a40f4b124 100644
--- a/ACE/ACEXML/common/DTDHandler.cpp
+++ b/ACE/ACEXML/common/DTDHandler.cpp
@@ -1,5 +1,5 @@
 #include "DTDHandler.h"
 
-ACEXML_DTDHandler::~ACEXML_DTDHandler (void)
+ACEXML_DTDHandler::~ACEXML_DTDHandler ()
 {
 }
diff --git a/ACE/ACEXML/common/DefaultHandler.cpp b/ACE/ACEXML/common/DefaultHandler.cpp
index 2338518e312..dd023d7e51d 100644
--- a/ACE/ACEXML/common/DefaultHandler.cpp
+++ b/ACE/ACEXML/common/DefaultHandler.cpp
@@ -2,11 +2,11 @@
 
 #include "ACEXML/common/DefaultHandler.h"
 
-ACEXML_DefaultHandler::ACEXML_DefaultHandler (void)
+ACEXML_DefaultHandler::ACEXML_DefaultHandler ()
 {
 }
 
-ACEXML_DefaultHandler::~ACEXML_DefaultHandler (void)
+ACEXML_DefaultHandler::~ACEXML_DefaultHandler ()
 {
 }
 
@@ -18,7 +18,7 @@ ACEXML_DefaultHandler::characters (const ACEXML_Char *,
 }
 
 void
-ACEXML_DefaultHandler::endDocument (void)
+ACEXML_DefaultHandler::endDocument ()
 {
 }
 
@@ -63,7 +63,7 @@ ACEXML_DefaultHandler::skippedEntity (const ACEXML_Char *)
 }
 
 void
-ACEXML_DefaultHandler::startDocument (void)
+ACEXML_DefaultHandler::startDocument ()
 {
   // No-op.
 }
diff --git a/ACE/ACEXML/common/EntityResolver.cpp b/ACE/ACEXML/common/EntityResolver.cpp
index 92d948a9cff..ea251f41f2a 100644
--- a/ACE/ACEXML/common/EntityResolver.cpp
+++ b/ACE/ACEXML/common/EntityResolver.cpp
@@ -1,5 +1,5 @@
 #include "EntityResolver.h"
 
-ACEXML_EntityResolver::~ACEXML_EntityResolver (void)
+ACEXML_EntityResolver::~ACEXML_EntityResolver ()
 {
 }
diff --git a/ACE/ACEXML/common/ErrorHandler.cpp b/ACE/ACEXML/common/ErrorHandler.cpp
index 59426c3a7e7..29afddb5b5f 100644
--- a/ACE/ACEXML/common/ErrorHandler.cpp
+++ b/ACE/ACEXML/common/ErrorHandler.cpp
@@ -1,5 +1,5 @@
 #include "ErrorHandler.h"
 
-ACEXML_ErrorHandler::~ACEXML_ErrorHandler (void)
+ACEXML_ErrorHandler::~ACEXML_ErrorHandler ()
 {
 }
diff --git a/ACE/ACEXML/common/FileCharStream.cpp b/ACE/ACEXML/common/FileCharStream.cpp
index b7a8538a38d..eba9e8b2660 100644
--- a/ACE/ACEXML/common/FileCharStream.cpp
+++ b/ACE/ACEXML/common/FileCharStream.cpp
@@ -9,13 +9,13 @@
 #  include "ace/OS_NS_wchar.h"
 #endif /* ACE_USES_WCHAR */
 
-ACEXML_FileCharStream::ACEXML_FileCharStream (void)
+ACEXML_FileCharStream::ACEXML_FileCharStream ()
   : filename_ (0), encoding_ (0), size_ (0), infile_ (0),
     close_infile_ (true), peek_ (0)
 {
 }
 
-ACEXML_FileCharStream::~ACEXML_FileCharStream (void)
+ACEXML_FileCharStream::~ACEXML_FileCharStream ()
 {
   this->close();
 }
@@ -60,7 +60,7 @@ ACEXML_FileCharStream::open (const ACEXML_Char *name)
 }
 
 int
-ACEXML_FileCharStream::determine_encoding (void)
+ACEXML_FileCharStream::determine_encoding ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -114,7 +114,7 @@ ACEXML_FileCharStream::rewind()
 }
 
 int
-ACEXML_FileCharStream::available (void)
+ACEXML_FileCharStream::available ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -126,7 +126,7 @@ ACEXML_FileCharStream::available (void)
 }
 
 int
-ACEXML_FileCharStream::close (void)
+ACEXML_FileCharStream::close ()
 {
   if (this->infile_ != 0)
     {
@@ -177,7 +177,7 @@ ACEXML_FileCharStream::get (ACEXML_Char& ch)
 }
 
 int
-ACEXML_FileCharStream::peek (void)
+ACEXML_FileCharStream::peek ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -226,7 +226,7 @@ ACEXML_FileCharStream::get_i (ACEXML_Char& ch)
 }
 
 int
-ACEXML_FileCharStream::peek_i (void)
+ACEXML_FileCharStream::peek_i ()
 {
   // If we are reading a UTF-8 encoded file, just use the plain unget.
   if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0)
@@ -262,13 +262,13 @@ ACEXML_FileCharStream::peek_i (void)
 #endif /* ACE_USES_WCHAR */
 
 const ACEXML_Char*
-ACEXML_FileCharStream::getEncoding (void)
+ACEXML_FileCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_FileCharStream::getSystemId (void)
+ACEXML_FileCharStream::getSystemId ()
 {
   return this->filename_;
 }
diff --git a/ACE/ACEXML/common/FileCharStream.h b/ACE/ACEXML/common/FileCharStream.h
index 2d273b87a7c..f1459976acf 100644
--- a/ACE/ACEXML/common/FileCharStream.h
+++ b/ACE/ACEXML/common/FileCharStream.h
@@ -112,7 +112,7 @@ private:
    *  encoding of the file. Subsequent call to get() returns this
    *  character.
    */
-  int peek_i (void);
+  int peek_i ();
 
 #endif /* ACE_USES_WCHAR */
 
diff --git a/ACE/ACEXML/common/HttpCharStream.cpp b/ACE/ACEXML/common/HttpCharStream.cpp
index 804f467a5fd..4fc0a1178a3 100644
--- a/ACE/ACEXML/common/HttpCharStream.cpp
+++ b/ACE/ACEXML/common/HttpCharStream.cpp
@@ -19,7 +19,7 @@ static const int HDST_CR = 13;
 static const int HDST_CRLF = 14;
 static const int HDST_CRLFCR = 15;
 
-ACEXML_HttpCharStream::ACEXML_HttpCharStream (void)
+ACEXML_HttpCharStream::ACEXML_HttpCharStream ()
   : url_(0),
     url_addr_(0),
     stream_(0),
@@ -30,7 +30,7 @@ ACEXML_HttpCharStream::ACEXML_HttpCharStream (void)
 {
 }
 
-ACEXML_HttpCharStream::~ACEXML_HttpCharStream (void)
+ACEXML_HttpCharStream::~ACEXML_HttpCharStream ()
 {
   this->close ();
 }
@@ -269,7 +269,7 @@ ACEXML_HttpCharStream::get_url (size_t& len)
 
 
 int
-ACEXML_HttpCharStream::send_request (void)
+ACEXML_HttpCharStream::send_request ()
 {
   char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name()));
   ACE_Auto_Basic_Array_Ptr<char> path_ptr (path);
@@ -301,7 +301,7 @@ ACEXML_HttpCharStream::send_request (void)
 
 
 int
-ACEXML_HttpCharStream::available (void)
+ACEXML_HttpCharStream::available ()
 {
   if (this->stream_ == 0)
     return -1;
@@ -309,7 +309,7 @@ ACEXML_HttpCharStream::available (void)
 }
 
 int
-ACEXML_HttpCharStream::close (void)
+ACEXML_HttpCharStream::close ()
 {
   delete[] this->url_;
   this->url_ = 0;
@@ -333,7 +333,7 @@ ACEXML_HttpCharStream::close (void)
 }
 
 int
-ACEXML_HttpCharStream::determine_encoding (void)
+ACEXML_HttpCharStream::determine_encoding ()
 {
   if (this->stream_ == 0)
     return -1;
@@ -377,7 +377,7 @@ ACEXML_HttpCharStream::determine_encoding (void)
 }
 
 void
-ACEXML_HttpCharStream::rewind (void)
+ACEXML_HttpCharStream::rewind ()
 {
   if (this->stream_ == 0)
     return;
@@ -390,13 +390,13 @@ ACEXML_HttpCharStream::rewind (void)
 }
 
 const ACEXML_Char*
-ACEXML_HttpCharStream::getEncoding (void)
+ACEXML_HttpCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_HttpCharStream::getSystemId (void)
+ACEXML_HttpCharStream::getSystemId ()
 {
   return this->url_;
 }
@@ -431,7 +431,7 @@ ACEXML_HttpCharStream::get (ACEXML_Char& ch)
 }
 
 int
-ACEXML_HttpCharStream::peek (void)
+ACEXML_HttpCharStream::peek ()
 {
   if (this->stream_ == 0)
     return -1;
@@ -469,7 +469,7 @@ ACEXML_HttpCharStream::get_i (ACEXML_Char& ch)
 }
 
 int
-ACEXML_HttpCharStream::peek_i (void)
+ACEXML_HttpCharStream::peek_i ()
 {
   // If we are reading a UTF-8 encoded file, just use the plain unget.
   if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0)
diff --git a/ACE/ACEXML/common/HttpCharStream.h b/ACE/ACEXML/common/HttpCharStream.h
index 24359adc767..f6d7cd167ad 100644
--- a/ACE/ACEXML/common/HttpCharStream.h
+++ b/ACE/ACEXML/common/HttpCharStream.h
@@ -31,10 +31,10 @@ class ACEXML_Export ACEXML_HttpCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_HttpCharStream (void);
+  ACEXML_HttpCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_HttpCharStream (void);
+  virtual ~ACEXML_HttpCharStream ();
 
   /// Open an URL.
   int open (const ACEXML_Char *url);
@@ -43,12 +43,12 @@ public:
    *  Returns the available ACEXML_Char in the buffer.  -1
    *  if the object is not initialized properly.
    */
-  virtual int available (void);
+  virtual int available ();
 
   /**
    *  Close this stream and release all resources used by it.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    *  Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -65,27 +65,27 @@ public:
    *  Peek the next ACEXML_Char in the CharStream.  Return the
    *  character if succeess, -1 if EOS is reached.
    */
-  virtual int peek (void);
+  virtual int peek ();
 
   /**
    *  Resets the file pointer to the beginning of the stream.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
   /**
    *  Determine the encoding of the file.
    */
-  virtual int determine_encoding (void);
+  virtual int determine_encoding ();
 
   /**
    * Get the encoding of the file
    */
-  virtual const ACEXML_Char* getEncoding (void);
+  virtual const ACEXML_Char* getEncoding ();
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void);
+  virtual const ACEXML_Char* getSystemId ();
 
 
 private:
@@ -101,14 +101,14 @@ private:
    *  encoding of the file. Subsequent call to get() returns this
    *  character.
    */
-  int peek_i (void);
+  int peek_i ();
 
 #endif /* ACE_USES_WCHAR */
 
   /**
    *  Send a HTTP/1.1 request to fetch the contents of the URL.
    */
-  int send_request (void);
+  int send_request ();
 
   /**
    *  Fetch the URL and save it in backing store.
diff --git a/ACE/ACEXML/common/InputSource.cpp b/ACE/ACEXML/common/InputSource.cpp
index 6d5a40ad2e4..a18405223bf 100644
--- a/ACE/ACEXML/common/InputSource.cpp
+++ b/ACE/ACEXML/common/InputSource.cpp
@@ -4,7 +4,7 @@
 #include "ACEXML/common/StreamFactory.h"
 #include "ace/ACE.h"
 
-ACEXML_InputSource::ACEXML_InputSource (void)
+ACEXML_InputSource::ACEXML_InputSource ()
   : charStream_ (0),
     encoding_ (0),
     publicId_ (0),
@@ -40,7 +40,7 @@ ACEXML_InputSource::ACEXML_InputSource (const ACEXML_Char *systemId)
     }
 }
 
-ACEXML_InputSource::~ACEXML_InputSource (void)
+ACEXML_InputSource::~ACEXML_InputSource ()
 {
   delete[] this->publicId_;
   this->publicId_ = 0;
diff --git a/ACE/ACEXML/common/Locator.cpp b/ACE/ACEXML/common/Locator.cpp
index 6e3b6341ad9..e055408b2ba 100644
--- a/ACE/ACEXML/common/Locator.cpp
+++ b/ACE/ACEXML/common/Locator.cpp
@@ -1,5 +1,5 @@
 #include "Locator.h"
 
-ACEXML_Locator::~ACEXML_Locator (void)
+ACEXML_Locator::~ACEXML_Locator ()
 {
 }
diff --git a/ACE/ACEXML/common/LocatorImpl.cpp b/ACE/ACEXML/common/LocatorImpl.cpp
index 96234be24a9..47501f57368 100644
--- a/ACE/ACEXML/common/LocatorImpl.cpp
+++ b/ACE/ACEXML/common/LocatorImpl.cpp
@@ -6,7 +6,7 @@
 # include "ACEXML/common/LocatorImpl.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_LocatorImpl::ACEXML_LocatorImpl (void)
+ACEXML_LocatorImpl::ACEXML_LocatorImpl ()
   : publicId_ (0),
     systemId_ (0),
     lineNumber_ (1),
@@ -32,13 +32,13 @@ ACEXML_LocatorImpl::ACEXML_LocatorImpl (const ACEXML_Locator& locator)
 {
 }
 
-ACEXML_LocatorImpl::~ACEXML_LocatorImpl (void)
+ACEXML_LocatorImpl::~ACEXML_LocatorImpl ()
 {
   this->reset();
 }
 
 void
-ACEXML_LocatorImpl::reset (void)
+ACEXML_LocatorImpl::reset ()
 {
   delete[] this->publicId_;
   this->publicId_ = 0;
diff --git a/ACE/ACEXML/common/Mem_Map_Stream.cpp b/ACE/ACEXML/common/Mem_Map_Stream.cpp
index 42a3cdb9881..dfcf04a48b7 100644
--- a/ACE/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACE/ACEXML/common/Mem_Map_Stream.cpp
@@ -4,7 +4,7 @@
 
 #include "ACEXML/common/Mem_Map_Stream.h"
 
-ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void)
+ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream ()
   : svc_handler_ (0),
     recv_pos_ (0),
     get_pos_ (0),
@@ -13,7 +13,7 @@ ACEXML_Mem_Map_Stream::ACEXML_Mem_Map_Stream (void)
 }
 
 ACE_SOCK_Stream &
-ACEXML_Mem_Map_Stream::stream (void)
+ACEXML_Mem_Map_Stream::stream ()
 {
   return svc_handler_->peer ();
 }
@@ -32,7 +32,7 @@ ACEXML_Mem_Map_Stream::eof () const
 }
 
 int
-ACEXML_Mem_Map_Stream::get_char (void)
+ACEXML_Mem_Map_Stream::get_char ()
 {
   if (this->eof () && this->grow_file_and_remap () == -1)
     return EOF;
@@ -40,7 +40,7 @@ ACEXML_Mem_Map_Stream::get_char (void)
 }
 
 void
-ACEXML_Mem_Map_Stream::rewind (void)
+ACEXML_Mem_Map_Stream::rewind ()
 {
   this->recv_pos_ = reinterpret_cast<char *> (this->mem_map_.addr ());
   this->get_pos_ = this->recv_pos_;
@@ -131,7 +131,7 @@ ACEXML_Mem_Map_Stream::seek (ACE_OFF_T offset, int whence)
 }
 
 Svc_Handler *
-ACEXML_Mem_Map_Stream::svc_handler (void)
+ACEXML_Mem_Map_Stream::svc_handler ()
 {
   return this->svc_handler_;
 }
@@ -187,7 +187,7 @@ ACEXML_Mem_Map_Stream::open (Connector *connector,
 }
 
 int
-ACEXML_Mem_Map_Stream::grow_file_and_remap (void)
+ACEXML_Mem_Map_Stream::grow_file_and_remap ()
 {
   char buf[8192];
 
@@ -256,7 +256,7 @@ ACEXML_Mem_Map_Stream::grow_file_and_remap (void)
   return 0;
 }
 
-ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void)
+ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream ()
 {
   // Remove the mapping and the file.
   this->mem_map_.remove ();
diff --git a/ACE/ACEXML/common/Mem_Map_Stream.h b/ACE/ACEXML/common/Mem_Map_Stream.h
index df450f5b624..716ea077f8c 100644
--- a/ACE/ACEXML/common/Mem_Map_Stream.h
+++ b/ACE/ACEXML/common/Mem_Map_Stream.h
@@ -53,17 +53,17 @@ class ACEXML_Export ACEXML_Mem_Map_Stream
 {
 public:
   /// Default constructor
-  ACEXML_Mem_Map_Stream (void);
+  ACEXML_Mem_Map_Stream ();
 
   /// Initialize this object.
   virtual int open (Connector *connector,
                     const ACE_INET_Addr &);
 
   /// Destructor.
-  virtual ~ACEXML_Mem_Map_Stream (void);
+  virtual ~ACEXML_Mem_Map_Stream ();
 
   /// Returns the underlying <ACE_SOCK_Stream>.
-  ACE_SOCK_Stream &stream (void);
+  ACE_SOCK_Stream &stream ();
 
   /**
    * Send <size> bytes in <buf> to the connected peer.  This is a
@@ -78,7 +78,7 @@ public:
    * position. Returns EOF when the <get> position reaches the end of the
    * HTTP stream.
    */
-  virtual int get_char (void);
+  virtual int get_char ();
 
   /**
    *  Returns a pointer to array of at most <len> characters starting at
@@ -111,7 +111,7 @@ public:
    *  This works since all the data has been cached in the memory-mapped
    *  backing store.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
   /**
    *  Returns the nth character <offset> from the <get> position in the
@@ -148,7 +148,7 @@ public:
   virtual int eof () const;
 
   /// Returns the underlying service handler.
-  Svc_Handler *svc_handler (void);
+  Svc_Handler *svc_handler ();
 
 private:
   /**
@@ -156,7 +156,7 @@ private:
    *  extend the mapping to cover this chunk.  Returns -1 on failure or
    *  EOF, else 0.
    */
-  int grow_file_and_remap (void);
+  int grow_file_and_remap ();
 
   /**
    *  Connection to peer. The granularity is at the Svc_Handler level.
diff --git a/ACE/ACEXML/common/NamespaceSupport.cpp b/ACE/ACEXML/common/NamespaceSupport.cpp
index 550a3011c82..938ad0bd23d 100644
--- a/ACE/ACEXML/common/NamespaceSupport.cpp
+++ b/ACE/ACEXML/common/NamespaceSupport.cpp
@@ -14,11 +14,11 @@ static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = ACE_TEXT ("xml");
 static const ACEXML_Char ACEXML_XMLNS_URI_name[] = ACE_TEXT ("http://www.w3.org/XML/1998/namespace");
 const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name;
 
-ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack (void)
+ACEXML_Namespace_Context_Stack::ACEXML_Namespace_Context_Stack ()
 {
 }
 
-ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack (void)
+ACEXML_Namespace_Context_Stack::~ACEXML_Namespace_Context_Stack ()
 {
   // Clean up stuff.
 }
@@ -30,7 +30,7 @@ ACEXML_Namespace_Context_Stack::push (ACEXML_NS_CONTEXT *nsc)
 }
 
 ACEXML_NS_CONTEXT *
-ACEXML_Namespace_Context_Stack::pop (void)
+ACEXML_Namespace_Context_Stack::pop ()
 {
   if (this->stack_.size() <= 0)
     return 0;
@@ -46,7 +46,7 @@ ACEXML_Namespace_Context_Stack::pop (void)
 }
 
 int
-ACEXML_NamespaceSupport::popContext (void)
+ACEXML_NamespaceSupport::popContext ()
 {
   delete this->effective_context_;
 
@@ -56,7 +56,7 @@ ACEXML_NamespaceSupport::popContext (void)
 }
 
 int
-ACEXML_NamespaceSupport::pushContext (void)
+ACEXML_NamespaceSupport::pushContext ()
 {
   ACEXML_NS_CONTEXT *temp = this->effective_context_;
   ACE_NEW_RETURN (this->effective_context_,
@@ -75,13 +75,13 @@ ACEXML_NamespaceSupport::pushContext (void)
   return 0;
 }
 
-ACEXML_NamespaceSupport::ACEXML_NamespaceSupport (void)
+ACEXML_NamespaceSupport::ACEXML_NamespaceSupport ()
   : ns_stack_ (),
     effective_context_ (0)
 {}
 
 int
-ACEXML_NamespaceSupport::init (void)
+ACEXML_NamespaceSupport::init ()
 {
   // @@ No way to tell if the new fails.
   ACE_NEW_RETURN (effective_context_, ACEXML_NS_CONTEXT(), -1);
@@ -91,7 +91,7 @@ ACEXML_NamespaceSupport::init (void)
   return this->effective_context_->bind (prefix, uri);
 }
 
-ACEXML_NamespaceSupport::~ACEXML_NamespaceSupport (void)
+ACEXML_NamespaceSupport::~ACEXML_NamespaceSupport ()
 {
   while (this->popContext () == 0)
     ;
@@ -238,7 +238,7 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
 }
 
 int
-ACEXML_NamespaceSupport::reset (void)
+ACEXML_NamespaceSupport::reset ()
 {
   while (this->popContext() != -1)
     ;
diff --git a/ACE/ACEXML/common/SAXExceptions.cpp b/ACE/ACEXML/common/SAXExceptions.cpp
index bca3d1e46b1..6eed2b94a8f 100644
--- a/ACE/ACEXML/common/SAXExceptions.cpp
+++ b/ACE/ACEXML/common/SAXExceptions.cpp
@@ -18,7 +18,7 @@ const ACEXML_Char ACEXML_SAXParseException::exception_name_[] = ACE_TEXT ("ACEXM
 # include "ACEXML/common/SAXExceptions.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_SAXException::ACEXML_SAXException (void)
+ACEXML_SAXException::ACEXML_SAXException ()
   : message_ (0)
 {
 }
@@ -53,7 +53,7 @@ ACEXML_SAXException::_downcast (ACEXML_Exception* ex)
   return dynamic_cast<ACEXML_SAXException*> (ex);
 }
 
-ACEXML_SAXException::~ACEXML_SAXException (void)
+ACEXML_SAXException::~ACEXML_SAXException ()
 {
   ACE::strdelete (this->message_);
 }
@@ -81,7 +81,7 @@ ACEXML_SAXException::print () const
               this->exception_name_, this->message()));
 }
 
-ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (void)
+ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException ()
 {
 }
 
@@ -109,7 +109,7 @@ ACEXML_SAXNotSupportedException::ACEXML_SAXNotSupportedException (const ACEXML_C
 {
 }
 
-ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException (void)
+ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException ()
 {
 }
 
@@ -138,7 +138,7 @@ ACEXML_SAXNotSupportedException::print () const
               this->exception_name_, this->message()));
 }
 
-ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException (void)
+ACEXML_SAXNotRecognizedException::ACEXML_SAXNotRecognizedException ()
 {
 }
 
@@ -165,7 +165,7 @@ ACEXML_SAXNotRecognizedException::_downcast (ACEXML_Exception* ex)
   return dynamic_cast<ACEXML_SAXNotRecognizedException*> (ex);
 }
 
-ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException (void)
+ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException ()
 {
 }
 
@@ -193,7 +193,7 @@ ACEXML_SAXNotRecognizedException::print () const
               this->exception_name_, this->message()));
 }
 
-ACEXML_SAXParseException::ACEXML_SAXParseException (void)
+ACEXML_SAXParseException::ACEXML_SAXParseException ()
 {
 }
 
@@ -220,7 +220,7 @@ ACEXML_SAXParseException::_downcast (ACEXML_Exception* ex)
   return dynamic_cast<ACEXML_SAXParseException*> (ex);
 }
 
-ACEXML_SAXParseException::~ACEXML_SAXParseException (void)
+ACEXML_SAXParseException::~ACEXML_SAXParseException ()
 {
 }
 
diff --git a/ACE/ACEXML/common/StrCharStream.cpp b/ACE/ACEXML/common/StrCharStream.cpp
index c64740d77e1..339bf4bd8fe 100644
--- a/ACE/ACEXML/common/StrCharStream.cpp
+++ b/ACE/ACEXML/common/StrCharStream.cpp
@@ -4,13 +4,13 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACEXML_StrCharStream::ACEXML_StrCharStream (void)
+ACEXML_StrCharStream::ACEXML_StrCharStream ()
   : start_ (0), ptr_ (0), end_ (0), encoding_ (0), name_ (0)
 {
 }
 
 
-ACEXML_StrCharStream::~ACEXML_StrCharStream (void)
+ACEXML_StrCharStream::~ACEXML_StrCharStream ()
 {
   this->close();
 }
@@ -34,7 +34,7 @@ ACEXML_StrCharStream::open (const ACEXML_Char *str, const ACEXML_Char* name)
 }
 
 int
-ACEXML_StrCharStream::available (void)
+ACEXML_StrCharStream::available ()
 {
   if (this->start_ != 0)
     return static_cast<int> (this->end_ - this->start_); // @@ Will this work on all platforms?
@@ -42,7 +42,7 @@ ACEXML_StrCharStream::available (void)
 }
 
 int
-ACEXML_StrCharStream::close (void)
+ACEXML_StrCharStream::close ()
 {
   delete[] this->start_;
   delete[] this->encoding_;
@@ -54,7 +54,7 @@ ACEXML_StrCharStream::close (void)
 }
 
 int
-ACEXML_StrCharStream::determine_encoding (void)
+ACEXML_StrCharStream::determine_encoding ()
 {
   if (this->start_ == 0)
     return -1;
@@ -76,7 +76,7 @@ ACEXML_StrCharStream::determine_encoding (void)
 }
 
 void
-ACEXML_StrCharStream::rewind (void)
+ACEXML_StrCharStream::rewind ()
 {
   this->ptr_ = this->start_;
   this->determine_encoding();
@@ -109,7 +109,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str, size_t len)
 }
 
 int
-ACEXML_StrCharStream::peek (void)
+ACEXML_StrCharStream::peek ()
 {
   if (this->start_ != 0 && this->ptr_ != this->end_)
     return *this->ptr_;
@@ -117,13 +117,13 @@ ACEXML_StrCharStream::peek (void)
 }
 
 const ACEXML_Char*
-ACEXML_StrCharStream::getEncoding (void)
+ACEXML_StrCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_StrCharStream::getSystemId(void)
+ACEXML_StrCharStream::getSystemId()
 {
   return this->name_;
 }
diff --git a/ACE/ACEXML/common/StrCharStream.h b/ACE/ACEXML/common/StrCharStream.h
index c3554ebbcc5..79eb26bcd9f 100644
--- a/ACE/ACEXML/common/StrCharStream.h
+++ b/ACE/ACEXML/common/StrCharStream.h
@@ -30,10 +30,10 @@ class ACEXML_Export ACEXML_StrCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_StrCharStream (void);
+  ACEXML_StrCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_StrCharStream (void);
+  virtual ~ACEXML_StrCharStream ();
 
   /// Initializing StrCharStream with @a str and @a name
   int open (const ACEXML_Char *str, const ACEXML_Char* name);
@@ -42,17 +42,17 @@ public:
    * Returns the available ACEXML_Char in the buffer.  -1
    * if the object is not initialized properly.
    */
-  virtual int available (void);
+  virtual int available ();
 
   /**
    * Close this stream and release all resources used by it.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    *  Determine the encoding of the file.
    */
-  virtual int determine_encoding (void);
+  virtual int determine_encoding ();
 
   /**
    * Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -69,22 +69,22 @@ public:
    * Peek the next ACEXML_Char in the CharStream.  Return the
    * character if succeess, -1 if EOS is reached.
    */
-  virtual int peek (void);
+  virtual int peek ();
 
   /*
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void);
+  virtual const ACEXML_Char *getEncoding ();
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void);
+  virtual const ACEXML_Char* getSystemId ();
 
   /**
    *  Resets the pointer to the beginning of the stream.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
 private:
   ACEXML_Char *start_;
diff --git a/ACE/ACEXML/common/StreamFactory.h b/ACE/ACEXML/common/StreamFactory.h
index 2149976b315..68d5bbf1460 100644
--- a/ACE/ACEXML/common/StreamFactory.h
+++ b/ACE/ACEXML/common/StreamFactory.h
@@ -37,7 +37,7 @@ class ACEXML_Export ACEXML_StreamFactory
 {
 public:
   // Destructor
-  virtual ~ACEXML_StreamFactory (void);
+  virtual ~ACEXML_StreamFactory ();
 
   /**
    *  Create the appropriate stream from the @a uri passed and return the
diff --git a/ACE/ACEXML/common/URL_Addr.cpp b/ACE/ACEXML/common/URL_Addr.cpp
index 673b4317956..ccd234d33d6 100644
--- a/ACE/ACEXML/common/URL_Addr.cpp
+++ b/ACE/ACEXML/common/URL_Addr.cpp
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_string.h"
 
-ACEXML_URL_Addr::ACEXML_URL_Addr (void)
+ACEXML_URL_Addr::ACEXML_URL_Addr ()
   : path_name_ (0),
     addr_string_ (0),
     addr_string_len_ (0)
@@ -166,7 +166,7 @@ ACEXML_URL_Addr::ACEXML_URL_Addr (const ACEXML_Char *host_name,
 {
 }
 
-ACEXML_URL_Addr::~ACEXML_URL_Addr (void)
+ACEXML_URL_Addr::~ACEXML_URL_Addr ()
 {
   ACE_OS::free (this->path_name_);
   ACE_OS::free (this->addr_string_);
diff --git a/ACE/ACEXML/common/URL_Addr.h b/ACE/ACEXML/common/URL_Addr.h
index 887834c0410..4d2e3f2c91a 100644
--- a/ACE/ACEXML/common/URL_Addr.h
+++ b/ACE/ACEXML/common/URL_Addr.h
@@ -30,7 +30,7 @@ class ACEXML_Export ACEXML_URL_Addr : public ACE_INET_Addr
 {
 public:
   /// Initialization and termination methods.
-  ACEXML_URL_Addr (void);
+  ACEXML_URL_Addr ();
 
   /// Constructor.
   ACEXML_URL_Addr (const ACEXML_Char *host_name,
@@ -89,7 +89,7 @@ public:
   void operator= (const ACEXML_URL_Addr &addr);
 
   /// Destructor.
-  ~ACEXML_URL_Addr (void);
+  ~ACEXML_URL_Addr ();
 
   /**
    *  Compare two addresses for equality.  The addresses are considered
@@ -107,7 +107,7 @@ public:
   const ACEXML_Char *get_path_name () const;
 
   /// Commit suicide.
-  int destroy (void);
+  int destroy ();
 
 private:
   /// Calculate the maximum length of the address string
diff --git a/ACE/ACEXML/common/XMLFilterImpl.cpp b/ACE/ACEXML/common/XMLFilterImpl.cpp
index c4519cfdb30..3a555931c45 100644
--- a/ACE/ACEXML/common/XMLFilterImpl.cpp
+++ b/ACE/ACEXML/common/XMLFilterImpl.cpp
@@ -6,7 +6,7 @@
 # include "ACEXML/common/XMLFilterImpl.inl"
 #endif /* __ACEXML_INLINE__ */
 
-ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (void)
+ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl ()
   :  parent_ (0),
      // locator_ (0),
      entityResolver_ (0),
@@ -26,7 +26,7 @@ ACEXML_XMLFilterImpl::ACEXML_XMLFilterImpl (ACEXML_XMLReader *parent)
 {
 }
 
-ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl (void)
+ACEXML_XMLFilterImpl::~ACEXML_XMLFilterImpl ()
 {
   // @@ How are all the object lifecycles managed?
 }
@@ -118,7 +118,7 @@ ACEXML_XMLFilterImpl::characters (const ACEXML_Char *ch,
 }
 
 void
-ACEXML_XMLFilterImpl::endDocument (void)
+ACEXML_XMLFilterImpl::endDocument ()
 {
   if (this->contentHandler_ != 0)
     this->contentHandler_->endDocument ();
@@ -177,7 +177,7 @@ ACEXML_XMLFilterImpl::skippedEntity (const ACEXML_Char *name)
 }
 
 void
-ACEXML_XMLFilterImpl::startDocument (void)
+ACEXML_XMLFilterImpl::startDocument ()
 {
   if (this->contentHandler_ != 0)
     this->contentHandler_->startDocument ();
diff --git a/ACE/ACEXML/common/XMLFilterImpl.h b/ACE/ACEXML/common/XMLFilterImpl.h
index ad5034372d9..c982068214d 100644
--- a/ACE/ACEXML/common/XMLFilterImpl.h
+++ b/ACE/ACEXML/common/XMLFilterImpl.h
@@ -41,7 +41,7 @@ public:
   /**
    * Default constructor.  Create with no parent.
    */
-  ACEXML_XMLFilterImpl (void);
+  ACEXML_XMLFilterImpl ();
 
   /**
    * Construct an XML filter with the specified parent.
@@ -51,7 +51,7 @@ public:
   /**
    * Destructor.
    */
-  virtual ~ACEXML_XMLFilterImpl (void);
+  virtual ~ACEXML_XMLFilterImpl ();
 
   /*
    * Look up the value of a feature.
@@ -143,7 +143,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void);
+  virtual void endDocument ();
 
   /*
    * Receive notification of the end of an element.
@@ -183,7 +183,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void);
+  virtual void startDocument ();
 
   /*
    * Receive notification of the beginning of an element.
@@ -241,7 +241,7 @@ public:
    */
   virtual void warning (ACEXML_SAXParseException &exception);
 protected:
-  int setupParser (void);
+  int setupParser ();
   // Set up the event handlers of parent parser to this.
   // Returns -1 if no valid parent is set.
 
diff --git a/ACE/ACEXML/common/XMLReader.cpp b/ACE/ACEXML/common/XMLReader.cpp
index 4a82e875257..74247fe0850 100644
--- a/ACE/ACEXML/common/XMLReader.cpp
+++ b/ACE/ACEXML/common/XMLReader.cpp
@@ -1,5 +1,5 @@
 #include "XMLReader.h"
 
-ACEXML_XMLReader::~ACEXML_XMLReader (void)
+ACEXML_XMLReader::~ACEXML_XMLReader ()
 {
 }
diff --git a/ACE/ACEXML/common/ZipCharStream.cpp b/ACE/ACEXML/common/ZipCharStream.cpp
index 4b54cf73e31..7dcf3a9b47c 100644
--- a/ACE/ACEXML/common/ZipCharStream.cpp
+++ b/ACE/ACEXML/common/ZipCharStream.cpp
@@ -4,13 +4,13 @@
 #include "ace/ACE.h"
 
 
-ACEXML_ZipCharStream::ACEXML_ZipCharStream (void)
+ACEXML_ZipCharStream::ACEXML_ZipCharStream ()
   : filename_ (0), encoding_ (0), size_ (0), infile_ (0), pos_ (0),
     limit_ (0)
 {
 }
 
-ACEXML_ZipCharStream::~ACEXML_ZipCharStream (void)
+ACEXML_ZipCharStream::~ACEXML_ZipCharStream ()
 {
   this->close();
 }
@@ -33,7 +33,7 @@ ACEXML_ZipCharStream::open (const ACEXML_Char *name)
 }
 
 int
-ACEXML_ZipCharStream::determine_encoding (void)
+ACEXML_ZipCharStream::determine_encoding ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -82,7 +82,7 @@ ACEXML_ZipCharStream::rewind()
 }
 
 int
-ACEXML_ZipCharStream::available (void)
+ACEXML_ZipCharStream::available ()
 {
   if (this->infile_ == 0)
     return -1;
@@ -93,7 +93,7 @@ ACEXML_ZipCharStream::available (void)
 }
 
 int
-ACEXML_ZipCharStream::close (void)
+ACEXML_ZipCharStream::close ()
 {
   if (this->infile_ != 0)
     {
@@ -182,7 +182,7 @@ ACEXML_ZipCharStream::get (ACEXML_Char& ch)
 
 
 int
-ACEXML_ZipCharStream::peek (void)
+ACEXML_ZipCharStream::peek ()
 {
 #if defined (ACE_USES_WCHAR)
   return this->peek_i();
@@ -192,13 +192,13 @@ ACEXML_ZipCharStream::peek (void)
 }
 
 const ACEXML_Char*
-ACEXML_ZipCharStream::getEncoding (void)
+ACEXML_ZipCharStream::getEncoding ()
 {
   return this->encoding_;
 }
 
 const ACEXML_Char*
-ACEXML_ZipCharStream::getSystemId (void)
+ACEXML_ZipCharStream::getSystemId ()
 {
   return this->filename_;
 }
@@ -226,7 +226,7 @@ ACEXML_ZipCharStream::get_i (ACEXML_Char& ch)
 }
 
 int
-ACEXML_ZipCharStream::peek_i (void)
+ACEXML_ZipCharStream::peek_i ()
 {
   // If we are reading a UTF-8 encoded file, just use the plain unget.
   if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0)
diff --git a/ACE/ACEXML/common/ZipCharStream.h b/ACE/ACEXML/common/ZipCharStream.h
index 44bc4132c71..3940583088e 100644
--- a/ACE/ACEXML/common/ZipCharStream.h
+++ b/ACE/ACEXML/common/ZipCharStream.h
@@ -38,10 +38,10 @@ class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_ZipCharStream (void);
+  ACEXML_ZipCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_ZipCharStream (void);
+  virtual ~ACEXML_ZipCharStream ();
 
   /// Open a file.
   int open (const ACEXML_Char *name);
@@ -50,12 +50,12 @@ public:
    * Returns the available ACEXML_Char in the buffer.  -1
    * if the object is not initialized properly.
    */
-  virtual int available (void);
+  virtual int available ();
 
   /**
    * Close this stream and release all resources used by it.
    */
-  virtual int close (void);
+  virtual int close ();
 
   /**
    * Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -71,29 +71,29 @@ public:
   /**
    *  Determine the encoding of the file.
    */
-  virtual int determine_encoding (void);
+  virtual int determine_encoding ();
 
 
   /**
    * Peek the next ACEXML_Char in the CharStream.  Return the
    * character if success, -1 if EOF is reached.
    */
-  virtual int peek (void);
+  virtual int peek ();
 
   /**
    *  Resets the file pointer to the beginning of the stream.
    */
-  virtual void rewind (void);
+  virtual void rewind ();
 
   /*
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void);
+  virtual const ACEXML_Char *getEncoding ();
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void);
+  virtual const ACEXML_Char* getSystemId ();
 
 protected:
   /** Read the next character as a normal character. Return -1 if EOF is
@@ -120,7 +120,7 @@ private:
    *  encoding of the file. Subsequent call to get() returns this
    *  character.
    */
-  int peek_i (void);
+  int peek_i ();
 
 #endif /* ACE_USES_WCHAR */
 
diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp
index 8b6ccdc374d..d63a112808f 100644
--- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp
+++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.cpp
@@ -10,7 +10,7 @@ ACEXML_Print_Handler::ACEXML_Print_Handler (ACEXML_Char* fileName)
 {
 }
 
-ACEXML_Print_Handler::~ACEXML_Print_Handler (void)
+ACEXML_Print_Handler::~ACEXML_Print_Handler ()
 {
   delete[] this->fileName_;
 }
@@ -26,7 +26,7 @@ ACEXML_Print_Handler::characters (const ACEXML_Char *cdata,
 }
 
 void
-ACEXML_Print_Handler::endDocument (void)
+ACEXML_Print_Handler::endDocument ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("* Event endDocument () ***************\n")));
@@ -84,7 +84,7 @@ ACEXML_Print_Handler::skippedEntity (const ACEXML_Char *name)
 }
 
 void
-ACEXML_Print_Handler::startDocument (void)
+ACEXML_Print_Handler::startDocument ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("* Event startDocument () ***************\n")));
diff --git a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h
index da8381f50de..ea4359b2b69 100644
--- a/ACE/ACEXML/examples/SAXPrint/Print_Handler.h
+++ b/ACE/ACEXML/examples/SAXPrint/Print_Handler.h
@@ -30,7 +30,7 @@ public:
   /*
    * Default destructor.
    */
-  virtual ~ACEXML_Print_Handler (void);
+  virtual ~ACEXML_Print_Handler ();
 
   // Methods inherited from ACEXML_ContentHandler.
 
@@ -44,7 +44,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void);
+  virtual void endDocument ();
 
   /*
    * Receive notification of the end of an element.
@@ -84,7 +84,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void);
+  virtual void startDocument ();
 
   /*
    * Receive notification of the beginning of an element.
diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
index 371f404427c..ae1fbc605ec 100644
--- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
+++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp
@@ -13,7 +13,7 @@ ACEXML_SAXPrint_Handler::ACEXML_SAXPrint_Handler (const ACEXML_Char* filename)
 {
 }
 
-ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler (void)
+ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler ()
 {
   delete [] this->fileName_;
 }
@@ -29,7 +29,7 @@ ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata,
 }
 
 void
-ACEXML_SAXPrint_Handler::endDocument (void)
+ACEXML_SAXPrint_Handler::endDocument ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
 }
@@ -92,7 +92,7 @@ ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name)
 }
 
 void
-ACEXML_SAXPrint_Handler::startDocument (void)
+ACEXML_SAXPrint_Handler::startDocument ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("* Event startDocument () ***************\n")));
@@ -194,7 +194,7 @@ ACEXML_SAXPrint_Handler::warning (ACEXML_SAXParseException & ex)
 }
 
 void
-ACEXML_SAXPrint_Handler::print_indent (void)
+ACEXML_SAXPrint_Handler::print_indent ()
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
   for (size_t i = 0; i < this->indent_; ++i)
diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h
index b940c467836..02ce2487386 100644
--- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h
+++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h
@@ -30,7 +30,7 @@ public:
   /*
    * Default destructor.
    */
-  virtual ~ACEXML_SAXPrint_Handler (void);
+  virtual ~ACEXML_SAXPrint_Handler ();
 
   // Methods inherit from ACEXML_ContentHandler.
 
@@ -45,7 +45,7 @@ public:
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void)
+  virtual void endDocument ()
     ;
 
   /*
@@ -86,7 +86,7 @@ public:
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void);
+  virtual void startDocument ();
 
   /*
    * Receive notification of the beginning of an element.
diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
index 6a34134531a..586b503cbec 100644
--- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
+++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp
@@ -28,7 +28,7 @@ ACEXML_Debug_Attribute_Builder::setName (const ACEXML_Char *n)
 }
 
 const ACEXML_Char *
-ACEXML_Debug_Attribute_Builder::getName (void)
+ACEXML_Debug_Attribute_Builder::getName ()
 {
   return this->name_.fast_rep ();
 }
@@ -63,14 +63,14 @@ ACEXML_Debug_Attribute_Builder::setDefault (const DEFAULT_DECL def,
 }
 
 int
-ACEXML_Debug_Attribute_Builder::validAttr (void)
+ACEXML_Debug_Attribute_Builder::validAttr ()
 {
   // @@ Not implemented.  Always return 1 (true) for now.
   return 1;
 }
 
 void
-ACEXML_Debug_Attribute_Builder::dump (void)
+ACEXML_Debug_Attribute_Builder::dump ()
 {
   cout << this->name_ << " ";
 
@@ -188,7 +188,7 @@ ACEXML_Debug_Attributes_Builder::insertAttribute (
 }
 
 void
-ACEXML_Debug_Attributes_Builder::dump (void)
+ACEXML_Debug_Attributes_Builder::dump ()
 {
   // @@ Print print.
   cout << "<!ATTLIST " << this->element_name_ << endl;
diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
index bd3906bbc87..df6fac84210 100644
--- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
+++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.h
@@ -43,7 +43,7 @@ public:
    * Specify the name of the attribute.
    */
   virtual int setName (const ACEXML_Char *n);
-  virtual const ACEXML_Char *getName (void);
+  virtual const ACEXML_Char *getName ();
 
   /**
    * Set the attribute type.
@@ -65,13 +65,13 @@ public:
    *
    * @retval 0 if the attribute is not a valid combo.
    */
-  virtual int validAttr (void);
+  virtual int validAttr ();
 
 
   /**
    * Dump the content of the attribute definition.
    */
-  virtual void dump (void);
+  virtual void dump ();
 private:
   /// Attribute name.
   ACEXML_String name_;
@@ -147,7 +147,7 @@ public:
   /**
    * Dump the content of the attribute definition.
    */
-  virtual void dump (void);
+  virtual void dump ();
 protected:
   /// The name of the element type these attributes applied.
   ACEXML_String element_name_;
diff --git a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h
index 1e63e8646c7..4f3e4e0cb65 100644
--- a/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h
+++ b/ACE/ACEXML/parser/debug_validator/Debug_Element_Builder.h
@@ -101,7 +101,7 @@ public:
   /**
    * Dump the content of the attribute definition.
    */
-  virtual void dump (void);
+  virtual void dump ();
 private:
   CONTENT_TYPE type_;
 
diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp
index f0aea3fdb8b..d98812167aa 100644
--- a/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp
+++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp
@@ -19,7 +19,7 @@ ACEXML_Element_Tree_Name_Node::dump ()
 
 ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_Name_Node)
 
-ACEXML_Element_Tree_List_Node::~ACEXML_Element_Tree_List_Node (void)
+ACEXML_Element_Tree_List_Node::~ACEXML_Element_Tree_List_Node ()
 {
   delete this->head_;
 }
@@ -40,7 +40,7 @@ ACEXML_Element_Tree_List_Node::insert (ACEXML_Element_Tree_Node *node)
 }
 
 void
-ACEXML_Element_Tree_List_Node::dump (void)
+ACEXML_Element_Tree_List_Node::dump ()
 {
   ACEXML_Element_Tree_Node *ptr = this->head_;
   const ACEXML_Char *separator = (this->type_ == SEQUENCE) ? ACE_TEXT(" , ") : ACE_TEXT(" | ");
diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.h b/ACE/ACEXML/parser/debug_validator/Element_Tree.h
index 24dc90e5269..71fae9b6a77 100644
--- a/ACE/ACEXML/parser/debug_validator/Element_Tree.h
+++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.h
@@ -97,16 +97,16 @@ public:
   } LIST_TYPE;
 
   /// Default constructor.
-  ACEXML_Element_Tree_List_Node (void);
+  ACEXML_Element_Tree_List_Node ();
 
   /// Destructor.
-  virtual ~ACEXML_Element_Tree_List_Node (void);
+  virtual ~ACEXML_Element_Tree_List_Node ();
 
   /// Insert a new ACEXML_Element_Tree_Node into the list.
   int insert (ACEXML_Element_Tree_Node *node);
 
   /// Get/set the type of list.
-  LIST_TYPE get (void);
+  LIST_TYPE get ();
   int set (LIST_TYPE type);
 
   virtual void dump ();
@@ -136,11 +136,11 @@ public:
 
   void push (ACEXML_Element_Tree_List_Node *n);
 
-  ACEXML_Element_Tree_List_Node *pop (void);
+  ACEXML_Element_Tree_List_Node *pop ();
 
-  ACEXML_Element_Tree_List_Node *top (void);
+  ACEXML_Element_Tree_List_Node *top ();
 
-  int empty (void);
+  int empty ();
 
   ACE_ALLOC_HOOK_DECLARE;
 
diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.cpp b/ACE/ACEXML/parser/parser/Entity_Manager.cpp
index b9efe5a89d8..a73cbb1b7ea 100644
--- a/ACE/ACEXML/parser/parser/Entity_Manager.cpp
+++ b/ACE/ACEXML/parser/parser/Entity_Manager.cpp
@@ -5,12 +5,12 @@
 #endif /* __ACEXML_INLINE__ */
 
 
-ACEXML_Entity_Manager::ACEXML_Entity_Manager (void)
+ACEXML_Entity_Manager::ACEXML_Entity_Manager ()
   : entities_ (0)
 {
 }
 
-ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void)
+ACEXML_Entity_Manager::~ACEXML_Entity_Manager ()
 {
   this->reset();
 }
diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp
index a722a7cfe7b..48196f26723 100644
--- a/ACE/ACEXML/parser/parser/Parser.cpp
+++ b/ACE/ACEXML/parser/parser/Parser.cpp
@@ -28,7 +28,7 @@ ACEXML_Parser::namespace_prefixes_feature_[] = ACE_TEXT ("http://xml.org/sax/fea
 const ACEXML_Char
 ACEXML_Parser::validation_feature_[] = ACE_TEXT ("http://xml.org/sax/features/validation");
 
-ACEXML_Parser::ACEXML_Parser (void)
+ACEXML_Parser::ACEXML_Parser ()
   :   dtd_handler_ (0),
       entity_resolver_ (0),
       content_handler_ (0),
@@ -51,7 +51,7 @@ ACEXML_Parser::ACEXML_Parser (void)
 {
 }
 
-ACEXML_Parser::~ACEXML_Parser (void)
+ACEXML_Parser::~ACEXML_Parser ()
 {
 }
 
@@ -202,7 +202,7 @@ ACEXML_Parser::parse (ACEXML_InputSource *input)
 }
 
 int
-ACEXML_Parser::parse_doctypedecl (void)
+ACEXML_Parser::parse_doctypedecl ()
 {
   if (this->parse_token (ACE_TEXT ("DOCTYPE")) < 0)
     {
@@ -262,7 +262,7 @@ ACEXML_Parser::parse_doctypedecl (void)
 }
 
 int
-ACEXML_Parser::parse_internal_dtd (void)
+ACEXML_Parser::parse_internal_dtd ()
 {
   this->ref_state_ = ACEXML_ParserInt::IN_INT_DTD;
   ACEXML_Char nextch = this->skip_whitespace ();
@@ -306,7 +306,7 @@ ACEXML_Parser::parse_internal_dtd (void)
 }
 
 int
-ACEXML_Parser::parse_external_dtd (void)
+ACEXML_Parser::parse_external_dtd ()
 {
   this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD;
   ACEXML_Char* publicId = 0;
@@ -348,7 +348,7 @@ ACEXML_Parser::parse_external_dtd (void)
 
 
 int
-ACEXML_Parser::parse_external_subset (void)
+ACEXML_Parser::parse_external_subset ()
 {
   this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD;
   this->external_subset_ = 1;
@@ -395,7 +395,7 @@ ACEXML_Parser::parse_external_subset (void)
 }
 
 int
-ACEXML_Parser::parse_conditional_section (void)
+ACEXML_Parser::parse_conditional_section ()
 {
   ACEXML_Char ch = this->get ();
   int include = 0;
@@ -457,7 +457,7 @@ ACEXML_Parser::parse_conditional_section (void)
 }
 
 int
-ACEXML_Parser::parse_ignoresect (void)
+ACEXML_Parser::parse_ignoresect ()
 {
   ACEXML_Char nextch = this->skip_whitespace();
   int count = 0;
@@ -510,7 +510,7 @@ ACEXML_Parser::parse_ignoresect (void)
 }
 
 int
-ACEXML_Parser::parse_includesect (void)
+ACEXML_Parser::parse_includesect ()
 {
   ACEXML_Char nextch = this->skip_whitespace();
   do {
@@ -561,7 +561,7 @@ ACEXML_Parser::parse_includesect (void)
 }
 
 int
-ACEXML_Parser::parse_markup_decl (void)
+ACEXML_Parser::parse_markup_decl ()
 {
   ACEXML_Char nextch = this->peek ();
   switch (nextch)
@@ -1003,7 +1003,7 @@ ACEXML_Parser::parse_content (const ACEXML_Char* startname,
 
 
 int
-ACEXML_Parser::parse_cdata (void)
+ACEXML_Parser::parse_cdata ()
 {
   if (this->parse_token (ACE_TEXT ("[CDATA[")) < 0)
     {
@@ -1041,7 +1041,7 @@ ACEXML_Parser::parse_cdata (void)
 
 
 int
-ACEXML_Parser::parse_entity_decl (void)
+ACEXML_Parser::parse_entity_decl ()
 {
   ACEXML_Char nextch = 0;
 
@@ -1168,7 +1168,7 @@ ACEXML_Parser::parse_entity_decl (void)
 }
 
 int
-ACEXML_Parser::parse_attlist_decl (void)
+ACEXML_Parser::parse_attlist_decl ()
 {
   if (this->parse_token (ACE_TEXT ("ATTLIST")) < 0)
     {
@@ -1227,7 +1227,7 @@ ACEXML_Parser::parse_attlist_decl (void)
 }
 
 int
-ACEXML_Parser::check_for_PE_reference (void)
+ACEXML_Parser::check_for_PE_reference ()
 {
   ACEXML_Char fwd = '\xFF';
   // Skip any leading whitespaces and store the number of such chars skipped
@@ -1261,7 +1261,7 @@ ACEXML_Parser::check_for_PE_reference (void)
 }
 
 ACEXML_Char*
-ACEXML_Parser::parse_attname (void)
+ACEXML_Parser::parse_attname ()
 {
   // Parse attribute name
   ACEXML_Char *att_name = this->parse_name ();
@@ -1273,7 +1273,7 @@ ACEXML_Parser::parse_attname (void)
 }
 
 int
-ACEXML_Parser::parse_defaultdecl (void)
+ACEXML_Parser::parse_defaultdecl ()
 {
   // DefaultDecl ::=  '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue)
   ACEXML_Char nextch = this->peek ();
@@ -1333,7 +1333,7 @@ ACEXML_Parser::parse_defaultdecl (void)
 }
 
 int
-ACEXML_Parser::parse_tokenized_type (void)
+ACEXML_Parser::parse_tokenized_type ()
 {
   ACEXML_Char ch = this->get();
   switch (ch)
@@ -1451,7 +1451,7 @@ ACEXML_Parser::parse_tokenized_type (void)
  *                                  [VC: Enumeration]
  */
 int
-ACEXML_Parser::parse_atttype (void)
+ACEXML_Parser::parse_atttype ()
 {
   ACEXML_Char nextch = this->peek();
   switch (nextch)
@@ -1546,7 +1546,7 @@ ACEXML_Parser::parse_atttype (void)
 }
 
 int
-ACEXML_Parser::parse_notation_decl (void)
+ACEXML_Parser::parse_notation_decl ()
 {
   if (this->parse_token (ACE_TEXT ("NOTATION")) < 0)
     {
@@ -1610,7 +1610,7 @@ ACEXML_Parser::parse_notation_decl (void)
 }
 
 int
-ACEXML_Parser::parse_element_decl (void)
+ACEXML_Parser::parse_element_decl ()
 {
   if (this->parse_token (ACE_TEXT ("LEMENT")) < 0)
     {
@@ -1664,7 +1664,7 @@ ACEXML_Parser::parse_element_decl (void)
 
 
 int
-ACEXML_Parser::parse_children_definition (void)
+ACEXML_Parser::parse_children_definition ()
 {
   this->get ();                 // consume the '('
   this->check_for_PE_reference ();
@@ -1901,7 +1901,7 @@ ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t& len)
 }
 
 ACEXML_Char*
-ACEXML_Parser::parse_reference_name (void)
+ACEXML_Parser::parse_reference_name ()
 {
   ACEXML_Char ch = this->get ();
   if (!this->isLetter (ch) && (ch != '_' && ch != ':'))
@@ -1995,7 +1995,7 @@ ACEXML_Parser::parse_attvalue (ACEXML_Char *&str)
 }
 
 int
-ACEXML_Parser::parse_entity_reference (void)
+ACEXML_Parser::parse_entity_reference ()
 {
   ACEXML_Char* replace = this->parse_reference_name ();
   if (replace == 0)
@@ -2121,7 +2121,7 @@ ACEXML_Parser::parse_entity_reference (void)
 }
 
 int
-ACEXML_Parser::parse_PE_reference (void)
+ACEXML_Parser::parse_PE_reference ()
 {
   ACEXML_Char* replace = this->parse_reference_name ();
   if (replace == 0)
@@ -2681,7 +2681,7 @@ ACEXML_Parser::fatal_error (const ACEXML_Char* msg)
 }
 
 void
-ACEXML_Parser::parse_version_info (void)
+ACEXML_Parser::parse_version_info ()
 {
   ACEXML_Char* astring;
   if (this->parse_token (ACE_TEXT("ersion")) < 0
@@ -2699,7 +2699,7 @@ ACEXML_Parser::parse_version_info (void)
 }
 
 void
-ACEXML_Parser::parse_encoding_decl (void)
+ACEXML_Parser::parse_encoding_decl ()
 {
   ACEXML_Char* astring = 0;
   if ((this->parse_token (ACE_TEXT("ncoding")) < 0)
@@ -2720,7 +2720,7 @@ ACEXML_Parser::parse_encoding_decl (void)
 }
 
 int
-ACEXML_Parser::parse_text_decl (void)
+ACEXML_Parser::parse_text_decl ()
 {
   // Read xml
   if (this->parse_token (ACE_TEXT("xml")) < 0)
@@ -2754,7 +2754,7 @@ ACEXML_Parser::parse_text_decl (void)
 }
 
 void
-ACEXML_Parser::parse_xml_decl (void)
+ACEXML_Parser::parse_xml_decl ()
 {
   // Read <?xml
   if (this->parse_token (ACE_TEXT("xml")) < 0)
@@ -2800,7 +2800,7 @@ ACEXML_Parser::parse_xml_decl (void)
 }
 
 int
-ACEXML_Parser::parse_comment (void)
+ACEXML_Parser::parse_comment ()
 {
   int state = 0;
 
@@ -2825,7 +2825,7 @@ ACEXML_Parser::parse_comment (void)
 }
 
 int
-ACEXML_Parser::parse_processing_instruction (void)
+ACEXML_Parser::parse_processing_instruction ()
 {
   const ACEXML_Char *pitarget = this->parse_name ();
   ACEXML_Char *instruction = 0;
@@ -2871,7 +2871,7 @@ ACEXML_Parser::parse_processing_instruction (void)
 }
 
 void
-ACEXML_Parser::reset (void)
+ACEXML_Parser::reset ()
 {
   this->doctype_ = 0;
   if (this->ctx_stack_.pop (this->current_) == -1)
diff --git a/ACE/ACEXML/tests/ContentHandler_Test.cpp b/ACE/ACEXML/tests/ContentHandler_Test.cpp
index fc905ac7e6c..4e4231e7d6f 100644
--- a/ACE/ACEXML/tests/ContentHandler_Test.cpp
+++ b/ACE/ACEXML/tests/ContentHandler_Test.cpp
@@ -23,7 +23,7 @@ public:
                            size_t start,
                            size_t length);
 
-  const ACEXML_Char *get_test_string (void)
+  const ACEXML_Char *get_test_string ()
     { return Basic_Content_Tester::test_string_; }
 
 private: