diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-17 16:58:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 16:58:48 +0100 |
| commit | b5fa839b3d30f2a1fb8b5b642217515c95d2aa93 (patch) | |
| tree | c839b605949b998fba59ae6f1e11bc57babbdef2 | |
| parent | 40019b0660840cce9e799ca988757b7dfc2ae314 (diff) | |
| parent | 75f5f0a4747ba841326afd91dc5a4fcdf40afc37 (diff) | |
| download | ATCD-b5fa839b3d30f2a1fb8b5b642217515c95d2aa93.tar.gz | |
Merge pull request #1349 from jwillemsen/jwi-autoptr2
Make use of std::unique_ptr instead of auto_ptr
258 files changed, 1432 insertions, 1432 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/Default_Dispatcher_Impl.cpp b/ACE/Kokyu/Default_Dispatcher_Impl.cpp index 29d6ef1a9be..c5f067fb878 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Default_Dispatcher_Impl.cpp @@ -1,5 +1,8 @@ #include "Default_Dispatcher_Impl.h" + #include "ace/Sched_Params.h" +#include <utility> +#include <memory> #if ! defined (__ACE_INLINE__) #include "Default_Dispatcher_Impl.inl" @@ -50,8 +53,8 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs) Dispatcher_Task (*config, ACE_Thread_Manager::instance()), -1); - auto_ptr<Dispatcher_Task> tmp_task_auto_ptr (task); - tasks_[i++] = tmp_task_auto_ptr; + std::unique_ptr<Dispatcher_Task> tmp_task_auto_ptr (task); + tasks_[i++] = std::move(tmp_task_auto_ptr); //I couldn't use reset because MSVC6 auto_ptr does not have reset method. //So in configurations where the auto_ptr maps to the std::auto_ptr instead //of ACE auto_ptr, this would be a problem. diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.h b/ACE/Kokyu/Default_Dispatcher_Impl.h index 9d9c4c3f6bf..350c88d179d 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.h +++ b/ACE/Kokyu/Default_Dispatcher_Impl.h @@ -19,11 +19,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Auto_Ptr.h" #include "kokyu_export.h" #include "Kokyu_defs.h" #include "Dispatcher_Impl.h" #include "Dispatcher_Task.h" +#include <memory> namespace Kokyu { @@ -48,7 +48,7 @@ namespace Kokyu Dispatcher_Task* find_task_with_preemption_prio (Priority_t); private: - typedef auto_ptr<Dispatcher_Task> Dispatcher_Task_Auto_Ptr; + typedef std::unique_ptr<Dispatcher_Task> Dispatcher_Task_Auto_Ptr; ACE_Auto_Array_Ptr<Dispatcher_Task_Auto_Ptr> tasks_; int ntasks_; ConfigInfoSet curr_config_info_; diff --git a/ACE/Kokyu/Dispatcher_Task.cpp b/ACE/Kokyu/Dispatcher_Task.cpp index 07857091e60..b128dcab6bf 100644 --- a/ACE/Kokyu/Dispatcher_Task.cpp +++ b/ACE/Kokyu/Dispatcher_Task.cpp @@ -66,7 +66,7 @@ Dispatcher_Task::initialize () } int -Dispatcher_Task::svc (void) +Dispatcher_Task::svc () { int done = 0; diff --git a/ACE/Kokyu/Dispatcher_Task.h b/ACE/Kokyu/Dispatcher_Task.h index d565be94f5d..ca602ca2be7 100644 --- a/ACE/Kokyu/Dispatcher_Task.h +++ b/ACE/Kokyu/Dispatcher_Task.h @@ -69,7 +69,7 @@ public: const QoSDescriptor& qos_info); /// Process the events in the queue. - int svc (void); + int svc (); const ConfigInfo& get_curr_config_info() const; Priority_t preemption_priority() const; diff --git a/ACE/Kokyu/Kokyu.cpp b/ACE/Kokyu/Kokyu.cpp index 5c1f4fe9d17..1f89b5f712b 100644 --- a/ACE/Kokyu/Kokyu.cpp +++ b/ACE/Kokyu/Kokyu.cpp @@ -1,5 +1,7 @@ #include "Kokyu.h" +#include <utility> + #include "Default_Dispatcher_Impl.h" #if ! defined (__ACE_INLINE__) @@ -26,8 +28,8 @@ int Dispatcher::activate () void Dispatcher::implementation (Dispatcher_Impl* impl) { - auto_ptr<Dispatcher_Impl> tmp_impl (impl); - dispatcher_impl_ = tmp_impl; + std::unique_ptr<Dispatcher_Impl> tmp_impl (impl); + dispatcher_impl_ = std::move(tmp_impl); //I couldn't use reset because MSVC++ auto_ptr does not have reset method. //So in configurations where the auto_ptr maps to the std::auto_ptr instead diff --git a/ACE/Kokyu/Kokyu.h b/ACE/Kokyu/Kokyu.h index 086f95eb67b..bbf444a4a7d 100644 --- a/ACE/Kokyu/Kokyu.h +++ b/ACE/Kokyu/Kokyu.h @@ -17,6 +17,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include <utility> +#include <memory> #include "kokyu_export.h" #include "Kokyu_defs.h" @@ -74,10 +76,10 @@ namespace Kokyu private: /// Auto ptr to the implementation. Implementation will be created on the /// heap and deleted automatically when the dispatcher object is destructed. - auto_ptr<Dispatcher_Impl> dispatcher_impl_; + std::unique_ptr<Dispatcher_Impl> dispatcher_impl_; }; - typedef auto_ptr<Dispatcher> Dispatcher_Auto_Ptr; + typedef std::unique_ptr<Dispatcher> Dispatcher_Auto_Ptr; /** * @class Dispatcher_Factory diff --git a/ACE/Kokyu/Kokyu_defs.cpp b/ACE/Kokyu/Kokyu_defs.cpp index afda89b8016..e474da88d0b 100644 --- a/ACE/Kokyu/Kokyu_defs.cpp +++ b/ACE/Kokyu/Kokyu_defs.cpp @@ -6,7 +6,7 @@ namespace Kokyu { - Dispatch_Command::~Dispatch_Command (void) + Dispatch_Command::~Dispatch_Command () { } diff --git a/ACE/Kokyu/Kokyu_defs.h b/ACE/Kokyu/Kokyu_defs.h index e0942a97845..409991c9670 100644 --- a/ACE/Kokyu/Kokyu_defs.h +++ b/ACE/Kokyu/Kokyu_defs.h @@ -134,12 +134,12 @@ namespace Kokyu int can_be_deleted () const; - void destroy (void); + void destroy (); protected: /// Destructor // only inheritance is possible and object should be on heap, // since object could be handed over to a different thread. - virtual ~Dispatch_Command (void); + virtual ~Dispatch_Command (); private: int dont_delete_; 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/Kokyu/Kokyu_dsrt.cpp b/ACE/Kokyu/Kokyu_dsrt.cpp index 604e3c57d48..5832b22dd03 100644 --- a/ACE/Kokyu/Kokyu_dsrt.cpp +++ b/ACE/Kokyu/Kokyu_dsrt.cpp @@ -15,8 +15,8 @@ template <class DSRT_Scheduler_Traits> void DSRT_Dispatcher<DSRT_Scheduler_Traits>::implementation (DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>* impl) { - auto_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > tmp_impl (impl); - dispatcher_impl_ = tmp_impl; + std::unique_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > tmp_impl (impl); + dispatcher_impl_ = std::move(tmp_impl); } template <class DSRT_Scheduler_Traits> diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h index 0c00c1f346c..11f24ec1eac 100644 --- a/ACE/Kokyu/Kokyu_dsrt.h +++ b/ACE/Kokyu/Kokyu_dsrt.h @@ -12,6 +12,7 @@ #include "kokyu_export.h" #include "Kokyu_defs.h" +#include <memory> namespace Kokyu { @@ -67,7 +68,7 @@ namespace Kokyu private: /// Auto ptr to the implementation. Implementation will be created on the /// heap and deleted automatically when the dispatcher object is destructed. - auto_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > dispatcher_impl_; + std::unique_ptr<DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> > dispatcher_impl_; }; @@ -85,7 +86,7 @@ namespace Kokyu class DSRT_Dispatcher_Factory : private ACE_Copy_Disabled { public: - typedef auto_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr; + typedef std::unique_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr; /** * Create a dispatcher for dynamic dispatching of threads. diff --git a/ACE/Kokyu/tests/EDF/test.cpp b/ACE/Kokyu/tests/EDF/test.cpp index 32a0860ee36..46fa980f0fd 100644 --- a/ACE/Kokyu/tests/EDF/test.cpp +++ b/ACE/Kokyu/tests/EDF/test.cpp @@ -1,5 +1,3 @@ -#include "ace/Auto_Ptr.h" - #include "Kokyu.h" #include "ace/Task.h" #include "ace/Sched_Params.h" @@ -7,6 +5,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_sys_time.h" +#include <memory> ACE_CString sched_policy_str = "fifo"; @@ -88,7 +87,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR** argv) ACE_DEBUG ((LM_DEBUG, "before create_dispatcher\n" )); attrs.config_info_set_ = config_info; - auto_ptr<Kokyu::Dispatcher> + std::unique_ptr<Kokyu::Dispatcher> disp (Kokyu::Dispatcher_Factory::create_dispatcher (attrs)); ACE_ASSERT (disp.get() != 0); diff --git a/ACE/Kokyu/tests/FIFO/README b/ACE/Kokyu/tests/FIFO/README index c3d271caaf8..55438c99683 100644 --- a/ACE/Kokyu/tests/FIFO/README +++ b/ACE/Kokyu/tests/FIFO/README @@ -1,5 +1,3 @@ - - This example is a very simple example, showing how to use the Kokyu dispatcher to dispatch command objects in a FIFO manner. The test configures the Kokyu dispatcher with 3 FIFO lanes, each having a diff --git a/ACE/Kokyu/tests/FIFO/test.cpp b/ACE/Kokyu/tests/FIFO/test.cpp index d9a86aeb225..b0e5dd5f7a2 100644 --- a/ACE/Kokyu/tests/FIFO/test.cpp +++ b/ACE/Kokyu/tests/FIFO/test.cpp @@ -1,10 +1,9 @@ -#include "ace/Auto_Ptr.h" - #include "Kokyu.h" #include "ace/Task.h" #include "ace/SString.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_strings.h" +#include <memory> ACE_CString sched_policy_str = "fifo"; @@ -98,7 +97,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR** argv) attrs.config_info_set_ = config_info; ACE_DEBUG ((LM_DEBUG, "before create_dispatcher\n" )); - auto_ptr<Kokyu::Dispatcher> + std::unique_ptr<Kokyu::Dispatcher> disp (Kokyu::Dispatcher_Factory::create_dispatcher (attrs)); ACE_ASSERT (disp.get() != 0); 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/Addr.h b/ACE/ace/Addr.h index ef5f6879e83..bfdea64446d 100644 --- a/ACE/ace/Addr.h +++ b/ACE/ace/Addr.h @@ -34,12 +34,12 @@ public: ACE_Addr (int type = -1, int size = -1); /// Destructor. - virtual ~ACE_Addr (void); + virtual ~ACE_Addr (); // = Get/set the size of the address. /// Return the size of the address. - int get_size (void) const; + int get_size () const; /// Sets the size of the address. void set_size (int size); @@ -47,13 +47,13 @@ public: // = Get/set the type of the address. /// Get the type of the address. - int get_type (void) const; + int get_type () const; /// Set the type of the address. void set_type (int type); /// Return a pointer to the address. - virtual void *get_addr (void) const; + virtual void *get_addr () const; /// Set a pointer to the address. virtual void set_addr (const void *, int len); @@ -73,7 +73,7 @@ public: /// Returns a hash value. This should be overwritten by a subclass /// that can produce a better hash value. - virtual unsigned long hash (void) const; + virtual unsigned long hash () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Addr.inl b/ACE/ace/Addr.inl index ad6f03e216a..1df00e9ab41 100644 --- a/ACE/ace/Addr.inl +++ b/ACE/ace/Addr.inl @@ -19,7 +19,7 @@ ACE_Addr::operator != (const ACE_Addr &sap) const /// Return the size of the address. ACE_INLINE int -ACE_Addr::get_size (void) const +ACE_Addr::get_size () const { return this->addr_size_; } @@ -33,7 +33,7 @@ ACE_Addr::set_size (int size) /// Return the type of the address. ACE_INLINE int -ACE_Addr::get_type (void) const +ACE_Addr::get_type () const { return this->addr_type_; } @@ -46,7 +46,7 @@ ACE_Addr::set_type (int type) } ACE_INLINE unsigned long -ACE_Addr::hash (void) const +ACE_Addr::hash () const { return 0; } diff --git a/ACE/ace/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/FILE.h b/ACE/ace/FILE.h index 1d8cc4f57a4..0396afad974 100644 --- a/ACE/ace/FILE.h +++ b/ACE/ace/FILE.h @@ -50,14 +50,14 @@ class ACE_Export ACE_FILE : public ACE_IO_SAP public: /// Close the ACE_FILE handle without removing the ACE_FILE from /// the file system. - int close (void); + int close (); /// Close and remove the ACE_FILE from the file system. - int remove (void); + int remove (); /// Remove the ACE_FILE from the file system without closing the /// ACE_FILE handle. - int unlink (void); + int unlink (); /// Get information on this ACE_FILE. int get_info (ACE_FILE_Info *finfo); @@ -83,7 +83,7 @@ public: int whence = SEEK_CUR); /// Return an offset for the file handle. - ACE_OFF_T tell (void); + ACE_OFF_T tell (); /** * Disable signal @a signum @@ -108,7 +108,7 @@ public: protected: /// Ensure that this class is only created by the /// ACE_FILE_Connector. - ACE_FILE (void); + ACE_FILE (); /// File we are "connected" with... ACE_FILE_Addr addr_; diff --git a/ACE/ace/FILE_Addr.h b/ACE/ace/FILE_Addr.h index 0ccf0b4cd59..bb14decca74 100644 --- a/ACE/ace/FILE_Addr.h +++ b/ACE/ace/FILE_Addr.h @@ -32,7 +32,7 @@ class ACE_Export ACE_FILE_Addr : public ACE_Addr { public: /// Default constructor. - ACE_FILE_Addr (void); + ACE_FILE_Addr (); /// Copy constructor. ACE_FILE_Addr (const ACE_FILE_Addr &sa); @@ -51,7 +51,7 @@ public: ACE_FILE_Addr &operator= (const ACE_FILE_Addr &); /// Return a pointer to the address. - virtual void *get_addr (void) const; + virtual void *get_addr () const; /// Transform the current address into string format. virtual int addr_to_string (ACE_TCHAR *addr, size_t) const; @@ -63,7 +63,7 @@ public: bool operator != (const ACE_FILE_Addr &SAP) const; /// Return the path name used for the rendezvous point. - const ACE_TCHAR *get_path_name (void) const; + const ACE_TCHAR *get_path_name () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/FILE_Addr.inl b/ACE/ace/FILE_Addr.inl index c873ba8b08b..828ef066669 100644 --- a/ACE/ace/FILE_Addr.inl +++ b/ACE/ace/FILE_Addr.inl @@ -23,7 +23,7 @@ ACE_FILE_Addr::operator != (const ACE_FILE_Addr &sap) const // Return the path name used for the rendezvous point. ACE_INLINE const ACE_TCHAR * -ACE_FILE_Addr::get_path_name (void) const +ACE_FILE_Addr::get_path_name () const { return this->filename_; } diff --git a/ACE/ace/FILE_Connector.h b/ACE/ace/FILE_Connector.h index 8db5dc3776c..22dd23f48dd 100644 --- a/ACE/ace/FILE_Connector.h +++ b/ACE/ace/FILE_Connector.h @@ -38,7 +38,7 @@ class ACE_Export ACE_FILE_Connector { public: /// Default constructor. - ACE_FILE_Connector (void); + ACE_FILE_Connector (); /** * Actively ``connect'' and produce a @a new_io ACE_FILE_IO object diff --git a/ACE/ace/FILE_IO.h b/ACE/ace/FILE_IO.h index c23f5905569..f53b02dbf5f 100644 --- a/ACE/ace/FILE_IO.h +++ b/ACE/ace/FILE_IO.h @@ -45,7 +45,7 @@ public: friend class ACE_FILE_Connector; /// Default constructor. - ACE_FILE_IO (void); + ACE_FILE_IO (); /// send upto @a n bytes in @a buf. ssize_t send (const void *buf, size_t n) const; diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h index 3dc19c38650..040df2b8cb2 100644 --- a/ACE/ace/Get_Opt.h +++ b/ACE/ace/Get_Opt.h @@ -195,7 +195,7 @@ public: int long_only = 0); #endif /// Default dtor. - ~ACE_Get_Opt (void); + ~ACE_Get_Opt (); /** * Scan elements of @a argv (whose length is @a argc) for short option @@ -233,14 +233,14 @@ public: * @a optstring up unto the first short option character for '+', '-', * and ':' in order to determine ordering and missing argument behavior. */ - int operator () (void); + int operator () (); /** * For communication from @c operator() to the caller. When * @c operator() finds an option that takes an argument, the argument * value is returned from this method, otherwise it returns 0. */ - ACE_TCHAR *opt_arg (void) const; + ACE_TCHAR *opt_arg () const; /** * Returns the most recently matched option character. Especially @@ -248,7 +248,7 @@ public: * that's required, since this allows the caller to learn what option * was specified without its required argument. */ - int opt_opt (void); + int opt_opt (); /** * Index in @a argv of the next element to be scanned. This is used @@ -262,7 +262,7 @@ public: * Otherwise, @c opt_ind() communicates from one call to the next how * much of @a argv has been scanned so far. */ - int &opt_ind (void); + int &opt_ind (); /// Adds a long option with no corresponding short option. /** @@ -298,26 +298,26 @@ public: /// Returns the name of the long option found on the last call to /// @c operator() or 0 if none was found. - const ACE_TCHAR *long_option (void) const; + const ACE_TCHAR *long_option () const; /// The number of arguments in the internal @c argv_. - int argc (void) const; + int argc () const; /// Accessor for the internal @c argv_ pointer. - ACE_TCHAR **argv (void) const; + ACE_TCHAR **argv () const; /// Accessor for the @c last_option that was processed. This allows /// applications to know if the found option was a short or long /// option, and is especially useful in cases where it was invalid /// and the caller wants to print out the invalid value. - const ACE_TCHAR *last_option (void) const; + const ACE_TCHAR *last_option () const; /// Dump the state of an object. void dump () const; /// Return the @a optstring. This is handy to verify that calls to /// long_option added short options as expected. - const ACE_TCHAR *optstring (void) const; + const ACE_TCHAR *optstring () const; public: /* @@ -387,7 +387,7 @@ private: int val = 0); /// Dtor. - ~ACE_Get_Opt_Long_Option (void); + ~ACE_Get_Opt_Long_Option (); bool operator < (const ACE_Get_Opt_Long_Option &rhs); @@ -409,21 +409,21 @@ private: }; /// Updates nextchar_. - int nextchar_i (void); + int nextchar_i (); /// Handles long options. - int long_option_i (void); + int long_option_i (); /// Handles short options. - int short_option_i (void); + int short_option_i (); /// If permuting args, this functions manages the nonopt_start_ and /// nonopt_end_ indexes and makes calls to permute to actually /// reorder the <argv>-elements. - void permute_args (void); + void permute_args (); /// Handles reordering <argv>-elements. - int permute (void); + int permute (); /// Set last_option. void last_option (const ACE_TString &s); diff --git a/ACE/ace/Get_Opt.inl b/ACE/ace/Get_Opt.inl index 32de1d85c18..950d707ec98 100644 --- a/ACE/ace/Get_Opt.inl +++ b/ACE/ace/Get_Opt.inl @@ -8,31 +8,31 @@ ACE_Get_Opt::ACE_Get_Opt_Long_Option::operator < (const ACE_Get_Opt_Long_Option } ACE_INLINE int -ACE_Get_Opt::argc (void) const +ACE_Get_Opt::argc () const { return this->argc_; } ACE_INLINE ACE_TCHAR ** -ACE_Get_Opt::argv (void) const +ACE_Get_Opt::argv () const { return this->argv_; } ACE_INLINE ACE_TCHAR* -ACE_Get_Opt::opt_arg (void) const +ACE_Get_Opt::opt_arg () const { return this->optarg; } ACE_INLINE int -ACE_Get_Opt::opt_opt (void) +ACE_Get_Opt::opt_opt () { return this->optopt_; } ACE_INLINE int & -ACE_Get_Opt::opt_ind (void) +ACE_Get_Opt::opt_ind () { return this->optind; } diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h index bb49682796b..1388d424a97 100644 --- a/ACE/ace/INET_Addr.h +++ b/ACE/ace/INET_Addr.h @@ -37,7 +37,7 @@ class ACE_Export ACE_INET_Addr : public ACE_Addr { public: /// Default constructor. - ACE_INET_Addr (void); + ACE_INET_Addr (); /// Copy constructor. ACE_INET_Addr (const ACE_INET_Addr &); @@ -109,7 +109,7 @@ public: #endif /* ACE_HAS_WCHAR */ /// Default dtor. - ~ACE_INET_Addr (void); + ~ACE_INET_Addr (); // = Direct initialization methods. @@ -210,8 +210,8 @@ public: #endif /* ACE_HAS_WCHAR */ /// Return a pointer to the underlying network address. - virtual void *get_addr (void) const; - int get_addr_size(void) const; + virtual void *get_addr () const; + int get_addr_size() const; /// Set a pointer to the address. virtual void set_addr (const void *, int len); @@ -284,7 +284,7 @@ public: #endif /* (ACE_LINUX || ACE_WIN32) && ACE_HAS_IPV6 */ /// Return the port number, converting it into host byte-order. - u_short get_port_number (void) const; + u_short get_port_number () const; /** * Return the character representation of the name of the host, @@ -309,7 +309,7 @@ public: * (2) use the "reentrant" version of get_host_name() described * above. */ - const char *get_host_name (void) const; + const char *get_host_name () const; /** * Return the "dotted decimal" Internet address representation of @@ -326,20 +326,20 @@ public: * using strdup() or (2) use the "reentrant" version of * get_host_addr() described above. */ - const char *get_host_addr (void) const; + const char *get_host_addr () const; /// Return the 4-byte IP address, converting it into host byte /// order. - ACE_UINT32 get_ip_address (void) const; + ACE_UINT32 get_ip_address () const; /// Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY. - bool is_any (void) const; + bool is_any () const; /// Return @c true if the IP address is IPv4/IPv6 loopback address. - bool is_loopback (void) const; + bool is_loopback () const; /// Return @c true if the IP address is IPv4/IPv6 multicast address. - bool is_multicast (void) const; + bool is_multicast () const; #if defined (ACE_HAS_IPV6) /// Return @c true if the IP address is IPv6 linklocal address. @@ -375,14 +375,14 @@ public: bool is_ip_equal (const ACE_INET_Addr &SAP) const; /// Computes and returns hash value. - virtual u_long hash (void) const; + virtual u_long hash () const; /// If there is another address to examine, move to it and return true; /// else return false. - bool next (void); + bool next (); /// Reset the set of address so they can be scanned again using next(). - void reset (void); + void reset (); /// Dump the state of an object. void dump () const; @@ -396,12 +396,12 @@ private: // Methods to gain access to the actual address of // the underlying internet address structure. - void *ip_addr_pointer (void) const; - int ip_addr_size (void) const; - int determine_type (void) const; + void *ip_addr_pointer () const; + int ip_addr_size () const; + int determine_type () const; /// Initialize underlying inet_addr_ to default values - void reset_i (void); + void reset_i (); /// Underlying representation. /// This union uses the knowledge that the two structures share the diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl index 96bbb161b67..f8aa3f42a1e 100644 --- a/ACE/ace/INET_Addr.inl +++ b/ACE/ace/INET_Addr.inl @@ -7,7 +7,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -ACE_INET_Addr::reset_i (void) +ACE_INET_Addr::reset_i () { ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); if (this->get_type() == AF_INET) @@ -32,7 +32,7 @@ ACE_INET_Addr::reset_i (void) } ACE_INLINE int -ACE_INET_Addr::determine_type (void) const +ACE_INET_Addr::determine_type () const { #if defined (ACE_HAS_IPV6) # if defined (ACE_USES_IPV4_IPV6_MIGRATION) @@ -46,7 +46,7 @@ ACE_INET_Addr::determine_type (void) const } ACE_INLINE void * -ACE_INET_Addr::ip_addr_pointer (void) const +ACE_INET_Addr::ip_addr_pointer () const { #if defined (ACE_HAS_IPV6) if (this->get_type () == PF_INET) @@ -59,7 +59,7 @@ ACE_INET_Addr::ip_addr_pointer (void) const } ACE_INLINE int -ACE_INET_Addr::ip_addr_size (void) const +ACE_INET_Addr::ip_addr_size () const { // Since this size value is used to pass to other host db-type // functions (gethostbyaddr, etc.) the length is of int type. @@ -78,7 +78,7 @@ ACE_INET_Addr::ip_addr_size (void) const // Return the port number, converting it into host byte order... ACE_INLINE u_short -ACE_INET_Addr::get_port_number (void) const +ACE_INET_Addr::get_port_number () const { ACE_TRACE ("ACE_INET_Addr::get_port_number"); #if defined (ACE_HAS_IPV6) @@ -96,7 +96,7 @@ ACE_INET_Addr::get_port_number (void) const } ACE_INLINE int -ACE_INET_Addr::get_addr_size (void) const +ACE_INET_Addr::get_addr_size () const { ACE_TRACE ("ACE_INET_Addr::get_addr_size"); #if defined (ACE_HAS_IPV6) @@ -181,7 +181,7 @@ ACE_INET_Addr::set (const wchar_t addr[], int address_family) // Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY. ACE_INLINE bool -ACE_INET_Addr::is_any (void) const +ACE_INET_Addr::is_any () const { #if defined (ACE_HAS_IPV6) if (this->get_type () == AF_INET6) @@ -193,7 +193,7 @@ ACE_INET_Addr::is_any (void) const // Return @c true if the IP address is IPv4/IPv6 loopback address. ACE_INLINE bool -ACE_INET_Addr::is_loopback (void) const +ACE_INET_Addr::is_loopback () const { #if defined (ACE_HAS_IPV6) if (this->get_type () == AF_INET6) @@ -206,7 +206,7 @@ ACE_INET_Addr::is_loopback (void) const // Return @c true if the IP address is IPv4/IPv6 multicast address. ACE_INLINE bool -ACE_INET_Addr::is_multicast (void) const +ACE_INET_Addr::is_multicast () const { #if defined (ACE_HAS_IPV6) if (this->get_type() == AF_INET6) diff --git a/ACE/ace/IO_SAP.h b/ACE/ace/IO_SAP.h index 3b00c05ff7b..81a4679145f 100644 --- a/ACE/ace/IO_SAP.h +++ b/ACE/ace/IO_SAP.h @@ -38,7 +38,7 @@ public: }; /// Default dtor. - ~ACE_IO_SAP (void); + ~ACE_IO_SAP (); /// Interface for ioctl. int control (int cmd, void *) const; @@ -60,7 +60,7 @@ public: int disable (int value) const; /// Get the underlying handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Set the underlying handle. void set_handle (ACE_HANDLE handle); @@ -73,7 +73,7 @@ public: protected: /// Ensure that ACE_IO_SAP is an abstract base class. - ACE_IO_SAP (void); + ACE_IO_SAP (); private: /// Underlying I/O handle. diff --git a/ACE/ace/IO_SAP.inl b/ACE/ace/IO_SAP.inl index d3472bb974c..12d8a50e397 100644 --- a/ACE/ace/IO_SAP.inl +++ b/ACE/ace/IO_SAP.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_IO_SAP::~ACE_IO_SAP (void) +ACE_IO_SAP::~ACE_IO_SAP () { ACE_TRACE ("ACE_IO_SAP::~ACE_IO_SAP"); } @@ -12,7 +12,7 @@ ACE_IO_SAP::~ACE_IO_SAP (void) // Used to return the underlying handle_. ACE_INLINE ACE_HANDLE -ACE_IO_SAP::get_handle (void) const +ACE_IO_SAP::get_handle () const { ACE_TRACE ("ACE_IO_SAP::get_handle"); return this->handle_; diff --git a/ACE/ace/IPC_SAP.h b/ACE/ace/IPC_SAP.h index 47097488277..dce2fabb6fc 100644 --- a/ACE/ace/IPC_SAP.h +++ b/ACE/ace/IPC_SAP.h @@ -50,7 +50,7 @@ public: int disable (int value) const; /// Get the underlying handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Set the underlying handle. void set_handle (ACE_HANDLE handle); @@ -64,7 +64,7 @@ public: protected: // = Ensure that ACE_IPC_SAP is an abstract base class. /// Default constructor. - ACE_IPC_SAP (void); + ACE_IPC_SAP (); /// Protected destructor. /** @@ -72,7 +72,7 @@ protected: * operator delete() from being called through a base class * ACE_IPC_SAP pointer/reference. */ - ~ACE_IPC_SAP (void); + ~ACE_IPC_SAP (); private: /// Underlying I/O handle. diff --git a/ACE/ace/IPC_SAP.inl b/ACE/ace/IPC_SAP.inl index 8419609148e..fe06636a02e 100644 --- a/ACE/ace/IPC_SAP.inl +++ b/ACE/ace/IPC_SAP.inl @@ -4,13 +4,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_IPC_SAP::~ACE_IPC_SAP (void) +ACE_IPC_SAP::~ACE_IPC_SAP () { // ACE_TRACE ("ACE_IPC_SAP::~ACE_IPC_SAP"); } ACE_INLINE ACE_HANDLE -ACE_IPC_SAP::get_handle (void) const +ACE_IPC_SAP::get_handle () const { ACE_TRACE ("ACE_IPC_SAP::get_handle"); return this->handle_; diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h index 340d9fb745f..4096dccf969 100644 --- a/ACE/ace/Log_Record.h +++ b/ACE/ace/Log_Record.h @@ -58,7 +58,7 @@ public: * Create a Log_Record and set its priority, time stamp, and * process id. */ - ACE_Log_Record (void); + ACE_Log_Record (); ACE_Log_Record (ACE_Log_Priority lp, time_t time_stamp, long pid); @@ -67,7 +67,7 @@ public: long pid); /// Default dtor. - ~ACE_Log_Record (void); + ~ACE_Log_Record (); /// Write the contents of the logging record to the appropriate /// FILE if the corresponding type is enabled. @@ -103,13 +103,13 @@ public: static void priority_name (ACE_Log_Priority p, const ACE_TCHAR *name); /// Get the type of the Log_Record. - ACE_UINT32 type (void) const; + ACE_UINT32 type () const; /// Set the type of the Log_Record. void type (ACE_UINT32); /// Get the category of the Log_Record. - ACE_Log_Category_TSS* category (void) const; + ACE_Log_Category_TSS* category () const; /// Set the category of the Log_Record. void category (ACE_Log_Category_TSS*); @@ -118,7 +118,7 @@ public: * as the base 2 logarithm of <type_> (which must be a power of 2, * as defined by the enums in ACE_Log_Priority). */ - u_long priority (void) const; + u_long priority () const; /// Set the priority of the Log_Record <type_> (which must be a /// power of 2, as defined by the enums in ACE_Log_Priority). @@ -126,26 +126,26 @@ public: /// Get the total length of the Log_Record, which includes the /// size of the various data member fields. - long length (void) const; + long length () const; /// Set the total length of the Log_Record, which needs to account for /// the size of the various data member fields. void length (long); /// Get the time stamp of the Log_Record. - ACE_Time_Value time_stamp (void) const; + ACE_Time_Value time_stamp () const; /// Set the time stamp of the Log_Record. void time_stamp (const ACE_Time_Value &ts); /// Get the process id of the Log_Record. - long pid (void) const; + long pid () const; /// Set the process id of the Log_Record. void pid (long); /// Get the message data of the Log_Record. - const ACE_TCHAR *msg_data (void) const; + const ACE_TCHAR *msg_data () const; /// Set the message data of the record. If @a data is longer than the /// current msg_data_ buffer, a new msg_data_ buffer is allocated to @@ -154,7 +154,7 @@ public: /// Get the size of the message data of the Log_Record, including /// a byte for the NUL. - size_t msg_data_len (void) const; + size_t msg_data_len () const; /// Dump the state of an object. void dump () const; @@ -164,7 +164,7 @@ public: private: /// Round up to the alignment restrictions. - void round_up (void); + void round_up (); /** * Total length of the logging record in bytes. This field *must* diff --git a/ACE/ace/Log_Record.inl b/ACE/ace/Log_Record.inl index dfd7e75b5b6..9c46fae907b 100644 --- a/ACE/ace/Log_Record.inl +++ b/ACE/ace/Log_Record.inl @@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Log_Record::~ACE_Log_Record (void) +ACE_Log_Record::~ACE_Log_Record () { if (this->msg_data_) #if defined (ACE_HAS_ALLOC_HOOKS) @@ -22,7 +22,7 @@ ACE_Log_Record::~ACE_Log_Record (void) } ACE_INLINE ACE_UINT32 -ACE_Log_Record::type (void) const +ACE_Log_Record::type () const { ACE_TRACE ("ACE_Log_Record::type"); return this->type_; @@ -37,7 +37,7 @@ ACE_Log_Record::category (ACE_Log_Category_TSS* t) ACE_INLINE ACE_Log_Category_TSS* -ACE_Log_Record::category (void) const +ACE_Log_Record::category () const { ACE_TRACE ("ACE_Log_Record::category"); return this->category_; @@ -51,7 +51,7 @@ ACE_Log_Record::type (ACE_UINT32 t) } ACE_INLINE long -ACE_Log_Record::length (void) const +ACE_Log_Record::length () const { ACE_TRACE ("ACE_Log_Record::length"); return (long) this->length_; @@ -65,7 +65,7 @@ ACE_Log_Record::length (long l) } ACE_INLINE ACE_Time_Value -ACE_Log_Record::time_stamp (void) const +ACE_Log_Record::time_stamp () const { ACE_TRACE ("ACE_Log_Record::time_stamp"); return ACE_Time_Value (this->secs_, (long) this->usecs_); @@ -80,7 +80,7 @@ ACE_Log_Record::time_stamp (const ACE_Time_Value &ts) } ACE_INLINE long -ACE_Log_Record::pid (void) const +ACE_Log_Record::pid () const { ACE_TRACE ("ACE_Log_Record::pid"); return (long) this->pid_; @@ -94,14 +94,14 @@ ACE_Log_Record::pid (long p) } ACE_INLINE const ACE_TCHAR * -ACE_Log_Record::msg_data (void) const +ACE_Log_Record::msg_data () const { ACE_TRACE ("ACE_Log_Record::msg_data"); return this->msg_data_; } ACE_INLINE size_t -ACE_Log_Record::msg_data_len (void) const +ACE_Log_Record::msg_data_len () const { ACE_TRACE ("ACE_Log_Record::msg_data_len"); return ACE_OS::strlen (this->msg_data_) + 1; diff --git a/ACE/ace/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/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index 0f966f99c8f..b2d117f045c 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -55,7 +55,7 @@ ACE_Cached_Allocator<T, ACE_LOCK>::ACE_Cached_Allocator (size_t n_chunks) } template <class T, class ACE_LOCK> -ACE_Cached_Allocator<T, ACE_LOCK>::~ACE_Cached_Allocator (void) +ACE_Cached_Allocator<T, ACE_LOCK>::~ACE_Cached_Allocator () { #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free (this->pool_); @@ -131,7 +131,7 @@ ACE_Dynamic_Cached_Allocator<ACE_LOCK>::ACE_Dynamic_Cached_Allocator } template <class ACE_LOCK> -ACE_Dynamic_Cached_Allocator<ACE_LOCK>::~ACE_Dynamic_Cached_Allocator (void) +ACE_Dynamic_Cached_Allocator<ACE_LOCK>::~ACE_Dynamic_Cached_Allocator () { delete [] this->pool_; this->pool_ = 0; @@ -204,7 +204,7 @@ ACE_Allocator_Adapter<MALLOC>::calloc (size_t n_elem, } template <class MALLOC> MALLOC & -ACE_Allocator_Adapter<MALLOC>::alloc (void) +ACE_Allocator_Adapter<MALLOC>::alloc () { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::allocator"); return this->allocator_; @@ -218,7 +218,7 @@ ACE_Allocator_Adapter<MALLOC>::free (void *ptr) } template <class MALLOC> int -ACE_Allocator_Adapter<MALLOC>::remove (void) +ACE_Allocator_Adapter<MALLOC>::remove () { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::remove"); return this->allocator_.remove (); @@ -339,7 +339,7 @@ ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter ( #endif /* ACE_HAS_WCHAR */ template <class MALLOC> -ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void) +ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter () { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter"); } @@ -354,7 +354,7 @@ ACE_Allocator_Adapter<MALLOC>::print_stats (void) const #endif /* ACE_HAS_MALLOC_STATS */ template <class MALLOC> void -ACE_Allocator_Adapter<MALLOC>::dump (void) const +ACE_Allocator_Adapter<MALLOC>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::dump"); @@ -365,7 +365,7 @@ ACE_Allocator_Adapter<MALLOC>::dump (void) const ACE_ALLOC_HOOK_DEFINE_Tt(ACE_Allocator_Adapter) template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump"); @@ -430,7 +430,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::free (void *ptr) // initialize the control block pointer. template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open () { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open"); ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1); @@ -577,7 +577,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T () { ACE_TRACE ("ACE_Malloc_T<MEM_POOL>::~ACE_Malloc_T<MEM_POOL>"); if (this->delete_lock_) @@ -590,7 +590,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T (void) // Clean up the resources allocated by ACE_Malloc_T. template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove () { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove"); // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n"))); @@ -1053,7 +1053,7 @@ ACE_Malloc_Lock_Adapter_T<ACE_LOCK>::operator () (const ACE_TCHAR *name) /*****************************************************************************/ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void -ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const +ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump"); @@ -1085,7 +1085,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_It } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> -ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_LIFO_Iterator_T (void) +ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_LIFO_Iterator_T () { ACE_OS::free ((void *) this->name_); } @@ -1121,7 +1121,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::next (void *&next_ } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int -ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const +ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done () const { ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done"); @@ -1129,7 +1129,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int -ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void) +ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance () { ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance"); @@ -1147,7 +1147,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void) } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void -ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const +ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump"); @@ -1181,7 +1181,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_FIFO_It } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> -ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_FIFO_Iterator_T (void) +ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_FIFO_Iterator_T () { ACE_OS::free ((void *) this->name_); } @@ -1217,7 +1217,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::next (void *&next_ } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int -ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const +ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done () const { ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done"); @@ -1225,7 +1225,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::done (void) const } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int -ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void) +ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance () { ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance"); @@ -1243,7 +1243,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void) } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int -ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::start (void) +ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::start () { this->curr_ = this->curr_->next_; NAME_NODE *prev = 0; diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index 6f8f6fdcb64..47aa74b0180 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -43,10 +43,10 @@ class ACE_Cached_Mem_Pool_Node { public: /// Return the address of free memory. - T *addr (void); + T *addr (); /// Get the next ACE_Cached_Mem_Pool_Node in a list. - ACE_Cached_Mem_Pool_Node<T> *get_next (void); + ACE_Cached_Mem_Pool_Node<T> *get_next (); /// Set the next ACE_Cached_Mem_Pool_Node. void set_next (ACE_Cached_Mem_Pool_Node<T> *ptr); @@ -90,7 +90,7 @@ public: ACE_Cached_Allocator (size_t n_chunks); /// Clear things up. - ~ACE_Cached_Allocator (void); + ~ACE_Cached_Allocator (); /** * Get a chunk of memory from free list cache. Note that @a nbytes is @@ -119,7 +119,7 @@ public: void free (void *); /// Return the number of chunks available in the cache. - size_t pool_depth (void); + size_t pool_depth (); ACE_ALLOC_HOOK_DECLARE; @@ -157,7 +157,7 @@ public: ACE_Dynamic_Cached_Allocator (size_t n_chunks, size_t chunk_size); /// Clear things up. - ~ACE_Dynamic_Cached_Allocator (void); + ~ACE_Dynamic_Cached_Allocator (); /** * Get a chunk of memory from free list cache. Note that @a nbytes is @@ -186,7 +186,7 @@ public: void free (void *); /// Return the number of chunks available in the cache. - size_t pool_depth (void); + size_t pool_depth (); private: /// Remember how we allocate the memory in the first place so @@ -251,7 +251,7 @@ public: #endif /* ACE_HAS_WCHAR */ /// Destructor. - virtual ~ACE_Allocator_Adapter (void); + virtual ~ACE_Allocator_Adapter (); // = Memory Management @@ -271,7 +271,7 @@ public: virtual void free (void *ptr); /// Remove any resources associated with this memory manager. - virtual int remove (void); + virtual int remove (); // = Map manager like functions @@ -338,7 +338,7 @@ public: virtual int protect (void *addr, size_t len, int prot = PROT_RDWR); /// Returns the underlying allocator. - ALLOCATOR &alloc (void); + ALLOCATOR &alloc (); #if defined (ACE_HAS_MALLOC_STATS) /// Dump statistics of how malloc is behaving. @@ -370,7 +370,7 @@ template <size_t POOL_SIZE> class ACE_Static_Allocator : public ACE_Static_Allocator_Base { public: - ACE_Static_Allocator (void) + ACE_Static_Allocator () : ACE_Static_Allocator_Base (pool_, POOL_SIZE) { // This function <{must}> be inlined!!! @@ -480,16 +480,16 @@ public: ACE_LOCK *lock); /// Destructor - ~ACE_Malloc_T (void); + ~ACE_Malloc_T (); /// Get Reference counter. - int ref_counter (void); + int ref_counter (); /// Release ref counter. int release (int close = 0); /// Releases resources allocated by this object. - int remove (void); + int remove (); // = Memory management @@ -510,7 +510,7 @@ public: void free (void *ptr); /// Returns a reference to the underlying memory pool. - MEMORY_POOL &memory_pool (void); + MEMORY_POOL &memory_pool (); // = Map manager like functions @@ -602,7 +602,7 @@ public: /// Returns a pointer to the lock used to provide mutual exclusion to /// an ACE_Malloc allocator. - ACE_LOCK &mutex (void); + ACE_LOCK &mutex (); /// Dump the state of an object. void dump () const; @@ -611,7 +611,7 @@ public: ACE_ALLOC_HOOK_DECLARE; /// Return cb_ptr value. - void *base_addr (void); + void *base_addr (); /** * Bad flag. This operation should be called immediately after the @@ -621,11 +621,11 @@ public: * @retval 0 if all is fine. non-zero if this malloc object is * unusable. */ - int bad (void); + int bad (); private: /// Initialize the Malloc pool. - int open (void); + int open (); /// Associate @a name with @a pointer. Assumes that locks are held by /// callers. @@ -703,12 +703,12 @@ public: const char *name = 0); /// Destructor. - ~ACE_Malloc_LIFO_Iterator_T (void); + ~ACE_Malloc_LIFO_Iterator_T (); // = Iteration methods. /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Pass back the next entry in the set that hasn't yet been /// visited. Returns 0 when all items have been seen, else 1. @@ -723,7 +723,7 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. void dump () const; @@ -771,12 +771,12 @@ public: const char *name = 0); /// Destructor. - ~ACE_Malloc_FIFO_Iterator_T (void); + ~ACE_Malloc_FIFO_Iterator_T (); // = Iteration methods. /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Pass back the next entry in the set that hasn't yet been /// visited. Returns 0 when all items have been seen, else 1. @@ -791,11 +791,11 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Go to the starting element that was inserted first. Returns 0 /// when there is no item in the set, else 1. - int start (void); + int start (); /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Malloc_T.inl b/ACE/ace/Malloc_T.inl index 42321a18a4e..8a8d939c972 100644 --- a/ACE/ace/Malloc_T.inl +++ b/ACE/ace/Malloc_T.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> ACE_INLINE T * -ACE_Cached_Mem_Pool_Node<T>::addr (void) +ACE_Cached_Mem_Pool_Node<T>::addr () { // This should be done using a single reinterpret_cast, but Sun/CC // (4.2) gets awfully confused when T is a char[20] (and maybe other @@ -13,7 +13,7 @@ ACE_Cached_Mem_Pool_Node<T>::addr (void) } template <class T> ACE_INLINE ACE_Cached_Mem_Pool_Node<T> * -ACE_Cached_Mem_Pool_Node<T>::get_next (void) +ACE_Cached_Mem_Pool_Node<T>::get_next () { return this->next_; } @@ -27,19 +27,19 @@ ACE_Cached_Mem_Pool_Node<T>::set_next (ACE_Cached_Mem_Pool_Node<T> *ptr) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Cached_Mem_Pool_Node) template <class T, class ACE_LOCK> ACE_INLINE size_t -ACE_Cached_Allocator<T, ACE_LOCK>::pool_depth (void) +ACE_Cached_Allocator<T, ACE_LOCK>::pool_depth () { return this->free_list_.size (); } template <class ACE_LOCK> ACE_INLINE size_t -ACE_Dynamic_Cached_Allocator<ACE_LOCK>::pool_depth (void) +ACE_Dynamic_Cached_Allocator<ACE_LOCK>::pool_depth () { return this->free_list_.size (); } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE int -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ref_counter (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ref_counter () { ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1); if (this->cb_ptr_ != 0) @@ -49,7 +49,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ref_counter (void) } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE int -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::bad (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::bad () { return this->bad_flag_; } @@ -77,7 +77,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::release (int close) } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE ACE_MEM_POOL & -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::memory_pool (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::memory_pool () { ACE_TRACE ("ACE_Malloc_T<MEMORY_POOL, ACE_LOCK, ACE_CB>::memory_pool"); return this->memory_pool_; @@ -118,13 +118,13 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::protect (void *addr, } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE ACE_LOCK & -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::mutex (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::mutex () { return *this->lock_; } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE void * -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::base_addr (void) +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::base_addr () { return this->cb_ptr_; } 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 efc451ac971..4ab76f8a3e8 100644 --- a/ACE/ace/Obchunk.h +++ b/ACE/ace/Obchunk.h @@ -36,7 +36,7 @@ public: ACE_Obchunk (size_t size); /// Dtor. - ~ACE_Obchunk (void); + ~ACE_Obchunk (); /// Dump the state of an object. void dump () const; 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 471329102a9..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,7 +79,7 @@ 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 () const; @@ -88,7 +88,7 @@ public: 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.h b/ACE/ace/SOCK.h index 853c6a483f6..62ef4b9121c 100644 --- a/ACE/ace/SOCK.h +++ b/ACE/ace/SOCK.h @@ -59,7 +59,7 @@ public: * @return The result of closing the socket; 0 if the handle value * was already ACE_INVALID_HANDLE. */ - int close (void); + int close (); /// Return the local endpoint address in the referenced ACE_Addr. /// Returns 0 if successful, else -1. @@ -114,7 +114,7 @@ protected: /// Default constructor is protected to prevent instances of this class /// from being defined. - ACE_SOCK (void); + ACE_SOCK (); /// Protected destructor. /** @@ -122,7 +122,7 @@ protected: * operator delete() from being called through a base class ACE_SOCK * pointer/reference. */ - ~ACE_SOCK (void); + ~ACE_SOCK (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK.inl b/ACE/ace/SOCK.inl index 74875bd41c3..6d55989b218 100644 --- a/ACE/ace/SOCK.inl +++ b/ACE/ace/SOCK.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK::~ACE_SOCK (void) +ACE_SOCK::~ACE_SOCK () { // ACE_TRACE ("ACE_SOCK::~ACE_SOCK"); } diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h index fba5f9a43a0..1dc947fb9cf 100644 --- a/ACE/ace/SOCK_Acceptor.h +++ b/ACE/ace/SOCK_Acceptor.h @@ -38,7 +38,7 @@ class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK { public: /// Default constructor. - ACE_SOCK_Acceptor (void); + ACE_SOCK_Acceptor (); /** * Initialize a passive-mode BSD-style acceptor socket (no QoS). @@ -98,10 +98,10 @@ public: int ipv6_only = 0); /// Close the socket. Returns 0 on success and -1 on failure. - int close (void); + int close (); /// Default dtor. - ~ACE_SOCK_Acceptor (void); + ~ACE_SOCK_Acceptor (); // = Passive connection <accept> methods. /** diff --git a/ACE/ace/SOCK_Acceptor.inl b/ACE/ace/SOCK_Acceptor.inl index bf6822a3e0f..525336c28ed 100644 --- a/ACE/ace/SOCK_Acceptor.inl +++ b/ACE/ace/SOCK_Acceptor.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor (void) +ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor () { ACE_TRACE ("ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor"); } diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h index 4ff5002773f..2a7dde20db4 100644 --- a/ACE/ace/SOCK_Connector.h +++ b/ACE/ace/SOCK_Connector.h @@ -42,7 +42,7 @@ class ACE_Export ACE_SOCK_Connector { public: /// Default constructor. - ACE_SOCK_Connector (void); + ACE_SOCK_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream @@ -247,7 +247,7 @@ public: #endif // ACE_HAS_WINCE /// Default destructor. - ~ACE_SOCK_Connector (void); + ~ACE_SOCK_Connector (); // = Completion routine. /** diff --git a/ACE/ace/SOCK_Connector.inl b/ACE/ace/SOCK_Connector.inl index ff1c7031182..d00f8d889f0 100644 --- a/ACE/ace/SOCK_Connector.inl +++ b/ACE/ace/SOCK_Connector.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // the specified REMOTE_SAP address using a blocking open. ACE_INLINE -ACE_SOCK_Connector::~ACE_SOCK_Connector (void) +ACE_SOCK_Connector::~ACE_SOCK_Connector () { ACE_TRACE ("ACE_SOCK_Connector::~ACE_SOCK_Connector"); } @@ -13,7 +13,7 @@ ACE_SOCK_Connector::~ACE_SOCK_Connector (void) // Do-nothing constructor... ACE_INLINE -ACE_SOCK_Connector::ACE_SOCK_Connector (void) +ACE_SOCK_Connector::ACE_SOCK_Connector () { ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); } diff --git a/ACE/ace/SOCK_Dgram.h b/ACE/ace/SOCK_Dgram.h index 7758dd19d9c..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)>). 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/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h index df4f5a6ed83..5c4c835eccd 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.h +++ b/ACE/ace/SOCK_Dgram_Mcast.h @@ -206,7 +206,7 @@ public: * done by the destructor. If not, most systems will automatically * unsubscribe upon the close of the socket. */ - ~ACE_SOCK_Dgram_Mcast (void); + ~ACE_SOCK_Dgram_Mcast (); /** * Explicitly open/bind the socket and define the network interface @@ -374,7 +374,7 @@ protected: int reuse_addr = 1); /// Empty the dynamic subscription list. - int clear_subs_list (void); + int clear_subs_list (); private: /// Per-instance options.. diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h index b55d525321c..ee1f460f4b1 100644 --- a/ACE/ace/SOCK_IO.h +++ b/ACE/ace/SOCK_IO.h @@ -48,10 +48,10 @@ class ACE_Export ACE_SOCK_IO : public ACE_SOCK { public: /// Constructor. - ACE_SOCK_IO (void); + ACE_SOCK_IO (); /// Destructor. - ~ACE_SOCK_IO (void); + ~ACE_SOCK_IO (); /// Recv an @a n byte buffer from the connected socket. ssize_t recv (void *buf, diff --git a/ACE/ace/SOCK_IO.inl b/ACE/ace/SOCK_IO.inl index eec644cd71f..9fd9a63d9f8 100644 --- a/ACE/ace/SOCK_IO.inl +++ b/ACE/ace/SOCK_IO.inl @@ -6,13 +6,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Send an n byte message to the connected socket. ACE_INLINE -ACE_SOCK_IO::ACE_SOCK_IO (void) +ACE_SOCK_IO::ACE_SOCK_IO () { // ACE_TRACE ("ACE_SOCK_IO::ACE_SOCK_IO"); } ACE_INLINE -ACE_SOCK_IO::~ACE_SOCK_IO (void) +ACE_SOCK_IO::~ACE_SOCK_IO () { // ACE_TRACE ("ACE_SOCK_IO::~ACE_SOCK_IO"); } diff --git a/ACE/ace/SOCK_Stream.h b/ACE/ace/SOCK_Stream.h index 11f266768fd..35203184249 100644 --- a/ACE/ace/SOCK_Stream.h +++ b/ACE/ace/SOCK_Stream.h @@ -40,13 +40,13 @@ class ACE_Export ACE_SOCK_Stream : public ACE_SOCK_IO public: // Initialization and termination methods. /// Constructor. - ACE_SOCK_Stream (void); + ACE_SOCK_Stream (); /// Constructor (sets the underlying ACE_HANDLE with @a h). ACE_SOCK_Stream (ACE_HANDLE h); /// Destructor. - ~ACE_SOCK_Stream (void); + ~ACE_SOCK_Stream (); /** @name Counted send/receive methods * @@ -153,17 +153,17 @@ public: // = Selectively close endpoints. /// Close down the reader. - int close_reader (void); + int close_reader (); /// Close down the writer. - int close_writer (void); + int close_writer (); /** * Close down the socket (we need this to make things work correctly * on Win32, which requires use to do a close_writer() before doing * the close to avoid losing data). */ - int close (void); + int close (); // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; diff --git a/ACE/ace/SOCK_Stream.inl b/ACE/ace/SOCK_Stream.inl index fe25fdde36e..f2aad80ad3e 100644 --- a/ACE/ace/SOCK_Stream.inl +++ b/ACE/ace/SOCK_Stream.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_SOCK_Stream::ACE_SOCK_Stream (void) +ACE_SOCK_Stream::ACE_SOCK_Stream () { // ACE_TRACE ("ACE_SOCK_Stream::ACE_SOCK_Stream"); } @@ -18,13 +18,13 @@ ACE_SOCK_Stream::ACE_SOCK_Stream (ACE_HANDLE h) } ACE_INLINE -ACE_SOCK_Stream::~ACE_SOCK_Stream (void) +ACE_SOCK_Stream::~ACE_SOCK_Stream () { // ACE_TRACE ("ACE_SOCK_Stream::~ACE_SOCK_Stream"); } ACE_INLINE int -ACE_SOCK_Stream::close_reader (void) +ACE_SOCK_Stream::close_reader () { ACE_TRACE ("ACE_SOCK_Stream::close_reader"); if (this->get_handle () != ACE_INVALID_HANDLE) @@ -36,7 +36,7 @@ ACE_SOCK_Stream::close_reader (void) // Shut down just the writing end of a ACE_SOCK. ACE_INLINE int -ACE_SOCK_Stream::close_writer (void) +ACE_SOCK_Stream::close_writer () { ACE_TRACE ("ACE_SOCK_Stream::close_writer"); if (this->get_handle () != ACE_INVALID_HANDLE) diff --git a/ACE/ace/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/Sched_Params.h b/ACE/ace/Sched_Params.h index ba496741269..7ca200bbf46 100644 --- a/ACE/ace/Sched_Params.h +++ b/ACE/ace/Sched_Params.h @@ -78,24 +78,24 @@ public: const ACE_Time_Value &quantum = ACE_Time_Value::zero); /// Termination. - ~ACE_Sched_Params (void); + ~ACE_Sched_Params (); // = Get/Set methods: // = Get/Set policy - Policy policy (void) const; + Policy policy () const; void policy (const Policy); // = Get/Set priority. - ACE_Sched_Priority priority (void) const; + ACE_Sched_Priority priority () const; void priority (const ACE_Sched_Priority); // = Get/Set scope. - int scope (void) const; + int scope () const; void scope(const int); // = Get/Set quantum. - const ACE_Time_Value &quantum (void) const; + const ACE_Time_Value &quantum () const; void quantum (const ACE_Time_Value &); // = Accessors for OS-specific priorities. @@ -184,23 +184,23 @@ public: int scope = ACE_SCOPE_THREAD); /// Default dtor. - ~ACE_Sched_Priority_Iterator (void); + ~ACE_Sched_Priority_Iterator (); /// Check if there are more priorities. - int more (void) const; + int more () const; /// Return the current priority. - int priority (void) const; + int priority () const; /// Move to the next priority. /// The iteration is from lowest to highest importance. - void next (void); + void next (); /// Accessor for the scheduling policy over which we are iterating. - const ACE_Sched_Params::Policy &policy (void) const; + const ACE_Sched_Params::Policy &policy () const; /// Accessor for the scheduling - int scope (void) const; + int scope () const; private: /// The Scheduling policy (FIFO, RR, etc.) and scheduling scope diff --git a/ACE/ace/Sched_Params.inl b/ACE/ace/Sched_Params.inl index 5392611ac08..1aef3ec8466 100644 --- a/ACE/ace/Sched_Params.inl +++ b/ACE/ace/Sched_Params.inl @@ -24,12 +24,12 @@ ACE_Sched_Params::ACE_Sched_Params ( { } -ACE_INLINE ACE_Sched_Params::~ACE_Sched_Params (void) +ACE_INLINE ACE_Sched_Params::~ACE_Sched_Params () { } ACE_INLINE ACE_Sched_Params::Policy -ACE_Sched_Params::policy (void) const +ACE_Sched_Params::policy () const { return this->policy_; } @@ -41,7 +41,7 @@ ACE_Sched_Params::policy (const ACE_Sched_Params::Policy policy) } ACE_INLINE ACE_Sched_Priority -ACE_Sched_Params::priority (void) const +ACE_Sched_Params::priority () const { return this->priority_; } @@ -53,7 +53,7 @@ ACE_Sched_Params::priority (const ACE_Sched_Priority priority) } ACE_INLINE int -ACE_Sched_Params::scope (void) const +ACE_Sched_Params::scope () const { return this->scope_; } @@ -65,7 +65,7 @@ ACE_Sched_Params::scope (const int scope) } ACE_INLINE const ACE_Time_Value & -ACE_Sched_Params::quantum (void) const +ACE_Sched_Params::quantum () const { return this->quantum_; } @@ -77,13 +77,13 @@ ACE_Sched_Params::quantum (const ACE_Time_Value &quant) } ACE_INLINE const ACE_Sched_Params::Policy & -ACE_Sched_Priority_Iterator::policy (void) const +ACE_Sched_Priority_Iterator::policy () const { return this->policy_; } ACE_INLINE int -ACE_Sched_Priority_Iterator::scope (void) const +ACE_Sched_Priority_Iterator::scope () const { return this->scope_; } @@ -100,24 +100,24 @@ ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator (const ACE_Sched_Params } ACE_INLINE -ACE_Sched_Priority_Iterator::~ACE_Sched_Priority_Iterator (void) +ACE_Sched_Priority_Iterator::~ACE_Sched_Priority_Iterator () { } ACE_INLINE int -ACE_Sched_Priority_Iterator::more (void) const +ACE_Sched_Priority_Iterator::more () const { return !this->done_; } ACE_INLINE int -ACE_Sched_Priority_Iterator::priority (void) const +ACE_Sched_Priority_Iterator::priority () const { return this->priority_; } ACE_INLINE void -ACE_Sched_Priority_Iterator::next (void) +ACE_Sched_Priority_Iterator::next () { if (this->done_) return; diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h index 07673a67c44..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); @@ -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. /** 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/Signal.h b/ACE/ace/Signal.h index e27245d2713..c4299437c51 100644 --- a/ACE/ace/Signal.h +++ b/ACE/ace/Signal.h @@ -55,13 +55,13 @@ public: /// full. ACE_Sig_Set (int fill = 0); - ~ACE_Sig_Set (void); + ~ACE_Sig_Set (); /// Create a set that excludes all signals defined by the system. - int empty_set (void); + int empty_set (); /// Create a set that includes all signals defined by the system. - int fill_set (void); + int fill_set (); /// Adds the individual signal specified by @a signo to the set. int sig_add (int signo); @@ -76,7 +76,7 @@ public: operator sigset_t *(); /// Returns a copy of the underlying @c sigset_t. - sigset_t sigset (void) const; + sigset_t sigset () const; /// Dump the state of an object. void dump () const; @@ -98,7 +98,7 @@ class ACE_Export ACE_Sig_Action { public: /// Default constructor. Initializes everything to 0. - ACE_Sig_Action (void); + ACE_Sig_Action (); /// Assigns the various fields of a @c sigaction struct but doesn't /// register for signal handling via the @c sigaction function. @@ -158,7 +158,7 @@ public: ACE_Sig_Action &operator = (ACE_Sig_Action&&) = default; /// Default dtor. - ~ACE_Sig_Action (void); + ~ACE_Sig_Action (); // = Signal action management. /// Register @c this as the current disposition and store old @@ -178,27 +178,27 @@ public: void set (struct sigaction *); /// Get current signal action. - struct sigaction *get (void); + struct sigaction *get (); operator struct sigaction *(); /// Set current signal flags. void flags (int); /// Get current signal flags. - int flags (void); + int flags (); /// Set current signal mask. void mask (sigset_t *); void mask (ACE_Sig_Set &); /// Get current signal mask. - sigset_t *mask (void); + sigset_t *mask (); /// Set current signal handler (pointer to function). void handler (ACE_SignalHandler); /// Get current signal handler (pointer to function). - ACE_SignalHandler handler (void); + ACE_SignalHandler handler (); /// Dump the state of an object. void dump () const; @@ -226,7 +226,7 @@ public: ACE_Sig_Guard (ACE_Sig_Set *mask = 0, bool condition = true); /// Restore blocked signals. - ~ACE_Sig_Guard (void); + ~ACE_Sig_Guard (); /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Signal.inl b/ACE/ace/Signal.inl index 64ac6c049e5..11fb1550967 100644 --- a/ACE/ace/Signal.inl +++ b/ACE/ace/Signal.inl @@ -45,14 +45,14 @@ ACE_Sig_Set::ACE_Sig_Set (ACE_Sig_Set *ss) } ACE_INLINE int -ACE_Sig_Set::empty_set (void) +ACE_Sig_Set::empty_set () { ACE_TRACE ("ACE_Sig_Set::empty_set"); return ACE_OS::sigemptyset (&this->sigset_); } ACE_INLINE int -ACE_Sig_Set::fill_set (void) +ACE_Sig_Set::fill_set () { ACE_TRACE ("ACE_Sig_Set::fill_set"); return ACE_OS::sigfillset (&this->sigset_); @@ -80,21 +80,21 @@ ACE_Sig_Set::is_member (int signo) const } ACE_INLINE -ACE_Sig_Set::operator sigset_t *(void) +ACE_Sig_Set::operator sigset_t *() { ACE_TRACE ("ACE_Sig_Set::operator sigset_t *"); return &this->sigset_; } ACE_INLINE sigset_t -ACE_Sig_Set::sigset (void) const +ACE_Sig_Set::sigset () const { ACE_TRACE ("ACE_Sig_Set::sigset"); return this->sigset_; } ACE_INLINE int -ACE_Sig_Action::flags (void) +ACE_Sig_Action::flags () { ACE_TRACE ("ACE_Sig_Action::flags"); return this->sa_.sa_flags; @@ -108,7 +108,7 @@ ACE_Sig_Action::flags (int flags) } ACE_INLINE sigset_t * -ACE_Sig_Action::mask (void) +ACE_Sig_Action::mask () { ACE_TRACE ("ACE_Sig_Action::mask"); return &this->sa_.sa_mask; @@ -130,7 +130,7 @@ ACE_Sig_Action::mask (ACE_Sig_Set &ss) } ACE_INLINE ACE_SignalHandler -ACE_Sig_Action::handler (void) +ACE_Sig_Action::handler () { ACE_TRACE ("ACE_Sig_Action::handler"); return ACE_SignalHandler (this->sa_.sa_handler); @@ -155,7 +155,7 @@ ACE_Sig_Action::set (struct sigaction *sa) } ACE_INLINE struct sigaction * -ACE_Sig_Action::get (void) +ACE_Sig_Action::get () { ACE_TRACE ("ACE_Sig_Action::get"); return &this->sa_; diff --git a/ACE/ace/Sock_Connect.h b/ACE/ace/Sock_Connect.h index 54011147474..394338d5800 100644 --- a/ACE/ace/Sock_Connect.h +++ b/ACE/ace/Sock_Connect.h @@ -74,7 +74,7 @@ namespace ACE /// Routine to return a handle from which @c ioctl requests can be /// made. Caller must close the handle. - extern ACE_Export ACE_HANDLE get_handle (void); + extern ACE_Export ACE_HANDLE get_handle (); /// Returns @c true if IPv4 is enabled on the current host; @c false /// if not. @@ -85,7 +85,7 @@ namespace ACE * succeeds, and @c false if it fails. Caches the result so it only gets checked once. */ - extern ACE_Export bool ipv4_enabled (void); + extern ACE_Export bool ipv4_enabled (); /** * Returns 1 if IPv6 is enabled on the current host; 0 if not. @@ -95,7 +95,7 @@ namespace ACE * returning 1 if it succeeds, and 0 if it fails. Caches the result * so it only gets checked once. */ - extern ACE_Export int ipv6_enabled (void); + extern ACE_Export int ipv6_enabled (); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Test_and_Set.cpp b/ACE/ace/Test_and_Set.cpp index 4ba0dd61d36..4c089b6b0fc 100644 --- a/ACE/ace/Test_and_Set.cpp +++ b/ACE/ace/Test_and_Set.cpp @@ -18,7 +18,7 @@ ACE_Test_and_Set<ACE_LOCK, TYPE>::ACE_Test_and_Set (TYPE initial_value) // Returns true if we are done, else false. template <class ACE_LOCK, class TYPE> TYPE -ACE_Test_and_Set<ACE_LOCK, TYPE>::is_set (void) const +ACE_Test_and_Set<ACE_LOCK, TYPE>::is_set () const { ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, this->is_set_); return this->is_set_; diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h index 6ec541a697e..d7351dd1cc3 100644 --- a/ACE/ace/Test_and_Set.h +++ b/ACE/ace/Test_and_Set.h @@ -37,7 +37,7 @@ public: ACE_Test_and_Set (TYPE initial_value = 0); /// Returns true if we are set, else false. - TYPE is_set (void) const; + TYPE is_set () const; /// Sets the <is_set_> status, returning the original value of /// <is_set_>. 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 e565f3d1b95..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 () 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 27c4af3ee2b..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); @@ -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 4effe463ac9..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 ¤t_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,10 +160,10 @@ 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 () const; @@ -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_ (); diff --git a/ACE/ace/Trace.h b/ACE/ace/Trace.h index 0d878c660ca..eb49cf2fdb0 100644 --- a/ACE/ace/Trace.h +++ b/ACE/ace/Trace.h @@ -42,7 +42,7 @@ public: /// Perform the second part of the trace, which prints out the NAME /// as the function is exited. - ~ACE_Trace (void); + ~ACE_Trace (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -61,7 +61,7 @@ public: static void set_nesting_indent (int indent); /// Get the nesting indentation level. - static int get_nesting_indent (void); + static int get_nesting_indent (); /// Dump the state of an object. void dump () const; diff --git a/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp index 8b2ac983310..1438c5e7148 100644 --- a/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp +++ b/ACE/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp @@ -2,7 +2,6 @@ ** Copyright 2001 Addison Wesley. All Rights Reserved. */ -#include "ace/Auto_Ptr.h" #include "ace/FILE_IO.h" #include "ace/Log_Msg.h" #include "ace/Sched_Params.h" @@ -13,6 +12,7 @@ #include "Logging_Handler.h" #include <errno.h> +#include <memory> namespace { extern "C" void sigterm_handler (int /* signum */) { /* No-op. */ } @@ -59,7 +59,7 @@ RT_Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client) ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg) { - auto_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg)); + std::unique_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg)); thread_args->this_->handle_data (&thread_args->logging_peer_); thread_args->logging_peer_.close (); @@ -70,7 +70,7 @@ ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg) int Thread_Per_Connection_Logging_Server::handle_connections () { - auto_ptr<Thread_Args> thread_args (new Thread_Args (this)); + std::unique_ptr<Thread_Args> thread_args (new Thread_Args (this)); if (acceptor ().accept (thread_args->logging_peer_) == -1) return -1; diff --git a/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp index d5d9196400c..6fc5d395049 100644 --- a/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp +++ b/ACE/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp @@ -2,7 +2,6 @@ ** Copyright 2001 Addison Wesley. All Rights Reserved. */ -#include "ace/Auto_Ptr.h" #include "ace/FILE_IO.h" #include "ace/Log_Msg.h" #include "ace/Signal.h" @@ -12,6 +11,7 @@ #include "Logging_Handler.h" #include <errno.h> +#include <memory> namespace { extern "C" void sigterm_handler (int /* signum */) { /* No-op. */ } @@ -20,7 +20,7 @@ namespace { ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg) { - auto_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg)); + std::unique_ptr<Thread_Args> thread_args (static_cast<Thread_Args *> (arg)); thread_args->this_->handle_data (&thread_args->logging_peer_); thread_args->logging_peer_.close (); @@ -31,7 +31,7 @@ ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg) int Thread_Per_Connection_Logging_Server::handle_connections () { - auto_ptr<Thread_Args> thread_args (new Thread_Args (this)); + std::unique_ptr<Thread_Args> thread_args (new Thread_Args (this)); if (acceptor ().accept (thread_args->logging_peer_) == -1) return -1; diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp index 73374a72c5b..10b599142a9 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -13,7 +13,6 @@ #include "ace/SOCK_Acceptor.h" #include "ace/Singleton.h" #include "ace/CDR_Stream.h" -#include "ace/Auto_Ptr.h" #include "ace/Test_and_Set.h" // FUZZ: disable check_for_streams_include @@ -23,6 +22,7 @@ #include "ace/Test_and_Set.h" #include "server_loggerd.h" +#include <memory> // ---------------------------------------- @@ -111,7 +111,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE), -1); - auto_ptr <ACE_Message_Block> header (header_p); + std::unique_ptr <ACE_Message_Block> header (header_p); // Align the Message Block for a CDR stream ACE_CDR::mb_align (header.get ()); @@ -158,7 +158,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_NEW_RETURN (payload_p, ACE_Message_Block (length), -1); - auto_ptr <ACE_Message_Block> payload (payload_p); + std::unique_ptr <ACE_Message_Block> payload (payload_p); // Ensure there's sufficient room for log record payload. ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length); diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp index b063bb4921f..a7776fcaf87 100644 --- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp +++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp @@ -3,7 +3,7 @@ #include "ace/Log_Record.h" #include "ace/OS_NS_string.h" #include "ace/CDR_Stream.h" -#include "ace/Auto_Ptr.h" +#include <memory> #include "Logging_Handler.h" #include "Reactor_Singleton.h" @@ -62,7 +62,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE), -1); - auto_ptr <ACE_Message_Block> header (header_p); + std::unique_ptr <ACE_Message_Block> header (header_p); // Align the Message Block for a CDR stream ACE_CDR::mb_align (header.get ()); @@ -109,7 +109,7 @@ Logging_Handler::handle_input (ACE_HANDLE) ACE_NEW_RETURN (payload_p, ACE_Message_Block (length), -1); - auto_ptr <ACE_Message_Block> payload (payload_p); + std::unique_ptr <ACE_Message_Block> payload (payload_p); // Ensure there's sufficient room for log record payload. ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length); diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 7ea8b6521ed..b82000a4a50 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -77,7 +77,6 @@ class ast_visitor; // Representation of array declaration: // An array is a combination of a list of dimensions and a base type. - class TAO_IDL_FE_Export AST_Array : public virtual AST_ConcreteType { public: diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 296d2d2f6bd..9f2baab57a9 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -41,7 +41,7 @@ public: virtual void push (const RtecEventComm::EventSet& events); /// Forwards to target_. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: TARGET *target_; @@ -64,7 +64,7 @@ public: ACE_PushSupplier_Adapter (TARGET *target); /// Forwards to target_. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: TARGET *target_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index c41ef28f1a6..b7cc48b1a54 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -49,14 +49,14 @@ public: * Check the documentation in ace/Synch.h for details. */ //@{ - int remove (void); - int acquire (void); - int tryacquire (void); - int release (void); - int acquire_read (void); - int acquire_write (void); - int tryacquire_read (void); - int tryacquire_write (void); + int remove (); + int acquire (); + int tryacquire (); + int release (); + int acquire_read (); + int acquire_write (); + int tryacquire_read (); + int tryacquire_write (); //@} private: diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index 0aa25211104..36578eb57e5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -36,7 +36,7 @@ class TAO_ESF_Copy_On_Read : public TAO_ESF_Proxy_Collection<PROXY> { public: /// Constructors - TAO_ESF_Copy_On_Read (void); + TAO_ESF_Copy_On_Read (); TAO_ESF_Copy_On_Read (const COLLECTION &collection); // = The TAO_ESF_Proxy_Collection methods @@ -44,7 +44,7 @@ public: virtual void connected (PROXY *proxy); virtual void reconnected (PROXY *proxy); virtual void disconnected (PROXY *proxy); - virtual void shutdown (void); + virtual void shutdown (); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index 20d105bb85f..dddaf15ebc8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -25,13 +25,13 @@ template<class COLLECTION, class ITERATOR> class TAO_ESF_Copy_On_Write_Collection { public: - TAO_ESF_Copy_On_Write_Collection (void); + TAO_ESF_Copy_On_Write_Collection (); /// Increment the reference count - CORBA::ULong _incr_refcnt (void); + CORBA::ULong _incr_refcnt (); /// Decrement the reference count - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _decr_refcnt (); /// The actual collection COLLECTION collection; @@ -62,7 +62,7 @@ public: Collection *&collection); /// Destructor - ~TAO_ESF_Copy_On_Write_Read_Guard (void); + ~TAO_ESF_Copy_On_Write_Read_Guard (); Collection *collection; @@ -94,7 +94,7 @@ public: Collection*& collection); /// Destructor - ~TAO_ESF_Copy_On_Write_Write_Guard (void); + ~TAO_ESF_Copy_On_Write_Write_Guard (); Collection *copy; @@ -124,17 +124,17 @@ public: /// Constructor typedef TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_SYNCH_MUTEX_T> Read_Guard; typedef TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE> Write_Guard; - TAO_ESF_Copy_On_Write (void); + TAO_ESF_Copy_On_Write (); /// Destructor - ~TAO_ESF_Copy_On_Write (void); + ~TAO_ESF_Copy_On_Write (); // = The TAO_ESF_Proxy methods virtual void for_each (TAO_ESF_Worker<PROXY> *worker); virtual void connected (PROXY *proxy); virtual void reconnected (PROXY *proxy); virtual void disconnected (PROXY *proxy); - virtual void shutdown (void); + virtual void shutdown (); private: typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index 5052c34c873..b1dcefda33e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - TAO_ESF_Delayed_Changes (void) + TAO_ESF_Delayed_Changes () : lock_ (this), busy_cond_ (busy_lock_), busy_count_ (0), @@ -61,7 +61,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - busy (void) + busy () { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1); @@ -75,7 +75,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - idle (void) + idle () { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1); @@ -91,7 +91,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - execute_delayed_operations (void) + execute_delayed_operations () { while (!this->command_queue_.is_empty ()) { @@ -177,7 +177,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: } template<class PROXY, class C, class I,ACE_SYNCH_DECL> void -TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::shutdown (void) +TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::shutdown () { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index 31aa6471b07..c3e9f8e40d0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -86,17 +86,17 @@ template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> class TAO_ESF_Delayed_Changes : public TAO_ESF_Proxy_Collection<PROXY> { public: - TAO_ESF_Delayed_Changes (void); + TAO_ESF_Delayed_Changes (); TAO_ESF_Delayed_Changes (const COLLECTION &collection); - int busy (void); - int idle (void); - int execute_delayed_operations (void); + int busy (); + int idle (); + int execute_delayed_operations (); void connected_i (PROXY *proxy); void reconnected_i (PROXY *proxy); void disconnected_i (PROXY *proxy); - void shutdown_i (void); + void shutdown_i (); typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command; typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command; @@ -108,7 +108,7 @@ public: virtual void connected (PROXY *proxy); virtual void reconnected (PROXY *proxy); virtual void disconnected (PROXY *proxy); - virtual void shutdown (void); + virtual void shutdown (); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl index 55fee94e3e6..0732a41bff2 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl @@ -24,7 +24,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - shutdown_i (void) + shutdown_i () { this->collection_.shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp index 37765884ca4..6a0a8a4c03b 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY, class C, class ITERATOR, class ACE_LOCK> TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: - TAO_ESF_Immediate_Changes (void) + TAO_ESF_Immediate_Changes () { } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index f1958c0680e..5f46da59d2a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -27,7 +27,7 @@ template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> class TAO_ESF_Immediate_Changes : public TAO_ESF_Proxy_Collection<PROXY> { public: - TAO_ESF_Immediate_Changes (void); + TAO_ESF_Immediate_Changes (); TAO_ESF_Immediate_Changes (const COLLECTION &collection); // = The TAO_ESF_Proxy methods @@ -35,7 +35,7 @@ public: virtual void connected (PROXY *proxy); virtual void reconnected (PROXY *proxy); virtual void disconnected (PROXY *proxy); - virtual void shutdown (void); + virtual void shutdown (); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl index 3dc79d8bdd7..469b999f73e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl @@ -33,7 +33,7 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void -TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown (void) +TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 54672a13ca8..eb2b2fbc583 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -60,7 +60,7 @@ public: TAO_ESF_Peer_Admin (EVENT_CHANNEL *ec); /// destructor - virtual ~TAO_ESF_Peer_Admin (void); + virtual ~TAO_ESF_Peer_Admin (); /** * A <peer> has connected, this is invoked when the peer's client diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index 45819a38f1f..ceb4b3ab3f3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -66,7 +66,7 @@ public: TAO_ESF_Proxy_Admin (EVENT_CHANNEL *ec); /// Cleanup internal resources, destroy the internal collection - virtual ~TAO_ESF_Proxy_Admin (void); + virtual ~TAO_ESF_Proxy_Admin (); /// Iterate over its internal collection. void for_each (TAO_ESF_Worker<PROXY> *worker); @@ -78,14 +78,14 @@ public: // code is supposed to run under TAO only. /// Create a new PROXY and activate it. virtual INTERFACE* - obtain (void); + obtain (); /** * The Event Channel that owns this Admin object is going * down. Invoke <shutdown> on all the proxies, cleanup the * collection and prepare to terminate. */ - virtual void shutdown (void); + virtual void shutdown (); /** * A <proxy> has connected, this is invoked when the proxy's client diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index 3250eee56ad..b486e13f02f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -125,7 +125,7 @@ class TAO_ESF_Proxy_Collection { public: /// destructor - virtual ~TAO_ESF_Proxy_Collection (void); + virtual ~TAO_ESF_Proxy_Collection (); /** * Iterate over the collection and invoke worker->work() for each @@ -151,7 +151,7 @@ public: virtual void disconnected (PROXY *proxy) = 0; /// The EC is shutting down, must release all the elements. - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index fe241694268..fbd79d670a7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -38,17 +38,17 @@ public: typedef ACE_Unbounded_Set_Iterator<PROXY*> Iterator; /// Constructor - TAO_ESF_Proxy_List (void); + TAO_ESF_Proxy_List (); /// Return the first element in the collection, or end() if there /// are none - ACE_Unbounded_Set_Iterator<PROXY*> begin (void); + ACE_Unbounded_Set_Iterator<PROXY*> begin (); /// Return one past the last element in the collection - ACE_Unbounded_Set_Iterator<PROXY*> end (void); + ACE_Unbounded_Set_Iterator<PROXY*> end (); /// Return the number of elements in the collection - size_t size (void) const; + size_t size () const; /// Insert a new element to the collection void connected (PROXY *); @@ -61,7 +61,7 @@ public: /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (void); + void shutdown (); private: /// The underlying implementation object diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index aa2e1c1fea7..089f7caaf71 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -37,9 +37,9 @@ public: bool operator == (const TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> &rhs) const; bool operator != (const TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> &rhs) const; - TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>& operator++ (void); + TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>& operator++ (); TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> operator++ (int); - PROXY *operator *(void); + PROXY *operator *(); private: Implementation impl_; @@ -66,17 +66,17 @@ public: typedef TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> Iterator; /// Constructor - TAO_ESF_Proxy_RB_Tree (void); + TAO_ESF_Proxy_RB_Tree (); /// Return the first element in the collection, or end() if there /// are none - TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> begin (void); + TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> begin (); /// Return one past the last element in the collection - TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> end (void); + TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> end (); /// Return the number of elements in the collection - size_t size (void) const; + size_t size () const; /// Insert a new element to the collection void connected (PROXY *); @@ -88,7 +88,7 @@ public: /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (void); + void shutdown (); private: /// The underlying implementation object diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h index 68e677e3a7b..0b4607fe62b 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h @@ -46,7 +46,7 @@ public: PROXY *proxy); /// Destructor - ~TAO_ESF_Proxy_RefCount_Guard (void); + ~TAO_ESF_Proxy_RefCount_Guard (); protected: /// The reference count, if it gets to zero then the object must be diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h index 49ae0dcf666..61873a0de55 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h @@ -41,7 +41,7 @@ public: TAO_ESF_RefCount_Guard (T &refcount); /// Destructor - ~TAO_ESF_RefCount_Guard (void); + ~TAO_ESF_RefCount_Guard (); protected: /// The reference count diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index a31b76e630f..efea73b2dcc 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -25,7 +25,7 @@ template<class PROXY> class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY> { public: - TAO_ESF_Shutdown_Proxy (void); + TAO_ESF_Shutdown_Proxy (); void work (PROXY *proxy); }; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl index 416d6e7dd6f..86e1ef6ccb0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY> ACE_INLINE -TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy (void) +TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy () { } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index e0d44d16751..fe8b04411b8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -41,7 +41,7 @@ template<class Object> class TAO_ESF_Worker { public: - virtual ~TAO_ESF_Worker (void); + virtual ~TAO_ESF_Worker (); /// Used by the collection to inform the worker /// the number of proxies in the collection. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index 23fe2376590..c44cadd0a86 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -42,8 +42,8 @@ public: // Define virtual destructor to make sure we can delete derived // objects through a pointer to TAO_ECG_Handler_Shutdown. - virtual ~TAO_ECG_Handler_Shutdown (void); - virtual int shutdown (void) = 0; + virtual ~TAO_ECG_Handler_Shutdown (); + virtual int shutdown () = 0; }; /** @@ -58,7 +58,7 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Dgram_Handler { public: - virtual ~TAO_ECG_Dgram_Handler (void); + virtual ~TAO_ECG_Dgram_Handler (); virtual int handle_input (ACE_SOCK_Dgram& dgram) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 3040d61ff41..d0bfcaf73f8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -12,7 +12,6 @@ #include /**/ "orbsvcs/Event/event_serv_export.h" #include "orbsvcs/RtecUDPAdminS.h" #include "orbsvcs/Event/EC_Lifetime_Utils.h" -#include "ace/Auto_Ptr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 8f69b305b86..aca8953f5dc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -145,7 +145,7 @@ TAO_ECG_CDR_Message_Receiver::Requests::init (size_t size, for (size_t i = 0; i < size; ++i) { - this->fragmented_requests_[i] = 0; + this->fragmented_requests_[i] = nullptr; } return 0; @@ -164,7 +164,7 @@ TAO_ECG_CDR_Message_Receiver::Requests::~Requests () delete [] this->fragmented_requests_; - this->fragmented_requests_ = 0; + this->fragmented_requests_ = nullptr; this->size_ = 0; this->id_range_low_ = 0; this->id_range_high_ = 0; @@ -176,7 +176,7 @@ TAO_ECG_CDR_Message_Receiver::Requests::get_request (CORBA::ULong request_id) if (request_id < this->id_range_low_) // <request_id> is below the current range. { - return 0; + return nullptr; } if (request_id > this->id_range_high_) @@ -223,14 +223,14 @@ TAO_ECG_CDR_Message_Receiver::Requests::purge_requests ( { delete this->fragmented_requests_[index]; } - this->fragmented_requests_[index] = 0; + this->fragmented_requests_[index] = nullptr; } } // **************************************************************** TAO_ECG_UDP_Request_Entry -TAO_ECG_CDR_Message_Receiver::Request_Completed_ (0, 0, 0, 0); +TAO_ECG_CDR_Message_Receiver::Request_Completed_ (false, 0, 0, 0); int TAO_ECG_CDR_Message_Receiver::handle_input ( @@ -290,7 +290,7 @@ TAO_ECG_CDR_Message_Receiver::handle_input ( crc = ACE::crc32 (iov, 2); } // Check whether the message is a loopback message. - if (this->ignore_from_.get () != 0 + if (this->ignore_from_.get () != nullptr && this->ignore_from_->is_loopback (from)) { return 0; @@ -368,7 +368,7 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from, TAO_ECG_UDP_Request_Entry ** request = entry->int_id_->get_request (request_id); - if (request == 0) + if (request == nullptr) { ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence" "below currently expected range.\n")); @@ -380,7 +380,7 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from, "(Request already complete).\n")); return 0; } - if (*request != 0) + if (*request != nullptr) { ORBSVCS_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for " "mcast request.\n"), @@ -407,7 +407,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( TAO_ECG_UDP_Request_Entry ** request = source_entry->int_id_->get_request (header.request_id); - if (request == 0) + if (request == nullptr) { ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence " "below currently expected range.\n")); @@ -419,7 +419,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( "(Request already complete).\n")); return 0; } - if (*request == 0) + if (*request == nullptr) // Entry for this request has not yet been allocated. { ACE_NEW_RETURN (*request, @@ -479,15 +479,15 @@ TAO_ECG_CDR_Message_Receiver::Request_Map::ENTRY* TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from) { // Get the entry for <from> from the <request_map_>. - Request_Map::ENTRY * entry = 0; + Request_Map::ENTRY * entry = nullptr; if (this->request_map_.find (from, entry) == -1) { // Create an entry if one doesn't exist. - Requests *requests = 0; + Requests *requests = nullptr; ACE_NEW_RETURN (requests, Requests, - 0); + nullptr); std::unique_ptr<Requests> requests_aptr (requests); if (requests->init (this->max_requests_, this->min_purge_count_) == -1 diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index 2ec41e62347..199834e90fc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ECG_CDR_Processor { public: - virtual ~TAO_ECG_CDR_Processor (void); + virtual ~TAO_ECG_CDR_Processor (); /// Extracts data from @a cdr. Returns 0 on success, -1 on error. virtual int decode (TAO_InputCDR &cdr) = 0; @@ -63,7 +63,7 @@ public: CORBA::ULong request_size, CORBA::ULong fragment_count); - ~TAO_ECG_UDP_Request_Entry (void); + ~TAO_ECG_UDP_Request_Entry (); /// Validate a fragment, it should be rejected if it is invalid.. int validate_fragment (CORBA::Boolean byte_order, @@ -80,7 +80,7 @@ public: void mark_received (CORBA::ULong fragment_id); /// Is the message complete? - int complete (void) const; + int complete () const; /// Return a buffer for the fragment at offset @a fragment_offset char* fragment_buffer (CORBA::ULong fragment_offset); @@ -144,7 +144,7 @@ public: /// Initialization and termination methods. //@{ TAO_ECG_CDR_Message_Receiver (CORBA::Boolean check_crc); - ~TAO_ECG_CDR_Message_Receiver (void); + ~TAO_ECG_CDR_Message_Receiver (); /** * @param ignore_from Endpoint used to remove events generated by @@ -154,7 +154,7 @@ public: /* , ACE_Lock *lock = 0 */); // Shutdown the component: close down the request map, etc. - void shutdown (void); + void shutdown (); //@} /// Main method: read the data from @a dgram and either pass ready data @@ -258,8 +258,8 @@ class TAO_ECG_CDR_Message_Receiver::Requests { public: - Requests (void); - ~Requests (void); + Requests (); + ~Requests (); /// Allocates and initializes <fragmented_requests_>. int init (size_t size, size_t min_purge_count); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index a46244b6dfb..a218fb7f0d5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -17,7 +17,7 @@ void TAO_ECG_CDR_Message_Sender::init ( TAO_ECG_Refcounted_Endpoint endpoint_rptr) { - if (endpoint_rptr.get () == 0 + if (endpoint_rptr.get () == nullptr || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE) { ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): " @@ -32,7 +32,7 @@ void TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, const ACE_INET_Addr &addr) { - if (this->endpoint_rptr_.get () == 0) + if (this->endpoint_rptr_.get () == nullptr) { ORBSVCS_ERROR ((LM_ERROR, "Attempt to invoke send_message() " "on non-initialized sender object.\n")); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index b36c12ff164..d9ce3dd8bbb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -94,7 +94,7 @@ public: void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr); // Shutdown this component. Frees up the endpoint. - void shutdown (void); + void shutdown (); //@} /// Setters/getters. @@ -109,7 +109,7 @@ public: * header + 8 bytes must fit). */ int mtu (CORBA::ULong mtu); - CORBA::ULong mtu (void) const; + CORBA::ULong mtu () const; //@} /// The main method - send a CDR message. @@ -131,7 +131,7 @@ public: private: /// Return the datagram... - ACE_SOCK_Dgram& dgram (void); + ACE_SOCK_Dgram& dgram (); /** * Send one fragment, the first entry in the iovec is used to send diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index 0d52735a8f6..d8d2961e3fd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -32,7 +32,7 @@ TAO_ECG_Complex_Address_Server::init (const char *arg) while (*data != '\0') { // Extract lookup value (it is followed by '@'). - const char * location = 0; + const char * location = nullptr; location = ACE_OS::strchr (data, '@'); if (!location) { @@ -44,24 +44,24 @@ TAO_ECG_Complex_Address_Server::init (const char *arg) -1); } size_t len = location - data; - key_string.set (data, len, 1); + key_string.set (data, len, true); data += len + 1; // Extract mcast address to be mapped to just extracted lookup // value. - location = 0; + location = nullptr; location = ACE_OS::strchr (data, ' '); if (location) { len = location - data; - mcast_string.set (data, len, 1); + mcast_string.set (data, len, true); data += len + 1; } else { // This must be the last entry in the mapping. len = ACE_OS::strlen (data); - mcast_string.set (data, len, 1); + mcast_string.set (data, len, true); data += len; } @@ -90,7 +90,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, } // Convert strings to values. - char * endptr = 0; + char * endptr = nullptr; CORBA::Long header_value = ACE_OS::strtol (key, &endptr, 0); if (*endptr != '\0') { @@ -131,7 +131,7 @@ TAO_ECG_Complex_Address_Server::get_addr ( else key = header.type; - MAP::ENTRY * mapping_entry = 0; + MAP::ENTRY * mapping_entry = nullptr; if (this->mcast_mapping_.find (key, mapping_entry) == -1) { // Key was not found in the mapping. Use default. @@ -164,7 +164,7 @@ TAO_ECG_Complex_Address_Server::get_address ( else key = header.type; - MAP::ENTRY * mapping_entry = 0; + MAP::ENTRY * mapping_entry = nullptr; ACE_INET_Addr &src_addr = (this->mcast_mapping_.find (key, mapping_entry) == -1) ? this->default_addr_ : mapping_entry->int_id_; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index 6f90a5b6935..5bb96c44b7b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -58,7 +58,7 @@ public: create (int is_source_mapping = 1); /// Destructor - virtual ~TAO_ECG_Complex_Address_Server (void); + virtual ~TAO_ECG_Complex_Address_Server (); /// Initializes the mapping from the @a arg string. See class notes /// for the expected format. @@ -72,7 +72,7 @@ public: /// Prints out complete content of the address server. Useful for /// debugging. - void dump_content (void); + void dump_content (); protected: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h index 268c4c5c7be..70bb109851f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h @@ -44,18 +44,18 @@ class TAO_RTEvent_Serv_Export TAO_ECG_ConsumerEC_Control { public: /// Constructor. - TAO_ECG_ConsumerEC_Control (void); + TAO_ECG_ConsumerEC_Control (); /// Destructor. - virtual ~TAO_ECG_ConsumerEC_Control (void); + virtual ~TAO_ECG_ConsumerEC_Control (); /// Activate any internal threads or timers used to poll the state of /// the event channel. - virtual int activate (void); + virtual int activate (); /// Shutdown any internal threads or timers used to poll the state of /// the event channel. - virtual int shutdown (void); + virtual int shutdown (); /** * When pushing an event to the event channel a CORBA::OBJECT_NOT_EXIST diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index fce5908ebc4..8c36dc6b44c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, const ACE_TCHAR *net_if, CORBA::ULong sz) - : net_if_ (net_if ? ACE_OS::strdup (net_if) : 0) + : net_if_ (net_if ? ACE_OS::strdup (net_if) : nullptr) , subscriptions_ () , receiver_ (recv) , recvbuf_size_ (sz) @@ -91,11 +91,11 @@ TAO_ECG_Mcast_EH::shutdown () if (this->observer_.in ()) { this->observer_->shutdown (); - this->observer_ = 0; + this->observer_ = nullptr; } // Indicates that we are in a shutdown state. - this->receiver_ = 0; + this->receiver_ = nullptr; // Deregister from reactor, close and clean up sockets. size_t const subscriptions_size = this->subscriptions_.size (); @@ -305,7 +305,7 @@ TAO_ECG_Mcast_EH::Observer::update_supplier ( void TAO_ECG_Mcast_EH::Observer::shutdown () { - this->eh_ = 0; + this->eh_ = nullptr; this->deactivator_.deactivate (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index dbdf3beef72..8afc5439610 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -68,7 +68,7 @@ public: CORBA::ULong buf_sz = 0); /// Destructor. - virtual ~TAO_ECG_Mcast_EH (void); + virtual ~TAO_ECG_Mcast_EH (); /** * Register for changes in the EC subscription list. @@ -89,7 +89,7 @@ public: * multicast groups, close the sockets and deregister from the * reactor. */ - virtual int shutdown (void); + virtual int shutdown (); //@} /// Reactor callback. Notify receiver_ that a dgram corresponding @@ -115,7 +115,7 @@ private: /// Shut down the observer: disconnect from EC and deactivate from /// POA. - void shutdown (void); + void shutdown (); /// Event Channel Observer methods //@{ @@ -201,14 +201,14 @@ private: class TAO_RTEvent_Serv_Export Observer_Disconnect_Command { public: - Observer_Disconnect_Command (void); + Observer_Disconnect_Command (); Observer_Disconnect_Command (RtecEventChannelAdmin::Observer_Handle handle, RtecEventChannelAdmin::EventChannel_ptr ec); Observer_Disconnect_Command (const Observer_Disconnect_Command &rhs); Observer_Disconnect_Command & operator= (const Observer_Disconnect_Command & rhs); - void execute (void); + void execute (); private: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 78d4be0b66c..3d8c8a8eb4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -149,7 +149,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - unsigned long tmp = ACE_OS::strtoul (opt, 0, 0) & 0xff; + unsigned long tmp = ACE_OS::strtoul (opt, nullptr, 0) & 0xff; this->ttl_value_ = static_cast<u_char> (tmp); arg_shifter.consume_arg (); } @@ -282,14 +282,14 @@ TAO_ECG_Mcast_Gateway::validate_configuration () TAO_ECG_Refcounted_Endpoint TAO_ECG_Mcast_Gateway::init_endpoint () { - TAO_ECG_UDP_Out_Endpoint* endpoint = 0; + TAO_ECG_UDP_Out_Endpoint* endpoint = nullptr; TAO_ECG_Refcounted_Endpoint refendpoint; // Try to allocate a new endpoint from the heap ACE_NEW_NORETURN (endpoint, TAO_ECG_UDP_Out_Endpoint); - if (endpoint != 0) + if (endpoint != nullptr) { refendpoint.reset (endpoint); } @@ -355,18 +355,18 @@ TAO_ECG_Mcast_Gateway::init_address_server () { const char * address_server_arg = (this->address_server_arg_.length ()) - ? this->address_server_arg_.c_str () : 0; + ? this->address_server_arg_.c_str () : nullptr; if (this->address_server_type_ == ECG_ADDRESS_SERVER_BASIC) { PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> impl = TAO_ECG_Simple_Address_Server::create (); if (!impl.in ()) - return 0; + return nullptr; if (impl->init (address_server_arg) == -1) { - return 0; + return nullptr; } return impl._retn (); } @@ -376,11 +376,11 @@ TAO_ECG_Mcast_Gateway::init_address_server () PortableServer::Servant_var<TAO_ECG_Complex_Address_Server> impl = TAO_ECG_Complex_Address_Server::create (1); if (!impl.in ()) - return 0; + return nullptr; if (impl->init (address_server_arg) == -1) { - return 0; + return nullptr; } return impl._retn (); } @@ -390,11 +390,11 @@ TAO_ECG_Mcast_Gateway::init_address_server () PortableServer::Servant_var<TAO_ECG_Complex_Address_Server> impl = TAO_ECG_Complex_Address_Server::create (0); if (!impl.in ()) - return 0; + return nullptr; if (impl->init (address_server_arg) == -1) { - return 0; + return nullptr; } return impl._retn (); } @@ -404,7 +404,7 @@ TAO_ECG_Mcast_Gateway::init_address_server () ORBSVCS_ERROR ((LM_ERROR, "Cannot create address server: " "unknown address server type specified.\n")); - return 0; + return nullptr; } } @@ -416,14 +416,14 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, TAO_ECG_Refcounted_Handler handler; const ACE_TCHAR * nic = - (this->nic_.length ()) ? this->nic_.c_str () : 0; + (this->nic_.length ()) ? this->nic_.c_str () : nullptr; const char * address_server_arg = (this->address_server_arg_.length ()) - ? this->address_server_arg_.c_str () : 0; + ? this->address_server_arg_.c_str () : nullptr; if (this->handler_type_ == ECG_HANDLER_BASIC) { - TAO_ECG_Simple_Mcast_EH * h = 0; + TAO_ECG_Simple_Mcast_EH * h = nullptr; ACE_NEW_RETURN (h, TAO_ECG_Simple_Mcast_EH (receiver), handler); @@ -436,7 +436,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, else if (this->handler_type_ == ECG_HANDLER_COMPLEX) { - TAO_ECG_Mcast_EH * h = 0; + TAO_ECG_Mcast_EH * h = nullptr; ACE_NEW_RETURN (h, TAO_ECG_Mcast_EH (receiver, nic), handler); @@ -449,7 +449,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, else if (this->handler_type_ == ECG_HANDLER_UDP) { - TAO_ECG_UDP_EH * h = 0; + TAO_ECG_UDP_EH * h = nullptr; ACE_NEW_RETURN (h, TAO_ECG_UDP_EH (receiver), handler); @@ -614,7 +614,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb, || this->service_type_ == ECG_MCAST_TWO_WAY) { endpoint_rptr = this->init_endpoint (); - if (endpoint_rptr.get () == 0) + if (endpoint_rptr.get () == nullptr) { throw CORBA::INTERNAL (); } @@ -651,7 +651,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb, handler_rptr (this->init_handler (receiver.in (), ec, reactor)); - if (handler_rptr.get () == 0) + if (handler_rptr.get () == nullptr) { throw CORBA::INTERNAL (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h index 5ab71be6c18..a34a07843f8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h @@ -129,15 +129,15 @@ public: /// The Service_Object entry points. //@{ virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); //@} /// Helper function to register the Gateway into the service /// configurator. - static int init_svcs (void); + static int init_svcs (); /// Constructor. - TAO_ECG_Mcast_Gateway (void); + TAO_ECG_Mcast_Gateway (); /// Values for some configuration parameters to init (). //@{ @@ -182,7 +182,7 @@ public: */ struct TAO_RTEvent_Serv_Export Attributes { - Attributes (void); + Attributes (); Address_Server_Type address_server_type; Handler_Type handler_type; @@ -227,13 +227,13 @@ private: RtecEventChannelAdmin::EventChannel_ptr ec); /// Verifies configuration values specified through init() make sense. - int validate_configuration (void); + int validate_configuration (); //@} /// Allocate and initialize appropriate objects. //@{ PortableServer::ServantBase * - init_address_server (void); + init_address_server (); PortableServer::Servant_var<TAO_ECG_UDP_Sender> init_sender (RtecEventChannelAdmin::EventChannel_ptr ec, @@ -245,7 +245,7 @@ private: RtecUDPAdmin::AddrServer_ptr address_server, TAO_ECG_Refcounted_Endpoint endpoint_rptr); - TAO_ECG_Refcounted_Endpoint init_endpoint (void); + TAO_ECG_Refcounted_Endpoint init_endpoint (); TAO_ECG_Refcounted_Handler init_handler (TAO_ECG_Dgram_Handler *recv, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index a72497a0d44..04b881ae603 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -134,7 +134,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate () // handle_timeout uses these policies, if done in front, the channel // can crash when the timeout expires before initiazation is ready. timer_id_ = this->reactor_->schedule_timer (&this->adapter_, - 0, + nullptr, this->rate_, this->rate_); if (timer_id_ == -1) @@ -159,7 +159,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::shutdown () r = this->reactor_->cancel_timer (timer_id_); #endif /* TAO_HAS_CORBA_MESSAGING */ - this->adapter_.reactor (0); + this->adapter_.reactor (nullptr); return r; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h index d3fe99a37b9..ed3b751b127 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h @@ -72,15 +72,15 @@ public: CORBA::ORB_ptr orb); /// Destructor. - virtual ~TAO_ECG_Reactive_ConsumerEC_Control (void); + virtual ~TAO_ECG_Reactive_ConsumerEC_Control (); /// Receive the timeout from the adapter void handle_timeout (const ACE_Time_Value &tv, const void* arg); // = Documented in TAO_EC_ConsumerControl - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway); virtual void system_exception (TAO_EC_Gateway_IIOP *gateway, CORBA::SystemException &); @@ -88,7 +88,7 @@ public: private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_eventchannel (void); + void query_eventchannel (); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 272b215efc9..018b710de09 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -173,7 +173,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate () // handle_timeout uses these policies, if done in front, the channel // can crash when the timeout expires before initiazation is ready. timer_id_ = this->reactor_->schedule_timer (&this->adapter_, - 0, + nullptr, this->rate_, this->rate_); if (timer_id_ == -1) @@ -198,7 +198,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::shutdown () r = this->reactor_->cancel_timer (timer_id_); #endif /* TAO_HAS_CORBA_MESSAGING */ - this->adapter_.reactor (0); + this->adapter_.reactor (nullptr); return r; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h index 27c521480d4..493cd0fe01e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h @@ -77,15 +77,15 @@ public: CORBA::ORB_ptr orb); /// Destructor. - virtual ~TAO_ECG_Reconnect_ConsumerEC_Control (void); + virtual ~TAO_ECG_Reconnect_ConsumerEC_Control (); /// Receive the timeout from the adapter void handle_timeout (const ACE_Time_Value &tv, const void* arg); // = Documented in TAO_EC_ConsumerControl - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway); virtual void system_exception (TAO_EC_Gateway_IIOP *gateway, CORBA::SystemException &); @@ -93,13 +93,13 @@ public: private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_eventchannel (void); + void query_eventchannel (); /// Look if we can reconnect again. - void try_reconnect (void); + void try_reconnect (); /// Reconnect to the consumer ec. - void reconnect (void); + void reconnect (); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index e3e27ce61f0..267cea8f0c9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -32,10 +32,10 @@ public: /// Create a new TAO_ECG_Simple_Address_Server object. /// (Constructor access is restricted to insure that all /// TAO_ECG_Simple_Address_Server objects are heap-allocated.) - static PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> create (void); + static PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> create (); /// Destructor - virtual ~TAO_ECG_Simple_Address_Server (void); + virtual ~TAO_ECG_Simple_Address_Server (); int init (const char *arg); @@ -50,7 +50,7 @@ protected: /// Constructor (protected). Clients can create new /// TAO_ECG_Simple_Address_Server objects using the static create() /// method. - TAO_ECG_Simple_Address_Server (void); + TAO_ECG_Simple_Address_Server (); private: ACE_INET_Addr addr_; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index b671a21d7c0..2e35302a66a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -23,7 +23,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, if (!this->receiver_) return -1; - if (mcast_addr == 0) + if (mcast_addr == nullptr) return -1; ACE_INET_Addr mcast_group; @@ -82,7 +82,7 @@ TAO_ECG_Simple_Mcast_EH::shutdown () "Unable to close mcast receiving dgram " "on shutdown.\n")); - this->receiver_ = 0; + this->receiver_ = nullptr; return result; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h index aa37322173f..69c5ac53150 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h @@ -50,7 +50,7 @@ public: TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv); /// Destructor. - virtual ~TAO_ECG_Simple_Mcast_EH (void); + virtual ~TAO_ECG_Simple_Mcast_EH (); /// Join the specified multicast group and register itself with the /// reactor. @@ -62,7 +62,7 @@ public: /// TAO_ECG_Handler_Shutdown method. /// Unsubscribe from the reactor and close the datagram. - virtual int shutdown (void); + virtual int shutdown (); //@} /// Main method - reactor callback. Notify <receiver_> that diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index 53d96374eb8..49ff6f35ecf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -72,7 +72,7 @@ TAO_ECG_UDP_EH::shutdown () ORBSVCS_ERROR ((LM_ERROR, "Unable to close receiving dgram on shutdown.\n")); - this->receiver_ = 0; + this->receiver_ = nullptr; return result; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h index c11544fae06..0d865c992c5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h @@ -55,7 +55,7 @@ public: TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv); /// Destructor. - virtual ~TAO_ECG_UDP_EH (void); + virtual ~TAO_ECG_UDP_EH (); /// Open the datagram and register itself with this->reactor(). /// To insure proper resource clean up, if open () is successful, @@ -66,7 +66,7 @@ public: /// TAO_ECG_Handler_Shutdown method. /// Unsubscribe from the reactor and close the datagram. - virtual int shutdown (void); + virtual int shutdown (); //@} /// Main method - reactor callback. Notify <receiver_> that @@ -78,7 +78,7 @@ public: * type safety", allowing the user to setup options and gain access * to low-level features. */ - ACE_SOCK_Dgram &dgram (void); + ACE_SOCK_Dgram &dgram (); private: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index a00410750a6..6f238efb3c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -36,7 +36,7 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from) if (from.get_port_number () != this->port_number_) return false; - if (this->ifs_ == 0) + if (this->ifs_ == nullptr) { ACE::get_ip_interfaces (this->if_count_, this->ifs_); } @@ -62,7 +62,7 @@ TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs) this->if_count_ = rhs.if_count_; delete [] this->ifs_; - this->ifs_ = 0; + this->ifs_ = nullptr; if (this->if_count_ != 0) { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h index eb710628ee5..8cf05182684 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h @@ -45,10 +45,10 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Out_Endpoint { public: /// Constructor - TAO_ECG_UDP_Out_Endpoint (void); + TAO_ECG_UDP_Out_Endpoint (); /// Constructor - ~TAO_ECG_UDP_Out_Endpoint (void); + ~TAO_ECG_UDP_Out_Endpoint (); /// Copy Constructor TAO_ECG_UDP_Out_Endpoint (const TAO_ECG_UDP_Out_Endpoint& rhs); @@ -58,10 +58,10 @@ public: /// Obtain the datagram associated with this endpoint. Clients of /// this class must open, and register (if necessary) this datagram. - ACE_SOCK_Dgram& dgram (void); + ACE_SOCK_Dgram& dgram (); /// Obtain the next request id. - CORBA::ULong next_request_id (void); + CORBA::ULong next_request_id (); /// The endpoint can detect if a data-gram was sent by itself, this /// is useful to ignore or remove messages sent by the same process. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 0d659652791..68532c6b4b0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -71,7 +71,7 @@ class TAO_ECG_UDP_Out_Endpoint; class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver_Disconnect_Command { public: - TAO_ECG_UDP_Receiver_Disconnect_Command (void); + TAO_ECG_UDP_Receiver_Disconnect_Command (); TAO_ECG_UDP_Receiver_Disconnect_Command ( RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy); @@ -81,7 +81,7 @@ public: TAO_ECG_UDP_Receiver_Disconnect_Command & operator= (const TAO_ECG_UDP_Receiver_Disconnect_Command & rhs); - void execute (void); + void execute (); private: @@ -113,7 +113,7 @@ public: /// TAO_ECG_UDP_Receiver objects are heap-allocated.) static PortableServer::Servant_var<TAO_ECG_UDP_Receiver> create (CORBA::Boolean perform_crc = 0); - ~TAO_ECG_UDP_Receiver (void); + ~TAO_ECG_UDP_Receiver (); /** * @param lcl_ec Event Channel to which we will act as a supplier of events. @@ -157,7 +157,7 @@ public: * result in decrementing of the reference count (due to * deactivation) and deletion of the object. */ - void shutdown (void); + void shutdown (); //@} /// Accessor. @@ -174,7 +174,7 @@ public: /// The PushSupplier idl method. /// Invokes shutdown (), which may result in the object being deleted, if /// refcounting is used to manage its lifetime. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// TAO_ECG_Dgram_Handler method. /** diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 1c0dab80b05..67f29c6fc14 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -70,7 +70,7 @@ class TAO_ECG_UDP_Out_Endpoint; class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender_Disconnect_Command { public: - TAO_ECG_UDP_Sender_Disconnect_Command (void); + TAO_ECG_UDP_Sender_Disconnect_Command (); TAO_ECG_UDP_Sender_Disconnect_Command ( RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy); @@ -80,7 +80,7 @@ public: TAO_ECG_UDP_Sender_Disconnect_Command & operator= (const TAO_ECG_UDP_Sender_Disconnect_Command & rhs); - void execute (void); + void execute (); private: @@ -110,7 +110,7 @@ public: /// TAO_ECG_UDP_Sender objects are heap-allocated.) static PortableServer::Servant_var<TAO_ECG_UDP_Sender> create (CORBA::Boolean crc = 0); - ~TAO_ECG_UDP_Sender (void); + ~TAO_ECG_UDP_Sender (); /** * @param lcl_ec Event Channel to which we will act as a consumer of events. @@ -148,7 +148,7 @@ public: * Calling this method may result in decrementing of the reference * count (due to deactivation) and deletion of the object. */ - void shutdown (void); + void shutdown (); //@} /// Accessors. @@ -160,7 +160,7 @@ public: * header + 8 bytes must fit). */ int mtu (CORBA::ULong mtu); - CORBA::ULong mtu (void) const; + CORBA::ULong mtu () const; /// Get the local endpoint used to send the events. int get_local_addr (ACE_INET_Addr& addr); @@ -170,7 +170,7 @@ public: //@{ /// Invokes shutdown (), which may result in the object being deleted, if /// refcounting is used to manage its lifetime. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); virtual void push (const RtecEventComm::EventSet &events); //@} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 10d6b5aa22d..0e9b80f7c7d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -24,10 +24,10 @@ TAO_EC_And_Filter::~TAO_EC_And_Filter () ++i) { delete *i; - *i = 0; + *i = nullptr; } delete[] this->children_; - this->children_ = 0; + this->children_ = nullptr; this->n_ = 0; } @@ -62,7 +62,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, } // All children accepted the event, push up... - if (this->parent () != 0) + if (this->parent () != nullptr) { this->parent ()->push (event, qos_info); } @@ -83,7 +83,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, } // All children accepted the event, push up... - if (this->parent () != 0) + if (this->parent () != nullptr) { this->parent ()->push (event, qos_info); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h index a773fc8f2df..8bab675629d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -43,13 +43,13 @@ public: size_t n); /// Destructor - virtual ~TAO_EC_And_Filter (void); + virtual ~TAO_EC_And_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. - virtual ChildrenIterator begin (void) const; - virtual ChildrenIterator end (void) const; - virtual int size (void) const; + virtual ChildrenIterator begin () const; + virtual ChildrenIterator end () const; + virtual int size () const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); virtual int filter_nocopy (RtecEventComm::EventSet& event, @@ -58,8 +58,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index fb9914cc01f..5409f0b4406 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -116,7 +116,7 @@ TAO_EC_Timeout_Generator* TAO_EC_Basic_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); ACE_Reactor *reactor = orb->orb_core ()->reactor (); @@ -133,7 +133,7 @@ TAO_EC_ObserverStrategy* TAO_EC_Basic_Factory::create_observer_strategy (TAO_EC_Event_Channel_Base *ec) { ACE_Lock* lock; - ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0); + ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, nullptr); return new TAO_EC_Basic_ObserverStrategy (ec, lock); } @@ -221,7 +221,7 @@ TAO_EC_ConsumerControl* TAO_EC_Basic_Factory::create_consumer_control (TAO_EC_Event_Channel_Base* ec) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); // Hard-coded rate to 10 times a second @@ -241,7 +241,7 @@ TAO_EC_SupplierControl* TAO_EC_Basic_Factory::create_supplier_control (TAO_EC_Event_Channel_Base* ec) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); // Hard-coded rate to 10 times a second diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h index e4b47f620df..79753dbcf98 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h @@ -40,10 +40,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Basic_Factory : public TAO_EC_Factory { public: /// Constructor - TAO_EC_Basic_Factory (void); + TAO_EC_Basic_Factory (); /// destructor... - virtual ~TAO_EC_Basic_Factory (void); + virtual ~TAO_EC_Basic_Factory (); // = The EC_Factory methods virtual TAO_EC_Dispatching* @@ -95,9 +95,9 @@ public: virtual void destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*); - virtual ACE_Lock* create_consumer_lock (void); + virtual ACE_Lock* create_consumer_lock (); virtual void destroy_consumer_lock (ACE_Lock*); - virtual ACE_Lock* create_supplier_lock (void); + virtual ACE_Lock* create_supplier_lock (); virtual void destroy_supplier_lock (ACE_Lock*); virtual TAO_EC_ConsumerControl* diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index 10b8410bc22..71b45942b78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -36,7 +36,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( { CORBA::ULong l = qos.dependencies.length (); if (pos == l) - return 0; + return nullptr; const RtecEventComm::Event& e = qos.dependencies[pos].event; if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR) @@ -45,7 +45,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( CORBA::ULong n = this->count_children (qos, pos); TAO_EC_Filter** children; - ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); + ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr); CORBA::ULong i = 0; for (; i != n; ++i) { @@ -59,7 +59,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( CORBA::ULong n = this->count_children (qos, pos); TAO_EC_Filter** children; - ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); + ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr); CORBA::ULong i = 0; for (; i != n; ++i) { @@ -73,7 +73,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( CORBA::ULong n = this->count_children (qos, pos); TAO_EC_Filter** children; - ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); + ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr); CORBA::ULong i = 0; for (; i != n; ++i) { @@ -94,7 +94,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( pos++; // COnsumer the designator if (pos == qos.dependencies.length ()) - return 0; + return nullptr; CORBA::ULong source_mask = qos.dependencies[pos].event.header.source; CORBA::ULong type_mask = qos.dependencies[pos].event.header.type; pos++; @@ -110,13 +110,13 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( pos++; // Consume the designator if (pos == qos.dependencies.length ()) - return 0; + return nullptr; CORBA::ULong source_mask = qos.dependencies[pos].event.header.source; CORBA::ULong type_mask = qos.dependencies[pos].event.header.type; pos++; if (pos == qos.dependencies.length ()) - return 0; + return nullptr; CORBA::ULong source_value = qos.dependencies[pos].event.header.source; CORBA::ULong type_value = qos.dependencies[pos].event.header.type; pos++; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 6c444ed0a34..37adc1f8432 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -45,7 +45,7 @@ public: TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel_Base* ec); /// destructor... - virtual ~TAO_EC_Basic_Filter_Builder (void); + virtual ~TAO_EC_Basic_Filter_Builder (); // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index 4cb7ed15ba9..1ddeaefc8d4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -67,7 +67,7 @@ void TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push (event, qos_info); } @@ -75,7 +75,7 @@ void TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push_nocopy (event, qos_info); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h index ad3bfc4eac4..8d20fef16be 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -60,13 +60,13 @@ public: TAO_EC_Filter* child); /// Destructor - virtual ~TAO_EC_Bitmask_Filter (void); + virtual ~TAO_EC_Bitmask_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. - virtual ChildrenIterator begin (void) const; - virtual ChildrenIterator end (void) const; - virtual int size (void) const; + virtual ChildrenIterator begin () const; + virtual ChildrenIterator end () const; + virtual int size () const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); virtual int filter_nocopy (RtecEventComm::EventSet& event, @@ -75,8 +75,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index 3ea1df0215e..3a42c815221 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -32,14 +32,14 @@ TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter () ++i) { delete *i; - *i = 0; + *i = nullptr; } delete[] this->children_; - this->children_ = 0; + this->children_ = nullptr; this->n_ = 0; delete[] this->bitvec_; - this->bitvec_ = 0; + this->bitvec_ = nullptr; } int @@ -123,7 +123,7 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, { this->event_[l + i] = event[i]; } - if (this->all_received () && this->parent () != 0) + if (this->all_received () && this->parent () != nullptr) this->parent ()->push_nocopy (this->event_, qos_info); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index c914ef7e81f..eb7247e4f05 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -45,13 +45,13 @@ public: size_t n); /// Destructor - virtual ~TAO_EC_Conjunction_Filter (void); + virtual ~TAO_EC_Conjunction_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. - virtual ChildrenIterator begin (void) const; - virtual ChildrenIterator end (void) const; - virtual int size (void) const; + virtual ChildrenIterator begin () const; + virtual ChildrenIterator end () const; + virtual int size () const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); virtual int filter_nocopy (RtecEventComm::EventSet& event, @@ -60,8 +60,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); @@ -70,7 +70,7 @@ public: private: /// Determine if all the children have received their events. - int all_received (void) const; + int all_received () const; TAO_EC_Conjunction_Filter (const TAO_EC_Conjunction_Filter&); TAO_EC_Conjunction_Filter& operator= (const TAO_EC_Conjunction_Filter&); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 9cce398a872..86fb2957843 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -57,14 +57,14 @@ public: TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base* event_channel); /// Destructor... - virtual ~TAO_EC_ConsumerAdmin (void); + virtual ~TAO_EC_ConsumerAdmin (); // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void); + obtain_push_supplier (); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h index 952d5b832af..651250bfb2f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h @@ -48,15 +48,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_ConsumerControl { public: /// Constructor. - TAO_EC_ConsumerControl (void); + TAO_EC_ConsumerControl (); /// Destructor. - virtual ~TAO_EC_ConsumerControl (void); + virtual ~TAO_EC_ConsumerControl (); /// Activate any internal threads or timers used to poll the state of /// the consumers - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); /** * When pushing an event to the consumer a CORBA::OBJECT_NOT_EXIST diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index f9e9063c993..175617bb25d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -106,16 +106,16 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) // need to parse the flags...ugh ACE_TCHAR* opt = ACE_OS::strdup (s); - ACE_TCHAR* aux = 0; + ACE_TCHAR* aux = nullptr; ACE_TCHAR* flags = ACE_OS::strtok_r (opt, ACE_TEXT (":"), &aux); TAO_EC_Thread_Flags tf(ACE_TEXT_ALWAYS_CHAR (flags)); // parse and set up this->dispatching_threads_flags_ = tf.flags (); - ACE_TCHAR* arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux); + ACE_TCHAR* arg = ACE_OS::strtok_r (nullptr, ACE_TEXT(":"), &aux); if (arg) { - long prio = ACE_OS::strtol (arg, 0, 0); + long prio = ACE_OS::strtol (arg, nullptr, 0); this->dispatching_threads_priority_ = prio; } @@ -244,8 +244,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) ACE_TCHAR* aux; for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux); - arg != 0; - arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux)) + arg != nullptr; + arg = ACE_OS::strtok_r (nullptr, ACE_TEXT(":"), &aux)) { if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0) synch_type = 0; @@ -289,8 +289,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) ACE_TCHAR* aux; for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux); - arg != 0; - arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux)) + arg != nullptr; + arg = ACE_OS::strtok_r (nullptr, ACE_TEXT(":"), &aux)) { if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0) synch_type = 0; @@ -435,7 +435,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - unsigned long timeout = ACE_OS::strtoul(opt, 0, 10); + unsigned long timeout = ACE_OS::strtoul(opt, nullptr, 10); this->consumer_control_timeout_.usec(timeout); arg_shifter.consume_arg (); } @@ -448,7 +448,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - unsigned long timeout = ACE_OS::strtoul(opt, 0, 10); + unsigned long timeout = ACE_OS::strtoul(opt, nullptr, 10); this->supplier_control_timeout_.usec(timeout); arg_shifter.consume_arg (); } @@ -509,9 +509,9 @@ TAO_EC_Queue_Full_Service_Object* TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted, const ACE_TCHAR* fallback) { - TAO_EC_Queue_Full_Service_Object* so = 0; + TAO_EC_Queue_Full_Service_Object* so = nullptr; so = ACE_Dynamic_Service<TAO_EC_Queue_Full_Service_Object>::instance (wanted); - if (so != 0) + if (so != nullptr) return so; ORBSVCS_ERROR ((LM_ERROR, @@ -522,7 +522,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted, fallback)); so = ACE_Dynamic_Service<TAO_EC_Queue_Full_Service_Object>::instance (fallback); - if (so != 0) + if (so != nullptr) return so; ORBSVCS_ERROR ((LM_ERROR, @@ -531,7 +531,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted, "aborting.\n", fallback)); ACE_OS::abort (); - return 0; // superfluous return to de-warn; we should never reach here + return nullptr; // superfluous return to de-warn; we should never reach here } TAO_EC_Dispatching* @@ -550,7 +550,7 @@ TAO_EC_Default_Factory::create_dispatching (TAO_EC_Event_Channel_Base *) this->dispatching_threads_force_active_, so); } - return 0; + return nullptr; } void @@ -568,7 +568,7 @@ TAO_EC_Default_Factory::create_filter_builder (TAO_EC_Event_Channel_Base *ec) return new TAO_EC_Basic_Filter_Builder (ec); else if (this->filtering_ == 2) return new TAO_EC_Prefix_Filter_Builder (ec); - return 0; + return nullptr; } void @@ -584,7 +584,7 @@ TAO_EC_Default_Factory::create_supplier_filter_builder (TAO_EC_Event_Channel_Bas return new TAO_EC_Trivial_Supplier_Filter_Builder (ec); else if (this->supplier_filtering_ == 1) return new TAO_EC_Per_Supplier_Filter_Builder (ec); - return 0; + return nullptr; } void @@ -647,7 +647,7 @@ TAO_EC_Default_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *) if (this->timeout_ == 0) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orbid_.c_str ()); @@ -659,7 +659,7 @@ TAO_EC_Default_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *) { } #endif - return 0; + return nullptr; } void @@ -676,18 +676,18 @@ TAO_EC_Default_Factory::create_observer_strategy (TAO_EC_Event_Channel_Base *ec) else if (this->observer_ == 1) { // @@ The lock should also be under control of the user... - ACE_Lock* lock = 0; - ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0); + ACE_Lock* lock = nullptr; + ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, nullptr); return new TAO_EC_Basic_ObserverStrategy (ec, lock); } else if (this->observer_ == 2) { // @@ The lock should also be under control of the user... - ACE_Lock* lock = 0; - ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0); + ACE_Lock* lock = nullptr; + ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, nullptr); return new TAO_EC_Reactive_ObserverStrategy (ec, lock); } - return 0; + return nullptr; } void @@ -703,7 +703,7 @@ TAO_EC_Default_Factory::create_scheduling_strategy (TAO_EC_Event_Channel_Base*) return new TAO_EC_Null_Scheduling; else if (this->scheduling_ == 1) return new TAO_EC_Group_Scheduling; - return 0; + return nullptr; } void @@ -811,7 +811,7 @@ TAO_EC_Default_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Chan TAO_EC_Consumer_RB_Tree_Iterator, ACE_NULL_SYNCH> (); - return 0; + return nullptr; } void @@ -904,7 +904,7 @@ TAO_EC_Default_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Chan TAO_EC_Supplier_RB_Tree_Iterator, ACE_NULL_SYNCH> (); - return 0; + return nullptr; } void @@ -922,7 +922,7 @@ TAO_EC_Default_Factory::create_consumer_lock () return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); else if (this->consumer_lock_ == 2) return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); - return 0; + return nullptr; } void @@ -940,7 +940,7 @@ TAO_EC_Default_Factory::create_supplier_lock () return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); else if (this->supplier_lock_ == 2) return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); - return 0; + return nullptr; } void @@ -957,14 +957,14 @@ TAO_EC_Default_Factory::create_consumer_control (TAO_EC_Event_Channel_Base* ec) else if (this->consumer_control_ == 1) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orbid_.c_str ()); ACE_Time_Value rate (0, this->consumer_control_period_); return new TAO_EC_Reactive_ConsumerControl (rate, consumer_control_timeout_, ec, orb.in ()); } - return 0; + return nullptr; } void @@ -981,14 +981,14 @@ TAO_EC_Default_Factory::create_supplier_control (TAO_EC_Event_Channel_Base* ec) else if (this->supplier_control_ == 1) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orbid_.c_str ()); ACE_Time_Value rate (0, this->supplier_control_period_); return new TAO_EC_Reactive_SupplierControl (rate, supplier_control_timeout_, ec, orb.in ()); } - return 0; + return nullptr; } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h index 681360dc2ed..55ad13f6b55 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h @@ -46,18 +46,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_Factory : public TAO_EC_Factory { public: /// Constructor - TAO_EC_Default_Factory (void); + TAO_EC_Default_Factory (); /// destructor... - virtual ~TAO_EC_Default_Factory (void); + virtual ~TAO_EC_Default_Factory (); /// Helper function to register the default factory into the service /// configurator. - static int init_svcs (void); + static int init_svcs (); // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); // = The EC_Factory methods virtual TAO_EC_Dispatching* @@ -109,9 +109,9 @@ public: virtual void destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*); - virtual ACE_Lock* create_consumer_lock (void); + virtual ACE_Lock* create_consumer_lock (); virtual void destroy_consumer_lock (ACE_Lock*); - virtual ACE_Lock* create_supplier_lock (void); + virtual ACE_Lock* create_supplier_lock (); virtual void destroy_supplier_lock (ACE_Lock*); virtual TAO_EC_ConsumerControl* @@ -124,16 +124,16 @@ public: destroy_supplier_control (TAO_EC_SupplierControl*); /// Accessors to consumer collection flags - int consumer_collection (void) const; + int consumer_collection () const; /// Accessors to supplier collection flags - int supplier_collection (void) const; + int supplier_collection () const; /// Accessors to supplier filtering flags - int supplier_filtering (void) const; + int supplier_filtering () const; /// Accessor to ORBid - const ACE_CString& orb_id (void) const; + const ACE_CString& orb_id () const; protected: /// Helper for agrument parsing. Prints out an error message about diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index 731206ed1b6..c90457fb277 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -60,7 +60,7 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier ( this->supplier_ = RtecEventComm::PushSupplier::_duplicate (push_supplier); - this->connected_ = 1; + this->connected_ = true; this->qos_ = qos; #if TAO_EC_ENABLE_DEBUG_MESSAGES @@ -104,7 +104,7 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer () connected = this->is_connected_i (); supplier = this->supplier_._retn (); - this->connected_ = 0; + this->connected_ = false; if (connected) this->cleanup_i (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index 1c86883333b..4230f1a6370 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -42,7 +42,7 @@ public: TAO_EC_Default_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel); /// Destructor... - virtual ~TAO_EC_Default_ProxyPushConsumer (void); + virtual ~TAO_EC_Default_ProxyPushConsumer (); virtual void activate ( RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy); @@ -52,17 +52,17 @@ public: RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos); virtual void push (const RtecEventComm::EventSet& event); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (void); - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual PortableServer::POA_ptr _default_POA (); + virtual void _add_ref (); + virtual void _remove_ref (); private: virtual PortableServer::ObjectId - object_id (void); + object_id (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index 3ee6df2154e..df5589db1f6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -39,7 +39,7 @@ public: TAO_EC_Default_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection); /// Destructor... - virtual ~TAO_EC_Default_ProxyPushSupplier (void); + virtual ~TAO_EC_Default_ProxyPushSupplier (); void activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy); @@ -48,19 +48,19 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos); - virtual void disconnect_push_supplier (void); - virtual void suspend_connection (void); - virtual void resume_connection (void); + virtual void disconnect_push_supplier (); + virtual void suspend_connection (); + virtual void resume_connection (); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (void); - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual PortableServer::POA_ptr _default_POA (); + virtual void _add_ref (); + virtual void _remove_ref (); private: virtual PortableServer::ObjectId - object_id (void); + object_id (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index 9d036908440..1cf257b54d6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -25,10 +25,10 @@ TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter () ++i) { delete *i; - *i = 0; + *i = nullptr; } delete[] this->children_; - this->children_ = 0; + this->children_ = nullptr; this->n_ = 0; } @@ -86,7 +86,7 @@ void TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push (event, qos_info); } @@ -94,7 +94,7 @@ void TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push_nocopy (event, qos_info); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index b93ba31e605..efc1c8a4fab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -43,14 +43,14 @@ public: size_t n); /// Destructor - virtual ~TAO_EC_Disjunction_Filter (void); + virtual ~TAO_EC_Disjunction_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. - virtual ChildrenIterator begin (void) const; - virtual ChildrenIterator end (void) const; - virtual int size (void) const; + virtual ChildrenIterator begin () const; + virtual ChildrenIterator end () const; + virtual int size () const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); virtual int filter_nocopy (RtecEventComm::EventSet& event, @@ -59,8 +59,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index b2a1830d646..60d330fc633 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -45,18 +45,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Dispatching { public: /// Destructor... - virtual ~TAO_EC_Dispatching (void); + virtual ~TAO_EC_Dispatching (); /// Initialize all the data structures, activate any internal threads, /// etc. - virtual void activate (void) = 0; + virtual void activate () = 0; /** * Deactivate any internal threads and cleanup internal data * structures, it should only return once the threads have finished * their jobs. */ - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; /** * The consumer represented by @a proxy should receive @a event. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 3e8cd26ef17..dbcd5a28853 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -50,7 +50,7 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[]) ; // probably ought to print an error message here #endif - } while (0); + } while (false); return 0; } @@ -99,7 +99,7 @@ TAO_EC_Dispatching_Task::svc () { try { - ACE_Message_Block *mb = 0; + ACE_Message_Block *mb = nullptr; if (this->getq (mb) == -1) { @@ -117,7 +117,7 @@ TAO_EC_Dispatching_Task::svc () TAO_EC_Dispatch_Command *command = dynamic_cast<TAO_EC_Dispatch_Command*> (mb); - if (command == 0) + if (command == nullptr) { ACE_Message_Block::release (mb); continue; @@ -148,7 +148,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, { if (this->msg_queue()->is_full ()) { - if (0 != this->queue_full_service_object_) + if (nullptr != this->queue_full_service_object_) { int action = this->queue_full_service_object_->queue_full_action (this, proxy, @@ -161,12 +161,12 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, // else go ahead and queue it } - if (this->allocator_ == 0) + if (this->allocator_ == nullptr) this->allocator_ = ACE_Allocator::instance (); void* buf = this->allocator_->malloc (sizeof (TAO_EC_Push_Command)); - if (buf == 0) + if (buf == nullptr) throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO); ACE_Message_Block *mb = diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index edf7d0add56..fac5d0fd162 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -59,11 +59,11 @@ public: /// Helper function to register the default action into the service /// configurator. - static int init_svcs (void); + static int init_svcs (); // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); virtual int queue_full_action (TAO_EC_Dispatching_Task *task, TAO_EC_ProxyPushSupplier *proxy, @@ -84,7 +84,7 @@ public: protected: // = Override the default definition in the Message_Queue, to count // the number of messages (and not their size). - virtual bool is_full_i (void); + virtual bool is_full_i (); }; /** @@ -106,7 +106,7 @@ public: #endif /// Process the events in the queue. - virtual int svc (void); + virtual int svc (); virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, @@ -138,10 +138,10 @@ public: ACE_Allocator *mb_allocator = 0); /// Destructor - virtual ~TAO_EC_Dispatch_Command (void); + virtual ~TAO_EC_Dispatch_Command (); /// Command callback - virtual int execute (void) = 0; + virtual int execute () = 0; }; // **************************************************************** @@ -153,7 +153,7 @@ public: TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (void); + virtual int execute (); }; // **************************************************************** @@ -169,10 +169,10 @@ public: ACE_Allocator *mb_allocator); /// Destructor - virtual ~TAO_EC_Push_Command (void); + virtual ~TAO_EC_Push_Command (); /// Command callback - virtual int execute (void); + virtual int execute (); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index 799f234f402..7eeeaf02ce8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -10,15 +10,15 @@ TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr, int own_factory) : TAO_EC_Event_Channel_Base (attr, factory, own_factory) { - if (this->factory () == 0) + if (this->factory () == nullptr) { this->factory ( ACE_Dynamic_Service<TAO_EC_Factory>::instance ("EC_Factory"), 0); - if (this->factory () == 0) + if (this->factory () == nullptr) { - TAO_EC_Factory *f = 0; + TAO_EC_Factory *f = nullptr; ACE_NEW (f, TAO_EC_Default_Factory); this->factory (f, 1); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index c392ccf3ac7..553ebe51701 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -22,19 +22,19 @@ TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr, consumer_poa_ (PortableServer::POA::_duplicate (attr.consumer_poa)), factory_ (factory), own_factory_ (own_factory), - dispatching_ (0), - filter_builder_ (0), - supplier_filter_builder_ (0), - consumer_admin_ (0), - supplier_admin_ (0), - timeout_generator_ (0), - observer_strategy_ (0), - scheduling_strategy_(0), + dispatching_ (nullptr), + filter_builder_ (nullptr), + supplier_filter_builder_ (nullptr), + consumer_admin_ (nullptr), + supplier_admin_ (nullptr), + timeout_generator_ (nullptr), + observer_strategy_ (nullptr), + scheduling_strategy_(nullptr), consumer_reconnect_ (attr.consumer_reconnect), supplier_reconnect_ (attr.supplier_reconnect), disconnect_callbacks_ (attr.disconnect_callbacks), - consumer_control_ (0), - supplier_control_ (0), + consumer_control_ (nullptr), + supplier_control_ (nullptr), status_ (EC_S_IDLE) { this->scheduler_ = @@ -47,34 +47,34 @@ TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base () // reference to each other during destruction and thus need to be // cleaned up properly. this->factory_->destroy_supplier_control (this->supplier_control_); - this->supplier_control_ = 0; + this->supplier_control_ = nullptr; this->factory_->destroy_consumer_control (this->consumer_control_); - this->consumer_control_ = 0; + this->consumer_control_ = nullptr; this->factory_->destroy_scheduling_strategy (this->scheduling_strategy_); - this->scheduling_strategy_ = 0; + this->scheduling_strategy_ = nullptr; this->factory_->destroy_observer_strategy (this->observer_strategy_); - this->observer_strategy_ = 0; + this->observer_strategy_ = nullptr; this->factory_->destroy_timeout_generator (this->timeout_generator_); - this->timeout_generator_ = 0; + this->timeout_generator_ = nullptr; this->factory_->destroy_supplier_admin (this->supplier_admin_); - this->supplier_admin_ = 0; + this->supplier_admin_ = nullptr; this->factory_->destroy_consumer_admin (this->consumer_admin_); - this->consumer_admin_ = 0; + this->consumer_admin_ = nullptr; this->factory_->destroy_supplier_filter_builder (this->supplier_filter_builder_); - this->supplier_filter_builder_ = 0; + this->supplier_filter_builder_ = nullptr; this->factory_->destroy_filter_builder (this->filter_builder_); - this->filter_builder_ = 0; + this->filter_builder_ = nullptr; this->factory_->destroy_dispatching (this->dispatching_); - this->dispatching_ = 0; + this->dispatching_ = nullptr; - this->factory (0, this->own_factory_); + this->factory (nullptr, this->own_factory_); } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 2ca67d3e4a3..aeaf455232d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -110,15 +110,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Base { public: /// destructor - virtual ~TAO_EC_Event_Channel_Base (void); + virtual ~TAO_EC_Event_Channel_Base (); /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (void); + virtual void activate (); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (void); + virtual void shutdown (); virtual void for_each_consumer ( TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker); @@ -127,31 +127,31 @@ public: TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker); /// Access the dispatching module.... - TAO_EC_Dispatching* dispatching (void) const; + TAO_EC_Dispatching* dispatching () const; /// Access the filter builder.... - TAO_EC_Filter_Builder* filter_builder (void) const; + TAO_EC_Filter_Builder* filter_builder () const; /// Access the filter builder.... - TAO_EC_Supplier_Filter_Builder* supplier_filter_builder (void) const; + TAO_EC_Supplier_Filter_Builder* supplier_filter_builder () const; /// Access the consumer admin implementation, useful for controlling /// the activation... - TAO_EC_ConsumerAdmin* consumer_admin (void) const; + TAO_EC_ConsumerAdmin* consumer_admin () const; /// Access the supplier admin implementation, useful for controlling /// the activation... - TAO_EC_SupplierAdmin* supplier_admin (void) const; + TAO_EC_SupplierAdmin* supplier_admin () const; /// Access the timer module... - TAO_EC_Timeout_Generator* timeout_generator (void) const; + TAO_EC_Timeout_Generator* timeout_generator () const; /// Access the scheduling strategy - TAO_EC_Scheduling_Strategy* scheduling_strategy (void) const; + TAO_EC_Scheduling_Strategy* scheduling_strategy () const; /// Access the client control strategies. - TAO_EC_ConsumerControl *consumer_control (void) const; - TAO_EC_SupplierControl *supplier_control (void) const; + TAO_EC_ConsumerControl *consumer_control () const; + TAO_EC_SupplierControl *supplier_control () const; // = The factory methods, they delegate on the EC_Factory. /// Create and destroy a ProxyPushSupplier @@ -175,14 +175,14 @@ public: void destroy_proxy_collection (TAO_EC_ProxyPushConsumer_Collection*); /// Access the supplier and consumer POAs from the factory. - PortableServer::POA_ptr supplier_poa (void); - PortableServer::POA_ptr consumer_poa (void); + PortableServer::POA_ptr supplier_poa (); + PortableServer::POA_ptr consumer_poa (); /// Locking strategies for the ProxyPushConsumer and /// ProxyPushSupplier objects - ACE_Lock* create_consumer_lock (void); + ACE_Lock* create_consumer_lock (); void destroy_consumer_lock (ACE_Lock*); - ACE_Lock* create_supplier_lock (void); + ACE_Lock* create_supplier_lock (); void destroy_supplier_lock (ACE_Lock*); /// Used to inform the EC that a Consumer has connected or @@ -201,31 +201,31 @@ public: // at construction time. /// Can the consumers reconnect to the EC? - int consumer_reconnect (void) const; + int consumer_reconnect () const; /// Can the suppliers reconnect to the EC? - int supplier_reconnect (void) const; + int supplier_reconnect () const; /// Should we send callback disconnect messages when a proxy is /// disconnected by the client - int disconnect_callbacks (void) const; + int disconnect_callbacks () const; /// Obtain the scheduler, the user must release - CORBA::Object_ptr scheduler (void); + CORBA::Object_ptr scheduler (); // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: /// this->consumer_admin ()->_this (); virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); /// The default implementation is: /// this->supplier_admin ()->_this (); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); /// Commit suicide. - virtual void destroy (void); + virtual void destroy (); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr); @@ -233,7 +233,7 @@ public: remove_observer (RtecEventChannelAdmin::Observer_Handle); /// Return 1 if the event channel is already destroyed. - int destroyed (void); + int destroyed (); protected: /** @@ -249,7 +249,7 @@ protected: /** * Get the factory. */ - TAO_EC_Factory * factory (void) const; + TAO_EC_Factory * factory () const; /** * Set the factory, if @a own_factory is not 0 it assumes ownership of the @@ -261,13 +261,13 @@ protected: /** * Create all strategies */ - void create_strategies (void); + void create_strategies (); /// Helpers. Deactivate admins from their POAs, ignoring any CORBA /// exceptions. //@{ - void deactivate_supplier_admin (void); - void deactivate_consumer_admin (void); + void deactivate_supplier_admin (); + void deactivate_consumer_admin (); //@} /// The POAs used to activate "supplier-side" and "consumer-side" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl index fba3bc42726..46f80d7a4b5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl @@ -15,7 +15,7 @@ TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa, } ACE_INLINE TAO_EC_Factory* -TAO_EC_Event_Channel_Base::factory (void) const +TAO_EC_Event_Channel_Base::factory () const { return this->factory_; } @@ -32,55 +32,55 @@ TAO_EC_Event_Channel_Base::factory (TAO_EC_Factory* factory, } ACE_INLINE TAO_EC_Dispatching* -TAO_EC_Event_Channel_Base::dispatching (void) const +TAO_EC_Event_Channel_Base::dispatching () const { return this->dispatching_; } ACE_INLINE TAO_EC_Filter_Builder* -TAO_EC_Event_Channel_Base::filter_builder (void) const +TAO_EC_Event_Channel_Base::filter_builder () const { return this->filter_builder_; } ACE_INLINE TAO_EC_Supplier_Filter_Builder* -TAO_EC_Event_Channel_Base::supplier_filter_builder (void) const +TAO_EC_Event_Channel_Base::supplier_filter_builder () const { return this->supplier_filter_builder_; } ACE_INLINE TAO_EC_ConsumerAdmin* -TAO_EC_Event_Channel_Base::consumer_admin (void) const +TAO_EC_Event_Channel_Base::consumer_admin () const { return this->consumer_admin_; } ACE_INLINE TAO_EC_SupplierAdmin* -TAO_EC_Event_Channel_Base::supplier_admin (void) const +TAO_EC_Event_Channel_Base::supplier_admin () const { return this->supplier_admin_; } ACE_INLINE TAO_EC_Timeout_Generator* -TAO_EC_Event_Channel_Base::timeout_generator (void) const +TAO_EC_Event_Channel_Base::timeout_generator () const { return this->timeout_generator_; } ACE_INLINE TAO_EC_Scheduling_Strategy* -TAO_EC_Event_Channel_Base::scheduling_strategy (void) const +TAO_EC_Event_Channel_Base::scheduling_strategy () const { return this->scheduling_strategy_; } ACE_INLINE TAO_EC_ConsumerControl* -TAO_EC_Event_Channel_Base::consumer_control (void) const +TAO_EC_Event_Channel_Base::consumer_control () const { return this->consumer_control_; } ACE_INLINE TAO_EC_SupplierControl* -TAO_EC_Event_Channel_Base::supplier_control (void) const +TAO_EC_Event_Channel_Base::supplier_control () const { return this->supplier_control_; } @@ -134,19 +134,19 @@ TAO_EC_Event_Channel_Base::destroy_proxy_collection (TAO_EC_ProxyPushSupplier_Co } ACE_INLINE PortableServer::POA_ptr -TAO_EC_Event_Channel_Base::supplier_poa (void) +TAO_EC_Event_Channel_Base::supplier_poa () { return PortableServer::POA::_duplicate (this->supplier_poa_.in ()); } ACE_INLINE PortableServer::POA_ptr -TAO_EC_Event_Channel_Base::consumer_poa (void) +TAO_EC_Event_Channel_Base::consumer_poa () { return PortableServer::POA::_duplicate (this->consumer_poa_.in ()); } ACE_INLINE ACE_Lock* -TAO_EC_Event_Channel_Base::create_consumer_lock (void) +TAO_EC_Event_Channel_Base::create_consumer_lock () { return this->factory_->create_consumer_lock (); } @@ -158,7 +158,7 @@ TAO_EC_Event_Channel_Base::destroy_consumer_lock (ACE_Lock* x) } ACE_INLINE ACE_Lock* -TAO_EC_Event_Channel_Base::create_supplier_lock (void) +TAO_EC_Event_Channel_Base::create_supplier_lock () { return this->factory_->create_supplier_lock (); } @@ -170,31 +170,31 @@ TAO_EC_Event_Channel_Base::destroy_supplier_lock (ACE_Lock* x) } ACE_INLINE int -TAO_EC_Event_Channel_Base::consumer_reconnect (void) const +TAO_EC_Event_Channel_Base::consumer_reconnect () const { return this->consumer_reconnect_; } ACE_INLINE int -TAO_EC_Event_Channel_Base::supplier_reconnect (void) const +TAO_EC_Event_Channel_Base::supplier_reconnect () const { return this->supplier_reconnect_; } ACE_INLINE int -TAO_EC_Event_Channel_Base::disconnect_callbacks (void) const +TAO_EC_Event_Channel_Base::disconnect_callbacks () const { return this->disconnect_callbacks_; } ACE_INLINE CORBA::Object_ptr -TAO_EC_Event_Channel_Base::scheduler (void) +TAO_EC_Event_Channel_Base::scheduler () { return CORBA::Object::_duplicate (this->scheduler_.in ()); } ACE_INLINE int -TAO_EC_Event_Channel_Base::destroyed (void) +TAO_EC_Event_Channel_Base::destroyed () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return (this->status_ == EC_S_DESTROYED); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h index fcc583bfde4..8b7a66455da 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h @@ -67,8 +67,8 @@ class TAO_RTEvent_Serv_Export TAO_EC_Factory : public ACE_Service_Object { public: /// destructor... - TAO_EC_Factory (void); - virtual ~TAO_EC_Factory (void); + TAO_EC_Factory (); + virtual ~TAO_EC_Factory (); /// Create and destroy the dispatching module. virtual TAO_EC_Dispatching* @@ -144,9 +144,9 @@ public: /// Create and destroy the locking strategies for both /// ProxyPushConsumers and ProxyPushSuppliers - virtual ACE_Lock* create_consumer_lock (void) = 0; + virtual ACE_Lock* create_consumer_lock () = 0; virtual void destroy_consumer_lock (ACE_Lock*) = 0; - virtual ACE_Lock* create_supplier_lock (void) = 0; + virtual ACE_Lock* create_supplier_lock () = 0; virtual void destroy_supplier_lock (ACE_Lock*) = 0; /// The ConsumerControl and SupplierControl strategies are used to diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index 4861e5e00d6..5a845583713 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -22,13 +22,13 @@ TAO_EC_Filter::adopt_child (TAO_EC_Filter* child) TAO_EC_Filter::ChildrenIterator TAO_EC_Filter::begin () const { - return 0; + return nullptr; } TAO_EC_Filter::ChildrenIterator TAO_EC_Filter::end () const { - return 0; + return nullptr; } int @@ -70,7 +70,7 @@ void TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push (event, qos_info); } @@ -78,7 +78,7 @@ void TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push_nocopy (event, qos_info); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index f64a49e72c0..88a7533d7a4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -50,13 +50,13 @@ class TAO_RTEvent_Serv_Export TAO_EC_Filter { public: /// constructor... - TAO_EC_Filter (void); + TAO_EC_Filter (); /// destructor... - virtual ~TAO_EC_Filter (void); + virtual ~TAO_EC_Filter (); /// Obtain the parent of this filter. - TAO_EC_Filter* parent (void) const; + TAO_EC_Filter* parent () const; /// Become the parent of @a child. void adopt_child (TAO_EC_Filter* child); @@ -76,9 +76,9 @@ public: * interface as if they all had children, but for simple filters the * iterators return an empty range. */ - virtual ChildrenIterator begin (void) const; - virtual ChildrenIterator end (void) const; - virtual int size (void) const; + virtual ChildrenIterator begin () const; + virtual ChildrenIterator end () const; + virtual int size () const; /** * Filter this event, returns 1 if the event is accepted, 0 @@ -110,10 +110,10 @@ public: /// Clear any saved state, must reset and assume no events have been /// received. - virtual void clear (void) = 0; + virtual void clear () = 0; /// Returns the maximum size of the events pushed by this filter. - virtual CORBA::ULong max_event_size (void) const = 0; + virtual CORBA::ULong max_event_size () const = 0; /** * Returns 0 if an event with that header could never be accepted. @@ -171,7 +171,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter : public TAO_EC_Filter { public: /// Constructor. - TAO_EC_Null_Filter (void); + TAO_EC_Null_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. @@ -183,8 +183,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index e3ccc9f3e73..931b66be256 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -42,7 +42,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Filter_Builder { public: /// destructor... - virtual ~TAO_EC_Filter_Builder (void); + virtual ~TAO_EC_Filter_Builder (); /// Create the filter, the caller must assume ownership of the filter /// returned. @@ -65,10 +65,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter_Builder : public TAO_EC_Filter_ { public: /// constructor. - TAO_EC_Null_Filter_Builder (void); + TAO_EC_Null_Filter_Builder (); /// destructor... - virtual ~TAO_EC_Null_Filter_Builder (void); + virtual ~TAO_EC_Null_Filter_Builder (); // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index 453db162cb6..6705b4026ca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -44,18 +44,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Gateway { public: /// Default constructor. - TAO_EC_Gateway (void); + TAO_EC_Gateway (); /// Destructor - virtual ~TAO_EC_Gateway (void); + virtual ~TAO_EC_Gateway (); /// The gateway must disconnect from all the relevant event channels, /// or any other communication media (such as multicast groups). - virtual void close (void) = 0; + virtual void close () = 0; /// Obtain and modify the observer handle. void observer_handle (RtecEventChannelAdmin::Observer_Handle h); - RtecEventChannelAdmin::Observer_Handle observer_handle (void) const; + RtecEventChannelAdmin::Observer_Handle observer_handle () const; private: RtecEventChannelAdmin::Observer_Handle handle_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 8e979dfbd67..18e8643be65 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -22,26 +22,26 @@ TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP () consumer_is_active_ (false), supplier_ (this), supplier_is_active_ (false), - ec_control_ (0), - factory_ (0), + ec_control_ (nullptr), + factory_ (nullptr), use_ttl_ (1), use_consumer_proxy_map_ (1) { - if (this->factory_ == 0) + if (this->factory_ == nullptr) { this->factory_ = ACE_Dynamic_Service<TAO_EC_Gateway_IIOP_Factory>::instance ("EC_Gateway_IIOP_Factory"); - if (this->factory_ == 0) + if (this->factory_ == nullptr) { - TAO_EC_Gateway_IIOP_Factory *f = 0; + TAO_EC_Gateway_IIOP_Factory *f = nullptr; ACE_NEW (f, TAO_EC_Gateway_IIOP_Factory); this->factory_ = f; } } - if (this->factory_ != 0) + if (this->factory_ != nullptr) { this->use_ttl_ = this->factory_->use_ttl(); this->use_consumer_proxy_map_ = this->factory_->use_consumer_proxy_map(); @@ -51,7 +51,7 @@ TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP () TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP () { delete ec_control_; - ec_control_ = 0; + ec_control_ = nullptr; } int @@ -74,7 +74,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec this->consumer_ec_ = RtecEventChannelAdmin::EventChannel::_duplicate (consumer_ec); - if (ec_control_ == 0) + if (ec_control_ == nullptr) { ec_control_ = factory_->create_consumerec_control(this); ec_control_->activate(); @@ -262,7 +262,7 @@ TAO_EC_Gateway_IIOP::open_i ( { sub.dependencies[i].rt_info = this->supplier_info_; - RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = 0; + RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = nullptr; const RtecEventComm::EventHeader &h = sub.dependencies[i].event.header; @@ -466,7 +466,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events) continue; } - RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = 0; + RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = nullptr; RtecEventComm::EventSourceID sid = events[i].header.source; if (sid == ACE_ES_EVENT_SOURCE_ANY || this->use_consumer_proxy_map_ == 0 || this->consumer_proxy_map_.find (sid, proxy) == -1) @@ -615,11 +615,11 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent ( TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - disconnected = 0; + disconnected = false; if (this->is_consumer_ec_connected_i () == 0) { - disconnected = 1; - return 0; + disconnected = true; + return false; } consumer_ec = CORBA::Object::_duplicate (this->consumer_ec_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index b6fb48fe2c5..8ea47da59ff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -63,8 +63,8 @@ class TAO_EC_Gateway_IIOP_Factory; class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP : public TAO_EC_Gateway { public: - TAO_EC_Gateway_IIOP (void); - virtual ~TAO_EC_Gateway_IIOP (void); + TAO_EC_Gateway_IIOP (); + virtual ~TAO_EC_Gateway_IIOP (); /** * To do its job this class requires to know the local and remote ECs it will @@ -75,25 +75,25 @@ public: RtecEventChannelAdmin::EventChannel_ptr consumer_ec); /// The channel is disconnecting. - void disconnect_push_supplier (void); + void disconnect_push_supplier (); /// The channel is disconnecting. - void disconnect_push_consumer (void); + void disconnect_push_consumer (); /// This is the consumer side behavior, it pushes the events to the /// local event channel. void push (const RtecEventComm::EventSet &events); /// Disconnect and shutdown the gateway - int shutdown (void); + int shutdown (); // The following methods are documented in the base class. - virtual void close (void); + virtual void close (); virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub); virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub); // Let the gateway reconnect itself to the consumer ec given exisiting QoS - void reconnect_consumer_ec(void); + void reconnect_consumer_ec(); /// Check whether the consumer event channel is non existent or not CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected); @@ -104,33 +104,33 @@ public: * the consumer proxy administration in case we know that the consumers * are all unreachable. */ - void cleanup_consumer_proxies (void); + void cleanup_consumer_proxies (); /// Cleanup the connection to the consumer ec. Doesn't call anything on the /// ec again, just set the object to nil - int cleanup_consumer_ec (void); + int cleanup_consumer_ec (); /// Cleanup the connection to the supplier ec. Doesn't call anything on the /// ec again, just set the object to nil - int cleanup_supplier_ec (void); + int cleanup_supplier_ec (); /// Suspend the connection to the supplier ec - void suspend_supplier_ec (void); + void suspend_supplier_ec (); /// Resume the connection to the supplier ec - void resume_supplier_ec (void); + void resume_supplier_ec (); private: - void close_i (void); + void close_i (); /// Disconnect the supplier proxy - void disconnect_supplier_proxy_i (void); + void disconnect_supplier_proxy_i (); /// Disconnect all consumer proxies - void disconnect_consumer_proxies_i (void); + void disconnect_consumer_proxies_i (); /// Remove all consumer proxies without calling disconnect on them - void cleanup_consumer_proxies_i (void); + void cleanup_consumer_proxies_i (); void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub); @@ -138,15 +138,15 @@ private: void open_i (const RtecEventChannelAdmin::ConsumerQOS& sub); /// Helper method to see if consumer ec is connected - CORBA::Boolean is_consumer_ec_connected_i (void) const; + CORBA::Boolean is_consumer_ec_connected_i () const; /// Push the @a event to the @a consumer. void push_to_consumer (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer, const RtecEventComm::EventSet& event); - void cleanup_consumer_ec_i (void); + void cleanup_consumer_ec_i (); - void cleanup_supplier_ec_i (void); + void cleanup_supplier_ec_i (); protected: /// Do the real work in init() diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index 3a6b062ce0f..f5a486ffc2c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -95,7 +95,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - unsigned long timeout = ACE_OS::strtoul(opt, 0, 10); + unsigned long timeout = ACE_OS::strtoul(opt, nullptr, 10); this->consumer_ec_control_timeout_.usec(timeout); arg_shifter.consume_arg (); } @@ -171,7 +171,7 @@ TAO_EC_Gateway_IIOP_Factory::create_consumerec_control (TAO_EC_Gateway_IIOP* gat else if (this->consumer_ec_control_ == 1) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orbid_.c_str ()); ACE_Time_Value rate (0, this->consumer_ec_control_period_); @@ -180,13 +180,13 @@ TAO_EC_Gateway_IIOP_Factory::create_consumerec_control (TAO_EC_Gateway_IIOP* gat else if (this->consumer_ec_control_ == 2) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orbid_.c_str ()); ACE_Time_Value rate (0, this->consumer_ec_control_period_); return new TAO_ECG_Reconnect_ConsumerEC_Control (rate, consumer_ec_control_timeout_, gateway, orb.in ()); } - return 0; + return nullptr; } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h index 50fc874fab1..dffea90381d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h @@ -40,18 +40,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP_Factory : public ACE_Service_Object { public: - TAO_EC_Gateway_IIOP_Factory (void); - virtual ~TAO_EC_Gateway_IIOP_Factory (void); + TAO_EC_Gateway_IIOP_Factory (); + virtual ~TAO_EC_Gateway_IIOP_Factory (); /// The Service_Object entry points. //@{ virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); //@} /// Helper function to register the Gateway into the service /// configurator. - static int init_svcs (void); + static int init_svcs (); /// Create the consumer event channel control. TAO_ECG_ConsumerEC_Control * @@ -61,10 +61,10 @@ public: void destroy_consumerec_control (TAO_ECG_ConsumerEC_Control* x); /// Accessors to use_ttl flag - int use_ttl (void) const; + int use_ttl () const; /// Accessors to use_consumer_proxy_map flag - int use_consumer_proxy_map (void) const; + int use_consumer_proxy_map () const; private: /// Helper for agrument parsing. Prints out an error message about diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h index 6017143de4e..e60007ddae6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h @@ -29,7 +29,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Group_Scheduling : public TAO_EC_Scheduling { public: /// Constructor. - TAO_EC_Group_Scheduling (void); + TAO_EC_Group_Scheduling (); // Read EC_Scheduling_Strategy.h for more details virtual void add_proxy_supplier_dependencies ( diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl index 8fbfc0adcf3..49a7fabbf41 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl @@ -1,5 +1,5 @@ ACE_INLINE -TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling (void) +TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index d60e247ffd4..df321abb0ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) :allocator_ (0), - dispatcher_ (0), + dispatcher_ (nullptr), lanes_setup_ (0), disp_sched_policy_ (sched_policy), disp_sched_scope_ (sched_scope) @@ -89,7 +89,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes () // Create Kokyu::Dispatcher using factory Kokyu::Dispatcher_Auto_Ptr tmp(Kokyu::Dispatcher_Factory::create_dispatcher(attrs)); - this->dispatcher_ = tmp; + this->dispatcher_ = std::move(tmp); this->lanes_setup_ = 1; //ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu dispatcher setup\n")); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index 6fbfb3f0eaf..f95099e6ab0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -41,7 +41,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Object_Deactivator public: /// Default constructor. Deactivation info can be supplied later /// through set_values (). - TAO_EC_Object_Deactivator (void); + TAO_EC_Object_Deactivator (); /// Constructor. Set @a id which will be deactivated from @ poa in /// the deactivator's destructor, unless deactivate () or @@ -52,7 +52,7 @@ public: /// Destructor. Deactivates id_ from poa_ if those values have /// been set, and neither deactivate() nor disallow_deactivation() /// have been invoked. - ~TAO_EC_Object_Deactivator (void); + ~TAO_EC_Object_Deactivator (); /// Set <id> which will be deactivated from <poa> in /// the deactivator's destructor, unless deactivate () or @@ -65,20 +65,20 @@ public: /// Explicitly enable deactivation to happen in destructor or when /// deactivate() is called. - void allow_deactivation (void); + void allow_deactivation (); /// Explicitly disable deactivation from happening in destructor or /// when deactivate() is called. - void disallow_deactivation (void); + void disallow_deactivation (); /// Perform deactivation now if <poa_> and <id_> values have been set, and /// deactivation hasn't happened yet nor has it been explicitly /// disallowed. CORBA exceptions occurring during deactivation are /// not propagated. Deactivation will NOT happen in the destructor. - void deactivate (void); + void deactivate (); /// Accessor for the POA used in deactivation. - PortableServer::POA_var poa (void) const; + PortableServer::POA_var poa () const; private: @@ -126,8 +126,8 @@ public: protected: - TAO_EC_Deactivated_Object (void); - ~TAO_EC_Deactivated_Object (void); + TAO_EC_Deactivated_Object (); + ~TAO_EC_Deactivated_Object (); /// Utility for deactivating ourselves from POA. TAO_EC_Object_Deactivator deactivator_; @@ -147,10 +147,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_ORB_Holder { public: /// Constructor. No-op. - TAO_EC_ORB_Holder (void); + TAO_EC_ORB_Holder (); /// Destructor. If holding an ORB, destroy it. - ~TAO_EC_ORB_Holder (void); + ~TAO_EC_ORB_Holder (); /// Set the ORB to be destroyed in destructor to <orb_var>. If /// TAO_EC_ORB_Holder already held an orb prior to invocation of @@ -183,10 +183,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Holder { public: /// Constructor. No-op. - TAO_EC_Event_Channel_Holder (void); + TAO_EC_Event_Channel_Holder (); /// Destructor. If holding an Event Channel, destroy it. - ~TAO_EC_Event_Channel_Holder (void); + ~TAO_EC_Event_Channel_Holder (); /// Set the Event Channel to be destroyed in destructor to @a ec_var. If /// TAO_EC_Event_Channel_Holder already held an Event Channel prior diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 341e42b298b..84f18bece00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -53,14 +53,14 @@ template <class T> class TAO_EC_Auto_Command { public: - TAO_EC_Auto_Command (void); + TAO_EC_Auto_Command (); TAO_EC_Auto_Command (const T & command); - ~TAO_EC_Auto_Command (void); + ~TAO_EC_Auto_Command (); void set_command (const T & command); void set_command (TAO_EC_Auto_Command<T> & auto_command); - void execute (void); - void allow_command (void); - void disallow_command (void); + void execute (); + void allow_command (); + void disallow_command (); private: @@ -78,9 +78,9 @@ template <class T> class TAO_EC_Shutdown_Command { public: - TAO_EC_Shutdown_Command (void); + TAO_EC_Shutdown_Command (); TAO_EC_Shutdown_Command (T target); - void execute (void); + void execute (); private: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index e112189d97c..0aabbbc08bc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -15,7 +15,7 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, thread_creation_flags_ (thread_creation_flags), thread_priority_ (thread_priority), force_activate_ (force_activate), - task_(0, service_object), + task_(nullptr, service_object), active_ (0) { this->task_.open (&this->thread_manager_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index 2492c94b2ad..8852968ebe1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -46,8 +46,8 @@ public: TAO_EC_Queue_Full_Service_Object* queue_full_service_object_name); // = The EC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 8b0c0053fd4..249dbb9e7ee 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -23,13 +23,13 @@ TAO_EC_Masked_Type_Filter::~TAO_EC_Masked_Type_Filter () TAO_EC_Filter::ChildrenIterator TAO_EC_Masked_Type_Filter::begin () const { - return 0; + return nullptr; } TAO_EC_Filter::ChildrenIterator TAO_EC_Masked_Type_Filter::end () const { - return 0; + return nullptr; } int @@ -49,7 +49,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) != this->source_value_) return 0; - if (this->parent () != 0) + if (this->parent () != nullptr) { this->parent ()->push (event, qos_info); } @@ -67,7 +67,7 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) != this->source_value_) return 0; - if (this->parent () != 0) + if (this->parent () != nullptr) { this->parent ()->push_nocopy (event, qos_info); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h index 3fa8dd6f094..c405c7589fb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -45,13 +45,13 @@ public: CORBA::ULong type_value); /// Destructor - virtual ~TAO_EC_Masked_Type_Filter (void); + virtual ~TAO_EC_Masked_Type_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. - virtual ChildrenIterator begin (void) const; - virtual ChildrenIterator end (void) const; - virtual int size (void) const; + virtual ChildrenIterator begin () const; + virtual ChildrenIterator end () const; + virtual int size () const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); virtual int filter_nocopy (RtecEventComm::EventSet& event, @@ -60,8 +60,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index 6e93808d5e5..a64fc8b06f1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -39,7 +39,7 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, { int n = this->child_->filter (event, qos_info); - if (this->parent () != 0 && n == 0) + if (this->parent () != nullptr && n == 0) { this->parent ()->push (event, qos_info); return 1; @@ -53,7 +53,7 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, { int n = this->child_->filter_nocopy (event, qos_info); - if (this->parent () != 0 && n == 0) + if (this->parent () != nullptr && n == 0) { this->parent ()->push_nocopy (event, qos_info); return 1; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h index 6097f931038..69128a25af5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -42,14 +42,14 @@ public: TAO_EC_Negation_Filter (TAO_EC_Filter* child); /// Destructor - virtual ~TAO_EC_Negation_Filter (void); + virtual ~TAO_EC_Negation_Filter (); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. - virtual ChildrenIterator begin (void) const; - virtual ChildrenIterator end (void) const; - virtual int size (void) const; + virtual ChildrenIterator begin () const; + virtual ChildrenIterator end () const; + virtual int size () const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); virtual int filter_nocopy (RtecEventComm::EventSet& event, @@ -58,8 +58,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 3ec46436444..8bc8ff7eab4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -117,7 +117,7 @@ TAO_EC_Timeout_Generator* TAO_EC_Null_Factory::create_timeout_generator (TAO_EC_Event_Channel_Base *) { int argc = 0; - ACE_TCHAR **argv = 0; + ACE_TCHAR **argv = nullptr; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); ACE_Reactor *reactor = orb->orb_core ()->reactor (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h index e6cdf972db1..5334fda7bca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h @@ -38,10 +38,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Factory : public TAO_EC_Factory { public: /// Constructor - TAO_EC_Null_Factory (void); + TAO_EC_Null_Factory (); /// destructor... - virtual ~TAO_EC_Null_Factory (void); + virtual ~TAO_EC_Null_Factory (); // = The EC_Factory methods virtual TAO_EC_Dispatching* @@ -93,9 +93,9 @@ public: virtual void destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*); - virtual ACE_Lock* create_consumer_lock (void); + virtual ACE_Lock* create_consumer_lock (); virtual void destroy_consumer_lock (ACE_Lock*); - virtual ACE_Lock* create_supplier_lock (void); + virtual ACE_Lock* create_supplier_lock (); virtual void destroy_supplier_lock (ACE_Lock*); virtual TAO_EC_ConsumerControl* diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index 05438b6adf4..141c3bd9b3b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -25,7 +25,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, const RtecEventComm::Event& e = event[j]; RtecEventComm::Event* buffer = const_cast<RtecEventComm::Event*> (&e); - RtecEventComm::EventSet single_event (1, 1, buffer, 0); + RtecEventComm::EventSet single_event (1, 1, buffer, false); TAO_EC_QOS_Info event_info; filter->push_scheduled_event (single_event, event_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h index 14892c28f7c..fc9da282605 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h @@ -32,7 +32,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Scheduling { public: /// Constructor. - TAO_EC_Null_Scheduling (void); + TAO_EC_Null_Scheduling (); // Read EC_Scheduling_Strategy.h for more details virtual void add_proxy_supplier_dependencies ( diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl index f1c2a48bd5c..63386ce9ca8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl @@ -1,5 +1,5 @@ ACE_INLINE -TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling (void) +TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 33e4df630d4..8b11a9dd746 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -11,8 +11,6 @@ #include "orbsvcs/Event/EC_ObserverStrategy.inl" #endif /* __ACE_INLINE__ */ - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy () @@ -60,7 +58,7 @@ TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*) TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy () { delete this->lock_; - this->lock_ = 0; + this->lock_ = nullptr; } RtecEventChannelAdmin::Observer_Handle @@ -111,7 +109,7 @@ TAO_EC_Basic_ObserverStrategy::create_observer_list ( RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR()); int size = static_cast<int> (this->observers_.current_size ()); - RtecEventChannelAdmin::Observer_var *tmp = 0; + RtecEventChannelAdmin::Observer_var *tmp = nullptr; ACE_NEW_RETURN (tmp, RtecEventChannelAdmin::Observer_var[size], 0); @@ -156,7 +154,7 @@ TAO_EC_Basic_ObserverStrategy::supplier_qos_update ( RtecEventChannelAdmin::SupplierQOS s_qos; this->fill_qos (s_qos); - RtecEventChannelAdmin::Observer_var *tmp = 0; + RtecEventChannelAdmin::Observer_var *tmp = nullptr; int size = this->create_observer_list (tmp); ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp); @@ -198,7 +196,7 @@ TAO_EC_Basic_ObserverStrategy::consumer_qos_update ( RtecEventChannelAdmin::ConsumerQOS c_qos; this->fill_qos (c_qos); - RtecEventChannelAdmin::Observer_var *tmp = 0; + RtecEventChannelAdmin::Observer_var *tmp = nullptr; int size = this->create_observer_list (tmp); ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 15f3781eaf5..21b01e17fe0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -58,7 +58,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_ObserverStrategy { public: /// Destructor - virtual ~TAO_EC_ObserverStrategy (void); + virtual ~TAO_EC_ObserverStrategy (); /// The basic methods to support the EC strategies. virtual RtecEventChannelAdmin::Observer_Handle @@ -91,7 +91,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_ObserverStrategy : public TAO_EC_Obser { public: /// Constructor - TAO_EC_Null_ObserverStrategy (void); + TAO_EC_Null_ObserverStrategy (); // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle @@ -130,7 +130,7 @@ public: ACE_Lock* lock); /// Destructor - virtual ~TAO_EC_Basic_ObserverStrategy (void); + virtual ~TAO_EC_Basic_ObserverStrategy (); // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle @@ -156,7 +156,7 @@ public: */ struct Observer_Entry { - Observer_Entry (void); + Observer_Entry (); Observer_Entry (RtecEventChannelAdmin::Observer_Handle h, RtecEventChannelAdmin::Observer_ptr o); @@ -241,7 +241,7 @@ public: ACE_Lock* lock); /// Destructor - virtual ~TAO_EC_Reactive_ObserverStrategy (void); + virtual ~TAO_EC_Reactive_ObserverStrategy (); protected: /// Helpers. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index aeecbe8e85c..74b29ea94cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Per_Supplier_Filter:: TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec) : event_channel_ (ec), - consumer_ (0), + consumer_ (nullptr), refcnt_ (1) { this->event_channel_->create_proxy_collection (this->collection_); @@ -29,7 +29,7 @@ TAO_EC_Per_Supplier_Filter:: TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter () { this->event_channel_->destroy_proxy_collection (this->collection_); - this->collection_ = 0; + this->collection_ = nullptr; } void @@ -37,7 +37,7 @@ TAO_EC_Per_Supplier_Filter::bind (TAO_EC_ProxyPushConsumer* consumer) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - if (this->consumer_ == 0) + if (this->consumer_ == nullptr) { this->consumer_ = consumer; } @@ -48,10 +48,10 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - if (this->consumer_ == 0 || this->consumer_ != consumer) + if (this->consumer_ == nullptr || this->consumer_ != consumer) return; - this->consumer_ = 0; + this->consumer_ = nullptr; try { @@ -68,7 +68,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - if (this->consumer_ != 0) + if (this->consumer_ != nullptr) { const RtecEventChannelAdmin::SupplierQOS& pub = this->consumer_->publications_i (); @@ -104,7 +104,7 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - if (this->consumer_ != 0) + if (this->consumer_ != nullptr) { const RtecEventChannelAdmin::SupplierQOS& pub = this->consumer_->publications_i (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index c2a5c559043..079c334476b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -46,7 +46,7 @@ public: TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec); /// Destructor - virtual ~TAO_EC_Per_Supplier_Filter (void); + virtual ~TAO_EC_Per_Supplier_Filter (); // = The TAO_EC_Supplier_Filter methods. virtual void bind (TAO_EC_ProxyPushConsumer* consumer); @@ -54,13 +54,13 @@ public: virtual void connected (TAO_EC_ProxyPushSupplier* supplier); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier); - virtual void shutdown (void); + virtual void shutdown (); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info); - virtual CORBA::ULong _decr_refcnt (void); - virtual CORBA::ULong _incr_refcnt (void); + virtual CORBA::ULong _decr_refcnt (); + virtual CORBA::ULong _incr_refcnt (); private: /// The event channel, used to locate the set of consumers. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 90af063fa1b..9aa1306d3b4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -38,7 +38,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( { CORBA::ULong l = qos.dependencies.length (); if (pos == l) - return 0; + return nullptr; const RtecEventComm::Event& e = qos.dependencies[pos].event; if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR) @@ -47,7 +47,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( CORBA::ULong n = e.header.source; TAO_EC_Filter** children; - ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); + ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr); CORBA::ULong i = 0; for (; i != n; ++i) { @@ -61,7 +61,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( CORBA::ULong n = e.header.source; TAO_EC_Filter** children; - ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); + ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr); CORBA::ULong i = 0; for (; i != n; ++i) { @@ -76,7 +76,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( CORBA::ULong n = e.header.source; TAO_EC_Filter** children; - ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); + ACE_NEW_RETURN (children, TAO_EC_Filter*[n], nullptr); CORBA::ULong i = 0; for (; i != n; ++i) { @@ -98,7 +98,7 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( pos++; // COnsumer the designator if (pos == qos.dependencies.length ()) - return 0; + return nullptr; CORBA::ULong source_mask = qos.dependencies[pos].event.header.source; CORBA::ULong type_mask = qos.dependencies[pos].event.header.type; pos++; @@ -114,13 +114,13 @@ TAO_EC_Prefix_Filter_Builder:: recursive_build ( pos++; // Consume the designator if (pos == qos.dependencies.length ()) - return 0; + return nullptr; CORBA::ULong source_mask = qos.dependencies[pos].event.header.source; CORBA::ULong type_mask = qos.dependencies[pos].event.header.type; pos++; if (pos == qos.dependencies.length ()) - return 0; + return nullptr; CORBA::ULong source_value = qos.dependencies[pos].event.header.source; CORBA::ULong type_value = qos.dependencies[pos].event.header.type; pos++; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h index 2f83bed94b7..453af2aace7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -42,7 +42,7 @@ public: TAO_EC_Prefix_Filter_Builder (TAO_EC_Event_Channel_Base* ec); /// destructor... - virtual ~TAO_EC_Prefix_Filter_Builder (void); + virtual ~TAO_EC_Prefix_Filter_Builder (); // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 51ffb0ffd78..59698a88284 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -18,7 +18,7 @@ TAO_EC_ProxyPushConsumer:: : event_channel_ (ec), ec_refcount_ (1), connected_ (false), - filter_ (0) + filter_ (nullptr) { this->lock_ = this->event_channel_->create_consumer_lock (); @@ -46,7 +46,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); - disconnected = 0; + disconnected = false; if (!this->is_connected_i ()) { disconnected = true; @@ -140,7 +140,7 @@ TAO_EC_ProxyPushConsumer::shutdown () this->shutdown_hook (); - if (this->filter_ != 0) + if (this->filter_ != nullptr) { this->filter_->shutdown (); @@ -171,11 +171,11 @@ TAO_EC_ProxyPushConsumer::cleanup_i () RtecEventComm::PushSupplier::_nil (); this->connected_ = false; - if (this->filter_ != 0) + if (this->filter_ != nullptr) { this->filter_->unbind (this); this->filter_->_decr_refcnt (); - this->filter_ = 0; + this->filter_ = nullptr; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 4e02c41c415..01fb9781875 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -62,27 +62,27 @@ public: TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel); /// destructor... - virtual ~TAO_EC_ProxyPushConsumer (void); + virtual ~TAO_EC_ProxyPushConsumer (); /// Activate in the POA virtual void activate ( RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) = 0; /// Deactivate from the POA - virtual void deactivate (void); + virtual void deactivate (); /// Disconnect this from virtual void disconnect_push_consumer () = 0; /// Return false if no supplier is connected... - CORBA::Boolean is_connected (void) const; + CORBA::Boolean is_connected () const; /// Return the consumer object reference. It returns nil() if it has /// not connected yet. - RtecEventComm::PushSupplier_ptr supplier (void) const; + RtecEventComm::PushSupplier_ptr supplier () const; /// The QoS (subscription) used to connect to the EC. - const RtecEventChannelAdmin::SupplierQOS& publications (void) const; + const RtecEventChannelAdmin::SupplierQOS& publications () const; /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -104,15 +104,15 @@ public: virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer); /// The event channel is shutting down - virtual void shutdown (void); + virtual void shutdown (); /// The QoS (subscription) used to connect to the EC, assumes the /// locks are held, use with care! - const RtecEventChannelAdmin::SupplierQOS& publications_i (void) const; + const RtecEventChannelAdmin::SupplierQOS& publications_i () const; /// Increment and decrement the reference count. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); protected: @@ -125,13 +125,13 @@ protected: // The guard needs access to the following protected methods. /// The private version (without locking) of is_connected(). - CORBA::Boolean is_connected_i (void) const; + CORBA::Boolean is_connected_i () const; /// Return the current filter, assumes the locks are held. - TAO_EC_Supplier_Filter *filter_i (void) const; + TAO_EC_Supplier_Filter *filter_i () const; /// Release the filter and the supplier - void cleanup_i (void); + void cleanup_i (); /// The supplier admin, used for activation and memory management. TAO_EC_Event_Channel_Base* event_channel_; @@ -160,10 +160,10 @@ protected: private: /// Template method hooks. - virtual void shutdown_hook (void); - virtual void refcount_zero_hook (void); + virtual void shutdown_hook (); + virtual void refcount_zero_hook (); - virtual PortableServer::ObjectId object_id (void) = 0; + virtual PortableServer::ObjectId object_id () = 0; }; // **************************************************************** @@ -188,10 +188,10 @@ public: TAO_EC_ProxyPushConsumer *proxy); /// Destructor - ~TAO_EC_ProxyPushConsumer_Guard (void); + ~TAO_EC_ProxyPushConsumer_Guard (); /// Returns true if the reference count successfully acquired - bool locked (void) const; + bool locked () const; TAO_EC_Supplier_Filter *filter; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 5521a7b996e..68c2c3cb5d8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -23,7 +23,7 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* e : event_channel_ (ec), refcount_ (1), suspended_ (false), - child_ (0), + child_ (nullptr), consumer_validate_connection_(validate_connection) { this->lock_ = @@ -124,7 +124,7 @@ TAO_EC_ProxyPushSupplier::cleanup_i () // @@ Why don't we have a destroy() method in the // filter_builder? delete this->child_; - this->child_ = 0; + this->child_ = nullptr; } void @@ -259,7 +259,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, qos_info); } - if (this->child_ != 0) + if (this->child_ != nullptr) this->child_->clear (); } @@ -308,7 +308,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, qos_info); } - if (this->child_ != 0) + if (this->child_ != nullptr) this->child_->clear (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 68b378bcb3e..65e699545b2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -62,32 +62,32 @@ public: TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection); /// Destructor... - virtual ~TAO_EC_ProxyPushSupplier (void); + virtual ~TAO_EC_ProxyPushSupplier (); /// Activate in the POA virtual void activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) = 0; /// Deactivate from the POA - virtual void deactivate (void) throw (); + virtual void deactivate () throw (); /// Disconnect this from virtual void disconnect_push_supplier () = 0; /// Return false if no consumer is connected... - CORBA::Boolean is_connected (void) const; + CORBA::Boolean is_connected () const; /// Return true if it is suspended. - CORBA::Boolean is_suspended (void) const; + CORBA::Boolean is_suspended () const; /** * Return the consumer object reference. It returns nil() if it has * not connected yet. */ - RtecEventComm::PushConsumer_ptr consumer (void) const; + RtecEventComm::PushConsumer_ptr consumer () const; /// The QoS (subscription) used to connect to the EC. - const RtecEventChannelAdmin::ConsumerQOS& subscriptions (void) const; + const RtecEventChannelAdmin::ConsumerQOS& subscriptions () const; /// Concrete implementations can use this methods to keep track of /// the suppliers that publish its events. @@ -102,7 +102,7 @@ public: virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier); /// The event channel is shutting down - virtual void shutdown (void); + virtual void shutdown (); /// Pushes to the consumer, verifies that it is connected and that it /// is not suspended. @@ -124,8 +124,8 @@ public: CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected); /// Increment and decrement the reference count. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcnt (); + CORBA::ULong _decr_refcnt (); // = The TAO_EC_Filter methods, only push() is implemented... virtual int filter (const RtecEventComm::EventSet &event, @@ -136,8 +136,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader &header) const; virtual int add_dependencies (const RtecEventComm::EventHeader &header, const TAO_EC_QOS_Info &qos_info); @@ -148,16 +148,16 @@ protected: void consumer (RtecEventComm::PushConsumer_ptr consumer); void consumer_i (RtecEventComm::PushConsumer_ptr consumer); - void suspend_connection_i (void); - void resume_connection_i (void); - void suspend_connection_locked (void); - void resume_connection_locked (void); + void suspend_connection_i (); + void resume_connection_i (); + void suspend_connection_locked (); + void resume_connection_locked (); /// The private version (without locking) of is_connected(). - CORBA::Boolean is_connected_i (void) const; + CORBA::Boolean is_connected_i () const; /// Release the child and the consumer - void cleanup_i (void); + void cleanup_i (); /// The Event Channel that owns this object. TAO_EC_Event_Channel_Base* event_channel_; @@ -188,9 +188,9 @@ protected: private: /// Template method hooks. - virtual void refcount_zero_hook (void); + virtual void refcount_zero_hook (); virtual void pre_dispatch_hook (RtecEventComm::EventSet&); - virtual PortableServer::ObjectId object_id (void) = 0; + virtual PortableServer::ObjectId object_id () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 701f280f40e..97e7fef5c6d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -40,7 +40,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_QOS_Info { public: /// Constructor - TAO_EC_QOS_Info (void); + TAO_EC_QOS_Info (); /// Copy constructor, it does the obvious thing, but if it is not /// here the HP/aCC compiler breaks. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 165818a0cc0..585b4a0e10e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -117,7 +117,7 @@ TAO_EC_Reactive_ConsumerControl::activate () // handle_timeout uses these policies, if done in front, the channel // can crash when the timeout expires before initiazation is ready. timer_id_ = this->reactor_->schedule_timer (&this->adapter_, - 0, + nullptr, this->rate_, this->rate_); if (timer_id_ == -1) @@ -141,7 +141,7 @@ TAO_EC_Reactive_ConsumerControl::shutdown () #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 r = this->reactor_->cancel_timer (timer_id_); #endif /* TAO_HAS_CORBA_MESSAGING */ - this->adapter_.reactor (0); + this->adapter_.reactor (nullptr); return r; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index 5218d068061..3d4f9b0645a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -77,15 +77,15 @@ public: CORBA::ORB_ptr orb); /// Destructor. - virtual ~TAO_EC_Reactive_ConsumerControl (void); + virtual ~TAO_EC_Reactive_ConsumerControl (); /// Receive the timeout from the adapter void handle_timeout (const ACE_Time_Value &tv, const void* arg); // = Documented in TAO_EC_ConsumerControl - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy); virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException &); @@ -93,7 +93,7 @@ public: private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (void); + void query_consumers (); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h index 2ede72e6740..ce9c76ad799 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h @@ -39,11 +39,11 @@ class TAO_RTEvent_Serv_Export TAO_EC_Reactive_Dispatching : public TAO_EC_Dispat public: /// The scheduler is used to find the range of priorities and similar /// info. - TAO_EC_Reactive_Dispatching (void); + TAO_EC_Reactive_Dispatching (); // = The EC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 0e05a2902ad..b76dc2aa4e7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -110,7 +110,7 @@ TAO_EC_Reactive_SupplierControl::activate () // handle_timeout uses these policies, if done in front, the channel // can crash when the timeout expires before initiazation is ready. timer_id_ = this->reactor_->schedule_timer (&this->adapter_, - 0, + nullptr, this->rate_, this->rate_); if (timer_id_ == -1) @@ -134,7 +134,7 @@ TAO_EC_Reactive_SupplierControl::shutdown () #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 r = this->reactor_->cancel_timer (timer_id_); #endif /* TAO_HAS_CORBA_MESSAGING */ - this->adapter_.reactor (0); + this->adapter_.reactor (nullptr); return r; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index 949cd581af7..64ae0a9f4e7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -87,15 +87,15 @@ public: CORBA::ORB_ptr orb); /// Destructor. - virtual ~TAO_EC_Reactive_SupplierControl (void); + virtual ~TAO_EC_Reactive_SupplierControl (); /// Receive the timeout from the adapter void handle_timeout (const ACE_Time_Value &tv, const void* arg); // = Documented in TAO_EC_SupplierControl - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy); virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy, CORBA::SystemException &); @@ -103,7 +103,7 @@ public: private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (void); + void query_suppliers (); private: /// The polling rate diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index 9fcc4d159ba..ae33ca08734 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -22,7 +22,7 @@ void TAO_EC_Reactive_Timeout_Generator::shutdown () { this->reactor_->cancel_timer (&this->event_handler_); - this->event_handler_.reactor (0); + this->event_handler_.reactor (nullptr); } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h index 4e7a0a6b7d4..1076a3e41d3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h @@ -42,11 +42,11 @@ public: TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor = 0); /// destructor - virtual ~TAO_EC_Reactive_Timeout_Generator (void); + virtual ~TAO_EC_Reactive_Timeout_Generator (); // = The TAO_EC_Timeout_Generator methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual int schedule_timer (TAO_EC_Timeout_Filter* filter, const ACE_Time_Value& delta, const ACE_Time_Value& interval); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index ecb4532fc30..6216f869b2c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -47,7 +47,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Scheduling_Strategy { public: /// Destructor - virtual ~TAO_EC_Scheduling_Strategy (void); + virtual ~TAO_EC_Scheduling_Strategy (); /// Add all the dependencies between @a supplier and @a consumer virtual void add_proxy_supplier_dependencies ( diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index a6aae47eb68..d388cb29734 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -48,14 +48,14 @@ public: TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base* event_channel); /// destructor... - virtual ~TAO_EC_SupplierAdmin (void); + virtual ~TAO_EC_SupplierAdmin (); // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void); + obtain_push_consumer (); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h index 68a36a5ea74..99d3805f1df 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h @@ -47,15 +47,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_SupplierControl { public: /// Constructor. - TAO_EC_SupplierControl (void); + TAO_EC_SupplierControl (); /// Destructor. - virtual ~TAO_EC_SupplierControl (void); + virtual ~TAO_EC_SupplierControl (); /// Activate any internal threads or timers used to poll the state of /// the suppliers - virtual int activate (void); - virtual int shutdown (void); + virtual int activate (); + virtual int shutdown (); /** * Invoked by helper classes when they detect that a supplier does diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 50872b9d5aa..e5f8204bbc0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -67,7 +67,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter { public: /// Destructor - virtual ~TAO_EC_Supplier_Filter (void); + virtual ~TAO_EC_Supplier_Filter (); /** * Whenever a ProxyPushConsumer is initialized it calls this method @@ -96,7 +96,7 @@ public: virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier) = 0; /// The event channel is shutting down. - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; /// The ProxyPushConsumer delegates on this class to actually send /// the event. @@ -110,8 +110,8 @@ public: /// Increment and decrement the reference count, locking must be /// provided by the user. - virtual CORBA::ULong _incr_refcnt (void) = 0; - virtual CORBA::ULong _decr_refcnt (void) = 0; + virtual CORBA::ULong _incr_refcnt () = 0; + virtual CORBA::ULong _decr_refcnt () = 0; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h index b23635b80af..0a363d62a02 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h @@ -41,7 +41,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter_Builder { public: /// Destructor... - virtual ~TAO_EC_Supplier_Filter_Builder (void); + virtual ~TAO_EC_Supplier_Filter_Builder (); /** * Create the filter. The consumer is bound to the returned diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index 6d0ab6519a2..bd3ad9b9094 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -22,7 +22,7 @@ TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (int , , consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE) , queue_full_service_object_(so) { - ACE_ASSERT (this->queue_full_service_object_ != 0); + ACE_ASSERT (this->queue_full_service_object_ != nullptr); } TAO_EC_TPC_Dispatching::~TAO_EC_TPC_Dispatching () @@ -68,13 +68,13 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer) int bindresult = this->consumer_task_map_.bind (RtecEventComm::PushConsumer::_duplicate(pc.in()), dtask); - const char* explanation = 0; + const char* explanation = nullptr; if (bindresult == -1) explanation = "general failure"; else if (bindresult == 1) explanation = "entry already exists"; - if (explanation != 0) + if (explanation != nullptr) { ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::add_consumer failed to bind consumer (%@)" @@ -94,7 +94,7 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); - TAO_EC_Dispatching_Task* dtask = 0; + TAO_EC_Dispatching_Task* dtask = nullptr; if (this->consumer_task_map_.find (consumer, dtask) == -1) { @@ -133,7 +133,7 @@ TAO_EC_TPC_Dispatching::shutdown () MAPTYPE::ITERATOR iter = this->consumer_task_map_.begin (); while (! iter.done()) { - MAPTYPE::ENTRY* entry = 0; + MAPTYPE::ENTRY* entry = nullptr; if (! iter.next(entry)) continue; @@ -148,7 +148,7 @@ TAO_EC_TPC_Dispatching::shutdown () iter = this->consumer_task_map_.begin (); while (! iter.done()) { - MAPTYPE::ENTRY* entry = 0; + MAPTYPE::ENTRY* entry = nullptr; if (! iter.next(entry)) continue; @@ -179,7 +179,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer)); ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - TAO_EC_Dispatching_Task* dtask = 0; + TAO_EC_Dispatching_Task* dtask = nullptr; if (this->consumer_task_map_.find (consumer, dtask) == -1) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h index d5af34899bf..6715b883f17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h @@ -44,8 +44,8 @@ public: ~TAO_EC_TPC_Dispatching (); // = The EC_Dispatching methods. - virtual void activate (void); - virtual void shutdown (void); + virtual void activate (); + virtual void shutdown (); virtual void push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h index 2e5fbed19b0..e7e189cf5cd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h @@ -30,14 +30,14 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_Factory : public TAO_EC_Default_Factory { public: /// Constructor - TAO_EC_TPC_Factory (void); + TAO_EC_TPC_Factory (); /// destructor... - virtual ~TAO_EC_TPC_Factory (void); + virtual ~TAO_EC_TPC_Factory (); /// Helper function to register the default factory into the service /// configurator. - static int init_svcs (void); + static int init_svcs (); // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h index 8b617a74f95..a6077c76874 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h @@ -29,9 +29,9 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_ProxyPushConsumer : { public: TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec); - virtual ~TAO_EC_TPC_ProxyPushConsumer (void); + virtual ~TAO_EC_TPC_ProxyPushConsumer (); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: typedef TAO_EC_Default_ProxyPushConsumer BASECLASS; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h index 5fd466c2f11..c2183f1b1b4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h @@ -28,7 +28,7 @@ public: TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection); /// Dtor - virtual ~TAO_EC_TPC_ProxyPushSupplier (void); + virtual ~TAO_EC_TPC_ProxyPushSupplier (); /*! These are overridden from the base class in order to maintain the map in the dispatcher class. */ @@ -38,7 +38,7 @@ public: RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos); - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: typedef TAO_EC_Default_ProxyPushSupplier BASECLASS; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp index 77617b17086..a08142d98ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp @@ -53,18 +53,18 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) flags_ = scope_ = sched_ = 0; // zero out everything // short-circuit on the trivial case - if (syms == 0 || *syms == '\0') + if (syms == nullptr || *syms == '\0') return; static size_t num_flags = sizeof(supported_flags_)/sizeof(Supported_Flag); char* s = ACE_OS::strdup (syms); // need a mutable string - if (s == 0) + if (s == nullptr) return; const char* SEPARATORS = " |"; // this should probably be at class level - char* ptr = 0; + char* ptr = nullptr; char* tok = ACE_OS::strtok_r (s, SEPARATORS, &ptr); - while (tok != 0) + while (tok != nullptr) { // This would allow for easy accomodation of flags that // aren't currently supported, but is it a good idea? @@ -76,7 +76,7 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) // If somebody specifies the scheduler this way, then they // lose range checking on the priority. Bummer, but those // are the breaks. - this->flags_ |= ACE_OS::strtol (tok, 0, 0); + this->flags_ |= ACE_OS::strtol (tok, nullptr, 0); } else { @@ -114,7 +114,7 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) tok)); } } - tok = ACE_OS::strtok_r (0, SEPARATORS, &ptr); + tok = ACE_OS::strtok_r (nullptr, SEPARATORS, &ptr); } ACE_OS::free (s); // clean up after ourselves diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index 15cca030176..cd4e008260d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -67,7 +67,7 @@ TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event, { qos_info.timer_id_ = this->id_; - if (this->supplier_ != 0) + if (this->supplier_ != nullptr) this->supplier_->filter (event, qos_info); } @@ -77,7 +77,7 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info) { if (qos_info.timer_id_ == this->id_ - && this->parent () != 0) + && this->parent () != nullptr) { this->parent ()->push (event, qos_info); return 1; @@ -90,7 +90,7 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info) { if (qos_info.timer_id_ == this->id_ - && this->parent () != 0) + && this->parent () != nullptr) { this->parent ()->push_nocopy (event, qos_info); return 1; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h index 333266db7d4..917b2ef4b83 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -48,13 +48,13 @@ public: RtecEventComm::Time period); /// Destructor. - virtual ~TAO_EC_Timeout_Filter (void); + virtual ~TAO_EC_Timeout_Filter (); /// Return the QOS_Info for this Timeout filter. - const TAO_EC_QOS_Info& qos_info (void) const; + const TAO_EC_QOS_Info& qos_info () const; /// The type of timeout event that we generate. - RtecEventComm::EventType type (void) const; + RtecEventComm::EventType type () const; /// Callback from the Timeout_Generator void push_to_proxy (const RtecEventComm::EventSet& event, @@ -70,8 +70,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index e315214c6d1..fd2f50c1dc3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -26,7 +26,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, TAO_EC_Timeout_Filter *filter = static_cast<TAO_EC_Timeout_Filter*> (const_cast<void*> (vp)); - if (filter == 0) + if (filter == nullptr) return 0; try @@ -35,7 +35,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, e.header.type = filter->type (); e.header.source = 0; - RtecEventComm::EventSet single_event (1, 1, &e, 0); + RtecEventComm::EventSet single_event (1, 1, &e, false); TAO_EC_QOS_Info qos_info = filter->qos_info (); filter->push_to_proxy (single_event, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h index 32f0a576ed5..3ef4d586c2c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h @@ -46,14 +46,14 @@ class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Generator { public: /// destructor - virtual ~TAO_EC_Timeout_Generator (void); + virtual ~TAO_EC_Timeout_Generator (); /// Activate any internal threads. - virtual void activate (void) = 0; + virtual void activate () = 0; /// Deactivate any internal threads, clients can destroy the object /// after calling this method. - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; /// Add a timer at the given priority, returns the timer ID. virtual int schedule_timer (TAO_EC_Timeout_Filter* filter, @@ -80,7 +80,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Adapter : public ACE_Event_Handler { public: /// Default construction. - TAO_EC_Timeout_Adapter (void); + TAO_EC_Timeout_Adapter (); private: /// Casts @a act to EC_Filter and dispatches an event to it. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index 0282d01b7c7..64994b1f55f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -54,13 +54,13 @@ public: virtual void connected (TAO_EC_ProxyPushSupplier* supplier); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier); - virtual void shutdown (void); + virtual void shutdown (); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info); - virtual CORBA::ULong _decr_refcnt (void); - virtual CORBA::ULong _incr_refcnt (void); + virtual CORBA::ULong _decr_refcnt (); + virtual CORBA::ULong _incr_refcnt (); private: /// The event channel, used to locate the set of consumers. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 66ff295aa4f..56ec593b2ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -43,7 +43,7 @@ void TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push (event, qos_info); } @@ -51,7 +51,7 @@ void TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info) { - if (this->parent () != 0) + if (this->parent () != nullptr) this->parent ()->push_nocopy (event, qos_info); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 180d39815ef..4e50f2cc5ca 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -48,8 +48,8 @@ public: TAO_EC_QOS_Info& qos_info); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info); - virtual void clear (void); - virtual CORBA::ULong max_event_size (void) const; + virtual void clear (); + virtual CORBA::ULong max_event_size () const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index ffe71480a01..51ab32225a3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -40,7 +40,7 @@ public: TAO_EC_Simple_AddrServer (CORBA::UShort port); /// Destructor - virtual ~TAO_EC_Simple_AddrServer (void); + virtual ~TAO_EC_Simple_AddrServer (); // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index ce31c1afdaf..1b6671c5093 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h @@ -98,7 +98,7 @@ public: CORBA::ULong qos_max_len = 0); /// Death and destruction. - ~ACE_ConsumerQOS_Factory (void); + ~ACE_ConsumerQOS_Factory (); /** * The Event Channel waits until all the children have accepted at @@ -117,7 +117,7 @@ public: /// The consumer wants all the events *except* the group that /// follows. - int start_negation (void); + int start_negation (); /// Insert a bitmask filter, this acts as a quick rejection mechanism /// for the subsequent filters. @@ -136,7 +136,7 @@ public: CORBA::ULong type_value); /// Insert a node that accepts any event, useful for bitmask filters. - int insert_null_terminator (void); + int insert_null_terminator (); // = Insert operations add to the current conjunction or disjunction // group. These return 0 on success, -1 on failure. Before insert @@ -179,10 +179,10 @@ public: /// Allows conversions to ConsumerQOS, which is expected by the /// PushSupplierProxy::connect_push_consumer interface. - const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS (void); + const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS (); /// Calls this->get_ConsumerQOS. - operator const RtecEventChannelAdmin::ConsumerQOS &(void); + operator const RtecEventChannelAdmin::ConsumerQOS &(); static void debug (const RtecEventChannelAdmin::ConsumerQOS& qos); @@ -224,10 +224,10 @@ public: /// Allows conversions to SupplierQOS, which is expected by the /// PushSupplierProxy::connect_push_supplier interface. - const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS (void); + const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS (); /// Calls this->get_SupplierQOS(). - operator const RtecEventChannelAdmin::SupplierQOS &(void); + operator const RtecEventChannelAdmin::SupplierQOS &(); static void debug (const RtecEventChannelAdmin::SupplierQOS& qos); diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index a33d537d286..83b5f0a45c9 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -41,7 +41,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; protected: S_forany x_; @@ -60,9 +60,9 @@ namespace TAO { public: In_Fixed_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x); - virtual ~In_Fixed_Array_Clonable_Argument_T (void); + virtual ~In_Fixed_Array_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -86,7 +86,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: S_forany x_; @@ -109,7 +109,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_forany x_; @@ -127,16 +127,16 @@ namespace TAO class Ret_Fixed_Array_Argument_T : public RetArgument { public: - Ret_Fixed_Array_Argument_T (void); + Ret_Fixed_Array_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); - typename S_forany::_slice_type * excp (void); - typename S_forany::_slice_type * retn (void); + typename S_forany::_slice_type * excp (); + typename S_forany::_slice_type * retn (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index 6b29a0872b6..45c969025fb 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -36,13 +36,13 @@ namespace TAO class In_Fixed_Array_SArgument_T : public InArgument { public: - In_Fixed_Array_SArgument_T (void); + In_Fixed_Array_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; private: mutable typename S_forany::_array_type x_; @@ -58,14 +58,14 @@ namespace TAO class Inout_Fixed_Array_SArgument_T : public InoutArgument { public: - Inout_Fixed_Array_SArgument_T (void); + Inout_Fixed_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: mutable typename S_forany::_array_type x_; @@ -81,13 +81,13 @@ namespace TAO class Out_Fixed_Array_SArgument_T : public OutArgument { public: - Out_Fixed_Array_SArgument_T (void); + Out_Fixed_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: mutable typename S_forany::_array_type x_; @@ -105,13 +105,13 @@ namespace TAO class Ret_Fixed_Array_SArgument_T : public RetArgument { public: - Ret_Fixed_Array_SArgument_T (void); + Ret_Fixed_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index 4e15f8aadf1..0242a21f24a 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -35,13 +35,13 @@ namespace TAO { public: - In_Var_Array_SArgument_T (void); + In_Var_Array_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; private: mutable typename S_forany::_array_type x_; @@ -58,14 +58,14 @@ namespace TAO class Inout_Var_Array_SArgument_T : public InoutArgument { public: - Inout_Var_Array_SArgument_T (void); + Inout_Var_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: typename S_forany::_array_type x_; @@ -83,13 +83,13 @@ namespace TAO class Out_Var_Array_SArgument_T : public OutArgument { public: - Out_Var_Array_SArgument_T (void); + Out_Var_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_var x_; @@ -107,13 +107,13 @@ namespace TAO class Ret_Var_Array_SArgument_T : public RetArgument { public: - Ret_Var_Array_SArgument_T (void); + Ret_Var_Array_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: S_var x_; diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index 3a633f2d815..f83e7d86abb 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -40,7 +40,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type const * arg (void) const; + typename S_forany::_slice_type const * arg () const; protected: S_forany x_; @@ -59,9 +59,9 @@ namespace TAO { public: In_Var_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x); - virtual ~In_Var_Array_Clonable_Argument_T (void); + virtual ~In_Var_Array_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -85,7 +85,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type * arg (void); + typename S_forany::_slice_type * arg (); private: S_forany x_; @@ -109,7 +109,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); private: typename S_forany::_slice_type *& x_; @@ -127,16 +127,16 @@ namespace TAO class Ret_Var_Array_Argument_T : public RetArgument { public: - Ret_Var_Array_Argument_T (void); + Ret_Var_Array_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_forany::_slice_type *& arg (void); + typename S_forany::_slice_type *& arg (); - typename S_forany::_slice_type * excp (void); - typename S_forany::_slice_type * retn (void); + typename S_forany::_slice_type * excp (); + typename S_forany::_slice_type * retn (); private: S_var x_; |