summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-12-17 14:26:43 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-12-17 14:26:43 +0100
commit924369e56549553d522ee19dee6d0e41d991859c (patch)
treee3a6d791831e75e2c264e55fb6fc41aef751168c
parent5b15b048b81764d2519877337c1967f855c6a1da (diff)
downloadATCD-924369e56549553d522ee19dee6d0e41d991859c.tar.gz
Remove redundant void
-rw-r--r--ACE/ACEXML/common/Attributes.h4
-rw-r--r--ACE/ACEXML/common/CharStream.h14
-rw-r--r--ACE/ACEXML/common/ContentHandler.h6
-rw-r--r--ACE/ACEXML/common/DTDHandler.h2
-rw-r--r--ACE/ACEXML/common/DefaultHandler.h8
-rw-r--r--ACE/ACEXML/common/EntityResolver.h2
-rw-r--r--ACE/ACEXML/common/ErrorHandler.h2
-rw-r--r--ACE/ACEXML/common/Exception.h12
-rw-r--r--ACE/ACEXML/common/Exception.inl2
-rw-r--r--ACE/ACEXML/common/FileCharStream.h18
-rw-r--r--ACE/ACEXML/common/InputSource.h12
-rw-r--r--ACE/ACEXML/common/Locator.h10
-rw-r--r--ACE/ACEXML/common/LocatorImpl.h14
-rw-r--r--ACE/ACEXML/common/LocatorImpl.inl8
-rw-r--r--ACE/ACEXML/common/NamespaceSupport.h18
-rw-r--r--ACE/ACEXML/common/SAXExceptions.h50
-rw-r--r--ACE/ACEXML/common/SAXExceptions.inl18
-rw-r--r--ACE/ACEXML/common/XMLReader.h10
-rw-r--r--ACE/ACEXML/parser/parser/Entity_Manager.h8
-rw-r--r--ACE/ACEXML/parser/parser/Entity_Manager.inl4
-rw-r--r--ACE/ACEXML/parser/parser/Parser.h80
-rw-r--r--ACE/ACEXML/parser/parser/Parser.inl16
-rw-r--r--ACE/ACEXML/parser/parser/ParserContext.h6
-rw-r--r--ACE/ACEXML/parser/parser/ParserContext.inl6
-rw-r--r--ACE/Kokyu/Kokyu_defs.inl4
-rw-r--r--ACE/ace/Abstract_Timer_Queue.h22
-rw-r--r--ACE/ace/Arg_Shifter.cpp14
-rw-r--r--ACE/ace/Arg_Shifter.h14
-rw-r--r--ACE/ace/ETCL/ETCL_Constraint.h106
-rw-r--r--ACE/ace/ETCL/ETCL_Constraint.inl58
-rw-r--r--ACE/ace/ETCL/ETCL_Interpreter.h8
-rw-r--r--ACE/ace/Event_Handler_Handle_Timeout_Upcall.h4
-rw-r--r--ACE/ace/Logging_Strategy.h8
-rw-r--r--ACE/ace/Monitor_Base.h34
-rw-r--r--ACE/ace/Monitor_Base.inl10
-rw-r--r--ACE/ace/Monitor_Control_Types.h4
-rw-r--r--ACE/ace/Monitor_Point_Registry.h10
-rw-r--r--ACE/ace/Monitor_Size.h8
-rw-r--r--ACE/ace/Obchunk.h4
-rw-r--r--ACE/ace/Obchunk.inl2
-rw-r--r--ACE/ace/Obstack_T.cpp10
-rw-r--r--ACE/ace/Obstack_T.h12
-rw-r--r--ACE/ace/SOCK_Dgram.h6
-rw-r--r--ACE/ace/SOCK_Dgram.inl4
-rw-r--r--ACE/ace/SSL/SSL_Context.h38
-rw-r--r--ACE/ace/SSL/SSL_Context.inl30
-rw-r--r--ACE/ace/SSL/SSL_SOCK.h6
-rw-r--r--ACE/ace/SSL/SSL_SOCK.inl2
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Acceptor.h6
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Acceptor.inl4
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Stream.h12
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Stream.inl10
-rw-r--r--ACE/ace/Sig_Handler.h12
-rw-r--r--ACE/ace/Sig_Handler.inl2
-rw-r--r--ACE/ace/Timer_Heap_T.cpp34
-rw-r--r--ACE/ace/Timer_Heap_T.h34
-rw-r--r--ACE/ace/Timer_Queue_Iterator.cpp10
-rw-r--r--ACE/ace/Timer_Queue_Iterator.h32
-rw-r--r--ACE/ace/Timer_Queue_Iterator.inl14
-rw-r--r--ACE/ace/Timer_Queue_T.cpp12
-rw-r--r--ACE/ace/Timer_Queue_T.h20
-rw-r--r--ACE/ace/Timer_Queue_T.inl6
62 files changed, 478 insertions, 478 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;
diff --git a/ACE/Kokyu/Kokyu_defs.inl b/ACE/Kokyu/Kokyu_defs.inl
index 13da3c1d0c0..a6639c429ec 100644
--- a/ACE/Kokyu/Kokyu_defs.inl
+++ b/ACE/Kokyu/Kokyu_defs.inl
@@ -44,13 +44,13 @@ Dispatch_Command::Dispatch_Command (int dont_delete,
}
ACE_INLINE
-int Dispatch_Command::can_be_deleted (void) const
+int Dispatch_Command::can_be_deleted () const
{
return !dont_delete_;
}
ACE_INLINE
-void Dispatch_Command::destroy (void)
+void Dispatch_Command::destroy ()
{
if (allocator_)
{
diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h
index 7dbbf7b4b9e..cd17f28d0ef 100644
--- a/ACE/ace/Abstract_Timer_Queue.h
+++ b/ACE/ace/Abstract_Timer_Queue.h
@@ -38,14 +38,14 @@ class ACE_Abstract_Timer_Queue
{
public:
/// Destructor
- virtual ~ACE_Abstract_Timer_Queue (void) = 0;
+ virtual ~ACE_Abstract_Timer_Queue () = 0;
/// True if queue is empty, else false.
- virtual bool is_empty (void) const = 0;
+ virtual bool is_empty () const = 0;
/// Returns the time of the earlier node in the Timer_Queue. Must
/// be called on a non-empty queue.
- virtual const ACE_Time_Value &earliest_time (void) const = 0;
+ virtual const ACE_Time_Value &earliest_time () const = 0;
/**
* Schedule @a type that will expire at @a future_time, which is
@@ -110,7 +110,7 @@ public:
*
* Returns the number of timers canceled.
*/
- virtual int expire (void) = 0;
+ virtual int expire () = 0;
/**
* A couple of classes using Timer_Queues need to dispatch a single
@@ -160,21 +160,21 @@ public:
/**
* Close timer queue. Cancels all timers.
*/
- virtual int close (void) = 0;
+ virtual int close () = 0;
/**
* Returns the current time of day. This method allows different
* implementations of the timer queue to use special high resolution
* timers.
*/
- virtual ACE_Time_Value gettimeofday (void) = 0;
+ virtual ACE_Time_Value gettimeofday () = 0;
/**
* Allows applications to control how the timer queue gets the time
* of day.
* @deprecated Use TIME_POLICY support instead. See Timer_Queue_T.h
*/
- virtual void gettimeofday (ACE_Time_Value (*gettimeofday)(void)) = 0;
+ virtual void gettimeofday (ACE_Time_Value (*gettimeofday)()) = 0;
/// Determine the next event to timeout. Returns @a max if there are
/// no pending timers or if all pending timers are longer than max.
@@ -204,16 +204,16 @@ public:
typedef ACE_Timer_Queue_Iterator_T<TYPE> ITERATOR;
/// Returns a pointer to this ACE_Timer_Queue's iterator.
- virtual ITERATOR & iter (void) = 0;
+ virtual ITERATOR & iter () = 0;
/// Removes the earliest node from the queue and returns it
- virtual ACE_Timer_Node_T<TYPE> *remove_first (void) = 0;
+ virtual ACE_Timer_Node_T<TYPE> *remove_first () = 0;
/// Reads the earliest node from the queue and returns it.
- virtual ACE_Timer_Node_T<TYPE> *get_first (void) = 0;
+ virtual ACE_Timer_Node_T<TYPE> *get_first () = 0;
/// Dump the state of a object.
- virtual void dump (void) const = 0;
+ virtual void dump () const = 0;
};
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Arg_Shifter.cpp b/ACE/ace/Arg_Shifter.cpp
index 29eace272bd..ef51e154d22 100644
--- a/ACE/ace/Arg_Shifter.cpp
+++ b/ACE/ace/Arg_Shifter.cpp
@@ -44,7 +44,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::ACE_Arg_Shifter_T (int& argc,
template <typename CHAR_TYPE>
void
-ACE_Arg_Shifter_T<CHAR_TYPE>::init (void)
+ACE_Arg_Shifter_T<CHAR_TYPE>::init ()
{
// If not provided with one, allocate a temporary array.
if (this->temp_ == 0)
@@ -74,7 +74,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::init (void)
}
template <typename CHAR_TYPE>
-ACE_Arg_Shifter_T<CHAR_TYPE>::~ACE_Arg_Shifter_T (void)
+ACE_Arg_Shifter_T<CHAR_TYPE>::~ACE_Arg_Shifter_T ()
{
// Delete the temporary vector.
#if defined (ACE_HAS_ALLOC_HOOKS)
@@ -87,7 +87,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::~ACE_Arg_Shifter_T (void)
template <typename CHAR_TYPE>
const CHAR_TYPE *
-ACE_Arg_Shifter_T<CHAR_TYPE>::get_current (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::get_current () const
{
const CHAR_TYPE * retval = 0;
@@ -190,14 +190,14 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::ignore_arg (int number)
template <typename CHAR_TYPE>
int
-ACE_Arg_Shifter_T<CHAR_TYPE>::is_anything_left (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::is_anything_left () const
{
return this->total_size_ - this->current_index_;
}
template <typename CHAR_TYPE>
int
-ACE_Arg_Shifter_T<CHAR_TYPE>::is_option_next (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::is_option_next () const
{
return this->is_anything_left () &&
this->temp_[this->current_index_][0] == '-';
@@ -205,7 +205,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::is_option_next (void) const
template <typename CHAR_TYPE>
int
-ACE_Arg_Shifter_T<CHAR_TYPE>::is_parameter_next (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::is_parameter_next () const
{
return this->is_anything_left ()
&& this->temp_[this->current_index_][0] != '-';
@@ -213,7 +213,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::is_parameter_next (void) const
template <typename CHAR_TYPE>
int
-ACE_Arg_Shifter_T<CHAR_TYPE>::num_ignored_args (void) const
+ACE_Arg_Shifter_T<CHAR_TYPE>::num_ignored_args () const
{
return this->front_;
}
diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h
index 29a6b345113..ec1817e692f 100644
--- a/ACE/ace/Arg_Shifter.h
+++ b/ACE/ace/Arg_Shifter.h
@@ -85,10 +85,10 @@ public:
CHAR_TYPE **temp = 0);
/// Destructor.
- ~ACE_Arg_Shifter_T (void);
+ ~ACE_Arg_Shifter_T ();
/// Get the current head of the vector.
- const CHAR_TYPE *get_current (void) const;
+ const CHAR_TYPE *get_current () const;
/**
* If the @a flag matches the current_arg of arg shifter
@@ -172,18 +172,18 @@ public:
int ignore_arg (int number = 1);
/// Returns the number of args left to see in the vector.
- int is_anything_left (void) const;
+ int is_anything_left () const;
/// Returns 1 if there's a next item in the vector and it begins with
/// '-'.
- int is_option_next (void) const;
+ int is_option_next () const;
/// Returns 1 if there's a next item in the vector and it doesn't
/// begin with '-'.
- int is_parameter_next (void) const;
+ int is_parameter_next () const;
/// Returns the number of irrelevant args seen.
- int num_ignored_args (void) const;
+ int num_ignored_args () const;
private:
/// Copy Constructor should not be used.
@@ -193,7 +193,7 @@ private:
ACE_UNIMPLEMENTED_FUNC (ACE_Arg_Shifter_T operator= (const ACE_Arg_Shifter_T<CHAR_TYPE> &))
/// Refactor the constructor logic.
- void init (void);
+ void init ();
/// The size of the argument vector.
int &argc_;
diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h
index 2c97e27c657..1e4ddf7aac7 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.h
+++ b/ACE/ace/ETCL/ETCL_Constraint.h
@@ -34,8 +34,8 @@ class ACE_ETCL_Export ETCL_Constraint
{
public:
/// Constructor and destructor
- ETCL_Constraint (void);
- virtual ~ETCL_Constraint (void);
+ ETCL_Constraint ();
+ virtual ~ETCL_Constraint ();
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -59,7 +59,7 @@ class ACE_ETCL_Export ETCL_Literal_Constraint
: public ETCL_Constraint
{
public:
- ETCL_Literal_Constraint (void);
+ ETCL_Literal_Constraint ();
// = Constructors for each of the various types of literals.
explicit ETCL_Literal_Constraint (ACE_CDR::ULong uinteger);
@@ -72,22 +72,22 @@ public:
ETCL_Literal_Constraint (const ETCL_Literal_Constraint& lit);
/// Destructor.
- virtual ~ETCL_Literal_Constraint(void);
+ virtual ~ETCL_Literal_Constraint();
/// Visitor accept method.
virtual int accept (ETCL_Constraint_Visitor* visitor);
- Literal_Type expr_type (void) const;
+ Literal_Type expr_type () const;
/// Assignment operator.
void operator= (const ETCL_Literal_Constraint& co);
// Conversion routines.
- operator ACE_CDR::Boolean (void) const;
- operator ACE_CDR::ULong (void) const;
- operator ACE_CDR::Long (void) const;
- operator ACE_CDR::Double (void) const;
- operator const char* (void) const;
+ operator ACE_CDR::Boolean () const;
+ operator ACE_CDR::ULong () const;
+ operator ACE_CDR::Long () const;
+ operator ACE_CDR::Double () const;
+ operator const char* () const;
// Return the type represented by this MysteryOperand.
@@ -127,7 +127,7 @@ public:
// Unary minus.
ETCL_Literal_Constraint
- operator- (void);
+ operator- ();
/// Ensure both operands are of the same simple numeric type.
virtual Literal_Type
@@ -159,7 +159,7 @@ public:
ETCL_Identifier (const char *value);
/// Get the value
- const char *value (void) const;
+ const char *value () const;
// = The Constraint methods.
int accept (ETCL_Constraint_Visitor *visitor);
@@ -177,11 +177,11 @@ public:
ETCL_Union_Value (int sign,
ETCL_Constraint *integer);
explicit ETCL_Union_Value (ETCL_Constraint *string = 0);
- virtual ~ETCL_Union_Value (void);
+ virtual ~ETCL_Union_Value ();
- int sign (void) const;
- ETCL_Literal_Constraint *integer (void) const;
- ETCL_Literal_Constraint *string (void) const;
+ int sign () const;
+ ETCL_Literal_Constraint *integer () const;
+ ETCL_Literal_Constraint *string () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -196,10 +196,10 @@ class ACE_ETCL_Export ETCL_Union_Pos : public ETCL_Constraint
public:
ETCL_Union_Pos (ETCL_Constraint *union_value = 0,
ETCL_Constraint *component = 0);
- virtual ~ETCL_Union_Pos (void);
+ virtual ~ETCL_Union_Pos ();
- ETCL_Union_Value *union_value (void) const;
- ETCL_Constraint *component (void) const;
+ ETCL_Union_Value *union_value () const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -213,10 +213,10 @@ class ACE_ETCL_Export ETCL_Component_Pos : public ETCL_Constraint
public:
ETCL_Component_Pos (ETCL_Constraint *integer = 0,
ETCL_Constraint *component = 0);
- virtual ~ETCL_Component_Pos (void);
+ virtual ~ETCL_Component_Pos ();
- ETCL_Literal_Constraint *integer (void) const;
- ETCL_Constraint *component (void) const;
+ ETCL_Literal_Constraint *integer () const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -230,10 +230,10 @@ class ACE_ETCL_Export ETCL_Component_Assoc : public ETCL_Constraint
public:
ETCL_Component_Assoc (ETCL_Constraint *identifier = 0,
ETCL_Constraint *component = 0);
- virtual ~ETCL_Component_Assoc (void);
+ virtual ~ETCL_Component_Assoc ();
- ETCL_Identifier *identifier (void) const;
- ETCL_Constraint *component (void) const;
+ ETCL_Identifier *identifier () const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -247,10 +247,10 @@ class ACE_ETCL_Export ETCL_Component_Array : public ETCL_Constraint
public:
ETCL_Component_Array (ETCL_Constraint *integer = 0,
ETCL_Constraint *component = 0);
- virtual ~ETCL_Component_Array (void);
+ virtual ~ETCL_Component_Array ();
- ETCL_Literal_Constraint *integer (void) const;
- ETCL_Constraint *component (void) const;
+ ETCL_Literal_Constraint *integer () const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -262,11 +262,11 @@ private:
class ACE_ETCL_Export ETCL_Special : public ETCL_Constraint
{
public:
- ETCL_Special (void);
+ ETCL_Special ();
ETCL_Special (int type);
- virtual ~ETCL_Special (void);
+ virtual ~ETCL_Special ();
- int type (void) const;
+ int type () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -279,10 +279,10 @@ class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint
public:
ETCL_Component (ETCL_Constraint *identifier = 0,
ETCL_Constraint *component = 0);
- virtual ~ETCL_Component (void);
+ virtual ~ETCL_Component ();
- ETCL_Identifier *identifier (void) const;
- ETCL_Constraint *component (void) const;
+ ETCL_Identifier *identifier () const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -295,9 +295,9 @@ class ACE_ETCL_Export ETCL_Dot : public ETCL_Constraint
{
public:
explicit ETCL_Dot (ETCL_Constraint *component = 0);
- virtual ~ETCL_Dot (void);
+ virtual ~ETCL_Dot ();
- ETCL_Constraint *component (void) const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -309,9 +309,9 @@ class ACE_ETCL_Export ETCL_Eval : public ETCL_Constraint
{
public:
explicit ETCL_Eval (ETCL_Constraint *component = 0);
- virtual ~ETCL_Eval (void);
+ virtual ~ETCL_Eval ();
- ETCL_Constraint *component (void) const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -323,9 +323,9 @@ class ACE_ETCL_Export ETCL_Default : public ETCL_Constraint
{
public:
explicit ETCL_Default (ETCL_Constraint *component = 0);
- virtual ~ETCL_Default (void);
+ virtual ~ETCL_Default ();
- ETCL_Constraint *component (void) const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -337,9 +337,9 @@ class ACE_ETCL_Export ETCL_Exist : public ETCL_Constraint
{
public:
explicit ETCL_Exist (ETCL_Constraint *component = 0);
- virtual ~ETCL_Exist (void);
+ virtual ~ETCL_Exist ();
- ETCL_Constraint *component (void) const;
+ ETCL_Constraint *component () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
@@ -352,10 +352,10 @@ class ACE_ETCL_Export ETCL_Unary_Expr : public ETCL_Constraint
public:
ETCL_Unary_Expr (int type,
ETCL_Constraint *subexpr);
- virtual ~ETCL_Unary_Expr (void);
+ virtual ~ETCL_Unary_Expr ();
- int type (void) const;
- ETCL_Constraint *subexpr (void) const;
+ int type () const;
+ ETCL_Constraint *subexpr () const;
int accept (ETCL_Constraint_Visitor *visitor);
@@ -370,11 +370,11 @@ public:
ETCL_Binary_Expr (int type,
ETCL_Constraint *lhs,
ETCL_Constraint *rhs);
- virtual ~ETCL_Binary_Expr (void);
+ virtual ~ETCL_Binary_Expr ();
- int type (void) const;
- ETCL_Constraint *rhs (void) const;
- ETCL_Constraint *lhs (void) const;
+ int type () const;
+ ETCL_Constraint *rhs () const;
+ ETCL_Constraint *lhs () const;
int accept (ETCL_Constraint_Visitor *visitor);
@@ -387,13 +387,13 @@ private:
class ACE_ETCL_Export ETCL_Preference : public ETCL_Constraint
{
public:
- ETCL_Preference (void);
+ ETCL_Preference ();
ETCL_Preference (int type,
ETCL_Constraint *subexpr = 0);
- virtual ~ETCL_Preference (void);
+ virtual ~ETCL_Preference ();
- int type (void) const;
- ETCL_Constraint *subexpr (void) const;
+ int type () const;
+ ETCL_Constraint *subexpr () const;
virtual int accept (ETCL_Constraint_Visitor *visitor);
diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl
index 2ee32f420c6..b10fd67cd31 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.inl
+++ b/ACE/ace/ETCL/ETCL_Constraint.inl
@@ -2,7 +2,7 @@
// ****************************************************************
ACE_INLINE
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (void)
+ETCL_Literal_Constraint::ETCL_Literal_Constraint ()
: type_ (ACE_ETCL_UNKNOWN)
{
}
@@ -16,7 +16,7 @@ ETCL_Identifier::ETCL_Identifier (const char *value)
}
ACE_INLINE const char *
-ETCL_Identifier::value (void) const
+ETCL_Identifier::value () const
{
return this->string_.c_str ();
}
@@ -44,19 +44,19 @@ ETCL_Union_Value::ETCL_Union_Value (ETCL_Constraint *string)
}
ACE_INLINE int
-ETCL_Union_Value::sign (void) const
+ETCL_Union_Value::sign () const
{
return this->sign_;
}
ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::integer (void) const
+ETCL_Union_Value::integer () const
{
return this->integer_;
}
ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::string (void) const
+ETCL_Union_Value::string () const
{
return this->string_;
}
@@ -73,13 +73,13 @@ ETCL_Union_Pos::ETCL_Union_Pos (ETCL_Constraint *union_value,
}
ACE_INLINE ETCL_Union_Value *
-ETCL_Union_Pos::union_value (void) const
+ETCL_Union_Pos::union_value () const
{
return this->union_value_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Union_Pos::component (void) const
+ETCL_Union_Pos::component () const
{
return this->component_;
}
@@ -97,13 +97,13 @@ ETCL_Component_Pos::ETCL_Component_Pos (
}
ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Pos::integer (void) const
+ETCL_Component_Pos::integer () const
{
return this->integer_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Component_Pos::component (void) const
+ETCL_Component_Pos::component () const
{
return this->component_;
}
@@ -121,13 +121,13 @@ ETCL_Component_Assoc::ETCL_Component_Assoc (
}
ACE_INLINE ETCL_Identifier *
-ETCL_Component_Assoc::identifier (void) const
+ETCL_Component_Assoc::identifier () const
{
return this->identifier_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Component_Assoc::component (void) const
+ETCL_Component_Assoc::component () const
{
return this->component_;
}
@@ -145,13 +145,13 @@ ETCL_Component_Array::ETCL_Component_Array (
}
ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Array::integer (void) const
+ETCL_Component_Array::integer () const
{
return this->integer_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Component_Array::component (void) const
+ETCL_Component_Array::component () const
{
return this->component_;
}
@@ -159,7 +159,7 @@ ETCL_Component_Array::component (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Special::ETCL_Special (void)
+ETCL_Special::ETCL_Special ()
: type_ (0)
{}
@@ -169,7 +169,7 @@ ETCL_Special::ETCL_Special (int type)
{}
ACE_INLINE int
-ETCL_Special::type (void) const
+ETCL_Special::type () const
{
return this->type_;
}
@@ -186,13 +186,13 @@ ETCL_Component::ETCL_Component (ETCL_Constraint *identifier,
}
ACE_INLINE ETCL_Identifier *
-ETCL_Component::identifier (void) const
+ETCL_Component::identifier () const
{
return this->identifier_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Component::component (void) const
+ETCL_Component::component () const
{
return this->component_;
}
@@ -206,7 +206,7 @@ ETCL_Dot::ETCL_Dot (ETCL_Constraint *component)
}
ACE_INLINE ETCL_Constraint *
-ETCL_Dot::component (void) const
+ETCL_Dot::component () const
{
return this->component_;
}
@@ -220,7 +220,7 @@ ETCL_Eval::ETCL_Eval (ETCL_Constraint *component)
}
ACE_INLINE ETCL_Constraint *
-ETCL_Eval::component (void) const
+ETCL_Eval::component () const
{
return this->component_;
}
@@ -234,7 +234,7 @@ ETCL_Default::ETCL_Default (ETCL_Constraint *component)
}
ACE_INLINE ETCL_Constraint *
-ETCL_Default::component (void) const
+ETCL_Default::component () const
{
return this->component_;
}
@@ -248,7 +248,7 @@ ETCL_Exist::ETCL_Exist (ETCL_Constraint *component)
}
ACE_INLINE ETCL_Constraint *
-ETCL_Exist::component (void) const
+ETCL_Exist::component () const
{
return this->component_;
}
@@ -263,13 +263,13 @@ ETCL_Unary_Expr::ETCL_Unary_Expr (int type,
{}
ACE_INLINE int
-ETCL_Unary_Expr::type (void) const
+ETCL_Unary_Expr::type () const
{
return this->type_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Unary_Expr::subexpr (void) const
+ETCL_Unary_Expr::subexpr () const
{
return this->subexpr_;
}
@@ -286,19 +286,19 @@ ETCL_Binary_Expr::ETCL_Binary_Expr (int type,
{}
ACE_INLINE int
-ETCL_Binary_Expr::type (void) const
+ETCL_Binary_Expr::type () const
{
return this->type_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::rhs (void) const
+ETCL_Binary_Expr::rhs () const
{
return this->rhs_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::lhs (void) const
+ETCL_Binary_Expr::lhs () const
{
return this->lhs_;
}
@@ -306,7 +306,7 @@ ETCL_Binary_Expr::lhs (void) const
// ****************************************************************
ACE_INLINE
-ETCL_Preference::ETCL_Preference (void)
+ETCL_Preference::ETCL_Preference ()
: type_ (0),
subexpr_ (0)
{}
@@ -319,13 +319,13 @@ ETCL_Preference::ETCL_Preference (int type,
{}
ACE_INLINE int
-ETCL_Preference::type (void) const
+ETCL_Preference::type () const
{
return this->type_;
}
ACE_INLINE ETCL_Constraint *
-ETCL_Preference::subexpr (void) const
+ETCL_Preference::subexpr () const
{
return this->subexpr_;
}
diff --git a/ACE/ace/ETCL/ETCL_Interpreter.h b/ACE/ace/ETCL/ETCL_Interpreter.h
index 517ffb239f2..b5f57b570ab 100644
--- a/ACE/ace/ETCL/ETCL_Interpreter.h
+++ b/ACE/ace/ETCL/ETCL_Interpreter.h
@@ -44,10 +44,10 @@ class ETCL_Parser_Export ETCL_Interpreter
{
protected:
/// Constructor.
- ETCL_Interpreter (void);
+ ETCL_Interpreter ();
/// Destructor.
- virtual ~ETCL_Interpreter (void);
+ virtual ~ETCL_Interpreter ();
/// Using the Yacc generated parser, construct an expression tree
/// representing @a constraints from the tokens returned by it.
@@ -65,9 +65,9 @@ private:
// Functions we need for parsing.
-extern int yyparse (void);
+extern int yyparse ();
extern void yyrestart (FILE*);
-extern int yylex (void);
+extern int yylex ();
// Have yylex read from the constraint string, not from stdin.
#undef YY_INPUT
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
index da0d57c7e4e..715cacb2c27 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
@@ -32,10 +32,10 @@ class ACE_Export ACE_Event_Handler_Handle_Timeout_Upcall
{
public:
/// Constructor.
- ACE_Event_Handler_Handle_Timeout_Upcall (void);
+ ACE_Event_Handler_Handle_Timeout_Upcall ();
/// Destructor.
- ~ACE_Event_Handler_Handle_Timeout_Upcall (void);
+ ~ACE_Event_Handler_Handle_Timeout_Upcall ();
/// This method is called when a timer is registered.
int registration (ACE_Timer_Queue &timer_queue,
diff --git a/ACE/ace/Logging_Strategy.h b/ACE/ace/Logging_Strategy.h
index 140e3352a23..e853dfdb5b1 100644
--- a/ACE/ace/Logging_Strategy.h
+++ b/ACE/ace/Logging_Strategy.h
@@ -79,16 +79,16 @@ class ACE_Export ACE_Logging_Strategy : public ACE_Service_Object
{
public:
/// Constructor.
- ACE_Logging_Strategy (void);
+ ACE_Logging_Strategy ();
/// Destructor.
- ~ACE_Logging_Strategy (void);
+ ~ACE_Logging_Strategy ();
/// Dynamic linking initialization hook.
virtual int init (int argc, ACE_TCHAR *argv[]);
/// Dynamic linking termination hook.
- virtual int fini (void);
+ virtual int fini ();
/**
* Timeout handler which tests logfile size. If the current logfile
@@ -112,7 +112,7 @@ public:
*/
virtual void reactor (ACE_Reactor *r);
- virtual ACE_Reactor * reactor (void) const;
+ virtual ACE_Reactor * reactor () const;
/**
* Parse arguments provided in svc.conf file.
diff --git a/ACE/ace/Monitor_Base.h b/ACE/ace/Monitor_Base.h
index 769418e25d6..c327755e956 100644
--- a/ACE/ace/Monitor_Base.h
+++ b/ACE/ace/Monitor_Base.h
@@ -51,11 +51,11 @@ namespace ACE
Monitor_Base (const char* name,
Monitor_Control_Types::Information_Type type);
- virtual ~Monitor_Base (void);
+ virtual ~Monitor_Base ();
/// Implemented by the most-derived class. Does the actual
/// work of fetching the monitored value.
- virtual void update (void);
+ virtual void update ();
/// Updates the monitor's data if it is a numeric floating point.
virtual void receive (double data);
@@ -75,10 +75,10 @@ namespace ACE
Control_Action* remove_constraint (const long constraint_id);
/// Get all constraints
- CONSTRAINTS& constraints (void);
+ CONSTRAINTS& constraints ();
/// Reset function.
- virtual void clear (void);
+ virtual void clear ();
/// Data accessors.
void retrieve (Monitor_Control_Types::Data& data) const;
@@ -88,42 +88,42 @@ namespace ACE
void add_to_registry (
const ACE_Time_Value& time = ACE_Time_Value::zero);
- void remove_from_registry (void);
+ void remove_from_registry ();
- const char* name (void) const;
+ const char* name () const;
void name (const char* new_name);
- void add_ref (void);
- void remove_ref (void);
+ void add_ref ();
+ void remove_ref ();
/// Calculate the average of the accumulated samples.
- double average (void) const;
+ double average () const;
/// Calculate the sum of the squares of the samples.
- double sum_of_squares (void) const;
+ double sum_of_squares () const;
/// Returns the number of samples
- size_t count (void) const;
+ size_t count () const;
/// Returns the minimum sample value
- double minimum_sample (void) const;
+ double minimum_sample () const;
/// Returns the maximum sample value
- double maximum_sample (void) const;
+ double maximum_sample () const;
/// Returns the most recent sample value
- double last_sample (void) const;
+ double last_sample () const;
/// Return the type of this statistic
- Monitor_Control_Types::Information_Type type (void) const;
+ Monitor_Control_Types::Information_Type type () const;
/// Return the list or error msg if wrong type.
- Monitor_Control_Types::NameList get_list (void) const;
+ Monitor_Control_Types::NameList get_list () const;
protected:
/// Overridden in some monitors (for example the OS monitors) where
/// clearing requires monitor-specific actions.
- virtual void clear_i (void);
+ virtual void clear_i ();
protected:
Monitor_Control_Types::Data data_;
diff --git a/ACE/ace/Monitor_Base.inl b/ACE/ace/Monitor_Base.inl
index 53248c3db83..f5dc8338696 100644
--- a/ACE/ace/Monitor_Base.inl
+++ b/ACE/ace/Monitor_Base.inl
@@ -6,7 +6,7 @@ namespace ACE
{
ACE_INLINE
const char*
- Monitor_Base::name (void) const
+ Monitor_Base::name () const
{
return this->name_.c_str ();
}
@@ -20,21 +20,21 @@ namespace ACE
ACE_INLINE
Monitor_Base::CONSTRAINTS&
- Monitor_Base::constraints (void)
+ Monitor_Base::constraints ()
{
return this->constraints_;
}
ACE_INLINE
void
- Monitor_Base::add_ref (void)
+ Monitor_Base::add_ref ()
{
(void) this->increment ();
}
ACE_INLINE
void
- Monitor_Base::remove_ref (void)
+ Monitor_Base::remove_ref ()
{
long const new_count = this->decrement ();
@@ -46,7 +46,7 @@ namespace ACE
ACE_INLINE
Monitor_Control_Types::Information_Type
- Monitor_Base::type (void) const
+ Monitor_Base::type () const
{
return this->data_.type_;
}
diff --git a/ACE/ace/Monitor_Control_Types.h b/ACE/ace/Monitor_Control_Types.h
index 0eaba0e5a76..4c7b66f194b 100644
--- a/ACE/ace/Monitor_Control_Types.h
+++ b/ACE/ace/Monitor_Control_Types.h
@@ -74,8 +74,8 @@ namespace ACE
*/
struct ACE_Export Constraint
{
- Constraint (void);
- ~Constraint (void);
+ Constraint ();
+ ~Constraint ();
/// Implemented explicitly so reference counting of control
/// actions can be managed.
diff --git a/ACE/ace/Monitor_Point_Registry.h b/ACE/ace/Monitor_Point_Registry.h
index 42245249d63..e6cf87129f6 100644
--- a/ACE/ace/Monitor_Point_Registry.h
+++ b/ACE/ace/Monitor_Point_Registry.h
@@ -48,7 +48,7 @@ namespace ACE
/// Used to help ensure that there is only a single instance
/// per process of Monitor_Point_Registry.
- static Monitor_Point_Registry* instance (void);
+ static Monitor_Point_Registry* instance ();
/// Adds a monitor to the registry.
bool add (Monitor_Base* type);
@@ -57,22 +57,22 @@ namespace ACE
bool remove (const char* name);
/// Returns a list of names stored in the registry
- Monitor_Control_Types::NameList names (void);
+ Monitor_Control_Types::NameList names ();
/// Increments the refcount, so the caller is responsible for
/// decrementing it when finished.
Monitor_Base* get (const ACE_CString& name) const;
/// Returns a unique id for a constraint when it is created.
- long constraint_id (void);
+ long constraint_id ();
/// Decrements the reference count on all remaining entries,
/// called right before we go out of scope (i.e., process exits).
- void cleanup (void);
+ void cleanup ();
private:
/// Prevent that users can make an instance.
- Monitor_Point_Registry (void);
+ Monitor_Point_Registry ();
/// Underlying container for the registry.
typedef ACE_Hash_Map_Manager<ACE_CString,
diff --git a/ACE/ace/Monitor_Size.h b/ACE/ace/Monitor_Size.h
index aba45955665..72b14e0d451 100644
--- a/ACE/ace/Monitor_Size.h
+++ b/ACE/ace/Monitor_Size.h
@@ -39,16 +39,16 @@ namespace ACE
class ACE_Export Size_Monitor : public Monitor_Base
{
public:
- Size_Monitor (void);
+ Size_Monitor ();
Size_Monitor (const char* name);
- virtual ~Size_Monitor (void);
+ virtual ~Size_Monitor ();
/// Implemented by the most-derived class. Does the actual
/// work of fetching the monitored value.
- virtual void update (void);
+ virtual void update ();
/// Reset function.
- virtual void clear (void);
+ virtual void clear ();
};
}
}
diff --git a/ACE/ace/Obchunk.h b/ACE/ace/Obchunk.h
index 3a2fddc260a..4ab76f8a3e8 100644
--- a/ACE/ace/Obchunk.h
+++ b/ACE/ace/Obchunk.h
@@ -36,10 +36,10 @@ public:
ACE_Obchunk (size_t size);
/// Dtor.
- ~ACE_Obchunk (void);
+ ~ACE_Obchunk ();
/// 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/Obchunk.inl b/ACE/ace/Obchunk.inl
index b27a8abef07..cb5b68ccef6 100644
--- a/ACE/ace/Obchunk.inl
+++ b/ACE/ace/Obchunk.inl
@@ -2,7 +2,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
-ACE_Obchunk::~ACE_Obchunk (void)
+ACE_Obchunk::~ACE_Obchunk ()
{
}
diff --git a/ACE/ace/Obstack_T.cpp b/ACE/ace/Obstack_T.cpp
index 659f643e980..99eb072b674 100644
--- a/ACE/ace/Obstack_T.cpp
+++ b/ACE/ace/Obstack_T.cpp
@@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Obstack_T)
template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::dump (void) const
+ACE_Obstack_T<ACE_CHAR_T>::dump () const
{
#if defined (ACE_HAS_DUMP)
ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::dump");
@@ -104,7 +104,7 @@ ACE_Obstack_T<ACE_CHAR_T>::grow (ACE_CHAR_T c)
}
template <class ACE_CHAR_T> ACE_Obchunk *
-ACE_Obstack_T<ACE_CHAR_T>::new_chunk (void)
+ACE_Obstack_T<ACE_CHAR_T>::new_chunk ()
{
ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::new_chunk");
@@ -137,7 +137,7 @@ ACE_Obstack_T<ACE_CHAR_T>::ACE_Obstack_T (size_t size,
}
template <class ACE_CHAR_T>
-ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T (void)
+ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T ()
{
ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T");
@@ -193,7 +193,7 @@ ACE_Obstack_T<ACE_CHAR_T>::unwind_i (void* obj)
}
template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::release (void)
+ACE_Obstack_T<ACE_CHAR_T>::release ()
{
ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::release");
@@ -209,7 +209,7 @@ ACE_Obstack_T<ACE_CHAR_T>::grow_fast (ACE_CHAR_T c)
}
template <class ACE_CHAR_T> ACE_CHAR_T *
-ACE_Obstack_T<ACE_CHAR_T>::freeze (void)
+ACE_Obstack_T<ACE_CHAR_T>::freeze ()
{
ACE_CHAR_T *retv = reinterpret_cast<ACE_CHAR_T *> (this->curr_->block_);
* (reinterpret_cast<ACE_CHAR_T *> (this->curr_->cur_)) = 0;
diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h
index 2f886b2a05f..5de08a1669f 100644
--- a/ACE/ace/Obstack_T.h
+++ b/ACE/ace/Obstack_T.h
@@ -38,7 +38,7 @@ class ACE_Obstack_T
public:
ACE_Obstack_T (size_t size = (4096 * sizeof (ACE_CHAR_T)) - sizeof (ACE_Obchunk),
ACE_Allocator *allocator_strategy = 0);
- ~ACE_Obstack_T (void);
+ ~ACE_Obstack_T ();
/// Request Obstack to prepare a block at least @a len long for building
/// a new string. Return -1 if fail, 0 if success.
@@ -59,7 +59,7 @@ public:
/// Freeze the current building block by null terminating it.
/// Return the starting address of the current building block, 0
/// if error occurs.
- ACE_CHAR_T *freeze (void);
+ ACE_CHAR_T *freeze ();
/// Copy the data into the current Obchunk and freeze the current
/// block. Return the starting address of the current building
@@ -69,7 +69,7 @@ public:
size_t len);
/// Return the maximum @a size
- size_t size (void) const;
+ size_t size () const;
/// "Unwind" the stack. If @a obj is a null pointer, everything allocated
/// in the stack is released. Otherwise, @a obj must be an address of an
@@ -79,16 +79,16 @@ public:
/// "Release" the entire stack of Obchunks, putting it back on the free
/// list.
- void release (void);
+ void release ();
/// Dump the state of an object.
- void dump (void) const;
+ void dump () const;
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
protected:
- class ACE_Obchunk *new_chunk (void);
+ class ACE_Obchunk *new_chunk ();
/// Search through the list of Obchunks and release them. Helper function
/// used by unwind.
diff --git a/ACE/ace/SOCK_Dgram.h b/ACE/ace/SOCK_Dgram.h
index 6746627148e..ea418e6a21c 100644
--- a/ACE/ace/SOCK_Dgram.h
+++ b/ACE/ace/SOCK_Dgram.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_SOCK_Dgram : public ACE_SOCK
{
public:
/// Default constructor.
- ACE_SOCK_Dgram (void);
+ ACE_SOCK_Dgram ();
/// This is a BSD-style method (i.e., no QoS) for initiating a socket
/// dgram that will accept datagrams at the <local> address.
@@ -85,7 +85,7 @@ public:
int ipv6_only = 0);
/// Default dtor.
- ~ACE_SOCK_Dgram (void);
+ ~ACE_SOCK_Dgram ();
// = Data transfer routines.
/// Send an @a n byte @a buf to the datagram socket (uses <sendto(3)>).
@@ -204,7 +204,7 @@ public:
typedef ACE_INET_Addr PEER_ADDR;
/// Dump the state of an object.
- void dump (void) const;
+ void dump () const;
/// Set NIC to use as multicast interface.
int set_nic (const ACE_TCHAR *net_if,
diff --git a/ACE/ace/SOCK_Dgram.inl b/ACE/ace/SOCK_Dgram.inl
index b2a116c31b9..275c6eeeeee 100644
--- a/ACE/ace/SOCK_Dgram.inl
+++ b/ACE/ace/SOCK_Dgram.inl
@@ -8,13 +8,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// Here's the simple-minded constructor.
ACE_INLINE
-ACE_SOCK_Dgram::ACE_SOCK_Dgram (void)
+ACE_SOCK_Dgram::ACE_SOCK_Dgram ()
{
ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
}
ACE_INLINE
-ACE_SOCK_Dgram::~ACE_SOCK_Dgram (void)
+ACE_SOCK_Dgram::~ACE_SOCK_Dgram ()
{
ACE_TRACE ("ACE_SOCK_Dgram::~ACE_SOCK_Dgram");
}
diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h
index a9104780a8a..fc6d39fa637 100644
--- a/ACE/ace/SSL/SSL_Context.h
+++ b/ACE/ace/SSL/SSL_Context.h
@@ -35,17 +35,17 @@ class ACE_SSL_Export ACE_SSL_Data_File
{
public:
/// Default constructor
- ACE_SSL_Data_File (void);
+ ACE_SSL_Data_File ();
/// Constructor from a file name and the file type.
ACE_SSL_Data_File (const char *file_name,
int type = SSL_FILETYPE_PEM);
/// The file name
- const char *file_name (void) const;
+ const char *file_name () const;
/// The type
- int type (void) const;
+ int type () const;
private:
/// The file name
@@ -110,17 +110,17 @@ public:
};
/// Constructor
- ACE_SSL_Context (void);
+ ACE_SSL_Context ();
/// Destructor
- ~ACE_SSL_Context (void);
+ ~ACE_SSL_Context ();
/// The Singleton context, the SSL components use the singleton if
/// nothing else is available.
- static ACE_SSL_Context *instance (void);
+ static ACE_SSL_Context *instance ();
/// Explicitly delete the Singleton context.
- static void close (void);
+ static void close ();
/**
* Set the CTX mode. The mode can be set only once, afterwards the
@@ -132,14 +132,14 @@ public:
*/
int set_mode (int mode = ACE_SSL_Context::SSLv23);
- int get_mode (void) const;
+ int get_mode () const;
/// Get the SSL context
- SSL_CTX *context (void);
+ SSL_CTX *context ();
/// Get the file name and file format used for the private key
- int private_key_type (void) const;
- const char *private_key_file_name (void) const;
+ int private_key_type () const;
+ const char *private_key_file_name () const;
/// Set the private key file.
/**
@@ -155,11 +155,11 @@ public:
* been set since key verification is performed against the
* certificate, among other things.
*/
- int verify_private_key (void);
+ int verify_private_key ();
/// Get the file name and file format used for the certificate file
- int certificate_type (void) const;
- const char *certificate_file_name (void) const;
+ int certificate_type () const;
+ const char *certificate_file_name () const;
/// Set the certificate file.
int certificate (const char *file_name,
@@ -255,7 +255,7 @@ public:
* @retval >0 The number of successful CA load attempts.
* @retval 0 If all CA load attempts have failed.
*/
- int have_trusted_ca (void) const;
+ int have_trusted_ca () const;
/**
* @todo Complete this documentation where elipses(...) are used
@@ -298,7 +298,7 @@ public:
* It can be overriden on a per-ACE_SSL object.
*/
void default_verify_mode (int mode);
- int default_verify_mode (void) const;
+ int default_verify_mode () const;
/**
* Set and query the default verify callback for this context, it is
@@ -306,7 +306,7 @@ public:
* It can be overriden on a per-ACE_SSL object.
*/
void default_verify_callback (extern_C_CallBackVerify_t);
- extern_C_CallBackVerify_t default_verify_callback (void) const;
+ extern_C_CallBackVerify_t default_verify_callback () const;
/**
* @name OpenSSL Random Number Generator Seed Related Methods
@@ -336,7 +336,7 @@ public:
static void report_error (unsigned long error_code);
/// Print the last SSL error for the current thread.
- static void report_error (void);
+ static void report_error ();
/**
* @name Diffie-Hellman (DH) Parameters
@@ -361,7 +361,7 @@ public:
private:
/// Verify if the context has been initialized or not.
- void check_context (void);
+ void check_context ();
/// @@ More to document
void ssl_library_init ();
diff --git a/ACE/ace/SSL/SSL_Context.inl b/ACE/ace/SSL/SSL_Context.inl
index f95beb88e0f..67edb162d64 100644
--- a/ACE/ace/SSL/SSL_Context.inl
+++ b/ACE/ace/SSL/SSL_Context.inl
@@ -2,7 +2,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
-ACE_SSL_Data_File::ACE_SSL_Data_File (void)
+ACE_SSL_Data_File::ACE_SSL_Data_File ()
: type_ (-1)
{
}
@@ -16,13 +16,13 @@ ACE_SSL_Data_File::ACE_SSL_Data_File (const char *file_name,
}
ACE_INLINE const char *
-ACE_SSL_Data_File::file_name (void) const
+ACE_SSL_Data_File::file_name () const
{
return this->file_name_.c_str ();
}
ACE_INLINE int
-ACE_SSL_Data_File::type (void) const
+ACE_SSL_Data_File::type () const
{
return this->type_;
}
@@ -30,7 +30,7 @@ ACE_SSL_Data_File::type (void) const
// ****************************************************************
ACE_INLINE void
-ACE_SSL_Context::check_context (void)
+ACE_SSL_Context::check_context ()
{
if (this->context_ == 0)
{
@@ -45,44 +45,44 @@ ACE_SSL_Context::check_context (void)
}
ACE_INLINE SSL_CTX *
-ACE_SSL_Context::context (void)
+ACE_SSL_Context::context ()
{
this->check_context ();
return this->context_;
}
ACE_INLINE int
-ACE_SSL_Context::private_key_type (void) const
+ACE_SSL_Context::private_key_type () const
{
return this->private_key_.type ();
}
ACE_INLINE const char*
-ACE_SSL_Context::private_key_file_name (void) const
+ACE_SSL_Context::private_key_file_name () const
{
return this->private_key_.file_name ();
}
ACE_INLINE int
-ACE_SSL_Context::certificate_type (void) const
+ACE_SSL_Context::certificate_type () const
{
return this->certificate_.type ();
}
ACE_INLINE const char*
-ACE_SSL_Context::certificate_file_name (void) const
+ACE_SSL_Context::certificate_file_name () const
{
return this->certificate_.file_name ();
}
ACE_INLINE int
-ACE_SSL_Context::dh_params_file_type (void) const
+ACE_SSL_Context::dh_params_file_type () const
{
return this->dh_params_.type ();
}
ACE_INLINE const char*
-ACE_SSL_Context::dh_params_file_name (void) const
+ACE_SSL_Context::dh_params_file_name () const
{
return this->dh_params_.file_name ();
}
@@ -94,7 +94,7 @@ ACE_SSL_Context::default_verify_mode (int mode)
}
ACE_INLINE int
-ACE_SSL_Context::default_verify_mode (void) const
+ACE_SSL_Context::default_verify_mode () const
{
return this->default_verify_mode_;
}
@@ -105,19 +105,19 @@ ACE_SSL_Context::default_verify_callback (extern_C_CallBackVerify_t callback)
this->default_verify_callback_ = callback;
}
-ACE_INLINE extern_C_CallBackVerify_t ACE_SSL_Context::default_verify_callback(void) const
+ACE_INLINE extern_C_CallBackVerify_t ACE_SSL_Context::default_verify_callback() const
{
return this->default_verify_callback_;
}
ACE_INLINE int
-ACE_SSL_Context::get_mode (void) const
+ACE_SSL_Context::get_mode () const
{
return this->mode_;
}
ACE_INLINE int
-ACE_SSL_Context::have_trusted_ca (void) const
+ACE_SSL_Context::have_trusted_ca () const
{
return this->have_ca_;
}
diff --git a/ACE/ace/SSL/SSL_SOCK.h b/ACE/ace/SSL/SSL_SOCK.h
index 29df1c85ce2..d1c68ea5604 100644
--- a/ACE/ace/SSL/SSL_SOCK.h
+++ b/ACE/ace/SSL/SSL_SOCK.h
@@ -55,14 +55,14 @@ public:
int enable (int value) const;
int disable (int value) const;
void set_handle (ACE_HANDLE);
- ACE_HANDLE get_handle (void) const;
+ ACE_HANDLE get_handle () const;
int control (int cmd, void *arg) const;
//@}
protected:
/// Default constructor is private to prevent instances of this class
/// from being defined.
- ACE_SSL_SOCK (void);
+ ACE_SSL_SOCK ();
/// Destructor
/**
@@ -70,7 +70,7 @@ protected:
* operator delete() from being called through a base class
* ACE_SSL_SOCK pointer/reference.
*/
- ~ACE_SSL_SOCK (void);
+ ~ACE_SSL_SOCK ();
};
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/SSL/SSL_SOCK.inl b/ACE/ace/SSL/SSL_SOCK.inl
index 6a12914d844..a3380ecd426 100644
--- a/ACE/ace/SSL/SSL_SOCK.inl
+++ b/ACE/ace/SSL/SSL_SOCK.inl
@@ -10,7 +10,7 @@ ACE_SSL_SOCK::set_handle (ACE_HANDLE fd)
}
ACE_INLINE ACE_HANDLE
-ACE_SSL_SOCK::get_handle (void) const
+ACE_SSL_SOCK::get_handle () const
{
// return this->ssl_ ? (ACE_HANDLE) ::SSL_get_fd (this->ssl_) : ACE_INVALID_HANDLE;
return this->ACE_SOCK::get_handle ();
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.h b/ACE/ace/SSL/SSL_SOCK_Acceptor.h
index e71226be9fe..0cbfa232c28 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.h
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.h
@@ -50,10 +50,10 @@ class ACE_SSL_Export ACE_SSL_SOCK_Acceptor : public ACE_SSL_SOCK
{
public:
/// Default constructor.
- ACE_SSL_SOCK_Acceptor (void);
+ ACE_SSL_SOCK_Acceptor ();
/// Default destructor.
- ~ACE_SSL_SOCK_Acceptor (void);
+ ~ACE_SSL_SOCK_Acceptor ();
/**
* Initiate a passive mode SSL/BSD-style acceptor socket.
@@ -112,7 +112,7 @@ public:
int ipv6_only = 0);
/// Close the listening socket.
- int close (void);
+ int close ();
/**
* @name Passive Connection "accept" Methods
diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.inl b/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
index 5c6b3555271..cfe1cb906ad 100644
--- a/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.inl
@@ -2,7 +2,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
-ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (void)
+ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor ()
: acceptor_ ()
{
ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor");
@@ -75,7 +75,7 @@ ACE_SSL_SOCK_Acceptor::open (const ACE_Addr &local_sap,
}
ACE_INLINE int
-ACE_SSL_SOCK_Acceptor::close (void)
+ACE_SSL_SOCK_Acceptor::close ()
{
ACE_TRACE ("ACE_SSL_SOCK_Acceptor::close ()");
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h
index ed75a132747..fdacb49d5f4 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.h
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.h
@@ -72,7 +72,7 @@ public:
ACE_SSL_Context::instance ());
/// Destructor
- ~ACE_SSL_SOCK_Stream (void);
+ ~ACE_SSL_SOCK_Stream ();
/// Send an @a n byte buffer to the ssl socket using the semantics of
/// send(3n).
@@ -263,14 +263,14 @@ public:
*/
//@{
/// 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.
- int close (void);
+ int close ();
/// Meta-type info
typedef ACE_INET_Addr PEER_ADDR;
@@ -287,7 +287,7 @@ public:
void set_handle (ACE_HANDLE fd);
/// Return a pointer to the underlying SSL structure.
- SSL *ssl (void) const;
+ SSL *ssl () const;
/**
* Return the address of the remotely connected peer (if there is
@@ -301,7 +301,7 @@ public:
int get_remote_addr (ACE_Addr &) const;
/// Return the underlying ACE_SOCK_Stream which ACE_SSL runs atop of.
- ACE_SOCK_Stream & peer (void);
+ ACE_SOCK_Stream & peer ();
protected:
/// Underlying send() helper method common to all public send()
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.inl b/ACE/ace/SSL/SSL_SOCK_Stream.inl
index 558be3e6628..f0773ba336f 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.inl
@@ -292,21 +292,21 @@ ACE_SSL_SOCK_Stream::send_n (const void *buf,
}
ACE_INLINE int
-ACE_SSL_SOCK_Stream::close_reader (void)
+ACE_SSL_SOCK_Stream::close_reader ()
{
ACE_TRACE ("ACE_SSL_SOCK_Stream::close_reader");
return this->stream_.close_reader ();
}
ACE_INLINE int
-ACE_SSL_SOCK_Stream::close_writer (void)
+ACE_SSL_SOCK_Stream::close_writer ()
{
ACE_TRACE ("ACE_SSL_SOCK_Stream::close_writer");
return this->stream_.close_writer ();
}
ACE_INLINE int
-ACE_SSL_SOCK_Stream::close (void)
+ACE_SSL_SOCK_Stream::close ()
{
ACE_TRACE ("ACE_SSL_SOCK_Stream::close");
@@ -348,14 +348,14 @@ ACE_SSL_SOCK_Stream::close (void)
}
ACE_INLINE ACE_SOCK_Stream &
-ACE_SSL_SOCK_Stream::peer (void)
+ACE_SSL_SOCK_Stream::peer ()
{
ACE_TRACE ("ACE_SSL_SOCK_Stream::peer");
return this->stream_;
}
ACE_INLINE SSL *
-ACE_SSL_SOCK_Stream::ssl (void) const
+ACE_SSL_SOCK_Stream::ssl () const
{
return this->ssl_;
}
diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h
index 1bd2a66d464..3a9e08be45b 100644
--- a/ACE/ace/Sig_Handler.h
+++ b/ACE/ace/Sig_Handler.h
@@ -42,10 +42,10 @@ class ACE_Export ACE_Sig_Handler
{
public:
/// Default constructor.
- ACE_Sig_Handler (void);
+ ACE_Sig_Handler ();
/// Destructor
- virtual ~ACE_Sig_Handler (void);
+ virtual ~ACE_Sig_Handler ();
// = Registration and removal methods.
/**
@@ -75,7 +75,7 @@ public:
// Set/get signal status.
/// True if there is a pending signal.
- static int sig_pending (void);
+ static int sig_pending ();
/// Reset the value of <sig_pending_> so that no signal is pending.
static void sig_pending (int);
@@ -98,7 +98,7 @@ public:
ucontext_t *);
/// Dump the state of an object.
- void dump (void) const;
+ void dump () const;
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
@@ -164,7 +164,7 @@ class ACE_Export ACE_Sig_Handlers : public ACE_Sig_Handler
{
public:
/// Default constructor
- ACE_Sig_Handlers (void);
+ ACE_Sig_Handlers ();
// = Registration and removal methods.
/**
@@ -215,7 +215,7 @@ public:
static void dispatch (int signum, siginfo_t *, ucontext_t *);
/// 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/Sig_Handler.inl b/ACE/ace/Sig_Handler.inl
index a2ad69de737..08531ab2cdd 100644
--- a/ACE/ace/Sig_Handler.inl
+++ b/ACE/ace/Sig_Handler.inl
@@ -1,6 +1,6 @@
// -*- C++ -*-
ACE_INLINE
-ACE_Sig_Handler::ACE_Sig_Handler (void)
+ACE_Sig_Handler::ACE_Sig_Handler ()
{
}
diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp
index fa2704ed82c..b29d8bc7b7d 100644
--- a/ACE/ace/Timer_Heap_T.cpp
+++ b/ACE/ace/Timer_Heap_T.cpp
@@ -50,7 +50,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_Iterator_T (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_Iterator_T ()
{
}
@@ -58,7 +58,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
void
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first ()
{
this->position_ = 0;
}
@@ -67,7 +67,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void)
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
void
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next ()
{
if (this->position_ != this->timer_heap_.cur_size_)
++this->position_;
@@ -76,7 +76,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void)
// Returns true the <position_> is at the end of the heap array
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone (void) const
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const
{
return this->position_ == this->timer_heap_.cur_size_;
}
@@ -84,7 +84,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone (void) c
// Returns the node at the current position in the heap or 0 if at the end
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void)
+ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item ()
{
if (this->position_ != this->timer_heap_.cur_size_)
return this->timer_heap_.heap_[this->position_];
@@ -222,7 +222,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_T (
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_T (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_T ()
{
ACE_TRACE ("ACE_Timer_Heap_T::~ACE_Timer_Heap_T");
@@ -258,7 +258,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_T (void)
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close ()
{
ACE_TRACE ("ACE_Timer_Heap_T::close");
@@ -284,7 +284,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void)
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
long
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::pop_freelist (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::pop_freelist ()
{
ACE_TRACE ("ACE_Timer_Heap_T::pop_freelist");
@@ -342,7 +342,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::push_freelist (long old_
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
long
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_id (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_id ()
{
ACE_TRACE ("ACE_Timer_Heap_T::timer_id");
@@ -354,7 +354,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_id (void)
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
bool
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty () const
{
ACE_TRACE ("ACE_Timer_Heap_T::is_empty");
@@ -363,7 +363,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
ACE_Timer_Queue_Iterator_T<TYPE> &
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter ()
{
this->iterator_->first ();
return *this->iterator_;
@@ -372,7 +372,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void)
// Returns earliest time in a non-empty queue.
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> const ACE_Time_Value &
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time (void) const
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time () const
{
ACE_TRACE ("ACE_Timer_Heap_T::earliest_time");
return this->heap_[0]->get_timer_value ();
@@ -380,7 +380,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time (void) con
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
void
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const
{
#if defined (ACE_HAS_DUMP)
ACE_TRACE ("ACE_Timer_Heap_T::dump");
@@ -562,7 +562,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::insert (
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
void
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::grow_heap (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::grow_heap ()
{
// All the containers will double in size from max_size_.
size_t new_size = this->max_size_ * 2;
@@ -682,7 +682,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::reschedule (
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node ()
{
ACE_Timer_Node_T<TYPE> *temp = 0;
@@ -920,7 +920,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::cancel (const TYPE &type
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
ACE_Timer_Node_T <TYPE> *
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first ()
{
ACE_TRACE ("ACE_Timer_Heap_T::remove_first");
@@ -932,7 +932,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first (void)
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
ACE_Timer_Node_T <TYPE> *
-ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first (void)
+ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first ()
{
ACE_TRACE ("ACE_Timer_Heap_T::get_first");
diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h
index 433bb7b7442..eed63517e1c 100644
--- a/ACE/ace/Timer_Heap_T.h
+++ b/ACE/ace/Timer_Heap_T.h
@@ -45,19 +45,19 @@ public:
ACE_Timer_Heap_Iterator_T (Heap &);
/// Destructor.
- virtual ~ACE_Timer_Heap_Iterator_T (void);
+ virtual ~ACE_Timer_Heap_Iterator_T ();
/// Positions the iterator at the earliest node in the Timer Queue
- virtual void first (void);
+ virtual void first ();
/// Positions the iterator at the next node in the Timer Queue
- virtual void next (void);
+ virtual void next ();
/// Returns true when there are no more nodes in the sequence
- virtual bool isdone (void) const;
+ virtual bool isdone () const;
/// Returns the node at the current position in the sequence
- virtual ACE_Timer_Node_T<TYPE> *item (void);
+ virtual ACE_Timer_Node_T<TYPE> *item ();
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
@@ -125,14 +125,14 @@ public:
TIME_POLICY const & time_policy = TIME_POLICY());
/// Destructor.
- virtual ~ACE_Timer_Heap_T (void);
+ virtual ~ACE_Timer_Heap_T ();
/// True if heap is empty, else false.
- virtual bool is_empty (void) const;
+ virtual bool is_empty () const;
/// Returns the time of the earliest node in the Timer_Queue.
/// Must be called on a non-empty queue.
- virtual const ACE_Time_Value &earliest_time (void) const;
+ virtual const ACE_Time_Value &earliest_time () const;
/**
* Resets the interval of the timer represented by @a timer_id to
@@ -168,10 +168,10 @@ public:
/**
* Destroy timer queue. Cancels all timers.
*/
- virtual int close (void);
+ virtual int close ();
/// Returns a pointer to this ACE_Timer_Queue's iterator.
- virtual ACE_Timer_Queue_Iterator_T<TYPE> &iter (void);
+ virtual ACE_Timer_Queue_Iterator_T<TYPE> &iter ();
/**
* Removes the earliest node from the queue and returns it. Note that
@@ -181,13 +181,13 @@ public:
* this function is for support of @c ACE_Timer_Queue::expire and
* should not be used unadvisedly in other conditions.
*/
- ACE_Timer_Node_T <TYPE> *remove_first (void);
+ ACE_Timer_Node_T <TYPE> *remove_first ();
/// Dump the state of an object.
- virtual void dump (void) const;
+ virtual void dump () const;
/// Reads the earliest node from the queue and returns it.
- virtual ACE_Timer_Node_T<TYPE> *get_first (void);
+ virtual ACE_Timer_Node_T<TYPE> *get_first ();
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
@@ -220,7 +220,7 @@ protected:
/// Factory method that allocates a new node (uses operator new if
/// we're *not* preallocating, otherwise uses an internal freelist).
- virtual ACE_Timer_Node_T<TYPE> *alloc_node (void);
+ virtual ACE_Timer_Node_T<TYPE> *alloc_node ();
/**
* Factory method that frees a previously allocated node (uses
@@ -242,7 +242,7 @@ private:
* If preallocation is used, will also double the size of the
* preallocated array of ACE_Timer_Nodes.
*/
- void grow_heap (void);
+ void grow_heap ();
/// Restore the heap property, starting at @a slot.
void reheap_up (ACE_Timer_Node_T<TYPE> *new_node,
@@ -264,10 +264,10 @@ private:
* timer id returned from this method will never == -1 to avoid
* conflicts with other failure return values.
*/
- long timer_id (void);
+ long timer_id ();
/// Pops and returns a new timer id from the freelist.
- long pop_freelist (void);
+ long pop_freelist ();
/// Pushes @a old_id onto the freelist.
void push_freelist (long old_id);
diff --git a/ACE/ace/Timer_Queue_Iterator.cpp b/ACE/ace/Timer_Queue_Iterator.cpp
index 2d16088b8d6..40965be1433 100644
--- a/ACE/ace/Timer_Queue_Iterator.cpp
+++ b/ACE/ace/Timer_Queue_Iterator.cpp
@@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Timer_Node_T)
template <class TYPE> void
-ACE_Timer_Node_T<TYPE>::dump (void) const
+ACE_Timer_Node_T<TYPE>::dump () const
{
#if defined (ACE_HAS_DUMP)
ACE_TRACE ("ACE_Timer_Node_T::dump");
@@ -35,7 +35,7 @@ ACE_Timer_Node_T<TYPE>::dump (void) const
}
template <class TYPE>
-ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T (void)
+ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T ()
: act_ (0),
prev_ (0),
next_ (0),
@@ -45,18 +45,18 @@ ACE_Timer_Node_T<TYPE>::ACE_Timer_Node_T (void)
}
template <class TYPE>
-ACE_Timer_Node_T<TYPE>::~ACE_Timer_Node_T (void)
+ACE_Timer_Node_T<TYPE>::~ACE_Timer_Node_T ()
{
ACE_TRACE ("ACE_Timer_Node_T::~ACE_Timer_Node_T");
}
template <class TYPE>
-ACE_Timer_Queue_Iterator_T<TYPE>::ACE_Timer_Queue_Iterator_T (void)
+ACE_Timer_Queue_Iterator_T<TYPE>::ACE_Timer_Queue_Iterator_T ()
{
}
template <class TYPE>
-ACE_Timer_Queue_Iterator_T<TYPE>::~ACE_Timer_Queue_Iterator_T (void)
+ACE_Timer_Queue_Iterator_T<TYPE>::~ACE_Timer_Queue_Iterator_T ()
{
}
diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h
index 35dc274033a..51aa013518a 100644
--- a/ACE/ace/Timer_Queue_Iterator.h
+++ b/ACE/ace/Timer_Queue_Iterator.h
@@ -42,10 +42,10 @@ class ACE_Timer_Node_T
{
public:
/// Default constructor
- ACE_Timer_Node_T (void);
+ ACE_Timer_Node_T ();
/// Destructor
- ~ACE_Timer_Node_T (void);
+ ~ACE_Timer_Node_T ();
/// Useful typedef ..
typedef ACE_Timer_Node_Dispatch_Info_T <TYPE> DISPATCH_INFO;
@@ -70,43 +70,43 @@ public:
// = Accessors
/// Get the type.
- TYPE &get_type (void);
+ TYPE &get_type ();
/// Set the type.
void set_type (TYPE &type);
/// Get the asynchronous completion token.
- const void *get_act (void);
+ const void *get_act ();
/// Set the asynchronous completion token.
void set_act (void *act);
/// Get the timer value.
- const ACE_Time_Value &get_timer_value (void) const;
+ const ACE_Time_Value &get_timer_value () const;
/// Set the timer value.
void set_timer_value (const ACE_Time_Value &timer_value);
/// Get the timer interval.
- const ACE_Time_Value &get_interval (void) const;
+ const ACE_Time_Value &get_interval () const;
/// Set the timer interval.
void set_interval (const ACE_Time_Value &interval);
/// Get the previous pointer.
- ACE_Timer_Node_T<TYPE> *get_prev (void);
+ ACE_Timer_Node_T<TYPE> *get_prev ();
/// Set the previous pointer.
void set_prev (ACE_Timer_Node_T<TYPE> *prev);
/// Get the next pointer.
- ACE_Timer_Node_T<TYPE> *get_next (void);
+ ACE_Timer_Node_T<TYPE> *get_next ();
/// Set the next pointer.
void set_next (ACE_Timer_Node_T<TYPE> *next);
/// Get the timer_id.
- long get_timer_id (void) const;
+ long get_timer_id () const;
/// Set the timer_id.
void set_timer_id (long timer_id);
@@ -119,7 +119,7 @@ public:
void get_dispatch_info (ACE_Timer_Node_Dispatch_Info_T <TYPE> &info);
/// Dump the state of an TYPE.
- void dump (void) const;
+ void dump () const;
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
@@ -163,22 +163,22 @@ class ACE_Timer_Queue_Iterator_T
{
public:
/// Constructor.
- ACE_Timer_Queue_Iterator_T (void);
+ ACE_Timer_Queue_Iterator_T ();
/// Destructor.
- virtual ~ACE_Timer_Queue_Iterator_T (void);
+ virtual ~ACE_Timer_Queue_Iterator_T ();
/// Positions the iterator at the earliest node in the Timer Queue
- virtual void first (void) = 0;
+ virtual void first () = 0;
/// Positions the iterator at the next node in the Timer Queue
- virtual void next (void) = 0;
+ virtual void next () = 0;
/// Returns true when there are no more nodes in the sequence
- virtual bool isdone (void) const = 0;
+ virtual bool isdone () const = 0;
/// Returns the node at the current position in the sequence
- virtual ACE_Timer_Node_T<TYPE> *item (void) = 0;
+ virtual ACE_Timer_Node_T<TYPE> *item () = 0;
};
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Timer_Queue_Iterator.inl b/ACE/ace/Timer_Queue_Iterator.inl
index 556987e08ac..95e364ed50e 100644
--- a/ACE/ace/Timer_Queue_Iterator.inl
+++ b/ACE/ace/Timer_Queue_Iterator.inl
@@ -36,7 +36,7 @@ ACE_Timer_Node_T<TYPE>::set (const TYPE &type,
}
template <class TYPE> ACE_INLINE TYPE &
-ACE_Timer_Node_T<TYPE>::get_type (void)
+ACE_Timer_Node_T<TYPE>::get_type ()
{
return this->type_;
}
@@ -48,7 +48,7 @@ ACE_Timer_Node_T<TYPE>::set_type (TYPE &type)
}
template <class TYPE> ACE_INLINE const void *
-ACE_Timer_Node_T<TYPE>::get_act (void)
+ACE_Timer_Node_T<TYPE>::get_act ()
{
return this->act_;
}
@@ -60,7 +60,7 @@ ACE_Timer_Node_T<TYPE>::set_act (void *act)
}
template <class TYPE> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Node_T<TYPE>::get_timer_value (void) const
+ACE_Timer_Node_T<TYPE>::get_timer_value () const
{
return this->timer_value_;
}
@@ -72,7 +72,7 @@ ACE_Timer_Node_T<TYPE>::set_timer_value (const ACE_Time_Value &timer_value)
}
template <class TYPE> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Node_T<TYPE>::get_interval (void) const
+ACE_Timer_Node_T<TYPE>::get_interval () const
{
return this->interval_;
}
@@ -84,7 +84,7 @@ ACE_Timer_Node_T<TYPE>::set_interval (const ACE_Time_Value &interval)
}
template <class TYPE> ACE_INLINE ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Node_T<TYPE>::get_prev (void)
+ACE_Timer_Node_T<TYPE>::get_prev ()
{
return this->prev_;
}
@@ -96,7 +96,7 @@ ACE_Timer_Node_T<TYPE>::set_prev (ACE_Timer_Node_T<TYPE> *prev)
}
template <class TYPE> ACE_INLINE ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Node_T<TYPE>::get_next (void)
+ACE_Timer_Node_T<TYPE>::get_next ()
{
return this->next_;
}
@@ -108,7 +108,7 @@ ACE_Timer_Node_T<TYPE>::set_next (ACE_Timer_Node_T<TYPE> *next)
}
template <class TYPE> ACE_INLINE long
-ACE_Timer_Node_T<TYPE>::get_timer_id (void) const
+ACE_Timer_Node_T<TYPE>::get_timer_id () const
{
return this->timer_id_;
}
diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp
index 209dc8c3546..94600bb5800 100644
--- a/ACE/ace/Timer_Queue_T.cpp
+++ b/ACE/ace/Timer_Queue_T.cpp
@@ -62,7 +62,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday()
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday (ACE_Time_Value (*gettimeofday)(void))
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday (ACE_Time_Value (*gettimeofday)())
{
this->time_policy_.set_gettimeofday (gettimeofday);
}
@@ -158,7 +158,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::current_time()
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const
{
#if defined (ACE_HAS_DUMP)
ACE_TRACE ("ACE_Timer_Queue_T::dump");
@@ -188,7 +188,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Queue_T (FUNC
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY>
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Queue_T (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Queue_T ()
{
ACE_TRACE ("ACE_Timer_Queue_T::~ACE_Timer_Queue_T");
@@ -198,7 +198,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Queue_T (voi
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> *
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::alloc_node ()
{
return this->free_list_->remove ();
}
@@ -210,7 +210,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::free_node (ACE_Timer_No
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_LOCK &
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::mutex (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::mutex ()
{
return this->mutex_;
}
@@ -244,7 +244,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::schedule (const TYPE &t
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire ()
{
// We can't check here is the timer queue is empty, in some
// implementations (like the timer heap) calling is_empty()
diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h
index e1ee3317de2..a28de49ee6f 100644
--- a/ACE/ace/Timer_Queue_T.h
+++ b/ACE/ace/Timer_Queue_T.h
@@ -46,10 +46,10 @@ public:
explicit ACE_Timer_Queue_Upcall_Base(FUNCTOR * upcall_functor = 0);
/// Destructor
- virtual ~ACE_Timer_Queue_Upcall_Base (void);
+ virtual ~ACE_Timer_Queue_Upcall_Base ();
/// Accessor to the upcall functor
- FUNCTOR & upcall_functor (void);
+ FUNCTOR & upcall_functor ();
protected:
/// Upcall functor
@@ -88,7 +88,7 @@ public:
/// Destructor - make virtual for proper destruction of inherited
/// classes.
- virtual ~ACE_Timer_Queue_T (void);
+ virtual ~ACE_Timer_Queue_T ();
/**
* Implement ACE_Abstract_Timer_Queue<TYPE>::schedule () with the right
@@ -105,7 +105,7 @@ public:
* locking strategy.
*/
virtual int expire (const ACE_Time_Value &current_time);
- virtual int expire (void);
+ virtual int expire ();
virtual int expire_single(ACE_Command_Base & pre_dispatch_command);
//@}
@@ -121,7 +121,7 @@ public:
/**
* Implement the gettimeofday() virtual function
*/
- virtual ACE_Time_Value gettimeofday (void);
+ virtual ACE_Time_Value gettimeofday ();
//@}
/**
@@ -132,7 +132,7 @@ public:
* is ACE_FPointer_Time_Policy. Other standard ACE time
* policies will ignore this.
*/
- virtual void gettimeofday (ACE_Time_Value (*gettimeofday)(void));
+ virtual void gettimeofday (ACE_Time_Value (*gettimeofday)());
/// Implement an inlined, non-abstract version of gettimeofday(),
/// through this member function the internals of the class can
@@ -160,13 +160,13 @@ public:
void timer_skew (const ACE_Time_Value &skew);
/// Get the timer skew for the Timer_Queue.
- const ACE_Time_Value &timer_skew (void) const;
+ const ACE_Time_Value &timer_skew () const;
/// Synchronization variable used by the queue
- ACE_LOCK &mutex (void);
+ ACE_LOCK &mutex ();
/// Dump the state of a object.
- virtual void dump (void) const;
+ virtual void dump () const;
/// Method used to return a timer node to the queue's ownership
/// after it is returned by a method like <remove_first>.
@@ -197,7 +197,7 @@ protected:
virtual void reschedule (ACE_Timer_Node_T<TYPE> *) = 0;
/// Factory method that allocates a new node.
- virtual ACE_Timer_Node_T<TYPE> *alloc_node (void);
+ virtual ACE_Timer_Node_T<TYPE> *alloc_node ();
/// Factory method that frees a previously allocated node.
virtual void free_node (ACE_Timer_Node_T<TYPE> *);
diff --git a/ACE/ace/Timer_Queue_T.inl b/ACE/ace/Timer_Queue_T.inl
index 64f2bf14c5a..15c0e8ef99d 100644
--- a/ACE/ace/Timer_Queue_T.inl
+++ b/ACE/ace/Timer_Queue_T.inl
@@ -2,7 +2,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class TYPE, class FUNCTOR> ACE_INLINE FUNCTOR &
-ACE_Timer_Queue_Upcall_Base<TYPE, FUNCTOR>::upcall_functor (void)
+ACE_Timer_Queue_Upcall_Base<TYPE, FUNCTOR>::upcall_functor ()
{
return *this->upcall_functor_;
}
@@ -14,7 +14,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_skew (const ACE_T
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_INLINE const ACE_Time_Value &
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_skew (void) const
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::timer_skew () const
{
return timer_skew_;
}
@@ -67,7 +67,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::postinvoke (ACE_Timer_N
}
template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_INLINE ACE_Time_Value
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday_static (void)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::gettimeofday_static ()
{
// Get the current time according to the time policy.
return this->time_policy_ ();