Remove redundant void

24 files changed, 165 insertions, 165 deletions

diff --git a/ACE/ACEXML/common/Attributes.h b/ACE/ACEXML/common/Attributes.h
index 9d171838fd0..71482c30654 100644
--- a/ACE/ACEXML/common/Attributes.h
+++ b/ACE/ACEXML/common/Attributes.h
@@ -57,7 +57,7 @@ class ACEXML_Export ACEXML_Attributes
 public:
 
   /// Destructor.
-  virtual ~ACEXML_Attributes (void);
+  virtual ~ACEXML_Attributes ();
 
   /**
    * Look up the index of an attribute by XML 1.0 qualified name.
@@ -73,7 +73,7 @@ public:
   /**
    * Return the number of attributes in the list.
    */
-  virtual size_t getLength (void) = 0;
+  virtual size_t getLength () = 0;
 
   /**
    * Look up an attribute's local name by index.
diff --git a/ACE/ACEXML/common/CharStream.h b/ACE/ACEXML/common/CharStream.h
index 0f7a08c831b..555c04b204a 100644
--- a/ACE/ACEXML/common/CharStream.h
+++ b/ACE/ACEXML/common/CharStream.h
@@ -33,18 +33,18 @@ public:
   /**
    * Virtual destructor, must have.
    */
-  virtual ~ACEXML_CharStream (void) = 0;
+  virtual ~ACEXML_CharStream () = 0;
 
   /**
    * Returns the available ACEXML_Char in the buffer.  -1
    * if the object is not initialized properly.
    */
-  virtual int available (void) = 0;
+  virtual int available () = 0;
 
   /**
    * Close this stream and release all resources used by it.
    */
-  virtual int close (void) = 0;
+  virtual int close () = 0;
 
   /**
    * Read the next ACEXML_Char.  Return -1 if we are not able to
@@ -61,22 +61,22 @@ public:
    * Peek the next ACEXML_Char in the CharStream.  Return the
    * character if succeess, -1 if EOS is reached.
    */
-  virtual int peek (void) = 0;
+  virtual int peek () = 0;
 
   /**
    *  Resets the pointer to the beginning of the stream.
    */
-  virtual void rewind (void) = 0;
+  virtual void rewind () = 0;
 
   /*
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void)  = 0;
+  virtual const ACEXML_Char *getEncoding ()  = 0;
 
   /*
    * Get the systemId for the underlying CharStream
    */
-  virtual const ACEXML_Char* getSystemId (void) = 0;
+  virtual const ACEXML_Char* getSystemId () = 0;
 
 };
 
diff --git a/ACE/ACEXML/common/ContentHandler.h b/ACE/ACEXML/common/ContentHandler.h
index 89669818d0c..f5e88c150e0 100644
--- a/ACE/ACEXML/common/ContentHandler.h
+++ b/ACE/ACEXML/common/ContentHandler.h
@@ -43,7 +43,7 @@ class ACEXML_Export ACEXML_ContentHandler
 {
 public:
 
-  virtual ~ACEXML_ContentHandler (void);
+  virtual ~ACEXML_ContentHandler ();
 
   /**
    * Receive notification of character data.
@@ -55,7 +55,7 @@ public:
   /**
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (void) = 0;
+  virtual void endDocument () = 0;
 
   /**
    * Receive notification of the end of an element.
@@ -95,7 +95,7 @@ public:
   /**
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (void) = 0;
+  virtual void startDocument () = 0;
 
   /**
    * Receive notification of the beginning of an element.
diff --git a/ACE/ACEXML/common/DTDHandler.h b/ACE/ACEXML/common/DTDHandler.h
index cd17dd8d543..52f701ccb02 100644
--- a/ACE/ACEXML/common/DTDHandler.h
+++ b/ACE/ACEXML/common/DTDHandler.h
@@ -49,7 +49,7 @@ class ACEXML_Export ACEXML_DTDHandler
 {
 public:
 
-  virtual ~ACEXML_DTDHandler (void);
+  virtual ~ACEXML_DTDHandler ();
 
   /**
    * Receive notification of a notation declaration event.
diff --git a/ACE/ACEXML/common/DefaultHandler.h b/ACE/ACEXML/common/DefaultHandler.h
index f02d01c3e07..7107a5158c7 100644
--- a/ACE/ACEXML/common/DefaultHandler.h
+++ b/ACE/ACEXML/common/DefaultHandler.h
@@ -50,12 +50,12 @@ public:
   /**
    * Default constructor.
    */
-  ACEXML_DefaultHandler (void);
+  ACEXML_DefaultHandler ();
 
   /**
    * destructor.
    */
-  virtual ~ACEXML_DefaultHandler (void);
+  virtual ~ACEXML_DefaultHandler ();
 
   // Methods inherit from ACEXML_ContentHandler.
 
@@ -69,7 +69,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.
@@ -109,7 +109,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/common/EntityResolver.h b/ACE/ACEXML/common/EntityResolver.h
index 7ab61eb451a..b2b143c34e3 100644
--- a/ACE/ACEXML/common/EntityResolver.h
+++ b/ACE/ACEXML/common/EntityResolver.h
@@ -42,7 +42,7 @@ class ACEXML_Export ACEXML_EntityResolver
 {
 public:
 
-  virtual ~ACEXML_EntityResolver (void);
+  virtual ~ACEXML_EntityResolver ();
 
   /**
    * Allow the application to resolve external entities.
diff --git a/ACE/ACEXML/common/ErrorHandler.h b/ACE/ACEXML/common/ErrorHandler.h
index 50706cfca77..72c8fb4a1a8 100644
--- a/ACE/ACEXML/common/ErrorHandler.h
+++ b/ACE/ACEXML/common/ErrorHandler.h
@@ -45,7 +45,7 @@ class ACEXML_Export ACEXML_ErrorHandler
 {
 public:
 
-  virtual ~ACEXML_ErrorHandler (void);
+  virtual ~ACEXML_ErrorHandler ();
 
   /**
    * Receive notification of a recoverable error.
diff --git a/ACE/ACEXML/common/Exception.h b/ACE/ACEXML/common/Exception.h
index 6e7005b9fbf..8520b2cfc2f 100644
--- a/ACE/ACEXML/common/Exception.h
+++ b/ACE/ACEXML/common/Exception.h
@@ -36,29 +36,29 @@ class ACEXML_Export ACEXML_Exception
 public:
 
   /// Destructor.
-  virtual ~ACEXML_Exception (void);
+  virtual ~ACEXML_Exception ();
 
   /// Throw the exception.
-  virtual void _raise (void) = 0;
+  virtual void _raise () = 0;
 
   /// Static narrow operation.
   static ACEXML_Exception* _downcast (ACEXML_Exception* ex);
 
   /// Return the exception type.  (for safe downcast.)
-  virtual const ACEXML_Char *id (void) const ;
+  virtual const ACEXML_Char *id () const ;
 
   /// Dynamically create a copy of this exception.
-  virtual ACEXML_Exception *duplicate (void) const = 0;
+  virtual ACEXML_Exception *duplicate () const = 0;
 
   /// Check whether this is an exception of type specified by <name>.
   virtual int is_a (const ACEXML_Char *name);
 
   /// Print out exception using ACE_DEBUG.
-  virtual void print (void) const = 0;
+  virtual void print () const = 0;
 
 protected:
   /// Default constructor.
-  ACEXML_Exception (void);
+  ACEXML_Exception ();
 
   /// All exceptions have names.  This name is used to identify the
   /// type of an exception.
diff --git a/ACE/ACEXML/common/Exception.inl b/ACE/ACEXML/common/Exception.inl
index 515546bc4c7..f1d086757d4 100644
--- a/ACE/ACEXML/common/Exception.inl
+++ b/ACE/ACEXML/common/Exception.inl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_Exception::id (void) const
+ACEXML_Exception::id () const
 {
   return ACEXML_Exception::exception_name_;
 }
diff --git a/ACE/ACEXML/common/FileCharStream.h b/ACE/ACEXML/common/FileCharStream.h
index 74d140c585e..bb2f0ec5e2c 100644
--- a/ACE/ACEXML/common/FileCharStream.h
+++ b/ACE/ACEXML/common/FileCharStream.h
@@ -30,10 +30,10 @@ class ACEXML_Export ACEXML_FileCharStream : public ACEXML_CharStream
 {
 public:
   /// Default constructor.
-  ACEXML_FileCharStream (void);
+  ACEXML_FileCharStream ();
 
   /// Destructor
-  virtual ~ACEXML_FileCharStream (void);
+  virtual ~ACEXML_FileCharStream ();
 
   /// Open a file.
   int open (const ACEXML_Char *name);
@@ -48,12 +48,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
@@ -70,29 +70,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 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:
 
diff --git a/ACE/ACEXML/common/InputSource.h b/ACE/ACEXML/common/InputSource.h
index 4642ec70aa1..d95303e6755 100644
--- a/ACE/ACEXML/common/InputSource.h
+++ b/ACE/ACEXML/common/InputSource.h
@@ -55,7 +55,7 @@ public:
   /**
    * Default constructor.
    */
-  ACEXML_InputSource (void);
+  ACEXML_InputSource ();
 
 
   /**
@@ -73,27 +73,27 @@ public:
   /**
    * Default destructor.
    */
-  virtual ~ACEXML_InputSource (void);
+  virtual ~ACEXML_InputSource ();
 
   /**
    * Get the ACEXML_Char stream for this input source.
    */
-  virtual ACEXML_CharStream *getCharStream (void) const;
+  virtual ACEXML_CharStream *getCharStream () const;
 
   /**
    * Get the character encoding for a byte stream or URI.
    */
-  virtual const ACEXML_Char *getEncoding (void) const;
+  virtual const ACEXML_Char *getEncoding () const;
 
   /**
    * Get the public identifier for this input source.
    */
-  virtual const ACEXML_Char *getPublicId (void) const;
+  virtual const ACEXML_Char *getPublicId () const;
 
   /**
    * Get the system identifier for this input source.
    */
-  virtual const ACEXML_Char *getSystemId (void) const;
+  virtual const ACEXML_Char *getSystemId () const;
 
   /**
    * Set the ACEXML_Char stream for this input source.
diff --git a/ACE/ACEXML/common/Locator.h b/ACE/ACEXML/common/Locator.h
index c4282454657..14f27aefb99 100644
--- a/ACE/ACEXML/common/Locator.h
+++ b/ACE/ACEXML/common/Locator.h
@@ -43,27 +43,27 @@ class ACEXML_Export ACEXML_Locator
 {
 public:
 
-  virtual ~ACEXML_Locator (void);
+  virtual ~ACEXML_Locator ();
 
   /*
    * Return the column number where the current document event ends.
    */
-  virtual int getColumnNumber (void) const = 0;
+  virtual int getColumnNumber () const = 0;
 
   /*
    * Return the line number where the current document event ends.
    */
-  virtual int getLineNumber (void) const = 0;
+  virtual int getLineNumber () const = 0;
 
   /*
    * Return the public identifier for the current document event.
    */
-  virtual const ACEXML_Char *getPublicId (void) const = 0;
+  virtual const ACEXML_Char *getPublicId () const = 0;
 
   /*
    * Return the system identifier for the current document event.
    */
-  virtual const ACEXML_Char *getSystemId (void) const = 0;
+  virtual const ACEXML_Char *getSystemId () const = 0;
 };
 
 
diff --git a/ACE/ACEXML/common/LocatorImpl.h b/ACE/ACEXML/common/LocatorImpl.h
index b927ebc7fcc..4a118122b7c 100644
--- a/ACE/ACEXML/common/LocatorImpl.h
+++ b/ACE/ACEXML/common/LocatorImpl.h
@@ -65,7 +65,7 @@ public:
   /*
    * Default constructor.
    */
-  ACEXML_LocatorImpl (void);
+  ACEXML_LocatorImpl ();
 
   /**
    * Construct a locator with systemId and publicId
@@ -84,27 +84,27 @@ public:
   /*
    * Destructor.
    */
-  virtual ~ACEXML_LocatorImpl (void);
+  virtual ~ACEXML_LocatorImpl ();
 
   /*
    * Return the column number where the current document event ends.
    */
-  virtual int getColumnNumber (void) const;
+  virtual int getColumnNumber () const;
 
   /*
    * Return the line number where the current document event ends.
    */
-  virtual int getLineNumber (void) const;
+  virtual int getLineNumber () const;
 
   /*
    * Return the public identifier for the current document event.
    */
-  virtual const ACEXML_Char *getPublicId (void) const;
+  virtual const ACEXML_Char *getPublicId () const;
 
   /*
    * Return the system identifier for the current document event.
    */
-  virtual const ACEXML_Char *getSystemId (void) const;
+  virtual const ACEXML_Char *getSystemId () const;
 
   /*
    * Set the column number of this locator.
@@ -142,7 +142,7 @@ public:
    * tying the life of the Locator with the parser is not appropriate. The
    * parser calls this method as soon as issuing an endDocument() call.
    */
-  void reset (void);
+  void reset ();
 
 private:
   ACEXML_Char *publicId_;
diff --git a/ACE/ACEXML/common/LocatorImpl.inl b/ACE/ACEXML/common/LocatorImpl.inl
index 1b4c6bc0d33..6802b38eea8 100644
--- a/ACE/ACEXML/common/LocatorImpl.inl
+++ b/ACE/ACEXML/common/LocatorImpl.inl
@@ -15,13 +15,13 @@ ACEXML_LocatorImpl::setLineNumber (int ln)
 }
 
 ACEXML_INLINE int
-ACEXML_LocatorImpl::getColumnNumber (void) const
+ACEXML_LocatorImpl::getColumnNumber () const
 {
   return this->columnNumber_;
 }
 
 ACEXML_INLINE int
-ACEXML_LocatorImpl::getLineNumber (void) const
+ACEXML_LocatorImpl::getLineNumber () const
 {
   return this->lineNumber_;
 }
@@ -41,13 +41,13 @@ ACEXML_LocatorImpl::setSystemId (const ACEXML_Char *id)
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_LocatorImpl::getPublicId (void) const
+ACEXML_LocatorImpl::getPublicId () const
 {
   return this->publicId_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_LocatorImpl::getSystemId (void) const
+ACEXML_LocatorImpl::getSystemId () const
 {
   return this->systemId_;
 }
diff --git a/ACE/ACEXML/common/NamespaceSupport.h b/ACE/ACEXML/common/NamespaceSupport.h
index fdef9fa0786..7ddf776214d 100644
--- a/ACE/ACEXML/common/NamespaceSupport.h
+++ b/ACE/ACEXML/common/NamespaceSupport.h
@@ -60,16 +60,16 @@ class ACEXML_Export ACEXML_Namespace_Context_Stack
 {
 public:
   /// Default constructor.
-  ACEXML_Namespace_Context_Stack (void);
+  ACEXML_Namespace_Context_Stack ();
 
   /// Destructor.
-  ~ACEXML_Namespace_Context_Stack (void);
+  ~ACEXML_Namespace_Context_Stack ();
 
   /// Push the old namespace before entering into a new namespace scope.
   int push (ACEXML_NS_CONTEXT * old);
 
   /// Pop the old namespace when exiting a namespace scope.
-  ACEXML_NS_CONTEXT *pop (void);
+  ACEXML_NS_CONTEXT *pop ();
 
 private:
   /// Internal stack structure to hold namespace context.
@@ -126,17 +126,17 @@ public:
   /**
    * Default constructor.
    */
-  ACEXML_NamespaceSupport (void);
+  ACEXML_NamespaceSupport ();
 
   /**
    * Default destructor.
    */
-  ~ACEXML_NamespaceSupport (void);
+  ~ACEXML_NamespaceSupport ();
 
   /**
    *  Initialize the namespace support object
    */
-  int init(void);
+  int init();
 
   /**
    * XMLNS default prefix and URI strings.
@@ -185,7 +185,7 @@ public:
   /**
    * Revert to the previous namespace context.
    */
-  int popContext (void);
+  int popContext ();
 
   /**
    * Process a raw XML 1.0 name.
@@ -205,13 +205,13 @@ public:
    * Start a new Namespace context.  Prefixes defined in previous
    * context are copied over to the new context.
    */
-  int pushContext (void);
+  int pushContext ();
 
   /**
    * Reset this Namespace support object for reuse.
    *
    */
-  int reset (void);
+  int reset ();
 
 private:
   /**
diff --git a/ACE/ACEXML/common/SAXExceptions.h b/ACE/ACEXML/common/SAXExceptions.h
index c47594e846b..60db0a865a8 100644
--- a/ACE/ACEXML/common/SAXExceptions.h
+++ b/ACE/ACEXML/common/SAXExceptions.h
@@ -31,7 +31,7 @@ class ACEXML_Export ACEXML_SAXException : public ACEXML_Exception
 {
 public:
   /// Default constructor.
-  ACEXML_SAXException (void);
+  ACEXML_SAXException ();
 
   /// Constructor initializing the exception message.
   ACEXML_SAXException (const ACEXML_Char *msg);
@@ -43,25 +43,25 @@ public:
   ACEXML_SAXException (const ACEXML_SAXException &ex);
 
   /// Destructor.
-  virtual ~ACEXML_SAXException (void);
+  virtual ~ACEXML_SAXException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXException* _downcast (ACEXML_Exception* ex);
 
   /// Return the name of the exception.
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
   /// Return the extra message accompanying the exception.
-  const ACEXML_Char *message (void) const;
+  const ACEXML_Char *message () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char * exception_name_;
@@ -80,7 +80,7 @@ class ACEXML_Export ACEXML_SAXNotSupportedException
 {
 public:
   /// Default constructor.
-  ACEXML_SAXNotSupportedException (void);
+  ACEXML_SAXNotSupportedException ();
 
   /// Copy constructor.
   ACEXML_SAXNotSupportedException (const ACEXML_SAXNotSupportedException &ex);
@@ -92,21 +92,21 @@ public:
   ACEXML_SAXNotSupportedException (const ACEXML_Char* msg);
 
   /// Destructor.
-  virtual ~ACEXML_SAXNotSupportedException (void);
+  virtual ~ACEXML_SAXNotSupportedException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXNotSupportedException* _downcast (ACEXML_Exception* ex);
 
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char exception_name_[];
@@ -122,7 +122,7 @@ class ACEXML_Export ACEXML_SAXNotRecognizedException
 {
 public:
   /// Default constructor.
-  ACEXML_SAXNotRecognizedException (void);
+  ACEXML_SAXNotRecognizedException ();
 
   /// Constructor with an initializing exception message.
   ACEXML_SAXNotRecognizedException (const ACEXML_Char *msg);
@@ -134,21 +134,21 @@ public:
   ACEXML_SAXNotRecognizedException& operator= (const ACEXML_SAXNotRecognizedException &ex);
 
   /// Destructor.
-  virtual ~ACEXML_SAXNotRecognizedException (void);
+  virtual ~ACEXML_SAXNotRecognizedException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXNotRecognizedException* _downcast (ACEXML_Exception* ex);
 
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char exception_name_[];
@@ -164,7 +164,7 @@ class ACEXML_Export ACEXML_SAXParseException
 {
 public:
   /// Default constructor.
-  ACEXML_SAXParseException (void);
+  ACEXML_SAXParseException ();
 
   /// Constructor with an initializing exception message.
   ACEXML_SAXParseException (const ACEXML_Char *msg);
@@ -176,21 +176,21 @@ public:
   ACEXML_SAXParseException& operator= (const ACEXML_SAXParseException &ex);
 
   /// Destructor.
-  virtual ~ACEXML_SAXParseException (void);
+  virtual ~ACEXML_SAXParseException ();
 
   /// Throw the exception.
-  virtual void _raise (void);
+  virtual void _raise ();
 
   /// Static narrow operation.
   static ACEXML_SAXParseException* _downcast (ACEXML_Exception* ex);
 
-  virtual const ACEXML_Char *id (void) const;
+  virtual const ACEXML_Char *id () const;
 
-  virtual ACEXML_Exception *duplicate (void) const;
+  virtual ACEXML_Exception *duplicate () const;
 
   virtual int is_a (const ACEXML_Char *name);
 
-  virtual void print (void) const;
+  virtual void print () const;
 
 protected:
   static const ACEXML_Char exception_name_[];
diff --git a/ACE/ACEXML/common/SAXExceptions.inl b/ACE/ACEXML/common/SAXExceptions.inl
index 798d6b0d2ae..404af3198a2 100644
--- a/ACE/ACEXML/common/SAXExceptions.inl
+++ b/ACE/ACEXML/common/SAXExceptions.inl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXException::message (void) const
+ACEXML_SAXException::message () const
 {
   return (this->message_ == 0 ?
           ACEXML_Exception::null_ :
@@ -9,49 +9,49 @@ ACEXML_SAXException::message (void) const
 }
 
 ACEXML_INLINE void
-ACEXML_SAXException::_raise (void)
+ACEXML_SAXException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE void
-ACEXML_SAXNotSupportedException::_raise (void)
+ACEXML_SAXNotSupportedException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE void
-ACEXML_SAXNotRecognizedException::_raise (void)
+ACEXML_SAXNotRecognizedException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE void
-ACEXML_SAXParseException::_raise (void)
+ACEXML_SAXParseException::_raise ()
 {
   throw *this;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXException::id (void) const
+ACEXML_SAXException::id () const
 {
   return ACEXML_SAXException::exception_name_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXNotSupportedException::id (void) const
+ACEXML_SAXNotSupportedException::id () const
 {
   return ACEXML_SAXNotSupportedException::exception_name_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXNotRecognizedException::id (void) const
+ACEXML_SAXNotRecognizedException::id () const
 {
   return ACEXML_SAXNotRecognizedException::exception_name_;
 }
 
 ACEXML_INLINE const ACEXML_Char *
-ACEXML_SAXParseException::id (void) const
+ACEXML_SAXParseException::id () const
 {
   return ACEXML_SAXParseException::exception_name_;
 }
diff --git a/ACE/ACEXML/common/XMLReader.h b/ACE/ACEXML/common/XMLReader.h
index 7f35d3cc156..a335291fc3e 100644
--- a/ACE/ACEXML/common/XMLReader.h
+++ b/ACE/ACEXML/common/XMLReader.h
@@ -41,27 +41,27 @@ class ACEXML_Export ACEXML_XMLReader
 {
 public:
 
-  virtual ~ACEXML_XMLReader (void);
+  virtual ~ACEXML_XMLReader ();
 
   /**
    * Return the current content handler.
    */
-  virtual ACEXML_ContentHandler *getContentHandler (void) const = 0;
+  virtual ACEXML_ContentHandler *getContentHandler () const = 0;
 
   /**
    * Return the current DTD handler.
    */
-  virtual ACEXML_DTDHandler *getDTDHandler (void) const = 0;
+  virtual ACEXML_DTDHandler *getDTDHandler () const = 0;
 
   /**
    * Return the current entity resolver.
    */
-  virtual ACEXML_EntityResolver *getEntityResolver (void) const = 0;
+  virtual ACEXML_EntityResolver *getEntityResolver () const = 0;
 
   /**
    * Return the current error handler.
    */
-  virtual ACEXML_ErrorHandler *getErrorHandler (void) const = 0;
+  virtual ACEXML_ErrorHandler *getErrorHandler () const = 0;
 
   /**
    * Look up the value of a feature.  This method allows
diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.h b/ACE/ACEXML/parser/parser/Entity_Manager.h
index a6da00bf8a5..f4a65b13f2b 100644
--- a/ACE/ACEXML/parser/parser/Entity_Manager.h
+++ b/ACE/ACEXML/parser/parser/Entity_Manager.h
@@ -61,10 +61,10 @@ class ACEXML_PARSER_Export ACEXML_Entity_Manager
 {
 public:
   /// Default constructor.
-  ACEXML_Entity_Manager (void);
+  ACEXML_Entity_Manager ();
 
   /// Destructor.
-  ~ACEXML_Entity_Manager (void);
+  ~ACEXML_Entity_Manager ();
 
   /// Add a new entity declaration.
   int add_entity (const ACEXML_Char *ref, const ACEXML_Char *value);
@@ -78,10 +78,10 @@ public:
                       ACEXML_Char*& publicId);
 
   /// Number of items in the Entity Manager
-  size_t size(void) const;
+  size_t size() const;
 
   /// Reset the state
-  int reset (void);
+  int reset ();
 
 private:
   ACEXML_ENTITIES_MANAGER* entities_;
diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.inl b/ACE/ACEXML/parser/parser/Entity_Manager.inl
index 9deab95fcc6..cdf3fb42164 100644
--- a/ACE/ACEXML/parser/parser/Entity_Manager.inl
+++ b/ACE/ACEXML/parser/parser/Entity_Manager.inl
@@ -47,7 +47,7 @@ ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char* ref,
 }
 
 ACEXML_INLINE int
-ACEXML_Entity_Manager::reset (void)
+ACEXML_Entity_Manager::reset ()
 {
   delete this->entities_;
   this->entities_ = 0;
@@ -56,7 +56,7 @@ ACEXML_Entity_Manager::reset (void)
 
 
 ACEXML_INLINE size_t
-ACEXML_Entity_Manager::size (void) const
+ACEXML_Entity_Manager::size () const
 {
   if (!this->entities_)
     return 0;
diff --git a/ACE/ACEXML/parser/parser/Parser.h b/ACE/ACEXML/parser/parser/Parser.h
index 64a330c3273..49a728be1b0 100644
--- a/ACE/ACEXML/parser/parser/Parser.h
+++ b/ACE/ACEXML/parser/parser/Parser.h
@@ -43,10 +43,10 @@ class ACEXML_PARSER_Export ACEXML_Parser : public ACEXML_XMLReader
 {
 public:
   /// Default constructor.
-  ACEXML_Parser (void);
+  ACEXML_Parser ();
 
   /// Destructor.
-  virtual ~ACEXML_Parser (void);
+  virtual ~ACEXML_Parser ();
 
   /**
    *  Initialize the parser state.
@@ -58,22 +58,22 @@ public:
    /**
    * Return the current content handler.
    */
-  virtual ACEXML_ContentHandler *getContentHandler (void) const;
+  virtual ACEXML_ContentHandler *getContentHandler () const;
 
   /*
    * Return the current DTD handler.
    */
-  virtual ACEXML_DTDHandler *getDTDHandler (void) const;
+  virtual ACEXML_DTDHandler *getDTDHandler () const;
 
   /*
    * Return the current entity resolver.
    */
-  virtual ACEXML_EntityResolver *getEntityResolver (void) const;
+  virtual ACEXML_EntityResolver *getEntityResolver () const;
 
   /*
    * Return the current error handler.
    */
-  virtual ACEXML_ErrorHandler *getErrorHandler (void) const;
+  virtual ACEXML_ErrorHandler *getErrorHandler () const;
 
   /**
    * Look up the value of a feature.  This method allows
@@ -136,30 +136,30 @@ protected:
   /**
    * Parse XML Prolog.
    */
-  void parse_xml_prolog (void);
+  void parse_xml_prolog ();
 
   /**
    * Parse VersionInfo declaration.
    *
    */
-  void parse_version_info (void);
+  void parse_version_info ();
 
   /**
    *  Parse a EncodingDecl declaration.
    *
    */
-  void parse_encoding_decl (void);
+  void parse_encoding_decl ();
 
   /**
    *  Parse a XMLDecl declaration.
    *
    */
-  void parse_xml_decl (void);
+  void parse_xml_decl ();
 
   /**
    *  Parse a TextDecl declaration.
    */
-  int parse_text_decl (void);
+  int parse_text_decl ();
 
   /**
    * Parse a PI statement.  The first character encountered
@@ -167,13 +167,13 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_processing_instruction (void);
+  int parse_processing_instruction ();
 
   /**
    * Parse the DOCTYPE declaration.  The first character encountered
    * should always be  'D' in doctype prefix: "@<@!DOCTYPE".
    */
-  int parse_doctypedecl (void);
+  int parse_doctypedecl ();
 
   /**
    * Parse an XML element.  The first character encountered should
@@ -218,7 +218,7 @@ protected:
    *
    * @retval  A pointer to name of reference, 0 otherwise.
    */
-  ACEXML_Char* parse_reference_name (void);
+  ACEXML_Char* parse_reference_name ();
 
   /**
    * Parse a CDATA section.  The first character should always be the first
@@ -227,19 +227,19 @@ protected:
    * @retval 0 on success.
    * @retval -1 if fail.
    */
-  int parse_cdata (void);
+  int parse_cdata ();
 
   /**
    * Parse a "markupdecl" section, this includes both "markupdecl" and
    * "DeclSep" sections in XML specification
    */
-  int parse_internal_dtd (void);
+  int parse_internal_dtd ();
 
   /**
    *  Skip over a comment. The first character encountered should always be
    *  the first '-' in the comment prefix "@<@!--".
    */
-  int parse_comment (void);
+  int parse_comment ();
 
   /**
    * Parse an "ELEMENT" decl.  The first character this method
@@ -248,7 +248,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_element_decl (void);
+  int parse_element_decl ();
 
   /**
    * Parse an "ENTITY" decl.  The first character this method expects
@@ -256,7 +256,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_entity_decl (void);
+  int parse_entity_decl ();
 
   /**
    * Parse an "ATTLIST" decl.  Thse first character this method
@@ -265,13 +265,13 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_attlist_decl (void);
+  int parse_attlist_decl ();
 
   /**
    * Parse a AttType declaration.
    *
    */
-  int parse_atttype (void);
+  int parse_atttype ();
 
   /**
    *Parse a "NOTATION" decl.  The first character this method
@@ -280,7 +280,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_notation_decl (void);
+  int parse_notation_decl ();
 
   /**
    * Parse an ExternalID or a reference to PUBLIC ExternalID.
@@ -308,50 +308,50 @@ protected:
    *  Parse an external DTD.
    *
    */
-  int parse_external_dtd (void);
+  int parse_external_dtd ();
 
   /**
    *  Parse an external subset. This does the actual parsing of an external
    *  subset and is called by @sa parse_external_dtd.
    *
    */
-  int parse_external_subset (void);
+  int parse_external_subset ();
 
   /**
    *  Parse a markupDecl section.
    *
    */
-  int parse_markup_decl (void);
+  int parse_markup_decl ();
 
   /**
    *  Parse a conditionalSect declaration.
    *
    */
-  int parse_conditional_section (void);
+  int parse_conditional_section ();
 
   /**
    *  Parse a includeSect declaration.
    *
    */
-  int parse_includesect (void);
+  int parse_includesect ();
 
   /**
    *
    *  Parse a ignoreSect declaration.
    */
-  int parse_ignoresect (void);
+  int parse_ignoresect ();
 
   /**
    * Parse a PEReference.
    *
    */
-  int parse_PE_reference (void);
+  int parse_PE_reference ();
 
   /**
    *  Parse a Reference.
    *
    */
-  int parse_entity_reference (void);
+  int parse_entity_reference ();
 
   /**
    *  Parse an entityValue.
@@ -363,7 +363,7 @@ protected:
    *  Parse a DefaultDecl specification.
    *
    */
-  int parse_defaultdecl (void);
+  int parse_defaultdecl ();
 
 
   /**
@@ -374,7 +374,7 @@ protected:
    *
    * @retval 0 on success, -1 otherwise.
    */
-  int parse_children_definition (void);
+  int parse_children_definition ();
 
   /**
    * Parse a @c cp non-terminal.  @c cp can either be a @c seq or a @c choice.
@@ -443,7 +443,7 @@ protected:
    *             if successful.
    *  @retval 0 otherwise.
    */
-  ACEXML_Char* parse_attname (void);
+  ACEXML_Char* parse_attname ();
 
   /**
    *  Parse an attribute value.
@@ -458,7 +458,7 @@ protected:
    *
    *  @return 0 if attribute type was read successfully, -1 otherwise.
    */
-  int parse_tokenized_type (void);
+  int parse_tokenized_type ();
 
   /**
    *  Parse a SystemLiteral.
@@ -554,10 +554,10 @@ protected:
   int isPubidChar (const ACEXML_Char c) const;
 
   /// Get a character.
-  virtual ACEXML_Char get (void);
+  virtual ACEXML_Char get ();
 
   /// Peek a character.
-  virtual ACEXML_Char peek (void);
+  virtual ACEXML_Char peek ();
 
 private:
 
@@ -571,7 +571,7 @@ private:
    *
    * @sa skip_whitespace_count
    */
-  ACEXML_Char skip_whitespace (void);
+  ACEXML_Char skip_whitespace ();
 
   /**
    * Skip any whitespaces encountered until the first non-whitespace
@@ -594,7 +594,7 @@ private:
    *
    * @retval 0 when succeeds, -1 if no equal sign is found.
    */
-  int skip_equal (void);
+  int skip_equal ();
 
   /**
    * Get a quoted string.  Quoted strings are used to specify
@@ -683,13 +683,13 @@ private:
    *
    * @retval Number of whitespace characters skipped.
    */
-  int check_for_PE_reference (void);
+  int check_for_PE_reference ();
 
   /**
    *  Reset the parser state.
    *
    */
-  void reset (void);
+  void reset ();
 
   /**
    * Very trivial, non-conformant normalization of a systemid.
diff --git a/ACE/ACEXML/parser/parser/Parser.inl b/ACE/ACEXML/parser/parser/Parser.inl
index 57b1a77d2c5..8ec7eb0fe52 100644
--- a/ACE/ACEXML/parser/parser/Parser.inl
+++ b/ACE/ACEXML/parser/parser/Parser.inl
@@ -7,25 +7,25 @@
 //=============================================================================
 
 ACEXML_INLINE ACEXML_ContentHandler *
-ACEXML_Parser::getContentHandler (void) const
+ACEXML_Parser::getContentHandler () const
 {
   return this->content_handler_;
 }
 
 ACEXML_INLINE ACEXML_DTDHandler *
-ACEXML_Parser::getDTDHandler (void) const
+ACEXML_Parser::getDTDHandler () const
 {
   return this->dtd_handler_;
 }
 
 ACEXML_INLINE ACEXML_EntityResolver *
-ACEXML_Parser::getEntityResolver (void) const
+ACEXML_Parser::getEntityResolver () const
 {
   return this->entity_resolver_;
 }
 
 ACEXML_INLINE ACEXML_ErrorHandler *
-ACEXML_Parser::getErrorHandler (void) const
+ACEXML_Parser::getErrorHandler () const
 {
   return this->error_handler_;
 }
@@ -171,7 +171,7 @@ ACEXML_Parser::is_whitespace (const ACEXML_Char c) const
 }
 
 ACEXML_INLINE ACEXML_Char
-ACEXML_Parser::skip_whitespace (void)
+ACEXML_Parser::skip_whitespace ()
 {
   ACEXML_Char ch = this->get();
   while (this->is_whitespace (ch))
@@ -193,7 +193,7 @@ ACEXML_Parser::skip_whitespace_count (ACEXML_Char *peeky)
 }
 
 ACEXML_INLINE int
-ACEXML_Parser::skip_equal (void)
+ACEXML_Parser::skip_equal ()
 {
   if (this->skip_whitespace() != '=')
     return -1;
@@ -203,7 +203,7 @@ ACEXML_Parser::skip_equal (void)
 }
 
 ACEXML_INLINE ACEXML_Char
-ACEXML_Parser::get (void)
+ACEXML_Parser::get ()
 {
   ACEXML_Char ch = 0;
   const ACEXML_InputSource* ip = this->current_->getInputSource();
@@ -231,7 +231,7 @@ ACEXML_Parser::get (void)
 }
 
 ACEXML_INLINE ACEXML_Char
-ACEXML_Parser::peek (void)
+ACEXML_Parser::peek ()
 {
   // Using an extra level of indirection so we can
   // manage document location in the future.
diff --git a/ACE/ACEXML/parser/parser/ParserContext.h b/ACE/ACEXML/parser/parser/ParserContext.h
index 0ac64628d1d..9264273940b 100644
--- a/ACE/ACEXML/parser/parser/ParserContext.h
+++ b/ACE/ACEXML/parser/parser/ParserContext.h
@@ -44,13 +44,13 @@ public:
   /// Reset the parser context. This does not free up the memory. Only sets
   /// it to zero. Meant to be called after a context is pushed on to a
   /// stack.
-  void reset (void);
+  void reset ();
 
   /// Get the underlying input source.
-  virtual ACEXML_InputSource* getInputSource(void);
+  virtual ACEXML_InputSource* getInputSource();
 
   /// Get the underlying locator.
-  virtual ACEXML_LocatorImpl* getLocator(void);
+  virtual ACEXML_LocatorImpl* getLocator();
 
   /// Set the underlying input source.
   virtual void setInputSource(ACEXML_InputSource* ip);
diff --git a/ACE/ACEXML/parser/parser/ParserContext.inl b/ACE/ACEXML/parser/parser/ParserContext.inl
index e2921519cbe..31bae2cd47a 100644
--- a/ACE/ACEXML/parser/parser/ParserContext.inl
+++ b/ACE/ACEXML/parser/parser/ParserContext.inl
@@ -43,13 +43,13 @@ ACEXML_Parser_Context::operator= (const ACEXML_Parser_Context& src)
 
 
 ACEXML_INLINE ACEXML_InputSource*
-ACEXML_Parser_Context::getInputSource (void)
+ACEXML_Parser_Context::getInputSource ()
 {
   return this->instream_;
 }
 
 ACEXML_INLINE ACEXML_LocatorImpl*
-ACEXML_Parser_Context::getLocator (void)
+ACEXML_Parser_Context::getLocator ()
 {
   return this->locator_;
 }
@@ -67,7 +67,7 @@ ACEXML_Parser_Context::setLocator (ACEXML_LocatorImpl* locator)
 }
 
 ACEXML_INLINE void
-ACEXML_Parser_Context::reset (void)
+ACEXML_Parser_Context::reset ()
 {
   this->instream_ = 0;
   this->locator_ = 0;