diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:52:29 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:52:29 +0100 |
| commit | 104d9f8a30c479fe661883b295f120ab035645d9 (patch) | |
| tree | aa39aaa576d8ce2e1666df7a750d77df1a33232e | |
| parent | 2d22ad2099d46d44fa05778313a8d4c9c4a4eba3 (diff) | |
| download | ATCD-104d9f8a30c479fe661883b295f120ab035645d9.tar.gz | |
Removed redundant void
1090 files changed, 3452 insertions, 3452 deletions
diff --git a/ACE/ACEXML/common/AttributesImpl.h b/ACE/ACEXML/common/AttributesImpl.h index 681e86bda35..b746878062c 100644 --- a/ACE/ACEXML/common/AttributesImpl.h +++ b/ACE/ACEXML/common/AttributesImpl.h @@ -64,31 +64,31 @@ public: const ACEXML_Char *value); /// Get \a uri_. - const ACEXML_Char *uri (void) const; + const ACEXML_Char *uri () const; /// Set \a uri_. void uri (const ACEXML_Char *uri); /// Get \a localName_. - const ACEXML_Char *localName (void) const; + const ACEXML_Char *localName () const; /// Set \a localName_. void localName (const ACEXML_Char *localName); /// Get \a qName_. - const ACEXML_Char *qName (void) const; + const ACEXML_Char *qName () const; /// Set \a qName_. void qName (const ACEXML_Char *qName); /// Get \a type_. - const ACEXML_Char *type (void) const; + const ACEXML_Char *type () const; /// Set \a type_. void type (const ACEXML_Char *type); /// Get \a value_. - const ACEXML_Char *value (void) const; + const ACEXML_Char *value () const; /// Set \a value_. void value (const ACEXML_Char *value); diff --git a/ACE/ACEXML/common/AttributesImpl.inl b/ACE/ACEXML/common/AttributesImpl.inl index 78f47317e25..38dafd62d3e 100644 --- a/ACE/ACEXML/common/AttributesImpl.inl +++ b/ACE/ACEXML/common/AttributesImpl.inl @@ -48,7 +48,7 @@ ACEXML_Attribute::~ACEXML_Attribute (void) } ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::uri (void) const +ACEXML_Attribute::uri () const { return this->uri_; } @@ -61,7 +61,7 @@ ACEXML_Attribute::uri (const ACEXML_Char *uri) } ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::localName (void) const +ACEXML_Attribute::localName () const { return this->localName_; } @@ -74,7 +74,7 @@ ACEXML_Attribute::localName (const ACEXML_Char *localName) } ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::qName (void) const +ACEXML_Attribute::qName () const { return this->qName_; } @@ -87,7 +87,7 @@ ACEXML_Attribute::qName (const ACEXML_Char *qName) } ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::type (void) const +ACEXML_Attribute::type () const { return this->type_; } @@ -100,7 +100,7 @@ ACEXML_Attribute::type (const ACEXML_Char *type) } ACEXML_INLINE const ACEXML_Char * -ACEXML_Attribute::value (void) const +ACEXML_Attribute::value () const { return this->value_; } diff --git a/ACE/ACEXML/common/Exception.cpp b/ACE/ACEXML/common/Exception.cpp index 70f5efb191e..d99d064270e 100644 --- a/ACE/ACEXML/common/Exception.cpp +++ b/ACE/ACEXML/common/Exception.cpp @@ -28,7 +28,7 @@ ACEXML_Exception::is_a (const ACEXML_Char *name) } void -ACEXML_Exception::print (void) const +ACEXML_Exception::print () const { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) EXCEPTION : %s\n"), diff --git a/ACE/ACEXML/common/InputSource.cpp b/ACE/ACEXML/common/InputSource.cpp index 89d6bba2c11..6d5a40ad2e4 100644 --- a/ACE/ACEXML/common/InputSource.cpp +++ b/ACE/ACEXML/common/InputSource.cpp @@ -53,25 +53,25 @@ ACEXML_InputSource::~ACEXML_InputSource (void) } ACEXML_CharStream * -ACEXML_InputSource::getCharStream (void) const +ACEXML_InputSource::getCharStream () const { return this->charStream_; } const ACEXML_Char * -ACEXML_InputSource::getEncoding (void) const +ACEXML_InputSource::getEncoding () const { return this->encoding_; } const ACEXML_Char * -ACEXML_InputSource::getPublicId (void) const +ACEXML_InputSource::getPublicId () const { return this->publicId_; } const ACEXML_Char * -ACEXML_InputSource::getSystemId (void) const +ACEXML_InputSource::getSystemId () const { return this->systemId_; } diff --git a/ACE/ACEXML/common/Mem_Map_Stream.cpp b/ACE/ACEXML/common/Mem_Map_Stream.cpp index 499b173f833..2c188106ca2 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.cpp +++ b/ACE/ACEXML/common/Mem_Map_Stream.cpp @@ -26,7 +26,7 @@ ACEXML_Mem_Map_Stream::send_n (const void *buf, size_t size, } int -ACEXML_Mem_Map_Stream::eof (void) const +ACEXML_Mem_Map_Stream::eof () const { return this->get_pos_ >= this->end_of_mapping_plus1_; } @@ -59,7 +59,7 @@ ACEXML_Mem_Map_Stream::peek_char (size_t offset) } const char * -ACEXML_Mem_Map_Stream::recv (void) const +ACEXML_Mem_Map_Stream::recv () const { return this->recv_pos_; } @@ -79,7 +79,7 @@ ACEXML_Mem_Map_Stream::recv (size_t &len) } size_t -ACEXML_Mem_Map_Stream::recv_len (void) const +ACEXML_Mem_Map_Stream::recv_len () const { return this->get_pos_ - this->recv_pos_; } @@ -137,7 +137,7 @@ ACEXML_Mem_Map_Stream::svc_handler (void) } size_t -ACEXML_Mem_Map_Stream::available (void) const +ACEXML_Mem_Map_Stream::available () const { return this->end_of_mapping_plus1_ - this->get_pos_; } diff --git a/ACE/ACEXML/common/Mem_Map_Stream.h b/ACE/ACEXML/common/Mem_Map_Stream.h index bda0a1c3d14..52bb92fcd0f 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.h +++ b/ACE/ACEXML/common/Mem_Map_Stream.h @@ -93,18 +93,18 @@ public: * Returns a pointer to array of characters starting at the <recv> * position. */ - virtual const char *recv (void) const; + virtual const char *recv () const; /** * Returns the length in bytes between the <get> position and the <recv> * position. */ - virtual size_t recv_len (void) const; + virtual size_t recv_len () const; /** * Returns the no. of bytes available in the stream. */ - virtual size_t available (void) const; + virtual size_t available () const; /** * Resets the <get> and <recv> positions to the beginning of the stream. @@ -145,7 +145,7 @@ public: virtual ACE_OFF_T seek (ACE_OFF_T offset, int whence = SEEK_CUR); /// Returns 1 if we're at the end of the HTTP stream, else 0. - virtual int eof (void) const; + virtual int eof () const; /// Returns the underlying service handler. Svc_Handler *svc_handler (void); diff --git a/ACE/ACEXML/common/SAXExceptions.cpp b/ACE/ACEXML/common/SAXExceptions.cpp index e03ef586091..bca3d1e46b1 100644 --- a/ACE/ACEXML/common/SAXExceptions.cpp +++ b/ACE/ACEXML/common/SAXExceptions.cpp @@ -59,7 +59,7 @@ ACEXML_SAXException::~ACEXML_SAXException (void) } ACEXML_Exception * -ACEXML_SAXException::duplicate (void) const +ACEXML_SAXException::duplicate () const { ACEXML_Exception *tmp; ACE_NEW_RETURN (tmp, ACEXML_SAXException (*this), 0); @@ -74,7 +74,7 @@ ACEXML_SAXException::is_a (const ACEXML_Char *name) } void -ACEXML_SAXException::print (void) const +ACEXML_SAXException::print () const { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), @@ -115,7 +115,7 @@ ACEXML_SAXNotSupportedException::~ACEXML_SAXNotSupportedException (void) ACEXML_Exception * -ACEXML_SAXNotSupportedException::duplicate (void) const +ACEXML_SAXNotSupportedException::duplicate () const { ACEXML_Exception *tmp; ACE_NEW_RETURN (tmp, ACEXML_SAXNotSupportedException (*this), 0); @@ -131,7 +131,7 @@ ACEXML_SAXNotSupportedException::is_a (const ACEXML_Char *name) } void -ACEXML_SAXNotSupportedException::print (void) const +ACEXML_SAXNotSupportedException::print () const { ACE_DEBUG ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), @@ -170,7 +170,7 @@ ACEXML_SAXNotRecognizedException::~ACEXML_SAXNotRecognizedException (void) } ACEXML_Exception * -ACEXML_SAXNotRecognizedException::duplicate (void) const +ACEXML_SAXNotRecognizedException::duplicate () const { ACEXML_Exception *tmp; ACE_NEW_RETURN (tmp, ACEXML_SAXNotRecognizedException (*this), 0); @@ -186,7 +186,7 @@ ACEXML_SAXNotRecognizedException::is_a (const ACEXML_Char *name) } void -ACEXML_SAXNotRecognizedException::print (void) const +ACEXML_SAXNotRecognizedException::print () const { ACE_DEBUG ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), @@ -225,7 +225,7 @@ ACEXML_SAXParseException::~ACEXML_SAXParseException (void) } ACEXML_Exception * -ACEXML_SAXParseException::duplicate (void) const +ACEXML_SAXParseException::duplicate () const { ACEXML_Exception *tmp; ACE_NEW_RETURN (tmp, ACEXML_SAXParseException (*this), 0); @@ -241,7 +241,7 @@ ACEXML_SAXParseException::is_a (const ACEXML_Char *name) } void -ACEXML_SAXParseException::print (void) const +ACEXML_SAXParseException::print () const { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), diff --git a/ACE/ACEXML/common/URL_Addr.h b/ACE/ACEXML/common/URL_Addr.h index 27ddd09ffd2..ea280dac416 100644 --- a/ACE/ACEXML/common/URL_Addr.h +++ b/ACE/ACEXML/common/URL_Addr.h @@ -101,10 +101,10 @@ public: bool operator != (const ACEXML_URL_Addr &SAP) const; /// Computes and returns hash value. - virtual u_long hash (void) const; + virtual u_long hash () const; /// Return the path name. - const ACEXML_Char *get_path_name (void) const; + const ACEXML_Char *get_path_name () const; /// Commit suicide. int destroy (void); diff --git a/ACE/ACEXML/common/URL_Addr.inl b/ACE/ACEXML/common/URL_Addr.inl index 169350eaed6..eba8ef80b3d 100644 --- a/ACE/ACEXML/common/URL_Addr.inl +++ b/ACE/ACEXML/common/URL_Addr.inl @@ -26,7 +26,7 @@ ACEXML_URL_Addr::operator= (const ACEXML_URL_Addr &addr) } ACE_INLINE u_long -ACEXML_URL_Addr::hash (void) const +ACEXML_URL_Addr::hash () const { u_long result = this->ACE_INET_Addr::hash () + ACE::hash_pjw (this->get_path_name ()); @@ -48,7 +48,7 @@ ACEXML_URL_Addr::operator!= (const ACEXML_URL_Addr &addr) const } ACE_INLINE const ACEXML_Char * -ACEXML_URL_Addr::get_path_name (void) const +ACEXML_URL_Addr::get_path_name () const { return this->path_name_; } diff --git a/ACE/ACEXML/common/XMLFilter.h b/ACE/ACEXML/common/XMLFilter.h index 61159e37ded..f49a994b523 100644 --- a/ACE/ACEXML/common/XMLFilter.h +++ b/ACE/ACEXML/common/XMLFilter.h @@ -40,7 +40,7 @@ public: /** * Get the parent reader. */ - virtual ACEXML_XMLReader *getParent (void) const = 0; + virtual ACEXML_XMLReader *getParent () const = 0; /** * Set the parent reader. diff --git a/ACE/ACEXML/common/XMLFilterImpl.cpp b/ACE/ACEXML/common/XMLFilterImpl.cpp index c8453a05b17..c4519cfdb30 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.cpp +++ b/ACE/ACEXML/common/XMLFilterImpl.cpp @@ -97,7 +97,7 @@ ACEXML_XMLFilterImpl::setProperty (const ACEXML_Char *name, void *value) } ACEXML_XMLReader * -ACEXML_XMLFilterImpl::getParent (void) const +ACEXML_XMLFilterImpl::getParent () const { return this->parent_; } @@ -261,25 +261,25 @@ ACEXML_XMLFilterImpl::warning (ACEXML_SAXParseException &exception) } ACEXML_DTDHandler * -ACEXML_XMLFilterImpl::getDTDHandler (void) const +ACEXML_XMLFilterImpl::getDTDHandler () const { return this->dtdHandler_; } ACEXML_ContentHandler * -ACEXML_XMLFilterImpl::getContentHandler (void) const +ACEXML_XMLFilterImpl::getContentHandler () const { return this->contentHandler_; } ACEXML_EntityResolver * -ACEXML_XMLFilterImpl::getEntityResolver (void) const +ACEXML_XMLFilterImpl::getEntityResolver () const { return this->entityResolver_; } ACEXML_ErrorHandler * -ACEXML_XMLFilterImpl::getErrorHandler (void) const +ACEXML_XMLFilterImpl::getErrorHandler () const { return this->errorHandler_; } diff --git a/ACE/ACEXML/common/XMLFilterImpl.h b/ACE/ACEXML/common/XMLFilterImpl.h index 44ff0eb6f63..ad5034372d9 100644 --- a/ACE/ACEXML/common/XMLFilterImpl.h +++ b/ACE/ACEXML/common/XMLFilterImpl.h @@ -86,7 +86,7 @@ public: /* * Get the parent reader. */ - virtual ACEXML_XMLReader *getParent (void) const; + virtual ACEXML_XMLReader *getParent () const; /* * Set the parent reader. @@ -96,22 +96,22 @@ public: /* * Get the current DTD event handler. */ - virtual ACEXML_DTDHandler *getDTDHandler (void) const; + virtual ACEXML_DTDHandler *getDTDHandler () const; /* * Get the current content event handler. */ - virtual ACEXML_ContentHandler *getContentHandler (void) const; + virtual ACEXML_ContentHandler *getContentHandler () const; /* * Get the current entity resolver. */ - virtual ACEXML_EntityResolver *getEntityResolver (void) const; + virtual ACEXML_EntityResolver *getEntityResolver () const; /* * Get the current error event handler. */ - virtual ACEXML_ErrorHandler *getErrorHandler (void) const; + virtual ACEXML_ErrorHandler *getErrorHandler () const; /* * Set the DTD event handler. diff --git a/ACE/ace/ATM_Acceptor.inl b/ACE/ace/ATM_Acceptor.inl index 8e4aef7fa02..55a7b1807d2 100644 --- a/ACE/ace/ATM_Acceptor.inl +++ b/ACE/ace/ATM_Acceptor.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -ACE_ATM_Acceptor::dump (void) const +ACE_ATM_Acceptor::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ATM_Acceptor::dump"); diff --git a/ACE/ace/ATM_Addr.cpp b/ACE/ace/ATM_Addr.cpp index 74c32b6fcb7..57e4e2639f0 100644 --- a/ACE/ace/ATM_Addr.cpp +++ b/ACE/ace/ATM_Addr.cpp @@ -119,7 +119,7 @@ ACE_ATM_Addr::~ACE_ATM_Addr (void) // Return the address. void * -ACE_ATM_Addr::get_addr (void) const +ACE_ATM_Addr::get_addr () const { ACE_TRACE ("ACE_ATM_Addr::get_addr"); return (void *) &this->atm_addr_; @@ -434,7 +434,7 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[], } const ACE_TCHAR * -ACE_ATM_Addr::addr_to_string (void) const +ACE_ATM_Addr::addr_to_string () const { ACE_TRACE ("ACE_ATM_Addr::addr_to_string"); @@ -496,7 +496,7 @@ ACE_ATM_Addr::operator == (const ACE_ATM_Addr &sap) const } void -ACE_ATM_Addr::dump (void) const +ACE_ATM_Addr::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ATM_Addr::dump"); diff --git a/ACE/ace/ATM_Addr.h b/ACE/ace/ATM_Addr.h index def7f35878c..9f0a72e9d4a 100644 --- a/ACE/ace/ATM_Addr.h +++ b/ACE/ace/ATM_Addr.h @@ -140,16 +140,16 @@ public: * is non-reentrant since it returns a pointer to a static data * area.) */ - const ACE_TCHAR *addr_to_string (void) const; + const ACE_TCHAR *addr_to_string () const; /// Return a pointer to the underlying network 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); /// Return the selector for network address. - u_char get_selector (void) const; + u_char get_selector () const; /// Set the selector for the network address. void set_selector (u_char selector); diff --git a/ACE/ace/ATM_Addr.inl b/ACE/ace/ATM_Addr.inl index d1f7e2c4d18..5d0b8faae9c 100644 --- a/ACE/ace/ATM_Addr.inl +++ b/ACE/ace/ATM_Addr.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE u_char -ACE_ATM_Addr::get_selector (void) const +ACE_ATM_Addr::get_selector () const { ACE_TRACE ("ACE_ATM_Addr::get_selector"); #if defined (ACE_HAS_FORE_ATM_XTI) diff --git a/ACE/ace/ATM_Connector.inl b/ACE/ace/ATM_Connector.inl index 3980c234b2c..4493be6afa8 100644 --- a/ACE/ace/ATM_Connector.inl +++ b/ACE/ace/ATM_Connector.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -ACE_ATM_Connector::dump (void) const +ACE_ATM_Connector::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ATM_Connector::dump"); diff --git a/ACE/ace/ATM_Params.inl b/ACE/ace/ATM_Params.inl index 59ec331b53e..57376a0caf4 100644 --- a/ACE/ace/ATM_Params.inl +++ b/ACE/ace/ATM_Params.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -ACE_ATM_Params::dump (void) const +ACE_ATM_Params::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ATM_Params::dump"); @@ -47,7 +47,7 @@ ACE_ATM_Params::~ACE_ATM_Params (void) ACE_INLINE int -ACE_ATM_Params::get_protocol_family (void) const +ACE_ATM_Params::get_protocol_family () const { ACE_TRACE ("ACE_ATM_Params::get_protocol_family"); return protocol_family_; @@ -63,7 +63,7 @@ ACE_ATM_Params::set_protocol_family (int family) ACE_INLINE int -ACE_ATM_Params::get_protocol (void) const +ACE_ATM_Params::get_protocol () const { ACE_TRACE ("ACE_ATM_Params::get_protocol"); return protocol_; @@ -79,7 +79,7 @@ ACE_ATM_Params::set_protocol (int protocol) ACE_INLINE int -ACE_ATM_Params::get_type (void) const +ACE_ATM_Params::get_type () const { ACE_TRACE ("ACE_ATM_Params::get_type"); return type_; @@ -143,7 +143,7 @@ ACE_ATM_Params::set_flags( u_long flags) ACE_INLINE int -ACE_ATM_Params::get_reuse_addr (void) const +ACE_ATM_Params::get_reuse_addr () const { ACE_TRACE ("ACE_ATM_Params::get_reuse_addr"); return reuse_addr_; @@ -159,7 +159,7 @@ ACE_ATM_Params::set_reuse_addr (int reuse_addr) ACE_INLINE const char* -ACE_ATM_Params::get_device (void) const +ACE_ATM_Params::get_device () const { ACE_TRACE ("ACE_ATM_Params::get_device"); return device_; @@ -167,7 +167,7 @@ ACE_ATM_Params::get_device (void) const ACE_INLINE Param_Info* -ACE_ATM_Params::get_info (void) const +ACE_ATM_Params::get_info () const { ACE_TRACE ("ACE_ATM_Params::get_info"); return info_; @@ -183,7 +183,7 @@ ACE_ATM_Params::set_info (Param_Info* info) ACE_INLINE int -ACE_ATM_Params::get_rw_flag (void) const +ACE_ATM_Params::get_rw_flag () const { ACE_TRACE ("ACE_ATM_Params::get_rw_flag"); return rw_flag_; @@ -199,7 +199,7 @@ ACE_ATM_Params::set_rw_flag (int rw_flag) ACE_INLINE Param_Udata* -ACE_ATM_Params::get_user_data (void) const +ACE_ATM_Params::get_user_data () const { ACE_TRACE ("ACE_ATM_Params::get_user_data"); return udata_; @@ -215,7 +215,7 @@ ACE_ATM_Params::set_user_data (Param_Udata *udata) ACE_INLINE int -ACE_ATM_Params::get_oflag (void) const +ACE_ATM_Params::get_oflag () const { ACE_TRACE ("ACE_ATM_Params::get_oflag"); return oflag_; diff --git a/ACE/ace/ATM_QoS.inl b/ACE/ace/ATM_QoS.inl index 479079e993e..8ac4d7aa09a 100644 --- a/ACE/ace/ATM_QoS.inl +++ b/ACE/ace/ATM_QoS.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -ACE_ATM_QoS::dump (void) const +ACE_ATM_QoS::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ATM_QoS::dump"); diff --git a/ACE/ace/ATM_Stream.cpp b/ACE/ace/ATM_Stream.cpp index f87ac4def1c..e750a457702 100644 --- a/ACE/ace/ATM_Stream.cpp +++ b/ACE/ace/ATM_Stream.cpp @@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_ATM_Stream) char* -ACE_ATM_Stream::get_peer_name (void) const +ACE_ATM_Stream::get_peer_name () const { ACE_TRACE ("ACE_ATM_Stream::get_peer_name"); #if defined (ACE_HAS_FORE_ATM_XTI) @@ -127,7 +127,7 @@ ACE_ATM_Stream::get_peer_name (void) const } ACE_HANDLE -ACE_ATM_Stream::get_handle (void) const +ACE_ATM_Stream::get_handle () const { ACE_TRACE ("ACE_ATM_Stream::get_handle"); #if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) diff --git a/ACE/ace/ATM_Stream.h b/ACE/ace/ATM_Stream.h index 300d0563e7a..a905ce05bd7 100644 --- a/ACE/ace/ATM_Stream.h +++ b/ACE/ace/ATM_Stream.h @@ -56,13 +56,13 @@ public: int close (void); /// Get the underlying handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Get the underlying stream. ATM_Stream& get_stream (void); /// Get the name of the connected host. - char* get_peer_name (void) const; + char* get_peer_name () const; /// Get the VPI and VCI of the stream. int get_vpi_vci (ACE_UINT16 &vpi, diff --git a/ACE/ace/ATM_Stream.inl b/ACE/ace/ATM_Stream.inl index eda7ca9bc81..803af75770c 100644 --- a/ACE/ace/ATM_Stream.inl +++ b/ACE/ace/ATM_Stream.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -ACE_ATM_Stream::dump (void) const +ACE_ATM_Stream::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ATM_Stream::dump"); diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h index 3d41fd0f4a4..2e5d8f75f1f 100644 --- a/ACE/ace/Activation_Queue.h +++ b/ACE/ace/Activation_Queue.h @@ -118,19 +118,19 @@ public: int enqueue (ACE_Method_Request *new_method_request, ACE_Time_Value *tv = 0); /// Get the current number of method objects in the queue. - size_t method_count (void) const; + size_t method_count () const; /// Returns 1 if the queue is empty, 0 otherwise. - int is_empty (void) const; + int is_empty () const; /// Returns 1 if the queue is full, 0 otherwise. - int is_full (void) const; + int is_full () const; /// Dump the state of an request. void dump () const; /// Get a pointer to the underlying queue. - ACE_Message_Queue<ACE_SYNCH> *queue (void) const; + ACE_Message_Queue<ACE_SYNCH> *queue () const; /// Set the pointer to the underlying queue. void queue (ACE_Message_Queue<ACE_SYNCH> *q); diff --git a/ACE/ace/Activation_Queue.inl b/ACE/ace/Activation_Queue.inl index b464dbdef10..3b259ce7625 100644 --- a/ACE/ace/Activation_Queue.inl +++ b/ACE/ace/Activation_Queue.inl @@ -2,25 +2,25 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE size_t -ACE_Activation_Queue::method_count (void) const +ACE_Activation_Queue::method_count () const { return queue_->message_count (); } ACE_INLINE int -ACE_Activation_Queue::is_full (void) const +ACE_Activation_Queue::is_full () const { return queue_->is_full (); } ACE_INLINE int -ACE_Activation_Queue::is_empty (void) const +ACE_Activation_Queue::is_empty () const { return queue_->is_empty (); } ACE_INLINE ACE_Message_Queue<ACE_SYNCH> * -ACE_Activation_Queue::queue (void) const +ACE_Activation_Queue::queue () const { return queue_; } diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp index c518c3a62fc..b8fb1c16fa6 100644 --- a/ACE/ace/Asynch_Acceptor.cpp +++ b/ACE/ace/Asynch_Acceptor.cpp @@ -192,7 +192,7 @@ ACE_Asynch_Acceptor<HANDLER>::set_handle (ACE_HANDLE listen_handle) } template <class HANDLER> ACE_HANDLE -ACE_Asynch_Acceptor<HANDLER>::get_handle (void) const +ACE_Asynch_Acceptor<HANDLER>::get_handle () const { return this->listen_handle_; } @@ -418,7 +418,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (const } template <class HANDLER> ACE_HANDLE -ACE_Asynch_Acceptor<HANDLER>::handle (void) const +ACE_Asynch_Acceptor<HANDLER>::handle () const { return this->listen_handle_; } @@ -447,7 +447,7 @@ ACE_Asynch_Acceptor<HANDLER>::make_handler (void) } template <class HANDLER> bool -ACE_Asynch_Acceptor<HANDLER>::pass_addresses (void) const +ACE_Asynch_Acceptor<HANDLER>::pass_addresses () const { return this->pass_addresses_; } @@ -459,7 +459,7 @@ ACE_Asynch_Acceptor<HANDLER>::pass_addresses (bool new_value) } template <class HANDLER> bool -ACE_Asynch_Acceptor<HANDLER>::validate_new_connection (void) const +ACE_Asynch_Acceptor<HANDLER>::validate_new_connection () const { return this->validate_new_connection_; } @@ -471,7 +471,7 @@ ACE_Asynch_Acceptor<HANDLER>::validate_new_connection (bool new_value) } template <class HANDLER> int -ACE_Asynch_Acceptor<HANDLER>::reissue_accept (void) const +ACE_Asynch_Acceptor<HANDLER>::reissue_accept () const { return this->reissue_accept_; } @@ -483,7 +483,7 @@ ACE_Asynch_Acceptor<HANDLER>::reissue_accept (int new_value) } template <class HANDLER> size_t -ACE_Asynch_Acceptor<HANDLER>::bytes_to_read (void) const +ACE_Asynch_Acceptor<HANDLER>::bytes_to_read () const { return this->bytes_to_read_; } diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h index 03efa702e8d..36b3aa1ca76 100644 --- a/ACE/ace/Asynch_Acceptor.h +++ b/ACE/ace/Asynch_Acceptor.h @@ -115,7 +115,7 @@ public: int number_of_initial_accepts = -1); /// Get the underlying handle. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /** * Set the underlying listen handle. It is the user's responsibility @@ -183,28 +183,28 @@ public: /// Get flag that indicates if parsing and passing of addresses to /// the service_handler is necessary. - virtual bool pass_addresses (void) const; + virtual bool pass_addresses () const; /// Set flag that indicates if parsing and passing of addresses to /// the service_handler is necessary. virtual void pass_addresses (bool new_value); /// Get flag that indicates if address validation is required. - virtual bool validate_new_connection (void) const; + virtual bool validate_new_connection () const; /// Set flag that indicates if address validation is required. virtual void validate_new_connection (bool new_value); /// Get flag that indicates if a new accept should be reissued when a accept /// completes. - virtual int reissue_accept (void) const; + virtual int reissue_accept () const; /// Set flag that indicates if a new accept should be reissued when a accept /// completes. virtual void reissue_accept (int new_value); /// Get bytes to be read with the <accept> call. - virtual size_t bytes_to_read (void) const; + virtual size_t bytes_to_read () const; /// Set bytes to be read with the <accept> call. virtual void bytes_to_read (size_t new_value); @@ -215,7 +215,7 @@ protected: virtual void handle_accept (const ACE_Asynch_Accept::Result &result); /// Return the listen handle. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Set the listen handle. void handle (ACE_HANDLE h); diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp index 5391ca5ad5e..3d35f0d4aa4 100644 --- a/ACE/ace/Asynch_Connector.cpp +++ b/ACE/ace/Asynch_Connector.cpp @@ -239,7 +239,7 @@ ACE_Asynch_Connector<HANDLER>::make_handler (void) } template <class HANDLER> bool -ACE_Asynch_Connector<HANDLER>::pass_addresses (void) const +ACE_Asynch_Connector<HANDLER>::pass_addresses () const { return this->pass_addresses_; } @@ -251,7 +251,7 @@ ACE_Asynch_Connector<HANDLER>::pass_addresses (bool new_value) } template <class HANDLER> bool -ACE_Asynch_Connector<HANDLER>::validate_new_connection (void) const +ACE_Asynch_Connector<HANDLER>::validate_new_connection () const { return this->validate_new_connection_; } diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h index 584c29fb0dd..1777cd0c904 100644 --- a/ACE/ace/Asynch_Connector.h +++ b/ACE/ace/Asynch_Connector.h @@ -113,12 +113,12 @@ public: /// Set and get flag that indicates if parsing and passing of /// addresses to the service_handler is necessary. - virtual bool pass_addresses (void) const; + virtual bool pass_addresses () const; virtual void pass_addresses (bool new_value); /// Set and get flag that indicates if address validation is /// required. - virtual bool validate_new_connection (void) const; + virtual bool validate_new_connection () const; virtual void validate_new_connection (bool new_value); protected: diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 9d2803ad7db..55e339e5f81 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -103,13 +103,13 @@ class ACE_Export ACE_Asynch_Result { public: /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This is the ACT associated with the handle on which the @@ -120,10 +120,10 @@ public: * * @@ This is not implemented for POSIX4 platforms. Returns 0. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fails. - unsigned long error (void) const; + unsigned long error () const; /** * On WIN32, this returns the event associated with the OVERLAPPED @@ -131,7 +131,7 @@ public: * * This returns ACE_INVALID_HANDLE on POSIX4-Unix platforms. */ - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /** * This really makes sense only when doing file I/O. @@ -141,8 +141,8 @@ public: * @@ On POSIX4-Unix, offset_high should be supported using * aiocb64. */ - unsigned long offset (void) const; - unsigned long offset_high (void) const; + unsigned long offset () const; + unsigned long offset_high () const; /** * Priority of the operation. @@ -154,7 +154,7 @@ public: * * On Win32, this is a no-op. */ - int priority (void) const; + int priority () const; /** * POSIX4 real-time signal number to be used for the @@ -162,7 +162,7 @@ public: * default, ACE_SIGRTMIN is used to issue {aio_} calls. This is a no-op * on non-POSIX4 systems and returns 0. */ - int signal_number (void) const; + int signal_number () const; /// Destructor. @@ -174,7 +174,7 @@ protected: ACE_Asynch_Result (ACE_Asynch_Result_Impl *implementation); /// Get the implementation class. - ACE_Asynch_Result_Impl *implementation (void) const; + ACE_Asynch_Result_Impl *implementation () const; /// Implementation class. ACE_Asynch_Result_Impl *implementation_; @@ -250,7 +250,7 @@ public: // = Access methods. /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; /// Destructor. virtual ~ACE_Asynch_Operation (void); @@ -260,7 +260,7 @@ protected: ACE_Asynch_Operation (void); /// Return the underlying implementation class. - virtual ACE_Asynch_Operation_Impl *implementation (void) const = 0; + virtual ACE_Asynch_Operation_Impl *implementation () const = 0; /// Get a proactor for/from the user ACE_Proactor *get_proactor (ACE_Proactor *user_proactor, @@ -356,7 +356,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Implementation class that all methods will be forwarded to. @@ -384,16 +384,16 @@ public: public: /// The number of bytes which were requested at the start of the /// asynchronous read. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for reading. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Get the implementation class. - ACE_Asynch_Read_Stream_Result_Impl *implementation (void) const; + ACE_Asynch_Read_Stream_Result_Impl *implementation () const; protected: /// Constructor. @@ -510,7 +510,7 @@ public: /// Return the underlying implementation class. /// @todo (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Implementation class that all methods will be forwarded to. @@ -538,16 +538,16 @@ public: public: /// The number of bytes which were requested at the start of the /// asynchronous write. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Message block that contains the data to be written. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for writing. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Get the implementation class. - ACE_Asynch_Write_Stream_Result_Impl *implementation (void) const; + ACE_Asynch_Write_Stream_Result_Impl *implementation () const; protected: /// Constructor. @@ -657,7 +657,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Delegation/implementation class that all methods will be @@ -691,7 +691,7 @@ public: public: /// Get the implementation class. - ACE_Asynch_Read_File_Result_Impl *implementation (void) const; + ACE_Asynch_Read_File_Result_Impl *implementation () const; protected: /// Constructor. This implementation will not be deleted. @@ -792,7 +792,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Implementation object. @@ -825,7 +825,7 @@ public: public: /// Get the implementation class. - ACE_Asynch_Write_File_Result_Impl *implementation (void) const; + ACE_Asynch_Write_File_Result_Impl *implementation () const; protected: /// Constructor. This implementation will not be deleted. @@ -928,7 +928,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Delegation/implementation class that all methods will be @@ -956,19 +956,19 @@ public: public: /// The number of bytes which were requested at the start of the /// asynchronous accept. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for accepting new connections. - ACE_HANDLE listen_handle (void) const; + ACE_HANDLE listen_handle () const; /// I/O handle for the new connection. - ACE_HANDLE accept_handle (void) const; + ACE_HANDLE accept_handle () const; /// Get the implementation. - ACE_Asynch_Accept_Result_Impl *implementation (void) const; + ACE_Asynch_Accept_Result_Impl *implementation () const; protected: /// Constructor. Implementation will not be deleted. @@ -1032,7 +1032,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Delegation/implementation class that all methods will be @@ -1060,10 +1060,10 @@ public: public: /// I/O handle for the connection. - ACE_HANDLE connect_handle (void) const; + ACE_HANDLE connect_handle () const; /// Get the implementation. - ACE_Asynch_Connect_Result_Impl *implementation (void) const; + ACE_Asynch_Connect_Result_Impl *implementation () const; protected: /// Constructor. Implementation will not be deleted. @@ -1157,7 +1157,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// The implementation class. @@ -1183,27 +1183,27 @@ public: public: /// Socket used for transmitting the file. - ACE_HANDLE socket (void) const; + ACE_HANDLE socket () const; /// File from which the data is read. - ACE_HANDLE file (void) const; + ACE_HANDLE file () const; /// Header and trailer data associated with this transmit file. - Header_And_Trailer *header_and_trailer (void) const; + Header_And_Trailer *header_and_trailer () const; /// The number of bytes which were requested at the start of the /// asynchronous transmit file. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Number of bytes per send requested at the start of the transmit /// file. - size_t bytes_per_send (void) const; + size_t bytes_per_send () const; /// Flags which were passed into transmit file. - unsigned long flags (void) const; + unsigned long flags () const; /// Get the implementation class. - ACE_Asynch_Transmit_File_Result_Impl *implementation (void) const; + ACE_Asynch_Transmit_File_Result_Impl *implementation () const; protected: /// Constructor. @@ -1244,25 +1244,25 @@ public: size_t trailer_bytes = 0); /// Get header which goes before the file data. - ACE_Message_Block *header (void) const; + ACE_Message_Block *header () const; /// Set header which goes before the file data. void header (ACE_Message_Block *message_block); /// Get size of the header data. - size_t header_bytes (void) const; + size_t header_bytes () const; /// Set size of the header data. void header_bytes (size_t bytes); /// Get trailer which goes after the file data. - ACE_Message_Block *trailer (void) const; + ACE_Message_Block *trailer () const; /// Set trailer which goes after the file data. void trailer (ACE_Message_Block *message_block); /// Get size of the trailer data. - size_t trailer_bytes (void) const; + size_t trailer_bytes () const; /// Set size of the trailer data. void trailer_bytes (size_t bytes); @@ -1366,7 +1366,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Implementation class that all methods will be forwarded to. @@ -1394,22 +1394,22 @@ public: public: /// The number of bytes which were requested at the start of the /// asynchronous read. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data - ACE_Message_Block *message_block (void) const; + ACE_Message_Block *message_block () const; /// The flags used in the read - int flags (void) const; + int flags () const; /// The address of where the packet came from int remote_address (ACE_Addr& addr) const; /// I/O handle used for reading. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Get the implementation class. - ACE_Asynch_Read_Dgram_Result_Impl *implementation (void) const; + ACE_Asynch_Read_Dgram_Result_Impl *implementation () const; protected: /// Constructor. @@ -1499,7 +1499,7 @@ public: /// Return the underlying implementation class. // (this should be protected...) - virtual ACE_Asynch_Operation_Impl *implementation (void) const; + virtual ACE_Asynch_Operation_Impl *implementation () const; protected: /// Implementation class that all methods will be forwarded to. @@ -1527,19 +1527,19 @@ public: public: /// The number of bytes which were requested at the start of the /// asynchronous write. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Message block which contains the sent data - ACE_Message_Block *message_block (void) const; + ACE_Message_Block *message_block () const; /// The flags using in the write - int flags (void) const; + int flags () const; /// I/O handle used for writing. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Get the implementation class. - ACE_Asynch_Write_Dgram_Result_Impl *implementation (void) const; + ACE_Asynch_Write_Dgram_Result_Impl *implementation () const; protected: /// Constructor. @@ -1634,7 +1634,7 @@ public: * called by the ACE_Asynch_* classes when an ACE_INVALID_HANDLE is * passed to {open}. */ - virtual ACE_HANDLE handle (void) const; + virtual ACE_HANDLE handle () const; /// Set the ACE_HANDLE value for this Handler. virtual void handle (ACE_HANDLE); diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h index a4ec996df19..01880bc1dbc 100644 --- a/ACE/ace/Asynch_IO_Impl.h +++ b/ACE/ace/Asynch_IO_Impl.h @@ -49,30 +49,30 @@ public: virtual ~ACE_Asynch_Result_Impl (void); /// Number of bytes transferred by the operation. - virtual size_t bytes_transferred (void) const = 0; + virtual size_t bytes_transferred () const = 0; /// ACT associated with the operation. - virtual const void *act (void) const = 0; + virtual const void *act () const = 0; /// Did the operation succeed? - virtual int success (void) const = 0; + virtual int success () const = 0; /// This ACT is not the same as the ACT associated with the /// asynchronous operation. - virtual const void *completion_key (void) const = 0; + virtual const void *completion_key () const = 0; /// Error value if the operation fail. - virtual u_long error (void) const = 0; + virtual u_long error () const = 0; /// Event associated with the OVERLAPPED structure. - virtual ACE_HANDLE event (void) const = 0; + virtual ACE_HANDLE event () const = 0; /// This really make sense only when doing file I/O. - virtual u_long offset (void) const = 0; - virtual u_long offset_high (void) const = 0; + virtual u_long offset () const = 0; + virtual u_long offset_high () const = 0; /// Priority of the operation. - virtual int priority (void) const = 0; + virtual int priority () const = 0; /** * POSIX4 real-time signal number to be used for the @@ -80,7 +80,7 @@ public: * default, SIGRTMIN is used to issue <aio_> calls. This is a no-op * on non-POSIX4 systems and returns 0. */ - virtual int signal_number (void) const = 0; + virtual int signal_number () const = 0; // protected: // @@ -133,7 +133,7 @@ public: // = Access methods. /// Return the underlying proactor. - virtual ACE_Proactor* proactor (void) const = 0; + virtual ACE_Proactor* proactor () const = 0; protected: /// Do-nothing constructor. @@ -191,13 +191,13 @@ public: /// The number of bytes which were requested at the start of the /// asynchronous read. - virtual size_t bytes_to_read (void) const = 0; + virtual size_t bytes_to_read () const = 0; /// Message block which contains the read data. - virtual ACE_Message_Block &message_block (void) const = 0; + virtual ACE_Message_Block &message_block () const = 0; /// I/O handle used for reading. - virtual ACE_HANDLE handle (void) const = 0; + virtual ACE_HANDLE handle () const = 0; protected: /// Do-nothing constructor. @@ -255,13 +255,13 @@ public: /// The number of bytes which were requested at the start of the /// asynchronous write. - virtual size_t bytes_to_write (void) const = 0; + virtual size_t bytes_to_write () const = 0; /// Message block that contains the data to be written. - virtual ACE_Message_Block &message_block (void) const = 0; + virtual ACE_Message_Block &message_block () const = 0; /// I/O handle used for writing. - virtual ACE_HANDLE handle (void) const = 0; + virtual ACE_HANDLE handle () const = 0; protected: /// Do-nothing constructor. @@ -484,16 +484,16 @@ public: /// The number of bytes which were requested at the start of the /// asynchronous accept. - virtual size_t bytes_to_read (void) const = 0; + virtual size_t bytes_to_read () const = 0; /// Message block which contains the read data. - virtual ACE_Message_Block &message_block (void) const = 0; + virtual ACE_Message_Block &message_block () const = 0; /// I/O handle used for accepting new connections. - virtual ACE_HANDLE listen_handle (void) const = 0; + virtual ACE_HANDLE listen_handle () const = 0; /// I/O handle for the new connection. - virtual ACE_HANDLE accept_handle (void) const = 0; + virtual ACE_HANDLE accept_handle () const = 0; protected: /// Do-nothing constructor. @@ -542,7 +542,7 @@ public: virtual ~ACE_Asynch_Connect_Result_Impl (void); /// I/O handle for the connection. - virtual ACE_HANDLE connect_handle (void) const = 0; + virtual ACE_HANDLE connect_handle () const = 0; protected: /// Do-nothing constructor. @@ -592,24 +592,24 @@ public: virtual ~ACE_Asynch_Transmit_File_Result_Impl (void); /// Socket used for transmitting the file. - virtual ACE_HANDLE socket (void) const = 0; + virtual ACE_HANDLE socket () const = 0; /// File from which the data is read. - virtual ACE_HANDLE file (void) const = 0; + virtual ACE_HANDLE file () const = 0; /// Header and trailer data associated with this transmit file. - virtual ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const = 0; + virtual ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer () const = 0; /// The number of bytes which were requested at the start of the /// asynchronous transmit file. - virtual size_t bytes_to_write (void) const = 0; + virtual size_t bytes_to_write () const = 0; /// Number of bytes per send requested at the start of the transmit /// file. - virtual size_t bytes_per_send (void) const = 0; + virtual size_t bytes_per_send () const = 0; /// Flags which were passed into transmit file. - virtual u_long flags (void) const = 0; + virtual u_long flags () const = 0; protected: /// Do-nothing constructor. @@ -681,20 +681,20 @@ public: virtual ~ACE_Asynch_Read_Dgram_Result_Impl (void); /// Message block which contains the read data - virtual ACE_Message_Block *message_block (void) const = 0; + virtual ACE_Message_Block *message_block () const = 0; /// The number of bytes which were requested at the start of the /// asynchronous read. - virtual size_t bytes_to_read (void) const = 0; + virtual size_t bytes_to_read () const = 0; /// The address of where the packet came from virtual int remote_address (ACE_Addr& addr) const = 0; /// The flags used in the read - virtual int flags (void) const = 0; + virtual int flags () const = 0; /// I/O handle used for reading. - virtual ACE_HANDLE handle (void) const = 0; + virtual ACE_HANDLE handle () const = 0; protected: /// Do-nothing constructor. @@ -766,16 +766,16 @@ public: /// The number of bytes which were requested at the start of the /// asynchronous write. - virtual size_t bytes_to_write (void) const = 0; + virtual size_t bytes_to_write () const = 0; /// Message block which contains the sent data - virtual ACE_Message_Block *message_block (void) const = 0; + virtual ACE_Message_Block *message_block () const = 0; /// The flags using in the write - virtual int flags (void) const = 0; + virtual int flags () const = 0; /// I/O handle used for writing. - virtual ACE_HANDLE handle (void) const = 0; + virtual ACE_HANDLE handle () const = 0; protected: /// Do-nothing constructor. diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp index e1075809b28..07490f3a425 100644 --- a/ACE/ace/Atomic_Op.cpp +++ b/ACE/ace/Atomic_Op.cpp @@ -258,7 +258,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::init_functions (void) } void -ACE_Atomic_Op<ACE_Thread_Mutex, long>::dump (void) const +ACE_Atomic_Op<ACE_Thread_Mutex, long>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -291,7 +291,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::init_functions (void) } void -ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::dump (void) const +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h index 19033b89860..e0281c856e5 100644 --- a/ACE/ace/Atomic_Op.h +++ b/ACE/ace/Atomic_Op.h @@ -126,7 +126,7 @@ public: long exchange (long newval); /// Explicitly return @c value_. - long value (void) const; + long value () const; /// Dump the state of an object. void dump () const; @@ -224,7 +224,7 @@ public: unsigned long exchange (unsigned long newval); /// Explicitly return @c value_. - unsigned long value (void) const; + unsigned long value () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl index 318339d0363..28a6c1a65ef 100644 --- a/ACE/ace/Atomic_Op.inl +++ b/ACE/ace/Atomic_Op.inl @@ -203,7 +203,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange (long newval) } ACE_INLINE long -ACE_Atomic_Op<ACE_Thread_Mutex, long>::value (void) const +ACE_Atomic_Op<ACE_Thread_Mutex, long>::value () const { return this->value_; } @@ -403,7 +403,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange (unsigned long newval) } ACE_INLINE unsigned long -ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::value (void) const +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::value () const { return this->value_; } diff --git a/ACE/ace/Auto_IncDec_T.cpp b/ACE/ace/Auto_IncDec_T.cpp index 5d408c7dbf2..bb5b7b40fd1 100644 --- a/ACE/ace/Auto_IncDec_T.cpp +++ b/ACE/ace/Auto_IncDec_T.cpp @@ -21,7 +21,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Auto_IncDec) template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> void -ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump (void) const +ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump"); diff --git a/ACE/ace/Based_Pointer_T.cpp b/ACE/ace/Based_Pointer_T.cpp index df983903c34..e3504108156 100644 --- a/ACE/ace/Based_Pointer_T.cpp +++ b/ACE/ace/Based_Pointer_T.cpp @@ -22,7 +22,7 @@ ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void) } template <class CONCRETE> void -ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const +ACE_Based_Pointer_Basic<CONCRETE>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::dump"); diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h index 3834f465517..33085713804 100644 --- a/ACE/ace/Based_Pointer_T.h +++ b/ACE/ace/Based_Pointer_T.h @@ -98,7 +98,7 @@ public: void operator = (const ACE_Based_Pointer_Basic<CONCRETE> &); /// Dereference operator. - CONCRETE operator * (void) const; + CONCRETE operator * () const; /// Less than operator. bool operator < (const ACE_Based_Pointer_Basic<CONCRETE> &) const; @@ -128,7 +128,7 @@ public: operator CONCRETE *() const; /// Returns the underlying memory address of the smart pointer. - CONCRETE *addr (void) const; + CONCRETE *addr () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Based_Pointer_T.inl b/ACE/ace/Based_Pointer_T.inl index 04ab75831b4..c9b00d5c703 100644 --- a/ACE/ace/Based_Pointer_T.inl +++ b/ACE/ace/Based_Pointer_T.inl @@ -36,14 +36,14 @@ ACE_Based_Pointer<CONCRETE>::operator = (CONCRETE *rhs) } template <class CONCRETE> ACE_INLINE CONCRETE -ACE_Based_Pointer_Basic<CONCRETE>::operator *(void) const +ACE_Based_Pointer_Basic<CONCRETE>::operator *() const { ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator *"); return *reinterpret_cast<CONCRETE *> (ACE_COMPUTE_BASED_POINTER (this)); } template <class CONCRETE> ACE_INLINE CONCRETE * -ACE_Based_Pointer_Basic<CONCRETE>::addr (void) const +ACE_Based_Pointer_Basic<CONCRETE>::addr () const { ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::addr"); diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h index 4590230a336..8ad197b03ac 100644 --- a/ACE/ace/CDR_Size.h +++ b/ACE/ace/CDR_Size.h @@ -45,13 +45,13 @@ public: ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION); /// Returns @c false if an error has occurred. - bool good_bit (void) const; + bool good_bit () const; /// Reset current size. void reset (void); /// Return current size. - size_t total_length (void) const; + size_t total_length () const; // Return 0 on failure and 1 on success. //@{ @name Size-calculating pseudo-write operations diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl index d138b3de13b..9a4e3fdeb77 100644 --- a/ACE/ace/CDR_Size.inl +++ b/ACE/ace/CDR_Size.inl @@ -14,7 +14,7 @@ ACE_SizeCDR::ACE_SizeCDR (ACE_CDR::Octet major_version, } ACE_INLINE bool -ACE_SizeCDR::good_bit (void) const +ACE_SizeCDR::good_bit () const { return this->good_bit_; } @@ -26,7 +26,7 @@ ACE_SizeCDR::reset (void) } ACE_INLINE size_t -ACE_SizeCDR::total_length (void) const +ACE_SizeCDR::total_length () const { return this->size_; } diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index b92876a7ffd..971b2d8b9da 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -391,7 +391,7 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP } template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> void -ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::dump (void) const +ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::dump () const { #if defined (ACE_HAS_DUMP) this->map_.dump (); diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index a090df83683..6a75854df24 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -190,10 +190,10 @@ public: int purge (void); /// Return the current size of the cache. - size_t current_size (void) const; + size_t current_size () const; /// Return the total size of the cache. - size_t total_size (void) const; + size_t total_size () const; /// Dumps the state of the object. void dump () const; @@ -274,7 +274,7 @@ public: /// Returns a reference to the internal element @c this is pointing /// to. - ACE_Reference_Pair<KEY, VALUE> operator* (void) const; + ACE_Reference_Pair<KEY, VALUE> operator* () const; // = STL styled iteration, compare, and reference functions. @@ -347,7 +347,7 @@ public: /// Returns a reference to the internal element @c this is pointing /// to. - ACE_Reference_Pair<KEY, VALUE> operator* (void) const; + ACE_Reference_Pair<KEY, VALUE> operator* () const; // = STL styled iteration, compare, and reference functions. diff --git a/ACE/ace/Cache_Map_Manager_T.inl b/ACE/ace/Cache_Map_Manager_T.inl index dc2a42ef0f5..84c276a7b84 100644 --- a/ACE/ace/Cache_Map_Manager_T.inl +++ b/ACE/ace/Cache_Map_Manager_T.inl @@ -10,13 +10,13 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP } template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t -ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::current_size (void) const +ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::current_size () const { return this->map_.current_size (); } template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t -ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::total_size (void) const +ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::total_size () const { return this->map_.total_size (); } @@ -84,7 +84,7 @@ ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> } template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Reference_Pair<KEY, VALUE> -ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const +ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* () const { value_type retn ((*this->iterator_implementation_).ext_id_, (*this->iterator_implementation_).int_id_.first); @@ -126,7 +126,7 @@ ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> } template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE void -ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::dump (void) const +ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::dump () const { #if defined (ACE_HAS_DUMP) this->iterator_implementation_.dump (); @@ -178,7 +178,7 @@ ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRAT } template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Reference_Pair<KEY, VALUE> -ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const +ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* () const { value_type retv ((*this->reverse_iterator_implementation_).ext_id_, (*this->reverse_iterator_implementation_).int_id_.first); @@ -221,7 +221,7 @@ ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRAT template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE void -ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::dump (void) const +ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::dump () const { #if defined (ACE_HAS_DUMP) this->reverse_iterator_implementation_.dump (); diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h index e7206290811..c46e30dd957 100644 --- a/ACE/ace/Caching_Strategies_T.h +++ b/ACE/ace/Caching_Strategies_T.h @@ -85,7 +85,7 @@ public: virtual CACHING_UTILITY &caching_utility (void) = 0; /// Dumps the state of the object. - virtual void dump (void) const = 0; + virtual void dump () const = 0; }; ////////////////////////////////////////////////////////////////////////// diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl index dd9c9851326..68508f5e298 100644 --- a/ACE/ace/Caching_Strategies_T.inl +++ b/ACE/ace/Caching_Strategies_T.inl @@ -102,7 +102,7 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::cachi } template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE void -ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump (void) const +ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump"); @@ -191,7 +191,7 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void) } template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void -ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const +ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LRU_Caching_Strategy::dump"); @@ -268,7 +268,7 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void) } template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void -ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const +ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LFU_Caching_Strategy::dump"); @@ -356,7 +356,7 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void) } template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void -ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const +ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump"); @@ -439,7 +439,7 @@ ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void) } template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void -ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const +ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Null_Caching_Strategy::dump"); diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h index e43ace9d2dd..3529ec6c81b 100644 --- a/ACE/ace/Capabilities.h +++ b/ACE/ace/Capabilities.h @@ -68,7 +68,7 @@ class ACE_Export ACE_IntCapEntry : public ACE_CapEntry { public: ACE_IntCapEntry (int val); - int getval (void) const; + int getval () const; ACE_ALLOC_HOOK_DECLARE; protected: @@ -87,7 +87,7 @@ class ACE_Export ACE_StringCapEntry : public ACE_CapEntry { public: ACE_StringCapEntry (const ACE_TString &val); - ACE_TString getval (void) const; + ACE_TString getval () const; ACE_ALLOC_HOOK_DECLARE; protected: @@ -106,7 +106,7 @@ class ACE_Export ACE_BoolCapEntry : public ACE_CapEntry { public: ACE_BoolCapEntry (int val); - int getval (void) const; + int getval () const; ACE_ALLOC_HOOK_DECLARE; protected: diff --git a/ACE/ace/Capabilities.inl b/ACE/ace/Capabilities.inl index 0579ae6cd98..4745cd1c415 100644 --- a/ACE/ace/Capabilities.inl +++ b/ACE/ace/Capabilities.inl @@ -15,7 +15,7 @@ ACE_IntCapEntry::ACE_IntCapEntry (int val) } ACE_INLINE int -ACE_IntCapEntry::getval (void) const +ACE_IntCapEntry::getval () const { return val_; } @@ -28,7 +28,7 @@ ACE_StringCapEntry::ACE_StringCapEntry (const ACE_TString &val) } ACE_INLINE ACE_TString -ACE_StringCapEntry::getval (void) const +ACE_StringCapEntry::getval () const { return val_; } @@ -41,7 +41,7 @@ ACE_BoolCapEntry::ACE_BoolCapEntry (int val) } ACE_INLINE int -ACE_BoolCapEntry::getval (void) const +ACE_BoolCapEntry::getval () const { return val_; } diff --git a/ACE/ace/Compression/Compressor.cpp b/ACE/ace/Compression/Compressor.cpp index 191bc839a4c..4c1d2d20247 100644 --- a/ACE/ace/Compression/Compressor.cpp +++ b/ACE/ace/Compression/Compressor.cpp @@ -19,14 +19,14 @@ ACE_Compressor::~ACE_Compressor () } ACE_UINT64 -ACE_Compressor::compressed_bytes(void) const +ACE_Compressor::compressed_bytes() const { ACE_GUARD_RETURN( ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0 ); return this->compressed_bytes_; } ACE_UINT64 -ACE_Compressor::uncompressed_bytes(void) const +ACE_Compressor::uncompressed_bytes() const { ACE_GUARD_RETURN( ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0 ); return this->uncompressed_bytes_; @@ -49,7 +49,7 @@ ACE_Compressor::update_stats(ACE_UINT64 uncompressed_bytes, ACE_UINT64 compresse } float -ACE_Compressor::compression_ratio(void) const +ACE_Compressor::compression_ratio() const { ACE_GUARD_RETURN( ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0.0f ); if (this->uncompressed_bytes_ > 0) { diff --git a/ACE/ace/Compression/Compressor.h b/ACE/ace/Compression/Compressor.h index b20deb877bf..58c8207e1f5 100644 --- a/ACE/ace/Compression/Compressor.h +++ b/ACE/ace/Compression/Compressor.h @@ -48,9 +48,9 @@ enum ACE_CompressorId class ACE_Compression_Export ACE_Compressor { public: - ACE_CompressorId get_compressor_id(void) const; + ACE_CompressorId get_compressor_id() const; - ACE_UINT32 get_compression_level(void) const; + ACE_UINT32 get_compression_level() const; /** * Compress the @a in_ptr buffer for @a in_len into the @@ -86,17 +86,17 @@ public: /** * Return the current compressed bytes statistics counter. */ - virtual ACE_UINT64 compressed_bytes(void) const; + virtual ACE_UINT64 compressed_bytes() const; /** * Return the current uncompressed bytes statistics counter. */ - virtual ACE_UINT64 uncompressed_bytes(void) const; + virtual ACE_UINT64 uncompressed_bytes() const; /** * Return the current compression ratio statistics. */ - virtual float compression_ratio(void) const; + virtual float compression_ratio() const; /** * Reset the statistics to zero. diff --git a/ACE/ace/Compression/Compressor.inl b/ACE/ace/Compression/Compressor.inl index 5f9a10af74d..21914ac1063 100644 --- a/ACE/ace/Compression/Compressor.inl +++ b/ACE/ace/Compression/Compressor.inl @@ -2,13 +2,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_CompressorId -ACE_Compressor::get_compressor_id(void) const +ACE_Compressor::get_compressor_id() const { return this->compressor_id_; } ACE_INLINE ACE_UINT32 -ACE_Compressor::get_compression_level(void) const +ACE_Compressor::get_compression_level() const { return this->compression_level_; } diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h index 7e89c4de42e..44af82ad93d 100644 --- a/ACE/ace/Configuration.h +++ b/ACE/ace/Configuration.h @@ -151,7 +151,7 @@ public: * @return Reference to the configuration's root section. Note that * it is a const reference. */ - virtual const ACE_Configuration_Section_Key& root_section (void) const; + virtual const ACE_Configuration_Section_Key& root_section () const; /** * Opens a named section in an existing section. @@ -585,7 +585,7 @@ public: /// hash function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. - u_long hash (void) const; + u_long hash () const; // = Data members. diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 5c2bd164acc..ebce134ea32 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -72,7 +72,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (long id) } template <typename SVC_HANDLER> void -ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump (void) const +ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump"); @@ -219,7 +219,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler (void) } template <typename SVC_HANDLER, typename PEER_CONNECTOR> void -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::dump (void) const +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::dump"); @@ -279,7 +279,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler (SVC_HANDLER *s } template <typename SVC_HANDLER, typename PEER_CONNECTOR> PEER_CONNECTOR & -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connector (void) const +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connector () const { return const_cast<PEER_CONNECTOR &> (this->connector_); } @@ -663,7 +663,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor (ACE_Reactor *reactor) } template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Reactor * -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor (void) const +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor () const { return this->reactor_; } @@ -978,19 +978,19 @@ ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler (SVC_H } template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Creation_Strategy<SVC_HANDLER> * -ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::creation_strategy (void) const +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::creation_strategy () const { return this->creation_strategy_; } template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> * -ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_strategy (void) const +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_strategy () const { return this->connect_strategy_; } template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Concurrency_Strategy<SVC_HANDLER> * -ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::concurrency_strategy (void) const +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::concurrency_strategy () const { return this->concurrency_strategy_; } diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index cb98eb22183..d611f9d6b99 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -469,9 +469,9 @@ public: virtual int close (void); // = Strategies accessors - virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const; - virtual ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *connect_strategy (void) const; - virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const; + virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy () const; + virtual ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *connect_strategy () const; + virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/DEV_Addr.h b/ACE/ace/DEV_Addr.h index 8a024d45a89..2609a3febc0 100644 --- a/ACE/ace/DEV_Addr.h +++ b/ACE/ace/DEV_Addr.h @@ -50,7 +50,7 @@ public: ACE_DEV_Addr &operator= (const ACE_DEV_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; @@ -62,7 +62,7 @@ public: bool operator != (const ACE_DEV_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/DEV_Addr.inl b/ACE/ace/DEV_Addr.inl index 3025745f2c0..922fdfaefe0 100644 --- a/ACE/ace/DEV_Addr.inl +++ b/ACE/ace/DEV_Addr.inl @@ -38,7 +38,7 @@ ACE_DEV_Addr::operator != (const ACE_DEV_Addr &sap) const // Return the path name used for the rendezvous point. ACE_INLINE const ACE_TCHAR * -ACE_DEV_Addr::get_path_name (void) const +ACE_DEV_Addr::get_path_name () const { ACE_TRACE ("ACE_DEV_Addr::get_path_name"); diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h index 64612470e80..7e6b1fb552e 100644 --- a/ACE/ace/DLL_Manager.h +++ b/ACE/ace/DLL_Manager.h @@ -117,7 +117,7 @@ public: int close (int unload = 0); /// Return the current refcount. - sig_atomic_t refcount (void) const; + sig_atomic_t refcount () const; /// If @a symbol_name is in the symbol table of the DLL a pointer to /// the @a symbol_name is returned. Otherwise, returns 0. Set the @@ -257,7 +257,7 @@ public: int close_dll (const ACE_TCHAR *dll_name); /// Returns the current per-process UNLOAD_POLICY. - u_long unload_policy (void) const; + u_long unload_policy () const; /// Set the per-process UNLOAD_POLICY. If the policy is changed from /// LAZY to EAGER, then it will also unload any dlls with zero diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index 886ec3c78b3..88d30409c2e 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -374,10 +374,10 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl //@} /// Returns the current table size. - size_t size (void) const; + size_t size () const; /// Returns the maximum table size. - size_t max_size (void) const; + size_t max_size () const; /// Dump the state of an object. void dump () const; @@ -463,7 +463,7 @@ public: /// Get the timer queue /// @return The current @c ACE_Timer_Queue. - virtual ACE_Timer_Queue *timer_queue (void) const; + virtual ACE_Timer_Queue *timer_queue () const; /// Close down and release all resources. virtual int close (void); @@ -804,7 +804,7 @@ public: /// Returns the current size of the Reactor's internal descriptor /// table. - virtual size_t size (void) const; + virtual size_t size () const; /// Returns a reference to the Reactor's internal repository lock. virtual ACE_Lock &lock (void); diff --git a/ACE/ace/Dev_Poll_Reactor.inl b/ACE/ace/Dev_Poll_Reactor.inl index 2b69631f2c2..8a0332eb4e1 100644 --- a/ACE/ace/Dev_Poll_Reactor.inl +++ b/ACE/ace/Dev_Poll_Reactor.inl @@ -18,7 +18,7 @@ ACE_Dev_Poll_Reactor::Event_Tuple::Event_Tuple (ACE_Event_Handler *eh, // --------------------------------------------------------------------- ACE_INLINE size_t -ACE_Dev_Poll_Reactor::Handler_Repository::size (void) const +ACE_Dev_Poll_Reactor::Handler_Repository::size () const { ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::size"); @@ -26,7 +26,7 @@ ACE_Dev_Poll_Reactor::Handler_Repository::size (void) const } ACE_INLINE size_t -ACE_Dev_Poll_Reactor::Handler_Repository::max_size (void) const +ACE_Dev_Poll_Reactor::Handler_Repository::max_size () const { ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::max_size"); diff --git a/ACE/ace/Dirent_Selector.h b/ACE/ace/Dirent_Selector.h index 5f3051cf17e..a65d796476d 100644 --- a/ACE/ace/Dirent_Selector.h +++ b/ACE/ace/Dirent_Selector.h @@ -41,7 +41,7 @@ public: virtual ~ACE_Dirent_Selector (void); /// Return the length of the list of matching directory entries. - int length (void) const; + int length () const; /// Return the entry at @a index. ACE_DIRENT *operator[] (const int index) const; diff --git a/ACE/ace/Dirent_Selector.inl b/ACE/ace/Dirent_Selector.inl index 27651569b7d..dc5fa82859b 100644 --- a/ACE/ace/Dirent_Selector.inl +++ b/ACE/ace/Dirent_Selector.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_Dirent_Selector::length (void) const +ACE_Dirent_Selector::length () const { return n_; } diff --git a/ACE/ace/Dump_T.cpp b/ACE/ace/Dump_T.cpp index fc0833a9e39..240d2fbfc42 100644 --- a/ACE/ace/Dump_T.cpp +++ b/ACE/ace/Dump_T.cpp @@ -32,7 +32,7 @@ ACE_Dumpable_Adapter<Concrete>::operator->() const } template <class Concrete> void -ACE_Dumpable_Adapter<Concrete>::dump (void) const +ACE_Dumpable_Adapter<Concrete>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dumpable_Adapter<Concrete>::dump"); diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp index 3cb945b39ae..e5d6fe7dc6f 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint.cpp @@ -82,7 +82,7 @@ ETCL_Literal_Constraint::accept (ETCL_Constraint_Visitor* visitor) } Literal_Type -ETCL_Literal_Constraint::expr_type (void) const +ETCL_Literal_Constraint::expr_type () const { return this->type_; } @@ -93,12 +93,12 @@ ETCL_Literal_Constraint::operator= (const ETCL_Literal_Constraint& co) this->copy (co); } -ETCL_Literal_Constraint::operator ACE_CDR::Boolean (void) const +ETCL_Literal_Constraint::operator ACE_CDR::Boolean () const { return (this->type_ == ACE_ETCL_BOOLEAN) ? this->op_.bool_ : false; } -ETCL_Literal_Constraint::operator ACE_CDR::ULong (void) const +ETCL_Literal_Constraint::operator ACE_CDR::ULong () const { switch (this->type_) { diff --git a/ACE/ace/Event_Handler_T.cpp b/ACE/ace/Event_Handler_T.cpp index 51efca89136..6c403c143ca 100644 --- a/ACE/ace/Event_Handler_T.cpp +++ b/ACE/ace/Event_Handler_T.cpp @@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Event_Handler_T) template <class T> void -ACE_Event_Handler_T<T>::dump (void) const +ACE_Event_Handler_T<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Event_Handler_T<T>::dump"); @@ -57,7 +57,7 @@ ACE_Event_Handler_T<T>::ACE_Event_Handler_T (T *op_handler, int delete_handler, } template<class T> ACE_HANDLE -ACE_Event_Handler_T<T>::get_handle (void) const +ACE_Event_Handler_T<T>::get_handle () const { ACE_TRACE ("ACE_Event_Handler_T<T>::get_handle"); return this->get_handle_ == 0 ? ACE_INVALID_HANDLE : (this->op_handler_->*get_handle_) (); diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index d904aec15be..258396372a8 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -63,7 +63,7 @@ public: // = Typedefs to simplify pointer-to-member-function registration. // Get/set the underlying handle. - typedef ACE_HANDLE (T::*GET_HANDLE) (void) const; + typedef ACE_HANDLE (T::*GET_HANDLE) () const; typedef void (T::*SET_HANDLE) (ACE_HANDLE); /// Handle I/O events. @@ -95,7 +95,7 @@ public: // = Override all the ACE_Event_Handler methods. // These methods all delegate down to the <T> operations handler. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual void set_handle (ACE_HANDLE); virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE); diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h index 12c06e062a3..c1a39a9669b 100644 --- a/ACE/ace/File_Lock.h +++ b/ACE/ace/File_Lock.h @@ -119,7 +119,7 @@ public: int tryacquire_read (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1); /// Get underlying ACE_HANDLE for the file. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /** * Set underlying ACE_HANDLE. Note that this method assumes diff --git a/ACE/ace/File_Lock.inl b/ACE/ace/File_Lock.inl index fb9ae6e0c10..768f63500e4 100644 --- a/ACE/ace/File_Lock.inl +++ b/ACE/ace/File_Lock.inl @@ -76,7 +76,7 @@ ACE_File_Lock::remove (bool unlink_file) } ACE_INLINE ACE_HANDLE -ACE_File_Lock::get_handle (void) const +ACE_File_Lock::get_handle () const { // ACE_TRACE ("ACE_File_Lock::get_handle"); return this->lock_.handle_; diff --git a/ACE/ace/Filecache.h b/ACE/ace/Filecache.h index 4596edab25c..77e72483ff3 100644 --- a/ACE/ace/Filecache.h +++ b/ACE/ace/Filecache.h @@ -107,16 +107,16 @@ public: ~ACE_Filecache_Handle (void); /// Base address of memory mapped file. - void *address (void) const; + void *address () const; /// A handle (e.g., UNIX file descriptor, or NT file handle). - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Any associated error in handle creation and acquisition. - int error (void) const; + int error () const; /// The size of the file. - ACE_OFF_T size (void) const; + ACE_OFF_T size () const; protected: /// Default do nothing constructor. Prevent it from being called. @@ -264,24 +264,24 @@ public: int release (void); // = error_ accessors - int error (void) const; + int error () const; int error (int error_value, const ACE_TCHAR *s = ACE_TEXT ("ACE_Filecache_Object")); /// filename_ accessor - const ACE_TCHAR *filename (void) const; + const ACE_TCHAR *filename () const; /// handle_ accessor. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Base memory address for memory mapped file. - void *address (void) const; + void *address () const; /// size_ accessor. - ACE_OFF_T size (void) const; + ACE_OFF_T size () const; /// True if file on disk is newer than cached file. - int update (void) const; + int update () const; ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index c2ec6adfcc7..7b4a37d414f 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -48,7 +48,7 @@ ACE_Future_Observer<T>::~ACE_Future_Observer (void) // Dump the state of an object. template <class T> void -ACE_Future_Rep<T>::dump (void) const +ACE_Future_Rep<T>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -160,7 +160,7 @@ ACE_Future_Rep<T>::~ACE_Future_Rep (void) } template <class T> int -ACE_Future_Rep<T>::ready (void) const +ACE_Future_Rep<T>::ready () const { return this->value_ != 0; } @@ -353,7 +353,7 @@ ACE_Future<T>::set (const T &r) } template <class T> int -ACE_Future<T>::ready (void) const +ACE_Future<T>::ready () const { // We're ready if the ACE_Future_rep is ready... return this->future_rep_->ready (); @@ -411,7 +411,7 @@ ACE_Future<T>::operator = (const ACE_Future<T> &rhs) } template <class T> void -ACE_Future<T>::dump (void) const +ACE_Future<T>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index b206feaa511..8238511b765 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -197,7 +197,7 @@ private: static void assign (ACE_Future_Rep<T> *&rep, ACE_Future_Rep<T> *new_rep); /// Is result available? - int ready (void) const; + int ready () const; /// Pointer to the result. T *value_; @@ -313,7 +313,7 @@ public: operator T (); /// Check if the result is available. - int ready (void) const; + int ready () const; /** * Attaches the specified observer to a subject (this ACE_Future). diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h index 57e8721fc71..638b4614a84 100644 --- a/ACE/ace/Future_Set.h +++ b/ACE/ace/Future_Set.h @@ -59,7 +59,7 @@ public: * ACE_Future_Set via the ACE_Future_Set::next_readable() method, * or when the ACE_Future_Set has not been assigned any subjects. */ - int is_empty (void) const; + int is_empty () const; /** * Enqueus the given ACE_Future into this objects queue when it is diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp index 51da4e4e519..0290057722f 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp @@ -69,7 +69,7 @@ ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::item () } template <class EXT_ID, class INT_ID> void -ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::dump (void) const +ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -80,7 +80,7 @@ ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::dump (void) const } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void -ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -456,7 +456,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::re // ------------------------------------------------------------ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void -ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const +ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i () const { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); @@ -528,7 +528,7 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC // ------------------------------------------------------------ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void -ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const +ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i () const { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index 29cce896653..adb6f67cde8 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -392,11 +392,11 @@ public: /// Returns the current number of @c ACE_Hash_Multi_Map_Entry objects in the /// hash table. - size_t current_size (void) const; + size_t current_size () const; /// Return the size of the array that's used to point to the /// linked lists of @c ACE_Hash_Multi_Map_Entry objects in the hash table. - size_t total_size (void) const; + size_t total_size () const; /** * Returns a reference to the underlying @c ACE_LOCK. This makes it @@ -575,7 +575,7 @@ protected: ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *table (void); /// Accessor of the current size attribute - size_t cur_size (void) const; + size_t cur_size () const; private: /** @@ -622,13 +622,13 @@ public: int next (ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *&next_entry) const; /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Returns a reference to the interal element this object is pointing to. - ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns a pointer to the interal element this object is pointing to. - ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const; + ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>* operator-> () const; /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated /// over. @@ -651,7 +651,7 @@ protected: int reverse_i (void); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Map we are iterating over. ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_; @@ -688,13 +688,13 @@ public: int next (ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *&next_entry) const; /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Returns a reference to the interal element this object is pointing to. - ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns a pointer to the interal element this object is pointing to. - ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const; + ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>* operator-> () const; /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated /// over. @@ -717,7 +717,7 @@ protected: int reverse_i (void); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Map we are iterating over. const ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_; @@ -862,10 +862,10 @@ public: ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); /// Returns a reference to the interal element this object is pointing to. - ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns a pointer to the interal element this object is pointing to. - ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const; + ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>* operator-> () const; /// Returns reference the Hash_Multi_Map_Manager that is being iterated /// over. diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.inl b/ACE/ace/Hash_Multi_Map_Manager_T.inl index 5c9c5f6c60e..27bd2cc1f22 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.inl +++ b/ACE/ace/Hash_Multi_Map_Manager_T.inl @@ -53,13 +53,13 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~A } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size (void) const +ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size () const { return this->cur_size_; } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size (void) const +ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size () const { return this->total_size_; } @@ -454,7 +454,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ta template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::cur_size (void) const +ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::cur_size () const { return this->cur_size_; } @@ -490,7 +490,7 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done (void) const +ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done () const { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done"); @@ -501,7 +501,7 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> & -ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const +ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*"); ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -516,7 +516,7 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> * -ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const +ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->"); ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -588,7 +588,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done (void) const +ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done () const { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done"); @@ -599,7 +599,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> & -ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const +ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*"); ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -614,7 +614,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> * -ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const +ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->"); ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -656,7 +656,7 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -726,7 +726,7 @@ ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::o } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -872,7 +872,7 @@ ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_L template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> & -ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const +ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const { ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*"); @@ -881,7 +881,7 @@ ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_L template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> * -ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const +ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const { ACE_TRACE ("ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->"); @@ -916,7 +916,7 @@ ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_L template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h index 1388d424a97..9172a86eb51 100644 --- a/ACE/ace/INET_Addr.h +++ b/ACE/ace/INET_Addr.h @@ -343,16 +343,16 @@ public: #if defined (ACE_HAS_IPV6) /// Return @c true if the IP address is IPv6 linklocal address. - bool is_linklocal (void) const; + bool is_linklocal () const; /// Return @c true if the IP address is IPv6 sitelocal address. - bool is_sitelocal (void) const; + bool is_sitelocal () const; /// Return @c true if the IP address is IPv4-mapped IPv6 address. - bool is_ipv4_mapped_ipv6 (void) const; + bool is_ipv4_mapped_ipv6 () const; /// Return @c true if the IP address is IPv4-compatible IPv6 address. - bool is_ipv4_compat_ipv6 (void) const; + bool is_ipv4_compat_ipv6 () const; #endif /* ACE_HAS_IPV6 */ /** diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl index f8aa3f42a1e..871ff931d4d 100644 --- a/ACE/ace/INET_Addr.inl +++ b/ACE/ace/INET_Addr.inl @@ -220,7 +220,7 @@ ACE_INET_Addr::is_multicast () const #if defined (ACE_HAS_IPV6) // Return @c true if the IP address is IPv6 linklocal address. ACE_INLINE bool -ACE_INET_Addr::is_linklocal (void) const +ACE_INET_Addr::is_linklocal () const { if (this->get_type () == AF_INET6) return IN6_IS_ADDR_LINKLOCAL (&this->inet_addr_.in6_.sin6_addr); @@ -230,7 +230,7 @@ ACE_INET_Addr::is_linklocal (void) const // Return @c true if the IP address is IPv6 sitelocal address. ACE_INLINE bool -ACE_INET_Addr::is_sitelocal (void) const +ACE_INET_Addr::is_sitelocal () const { if (this->get_type () == AF_INET6) return IN6_IS_ADDR_SITELOCAL (&this->inet_addr_.in6_.sin6_addr); @@ -240,7 +240,7 @@ ACE_INET_Addr::is_sitelocal (void) const // Return @c true if the IP address is IPv4 mapped IPv6 address. ACE_INLINE bool -ACE_INET_Addr::is_ipv4_mapped_ipv6 (void) const +ACE_INET_Addr::is_ipv4_mapped_ipv6 () const { if (this->get_type () == AF_INET6) return IN6_IS_ADDR_V4MAPPED (&this->inet_addr_.in6_.sin6_addr); @@ -250,7 +250,7 @@ ACE_INET_Addr::is_ipv4_mapped_ipv6 (void) const // Return @c true if the IP address is IPv4-compatible IPv6 address. ACE_INLINE bool -ACE_INET_Addr::is_ipv4_compat_ipv6 (void) const +ACE_INET_Addr::is_ipv4_compat_ipv6 () const { if (this->get_type () == AF_INET6) return IN6_IS_ADDR_V4COMPAT (&this->inet_addr_.in6_.sin6_addr); diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index 27465c6c02d..8802c862a5f 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -311,18 +311,18 @@ protected: virtual ACE_HANDLE get_handle (void); # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) && !defined (ACE_USES_OLD_IOSTREAMS) - char *base (void) const + char *base () const { return cur_mode_ == get_mode_ ? eback_saved_ : cur_mode_ == put_mode_ ? pbase_saved_ : 0; } - char *ebuf (void) const + char *ebuf () const { return cur_mode_ == 0 ? 0 : base () + streambuf_size_; } - int blen (void) const + int blen () const { return streambuf_size_; } diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h index ed389dce9a6..d834c525470 100644 --- a/ACE/ace/IOStream_T.h +++ b/ACE/ace/IOStream_T.h @@ -135,7 +135,7 @@ public: * the return of <eof> and check it instead of calling <eof> * successively. */ - int eof (void) const; + int eof () const; # if defined (ACE_HAS_STRING_CLASS) /** diff --git a/ACE/ace/IOStream_T.inl b/ACE/ace/IOStream_T.inl index 1797de613df..800b2db181a 100644 --- a/ACE/ace/IOStream_T.inl +++ b/ACE/ace/IOStream_T.inl @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class STREAM> ACE_INLINE int -ACE_IOStream<STREAM>::eof (void) const +ACE_IOStream<STREAM>::eof () const { // Get the timeout value of the streambuf ACE_Time_Value *timeout = this->streambuf_->recv_timeout (0); diff --git a/ACE/ace/LSOCK.h b/ACE/ace/LSOCK.h index 61482cdf600..f48910e81f7 100644 --- a/ACE/ace/LSOCK.h +++ b/ACE/ace/LSOCK.h @@ -61,7 +61,7 @@ protected: ACE_LSOCK (ACE_HANDLE handle); /// Get handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Set handle. void set_handle (ACE_HANDLE handle); diff --git a/ACE/ace/LSOCK.inl b/ACE/ace/LSOCK.inl index 9815783f323..7e7d9d1d6bf 100644 --- a/ACE/ace/LSOCK.inl +++ b/ACE/ace/LSOCK.inl @@ -22,7 +22,7 @@ ACE_LSOCK::set_handle (ACE_HANDLE handle) // Gets the underlying file descriptor. ACE_INLINE ACE_HANDLE -ACE_LSOCK::get_handle (void) const +ACE_LSOCK::get_handle () const { ACE_TRACE ("ACE_LSOCK::get_handle"); return this->aux_handle_; diff --git a/ACE/ace/LSOCK_CODgram.h b/ACE/ace/LSOCK_CODgram.h index 0c9f8f64a96..0874a5ed93e 100644 --- a/ACE/ace/LSOCK_CODgram.h +++ b/ACE/ace/LSOCK_CODgram.h @@ -84,7 +84,7 @@ public: //@} /// Get underlying handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Set underlying handle. void set_handle (ACE_HANDLE); diff --git a/ACE/ace/LSOCK_CODgram.inl b/ACE/ace/LSOCK_CODgram.inl index 1ebcf344bb2..21091814f9c 100644 --- a/ACE/ace/LSOCK_CODgram.inl +++ b/ACE/ace/LSOCK_CODgram.inl @@ -18,7 +18,7 @@ ACE_LSOCK_CODgram::set_handle (ACE_HANDLE h) } ACE_INLINE ACE_HANDLE -ACE_LSOCK_CODgram::get_handle (void) const +ACE_LSOCK_CODgram::get_handle () const { ACE_TRACE ("ACE_LSOCK_CODgram::get_handle"); return this->ACE_SOCK_CODgram::get_handle (); diff --git a/ACE/ace/LSOCK_Dgram.h b/ACE/ace/LSOCK_Dgram.h index a5690f45f43..4c859a516b1 100644 --- a/ACE/ace/LSOCK_Dgram.h +++ b/ACE/ace/LSOCK_Dgram.h @@ -48,7 +48,7 @@ public: int protocol = 0); /// Get handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Set handle. void set_handle (ACE_HANDLE); diff --git a/ACE/ace/LSOCK_Dgram.inl b/ACE/ace/LSOCK_Dgram.inl index 6028a3586c2..8377025878b 100644 --- a/ACE/ace/LSOCK_Dgram.inl +++ b/ACE/ace/LSOCK_Dgram.inl @@ -10,7 +10,7 @@ ACE_LSOCK_Dgram::set_handle (ACE_HANDLE h) } ACE_INLINE ACE_HANDLE -ACE_LSOCK_Dgram::get_handle (void) const +ACE_LSOCK_Dgram::get_handle () const { ACE_TRACE ("ACE_LSOCK_Dgram::get_handle"); return this->ACE_SOCK_Dgram::get_handle (); diff --git a/ACE/ace/LSOCK_Stream.h b/ACE/ace/LSOCK_Stream.h index 9cf6e8373d3..d780d32973d 100644 --- a/ACE/ace/LSOCK_Stream.h +++ b/ACE/ace/LSOCK_Stream.h @@ -47,7 +47,7 @@ public: ACE_HANDLE &handle); /// Get handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Overrides set_handle() from the base classes. void set_handle (ACE_HANDLE fd); diff --git a/ACE/ace/LSOCK_Stream.inl b/ACE/ace/LSOCK_Stream.inl index 16b9489153e..a84c32953fb 100644 --- a/ACE/ace/LSOCK_Stream.inl +++ b/ACE/ace/LSOCK_Stream.inl @@ -13,7 +13,7 @@ ACE_LSOCK_Stream::set_handle (ACE_HANDLE fd) } ACE_INLINE ACE_HANDLE -ACE_LSOCK_Stream::get_handle (void) const +ACE_LSOCK_Stream::get_handle () const { ACE_TRACE ("ACE_LSOCK_Stream::get_handle"); return this->ACE_SOCK_Stream::get_handle (); diff --git a/ACE/ace/Local_Memory_Pool.h b/ACE/ace/Local_Memory_Pool.h index 4fb5111b705..ecf5e38ec0f 100644 --- a/ACE/ace/Local_Memory_Pool.h +++ b/ACE/ace/Local_Memory_Pool.h @@ -107,7 +107,7 @@ public: /// Return the base address of this memory pool, 0 if base_addr /// never changes. - virtual void *base_addr (void) const; + virtual void *base_addr () const; /// Dump the state of an object. virtual void dump () const; diff --git a/ACE/ace/Local_Name_Space.h b/ACE/ace/Local_Name_Space.h index 3938f77b840..ea7845baa8f 100644 --- a/ACE/ace/Local_Name_Space.h +++ b/ACE/ace/Local_Name_Space.h @@ -56,7 +56,7 @@ public: operator ACE_NS_WString () const; /// Return the ASCII character representation. - char *char_rep (void) const; + char *char_rep () const; /// Matches on substrings. int strstr (const ACE_NS_String &) const; @@ -68,13 +68,13 @@ public: bool operator != (const ACE_NS_String &) const; /// Returns length of the string - size_t len (void) const; + size_t len () const; /// Returns the underlying representation. - ACE_WCHAR_T *fast_rep (void) const; + ACE_WCHAR_T *fast_rep () const; /// Returns a hash value for this string. - u_long hash (void) const; + u_long hash () const; private: /// Length of the string. diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp index cf04a35f421..397ea23d6e4 100644 --- a/ACE/ace/Local_Name_Space_T.cpp +++ b/ACE/ace/Local_Name_Space_T.cpp @@ -811,7 +811,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_type_entries_i ( } template <ACE_MEM_POOL_1, class ACE_LOCK> void -ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const +ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i () const { ACE_TRACE ("ACE_Local_Name_Space::dump_i"); @@ -961,7 +961,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_type_entries ( } template <ACE_MEM_POOL_1, class ACE_LOCK> void -ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump (void) const +ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) // Note that we *must* use structured exception handling here diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h index fe8189670b1..3694de0e89b 100644 --- a/ACE/ace/Local_Name_Space_T.h +++ b/ACE/ace/Local_Name_Space_T.h @@ -205,7 +205,7 @@ public: /// Dump the state of the object virtual void dump () const; - virtual void dump_i (void) const; + virtual void dump_i () const; // = I just know this is going to cause problems on some platform... typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MEM_POOL_2, ACE_LOCK> > diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp index b0fa98ad2e5..b429cbd12f8 100644 --- a/ACE/ace/Local_Tokens.cpp +++ b/ACE/ace/Local_Tokens.cpp @@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL void -ACE_Tokens::dump (void) const +ACE_Tokens::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Tokens::dump"); @@ -67,7 +67,7 @@ ACE_Null_Token::~ACE_Null_Token (void) #endif /* ACE_LACKS_INLINE_FUNCTIONS */ void -ACE_TPQ_Entry::dump (void) const +ACE_TPQ_Entry::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TPQ_Entry::dump"); @@ -175,7 +175,7 @@ ACE_TSS_TPQ_Entry::~ACE_TSS_TPQ_Entry (void) } void -ACE_TSS_TPQ_Entry::dump (void) const +ACE_TSS_TPQ_Entry::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TSS_TPQ_Entry::dump"); @@ -198,7 +198,7 @@ ACE_TSS_TPQ_Entry::ACE_TSS_TPQ_Entry (const ACE_Token_Proxy *proxy, } ACE_TPQ_Entry * -ACE_TSS_TPQ_Entry::make_TSS_TYPE (void) const +ACE_TSS_TPQ_Entry::make_TSS_TYPE () const { ACE_TRACE ("ACE_TSS_TPQ_Entry::make_TSS_TYPE"); ACE_TPQ_Entry *temp; @@ -242,7 +242,7 @@ ACE_TPQ_Iterator::next (ACE_TPQ_Entry *&next_item) } int -ACE_TPQ_Iterator::done (void) const +ACE_TPQ_Iterator::done () const { ACE_TRACE ("ACE_TPQ_Iterator::done"); @@ -259,7 +259,7 @@ ACE_TPQ_Iterator::advance (void) } void -ACE_TPQ_Iterator::dump (void) const +ACE_TPQ_Iterator::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TPQ_Iterator::dump"); @@ -273,7 +273,7 @@ ACE_TPQ_Iterator::dump (void) const } void -ACE_Token_Proxy_Queue::dump (void) const +ACE_Token_Proxy_Queue::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Proxy_Queue::dump"); @@ -437,7 +437,7 @@ ACE_Token_Proxy_Queue::remove (const ACE_TPQ_Entry *remove_me) } void -ACE_Mutex_Token::dump (void) const +ACE_Mutex_Token::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Mutex_Token::dump"); @@ -676,7 +676,7 @@ ACE_Mutex_Token::is_owner (const ACE_TCHAR *id) } int -ACE_Mutex_Token::type (void) const +ACE_Mutex_Token::type () const { ACE_TRACE ("ACE_Mutex_Token::type"); return (int) ACE_Tokens::MUTEX; @@ -685,14 +685,14 @@ ACE_Mutex_Token::type (void) const // ************************************************************ int -ACE_RW_Token::type (void) const +ACE_RW_Token::type () const { ACE_TRACE ("ACE_RW_Token::type"); return (int) ACE_Tokens::RWLOCK; } void -ACE_RW_Token::dump (void) const +ACE_RW_Token::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RW_Token::dump"); @@ -1074,7 +1074,7 @@ ACE_RW_Token::is_owner (const ACE_TCHAR *id) } void -ACE_Token_Proxy::dump (void) const +ACE_Token_Proxy::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Proxy::dump"); @@ -1096,7 +1096,7 @@ ACE_Token_Proxy::dump (void) const } const ACE_TCHAR * -ACE_Token_Proxy::client_id (void) const +ACE_Token_Proxy::client_id () const { ACE_TRACE ("ACE_Token_Proxy::client_id"); // Thread-specific. @@ -1124,7 +1124,7 @@ ACE_Token_Proxy::owner_id (void) } const ACE_TCHAR * -ACE_Token_Proxy::name (void) const +ACE_Token_Proxy::name () const { ACE_TRACE ("ACE_Token_Proxy::name"); return this->token_->name (); @@ -1443,7 +1443,7 @@ ACE_Token_Proxy::token_acquired (ACE_TPQ_Entry *e) } int -ACE_Token_Proxy::type (void) const +ACE_Token_Proxy::type () const { ACE_TRACE ("ACE_Token_Proxy::type"); return 0; @@ -1499,7 +1499,7 @@ ACE_Token_Name::~ACE_Token_Name () } void -ACE_Token_Name::dump (void) const +ACE_Token_Name::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Name::dump"); @@ -1514,7 +1514,7 @@ ACE_Token_Name::dump (void) const // ************************************************************ ACE_Token_Proxy * -ACE_Local_Mutex::clone (void) const +ACE_Local_Mutex::clone () const { ACE_Token_Proxy *temp = 0; ACE_NEW_RETURN (temp, @@ -1556,13 +1556,13 @@ ACE_Local_RLock::create_token (const ACE_TCHAR *name) } int -ACE_Local_RLock::type (void) const +ACE_Local_RLock::type () const { return ACE_RW_Token::READER; } ACE_Token_Proxy * -ACE_Local_RLock::clone (void) const +ACE_Local_RLock::clone () const { ACE_Token_Proxy *temp = 0; ACE_NEW_RETURN (temp, @@ -1590,13 +1590,13 @@ ACE_Local_WLock::create_token (const ACE_TCHAR *name) } int -ACE_Local_WLock::type (void) const +ACE_Local_WLock::type () const { return ACE_RW_Token::WRITER; } ACE_Token_Proxy * -ACE_Local_WLock::clone (void) const +ACE_Local_WLock::clone () const { ACE_Token_Proxy *temp = 0; ACE_NEW_RETURN (temp, diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h index c420cf92e9e..2df0c741dff 100644 --- a/ACE/ace/Local_Tokens.h +++ b/ACE/ace/Local_Tokens.h @@ -125,19 +125,19 @@ public: void operator= (const ACE_TPQ_Entry &rhs); /// Get top of the queue. - ACE_Token_Proxy *proxy (void) const; + ACE_Token_Proxy *proxy () const; /// Set top of the queue. void proxy (ACE_Token_Proxy *); /// Get nesting level of the entry. - int nesting_level (void) const; + int nesting_level () const; /// Delta nesting level of the entry. void nesting_level (int delta); /// Get client_id of the entry. - const ACE_TCHAR *client_id (void) const; + const ACE_TCHAR *client_id () const; /// Set client_id of the entry. void client_id (const ACE_TCHAR *); @@ -152,7 +152,7 @@ public: void sleep_hook (void (*sh)(void *)); /// Get sleep hook of the entry. - PTVF sleep_hook (void) const; + PTVF sleep_hook () const; /// Call the sleep hook function or method passing arg. void call_sleep_hook (void); @@ -168,7 +168,7 @@ public: ACE_TPQ_Entry *next_; /// Get whether this client is blocked waiting for a token. - int waiting (void) const; + int waiting () const; /// Set whether this client is blocked waiting for a token. void waiting (int w); @@ -219,7 +219,7 @@ public: virtual ~ACE_TSS_TPQ_Entry (void); /// Allows us to pass args to the construction of the TSS object. - virtual ACE_TPQ_Entry *make_TSS_TYPE (void) const; + virtual ACE_TPQ_Entry *make_TSS_TYPE () const; /// Operator overloading and inheritance don't mix. operator ACE_TPQ_Entry *(void); @@ -272,7 +272,7 @@ public: int next (ACE_TPQ_Entry *&next_item); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Move forward by one element in the queue. void advance (void); @@ -445,7 +445,7 @@ public: * ACE_Token_Request so that the type of a token can be sent to a * remote Token Server. */ - virtual int type (void) const = 0; + virtual int type () const = 0; // = The following methods allow the deadlock detection algorithm to // check if this token has been visited. @@ -553,7 +553,7 @@ public: void dump () const; /// Returns ACE_Tokens::MUTEX. - virtual int type (void) const; + virtual int type () const; /// Returns a stack of the current owners. Returns -1 on error, 0 on /// success. If @a id is non-zero, returns 1 if id is an owner. @@ -651,7 +651,7 @@ public: enum PROXY_TYPE { READER, WRITER }; /// Returns READER or WRITER. - virtual int type (void) const; + virtual int type () const; /// Returns a stack of the current owners. Returns -1 on error, 0 on /// success. If @a id is non-zero, returns 1 if id is an owner. @@ -705,7 +705,7 @@ public: bool operator== (const ACE_Token_Name &rhs) const; /// Get the token name. - const ACE_TCHAR *name (void) const; + const ACE_TCHAR *name () const; /// Set the token name. void name (const ACE_TCHAR *new_name); @@ -823,7 +823,7 @@ public: /// Get the client id of the proxy. This is implemented as /// thread-specific data. - virtual const ACE_TCHAR *client_id (void) const; + virtual const ACE_TCHAR *client_id () const; /** * Set the client_id for the calling thread. I strongly recommend @@ -840,7 +840,7 @@ public: * So, for instance, the token within the reactor should probably be * called "Reactor Token." */ - virtual const ACE_TCHAR *name (void) const; + virtual const ACE_TCHAR *name () const; /** * This should really be called <someone_waiting>. This is called @@ -857,7 +857,7 @@ public: virtual const ACE_TCHAR *owner_id (void); /// Return a dynamically allocated clone of the derived class. - virtual ACE_Token_Proxy *clone (void) const = 0; + virtual ACE_Token_Proxy *clone () const = 0; /// Dump the state of the class. void dump () const; @@ -868,7 +868,7 @@ public: * should return a different type value than a Writer proxy. The * default implementation returns 0. */ - virtual int type (void) const; + virtual int type () const; protected: /// Duplication. @@ -937,7 +937,7 @@ public: ACE_Synch_Options::defaults) { return 0; } /// Return a dynamically allocated clone of the derived class. - virtual ACE_Token_Proxy *clone (void) const { return new ACE_Null_Token; } + virtual ACE_Token_Proxy *clone () const { return new ACE_Null_Token; } /// Dump the state of the class. void dump () const; @@ -985,7 +985,7 @@ public: void dump () const; /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; protected: /// Return a new ACE_Local_Mutex. @@ -1037,10 +1037,10 @@ public: void dump () const; /// Returns ACE_RW_Token::RLOCK. - virtual int type (void) const; + virtual int type () const; /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; protected: /// Return a new ACE_Local_Mutex. diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl index a57ca96344b..374b452a59f 100644 --- a/ACE/ace/Local_Tokens.inl +++ b/ACE/ace/Local_Tokens.inl @@ -203,7 +203,7 @@ ACE_Token_Name::name (const ACE_TCHAR *new_name) } ACE_INLINE const ACE_TCHAR* -ACE_Token_Name::name (void) const +ACE_Token_Name::name () const { ACE_TRACE ("ACE_Token_Name::name"); return this->token_name_; diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h index a1477de1a4d..dcf8cabaa0d 100644 --- a/ACE/ace/MEM_Acceptor.h +++ b/ACE/ace/MEM_Acceptor.h @@ -98,7 +98,7 @@ public: * within the same host can located the mmap file. Example: * /tmp/mmapfile. */ - const ACE_TCHAR *mmap_prefix (void) const; + const ACE_TCHAR *mmap_prefix () const; void mmap_prefix (const ACE_TCHAR *prefix); /** @@ -108,7 +108,7 @@ public: void init_buffer_size (ACE_OFF_T bytes); /// Get the preferred signaling strategy. - ACE_MEM_IO::Signal_Strategy preferred_strategy (void) const; + ACE_MEM_IO::Signal_Strategy preferred_strategy () const; /// Set the preferred signaling strategy. void preferred_strategy (ACE_MEM_IO::Signal_Strategy strategy); diff --git a/ACE/ace/MEM_Acceptor.inl b/ACE/ace/MEM_Acceptor.inl index 77e7b9b37d8..4d31ef56f20 100644 --- a/ACE/ace/MEM_Acceptor.inl +++ b/ACE/ace/MEM_Acceptor.inl @@ -52,7 +52,7 @@ ACE_MEM_Acceptor::get_local_addr (ACE_MEM_Addr &sap) const } ACE_INLINE const ACE_TCHAR * -ACE_MEM_Acceptor::mmap_prefix (void) const +ACE_MEM_Acceptor::mmap_prefix () const { return this->mmap_prefix_; } @@ -71,7 +71,7 @@ ACE_MEM_Acceptor::mmap_prefix (const ACE_TCHAR *prefix) } ACE_INLINE ACE_MEM_IO::Signal_Strategy -ACE_MEM_Acceptor::preferred_strategy (void) const +ACE_MEM_Acceptor::preferred_strategy () const { return this->preferred_strategy_; } diff --git a/ACE/ace/MEM_Addr.h b/ACE/ace/MEM_Addr.h index 7791cb1ec2b..a50c1fb737d 100644 --- a/ACE/ace/MEM_Addr.h +++ b/ACE/ace/MEM_Addr.h @@ -72,7 +72,7 @@ public: int set (const ACE_TCHAR port_name[]); /// Return a pointer to the underlying network 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); @@ -91,7 +91,7 @@ public: int encode = 1); /// 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 hostname. int get_host_name (ACE_TCHAR hostname[], @@ -102,7 +102,7 @@ public: * is non-reentrant since it returns a pointer to a static data * area). */ - const char *get_host_name (void) const; + const char *get_host_name () const; /** * Return the "dotted decimal" external Internet address representation of @@ -119,14 +119,14 @@ 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 external IP address, converting it into host byte /// order. - ACE_UINT32 get_ip_address (void) const; + ACE_UINT32 get_ip_address () const; - const ACE_INET_Addr &get_remote_addr (void) const; - const ACE_INET_Addr &get_local_addr (void) const; + const ACE_INET_Addr &get_remote_addr () const; + const ACE_INET_Addr &get_local_addr () const; /// Compare two addresses for equality. The addresses are considered /// equal if they contain the same IP address and port number. @@ -138,7 +138,7 @@ public: bool operator != (const ACE_INET_Addr &SAP) const; /// Computes and returns hash value. - virtual u_long hash (void) const; + virtual u_long hash () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/MEM_Addr.inl b/ACE/ace/MEM_Addr.inl index f849070acfb..748bc42c709 100644 --- a/ACE/ace/MEM_Addr.inl +++ b/ACE/ace/MEM_Addr.inl @@ -32,7 +32,7 @@ ACE_MEM_Addr::set (const ACE_TCHAR port_number[]) /// Return the port number. ACE_INLINE u_short -ACE_MEM_Addr::get_port_number (void) const +ACE_MEM_Addr::get_port_number () const { ACE_TRACE ("ACE_MEM_Addr::get_port_number"); return this->internal_.get_port_number (); @@ -40,7 +40,7 @@ ACE_MEM_Addr::get_port_number (void) const /// Return the "dotted decimal" external address. ACE_INLINE const char * -ACE_MEM_Addr::get_host_addr (void) const +ACE_MEM_Addr::get_host_addr () const { ACE_TRACE ("ACE_MEM_Addr::get_host_addr"); return this->external_.get_host_addr (); @@ -56,20 +56,20 @@ ACE_MEM_Addr::get_host_addr (char *addr, int addr_size) const /// Return the 4-byte IP address, converting it into host byte order. ACE_INLINE ACE_UINT32 -ACE_MEM_Addr::get_ip_address (void) const +ACE_MEM_Addr::get_ip_address () const { ACE_TRACE ("ACE_MEM_Addr::get_ip_address"); return this->external_.get_ip_address (); } ACE_INLINE const ACE_INET_Addr & -ACE_MEM_Addr::get_local_addr (void) const +ACE_MEM_Addr::get_local_addr () const { return this->internal_; } ACE_INLINE const ACE_INET_Addr & -ACE_MEM_Addr::get_remote_addr (void) const +ACE_MEM_Addr::get_remote_addr () const { return this->external_; } diff --git a/ACE/ace/MEM_Connector.h b/ACE/ace/MEM_Connector.h index ac7dd7570cf..1182198fa74 100644 --- a/ACE/ace/MEM_Connector.h +++ b/ACE/ace/MEM_Connector.h @@ -133,7 +133,7 @@ public: int perms = 0); /// Get the preferred signaling strategy. - ACE_MEM_IO::Signal_Strategy preferred_strategy (void) const; + ACE_MEM_IO::Signal_Strategy preferred_strategy () const; /// Set the preferred signaling strategy. void preferred_strategy (ACE_MEM_IO::Signal_Strategy strategy); diff --git a/ACE/ace/MEM_Connector.inl b/ACE/ace/MEM_Connector.inl index ca7a601f11e..9c60051ef20 100644 --- a/ACE/ace/MEM_Connector.inl +++ b/ACE/ace/MEM_Connector.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_MEM_IO::Signal_Strategy -ACE_MEM_Connector::preferred_strategy (void) const +ACE_MEM_Connector::preferred_strategy () const { return this->preferred_strategy_; } diff --git a/ACE/ace/MEM_SAP.h b/ACE/ace/MEM_SAP.h index 0053ebad40c..c9b37ae0adb 100644 --- a/ACE/ace/MEM_SAP.h +++ b/ACE/ace/MEM_SAP.h @@ -46,10 +46,10 @@ public: ACE_MEM_SAP_Node (size_t cap); /// Get the size of the data we hold. - size_t size (void) const; + size_t size () const; /// Get the capacity of this block of data. - size_t capacity (void) const; + size_t capacity () const; /// Get the pointer to the block of data we hold. void *data (void); diff --git a/ACE/ace/MEM_SAP.inl b/ACE/ace/MEM_SAP.inl index 87c6f9133f0..494d53db3d7 100644 --- a/ACE/ace/MEM_SAP.inl +++ b/ACE/ace/MEM_SAP.inl @@ -12,13 +12,13 @@ ACE_MEM_SAP_Node::ACE_MEM_SAP_Node (size_t cap) } ACE_INLINE size_t -ACE_MEM_SAP_Node::size (void) const +ACE_MEM_SAP_Node::size () const { return this->size_; } ACE_INLINE size_t -ACE_MEM_SAP_Node::capacity (void) const +ACE_MEM_SAP_Node::capacity () const { return this->capacity_; } diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h index e90264d0e14..d0f76ca8d93 100644 --- a/ACE/ace/MMAP_Memory_Pool.h +++ b/ACE/ace/MMAP_Memory_Pool.h @@ -210,13 +210,13 @@ public: virtual int remap (void *addr); /// Return the base address of this memory pool. - virtual void *base_addr (void) const; + virtual void *base_addr () const; /// Dump the state of an object. virtual void dump () const; /// Get reference to underlying ACE_Mem_Map object. - ACE_Mem_Map const & mmap (void) const; + ACE_Mem_Map const & mmap () const; /// Get reference to underlying ACE_Mem_Map object. ACE_Mem_Map & mmap (void); diff --git a/ACE/ace/MMAP_Memory_Pool.inl b/ACE/ace/MMAP_Memory_Pool.inl index bc494c4312d..a458c8e374a 100644 --- a/ACE/ace/MMAP_Memory_Pool.inl +++ b/ACE/ace/MMAP_Memory_Pool.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Mem_Map const & -ACE_MMAP_Memory_Pool::mmap (void) const +ACE_MMAP_Memory_Pool::mmap () const { return mmap_; } diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index 4f1cae29388..c61b0151cfd 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -154,7 +154,7 @@ ACE_Malloc_Stats::ACE_Malloc_Stats (void) } void -ACE_Malloc_Stats::dump (void) const +ACE_Malloc_Stats::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_Stats::dump"); diff --git a/ACE/ace/Malloc_Allocator.cpp b/ACE/ace/Malloc_Allocator.cpp index 0726226648c..d9ea4036355 100644 --- a/ACE/ace/Malloc_Allocator.cpp +++ b/ACE/ace/Malloc_Allocator.cpp @@ -196,7 +196,7 @@ ACE_New_Allocator::protect (void *, size_t, int) #if defined (ACE_HAS_MALLOC_STATS) void -ACE_New_Allocator::print_stats (void) const +ACE_New_Allocator::print_stats () const { } #endif /* ACE_HAS_MALLOC_STATS */ @@ -322,7 +322,7 @@ ACE_Static_Allocator_Base::protect (void *, size_t, int) #if defined (ACE_HAS_MALLOC_STATS) void -ACE_Static_Allocator_Base::print_stats (void) const +ACE_Static_Allocator_Base::print_stats () const { } #endif /* ACE_HAS_MALLOC_STATS */ diff --git a/ACE/ace/Malloc_Allocator.h b/ACE/ace/Malloc_Allocator.h index 52df2ac9480..6ea723f9637 100644 --- a/ACE/ace/Malloc_Allocator.h +++ b/ACE/ace/Malloc_Allocator.h @@ -71,7 +71,7 @@ public: virtual int protect (ssize_t len = -1, int prot = PROT_RDWR); virtual int protect (void *addr, size_t len, int prot = PROT_RDWR); #if defined (ACE_HAS_MALLOC_STATS) - virtual void print_stats (void) const; + virtual void print_stats () const; #endif /* ACE_HAS_MALLOC_STATS */ virtual void dump () const; @@ -115,7 +115,7 @@ public: virtual int protect (ssize_t len = -1, int prot = PROT_RDWR); virtual int protect (void *addr, size_t len, int prot = PROT_RDWR); #if defined (ACE_HAS_MALLOC_STATS) - virtual void print_stats (void) const; + virtual void print_stats () const; #endif /* ACE_HAS_MALLOC_STATS */ virtual void dump () const; diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h index c73f984e856..6f3ac403758 100644 --- a/ACE/ace/Malloc_Base.h +++ b/ACE/ace/Malloc_Base.h @@ -145,7 +145,7 @@ public: #if defined (ACE_HAS_MALLOC_STATS) /// Dump statistics of how malloc is behaving. - virtual void print_stats (void) const = 0; + virtual void print_stats () const = 0; #endif /* ACE_HAS_MALLOC_STATS */ /// Dump the state of the object. diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index a2cd42f0d2a..fbe0ec735e7 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -345,7 +345,7 @@ ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter () #if defined (ACE_HAS_MALLOC_STATS) template <class MALLOC> void -ACE_Allocator_Adapter<MALLOC>::print_stats (void) const +ACE_Allocator_Adapter<MALLOC>::print_stats () const { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::print_stats"); this->allocator_.print_stats (); @@ -384,7 +384,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump () const #if defined (ACE_HAS_MALLOC_STATS) template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::print_stats (void) const +ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::print_stats () const { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::print_stats"); ACE_GUARD (ACE_LOCK, ace_mon, *this->lock_); diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index 47aa74b0180..e7c28760a8c 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -342,7 +342,7 @@ public: #if defined (ACE_HAS_MALLOC_STATS) /// Dump statistics of how malloc is behaving. - virtual void print_stats (void) const; + virtual void print_stats () const; #endif /* ACE_HAS_MALLOC_STATS */ /// Dump the state of the object. @@ -414,7 +414,7 @@ class ACE_Malloc_FIFO_Iterator_T; * The MEMORY_POOL class must provide the following methods: * - constructor (const ACE_TCHAR *pool_name) * - constructor (const ACE_TCHAR *pool_name, const MEMORY_POOL_OPTIONS *options) - * - void dump (void) const (needed if ACE is built with ACE_HAS_DUMP defined) + * - void dump () const (needed if ACE is built with ACE_HAS_DUMP defined) * - void *init_acquire (size_t nbytes, size_t &rounded_bytes, int &first_time); * - int release (void) * - void *acquire (size_t nbytes, size_t &rounded_bytes) @@ -597,7 +597,7 @@ public: #if defined (ACE_HAS_MALLOC_STATS) /// Dump statistics of how malloc is behaving. - void print_stats (void) const; + void print_stats () const; #endif /* ACE_HAS_MALLOC_STATS */ /// Returns a pointer to the lock used to provide mutual exclusion to diff --git a/ACE/ace/Mem_Map.inl b/ACE/ace/Mem_Map.inl index 0d9994ce811..4eb164f8d81 100644 --- a/ACE/ace/Mem_Map.inl +++ b/ACE/ace/Mem_Map.inl @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_HANDLE -ACE_Mem_Map::handle (void) const +ACE_Mem_Map::handle () const { ACE_TRACE ("ACE_Mem_Map::handle"); return this->handle_; @@ -15,7 +15,7 @@ ACE_Mem_Map::handle (void) const // Return the name of file that is mapped (if any). ACE_INLINE const ACE_TCHAR * -ACE_Mem_Map::filename (void) const +ACE_Mem_Map::filename () const { return this->filename_; } @@ -75,7 +75,7 @@ ACE_Mem_Map::operator () (void *&addr) // Return the base address. ACE_INLINE void * -ACE_Mem_Map::addr (void) const +ACE_Mem_Map::addr () const { ACE_TRACE ("ACE_Mem_Map::addr"); @@ -86,7 +86,7 @@ ACE_Mem_Map::addr (void) const // file. ACE_INLINE size_t -ACE_Mem_Map::size (void) const +ACE_Mem_Map::size () const { ACE_TRACE ("ACE_Mem_Map::size"); return this->length_; diff --git a/ACE/ace/Message_Queue_NT.cpp b/ACE/ace/Message_Queue_NT.cpp index 8107c6c7c58..0273fe9f841 100644 --- a/ACE/ace/Message_Queue_NT.cpp +++ b/ACE/ace/Message_Queue_NT.cpp @@ -190,7 +190,7 @@ ACE_Message_Queue_NT::pulse (void) } void -ACE_Message_Queue_NT::dump (void) const +ACE_Message_Queue_NT::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue_NT::dump"); diff --git a/ACE/ace/Message_Queue_Vx.cpp b/ACE/ace/Message_Queue_Vx.cpp index 15e6d140368..0805a43d01d 100644 --- a/ACE/ace/Message_Queue_Vx.cpp +++ b/ACE/ace/Message_Queue_Vx.cpp @@ -17,7 +17,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_Message_Queue_Vx); void -ACE_Message_Queue_Vx::dump (void) const +ACE_Message_Queue_Vx::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue_Vx::dump"); diff --git a/ACE/ace/Method_Request.h b/ACE/ace/Method_Request.h index 2b59488e9e7..66bd5449345 100644 --- a/ACE/ace/Method_Request.h +++ b/ACE/ace/Method_Request.h @@ -51,7 +51,7 @@ public: // = Accessors. /// Get priority. - unsigned long priority (void) const; + unsigned long priority () const; /// Set priority. /** diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h index d851c008e49..c05862183c5 100644 --- a/ACE/ace/Metrics_Cache_T.h +++ b/ACE/ace/Metrics_Cache_T.h @@ -162,7 +162,7 @@ public: void metrics_enabled(int enabled); /// Return the enable state for metrics collection. - int metrics_enabled(void) const; + int metrics_enabled() const; protected: diff --git a/ACE/ace/Metrics_Cache_T.inl b/ACE/ace/Metrics_Cache_T.inl index 5b2e1a77153..e4900cb88b8 100644 --- a/ACE/ace/Metrics_Cache_T.inl +++ b/ACE/ace/Metrics_Cache_T.inl @@ -229,7 +229,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::metrics_enabled(int enabled) template <class ACE_LOCK, class ALLOCATOR> ACE_INLINE int -ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::metrics_enabled(void) const +ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::metrics_enabled() const { return metrics_enabled_; } diff --git a/ACE/ace/Monitor_Admin.h b/ACE/ace/Monitor_Admin.h index c506c049efa..1f733bce593 100644 --- a/ACE/ace/Monitor_Admin.h +++ b/ACE/ace/Monitor_Admin.h @@ -88,7 +88,7 @@ namespace ACE /// This mutator allows the application to create its own reactor /// and substitute it for the default reactor. void reactor (ACE_Reactor* new_reactor); - ACE_Reactor* reactor (void) const; + ACE_Reactor* reactor () const; private: Monitor_Point_Auto_Updater auto_updater_; diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h index e1b03990333..9308dbbe17f 100644 --- a/ACE/ace/NT_Service.h +++ b/ACE/ace/NT_Service.h @@ -163,16 +163,16 @@ public: void name (const ACE_TCHAR *name, const ACE_TCHAR *desc = 0); /// Get the service name. - const ACE_TCHAR *name (void) const; + const ACE_TCHAR *name () const; /// Get the service description. - const ACE_TCHAR *desc (void) const; + const ACE_TCHAR *desc () const; /// Sets the host machine void host (const ACE_TCHAR *host); /// Get the host machine. - const ACE_TCHAR *host (void) const; + const ACE_TCHAR *host () const; /** * Insert (create) the service in the NT Service Control Manager, diff --git a/ACE/ace/NT_Service.inl b/ACE/ace/NT_Service.inl index 9808ce8f7b9..c5af76d4018 100644 --- a/ACE/ace/NT_Service.inl +++ b/ACE/ace/NT_Service.inl @@ -53,21 +53,21 @@ ACE_NT_Service::svc (void) ACE_INLINE const ACE_TCHAR * -ACE_NT_Service::name (void) const +ACE_NT_Service::name () const { return name_; } ACE_INLINE const ACE_TCHAR * -ACE_NT_Service::desc (void) const +ACE_NT_Service::desc () const { return desc_; } ACE_INLINE const ACE_TCHAR * -ACE_NT_Service::host (void) const +ACE_NT_Service::host () const { return host_; } diff --git a/ACE/ace/Name_Proxy.h b/ACE/ace/Name_Proxy.h index 7152cd76f96..93ac6d6c608 100644 --- a/ACE/ace/Name_Proxy.h +++ b/ACE/ace/Name_Proxy.h @@ -67,7 +67,7 @@ public: int recv_reply (ACE_Name_Request &reply); /// Obtain underlying handle. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Close down the connection to the server. virtual ~ACE_Name_Proxy (void); diff --git a/ACE/ace/Name_Request_Reply.h b/ACE/ace/Name_Request_Reply.h index b11f8747bc2..ec49d3679c4 100644 --- a/ACE/ace/Name_Request_Reply.h +++ b/ACE/ace/Name_Request_Reply.h @@ -84,43 +84,43 @@ public: void init (void); // = Set/get the length of the encoded/decoded message. - ACE_UINT32 length (void) const; + ACE_UINT32 length () const; void length (ACE_UINT32); // = Set/get the type of the message. - ACE_INT32 msg_type (void) const; + ACE_INT32 msg_type () const; void msg_type (ACE_INT32); // = Set/get the blocking semantics. - ACE_UINT32 block_forever (void) const; + ACE_UINT32 block_forever () const; void block_forever (ACE_UINT32); // = Set/get the timeout. - ACE_Time_Value timeout (void) const; + ACE_Time_Value timeout () const; void timeout (const ACE_Time_Value timeout); // = Set/get the name - const ACE_WCHAR_T *name (void) const; + const ACE_WCHAR_T *name () const; void name (const ACE_WCHAR_T *); // = Set/get the value - const ACE_WCHAR_T *value (void) const; + const ACE_WCHAR_T *value () const; void value (const ACE_WCHAR_T *); // = Set/get the type - const char *type (void) const; + const char *type () const; void type (const char *); // = Set/get the len of name - ACE_UINT32 name_len (void) const; + ACE_UINT32 name_len () const; void name_len (ACE_UINT32); // = Set/get the len of value - ACE_UINT32 value_len (void) const; + ACE_UINT32 value_len () const; void value_len (ACE_UINT32); // = Set/get the len of type - ACE_UINT32 type_len (void) const; + ACE_UINT32 type_len () const; void type_len (ACE_UINT32); /// Encode the message before transmission. @@ -211,19 +211,19 @@ public: void init (void); // = Set/get the length of the encoded/decoded message. - ACE_UINT32 length (void) const; + ACE_UINT32 length () const; void length (ACE_UINT32); // = Set/get the type of the message. - ACE_INT32 msg_type (void) const; + ACE_INT32 msg_type () const; void msg_type (ACE_INT32); // = Set/get the status of the reply (0 == success, -1 == failure). - ACE_INT32 status (void) const; + ACE_INT32 status () const; void status (ACE_INT32); // = Set/get the errno of a failed reply. - ACE_UINT32 errnum (void) const; + ACE_UINT32 errnum () const; void errnum (ACE_UINT32); /// Encode the message before transfer. diff --git a/ACE/ace/Name_Space.h b/ACE/ace/Name_Space.h index 1b3ff1c7936..cee698efd33 100644 --- a/ACE/ace/Name_Space.h +++ b/ACE/ace/Name_Space.h @@ -152,7 +152,7 @@ public: const ACE_NS_WString &pattern) = 0; /// Dump the state of the object - virtual void dump (void) const = 0; + virtual void dump () const = 0; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h index 35bafa2ffee..453e1822f10 100644 --- a/ACE/ace/Naming_Context.h +++ b/ACE/ace/Naming_Context.h @@ -326,7 +326,7 @@ public: char *base_address (void); /// Get use of registry in naming - bool use_registry (void) const; + bool use_registry () const; /// Set use of registry in naming void use_registry (bool x); diff --git a/ACE/ace/Naming_Context.inl b/ACE/ace/Naming_Context.inl index 77d451e820a..bd61adb77cd 100644 --- a/ACE/ace/Naming_Context.inl +++ b/ACE/ace/Naming_Context.inl @@ -1,5 +1,5 @@ ACE_INLINE bool -ACE_Name_Options::use_registry (void) const +ACE_Name_Options::use_registry () const { ACE_TRACE ("ACE_Name_Options::use_registry"); return this->use_registry_; diff --git a/ACE/ace/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h index 2d934b14086..5b08d5fb78f 100644 --- a/ACE/ace/Netlink_Addr.h +++ b/ACE/ace/Netlink_Addr.h @@ -63,19 +63,19 @@ public: /** * @return pid */ - int get_pid (void) const; + int get_pid () const; /** * @return the group id @see nl_ */ - int get_gid (void) const; + int get_gid () const; /** * @return addr pointer @see nl_ */ - virtual void *get_addr (void) const; + virtual void *get_addr () const; /** * @return nl_ member @see nl_ size */ - int get_addr_size (void) const; + int get_addr_size () const; /** * Set a pointer to the address */ @@ -89,7 +89,7 @@ private: * @return family type AF_NETLINK * * */ - int determine_type (void) const; + int determine_type () const; /** * set nl_ @see nl_ to zero and sets address family to default value */ diff --git a/ACE/ace/Netlink_Addr.inl b/ACE/ace/Netlink_Addr.inl index 06c31b65d17..2c8dbb1e55c 100644 --- a/ACE/ace/Netlink_Addr.inl +++ b/ACE/ace/Netlink_Addr.inl @@ -21,17 +21,17 @@ ACE_INLINE void ACE_Netlink_Addr::reset (void) this->nl_.nl_family = AF_NETLINK; } -ACE_INLINE int ACE_Netlink_Addr::determine_type (void) const +ACE_INLINE int ACE_Netlink_Addr::determine_type () const { return AF_NETLINK; } -ACE_INLINE void *ACE_Netlink_Addr::get_addr (void) const +ACE_INLINE void *ACE_Netlink_Addr::get_addr () const { return (void*)&(this->nl_); } -ACE_INLINE int ACE_Netlink_Addr::get_addr_size (void) const +ACE_INLINE int ACE_Netlink_Addr::get_addr_size () const { return sizeof(this->nl_); } diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 5a1da97c9df..32ffcdf915c 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -342,7 +342,7 @@ class ACE_Export ACE_cond_t public: /// Returns the number of waiters. - long waiters (void) const; + long waiters () const; //protected: /// Number of waiting threads. @@ -963,7 +963,7 @@ public: ACE_TSS_Info (void); /// Returns 1 if the key is in use, 0 if not. - int key_in_use (void) const { return thread_count_ != -1; } + int key_in_use () const { return thread_count_ != -1; } /// Mark the key as being in use if the flag is non-zero, or /// not in use if the flag is 0. diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 7ab6d5894f1..8d3c29a913a 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -30,7 +30,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_LACKS_COND_T) && defined (ACE_HAS_THREADS) ACE_INLINE long -ACE_cond_t::waiters (void) const +ACE_cond_t::waiters () const { return this->waiters_; } diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h index 722241d7662..3c26f5fe726 100644 --- a/ACE/ace/OS_NS_errno.h +++ b/ACE/ace/OS_NS_errno.h @@ -69,7 +69,7 @@ public: static void fini (); static ACE_CE_Errno *instance (); - operator int (void) const; + operator int () const; int operator= (int); private: diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl index 408039c5526..9dcbe998360 100644 --- a/ACE/ace/OS_NS_errno.inl +++ b/ACE/ace/OS_NS_errno.inl @@ -62,7 +62,7 @@ ACE_CE_Errno::instance () } ACE_INLINE -ACE_CE_Errno::operator int (void) const +ACE_CE_Errno::operator int () const { return (int) TlsGetValue (ACE_CE_Errno::errno_key_); } diff --git a/ACE/ace/PI_Malloc.h b/ACE/ace/PI_Malloc.h index 2fee63360c2..db21328abf5 100644 --- a/ACE/ace/PI_Malloc.h +++ b/ACE/ace/PI_Malloc.h @@ -120,7 +120,7 @@ public: void *base_addr); /// Return a pointer to the name of this node. - const char *name (void) const; + const char *name () const; /// Assign a name; void name (const char *); diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h index 2fde60e791c..e98a7151d36 100644 --- a/ACE/ace/POSIX_Asynch_IO.h +++ b/ACE/ace/POSIX_Asynch_IO.h @@ -57,13 +57,13 @@ class ACE_Export ACE_POSIX_Asynch_Result : public virtual ACE_Asynch_Result_Impl { public: /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This is the ACT associated with the handle on which the @@ -71,13 +71,13 @@ public: * * @note This is not implemented for POSIX4 platforms. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fails. - u_long error (void) const; + u_long error () const; /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /** * This really make sense only when doing file I/O. @@ -86,18 +86,18 @@ public: * aiocb64. * */ - u_long offset (void) const; - u_long offset_high (void) const; + u_long offset () const; + u_long offset_high () const; /// Priority of the operation. - int priority (void) const; + int priority () const; /** * POSIX4 realtime signal number to be used for the * operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By * default, SIGRTMIN is used to issue <aio_> calls. */ - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor. int post_completion (ACE_Proactor_Impl *proactor); @@ -175,10 +175,10 @@ public: // = Access methods. /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; /// Return the underlying Proactor implementation. - ACE_POSIX_Proactor * posix_proactor (void) const; + ACE_POSIX_Proactor * posix_proactor () const; protected: /// Constructor. @@ -232,13 +232,13 @@ class ACE_Export ACE_POSIX_Asynch_Read_Stream_Result : public virtual ACE_Asynch public: /// The number of bytes which were requested at the start of the /// asynchronous read. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for reading. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; protected: ACE_POSIX_Asynch_Read_Stream_Result (const ACE_Handler::Proxy_Ptr &handler_proxy, @@ -320,13 +320,13 @@ class ACE_Export ACE_POSIX_Asynch_Write_Stream_Result : public virtual ACE_Async public: /// The number of bytes which were requested at the start of the /// asynchronous write. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Message block that contains the data to be written. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for writing. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; protected: /// Constructor is protected since creation is limited to @@ -598,16 +598,16 @@ class ACE_Export ACE_POSIX_Asynch_Accept_Result : public virtual ACE_Asynch_Acce public: /// The number of bytes which were requested at the start of the /// asynchronous accept. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for accepting new connections. - ACE_HANDLE listen_handle (void) const; + ACE_HANDLE listen_handle () const; /// I/O handle for the new connection. - ACE_HANDLE accept_handle (void) const; + ACE_HANDLE accept_handle () const; protected: /// Constructor is protected since creation is limited to @@ -707,7 +707,7 @@ public: int close (); /// virtual from ACE_Event_Handler - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// virtual from ACE_Event_Handler void set_handle (ACE_HANDLE handle); @@ -766,7 +766,7 @@ class ACE_Export ACE_POSIX_Asynch_Connect_Result : public virtual ACE_Asynch_Con public: /// I/O handle for the connection. - ACE_HANDLE connect_handle (void) const; + ACE_HANDLE connect_handle () const; protected: /// Constructor is protected since creation is limited to @@ -846,7 +846,7 @@ public: int close (void); /// virtual from ACE_Event_Handler - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// virtual from ACE_Event_Handler void set_handle (ACE_HANDLE handle); @@ -920,24 +920,24 @@ class ACE_Export ACE_POSIX_Asynch_Transmit_File_Result : public virtual ACE_Asyn public: /// Socket used for transmitting the file. - ACE_HANDLE socket (void) const; + ACE_HANDLE socket () const; /// File from which the data is read. - ACE_HANDLE file (void) const; + ACE_HANDLE file () const; /// Header and trailer data associated with this transmit file. - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const; + ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer () const; /// The number of bytes which were requested at the start of the /// asynchronous transmit file. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Number of bytes per send requested at the start of the transmit /// file. - size_t bytes_per_send (void) const; + size_t bytes_per_send () const; /// Flags which were passed into transmit file. - u_long flags (void) const; + u_long flags () const; protected: ACE_POSIX_Asynch_Transmit_File_Result (const ACE_Handler::Proxy_Ptr &handler_proxy, @@ -1098,16 +1098,16 @@ class ACE_Export ACE_POSIX_Asynch_Write_Dgram_Result : public virtual ACE_Asynch public: /// The number of bytes which were requested at the start of the /// asynchronous write. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Message block which contains the sent data - ACE_Message_Block *message_block (void) const; + ACE_Message_Block *message_block () const; /// The flags using in the write - int flags (void) const; + int flags () const; /// I/O handle used for writing. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; protected: /// Constructor is protected since creation is limited to @@ -1226,21 +1226,21 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_ public: /// The number of bytes which were requested at the start of the /// asynchronous read. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data - ACE_Message_Block *message_block (void) const; + ACE_Message_Block *message_block () const; /// The address of where the packet came from int remote_address (ACE_Addr& addr) const; - sockaddr *saddr (void) const; + sockaddr *saddr () const; /// The flags used in the read - int flags (void) const; + int flags () const; /// I/O handle used for reading. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; protected: /// Constructor is protected since creation is limited to diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index 3002550ad34..076c0847a59 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -148,11 +148,11 @@ public: int close_dispatch_threads (int wait); /// @@ This is a no-op on POSIX platforms. Returns 0. - size_t number_of_threads (void) const; + size_t number_of_threads () const; void number_of_threads (size_t threads); /// This is a no-op in POSIX. Returns ACE_INVALID_HANDLE. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; // Methods used to create Asynch IO factory and result objects. We // create the right objects here in these methods. @@ -575,7 +575,7 @@ protected: int setup_signal_handler (int signal_number) const; /// Insures that RT_completion_signals_ are blocked in the calling thread. - int block_signals (void) const; + int block_signals () const; /** * Dispatch a single set of events. @a timeout is a pointer to a diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h index 4a78171b75a..49f20b47880 100644 --- a/ACE/ace/Pagefile_Memory_Pool.h +++ b/ACE/ace/Pagefile_Memory_Pool.h @@ -114,9 +114,9 @@ public: /// Return the base address of this memory pool, 0 if base_addr /// never changes. - virtual void *base_addr (void) const; + virtual void *base_addr () const; - void dump (void) const {} + void dump () const {} protected: /** diff --git a/ACE/ace/Pagefile_Memory_Pool.inl b/ACE/ace/Pagefile_Memory_Pool.inl index 30003e0b1e7..e6b2919d873 100644 --- a/ACE/ace/Pagefile_Memory_Pool.inl +++ b/ACE/ace/Pagefile_Memory_Pool.inl @@ -41,7 +41,7 @@ ACE_Pagefile_Memory_Pool::protect (void *, size_t, int) } ACE_INLINE void * -ACE_Pagefile_Memory_Pool::base_addr (void) const +ACE_Pagefile_Memory_Pool::base_addr () const { return 0; } diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h index 7686bdeb62c..41bf735bba6 100644 --- a/ACE/ace/Parse_Node.h +++ b/ACE/ace/Parse_Node.h @@ -50,14 +50,14 @@ public: explicit ACE_Parse_Node (const ACE_TCHAR *name); virtual ~ACE_Parse_Node (void); - ACE_Parse_Node *link (void) const; + ACE_Parse_Node *link () const; void link (ACE_Parse_Node *); /// Will update the yyereno member and/or the corresponding configuration virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno) = 0; - const ACE_TCHAR *name (void) const; - void print (void) const; + const ACE_TCHAR *name () const; + void print () const; /// Dump the state of an object. void dump () const; @@ -176,7 +176,7 @@ public: virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); virtual const ACE_Service_Type *record (const ACE_Service_Gestalt *g) const; - ACE_TCHAR *parameters (void) const; + ACE_TCHAR *parameters () const; /// Dump the state of an object. void dump () const; @@ -212,7 +212,7 @@ public: virtual ~ACE_Dynamic_Node (void); - // virtual const ACE_Service_Type *record (void) const; + // virtual const ACE_Service_Type *record () const; virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); /// Dump the state of an object. @@ -309,9 +309,9 @@ class ACE_Location_Node public: ACE_Location_Node (void); const ACE_DLL &dll (void); - const ACE_TCHAR *pathname (void) const; + const ACE_TCHAR *pathname () const; void pathname (const ACE_TCHAR *h); - int dispose (void) const; + int dispose () const; virtual ~ACE_Location_Node (void); virtual void set_symbol (void *h); @@ -490,7 +490,7 @@ public: ACE_Service_Type *make_service_type (ACE_Service_Gestalt *pcfg) const; - ACE_TCHAR const* name (void) const; + ACE_TCHAR const* name () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Pipe.h b/ACE/ace/Pipe.h index d118479141e..c257341b356 100644 --- a/ACE/ace/Pipe.h +++ b/ACE/ace/Pipe.h @@ -72,14 +72,14 @@ public: * processes can also write to this handle as well since pipes are * bi-directional. */ - ACE_HANDLE read_handle (void) const; + ACE_HANDLE read_handle () const; /** * This is the "write" side of the pipe. Note, however, that * processes can also read to this handle as well since pipes are * bi-directional. */ - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; /// Dump the state of the object. void dump () const; diff --git a/ACE/ace/Pipe.inl b/ACE/ace/Pipe.inl index 85900d2d6ed..35af84ff287 100644 --- a/ACE/ace/Pipe.inl +++ b/ACE/ace/Pipe.inl @@ -12,14 +12,14 @@ ACE_Pipe::~ACE_Pipe (void) } ACE_INLINE ACE_HANDLE -ACE_Pipe::read_handle (void) const +ACE_Pipe::read_handle () const { ACE_TRACE ("ACE_Pipe::read_handle"); return this->handles_[0]; } ACE_INLINE ACE_HANDLE -ACE_Pipe::write_handle (void) const +ACE_Pipe::write_handle () const { ACE_TRACE ("ACE_Pipe::write_handle"); return this->handles_[1]; diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h index 31c4aa2e210..a2c87f35cdf 100644 --- a/ACE/ace/Proactor.h +++ b/ACE/ace/Proactor.h @@ -363,13 +363,13 @@ public: int close_dispatch_threads (int wait); /// Get number of thread used as a parameter to CreatIoCompletionPort. - size_t number_of_threads (void) const; + size_t number_of_threads () const; /// Set number of thread used as a parameter to CreatIoCompletionPort. void number_of_threads (size_t threads); /// Get timer queue. - ACE_Proactor_Timer_Queue *timer_queue (void) const; + ACE_Proactor_Timer_Queue *timer_queue () const; /// Set timer queue. void timer_queue (ACE_Proactor_Timer_Queue *timer_queue); @@ -379,10 +379,10 @@ public: * It is a no-op in POSIX platforms and it returns * ACE_INVALID_HANDLE. */ - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Get the implementation class. - ACE_Proactor_Impl *implementation (void) const; + ACE_Proactor_Impl *implementation () const; // = Factory methods for the operations diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 886d1cf6247..2df5ac5a37e 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -311,7 +311,7 @@ public: /// Get the process_attributes. Returns NULL if /// set_process_attributes has not been set. - LPSECURITY_ATTRIBUTES get_process_attributes (void) const; + LPSECURITY_ATTRIBUTES get_process_attributes () const; /// If this is called, a non-null process attributes is sent to /// CreateProcess. @@ -319,14 +319,14 @@ public: /// Get the thread_attributes. Returns NULL if set_thread_attributes /// has not been set. - LPSECURITY_ATTRIBUTES get_thread_attributes (void) const; + LPSECURITY_ATTRIBUTES get_thread_attributes () const; /// If this is called, a non-null thread attributes is sent to /// CreateProcess. LPSECURITY_ATTRIBUTES set_thread_attributes (void); /// Get user token. Return ACE_INVALID_HANDLE if it has not been set. - HANDLE get_user_token (void) const; + HANDLE get_user_token () const; /// Set user token for creating process as user. /// @param token the user token is passed to \c ::CreateProcessAsUser. diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl index f1bacf8d431..a029eb661e9 100644 --- a/ACE/ace/Process.inl +++ b/ACE/ace/Process.inl @@ -178,7 +178,7 @@ ACE_Process_Options::startup_info (void) } ACE_INLINE LPSECURITY_ATTRIBUTES -ACE_Process_Options::get_process_attributes (void) const +ACE_Process_Options::get_process_attributes () const { #if !defined (ACE_HAS_WINCE) return process_attributes_; @@ -199,7 +199,7 @@ ACE_Process_Options::set_process_attributes (void) } ACE_INLINE LPSECURITY_ATTRIBUTES -ACE_Process_Options::get_thread_attributes (void) const +ACE_Process_Options::get_thread_attributes () const { #if !defined (ACE_HAS_WINCE) return thread_attributes_; @@ -219,7 +219,7 @@ ACE_Process_Options::set_thread_attributes (void) #endif /* !ACE_HAS_WINCE */ } -ACE_INLINE HANDLE ACE_Process_Options::get_user_token (void) const +ACE_INLINE HANDLE ACE_Process_Options::get_user_token () const { return user_token_; } diff --git a/ACE/ace/Process_Mutex.h b/ACE/ace/Process_Mutex.h index c1f042c2269..aacf8700d39 100644 --- a/ACE/ace/Process_Mutex.h +++ b/ACE/ace/Process_Mutex.h @@ -195,7 +195,7 @@ public: #if !defined (_ACE_USE_SV_SEM) /// Return the underlying mutex. - const ACE_mutex_t &lock (void) const; + const ACE_mutex_t &lock () const; #endif /* !_ACE_USE_SV_SEM */ /// Get the name used for the lock, or null if no name is used. diff --git a/ACE/ace/Process_Mutex.inl b/ACE/ace/Process_Mutex.inl index 040bfc5cd29..717f4950421 100644 --- a/ACE/ace/Process_Mutex.inl +++ b/ACE/ace/Process_Mutex.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if !defined (_ACE_USE_SV_SEM) ACE_INLINE const ACE_mutex_t & -ACE_Process_Mutex::lock (void) const +ACE_Process_Mutex::lock () const { // ACE_TRACE ("ACE_Process_Mutex::lock"); return this->lock_.lock (); diff --git a/ACE/ace/Process_Semaphore.h b/ACE/ace/Process_Semaphore.h index 1024d70b6da..8d6860fa2ad 100644 --- a/ACE/ace/Process_Semaphore.h +++ b/ACE/ace/Process_Semaphore.h @@ -110,7 +110,7 @@ public: #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) /// Return the underlying lock. - const ACE_sema_t &lock (void) const; + const ACE_sema_t &lock () const; #endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM */ /// Dump the state of an object. diff --git a/ACE/ace/Process_Semaphore.inl b/ACE/ace/Process_Semaphore.inl index d19eb2286ba..4abff5c70c0 100644 --- a/ACE/ace/Process_Semaphore.inl +++ b/ACE/ace/Process_Semaphore.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) ACE_INLINE const ACE_sema_t & -ACE_Process_Semaphore::lock (void) const +ACE_Process_Semaphore::lock () const { // ACE_TRACE ("ACE_Process_Semaphore::lock"); return this->lock_.lock (); diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index b0ae13790bc..1dd78c0accb 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -274,7 +274,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL void -ACE_Profile_Timer::dump (void) const +ACE_Profile_Timer::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Profile_Timer::dump"); @@ -386,7 +386,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL void -ACE_Profile_Timer::dump (void) const +ACE_Profile_Timer::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Profile_Timer::dump"); diff --git a/ACE/ace/QoS/QoS_Decorator.cpp b/ACE/ace/QoS/QoS_Decorator.cpp index abecb9473b3..3f2d9b15bf3 100644 --- a/ACE/ace/QoS/QoS_Decorator.cpp +++ b/ACE/ace/QoS/QoS_Decorator.cpp @@ -23,7 +23,7 @@ ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base (void) // Forward the call to ACE_Event_Handler component. ACE_HANDLE -ACE_QoS_Decorator_Base::get_handle (void) const +ACE_QoS_Decorator_Base::get_handle () const { return this->event_handler_->get_handle (); } @@ -71,7 +71,7 @@ ACE_QoS_Decorator::~ACE_QoS_Decorator (void) // GQoS. RAPI needs additional QoS decoration. This is done by the // ACE_QoS_Event_Handler class. ACE_HANDLE -ACE_QoS_Decorator::get_handle (void) const +ACE_QoS_Decorator::get_handle () const { return this->decorator_base_->get_handle (); } @@ -139,7 +139,7 @@ ACE_QoS_Event_Handler::qos_session (ACE_QoS_Session *qos_session) // Returns the RAPI file descriptor for listening to RAPI evnets. ACE_HANDLE -ACE_QoS_Event_Handler::get_handle (void) const +ACE_QoS_Event_Handler::get_handle () const { return this->qos_session_->rsvp_events_handle (); } diff --git a/ACE/ace/QoS/QoS_Decorator.h b/ACE/ace/QoS/QoS_Decorator.h index af0d98447d4..b6ff20c74e4 100644 --- a/ACE/ace/QoS/QoS_Decorator.h +++ b/ACE/ace/QoS/QoS_Decorator.h @@ -54,7 +54,7 @@ public: ~ACE_QoS_Decorator_Base (void); /// Forwards the request to its event_handler_ component. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Forwards the request to its event_handler_ component. virtual int handle_input (ACE_HANDLE fd); @@ -86,7 +86,7 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler ~ACE_QoS_Event_Handler (void); /// Returns the RAPI file descriptor for receiving QoS events. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Calls the base class handle_input (). virtual int handle_input (ACE_HANDLE fd); @@ -140,7 +140,7 @@ public: ~ACE_QoS_Decorator (void); /// Calls the base class get_handle (). - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Calls the base class handle_input (). virtual int handle_input (ACE_HANDLE fd); diff --git a/ACE/ace/QoS/QoS_Session.h b/ACE/ace/QoS/QoS_Session.h index 7f9590427cd..bfa19ef8878 100644 --- a/ACE/ace/QoS/QoS_Session.h +++ b/ACE/ace/QoS/QoS_Session.h @@ -74,7 +74,7 @@ public: virtual int close (void) = 0; /// Returns the QoS in the current session. - virtual ACE_QoS qos (void) const = 0; + virtual ACE_QoS qos () const = 0; /// Set QoS for the current session. The qos manager is used to /// confirm if this QoS session was subscribed to by the socket. @@ -102,11 +102,11 @@ public: virtual int update_qos (void) = 0; /// Get/Set methods for the flags_. - virtual ACE_End_Point_Type flags (void) const = 0; + virtual ACE_End_Point_Type flags () const = 0; virtual void flags (const ACE_End_Point_Type flags) = 0; /// Get the session id. - virtual int session_id (void) const = 0; + virtual int session_id () const = 0; /// Set the session id. virtual void session_id (const int session_id) = 0; @@ -122,19 +122,19 @@ public: /// Get the destination address for this session. - virtual ACE_INET_Addr dest_addr (void) const = 0; + virtual ACE_INET_Addr dest_addr () const = 0; /// Set the destination address for this session. virtual void dest_addr (const ACE_INET_Addr &dest_addr) = 0; /// Get the source port for this session. - virtual u_short source_port (void) const = 0; + virtual u_short source_port () const = 0; /// Set the source port for this session. virtual void source_port (const u_short &source_port) = 0; //Set the source host - virtual ACE_INET_Addr* source_addr (void) const = 0; + virtual ACE_INET_Addr* source_addr () const = 0; /// Set the source port for this session. virtual void source_addr (ACE_INET_Addr* source_addr) = 0; diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h index 601b473e33b..6fda16087dc 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.h +++ b/ACE/ace/QoS/QoS_Session_Impl.h @@ -51,7 +51,7 @@ public: virtual int close (void); /// Returns the QoS for this RAPI session. - virtual ACE_QoS qos (void) const; + virtual ACE_QoS qos () const; /// Set QoS for this RAPI session. The socket parameter is used to confirm if /// this QoS session was subscribed to by the socket. @@ -76,13 +76,13 @@ public: virtual int update_qos (void); /// Get methods for the flags_. - virtual ACE_End_Point_Type flags (void) const; + virtual ACE_End_Point_Type flags () const; /// Set methods for the flags_. virtual void flags (const ACE_End_Point_Type flags); /// Get the RAPI session id. - virtual int session_id (void) const; + virtual int session_id () const; /// Set the RAPI session id. virtual void session_id (const int session_id); @@ -97,19 +97,19 @@ public: virtual RSVP_Event_Type rsvp_event_type (void); /// Get the destination address for this RAPI session. - virtual ACE_INET_Addr dest_addr (void) const; + virtual ACE_INET_Addr dest_addr () const; /// Set the destination address for this RAPI session. virtual void dest_addr (const ACE_INET_Addr &dest_addr); /// Get the source port for this session. - virtual u_short source_port (void) const; + virtual u_short source_port () const; /// Set the source port for this session. virtual void source_port (const u_short &source_port); //Set the source host - virtual ACE_INET_Addr* source_addr (void) const; + virtual ACE_INET_Addr* source_addr () const; /// Set the source port for this session. virtual void source_addr (ACE_INET_Addr* source_addr); @@ -175,7 +175,7 @@ public: virtual int close (void); /// Returns the QoS for this GQoS session. - virtual ACE_QoS qos (void) const; + virtual ACE_QoS qos () const; /// Set QoS for this GQoS session. The socket parameter is used to confirm if /// this QoS session was subscribed to by the socket. @@ -197,29 +197,29 @@ public: virtual int update_qos (void); /// Get/Set methods for the flags_. - virtual ACE_End_Point_Type flags (void) const; + virtual ACE_End_Point_Type flags () const; virtual void flags (const ACE_End_Point_Type flags); /// Get the destination address for this GQoS session. - virtual ACE_INET_Addr dest_addr (void) const; + virtual ACE_INET_Addr dest_addr () const; /// Set the destination address for this GQoS session. virtual void dest_addr (const ACE_INET_Addr &dest_addr); /// Get the source port for this session. - virtual u_short source_port (void) const; + virtual u_short source_port () const; /// Set the source port for this session. virtual void source_port (const u_short &source_port); //Set the source host - virtual ACE_INET_Addr* source_addr (void) const; + virtual ACE_INET_Addr* source_addr () const; /// Set the source port for this session. virtual void source_addr (ACE_INET_Addr* source_addr); /// Get the GQoS session id. - virtual int session_id (void) const; + virtual int session_id () const; /// Set the GQoS session id. virtual void session_id (const int session_id); diff --git a/ACE/ace/QoS/QoS_Session_Impl.inl b/ACE/ace/QoS/QoS_Session_Impl.inl index 37000bdde31..f78b8adc68f 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.inl +++ b/ACE/ace/QoS/QoS_Session_Impl.inl @@ -11,7 +11,7 @@ ACE_RAPI_Session::~ACE_RAPI_Session (void) // Returns the QoS for this RAPI session. ACE_INLINE ACE_QoS -ACE_RAPI_Session::qos (void) const +ACE_RAPI_Session::qos () const { return this->qos_; } @@ -26,7 +26,7 @@ ACE_RAPI_Session::qos (const ACE_QoS &ace_qos) // Get the RAPI session id. ACE_INLINE int -ACE_RAPI_Session::session_id (void) const +ACE_RAPI_Session::session_id () const { return this->session_id_; } @@ -56,7 +56,7 @@ ACE_RAPI_Session::rsvp_events_handle (void) // Get the End Point Type (Sender/Receiver/Both). ACE_INLINE ACE_QoS_Session::ACE_End_Point_Type -ACE_RAPI_Session::flags (void) const +ACE_RAPI_Session::flags () const { return this->flags_; } @@ -71,7 +71,7 @@ ACE_RAPI_Session::flags (const ACE_End_Point_Type flags) // Get the destination address for this RAPI session. ACE_INLINE ACE_INET_Addr -ACE_RAPI_Session::dest_addr (void) const +ACE_RAPI_Session::dest_addr () const { return this->dest_addr_; } @@ -85,7 +85,7 @@ ACE_RAPI_Session::dest_addr (const ACE_INET_Addr &dest_addr) // Get the source port for this RAPI session. ACE_INLINE u_short -ACE_RAPI_Session::source_port (void) const +ACE_RAPI_Session::source_port () const { return this->source_port_; } @@ -98,7 +98,7 @@ ACE_RAPI_Session::source_port (const u_short &source_port) } ACE_INLINE ACE_INET_Addr* -ACE_RAPI_Session::source_addr (void) const +ACE_RAPI_Session::source_addr () const { return this->src_addr_; } @@ -126,7 +126,7 @@ ACE_GQoS_Session::~ACE_GQoS_Session (void) // Returns the QoS for this GQoS session. ACE_INLINE ACE_QoS -ACE_GQoS_Session::qos (void) const +ACE_GQoS_Session::qos () const { return this->qos_; } @@ -141,7 +141,7 @@ ACE_GQoS_Session::qos (const ACE_QoS &ace_qos) // Get the GQoS session id. ACE_INLINE int -ACE_GQoS_Session::session_id (void) const +ACE_GQoS_Session::session_id () const { return this->session_id_; } @@ -164,7 +164,7 @@ ACE_GQoS_Session::rsvp_events_handle (void) // Get the End Point Type (Sender/Receiver/Both). ACE_INLINE ACE_QoS_Session::ACE_End_Point_Type -ACE_GQoS_Session::flags (void) const +ACE_GQoS_Session::flags () const { return this->flags_; } @@ -178,7 +178,7 @@ ACE_GQoS_Session::flags (const ACE_End_Point_Type flags) // Get the destination address for this GQoS session. ACE_INLINE ACE_INET_Addr -ACE_GQoS_Session::dest_addr (void) const +ACE_GQoS_Session::dest_addr () const { return this->dest_addr_; } @@ -192,7 +192,7 @@ ACE_GQoS_Session::dest_addr (const ACE_INET_Addr &dest_addr) // Get the source port for this RAPI session. ACE_INLINE u_short -ACE_GQoS_Session::source_port (void) const +ACE_GQoS_Session::source_port () const { return this->source_port_; } @@ -205,7 +205,7 @@ ACE_GQoS_Session::source_port (const u_short &source_port) } ACE_INLINE ACE_INET_Addr* -ACE_GQoS_Session::source_addr (void) const +ACE_GQoS_Session::source_addr () const { return this->src_addr_; } diff --git a/ACE/ace/RW_Process_Mutex.h b/ACE/ace/RW_Process_Mutex.h index 13e46ededc7..71244548ddc 100644 --- a/ACE/ace/RW_Process_Mutex.h +++ b/ACE/ace/RW_Process_Mutex.h @@ -105,7 +105,7 @@ public: int tryacquire_write_upgrade (void); /// Return the underlying lock. - const ACE_File_Lock &lock (void) const; + const ACE_File_Lock &lock () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/RW_Process_Mutex.inl b/ACE/ace/RW_Process_Mutex.inl index 61326713aba..a82d6f61cdf 100644 --- a/ACE/ace/RW_Process_Mutex.inl +++ b/ACE/ace/RW_Process_Mutex.inl @@ -65,7 +65,7 @@ ACE_RW_Process_Mutex::tryacquire_write_upgrade (void) } ACE_INLINE const ACE_File_Lock & -ACE_RW_Process_Mutex::lock (void) const +ACE_RW_Process_Mutex::lock () const { // ACE_TRACE ("ACE_RW_Process_Mutex::lock"); return this->lock_; diff --git a/ACE/ace/Reactor_Token_T.cpp b/ACE/ace/Reactor_Token_T.cpp index f4399c903f4..827aefcc64a 100644 --- a/ACE/ace/Reactor_Token_T.cpp +++ b/ACE/ace/Reactor_Token_T.cpp @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Reactor_Token_T) template <class ACE_TOKEN_TYPE> void -ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::dump (void) const +ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Reactor_Token_T::dump"); diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h index f71f67b8562..ea5cbb0c004 100644 --- a/ACE/ace/Read_Buffer.h +++ b/ACE/ace/Read_Buffer.h @@ -76,14 +76,14 @@ public: int replace = '\0'); /// Returns the number of characters replaced during a @c read. - size_t replaced (void) const; + size_t replaced () const; /// Returns the size of the allocated buffer obtained during a /// @c read, not including the null terminator. - size_t size (void) const; + size_t size () const; /// Returns a pointer to its allocator. - ACE_Allocator *alloc (void) const; + ACE_Allocator *alloc () const; /// Dump the state of the object. void dump () const; diff --git a/ACE/ace/Read_Buffer.inl b/ACE/ace/Read_Buffer.inl index cadd0077464..8f8d5b6a06b 100644 --- a/ACE/ace/Read_Buffer.inl +++ b/ACE/ace/Read_Buffer.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Accessor to the number of bytes in the buffer. ACE_INLINE size_t -ACE_Read_Buffer::size (void) const +ACE_Read_Buffer::size () const { ACE_TRACE ("ACE_Read_Buffer::size"); return this->size_; @@ -13,14 +13,14 @@ ACE_Read_Buffer::size (void) const // The total number of characters replaced. ACE_INLINE size_t -ACE_Read_Buffer::replaced (void) const +ACE_Read_Buffer::replaced () const { ACE_TRACE ("ACE_Read_Buffer::replaced"); return this->occurrences_; } ACE_INLINE ACE_Allocator * -ACE_Read_Buffer::alloc (void) const +ACE_Read_Buffer::alloc () const { ACE_TRACE ("ACE_Read_Buffer::alloc"); return this->allocator_; diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index 017ae1a5dea..9e63c4421f6 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -133,7 +133,7 @@ ACE_Registry::Object::data (void *data) void * -ACE_Registry::Object::data (void) const +ACE_Registry::Object::data () const { return this->data_; } @@ -147,7 +147,7 @@ ACE_Registry::Object::size (u_long size) u_long -ACE_Registry::Object::size (void) const +ACE_Registry::Object::size () const { return this->size_; } @@ -161,7 +161,7 @@ ACE_Registry::Object::type (u_long type) u_long -ACE_Registry::Object::type (void) const +ACE_Registry::Object::type () const { return this->type_; } diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h index d21dfef8e7f..893d4ec9b68 100644 --- a/ACE/ace/Registry.h +++ b/ACE/ace/Registry.h @@ -140,19 +140,19 @@ public: void data (void *data); /// Get data - void *data (void) const; + void *data () const; /// Set size void size (u_long size); /// Get size - u_long size (void) const; + u_long size () const; /// Set type void type (u_long type); /// Get type - u_long type (void) const; + u_long type () const; private: /// Pointer to data diff --git a/ACE/ace/Registry_Name_Space.cpp b/ACE/ace/Registry_Name_Space.cpp index c803b5a2edb..7b3587c00f3 100644 --- a/ACE/ace/Registry_Name_Space.cpp +++ b/ACE/ace/Registry_Name_Space.cpp @@ -283,7 +283,7 @@ ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set, void -ACE_Registry_Name_Space::dump (void) const +ACE_Registry_Name_Space::dump () const { #if defined (ACE_HAS_DUMP) #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Remote_Tokens.cpp b/ACE/ace/Remote_Tokens.cpp index 2e1d2461743..866f7916201 100644 --- a/ACE/ace/Remote_Tokens.cpp +++ b/ACE/ace/Remote_Tokens.cpp @@ -49,7 +49,7 @@ ACE_TSS_Connection::get_connection (void) } ACE_SOCK_Stream * -ACE_TSS_Connection::make_TSS_TYPE (void) const +ACE_TSS_Connection::make_TSS_TYPE () const { ACE_TRACE ("ACE_TSS_Connection::make_TSS_TYPE"); @@ -77,7 +77,7 @@ ACE_TSS_Connection::operator ACE_SOCK_Stream *(void) } void -ACE_TSS_Connection::dump (void) const +ACE_TSS_Connection::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TSS_Connection::dump"); @@ -386,7 +386,7 @@ ACE_Remote_Token_Proxy::owner_id (void) } void -ACE_Remote_Token_Proxy::dump (void) const +ACE_Remote_Token_Proxy::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_Token_Proxy::dump"); @@ -401,7 +401,7 @@ ACE_Remote_Token_Proxy::dump (void) const } ACE_Token_Proxy * -ACE_Remote_Mutex::clone (void) const +ACE_Remote_Mutex::clone () const { ACE_Token_Proxy *temp; ACE_NEW_RETURN (temp, @@ -423,7 +423,7 @@ ACE_Remote_Mutex::create_token (const ACE_TCHAR *name) } void -ACE_Remote_Mutex::dump (void) const +ACE_Remote_Mutex::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_Mutex::dump"); @@ -446,13 +446,13 @@ ACE_Remote_RLock::create_token (const ACE_TCHAR *name) } int -ACE_Remote_RLock::type (void) const +ACE_Remote_RLock::type () const { return ACE_RW_Token::READER; } ACE_Token_Proxy * -ACE_Remote_RLock::clone (void) const +ACE_Remote_RLock::clone () const { ACE_Token_Proxy *temp = 0; ACE_NEW_RETURN (temp, @@ -464,7 +464,7 @@ ACE_Remote_RLock::clone (void) const } void -ACE_Remote_RLock::dump (void) const +ACE_Remote_RLock::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_RLock::dump"); @@ -488,13 +488,13 @@ ACE_Remote_WLock::create_token (const ACE_TCHAR *name) } int -ACE_Remote_WLock::type (void) const +ACE_Remote_WLock::type () const { return ACE_RW_Token::WRITER; } ACE_Token_Proxy * -ACE_Remote_WLock::clone (void) const +ACE_Remote_WLock::clone () const { ACE_Token_Proxy *temp = 0; ACE_NEW_RETURN (temp, @@ -506,7 +506,7 @@ ACE_Remote_WLock::clone (void) const } void -ACE_Remote_WLock::dump (void) const +ACE_Remote_WLock::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_WLock::dump"); diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h index 3433ba72fe1..d38270357d9 100644 --- a/ACE/ace/Remote_Tokens.h +++ b/ACE/ace/Remote_Tokens.h @@ -178,7 +178,7 @@ public: void dump () const; /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; protected: /// Make the correct type of ACE_Tokens. @@ -214,10 +214,10 @@ public: void dump () const; /// Returns ACE_RW_Token::RLOCK; - virtual int type (void) const; + virtual int type () const; /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; protected: /// Make the correct type of ACE_Tokens. This is called by the Token @@ -252,10 +252,10 @@ public: void dump () const; /// Returns ACE_RW_Token::WLOCK; - virtual int type (void) const; + virtual int type () const; /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; protected: /// Make the correct type of ACE_Tokens. This is called by the Token @@ -283,7 +283,7 @@ public: ACE_SOCK_Stream *get_connection (void); /// Factory Method that creates a new SOCK Stream. - virtual ACE_SOCK_Stream *make_TSS_TYPE (void) const; + virtual ACE_SOCK_Stream *make_TSS_TYPE () const; /// Inheritance and operator overloading don't mix. Redefine this /// from ACE_TSS so that we can use it. diff --git a/ACE/ace/SPIPE_Addr.h b/ACE/ace/SPIPE_Addr.h index d8ae394882b..455acd9acbb 100644 --- a/ACE/ace/SPIPE_Addr.h +++ b/ACE/ace/SPIPE_Addr.h @@ -71,7 +71,7 @@ public: // = SPIPE-specific address operations /// Pathname of rendezvous point in file system. - const ACE_TCHAR *get_path_name (void) const; + const ACE_TCHAR *get_path_name () const; /// Get user id. uid_t user_id () const; diff --git a/ACE/ace/SPIPE_Addr.inl b/ACE/ace/SPIPE_Addr.inl index e5ab7bc7fe3..be00866dc80 100644 --- a/ACE/ace/SPIPE_Addr.inl +++ b/ACE/ace/SPIPE_Addr.inl @@ -27,7 +27,7 @@ ACE_SPIPE_Addr::get_path_name () const } ACE_INLINE uid_t -ACE_SPIPE_Addr::user_id (void) const +ACE_SPIPE_Addr::user_id () const { return this->SPIPE_addr_.uid_; } diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index f6984515214..65a6d5d6b83 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -184,7 +184,7 @@ public: int close (void); /// Return a pointer to the underlying SSL structure. - SSL *ssl (void) const; + SSL *ssl () const; /** * Initializes the factory with information which will be used with @@ -277,7 +277,7 @@ public: protected: /// Virtual from ACE_Asynch_Operation. Since this class is essentially an /// implementation class, simply return 0. - virtual ACE_Asynch_Operation_Impl *implementation (void) const { return 0; } + virtual ACE_Asynch_Operation_Impl *implementation () const { return 0; } /// virtual from ACE_Handler diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.inl b/ACE/ace/SSL/SSL_Asynch_Stream.inl index 969a37cd37b..81a33728103 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.inl +++ b/ACE/ace/SSL/SSL_Asynch_Stream.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE SSL * -ACE_SSL_Asynch_Stream::ssl (void) const +ACE_SSL_Asynch_Stream::ssl () const { return this->ssl_; } diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h index f0c9dfac81d..784820612a2 100644 --- a/ACE/ace/SSL/SSL_Context.h +++ b/ACE/ace/SSL/SSL_Context.h @@ -289,8 +289,8 @@ public: /// of files and paths etc. /// Query the location of trusted certification authority /// certificates. - // const char* ca_file_name(void) const; - // const char* ca_dir_name(void) const; + // const char* ca_file_name() const; + // const char* ca_dir_name() const; /** * Set and query the default verify mode for this context, it is diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.inl b/ACE/ace/SSL/SSL_SOCK_Connector.inl index 0dd4bb62e36..83c99526b6f 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.inl +++ b/ACE/ace/SSL/SSL_SOCK_Connector.inl @@ -16,7 +16,7 @@ ACE_SSL_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) } ACE_INLINE void -ACE_SSL_SOCK_Connector::dump (void) const +ACE_SSL_SOCK_Connector::dump () const { ACE_TRACE ("ACE_SSL_SOCK_Connector::dump"); this->connector_.dump (); diff --git a/ACE/ace/SV_Message.h b/ACE/ace/SV_Message.h index 07a254fb821..a75ace4d2ac 100644 --- a/ACE/ace/SV_Message.h +++ b/ACE/ace/SV_Message.h @@ -37,7 +37,7 @@ public: ~ACE_SV_Message (void); /// Get the message type. - long type (void) const; + long type () const; /// Set the message type. void type (long); diff --git a/ACE/ace/SV_Message.inl b/ACE/ace/SV_Message.inl index ef4265ba689..bc8cc999d72 100644 --- a/ACE/ace/SV_Message.inl +++ b/ACE/ace/SV_Message.inl @@ -18,7 +18,7 @@ ACE_SV_Message::~ACE_SV_Message (void) } ACE_INLINE long -ACE_SV_Message::type (void) const +ACE_SV_Message::type () const { ACE_TRACE ("ACE_SV_Message::type"); return this->type_; diff --git a/ACE/ace/SV_Message_Queue.h b/ACE/ace/SV_Message_Queue.h index 3359ba7f379..8ded7d84362 100644 --- a/ACE/ace/SV_Message_Queue.h +++ b/ACE/ace/SV_Message_Queue.h @@ -75,7 +75,7 @@ public: int control (int option, void *arg = 0); /// Get the underly internal id. - int get_id (void) const; + int get_id () const; /// Set the underly internal id. void set_id (int); diff --git a/ACE/ace/SV_Message_Queue.inl b/ACE/ace/SV_Message_Queue.inl index f1355d51c61..045b20ccf40 100644 --- a/ACE/ace/SV_Message_Queue.inl +++ b/ACE/ace/SV_Message_Queue.inl @@ -41,7 +41,7 @@ ACE_SV_Message_Queue::remove (void) } ACE_INLINE int -ACE_SV_Message_Queue::get_id (void) const +ACE_SV_Message_Queue::get_id () const { ACE_TRACE ("ACE_SV_Message_Queue::get_id"); return this->internal_id_; diff --git a/ACE/ace/SV_Semaphore_Simple.h b/ACE/ace/SV_Semaphore_Simple.h index 71d178a9636..0b33c59bbd9 100644 --- a/ACE/ace/SV_Semaphore_Simple.h +++ b/ACE/ace/SV_Semaphore_Simple.h @@ -109,7 +109,7 @@ public: * regardless of whether other processes may be using it or not. * Most other processes should use close() below. */ - int remove (void) const; + int remove () const; // = Semaphore acquire and release methods. /** @@ -151,7 +151,7 @@ public: int control (int cmd, int value = 0, u_short n = 0) const; /// Get underlying internal id. - int get_id (void) const; + int get_id () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/SV_Semaphore_Simple.inl b/ACE/ace/SV_Semaphore_Simple.inl index b8d0b703734..73a9cae68c1 100644 --- a/ACE/ace/SV_Semaphore_Simple.inl +++ b/ACE/ace/SV_Semaphore_Simple.inl @@ -120,7 +120,7 @@ ACE_SV_Semaphore_Simple::release (u_short n, short flags) const } ACE_INLINE int -ACE_SV_Semaphore_Simple::get_id (void) const +ACE_SV_Semaphore_Simple::get_id () const { ACE_TRACE ("ACE_SV_Semaphore_Simple::get_id"); return this->internal_id_; diff --git a/ACE/ace/SV_Shared_Memory.h b/ACE/ace/SV_Shared_Memory.h index 16354e171b9..a6734bb075b 100644 --- a/ACE/ace/SV_Shared_Memory.h +++ b/ACE/ace/SV_Shared_Memory.h @@ -75,11 +75,11 @@ public: int control (int cmd, void *buf); // = Segment-related info. - void *get_segment_ptr (void) const; - size_t get_segment_size (void) const; + void *get_segment_ptr () const; + size_t get_segment_size () const; /// Return the ID of the shared memory segment (i.e., an ACE_HANDLE). - ACE_HANDLE get_id (void) const; + ACE_HANDLE get_id () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/SV_Shared_Memory.inl b/ACE/ace/SV_Shared_Memory.inl index 19235c3ffee..1d31912ebc1 100644 --- a/ACE/ace/SV_Shared_Memory.inl +++ b/ACE/ace/SV_Shared_Memory.inl @@ -69,7 +69,7 @@ ACE_SV_Shared_Memory::control (int cmd, void *buf) // The overall size of the segment. ACE_INLINE size_t -ACE_SV_Shared_Memory::get_segment_size (void) const +ACE_SV_Shared_Memory::get_segment_size () const { ACE_TRACE ("ACE_SV_Shared_Memory::get_segment_size"); return this->size_; @@ -99,14 +99,14 @@ ACE_SV_Shared_Memory::detach (void) } ACE_INLINE void * -ACE_SV_Shared_Memory::get_segment_ptr (void) const +ACE_SV_Shared_Memory::get_segment_ptr () const { ACE_TRACE ("ACE_SV_Shared_Memory::get_segment_ptr"); return this->segment_ptr_; } ACE_INLINE ACE_HANDLE -ACE_SV_Shared_Memory::get_id (void) const +ACE_SV_Shared_Memory::get_id () const { ACE_TRACE ("ACE_SV_Shared_Memory::get_id"); return this->internal_id_; diff --git a/ACE/ace/Sample_History.h b/ACE/ace/Sample_History.h index 9a6bcb19363..fea5384037e 100644 --- a/ACE/ace/Sample_History.h +++ b/ACE/ace/Sample_History.h @@ -55,10 +55,10 @@ public: int sample (ACE_UINT64 value); /// Returns the maximum number of samples - size_t max_samples (void) const; + size_t max_samples () const; /// Returns the current number of samples - size_t sample_count (void) const; + size_t sample_count () const; /// Dump all the samples /** diff --git a/ACE/ace/Sample_History.inl b/ACE/ace/Sample_History.inl index 305c861ff09..bcd4918a27a 100644 --- a/ACE/ace/Sample_History.inl +++ b/ACE/ace/Sample_History.inl @@ -21,13 +21,13 @@ ACE_Sample_History::get_sample (size_t i) const } ACE_INLINE size_t -ACE_Sample_History::max_samples (void) const +ACE_Sample_History::max_samples () const { return this->max_samples_; } ACE_INLINE size_t -ACE_Sample_History::sample_count (void) const +ACE_Sample_History::sample_count () const { return this->sample_count_; } diff --git a/ACE/ace/Sbrk_Memory_Pool.h b/ACE/ace/Sbrk_Memory_Pool.h index 5f4d54cf6da..ed7eaad69a0 100644 --- a/ACE/ace/Sbrk_Memory_Pool.h +++ b/ACE/ace/Sbrk_Memory_Pool.h @@ -97,7 +97,7 @@ public: /// Return the base address of this memory pool, 0 if base_addr /// never changes. - virtual void *base_addr (void) const; + virtual void *base_addr () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h index 1c59c82a312..25c0f793a09 100644 --- a/ACE/ace/Select_Reactor.h +++ b/ACE/ace/Select_Reactor.h @@ -53,7 +53,7 @@ public: int release (void) { return 0; } int locked (void) { return 1; } int remove (void) { return 0; } - void dump (void) const {} + void dump () const {} private: ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &) = delete; diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h index e9cd8fbe2da..f076a2bffeb 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -363,10 +363,10 @@ public: // = Accessors. /// Returns the current table size. - size_type size (void) const; + size_type size () const; /// Maximum ACE_HANDLE value, plus 1. - max_handlep1_type max_handlep1 (void) const; + max_handlep1_type max_handlep1 () const; /// Dump the state of an object. void dump () const; @@ -424,7 +424,7 @@ public: bool next (ACE_Event_Handler* & next_item); /// Returns @c true when all items have been seen, else @c false. - bool done (void) const; + bool done () const; /// Move forward by one element in the set. Returns @c false when /// all the items in the set have been seen, else @c true. diff --git a/ACE/ace/Select_Reactor_Base.inl b/ACE/ace/Select_Reactor_Base.inl index 37c7ce800ba..946ae27a14d 100644 --- a/ACE/ace/Select_Reactor_Base.inl +++ b/ACE/ace/Select_Reactor_Base.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Select_Reactor_Handler_Repository::size_type -ACE_Select_Reactor_Handler_Repository::size (void) const +ACE_Select_Reactor_Handler_Repository::size () const { #ifdef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP return this->event_handlers_.total_size (); @@ -14,7 +14,7 @@ ACE_Select_Reactor_Handler_Repository::size (void) const } ACE_INLINE ACE_Select_Reactor_Handler_Repository::max_handlep1_type -ACE_Select_Reactor_Handler_Repository::max_handlep1 (void) const +ACE_Select_Reactor_Handler_Repository::max_handlep1 () const { #ifdef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP return this->event_handlers_.current_size (); @@ -70,7 +70,7 @@ ACE_Select_Reactor_Handler_Repository::find (ACE_HANDLE handle) // ------------------------------------------------------------------ ACE_INLINE bool -ACE_Select_Reactor_Handler_Repository_Iterator::done (void) const +ACE_Select_Reactor_Handler_Repository_Iterator::done () const { #ifdef ACE_SELECT_REACTOR_BASE_USES_HASH_MAP return this->current_ == this->rep_->event_handlers_.end (); diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 420c421fb8f..9e6a83e7c1c 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -445,7 +445,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::set_sig_handler } template <class ACE_SELECT_REACTOR_TOKEN> ACE_Timer_Queue * -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::timer_queue (void) const +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::timer_queue () const { return this->timer_queue_; } @@ -1544,7 +1544,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void) } template <class ACE_SELECT_REACTOR_TOKEN> void -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Select_Reactor_T::dump"); diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index c142459a6ed..dc0fc72a762 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -120,7 +120,7 @@ public: virtual int timer_queue (ACE_Timer_Queue *tq); /// Return the current ACE_Timer_Queue. - virtual ACE_Timer_Queue *timer_queue (void) const; + virtual ACE_Timer_Queue *timer_queue () const; /// Close down the select_reactor and release all of its resources. virtual int close (void); @@ -518,7 +518,7 @@ public: /// Returns the current size of the Reactor's internal descriptor /// table. - virtual size_t size (void) const; + virtual size_t size () const; /** * Returns a reference to the ACE_Reactor_Token that is diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl index 7200933a448..c71bc0a7caa 100644 --- a/ACE/ace/Select_Reactor_T.inl +++ b/ACE/ace/Select_Reactor_T.inl @@ -223,7 +223,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivate (int do_stop) } template <class ACE_SELECT_REACTOR_TOKEN> ACE_INLINE size_t -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::size (void) const +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::size () const { return this->handler_rep_.size (); } diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h index eda5f3f0163..45c527484ba 100644 --- a/ACE/ace/Service_Manager.h +++ b/ACE/ace/Service_Manager.h @@ -86,7 +86,7 @@ protected: int open (const ACE_INET_Addr &sia); // = Demultiplexing hooks. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask); virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); diff --git a/ACE/ace/Shared_Memory.h b/ACE/ace/Shared_Memory.h index be6970e31f0..f5d9b3cc3d0 100644 --- a/ACE/ace/Shared_Memory.h +++ b/ACE/ace/Shared_Memory.h @@ -45,8 +45,8 @@ public: virtual int remove (void) = 0; virtual void *malloc (size_t = 0) = 0; virtual int free (void *p) = 0; - virtual size_t get_segment_size (void) const = 0; - virtual ACE_HANDLE get_id (void) const = 0; + virtual size_t get_segment_size () const = 0; + virtual ACE_HANDLE get_id () const = 0; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h index 85c405dc6af..58bad1585b9 100644 --- a/ACE/ace/Shared_Memory_MM.h +++ b/ACE/ace/Shared_Memory_MM.h @@ -74,7 +74,7 @@ public: ACE_OFF_T pos = 0); /// Return the name of file that is mapped (if any). - const ACE_TCHAR *filename (void) const; + const ACE_TCHAR *filename () const; /// Close down the shared memory segment. virtual int close (void); @@ -91,10 +91,10 @@ public: virtual int free (void *p); /// Return the size of the shared memory segment. - virtual size_t get_segment_size (void) const; + virtual size_t get_segment_size () const; /// Return the ID of the shared memory segment (i.e., an ACE_HANDLE). - virtual ACE_HANDLE get_id (void) const; + virtual ACE_HANDLE get_id () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Shared_Memory_MM.inl b/ACE/ace/Shared_Memory_MM.inl index 75762c1994d..caad381e9e8 100644 --- a/ACE/ace/Shared_Memory_MM.inl +++ b/ACE/ace/Shared_Memory_MM.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Return the name of file that is mapped (if any). ACE_INLINE const ACE_TCHAR * -ACE_Shared_Memory_MM::filename (void) const +ACE_Shared_Memory_MM::filename () const { return this->shared_memory_.filename (); } diff --git a/ACE/ace/Shared_Memory_Pool.h b/ACE/ace/Shared_Memory_Pool.h index 74125a74225..58c1210ad55 100644 --- a/ACE/ace/Shared_Memory_Pool.h +++ b/ACE/ace/Shared_Memory_Pool.h @@ -125,7 +125,7 @@ public: /// Return the base address of this memory pool, 0 if base_addr /// never changes. - virtual void *base_addr (void) const; + virtual void *base_addr () const; /// Dump the state of an object. virtual void dump () const; diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h index 0523bf6b49c..1578e2a6997 100644 --- a/ACE/ace/Shared_Memory_SV.h +++ b/ACE/ace/Shared_Memory_SV.h @@ -70,11 +70,11 @@ public: virtual int free (void *p); /// Return the size of the shared memory segment. - virtual size_t get_segment_size (void) const; + virtual size_t get_segment_size () const; /// Return the ID of the shared memory segment (i.e., a System V /// shared memory internal id). - virtual ACE_HANDLE get_id (void) const; + virtual ACE_HANDLE get_id () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Stats.inl b/ACE/ace/Stats.inl index 2e54c1228ef..f4b85dea15e 100644 --- a/ACE/ace/Stats.inl +++ b/ACE/ace/Stats.inl @@ -11,7 +11,7 @@ ACE_Stats_Value::ACE_Stats_Value (const u_int precision) ACE_INLINE u_int -ACE_Stats_Value::precision (void) const +ACE_Stats_Value::precision () const { return precision_; } @@ -25,7 +25,7 @@ ACE_Stats_Value::whole (const ACE_UINT32 value) ACE_INLINE ACE_UINT32 -ACE_Stats_Value::whole (void) const +ACE_Stats_Value::whole () const { return whole_; } @@ -39,7 +39,7 @@ ACE_Stats_Value::fractional (const ACE_UINT32 value) ACE_INLINE ACE_UINT32 -ACE_Stats_Value::fractional (void) const +ACE_Stats_Value::fractional () const { return fractional_; } @@ -53,7 +53,7 @@ ACE_Stats_Value::scaled_value (ACE_UINT64 &sv) const ACE_INLINE void -ACE_Stats_Value::dump (void) const +ACE_Stats_Value::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, @@ -70,28 +70,28 @@ ACE_Stats::ACE_Stats (void) ACE_INLINE ACE_UINT32 -ACE_Stats::samples (void) const +ACE_Stats::samples () const { return number_of_samples_; } ACE_INLINE ACE_INT32 -ACE_Stats::min_value (void) const +ACE_Stats::min_value () const { return min_; } ACE_INLINE ACE_INT32 -ACE_Stats::max_value (void) const +ACE_Stats::max_value () const { return max_; } ACE_INLINE void -ACE_Stats::dump (void) const +ACE_Stats::dump () const { #if defined (ACE_HAS_DUMP) print_summary (3u); diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp index 8e240e6dcd7..31bb58aff0c 100644 --- a/ACE/ace/Stream.cpp +++ b/ACE/ace/Stream.cpp @@ -21,7 +21,7 @@ ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Stream) // Give some idea of what the heck is going on in a stream! template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump"); diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h index 5e994704d26..9d625c8c9ef 100644 --- a/ACE/ace/Stream.h +++ b/ACE/ace/Stream.h @@ -219,7 +219,7 @@ public: int next (const ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *&next_item); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. diff --git a/ACE/ace/Stream.inl b/ACE/ace/Stream.inl index ac9754924c3..325e1f01820 100644 --- a/ACE/ace/Stream.inl +++ b/ACE/ace/Stream.inl @@ -31,7 +31,7 @@ ACE_Stream_Iterator<ACE_SYNCH_USE, TIME_POLICY>::next (const ACE_Module<ACE_SYNC } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE int -ACE_Stream_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) const +ACE_Stream_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done () const { ACE_TRACE ("ACE_Stream_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done"); return this->next_ == 0; diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp index 0e2548c014d..7766b7e4204 100644 --- a/ACE/ace/TLI.cpp +++ b/ACE/ace/TLI.cpp @@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_TLI) void -ACE_TLI::dump (void) const +ACE_TLI::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TLI::dump"); diff --git a/ACE/ace/TLI.inl b/ACE/ace/TLI.inl index 2e339c6ead8..b113d3cef2d 100644 --- a/ACE/ace/TLI.inl +++ b/ACE/ace/TLI.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_TLI::look (void) const +ACE_TLI::look () const { ACE_TRACE ("ACE_TLI::look"); return ACE_OS::t_look (this->get_handle ()); @@ -29,7 +29,7 @@ ACE_TLI::snddis (struct t_call *call) const ACE_INLINE int -ACE_TLI::rcvrel (void) const +ACE_TLI::rcvrel () const { ACE_TRACE ("ACE_TLI::rcvrel"); return ACE_OS::t_rcvrel (this->get_handle ()); @@ -37,7 +37,7 @@ ACE_TLI::rcvrel (void) const ACE_INLINE int -ACE_TLI::sndrel (void) const +ACE_TLI::sndrel () const { ACE_TRACE ("ACE_TLI::sndrel"); return ACE_OS::t_sndrel (this->get_handle ()); diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp index bd81572e2e1..d46865728b6 100644 --- a/ACE/ace/TLI_Acceptor.cpp +++ b/ACE/ace/TLI_Acceptor.cpp @@ -54,7 +54,7 @@ private: ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Request_Queue) void -ACE_TLI_Request_Queue::dump (void) const +ACE_TLI_Request_Queue::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TLI_Request_Queue::dump"); @@ -62,14 +62,14 @@ ACE_TLI_Request_Queue::dump (void) const } int -ACE_TLI_Request_Queue::is_empty (void) const +ACE_TLI_Request_Queue::is_empty () const { ACE_TRACE ("ACE_TLI_Request_Queue::is_empty"); return this->current_count_ == 0; } int -ACE_TLI_Request_Queue::is_full (void) const +ACE_TLI_Request_Queue::is_full () const { ACE_TRACE ("ACE_TLI_Request_Queue::is_full"); return this->current_count_ + 1 == this->size_; // Add 1 for the dummy. @@ -99,7 +99,7 @@ ACE_TLI_Request_Queue::alloc (void) ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Acceptor) void -ACE_TLI_Acceptor::dump (void) const +ACE_TLI_Acceptor::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TLI_Acceptor::dump"); diff --git a/ACE/ace/TLI_Connector.cpp b/ACE/ace/TLI_Connector.cpp index ba4d6524d0c..60fb793a9bc 100644 --- a/ACE/ace/TLI_Connector.cpp +++ b/ACE/ace/TLI_Connector.cpp @@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Connector) void -ACE_TLI_Connector::dump (void) const +ACE_TLI_Connector::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TLI_Connector::dump"); diff --git a/ACE/ace/TLI_Stream.cpp b/ACE/ace/TLI_Stream.cpp index 3577169396a..34e5ab2ae80 100644 --- a/ACE/ace/TLI_Stream.cpp +++ b/ACE/ace/TLI_Stream.cpp @@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Stream) void -ACE_TLI_Stream::dump (void) const +ACE_TLI_Stream::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TLI_Stream::dump"); diff --git a/ACE/ace/TLI_Stream.h b/ACE/ace/TLI_Stream.h index 0df08505322..c26823685c3 100644 --- a/ACE/ace/TLI_Stream.h +++ b/ACE/ace/TLI_Stream.h @@ -121,7 +121,7 @@ private: int rwflag_; /// Get rwflag - int get_rwflag (void) const; + int get_rwflag () const; /// Set rwflag void set_rwflag (int value); diff --git a/ACE/ace/TLI_Stream.inl b/ACE/ace/TLI_Stream.inl index 8f5608f0a1d..df7c5b07796 100644 --- a/ACE/ace/TLI_Stream.inl +++ b/ACE/ace/TLI_Stream.inl @@ -13,7 +13,7 @@ ACE_TLI_Stream::set_rwflag (int value) ACE_INLINE int -ACE_TLI_Stream::get_rwflag (void) const +ACE_TLI_Stream::get_rwflag () const { ACE_TRACE ("ACE_TLI_Stream::get_rwflag"); return this->rwflag_; diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h index f8e59ccc0b7..17075f11837 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -54,7 +54,7 @@ public: ACE_Reactor_Mask mask, ACE_EH_PTMF callback); - bool dispatch (void) const; + bool dispatch () const; ACE_HANDLE handle_; ACE_Event_Handler *event_handler_; diff --git a/ACE/ace/TP_Reactor.inl b/ACE/ace/TP_Reactor.inl index f793fd23c6e..fc712b13c68 100644 --- a/ACE/ace/TP_Reactor.inl +++ b/ACE/ace/TP_Reactor.inl @@ -41,7 +41,7 @@ ACE_EH_Dispatch_Info::set (ACE_HANDLE handle, } ACE_INLINE bool -ACE_EH_Dispatch_Info::dispatch (void) const +ACE_EH_Dispatch_Info::dispatch () const { return this->dispatch_; } diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index 963c2a8b07f..efd7d43c6fc 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -196,7 +196,7 @@ protected: /// Obtains a plain value stored in the thread-specific storage. # if defined (ACE_HAS_THR_C_DEST) - ACE_TSS_Adapter *ts_value (void) const; + ACE_TSS_Adapter *ts_value () const; # else TYPE *ts_value () const; # endif /* ACE_HAS_THR_C_DEST */ diff --git a/ACE/ace/TSS_T.inl b/ACE/ace/TSS_T.inl index 9d97fc374a4..69fb08e28c9 100644 --- a/ACE/ace/TSS_T.inl +++ b/ACE/ace/TSS_T.inl @@ -19,7 +19,7 @@ ACE_TSS<TYPE>::ts_init (void) } template <class TYPE> ACE_INLINE TYPE * -ACE_TSS<TYPE>::ts_object (void) const +ACE_TSS<TYPE>::ts_object () const { return this->type_; } @@ -32,7 +32,7 @@ ACE_TSS<TYPE>::ts_object (TYPE *type) } template <class TYPE> ACE_INLINE TYPE * -ACE_TSS<TYPE>::ts_get (void) const +ACE_TSS<TYPE>::ts_get () const { return this->type_; } @@ -41,7 +41,7 @@ ACE_TSS<TYPE>::ts_get (void) const # if defined (ACE_HAS_THR_C_DEST) template <class TYPE> ACE_INLINE ACE_TSS_Adapter * -ACE_TSS<TYPE>::ts_value (void) const +ACE_TSS<TYPE>::ts_value () const { // Get the tss adapter from thread-specific storage void *temp = 0; diff --git a/ACE/ace/Task_Ex_T.cpp b/ACE/ace/Task_Ex_T.cpp index 801c433abe2..8f48df6775c 100644 --- a/ACE/ace/Task_Ex_T.cpp +++ b/ACE/ace/Task_Ex_T.cpp @@ -23,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tycc (ACE_Task_Ex) template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY> void -ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::dump (void) const +ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::dump"); @@ -96,7 +96,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::sibling (void) } template<ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY> const ACE_TCHAR * -ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::name (void) const +ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::name () const { ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::name"); if (this->mod_ == 0) @@ -106,7 +106,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::name (void) const } template<ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY> ACE_Module<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::module (void) const +ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::module () const { ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::module"); return this->mod_; diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h index 20fdf2222d0..905090dee5c 100644 --- a/ACE/ace/Task_Ex_T.h +++ b/ACE/ace/Task_Ex_T.h @@ -127,7 +127,7 @@ public: // Should be protected: // = ACE_Task utility routines to identify names et al. /// Return the name of the enclosing Module if there's one associated /// with the Task, else returns 0. - const ACE_TCHAR *name (void) const; + const ACE_TCHAR *name () const; // = Pointers to next ACE_Task_Base (if ACE is part of an ACE_Stream). /// Get next Task pointer. @@ -140,7 +140,7 @@ public: // Should be protected: ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling (void); /// Return the Task's Module if there is one, else returns 0. - ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module (void) const; + ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module () const; /** * Flush the task's queue, i.e., free all of the enqueued diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp index c3c2e050368..b04a034c977 100644 --- a/ACE/ace/Timer_Hash_T.cpp +++ b/ACE/ace/Timer_Hash_T.cpp @@ -245,7 +245,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::next (v // Returns true when we are at the end (when bucket_item_ == 0) template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> bool -ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::isdone (void) const +ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::isdone () const { return this->iter_ == 0; } @@ -387,7 +387,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::close (void) // Checks if queue is empty. template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> bool -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::is_empty (void) const +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::is_empty () const { ACE_TRACE ("ACE_Timer_Hash_T::is_empty"); return this->table_[this->earliest_position_]->is_empty (); @@ -397,14 +397,14 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::is_empty (void) template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> const ACE_Time_Value & -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::earliest_time (void) const +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::earliest_time () const { ACE_TRACE ("ACE_Timer_Hash_T::earliest_time"); return this->table_[this->earliest_position_]->earliest_time (); } template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> void -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::dump (void) const +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Hash_T::dump"); diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp index aa6c795c14a..5a9c27d8152 100644 --- a/ACE/ace/Timer_List_T.cpp +++ b/ACE/ace/Timer_List_T.cpp @@ -48,7 +48,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void) // Returns true when we are at <head_> template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool -ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone (void) const +ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const { return this->current_node_ == 0; } @@ -97,7 +97,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_List_T (FUNCTO // Checks if list is empty. template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty () const { ACE_TRACE ("ACE_Timer_List_T::is_empty"); return this->get_first_i() == 0; @@ -107,7 +107,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const // Returns earliest time in a non-empty list. template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> const ACE_Time_Value & -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time (void) const +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time () const { ACE_TRACE ("ACE_Timer_List_T::earliest_time"); ACE_Timer_Node_T<TYPE>* first = this->get_first_i(); @@ -164,7 +164,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void) } template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_List_T::dump"); @@ -404,7 +404,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first (void) } template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> * -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i (void) const +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i () const { ACE_TRACE ("ACE_Timer_List_T::get_first_i"); ACE_Timer_Node_T<TYPE>* first = this->head_->get_next(); diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h index 1e7ed649c6d..ecac32eeafa 100644 --- a/ACE/ace/Timer_List_T.h +++ b/ACE/ace/Timer_List_T.h @@ -49,7 +49,7 @@ public: virtual void next (void); /// 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); @@ -107,11 +107,11 @@ public: virtual ~ACE_Timer_List_T (void); /// True if queue is empty, else false. - virtual bool is_empty (void) const; + virtual bool is_empty () const; /// Returns the time of the earlier node in the ACE_Timer_List. /// 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 @@ -194,7 +194,7 @@ private: void unlink (ACE_Timer_Node_T<TYPE>* n); - ACE_Timer_Node_T<TYPE>* get_first_i(void) const; + ACE_Timer_Node_T<TYPE>* get_first_i() const; private: /// Pointer to linked list of <ACE_Timer_Handles>. diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 56351b7172b..90104b4a27d 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -164,10 +164,10 @@ public: int timer_queue (TQ *tq); /// Return the current <TQ>. - TQ *timer_queue (void) const; + TQ *timer_queue () const; /// Return the thread id of our active object. - ACE_thread_t thr_id (void) const; + ACE_thread_t thr_id () const; /** * We override the default activate() method so that we can ensure diff --git a/ACE/ace/Timer_Queue_Adapters.inl b/ACE/ace/Timer_Queue_Adapters.inl index ad5129f73fd..e9a0c161342 100644 --- a/ACE/ace/Timer_Queue_Adapters.inl +++ b/ACE/ace/Timer_Queue_Adapters.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class TQ, class TYPE> ACE_INLINE TQ * -ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::timer_queue (void) const +ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::timer_queue () const { return this->timer_queue_; } @@ -20,7 +20,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::timer_queue (TQ *tq) } template<class TQ, class TYPE> ACE_INLINE ACE_thread_t -ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::thr_id (void) const +ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::thr_id () const { return this->thr_id_; } diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index 5c55346187c..5347b6570fd 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -262,7 +262,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::find_node (long timer_i * @return True if empty */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty () const { ACE_TRACE ("ACE_Timer_Wheel_T::is_empty"); return timer_count_ == 0; @@ -273,7 +273,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::is_empty (void) const * @return First (earliest) node in the wheel_'s earliest_spoke_ list */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> const ACE_Time_Value & -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time (void) const +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time () const { ACE_TRACE ("ACE_Timer_Wheel_T::earliest_time"); ACE_Timer_Node_T<TYPE>* n = this->get_first_i (); @@ -672,7 +672,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::recalc_earliest * of the wheel. */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Wheel_T::dump"); @@ -753,7 +753,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first (void) template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE>* -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i (void) const +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i () const { ACE_Timer_Node_T<TYPE>* root = this->spokes_[this->earliest_spoke_]; ACE_Timer_Node_T<TYPE>* first = root->get_next (); @@ -922,7 +922,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::goto_next (u_i * @return True when we there aren't any more items (when current_node_ == 0) */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool -ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone (void) const +ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const { return this->current_node_ == 0; } diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h index f02649e7ff7..ccedf514bb6 100644 --- a/ACE/ace/Timer_Wheel_T.h +++ b/ACE/ace/Timer_Wheel_T.h @@ -177,7 +177,7 @@ protected: private: // The following are documented in the .cpp file. - ACE_Timer_Node_T<TYPE>* get_first_i (void) const; + ACE_Timer_Node_T<TYPE>* get_first_i () const; ACE_Timer_Node_T<TYPE>* remove_first_expired (const ACE_Time_Value& now); void open_i (size_t prealloc, u_int spokes, u_int res); virtual void reschedule (ACE_Timer_Node_T<TYPE> *); diff --git a/ACE/ace/Token.inl b/ACE/ace/Token.inl index 5d42c427bdf..ed7a6883dce 100644 --- a/ACE/ace/Token.inl +++ b/ACE/ace/Token.inl @@ -165,7 +165,7 @@ ACE_Noop_Token::renew (int, ACE_Time_Value *) } ACE_INLINE void -ACE_Noop_Token::dump (void) const +ACE_Noop_Token::dump () const { } diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp index c67950243ad..031c8ab66ef 100644 --- a/ACE/ace/Token_Collection.cpp +++ b/ACE/ace/Token_Collection.cpp @@ -254,7 +254,7 @@ ACE_Token_Collection::~ACE_Token_Collection (void) // This method doesn't mean anything for a collection. ACE_Token_Proxy * -ACE_Token_Collection::clone (void) const +ACE_Token_Collection::clone () const { ACE_TRACE ("ACE_Token_Collection::clone"); return (ACE_Token_Proxy *) 0; @@ -269,7 +269,7 @@ ACE_Token_Collection::create_token (const ACE_TCHAR *) } void -ACE_Token_Collection::dump (void) const +ACE_Token_Collection::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Collection::dump"); diff --git a/ACE/ace/Token_Collection.h b/ACE/ace/Token_Collection.h index 401cb4b23e8..3323aad0031 100644 --- a/ACE/ace/Token_Collection.h +++ b/ACE/ace/Token_Collection.h @@ -190,7 +190,7 @@ public: /// Return the name of the collection. Not very functionally /// important, but sometimes a useful debugging tool. - virtual const ACE_TCHAR *name (void) const; + virtual const ACE_TCHAR *name () const; protected: @@ -211,7 +211,7 @@ protected: // = I'm not sure what these mean, but they have to be defined since they're // pure virtual in ACE_Token_Proxy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; virtual ACE_Tokens *create_token (const ACE_TCHAR *name); }; diff --git a/ACE/ace/Token_Collection.inl b/ACE/ace/Token_Collection.inl index 1104b1f6030..d103925e489 100644 --- a/ACE/ace/Token_Collection.inl +++ b/ACE/ace/Token_Collection.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_TCHAR * -ACE_Token_Collection::name (void) const +ACE_Token_Collection::name () const { return name_; } diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp index e8a6d03684d..9d2f1a48c91 100644 --- a/ACE/ace/Token_Invariants.cpp +++ b/ACE/ace/Token_Invariants.cpp @@ -134,7 +134,7 @@ ACE_Token_Invariant_Manager::rwlock_releasing (const ACE_TCHAR *token_name) } void -ACE_Token_Invariant_Manager::dump (void) const +ACE_Token_Invariant_Manager::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Invariant_Manager::dump"); @@ -245,7 +245,7 @@ ACE_Mutex_Invariants::releasing () } void -ACE_Mutex_Invariants::dump (void) const +ACE_Mutex_Invariants::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Mutex_Invariants::dump"); @@ -299,7 +299,7 @@ ACE_RWLock_Invariants::releasing (void) } void -ACE_RWLock_Invariants::dump (void) const +ACE_RWLock_Invariants::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RWLock_Invariants::dump"); diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp index 0c983f9ff98..32ec131f4ff 100644 --- a/ACE/ace/Token_Manager.cpp +++ b/ACE/ace/Token_Manager.cpp @@ -251,7 +251,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token) } void -ACE_Token_Manager::dump (void) const +ACE_Token_Manager::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Manager::dump"); diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp index 8737e7576bb..bdbaddedc72 100644 --- a/ACE/ace/Token_Request_Reply.cpp +++ b/ACE/ace/Token_Request_Reply.cpp @@ -86,7 +86,7 @@ ACE_Token_Request::decode (void) // Print out the current values of the ACE_Token_Request. void -ACE_Token_Request::dump (void) const +ACE_Token_Request::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -167,7 +167,7 @@ ACE_Token_Reply::decode (void) // Print out current values of the ACE_Token_Reply object. void -ACE_Token_Reply::dump (void) const +ACE_Token_Reply::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), diff --git a/ACE/ace/Token_Request_Reply.inl b/ACE/ace/Token_Request_Reply.inl index df58781c5f2..1072febd3a9 100644 --- a/ACE/ace/Token_Request_Reply.inl +++ b/ACE/ace/Token_Request_Reply.inl @@ -8,7 +8,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // = Set/get the length of the encoded/decoded message. ACE_INLINE ACE_UINT32 -ACE_Token_Request::length (void) const +ACE_Token_Request::length () const { return ntohl (this->transfer_.length_); } @@ -21,7 +21,7 @@ ACE_Token_Request::length (ACE_UINT32 l) // = Set/get the type of the message. ACE_INLINE int -ACE_Token_Request::token_type (void) const +ACE_Token_Request::token_type () const { return (int) ntohl (this->transfer_.token_type_); } @@ -34,7 +34,7 @@ ACE_Token_Request::token_type (int t) // = Set/get the type of the message. ACE_INLINE int -ACE_Token_Request::proxy_type (void) const +ACE_Token_Request::proxy_type () const { return (int) ntohl (this->transfer_.proxy_type_); } @@ -47,7 +47,7 @@ ACE_Token_Request::proxy_type (int t) // = Set/get the type of the message. ACE_INLINE ACE_UINT32 -ACE_Token_Request::operation_type (void) const +ACE_Token_Request::operation_type () const { return ntohl (this->transfer_.operation_type_); } @@ -60,7 +60,7 @@ ACE_Token_Request::operation_type (ACE_UINT32 t) // = Set/get the requeue position ACE_INLINE ACE_UINT32 -ACE_Token_Request::requeue_position (void) const +ACE_Token_Request::requeue_position () const { return ntohl (this->transfer_.requeue_position_); } @@ -73,7 +73,7 @@ ACE_Token_Request::requeue_position (ACE_UINT32 rq) // = Set/get the requeue position ACE_INLINE ACE_UINT32 -ACE_Token_Request::notify (void) const +ACE_Token_Request::notify () const { return ntohl (this->transfer_.notify_); } @@ -86,7 +86,7 @@ ACE_Token_Request::notify (ACE_UINT32 rq) // = Set/get the blocking semantics. ACE_INLINE ACE_Synch_Options & -ACE_Token_Request::options (void) const +ACE_Token_Request::options () const { return (ACE_Synch_Options &) options_; } @@ -115,7 +115,7 @@ ACE_Token_Request::options (const ACE_Synch_Options &opt) // = Set/get the name of the token. ACE_INLINE ACE_TCHAR * -ACE_Token_Request::token_name (void) const +ACE_Token_Request::token_name () const { return token_name_; } @@ -149,7 +149,7 @@ ACE_Token_Request::token_name (const ACE_TCHAR *token_name, // = Set/get the id of the client. ACE_INLINE ACE_TCHAR * -ACE_Token_Request::client_id (void) const +ACE_Token_Request::client_id () const { return this->client_id_; } @@ -160,7 +160,7 @@ ACE_Token_Request::client_id (void) const // = Set/get the length of the encoded/decoded message. ACE_INLINE ACE_UINT32 -ACE_Token_Reply::length (void) const +ACE_Token_Reply::length () const { return ntohl (this->transfer_.length_); } @@ -173,7 +173,7 @@ ACE_Token_Reply::length (ACE_UINT32 l) // = Set/get the errno of a failed reply. ACE_INLINE ACE_UINT32 -ACE_Token_Reply::errnum (void) const +ACE_Token_Reply::errnum () const { return ntohl (this->transfer_.errno_); } @@ -186,7 +186,7 @@ ACE_Token_Reply::errnum (ACE_UINT32 e) // = Set/get the length of the encoded/decoded message. ACE_INLINE ACE_UINT32 -ACE_Token_Reply::arg (void) const +ACE_Token_Reply::arg () const { return ntohl (this->transfer_.arg_); } diff --git a/ACE/ace/Typed_SV_Message.cpp b/ACE/ace/Typed_SV_Message.cpp index 842d70ac2ac..98ec28aee6c 100644 --- a/ACE/ace/Typed_SV_Message.cpp +++ b/ACE/ace/Typed_SV_Message.cpp @@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message) template <class T> void -ACE_Typed_SV_Message<T>::dump (void) const +ACE_Typed_SV_Message<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Typed_SV_Message<T>::dump"); diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h index bbff937f2d2..503f1ceefb0 100644 --- a/ACE/ace/Typed_SV_Message.h +++ b/ACE/ace/Typed_SV_Message.h @@ -42,19 +42,19 @@ public: ~ACE_Typed_SV_Message (void); /// Get the type of the message. - long type (void) const; + long type () const; /// Set the type of the message. void type (long type); /// Get the length of the message. - int length (void) const; + int length () const; /// Set the length of the message. void length (int l); /// Get the maximum size of the message. - int max_size (void) const; + int max_size () const; /// Set the maximum size of the message. void max_size (int m); diff --git a/ACE/ace/Typed_SV_Message.inl b/ACE/ace/Typed_SV_Message.inl index 2e3c12939c3..e9eef31b737 100644 --- a/ACE/ace/Typed_SV_Message.inl +++ b/ACE/ace/Typed_SV_Message.inl @@ -35,7 +35,7 @@ ACE_Typed_SV_Message<T>::~ACE_Typed_SV_Message (void) } template <class T> ACE_INLINE long -ACE_Typed_SV_Message<T>::type (void) const +ACE_Typed_SV_Message<T>::type () const { ACE_TRACE ("ACE_Typed_SV_Message<T>::type"); return this->type_; @@ -49,7 +49,7 @@ ACE_Typed_SV_Message<T>::type (long t) } template <class T> ACE_INLINE int -ACE_Typed_SV_Message<T>::length (void) const +ACE_Typed_SV_Message<T>::length () const { ACE_TRACE ("ACE_Typed_SV_Message<T>::length"); return this->length_; @@ -63,7 +63,7 @@ ACE_Typed_SV_Message<T>::length (int len) } template <class T> ACE_INLINE int -ACE_Typed_SV_Message<T>::max_size (void) const +ACE_Typed_SV_Message<T>::max_size () const { ACE_TRACE ("ACE_Typed_SV_Message<T>::max_size"); return this->max_; diff --git a/ACE/ace/Typed_SV_Message_Queue.cpp b/ACE/ace/Typed_SV_Message_Queue.cpp index 3fe864f14d5..09c213dfd72 100644 --- a/ACE/ace/Typed_SV_Message_Queue.cpp +++ b/ACE/ace/Typed_SV_Message_Queue.cpp @@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message_Queue) template <class T> void -ACE_Typed_SV_Message_Queue<T>::dump (void) const +ACE_Typed_SV_Message_Queue<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::dump"); diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h index 18c01cb5c6b..3fdb92bd7ef 100644 --- a/ACE/ace/Typed_SV_Message_Queue.h +++ b/ACE/ace/Typed_SV_Message_Queue.h @@ -56,7 +56,7 @@ public: int recv (ACE_Typed_SV_Message<T> &mb, int mflags = 0); /// Return the id of the underlying ACE_SV_Message_Queue. - int get_id (void) const; + int get_id () const; /// Control the underlying message queue. int control (int option, void *arg = 0); diff --git a/ACE/ace/Typed_SV_Message_Queue.inl b/ACE/ace/Typed_SV_Message_Queue.inl index 915bd371713..0814ecf64db 100644 --- a/ACE/ace/Typed_SV_Message_Queue.inl +++ b/ACE/ace/Typed_SV_Message_Queue.inl @@ -69,7 +69,7 @@ ACE_Typed_SV_Message_Queue<T>::control (int option, } template <class T> ACE_INLINE int -ACE_Typed_SV_Message_Queue<T>::get_id (void) const +ACE_Typed_SV_Message_Queue<T>::get_id () const { return this->message_queue_.get_id (); } diff --git a/ACE/ace/UNIX_Addr.inl b/ACE/ace/UNIX_Addr.inl index f19ef68a52b..125ead75e32 100644 --- a/ACE/ace/UNIX_Addr.inl +++ b/ACE/ace/UNIX_Addr.inl @@ -44,7 +44,7 @@ ACE_UNIX_Addr::operator != (const ACE_UNIX_Addr &sap) const // Return the path name used for the rendezvous point. ACE_INLINE const char * -ACE_UNIX_Addr::get_path_name (void) const +ACE_UNIX_Addr::get_path_name () const { return this->unix_addr_.sun_path; } diff --git a/ACE/ace/UPIPE_Stream.h b/ACE/ace/UPIPE_Stream.h index ca377e3e407..44c9f2df1dc 100644 --- a/ACE/ace/UPIPE_Stream.h +++ b/ACE/ace/UPIPE_Stream.h @@ -49,7 +49,7 @@ public: int close (void); /// Return the underlying I/O handle. - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; // = Send/recv ACE Message_Blocks. /// Send a message through the message queue. Returns -1 on error, diff --git a/ACE/ace/UPIPE_Stream.inl b/ACE/ace/UPIPE_Stream.inl index acc4a4ed789..df11fbc576e 100644 --- a/ACE/ace/UPIPE_Stream.inl +++ b/ACE/ace/UPIPE_Stream.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_HANDLE -ACE_UPIPE_Stream::get_handle (void) const +ACE_UPIPE_Stream::get_handle () const { ACE_TRACE ("ACE_UPIPE_Stream::get_handle"); return this->ACE_SPIPE::get_handle (); diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index a835962f7ae..1ce14798b6a 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -980,7 +980,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos (void) } void -ACE_WFMO_Reactor_Handler_Repository::dump (void) const +ACE_WFMO_Reactor_Handler_Repository::dump () const { #if defined (ACE_HAS_DUMP) size_t i = 0; @@ -1273,7 +1273,7 @@ ACE_WFMO_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler) } ACE_Timer_Queue * -ACE_WFMO_Reactor::timer_queue (void) const +ACE_WFMO_Reactor::timer_queue () const { return this->timer_queue_; } @@ -2332,7 +2332,7 @@ ACE_WFMO_Reactor::update_state (void) } void -ACE_WFMO_Reactor::dump (void) const +ACE_WFMO_Reactor::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor::dump"); @@ -2412,7 +2412,7 @@ ACE_WFMO_Reactor_Notify::open (ACE_Reactor_Impl *wfmo_reactor, } ACE_HANDLE -ACE_WFMO_Reactor_Notify::get_handle (void) const +ACE_WFMO_Reactor_Notify::get_handle () const { return this->wakeup_one_thread_.handle (); } @@ -2683,7 +2683,7 @@ ACE_WFMO_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh, } void -ACE_WFMO_Reactor_Notify::dump (void) const +ACE_WFMO_Reactor_Notify::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump"); diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index 0c1d5dab885..92eed922bb9 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -335,15 +335,15 @@ public: // = Accessors. /// Maximum ACE_HANDLE value, plus 1. - DWORD max_handlep1 (void) const; + DWORD max_handlep1 () const; /// Pointer to the beginning of the current array of ACE_HANDLE /// *'s. - ACE_HANDLE *handles (void) const; + ACE_HANDLE *handles () const; /// Pointer to the beginning of the current array of /// ACE_Event_Handler *'s. - Current_Info *current_info (void) const; + Current_Info *current_info () const; /// Check if changes to the handle set are required. virtual bool changes_required (void); @@ -519,7 +519,7 @@ public: ACE_Handle_Set &rd_mask); /// Returns a handle to the ACE_Auto_Event. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock @@ -704,7 +704,7 @@ public: virtual int timer_queue (ACE_Timer_Queue *tq); /// Return the current ACE_Timer_Queue. - virtual ACE_Timer_Queue *timer_queue (void) const; + virtual ACE_Timer_Queue *timer_queue () const; /// Close down the ACE_WFMO_Reactor and release all of its resources. virtual int close (void); @@ -1100,7 +1100,7 @@ public: /// Returns the current size of the WFMO_Reactor's internal /// descriptor table. - virtual size_t size (void) const; + virtual size_t size () const; /// Returns a reference to the WFMO_Reactor's internal lock. virtual ACE_Lock &lock (void); diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl index 19c7da594d6..0cd239a2bbf 100644 --- a/ACE/ace/WFMO_Reactor.inl +++ b/ACE/ace/WFMO_Reactor.inl @@ -73,7 +73,7 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::set (Common_Info &common_info) } ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const +ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump"); @@ -229,7 +229,7 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::reset (void) } ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const +ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump"); @@ -300,7 +300,7 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::set (ACE_HANDLE event_handl } ACE_INLINE void -ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const +ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump"); @@ -333,7 +333,7 @@ ACE_WFMO_Reactor_Handler_Repository::close (void) } ACE_INLINE ACE_HANDLE * -ACE_WFMO_Reactor_Handler_Repository::handles (void) const +ACE_WFMO_Reactor_Handler_Repository::handles () const { // This code is probably too subtle to be useful in the long run... // The basic idea is that all threads wait on all user handles plus @@ -348,7 +348,7 @@ ACE_WFMO_Reactor_Handler_Repository::handles (void) const } ACE_INLINE ACE_WFMO_Reactor_Handler_Repository::Current_Info * -ACE_WFMO_Reactor_Handler_Repository::current_info (void) const +ACE_WFMO_Reactor_Handler_Repository::current_info () const { if (ACE_Thread::self () == this->wfmo_reactor_.owner_i ()) return this->current_info_; @@ -357,7 +357,7 @@ ACE_WFMO_Reactor_Handler_Repository::current_info (void) const } ACE_INLINE DWORD -ACE_WFMO_Reactor_Handler_Repository::max_handlep1 (void) const +ACE_WFMO_Reactor_Handler_Repository::max_handlep1 () const { if (ACE_Thread::self () == this->wfmo_reactor_.owner_i ()) return this->max_handlep1_; @@ -1171,7 +1171,7 @@ ACE_WFMO_Reactor::lock (void) } ACE_INLINE size_t -ACE_WFMO_Reactor::size (void) const +ACE_WFMO_Reactor::size () const { // Size of repository minus the 2 used for internal purposes return this->handler_rep_.max_size_ - 2; diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index 710db21683c..9866721da19 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -17,61 +17,61 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL size_t -ACE_WIN32_Asynch_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Result::bytes_transferred () const { return this->bytes_transferred_; } const void * -ACE_WIN32_Asynch_Result::act (void) const +ACE_WIN32_Asynch_Result::act () const { return this->act_; } int -ACE_WIN32_Asynch_Result::success (void) const +ACE_WIN32_Asynch_Result::success () const { return this->success_; } const void * -ACE_WIN32_Asynch_Result::completion_key (void) const +ACE_WIN32_Asynch_Result::completion_key () const { return this->completion_key_; } u_long -ACE_WIN32_Asynch_Result::error (void) const +ACE_WIN32_Asynch_Result::error () const { return this->error_; } ACE_HANDLE -ACE_WIN32_Asynch_Result::event (void) const +ACE_WIN32_Asynch_Result::event () const { return this->hEvent; } u_long -ACE_WIN32_Asynch_Result::offset (void) const +ACE_WIN32_Asynch_Result::offset () const { return this->Offset; } u_long -ACE_WIN32_Asynch_Result::offset_high (void) const +ACE_WIN32_Asynch_Result::offset_high () const { return this->OffsetHigh; } int -ACE_WIN32_Asynch_Result::priority (void) const +ACE_WIN32_Asynch_Result::priority () const { ACE_NOTSUP_RETURN (0); } int -ACE_WIN32_Asynch_Result::signal_number (void) const +ACE_WIN32_Asynch_Result::signal_number () const { ACE_NOTSUP_RETURN (0); } @@ -190,7 +190,7 @@ ACE_WIN32_Asynch_Operation::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Operation::proactor (void) const +ACE_WIN32_Asynch_Operation::proactor () const { return this->proactor_; } @@ -210,19 +210,19 @@ ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation (void) // ************************************************************ size_t -ACE_WIN32_Asynch_Read_Stream_Result::bytes_to_read (void) const +ACE_WIN32_Asynch_Read_Stream_Result::bytes_to_read () const { return this->bytes_to_read_; } ACE_Message_Block & -ACE_WIN32_Asynch_Read_Stream_Result::message_block (void) const +ACE_WIN32_Asynch_Read_Stream_Result::message_block () const { return this->message_block_; } ACE_HANDLE -ACE_WIN32_Asynch_Read_Stream_Result::handle (void) const +ACE_WIN32_Asynch_Read_Stream_Result::handle () const { return this->handle_; } @@ -302,61 +302,61 @@ ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result (void) // warnings. These methods call the base class methods. size_t -ACE_WIN32_Asynch_Read_Stream_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Read_Stream_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Read_Stream_Result::act (void) const +ACE_WIN32_Asynch_Read_Stream_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Read_Stream_Result::success (void) const +ACE_WIN32_Asynch_Read_Stream_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Read_Stream_Result::completion_key (void) const +ACE_WIN32_Asynch_Read_Stream_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Read_Stream_Result::error (void) const +ACE_WIN32_Asynch_Read_Stream_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Read_Stream_Result::event (void) const +ACE_WIN32_Asynch_Read_Stream_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Read_Stream_Result::offset (void) const +ACE_WIN32_Asynch_Read_Stream_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Read_Stream_Result::offset_high (void) const +ACE_WIN32_Asynch_Read_Stream_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Read_Stream_Result::priority (void) const +ACE_WIN32_Asynch_Read_Stream_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Read_Stream_Result::signal_number (void) const +ACE_WIN32_Asynch_Read_Stream_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -368,7 +368,7 @@ ACE_WIN32_Asynch_Read_Stream_Result::post_completion (ACE_Proactor_Impl *proacto } int -ACE_WIN32_Asynch_Read_Stream_Result::scatter_enabled (void) const +ACE_WIN32_Asynch_Read_Stream_Result::scatter_enabled () const { return this->scatter_enabled_; } @@ -638,25 +638,25 @@ ACE_WIN32_Asynch_Read_Stream::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Read_Stream::proactor (void) const +ACE_WIN32_Asynch_Read_Stream::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } size_t -ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write (void) const +ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write () const { return this->bytes_to_write_; } ACE_Message_Block & -ACE_WIN32_Asynch_Write_Stream_Result::message_block (void) const +ACE_WIN32_Asynch_Write_Stream_Result::message_block () const { return this->message_block_; } ACE_HANDLE -ACE_WIN32_Asynch_Write_Stream_Result::handle (void) const +ACE_WIN32_Asynch_Write_Stream_Result::handle () const { return this->handle_; } @@ -731,61 +731,61 @@ ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result (voi // warnings. These methods call the base class methods. size_t -ACE_WIN32_Asynch_Write_Stream_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Write_Stream_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Write_Stream_Result::act (void) const +ACE_WIN32_Asynch_Write_Stream_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Write_Stream_Result::success (void) const +ACE_WIN32_Asynch_Write_Stream_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Write_Stream_Result::completion_key (void) const +ACE_WIN32_Asynch_Write_Stream_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Write_Stream_Result::error (void) const +ACE_WIN32_Asynch_Write_Stream_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Write_Stream_Result::event (void) const +ACE_WIN32_Asynch_Write_Stream_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Write_Stream_Result::offset (void) const +ACE_WIN32_Asynch_Write_Stream_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Write_Stream_Result::offset_high (void) const +ACE_WIN32_Asynch_Write_Stream_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Write_Stream_Result::priority (void) const +ACE_WIN32_Asynch_Write_Stream_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Write_Stream_Result::signal_number (void) const +ACE_WIN32_Asynch_Write_Stream_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -797,7 +797,7 @@ ACE_WIN32_Asynch_Write_Stream_Result::post_completion (ACE_Proactor_Impl *proact } int -ACE_WIN32_Asynch_Write_Stream_Result::gather_enabled (void) const +ACE_WIN32_Asynch_Write_Stream_Result::gather_enabled () const { return this->gather_enabled_; } @@ -1066,7 +1066,7 @@ ACE_WIN32_Asynch_Write_Stream::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Write_Stream::proactor (void) const +ACE_WIN32_Asynch_Write_Stream::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } @@ -1155,61 +1155,61 @@ ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result (void) // warnings. These methods call the base class methods. size_t -ACE_WIN32_Asynch_Read_File_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Read_File_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Read_File_Result::act (void) const +ACE_WIN32_Asynch_Read_File_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Read_File_Result::success (void) const +ACE_WIN32_Asynch_Read_File_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Read_File_Result::completion_key (void) const +ACE_WIN32_Asynch_Read_File_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Read_File_Result::error (void) const +ACE_WIN32_Asynch_Read_File_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Read_File_Result::event (void) const +ACE_WIN32_Asynch_Read_File_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Read_File_Result::offset (void) const +ACE_WIN32_Asynch_Read_File_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Read_File_Result::offset_high (void) const +ACE_WIN32_Asynch_Read_File_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Read_File_Result::priority (void) const +ACE_WIN32_Asynch_Read_File_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Read_File_Result::signal_number (void) const +ACE_WIN32_Asynch_Read_File_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -1220,19 +1220,19 @@ ACE_WIN32_Asynch_Read_File_Result::signal_number (void) const // ACE_WIN32_Asynch_Read_Stream_Result base class. size_t -ACE_WIN32_Asynch_Read_File_Result::bytes_to_read (void) const +ACE_WIN32_Asynch_Read_File_Result::bytes_to_read () const { return ACE_WIN32_Asynch_Read_Stream_Result::bytes_to_read (); } ACE_Message_Block & -ACE_WIN32_Asynch_Read_File_Result::message_block (void) const +ACE_WIN32_Asynch_Read_File_Result::message_block () const { return ACE_WIN32_Asynch_Read_Stream_Result::message_block (); } ACE_HANDLE -ACE_WIN32_Asynch_Read_File_Result::handle (void) const +ACE_WIN32_Asynch_Read_File_Result::handle () const { return ACE_WIN32_Asynch_Read_Stream_Result::handle (); } @@ -1468,7 +1468,7 @@ ACE_WIN32_Asynch_Read_File::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Read_File::proactor (void) const +ACE_WIN32_Asynch_Read_File::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } @@ -1558,61 +1558,61 @@ ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result (void) // warnings. These methods call the base class methods. size_t -ACE_WIN32_Asynch_Write_File_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Write_File_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Write_File_Result::act (void) const +ACE_WIN32_Asynch_Write_File_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Write_File_Result::success (void) const +ACE_WIN32_Asynch_Write_File_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Write_File_Result::completion_key (void) const +ACE_WIN32_Asynch_Write_File_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Write_File_Result::error (void) const +ACE_WIN32_Asynch_Write_File_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Write_File_Result::event (void) const +ACE_WIN32_Asynch_Write_File_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Write_File_Result::offset (void) const +ACE_WIN32_Asynch_Write_File_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Write_File_Result::offset_high (void) const +ACE_WIN32_Asynch_Write_File_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Write_File_Result::priority (void) const +ACE_WIN32_Asynch_Write_File_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Write_File_Result::signal_number (void) const +ACE_WIN32_Asynch_Write_File_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -1623,19 +1623,19 @@ ACE_WIN32_Asynch_Write_File_Result::signal_number (void) const // ACE_WIN32_Asynch_Write_Stream_Result base class. size_t -ACE_WIN32_Asynch_Write_File_Result::bytes_to_write (void) const +ACE_WIN32_Asynch_Write_File_Result::bytes_to_write () const { return ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write (); } ACE_Message_Block & -ACE_WIN32_Asynch_Write_File_Result::message_block (void) const +ACE_WIN32_Asynch_Write_File_Result::message_block () const { return ACE_WIN32_Asynch_Write_Stream_Result::message_block (); } ACE_HANDLE -ACE_WIN32_Asynch_Write_File_Result::handle (void) const +ACE_WIN32_Asynch_Write_File_Result::handle () const { return ACE_WIN32_Asynch_Write_Stream_Result::handle (); } @@ -1915,31 +1915,31 @@ ACE_WIN32_Asynch_Write_File::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Write_File::proactor (void) const +ACE_WIN32_Asynch_Write_File::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } size_t -ACE_WIN32_Asynch_Accept_Result::bytes_to_read (void) const +ACE_WIN32_Asynch_Accept_Result::bytes_to_read () const { return this->bytes_to_read_; } ACE_Message_Block & -ACE_WIN32_Asynch_Accept_Result::message_block (void) const +ACE_WIN32_Asynch_Accept_Result::message_block () const { return this->message_block_; } ACE_HANDLE -ACE_WIN32_Asynch_Accept_Result::listen_handle (void) const +ACE_WIN32_Asynch_Accept_Result::listen_handle () const { return this->listen_handle_; } ACE_HANDLE -ACE_WIN32_Asynch_Accept_Result::accept_handle (void) const +ACE_WIN32_Asynch_Accept_Result::accept_handle () const { return this->accept_handle_; } @@ -2008,61 +2008,61 @@ ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void) // warnings. These methods call the base class methods. size_t -ACE_WIN32_Asynch_Accept_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Accept_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Accept_Result::act (void) const +ACE_WIN32_Asynch_Accept_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Accept_Result::success (void) const +ACE_WIN32_Asynch_Accept_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Accept_Result::completion_key (void) const +ACE_WIN32_Asynch_Accept_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Accept_Result::error (void) const +ACE_WIN32_Asynch_Accept_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Accept_Result::event (void) const +ACE_WIN32_Asynch_Accept_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Accept_Result::offset (void) const +ACE_WIN32_Asynch_Accept_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Accept_Result::offset_high (void) const +ACE_WIN32_Asynch_Accept_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Accept_Result::priority (void) const +ACE_WIN32_Asynch_Accept_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Accept_Result::signal_number (void) const +ACE_WIN32_Asynch_Accept_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -2232,7 +2232,7 @@ ACE_WIN32_Asynch_Accept::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Accept::proactor (void) const +ACE_WIN32_Asynch_Accept::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } @@ -2240,7 +2240,7 @@ ACE_WIN32_Asynch_Accept::proactor (void) const // ********************************************************************* ACE_HANDLE -ACE_WIN32_Asynch_Connect_Result::connect_handle (void) const +ACE_WIN32_Asynch_Connect_Result::connect_handle () const { return this->connect_handle_; } @@ -2296,61 +2296,61 @@ ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result (void) // warnings. These methods call the base class methods. size_t -ACE_WIN32_Asynch_Connect_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Connect_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Connect_Result::act (void) const +ACE_WIN32_Asynch_Connect_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Connect_Result::success (void) const +ACE_WIN32_Asynch_Connect_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Connect_Result::completion_key (void) const +ACE_WIN32_Asynch_Connect_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Connect_Result::error (void) const +ACE_WIN32_Asynch_Connect_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Connect_Result::event (void) const +ACE_WIN32_Asynch_Connect_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Connect_Result::offset (void) const +ACE_WIN32_Asynch_Connect_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Connect_Result::offset_high (void) const +ACE_WIN32_Asynch_Connect_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Connect_Result::priority (void) const +ACE_WIN32_Asynch_Connect_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Connect_Result::signal_number (void) const +ACE_WIN32_Asynch_Connect_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -2378,13 +2378,13 @@ ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect (void) } ACE_Proactor * -ACE_WIN32_Asynch_Connect::proactor (void) const +ACE_WIN32_Asynch_Connect::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } ACE_HANDLE -ACE_WIN32_Asynch_Connect::get_handle (void) const +ACE_WIN32_Asynch_Connect::get_handle () const { ACE_ASSERT (0); @@ -2808,37 +2808,37 @@ ACE_WIN32_Asynch_Connect::handle_close (ACE_HANDLE fd, ACE_Reactor_Mask) // ********************************************************************* ACE_HANDLE -ACE_WIN32_Asynch_Transmit_File_Result::socket (void) const +ACE_WIN32_Asynch_Transmit_File_Result::socket () const { return this->socket_; } ACE_HANDLE -ACE_WIN32_Asynch_Transmit_File_Result::file (void) const +ACE_WIN32_Asynch_Transmit_File_Result::file () const { return this->file_; } ACE_Asynch_Transmit_File::Header_And_Trailer * -ACE_WIN32_Asynch_Transmit_File_Result::header_and_trailer (void) const +ACE_WIN32_Asynch_Transmit_File_Result::header_and_trailer () const { return this->header_and_trailer_; } size_t -ACE_WIN32_Asynch_Transmit_File_Result::bytes_to_write (void) const +ACE_WIN32_Asynch_Transmit_File_Result::bytes_to_write () const { return this->bytes_to_write_; } size_t -ACE_WIN32_Asynch_Transmit_File_Result::bytes_per_send (void) const +ACE_WIN32_Asynch_Transmit_File_Result::bytes_per_send () const { return this->bytes_per_send_; } u_long -ACE_WIN32_Asynch_Transmit_File_Result::flags (void) const +ACE_WIN32_Asynch_Transmit_File_Result::flags () const { return this->flags_; } @@ -2920,61 +2920,61 @@ ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result (v // warnings. These methods call the base class methods. size_t -ACE_WIN32_Asynch_Transmit_File_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Transmit_File_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Transmit_File_Result::act (void) const +ACE_WIN32_Asynch_Transmit_File_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Transmit_File_Result::success (void) const +ACE_WIN32_Asynch_Transmit_File_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Transmit_File_Result::completion_key (void) const +ACE_WIN32_Asynch_Transmit_File_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Transmit_File_Result::error (void) const +ACE_WIN32_Asynch_Transmit_File_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Transmit_File_Result::event (void) const +ACE_WIN32_Asynch_Transmit_File_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Transmit_File_Result::offset (void) const +ACE_WIN32_Asynch_Transmit_File_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Transmit_File_Result::offset_high (void) const +ACE_WIN32_Asynch_Transmit_File_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Transmit_File_Result::priority (void) const +ACE_WIN32_Asynch_Transmit_File_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Transmit_File_Result::signal_number (void) const +ACE_WIN32_Asynch_Transmit_File_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -3114,19 +3114,19 @@ ACE_WIN32_Asynch_Transmit_File::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Transmit_File::proactor (void) const +ACE_WIN32_Asynch_Transmit_File::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } size_t -ACE_WIN32_Asynch_Read_Dgram_Result::bytes_to_read (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::bytes_to_read () const { return this->bytes_to_read_; } ACE_Message_Block* -ACE_WIN32_Asynch_Read_Dgram_Result::message_block (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::message_block () const { return this->message_block_; } @@ -3156,73 +3156,73 @@ ACE_WIN32_Asynch_Read_Dgram_Result::saddr () const int -ACE_WIN32_Asynch_Read_Dgram_Result::flags (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::flags () const { return this->flags_; } ACE_HANDLE -ACE_WIN32_Asynch_Read_Dgram_Result::handle (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::handle () const { return this->handle_; } size_t -ACE_WIN32_Asynch_Read_Dgram_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Read_Dgram_Result::act (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Read_Dgram_Result::success (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Read_Dgram_Result::completion_key (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Read_Dgram_Result::error (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Read_Dgram_Result::event (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Read_Dgram_Result::offset (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Read_Dgram_Result::offset_high (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Read_Dgram_Result::priority (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Read_Dgram_Result::signal_number (void) const +ACE_WIN32_Asynch_Read_Dgram_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -3467,7 +3467,7 @@ ACE_WIN32_Asynch_Read_Dgram::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Read_Dgram::proactor (void) const +ACE_WIN32_Asynch_Read_Dgram::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } @@ -3482,7 +3482,7 @@ ACE_WIN32_Asynch_Read_Dgram::ACE_WIN32_Asynch_Read_Dgram (ACE_WIN32_Proactor *wi //*********************************************** size_t -ACE_WIN32_Asynch_Write_Dgram_Result::bytes_to_write (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::bytes_to_write () const { return this->bytes_to_write_; } @@ -3494,73 +3494,73 @@ ACE_WIN32_Asynch_Write_Dgram_Result::message_block () const } int -ACE_WIN32_Asynch_Write_Dgram_Result::flags (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::flags () const { return this->flags_; } ACE_HANDLE -ACE_WIN32_Asynch_Write_Dgram_Result::handle (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::handle () const { return this->handle_; } size_t -ACE_WIN32_Asynch_Write_Dgram_Result::bytes_transferred (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::bytes_transferred () const { return ACE_WIN32_Asynch_Result::bytes_transferred (); } const void * -ACE_WIN32_Asynch_Write_Dgram_Result::act (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::act () const { return ACE_WIN32_Asynch_Result::act (); } int -ACE_WIN32_Asynch_Write_Dgram_Result::success (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::success () const { return ACE_WIN32_Asynch_Result::success (); } const void * -ACE_WIN32_Asynch_Write_Dgram_Result::completion_key (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::completion_key () const { return ACE_WIN32_Asynch_Result::completion_key (); } u_long -ACE_WIN32_Asynch_Write_Dgram_Result::error (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::error () const { return ACE_WIN32_Asynch_Result::error (); } ACE_HANDLE -ACE_WIN32_Asynch_Write_Dgram_Result::event (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::event () const { return ACE_WIN32_Asynch_Result::event (); } u_long -ACE_WIN32_Asynch_Write_Dgram_Result::offset (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::offset () const { return ACE_WIN32_Asynch_Result::offset (); } u_long -ACE_WIN32_Asynch_Write_Dgram_Result::offset_high (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::offset_high () const { return ACE_WIN32_Asynch_Result::offset_high (); } int -ACE_WIN32_Asynch_Write_Dgram_Result::priority (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::priority () const { return ACE_WIN32_Asynch_Result::priority (); } int -ACE_WIN32_Asynch_Write_Dgram_Result::signal_number (void) const +ACE_WIN32_Asynch_Write_Dgram_Result::signal_number () const { return ACE_WIN32_Asynch_Result::signal_number (); } @@ -3792,7 +3792,7 @@ ACE_WIN32_Asynch_Write_Dgram::cancel (void) } ACE_Proactor * -ACE_WIN32_Asynch_Write_Dgram::proactor (void) const +ACE_WIN32_Asynch_Write_Dgram::proactor () const { return ACE_WIN32_Asynch_Operation::proactor (); } diff --git a/ACE/ace/WIN32_Asynch_IO.h b/ACE/ace/WIN32_Asynch_IO.h index 41ceffac051..42d91ee4ca5 100644 --- a/ACE/ace/WIN32_Asynch_IO.h +++ b/ACE/ace/WIN32_Asynch_IO.h @@ -67,39 +67,39 @@ class ACE_Export ACE_WIN32_Asynch_Result : public virtual ACE_Asynch_Result_Impl public: /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -172,7 +172,7 @@ public: // = Access methods. /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; protected: /// Constructor. @@ -212,57 +212,57 @@ class ACE_Export ACE_WIN32_Asynch_Read_Stream_Result : public virtual ACE_Asynch public: /// The number of bytes which were requested at the start of the /// asynchronous read. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for reading. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; // Base class operations. These operations are here to kill // dominance warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); /// Accessor for the scatter read flag - int scatter_enabled (void) const; + int scatter_enabled () const; protected: /// Constructor is protected since creation is limited to @@ -363,7 +363,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; protected: /// This is the method which does the real work and is there so that @@ -389,57 +389,57 @@ class ACE_Export ACE_WIN32_Asynch_Write_Stream_Result : public virtual ACE_Async public: /// The number of bytes which were requested at the start of the /// asynchronous write. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Message block that contains the data to be written. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for writing. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; // = Base class operations. These operations are here to kill some // warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); /// Accessor for the gather write flag - int gather_enabled (void) const; + int gather_enabled () const; protected: /// Constructor is protected since creation is limited to @@ -541,7 +541,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; }; /** @@ -565,39 +565,39 @@ public: // methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; // The following methods belong to // ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++ @@ -606,13 +606,13 @@ public: /// The number of bytes which were requested at the start of the /// asynchronous read. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for reading. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -720,7 +720,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; private: /** @@ -776,39 +776,39 @@ public: // warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; // The following methods belong to // ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++ @@ -817,13 +817,13 @@ public: /// The number of bytes which were requested at the start of the /// asynchronous write. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Message block that contains the data to be written. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for writing. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -926,7 +926,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; private: /** @@ -973,54 +973,54 @@ class ACE_Export ACE_WIN32_Asynch_Accept_Result : public virtual ACE_Asynch_Acce public: /// The number of bytes which were requested at the start of the /// asynchronous accept. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data. - ACE_Message_Block &message_block (void) const; + ACE_Message_Block &message_block () const; /// I/O handle used for accepting new connections. - ACE_HANDLE listen_handle (void) const; + ACE_HANDLE listen_handle () const; /// I/O handle for the new connection. - ACE_HANDLE accept_handle (void) const; + ACE_HANDLE accept_handle () const; // = Base class operations. These operations are here to kill some // warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -1124,7 +1124,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; }; /** @@ -1149,45 +1149,45 @@ class ACE_Export ACE_WIN32_Asynch_Connect_Result : public virtual ACE_Asynch_Con public: /// I/O handle for the connection. - ACE_HANDLE connect_handle (void) const; + ACE_HANDLE connect_handle () const; // = Base class operations. These operations are here to kill some // warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * Returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post this object to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -1274,7 +1274,7 @@ public: int close (void); /// Virtual from ACE_Event_Handler - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; /// Virtual from ACE_Event_Handler void set_handle (ACE_HANDLE handle); @@ -1291,7 +1291,7 @@ public: // methods are defined here to avoid dominace warnings. They route // the call to the ACE_WIN32_Asynch_Operation base class. /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; private: int connect_i (ACE_WIN32_Asynch_Connect_Result *result, @@ -1355,62 +1355,62 @@ class ACE_Export ACE_WIN32_Asynch_Transmit_File_Result : public virtual ACE_Asyn public: /// Socket used for transmitting the file. - ACE_HANDLE socket (void) const; + ACE_HANDLE socket () const; /// File from which the data is read. - ACE_HANDLE file (void) const; + ACE_HANDLE file () const; /// Header and trailer data associated with this transmit file. - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const; + ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer () const; /// The number of bytes which were requested at the start of the /// asynchronous transmit file. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Number of bytes per send requested at the start of the transmit /// file. - size_t bytes_per_send (void) const; + size_t bytes_per_send () const; /// Flags which were passed into transmit file. - u_long flags (void) const; + u_long flags () const; // Base class operations. These operations are here to kill some // warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -1536,7 +1536,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; }; /** @@ -1557,10 +1557,10 @@ class ACE_Export ACE_WIN32_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_ public: /// The number of bytes which were requested at the start of the /// asynchronous read. - size_t bytes_to_read (void) const; + size_t bytes_to_read () const; /// Message block which contains the read data - ACE_Message_Block *message_block (void) const; + ACE_Message_Block *message_block () const; /// The address of where the packet came from int remote_address (ACE_Addr& addr) const; @@ -1568,48 +1568,48 @@ public: sockaddr *saddr () const; /// The flags used in the read - int flags (void) const; + int flags () const; /// I/O handle used for reading. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; // Base class operations. These operations are here to kill // dominance warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -1725,7 +1725,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; protected: /// Do-nothing constructor. @@ -1750,54 +1750,54 @@ class ACE_Export ACE_WIN32_Asynch_Write_Dgram_Result : public virtual ACE_Asynch public: /// The number of bytes which were requested at the start of the /// asynchronous write. - size_t bytes_to_write (void) const; + size_t bytes_to_write () const; /// Message block which contains the sent data - ACE_Message_Block *message_block (void) const; + ACE_Message_Block *message_block () const; /// The flags using in the write - int flags (void) const; + int flags () const; /// I/O handle used for writing. - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; // = Base class operations. These operations are here to kill some // warnings. These methods call the base class methods. /// Number of bytes transferred by the operation. - size_t bytes_transferred (void) const; + size_t bytes_transferred () const; /// ACT associated with the operation. - const void *act (void) const; + const void *act () const; /// Did the operation succeed? - int success (void) const; + int success () const; /** * This returns the ACT associated with the handle when it was * registered with the I/O completion port. This ACT is not the * same as the ACT associated with the asynchronous operation. */ - const void *completion_key (void) const; + const void *completion_key () const; /// Error value if the operation fail. - u_long error (void) const; + u_long error () const; /// Event associated with the OVERLAPPED structure. - ACE_HANDLE event (void) const; + ACE_HANDLE event () const; /// This really make sense only when doing file I/O. - u_long offset (void) const; + u_long offset () const; /// Offset_high associated with the OVERLAPPED structure. - u_long offset_high (void) const; + u_long offset_high () const; /// The priority of the asynchronous operation. Currently, this is /// not supported on Win32. - int priority (void) const; + int priority () const; /// No-op. Returns 0. - int signal_number (void) const; + int signal_number () const; /// Post @c this to the Proactor's completion port. int post_completion (ACE_Proactor_Impl *proactor); @@ -1909,7 +1909,7 @@ public: int cancel (void); /// Return the underlying proactor. - ACE_Proactor* proactor (void) const; + ACE_Proactor* proactor () const; protected: /// Do-nothing constructor. diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp index 25bf4f31b32..d23e5d3033d 100644 --- a/ACE/ace/WIN32_Proactor.cpp +++ b/ACE/ace/WIN32_Proactor.cpp @@ -533,7 +533,7 @@ ACE_WIN32_Proactor::handle_close (ACE_HANDLE handle, } ACE_HANDLE -ACE_WIN32_Proactor::get_handle (void) const +ACE_WIN32_Proactor::get_handle () const { if (this->used_with_reactor_event_loop_) return this->event_.handle (); @@ -734,7 +734,7 @@ ACE_WIN32_Proactor::close_dispatch_threads (int) } size_t -ACE_WIN32_Proactor::number_of_threads (void) const +ACE_WIN32_Proactor::number_of_threads () const { return static_cast<size_t> (this->number_of_threads_); } diff --git a/ACE/ace/WIN32_Proactor.h b/ACE/ace/WIN32_Proactor.h index 8ce6d744c25..87aa30ca10c 100644 --- a/ACE/ace/WIN32_Proactor.h +++ b/ACE/ace/WIN32_Proactor.h @@ -106,7 +106,7 @@ public: void number_of_threads (size_t threads); /// Get the event handle. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (); virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (); diff --git a/ACE/ace/XTI_ATM_Mcast.cpp b/ACE/ace/XTI_ATM_Mcast.cpp index 0e1ef23299b..4e1b848a102 100644 --- a/ACE/ace/XTI_ATM_Mcast.cpp +++ b/ACE/ace/XTI_ATM_Mcast.cpp @@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_XTI_ATM_Mcast) void -ACE_XTI_ATM_Mcast::dump (void) const +ACE_XTI_ATM_Mcast::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_XTI_ATM_Mcast::dump"); diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp index bf23d31e677..945562c3dac 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor/XtReactor.cpp @@ -178,7 +178,7 @@ ACE_XtReactor::XtWaitForMultipleEvents (int width, } XtAppContext -ACE_XtReactor::context (void) const +ACE_XtReactor::context () const { return this->context_; } diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor/XtReactor.h index 3247ce6a884..af8ea2f9156 100644 --- a/ACE/ace/XtReactor/XtReactor.h +++ b/ACE/ace/XtReactor/XtReactor.h @@ -61,7 +61,7 @@ public: ACE_Sig_Handler * = 0); virtual ~ACE_XtReactor (void); - XtAppContext context (void) const; + XtAppContext context () const; void context (XtAppContext); // = Timer operations. diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp index 93db8296a3b..b2bcecbe9a2 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler.cpp +++ b/ACE/apps/Gateway/Gateway/Connection_Handler.cpp @@ -5,7 +5,7 @@ #include "Concrete_Connection_Handlers.h" Event_Channel * -Connection_Handler::event_channel (void) const +Connection_Handler::event_channel () const { return this->event_channel_; } @@ -23,7 +23,7 @@ Connection_Handler::connection_id (CONNECTION_ID id) } CONNECTION_ID -Connection_Handler::connection_id (void) const +Connection_Handler::connection_id () const { return this->connection_id_; } @@ -31,7 +31,7 @@ Connection_Handler::connection_id (void) const // The total number of bytes sent/received on this Proxy. size_t -Connection_Handler::total_bytes (void) const +Connection_Handler::total_bytes () const { return this->total_bytes_; } @@ -74,7 +74,7 @@ Connection_Handler::connection_role (char d) // Get the connection_role. char -Connection_Handler::connection_role (void) const +Connection_Handler::connection_role () const { return this->connection_role_; } @@ -117,7 +117,7 @@ Connection_Handler::max_timeout (long mto) // Gets the max timeout delay. long -Connection_Handler::max_timeout (void) const +Connection_Handler::max_timeout () const { return this->max_timeout_; } @@ -165,7 +165,7 @@ Connection_Handler::state (Connection_Handler::State s) // Return the current state of the Proxy. Connection_Handler::State -Connection_Handler::state (void) const +Connection_Handler::state () const { return this->state_; } @@ -197,7 +197,7 @@ Connection_Handler::open (void *) } const ACE_INET_Addr & -Connection_Handler::remote_addr (void) const +Connection_Handler::remote_addr () const { return this->remote_addr_; } @@ -209,7 +209,7 @@ Connection_Handler::remote_addr (ACE_INET_Addr &ra) } const ACE_INET_Addr & -Connection_Handler::local_addr (void) const +Connection_Handler::local_addr () const { return this->local_addr_; } diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler.h b/ACE/apps/Gateway/Gateway/Connection_Handler.h index a69d5f24139..baf4a8f46f0 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler.h +++ b/ACE/apps/Gateway/Gateway/Connection_Handler.h @@ -61,19 +61,19 @@ public: // = Set/get the current state. void state (State); - State state (void) const; + State state () const; // = Set/get remote INET addr. void remote_addr (ACE_INET_Addr &); - const ACE_INET_Addr &remote_addr (void) const; + const ACE_INET_Addr &remote_addr () const; // = Set/get local INET addr. void local_addr (ACE_INET_Addr &); - const ACE_INET_Addr &local_addr (void) const; + const ACE_INET_Addr &local_addr () const; // = Set/get connection id. void connection_id (CONNECTION_ID); - CONNECTION_ID connection_id (void) const; + CONNECTION_ID connection_id () const; // = Set/get the current retry timeout delay. void timeout (long); @@ -81,22 +81,22 @@ public: // = Set/get the maximum retry timeout delay. void max_timeout (long); - long max_timeout (void) const; + long max_timeout () const; // = Set/get proxy role (i.e., 'S' for Supplier and 'C' for Consumer // (necessary for error checking). void connection_role (char); - char connection_role (void) const; + char connection_role () const; // = Set/get the <Event_Channel> *. void event_channel (Event_Channel *); - Event_Channel *event_channel (void) const; + Event_Channel *event_channel () const; // = The total number of bytes sent/received on this proxy. /// Increment count by <bytes>. /// Return the current byte count. void total_bytes (size_t bytes); - size_t total_bytes (void) const; + size_t total_bytes () const; /// Perform timer-based Connection_Handler reconnection. virtual int handle_timeout (const ACE_Time_Value &, const void *arg); diff --git a/ACE/apps/Gateway/Gateway/Options.cpp b/ACE/apps/Gateway/Gateway/Options.cpp index 2d0f618c97c..cccc5a3a37b 100644 --- a/ACE/apps/Gateway/Gateway/Options.cpp +++ b/ACE/apps/Gateway/Gateway/Options.cpp @@ -76,7 +76,7 @@ Options::~Options (void) } ACE_Lock_Adapter<ACE_SYNCH_MUTEX> * -Options::locking_strategy (void) const +Options::locking_strategy () const { return this->locking_strategy_; } @@ -88,7 +88,7 @@ Options::locking_strategy (ACE_Lock_Adapter<ACE_SYNCH_MUTEX> *ls) } long -Options::performance_window (void) const +Options::performance_window () const { return this->performance_window_; } @@ -100,67 +100,67 @@ Options::connection_id (void) } long -Options::max_timeout (void) const +Options::max_timeout () const { return this->max_timeout_; } int -Options::blocking_semantics (void) const +Options::blocking_semantics () const { return this->blocking_semantics_; } int -Options::socket_queue_size (void) const +Options::socket_queue_size () const { return this->socket_queue_size_; } u_long -Options::threading_strategy (void) const +Options::threading_strategy () const { return this->threading_strategy_; } const ACE_TCHAR * -Options::connection_config_file (void) const +Options::connection_config_file () const { return this->connection_config_file_; } const ACE_TCHAR * -Options::consumer_config_file (void) const +Options::consumer_config_file () const { return this->consumer_config_file_; } u_short -Options::consumer_acceptor_port (void) const +Options::consumer_acceptor_port () const { return this->consumer_acceptor_port_; } u_short -Options::supplier_acceptor_port (void) const +Options::supplier_acceptor_port () const { return this->supplier_acceptor_port_; } u_short -Options::consumer_connector_port (void) const +Options::consumer_connector_port () const { return this->consumer_connector_port_; } long -Options::max_queue_size (void) const +Options::max_queue_size () const { return this->max_queue_size_; } u_short -Options::supplier_connector_port (void) const +Options::supplier_connector_port () const { return this->supplier_connector_port_; } diff --git a/ACE/apps/Gateway/Gateway/Options.h b/ACE/apps/Gateway/Gateway/Options.h index 13dc13dc4dc..5ba13c7a5e8 100644 --- a/ACE/apps/Gateway/Gateway/Options.h +++ b/ACE/apps/Gateway/Gateway/Options.h @@ -71,7 +71,7 @@ public: * no locking strategy and we're using a REACTIVE concurrency * strategy. */ - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> *locking_strategy (void) const; + ACE_Lock_Adapter<ACE_SYNCH_MUTEX> *locking_strategy () const; /// Set the locking strategy used for serializing access to the /// reference count in <ACE_Message_Block>. @@ -79,50 +79,50 @@ public: /// Number of seconds after connection establishment to report /// throughput. - long performance_window (void) const; + long performance_window () const; /// 0 == blocking connects, ACE_NONBLOCK == non-blocking connects. - int blocking_semantics (void) const; + int blocking_semantics () const; /// Size of the socket queue (0 means "use default"). - int socket_queue_size (void) const; + int socket_queue_size () const; /// i.e., REACTIVE, OUTPUT_MT, and/or INPUT_MT. - u_long threading_strategy (void) const; + u_long threading_strategy () const; /** * Our acceptor port number, i.e., the one that we passively listen * on for connections to arrive from a gatewayd and create a * Supplier. */ - u_short supplier_acceptor_port (void) const; + u_short supplier_acceptor_port () const; /** * Our acceptor port number, i.e., the one that we passively listen * on for connections to arrive from a gatewayd and create a * Consumer. */ - u_short consumer_acceptor_port (void) const; + u_short consumer_acceptor_port () const; /// The connector port number, i.e., the one that we use to actively /// establish connections with a gatewayd and create a Supplier. - u_short supplier_connector_port (void) const; + u_short supplier_connector_port () const; /// The connector port number, i.e., the one that we use to actively /// establish connections with a gatewayd and create a Consumer. - u_short consumer_connector_port (void) const; + u_short consumer_connector_port () const; /// Name of the connection configuration file. - const ACE_TCHAR *connection_config_file (void) const; + const ACE_TCHAR *connection_config_file () const; /// Name of the consumer map configuration file. - const ACE_TCHAR *consumer_config_file (void) const; + const ACE_TCHAR *consumer_config_file () const; /// The maximum retry timeout delay. - long max_timeout (void) const; + long max_timeout () const; /// The maximum size of the queue. - long max_queue_size (void) const; + long max_queue_size () const; /// Returns a reference to the next available connection id; CONNECTION_ID &connection_id (void); diff --git a/ACE/apps/Gateway/Peer/Options.cpp b/ACE/apps/Gateway/Peer/Options.cpp index 4b8f8dcc7f8..2a849effa2e 100644 --- a/ACE/apps/Gateway/Peer/Options.cpp +++ b/ACE/apps/Gateway/Peer/Options.cpp @@ -48,7 +48,7 @@ Options::instance (void) } long -Options::timeout (void) const +Options::timeout () const { return this->timeout_; } @@ -60,37 +60,37 @@ Options::connection_id (void) } long -Options::max_queue_size (void) const +Options::max_queue_size () const { return this->max_queue_size_; } u_short -Options::consumer_acceptor_port (void) const +Options::consumer_acceptor_port () const { return this->consumer_acceptor_port_; } u_short -Options::supplier_acceptor_port (void) const +Options::supplier_acceptor_port () const { return this->supplier_acceptor_port_; } u_short -Options::consumer_connector_port (void) const +Options::consumer_connector_port () const { return this->consumer_connector_port_; } u_short -Options::supplier_connector_port (void) const +Options::supplier_connector_port () const { return this->supplier_connector_port_; } const ACE_TCHAR * -Options::connector_host (void) const +Options::connector_host () const { return this->connector_host_; } diff --git a/ACE/apps/Gateway/Peer/Options.h b/ACE/apps/Gateway/Peer/Options.h index 52f342c6160..0d9613f0234 100644 --- a/ACE/apps/Gateway/Peer/Options.h +++ b/ACE/apps/Gateway/Peer/Options.h @@ -48,32 +48,32 @@ public: * on for connections to arrive from a gatewayd and create a * Supplier. */ - u_short supplier_acceptor_port (void) const; + u_short supplier_acceptor_port () const; /** * Our acceptor port number, i.e., the one that we passively listen * on for connections to arrive from a gatewayd and create a * Consumer. */ - u_short consumer_acceptor_port (void) const; + u_short consumer_acceptor_port () const; /// The connector port number, i.e., the one that we use to actively /// establish connections with a gatewayd and create a Supplier. - u_short supplier_connector_port (void) const; + u_short supplier_connector_port () const; /// The connector port number, i.e., the one that we use to actively /// establish connections with a gatewayd and create a Consumer. - u_short consumer_connector_port (void) const; + u_short consumer_connector_port () const; /// Our connector port host, i.e., the host running the gatewayd /// process. - const ACE_TCHAR *connector_host (void) const; + const ACE_TCHAR *connector_host () const; /// Duration between disconnects. - long timeout (void) const; + long timeout () const; /// The maximum size of the queue. - long max_queue_size (void) const; + long max_queue_size () const; /// Returns a reference to the connection id. CONNECTION_ID &connection_id (void); diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp index c83053cea96..3c236ecab59 100644 --- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp +++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp @@ -227,7 +227,7 @@ ACE_URL_Locator_Request::size (void) } void -ACE_URL_Locator_Request::dump (void) const +ACE_URL_Locator_Request::dump () const { //ACE_TRACE ("ACE_URL_Locator_Request::dump"); @@ -421,7 +421,7 @@ ACE_URL_Locator_Reply::size (void) } void -ACE_URL_Locator_Reply::dump (void) const +ACE_URL_Locator_Reply::dump () const { //ACE_TRACE ("ACE_URL_Locator_Reply::dump"); diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h index dd2674d9bb7..56057315af2 100644 --- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h +++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.h @@ -77,16 +77,16 @@ public: size_t decode (void *buffer); /// A bunch of methods to access internal data. - const int how (void) const; - const int how_many (void) const; - const u_int opcode (void) const; - const ACE_URL_Property_Seq *seq (void) const; - const ACE_URL_Property_Seq *del (void) const; - const ACE_URL_Property_Seq *modify (void) const; - const ACE_URL_Offer *offer (void) const; - const ACE_WString &id (void) const; - const ACE_WString &url (void) const; - const char *buffer (void) const; + const int how () const; + const int how_many () const; + const u_int opcode () const; + const ACE_URL_Property_Seq *seq () const; + const ACE_URL_Property_Seq *del () const; + const ACE_URL_Property_Seq *modify () const; + const ACE_URL_Offer *offer () const; + const ACE_WString &id () const; + const ACE_WString &url () const; + const char *buffer () const; /// Print out this object. void dump () const; @@ -176,15 +176,15 @@ public: size_t decode (void *buffer); // Accessor function. - const size_t num_offers (void) const; - const ACE_URL_Offer *offer (void) const; - const ACE_URL_Offer_Seq *offers (void) const; - const u_int opcode (void) const; - const u_int status (void) const; - const char *buffer (void) const ; + const size_t num_offers () const; + const ACE_URL_Offer *offer () const; + const ACE_URL_Offer_Seq *offers () const; + const u_int opcode () const; + const u_int status () const; + const char *buffer () const ; /// Print out this object. - void dump (void) const ; + void dump () const ; protected: /// Return the size of the buffer required to encode diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl index 9fc67319c64..8047feb7efd 100644 --- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl +++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl @@ -22,61 +22,61 @@ ACE_URL_Locator_Request::~ACE_URL_Locator_Request (void) } ACE_INLINE const int -ACE_URL_Locator_Request::how (void) const +ACE_URL_Locator_Request::how () const { return this-> how_; } ACE_INLINE const int -ACE_URL_Locator_Request::how_many (void) const +ACE_URL_Locator_Request::how_many () const { return this->how_many_; } ACE_INLINE const u_int -ACE_URL_Locator_Request::opcode (void) const +ACE_URL_Locator_Request::opcode () const { return this->code_; } ACE_INLINE const ACE_URL_Property_Seq * -ACE_URL_Locator_Request::seq (void) const +ACE_URL_Locator_Request::seq () const { return this->seq1_; } ACE_INLINE const ACE_URL_Property_Seq * -ACE_URL_Locator_Request::del (void) const +ACE_URL_Locator_Request::del () const { return this->seq1_; } ACE_INLINE const ACE_URL_Property_Seq * -ACE_URL_Locator_Request::modify (void) const +ACE_URL_Locator_Request::modify () const { return this->seq2_; } ACE_INLINE const ACE_URL_Offer * -ACE_URL_Locator_Request::offer (void) const +ACE_URL_Locator_Request::offer () const { return this->offer_; } ACE_INLINE const ACE_WString & -ACE_URL_Locator_Request::id (void) const +ACE_URL_Locator_Request::id () const { return this->id_; } ACE_INLINE const ACE_WString & -ACE_URL_Locator_Request::url (void) const +ACE_URL_Locator_Request::url () const { return this->url_; } ACE_INLINE const char * -ACE_URL_Locator_Request::buffer (void) const +ACE_URL_Locator_Request::buffer () const { return this->buffer_; } @@ -99,38 +99,38 @@ ACE_URL_Locator_Reply::~ACE_URL_Locator_Reply (void) } ACE_INLINE const size_t -ACE_URL_Locator_Reply::num_offers (void) const +ACE_URL_Locator_Reply::num_offers () const { return this->num_offers_; } ACE_INLINE const ACE_URL_Offer * -ACE_URL_Locator_Reply::offer (void) const +ACE_URL_Locator_Reply::offer () const { return this->offer_; } ACE_INLINE const ACE_URL_Offer_Seq * -ACE_URL_Locator_Reply::offers (void) const +ACE_URL_Locator_Reply::offers () const { return this->offers_; } ACE_INLINE const u_int -ACE_URL_Locator_Reply::opcode (void) const +ACE_URL_Locator_Reply::opcode () const { return this->code_; } ACE_INLINE const u_int -ACE_URL_Locator_Reply::status (void) const +ACE_URL_Locator_Reply::status () const { return this->status_; } ACE_INLINE const char * -ACE_URL_Locator_Reply::buffer (void) const +ACE_URL_Locator_Reply::buffer () const { return this->buffer_; } diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp index fbddf7a0ea5..c571f2a5f4f 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp +++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp @@ -57,7 +57,7 @@ ACE_URL_Property::decode (void *buf) } void -ACE_URL_Property::dump (void) const +ACE_URL_Property::dump () const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -77,7 +77,7 @@ ACE_URL_Property::dump (void) const } size_t -ACE_URL_Offer::size (void) const +ACE_URL_Offer::size () const { size_t sum = (this->url_.length () + 1) * sizeof (ACE_UINT16); sum += ::ace_array_size (this->prop_); @@ -116,7 +116,7 @@ ACE_URL_Offer::decode (void *buf) } void -ACE_URL_Offer::dump (void) const +ACE_URL_Offer::dump () const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.h b/ACE/apps/JAWS/clients/Caching/URL_Properties.h index 727e013c949..e3de23cf53f 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Properties.h +++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.h @@ -87,7 +87,7 @@ public: // = Query property name. ACE_WString &name_rep (void); - const ACE_WString &name (void) const; + const ACE_WString &name () const; // = Set property name. void name (const ACE_UINT16 *n); @@ -95,7 +95,7 @@ public: // = Query property value. ACE_WString &value_rep (void); - const ACE_WString &value (void) const; + const ACE_WString &value () const; // = Set property value. void value (const ACE_UINT16 *v); @@ -103,7 +103,7 @@ public: // = Helper functions for encoding and decoding. /// Returns memory size (in bytes) required to encode this object. - size_t size (void) const; + size_t size () const; /// Encodes this object into buf for network transmission. size_t encode (void *buf) const; @@ -159,7 +159,7 @@ public: // = Get URL string. ACE_WString &url_rep (void); - const ACE_WString &url (void) const; + const ACE_WString &url () const; // = Set URL. void url (const char *url); @@ -174,7 +174,7 @@ public: // = Helper functions for encoding and decoding. /// Returns memory size (in bytes) required to encode this object. - size_t size (void) const; + size_t size () const; /// Encodes this object into buf for network transmission. size_t encode (void *buf) const; diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl index 6489cd94b69..711ac9823bc 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl +++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl @@ -66,7 +66,7 @@ ACE_URL_Property::name_rep (void) } ACE_INLINE const ACE_WString & -ACE_URL_Property::name (void) const +ACE_URL_Property::name () const { return this->name_; } @@ -90,7 +90,7 @@ ACE_URL_Property::value_rep (void) } ACE_INLINE const ACE_WString & -ACE_URL_Property::value (void) const +ACE_URL_Property::value () const { return this->value_; } @@ -109,7 +109,7 @@ ACE_URL_Property::value (const ACE_UINT16 *v) ACE_INLINE size_t -ACE_URL_Property::size (void) const +ACE_URL_Property::size () const { size_t len = 2; len += this->name_.length () + this->value_.length (); @@ -170,7 +170,7 @@ ACE_URL_Offer::url_rep (void) } ACE_INLINE const ACE_WString & -ACE_URL_Offer::url (void) const +ACE_URL_Offer::url () const { return this->url_; } diff --git a/ACE/apps/JAWS/clients/Caching/http_handler.cpp b/ACE/apps/JAWS/clients/Caching/http_handler.cpp index d6fd0c986be..fef8203a6ac 100644 --- a/ACE/apps/JAWS/clients/Caching/http_handler.cpp +++ b/ACE/apps/JAWS/clients/Caching/http_handler.cpp @@ -160,7 +160,7 @@ HTTP_Handler::svc (void) } const char * -HTTP_Handler::filename (void) const +HTTP_Handler::filename () const { return this->filename_; } diff --git a/ACE/apps/JAWS/clients/Caching/http_handler.h b/ACE/apps/JAWS/clients/Caching/http_handler.h index d6482dee30e..1878ae13537 100644 --- a/ACE/apps/JAWS/clients/Caching/http_handler.h +++ b/ACE/apps/JAWS/clients/Caching/http_handler.h @@ -40,7 +40,7 @@ public: virtual int svc (); /// Accessor to the file being fetched. - const char *filename (void) const; + const char *filename () const; private: char request_[BUFSIZ]; diff --git a/ACE/apps/JAWS/server/HTTP_Config.cpp b/ACE/apps/JAWS/server/HTTP_Config.cpp index 884dae7f144..d923142d100 100644 --- a/ACE/apps/JAWS/server/HTTP_Config.cpp +++ b/ACE/apps/JAWS/server/HTTP_Config.cpp @@ -38,31 +38,31 @@ HTTP_Config_Info::~HTTP_Config_Info (void) } const char * -HTTP_Config_Info::document_root (void) const +HTTP_Config_Info::document_root () const { return this->document_root_; } const char * -HTTP_Config_Info::cgi_path (void) const +HTTP_Config_Info::cgi_path () const { return this->cgi_path_; } const char * -HTTP_Config_Info::user_dir (void) const +HTTP_Config_Info::user_dir () const { return this->user_dir_; } const char * -HTTP_Config_Info::dir_index (void) const +HTTP_Config_Info::dir_index () const { return this->dir_index_; } int -HTTP_Config_Info::proxy_flag (void) const +HTTP_Config_Info::proxy_flag () const { return this->proxy_flag_; } diff --git a/ACE/apps/JAWS/server/HTTP_Config.h b/ACE/apps/JAWS/server/HTTP_Config.h index 4759451b6ee..6a68919c52d 100644 --- a/ACE/apps/JAWS/server/HTTP_Config.h +++ b/ACE/apps/JAWS/server/HTTP_Config.h @@ -48,21 +48,21 @@ public: /// Where the root of the document tree begins. This prevents /// clients from being able to examine your entire filesystem. - const char *document_root (void) const; + const char *document_root () const; /// A search path for CGI files. - const char *cgi_path (void) const; + const char *cgi_path () const; /// The directory which is appended to a home user directory, e.g., /// ".www-docs" or "public_html". - const char *user_dir (void) const; + const char *user_dir () const; /// What is the default index file for a directory, e.g., /// "index.html". - const char *dir_index (void) const; + const char *dir_index () const; /// Will the server support proxy requests? - int proxy_flag (void) const; + int proxy_flag () const; private: // = Accesors that can set the data diff --git a/ACE/apps/JAWS/server/HTTP_Request.cpp b/ACE/apps/JAWS/server/HTTP_Request.cpp index 09a59604da3..9c789bdd463 100644 --- a/ACE/apps/JAWS/server/HTTP_Request.cpp +++ b/ACE/apps/JAWS/server/HTTP_Request.cpp @@ -177,73 +177,73 @@ HTTP_Request::init (char *const buffer, } const char * -HTTP_Request::method (void) const +HTTP_Request::method () const { return this->method_; } const char * -HTTP_Request::uri (void) const +HTTP_Request::uri () const { return this->uri_; } const char * -HTTP_Request::version (void) const +HTTP_Request::version () const { return this->version_; } const char * -HTTP_Request::path (void) const +HTTP_Request::path () const { return this->path_; } int -HTTP_Request::cgi (void) const +HTTP_Request::cgi () const { return this->cgi_; } const char ** -HTTP_Request::cgi_env (void) const +HTTP_Request::cgi_env () const { return (const char **)this->cgi_env_; } const char * -HTTP_Request::cgi_args (void) const +HTTP_Request::cgi_args () const { return this->cgi_args_; } const char * -HTTP_Request::query_string (void) const +HTTP_Request::query_string () const { return this->query_string_; } const char * -HTTP_Request::path_info (void) const +HTTP_Request::path_info () const { return this->path_info_; } int -HTTP_Request::got_request_line (void) const +HTTP_Request::got_request_line () const { return this->got_request_line_; } int -HTTP_Request::type (void) const +HTTP_Request::type () const { return type_; } const Headers & -HTTP_Request::headers (void) const +HTTP_Request::headers () const { return this->headers_; } diff --git a/ACE/apps/JAWS/server/HTTP_Request.h b/ACE/apps/JAWS/server/HTTP_Request.h index bc01f67baf4..e027f4953b0 100644 --- a/ACE/apps/JAWS/server/HTTP_Request.h +++ b/ACE/apps/JAWS/server/HTTP_Request.h @@ -54,37 +54,37 @@ public: // = The Accessors. /// HTTP request method - const char *method (void) const; + const char *method () const; /// HTTP request uri - const char *uri (void) const; + const char *uri () const; /// HTTP request version - const char *version (void) const; + const char *version () const; /// The HTTP request uri translated into a server filename path - const char *path (void) const; + const char *path () const; /// TRUE of the request is a cgi request - int cgi (void) const; + int cgi () const; /// The arguments to the cgi request - const char *cgi_args (void) const; + const char *cgi_args () const; /// The environment variables passed to the CGI request - const char **cgi_env (void) const; + const char **cgi_env () const; /// The cgi request query string - const char *query_string (void) const; + const char *query_string () const; /// The cgi request path information - const char *path_info (void) const; + const char *path_info () const; /// The type of the HTTP request - int type (void) const; + int type () const; /// The headers that were parsed from the request - const Headers &headers (void) const; + const Headers &headers () const; /// Header strings stored const char *header_strings (int index) const; @@ -162,7 +162,7 @@ private: int type (const char *type_string); private: - int got_request_line (void) const; + int got_request_line () const; private: int got_request_line_; diff --git a/ACE/apps/JAWS/server/JAWS_IO.cpp b/ACE/apps/JAWS/server/JAWS_IO.cpp index af143104c1a..72acf14c092 100644 --- a/ACE/apps/JAWS/server/JAWS_IO.cpp +++ b/ACE/apps/JAWS/server/JAWS_IO.cpp @@ -44,7 +44,7 @@ JAWS_Synch_IO::~JAWS_Synch_IO (void) } ACE_HANDLE -JAWS_Synch_IO::handle (void) const +JAWS_Synch_IO::handle () const { return this->handle_; } @@ -429,7 +429,7 @@ JAWS_Synch_IO_No_Cache::~JAWS_Synch_IO_No_Cache (void) } ACE_HANDLE -JAWS_Synch_IO_No_Cache::handle (void) const +JAWS_Synch_IO_No_Cache::handle () const { return this->handle_; } diff --git a/ACE/apps/JAWS/server/JAWS_IO.h b/ACE/apps/JAWS/server/JAWS_IO.h index 32e305d6558..b0010b73a67 100644 --- a/ACE/apps/JAWS/server/JAWS_IO.h +++ b/ACE/apps/JAWS/server/JAWS_IO.h @@ -45,7 +45,7 @@ public: void handler (JAWS_IO_Handler *handler); virtual void handle (ACE_HANDLE h) = 0; - virtual ACE_HANDLE handle (void) const = 0; + virtual ACE_HANDLE handle () const = 0; // James, please add documentation here. @@ -139,7 +139,7 @@ public: ~JAWS_Synch_IO (void); virtual void handle (ACE_HANDLE h); - virtual ACE_HANDLE handle (void) const; + virtual ACE_HANDLE handle () const; void read (ACE_Message_Block& mb, int size); @@ -183,7 +183,7 @@ public: ~JAWS_Asynch_IO (void); virtual void handle (ACE_HANDLE h) { ACE_Handler::handle (h); }; - virtual ACE_HANDLE handle (void) const { return ACE_Handler::handle (); }; + virtual ACE_HANDLE handle () const { return ACE_Handler::handle (); }; void read (ACE_Message_Block& mb, int size); @@ -255,7 +255,7 @@ public: ~JAWS_Synch_IO_No_Cache (void); virtual void handle (ACE_HANDLE h); - virtual ACE_HANDLE handle (void) const; + virtual ACE_HANDLE handle () const; void read (ACE_Message_Block& mb, int size); diff --git a/ACE/apps/JAWS/server/Parse_Headers.cpp b/ACE/apps/JAWS/server/Parse_Headers.cpp index d69cdef5af9..d53a9078db6 100644 --- a/ACE/apps/JAWS/server/Parse_Headers.cpp +++ b/ACE/apps/JAWS/server/Parse_Headers.cpp @@ -120,7 +120,7 @@ Headers::complete_header_line (char *const header_line) } int -Headers::end_of_headers (void) const +Headers::end_of_headers () const { return this->done_; } @@ -184,7 +184,7 @@ Headers_Map_Item::~Headers_Map_Item (void) this->header_ = this->value_ = 0; } -// Headers_Map_Item::operator const char * (void) const +// Headers_Map_Item::operator const char * () const // { // return this->value_ == 0 ? this->no_value_ : this->value_; // } @@ -216,13 +216,13 @@ Headers_Map_Item::operator= (const Headers_Map_Item & mi) } const char * -Headers_Map_Item::header (void) const +Headers_Map_Item::header () const { return this->header_; } const char * -Headers_Map_Item::value (void) const +Headers_Map_Item::value () const { return this->value_; } diff --git a/ACE/apps/JAWS/server/Parse_Headers.h b/ACE/apps/JAWS/server/Parse_Headers.h index bd41b76378c..43c33a5a51c 100644 --- a/ACE/apps/JAWS/server/Parse_Headers.h +++ b/ACE/apps/JAWS/server/Parse_Headers.h @@ -27,14 +27,14 @@ private: Headers_Map_Item (void); ~Headers_Map_Item (void); - // operator const char * (void) const; + // operator const char * () const; Headers_Map_Item &operator= (char *); Headers_Map_Item &operator= (const char *); Headers_Map_Item &operator= (const Headers_Map_Item &); public: - const char *header (void) const; - const char *value (void) const; + const char *header () const; + const char *value () const; private: const char *header_; @@ -101,7 +101,7 @@ public: */ int complete_header_line (char *const header_line); - int end_of_headers (void) const; + int end_of_headers () const; enum { diff --git a/ACE/apps/JAWS2/HTTPU/http_base.h b/ACE/apps/JAWS2/HTTPU/http_base.h index 5c421faf523..e028885a382 100644 --- a/ACE/apps/JAWS2/HTTPU/http_base.h +++ b/ACE/apps/JAWS2/HTTPU/http_base.h @@ -28,8 +28,8 @@ public: const char * payload (void); unsigned long payload_size (void); - int status (void) const; - const char *line (void) const; + int status () const; + const char *line () const; HTTP_Headers *http_headers (void); JAWS_Headers *headers (void); diff --git a/ACE/apps/JAWS2/HTTPU/http_base.inl b/ACE/apps/JAWS2/HTTPU/http_base.inl index 67ae932c433..805705bc89f 100644 --- a/ACE/apps/JAWS2/HTTPU/http_base.inl +++ b/ACE/apps/JAWS2/HTTPU/http_base.inl @@ -27,13 +27,13 @@ HTTP_Base::~HTTP_Base (void) } ACE_INLINE int -HTTP_Base::status (void) const +HTTP_Base::status () const { return this->status_; } ACE_INLINE const char * -HTTP_Base::line (void) const +HTTP_Base::line () const { return this->line_; } diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h index 798f1c502b7..3a48b23848d 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.h +++ b/ACE/apps/JAWS2/HTTPU/http_headers.h @@ -29,9 +29,9 @@ class HTTPU_Export HTTP_Hdr_Node friend class HTTP_HCodes; public: - operator int (void) const; - operator const char * (void) const; - const char * format (void) const; + operator int () const; + operator const char * () const; + const char * format () const; private: HTTP_Hdr_Node (const char *token, const char *format); diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.inl b/ACE/apps/JAWS2/HTTPU/http_headers.inl index 4e7f4d408b9..20ba44c09cc 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.inl +++ b/ACE/apps/JAWS2/HTTPU/http_headers.inl @@ -5,19 +5,19 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE -HTTP_Hdr_Node::operator int (void) const +HTTP_Hdr_Node::operator int () const { return this->index_; } ACE_INLINE -HTTP_Hdr_Node::operator const char * (void) const +HTTP_Hdr_Node::operator const char * () const { return this->token_; } ACE_INLINE const char * -HTTP_Hdr_Node::format (void) const +HTTP_Hdr_Node::format () const { return this->format_; } diff --git a/ACE/apps/JAWS2/HTTPU/http_request.h b/ACE/apps/JAWS2/HTTPU/http_request.h index a60bc47ad1e..64a9e6ee493 100644 --- a/ACE/apps/JAWS2/HTTPU/http_request.h +++ b/ACE/apps/JAWS2/HTTPU/http_request.h @@ -26,7 +26,7 @@ public: Parse_HTTP_Request *request_line (void); // Returns the parsed request line. - const Parse_HTTP_Request *request_line (void) const; + const Parse_HTTP_Request *request_line () const; // Returns the parsed request line. HTTP_Parse_URL *url (void); diff --git a/ACE/apps/JAWS2/HTTPU/http_request.inl b/ACE/apps/JAWS2/HTTPU/http_request.inl index 92322e1d445..706d98b6f7b 100644 --- a/ACE/apps/JAWS2/HTTPU/http_request.inl +++ b/ACE/apps/JAWS2/HTTPU/http_request.inl @@ -21,7 +21,7 @@ HTTP_Request::request_line (void) } ACE_INLINE const Parse_HTTP_Request * -HTTP_Request::request_line (void) const +HTTP_Request::request_line () const { return &(this->request_); } diff --git a/ACE/apps/JAWS2/HTTPU/http_status.h b/ACE/apps/JAWS2/HTTPU/http_status.h index 9e60a75cd47..312ff36d2d0 100644 --- a/ACE/apps/JAWS2/HTTPU/http_status.h +++ b/ACE/apps/JAWS2/HTTPU/http_status.h @@ -18,8 +18,8 @@ class HTTPU_Export HTTP_SCode_Node friend class HTTP_SCode_Base; public: - operator int (void) const; - operator const char * (void) const; + operator int () const; + operator const char * () const; private: HTTP_SCode_Node (int code, const char *code_str); diff --git a/ACE/apps/JAWS2/HTTPU/http_status.inl b/ACE/apps/JAWS2/HTTPU/http_status.inl index a78a24f560a..870eded57ee 100644 --- a/ACE/apps/JAWS2/HTTPU/http_status.inl +++ b/ACE/apps/JAWS2/HTTPU/http_status.inl @@ -5,13 +5,13 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE -HTTP_SCode_Node::operator int (void) const +HTTP_SCode_Node::operator int () const { return this->code_; } ACE_INLINE -HTTP_SCode_Node::operator const char * (void) const +HTTP_SCode_Node::operator const char * () const { return this->code_str_; } diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.h b/ACE/apps/JAWS2/HTTPU/parse_http_request.h index 2b9ca414d48..5943cbc6fdb 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_request.h +++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.h @@ -17,19 +17,19 @@ public: void init (const char *request); - int method (void) const; - const char *method_str (void) const; + int method () const; + const char *method_str () const; - int major_version (void) const; - int minor_version (void) const; + int major_version () const; + int minor_version () const; - const char *version (void) const; + const char *version () const; - const char *url (void) const; + const char *url () const; enum { HTTPU_OK, NO_MEMORY, BAD_REQUEST, NOT_IMPLEMENTED }; - int error (void) const; + int error () const; // 0 -> ok void dump (void); diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.inl b/ACE/apps/JAWS2/HTTPU/parse_http_request.inl index 129c634d0c7..b0cdf59e5e5 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_request.inl +++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.inl @@ -5,43 +5,43 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE int -Parse_HTTP_Request::method (void) const +Parse_HTTP_Request::method () const { return (int) *this->method_; } ACE_INLINE const char * -Parse_HTTP_Request::method_str (void) const +Parse_HTTP_Request::method_str () const { return (const char *) *this->method_; } ACE_INLINE int -Parse_HTTP_Request::major_version (void) const +Parse_HTTP_Request::major_version () const { return this->major_version_; } ACE_INLINE int -Parse_HTTP_Request::minor_version (void) const +Parse_HTTP_Request::minor_version () const { return this->minor_version_; } ACE_INLINE const char * -Parse_HTTP_Request::version (void) const +Parse_HTTP_Request::version () const { return this->version_ ? this->version_ : "HTTP/0.9"; } ACE_INLINE const char * -Parse_HTTP_Request::url (void) const +Parse_HTTP_Request::url () const { return this->url_; } ACE_INLINE int -Parse_HTTP_Request::error (void) const +Parse_HTTP_Request::error () const { return this->error_; } diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.h b/ACE/apps/JAWS2/HTTPU/parse_http_response.h index 89ca5afecd7..eefd0473e47 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_response.h +++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.h @@ -17,17 +17,17 @@ public: void init (const char *response); - int code (void) const; - const char *code_str (void) const; + int code () const; + const char *code_str () const; - int major_version (void) const; - int minor_version (void) const; + int major_version () const; + int minor_version () const; - const char *version (void) const; + const char *version () const; enum { HTTPU_OK, NO_MEMORY, BAD_RESPONSE }; - int error (void) const; + int error () const; // 0 -> ok private: diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.inl b/ACE/apps/JAWS2/HTTPU/parse_http_response.inl index 66a66939915..a077f06aab7 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_response.inl +++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.inl @@ -5,37 +5,37 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE int -Parse_HTTP_Response::code (void) const +Parse_HTTP_Response::code () const { return this->code_; } ACE_INLINE const char * -Parse_HTTP_Response::code_str (void) const +Parse_HTTP_Response::code_str () const { return this->code_str_ ? this->code_str_ : "200"; } ACE_INLINE int -Parse_HTTP_Response::major_version (void) const +Parse_HTTP_Response::major_version () const { return this->major_version_; } ACE_INLINE int -Parse_HTTP_Response::minor_version (void) const +Parse_HTTP_Response::minor_version () const { return this->minor_version_; } ACE_INLINE const char * -Parse_HTTP_Response::version (void) const +Parse_HTTP_Response::version () const { return this->version_ ? this->version_ : "HTTP/0.9"; } ACE_INLINE int -Parse_HTTP_Response::error (void) const +Parse_HTTP_Response::error () const { return this->error_; } diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.cpp b/ACE/apps/JAWS2/HTTPU/parse_url.cpp index 1ca0b71bb93..fa712e6a583 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_url.cpp +++ b/ACE/apps/JAWS2/HTTPU/parse_url.cpp @@ -264,37 +264,37 @@ HTTP_Parse_URL::set_port_from_scheme (void) } const char * -HTTP_Parse_URL::scheme (void) const +HTTP_Parse_URL::scheme () const { return this->scheme_; } const char * -HTTP_Parse_URL::user (void) const +HTTP_Parse_URL::user () const { return this->user_; } const char * -HTTP_Parse_URL::passwd (void) const +HTTP_Parse_URL::passwd () const { return this->passwd_; } const char * -HTTP_Parse_URL::host (void) const +HTTP_Parse_URL::host () const { return this->host_; } int -HTTP_Parse_URL::port (void) const +HTTP_Parse_URL::port () const { return this->port_; } const char * -HTTP_Parse_URL::url_path (void) const +HTTP_Parse_URL::url_path () const { return this->url_path_ ? this->url_path_ : ""; } @@ -314,7 +314,7 @@ HTTP_Parse_URL::is_cgi (const char *path) } int -HTTP_Parse_URL::is_cgi (void) const +HTTP_Parse_URL::is_cgi () const { return this->is_cgi_; } diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.h b/ACE/apps/JAWS2/HTTPU/parse_url.h index 92b3cec2d1f..05eed0ae8b5 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_url.h +++ b/ACE/apps/JAWS2/HTTPU/parse_url.h @@ -22,18 +22,18 @@ public: enum URL_SCHEME { HTTP, FTP }; - const char *scheme (void) const; - const char *user (void) const; - const char *passwd (void) const; - const char *host (void) const; - int port (void) const; - const char *url_path (void) const; + const char *scheme () const; + const char *user () const; + const char *passwd () const; + const char *host () const; + int port () const; + const char *url_path () const; enum URL_ERROR { URL_ERROR_NONE, URL_ERROR_STRDUP, URL_ERROR_SCHEME, URL_ERROR_SLASHSLASH }; - int error (void) const { return( error_ ); } + int error () const { return( error_ ); } - int is_cgi (void) const; + int is_cgi () const; private: void parse_url (void); diff --git a/ACE/apps/JAWS2/HTTP_10_Request.cpp b/ACE/apps/JAWS2/HTTP_10_Request.cpp index 0a3fe5ef650..d72e08c58a8 100644 --- a/ACE/apps/JAWS2/HTTP_10_Request.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Request.cpp @@ -18,31 +18,31 @@ JAWS_HTTP_10_Request::~JAWS_HTTP_10_Request (void) } const char * -JAWS_HTTP_10_Request::method (void) const +JAWS_HTTP_10_Request::method () const { return this->request_line ()->method_str (); } const char * -JAWS_HTTP_10_Request::uri (void) const +JAWS_HTTP_10_Request::uri () const { return this->request_line ()->url (); } const char * -JAWS_HTTP_10_Request::version (void) const +JAWS_HTTP_10_Request::version () const { return this->request_line ()->version (); } int -JAWS_HTTP_10_Request::type (void) const +JAWS_HTTP_10_Request::type () const { return this->request_line ()->method (); } const char * -JAWS_HTTP_10_Request::path (void) const +JAWS_HTTP_10_Request::path () const { if (this->path_ == 0) { diff --git a/ACE/apps/JAWS2/HTTP_10_Request.h b/ACE/apps/JAWS2/HTTP_10_Request.h index cd6d45bff9b..db54acefafc 100644 --- a/ACE/apps/JAWS2/HTTP_10_Request.h +++ b/ACE/apps/JAWS2/HTTP_10_Request.h @@ -12,12 +12,12 @@ public: JAWS_HTTP_10_Request (void); ~JAWS_HTTP_10_Request (void); - int type (void) const; - const char * method (void) const; - const char * uri (void) const; - const char * version (void) const; + int type () const; + const char * method () const; + const char * uri () const; + const char * version () const; - const char * path (void) const; + const char * path () const; void path (const char *); void set_status (int); diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp index 022553c65ba..a5349ab5bf1 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp @@ -224,7 +224,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id, template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> size_t -JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size () const { return this->size_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h index f80db70776d..501f20e1700 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h @@ -33,7 +33,7 @@ public: int unbind (const EXT_ID &ext_id); int unbind (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id); - size_t size (void) const; + size_t size () const; protected: diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp index 99185b8280a..1aa8ce79a42 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp @@ -54,25 +54,25 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty () const { return (this->size_ == 0); } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full () const { return (this->size_ == this->maxsize_); } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size () const { return this->size_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize () const { return this->maxsize_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h index 89f46561ace..7e80bbeb84e 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h @@ -29,11 +29,11 @@ public: ~JAWS_Cache_Heap (void); - int is_empty (void) const; - int is_full (void) const; + int is_empty () const; + int is_full () const; - size_t size (void) const; - size_t maxsize (void) const; + size_t size () const; + size_t maxsize () const; int maxsize (Cache_Manager *cm, size_t new_maxsize); // attempt to grow (or shrink) the heap. Return 0 on success, -1 on diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp index aadbfaf550e..492152f6936 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp @@ -27,25 +27,25 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_List (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_empty () const { return (this->size_ == 0); } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_full () const { return (this->size_ == this->maxsize_); } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::size (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::size () const { return this->size_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize () const { return this->maxsize_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h index d7fee623365..d249db04cbf 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h @@ -32,11 +32,11 @@ public: ~JAWS_Cache_List (void); - int is_empty (void) const; - int is_full (void) const; + int is_empty () const; + int is_full () const; - size_t size (void) const; - size_t maxsize (void) const; + size_t size () const; + size_t maxsize () const; int maxsize (Cache_Manager *cm, size_t new_maxsize); // attempt to grow (or shrink) the heap. Return 0 on success, -1 on diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp index 2bc6bc8835a..6c27bc4cc6c 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp @@ -10,7 +10,7 @@ JAWS_String_Hash_Functor::JAWS_String_Hash_Functor (const char *s) this->i_ = ACE::hash_pjw (s); } -JAWS_String_Hash_Functor::operator unsigned long (void) const +JAWS_String_Hash_Functor::operator unsigned long () const { return this->i_; } @@ -22,7 +22,7 @@ JAWS_String_Equal_Functor::JAWS_String_Equal_Functor (const char *s1, this->i_ = ACE_OS::strcmp (s1, s2); } -JAWS_String_Equal_Functor::operator int (void) const +JAWS_String_Equal_Functor::operator int () const { return this->i_ == 0; } @@ -60,7 +60,7 @@ JAWS_Strdup_String::~JAWS_Strdup_String (void) this->c_ = 0; } -JAWS_Strdup_String::operator const char * (void) const +JAWS_Strdup_String::operator const char * () const { return this->s_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.h b/ACE/apps/JAWS2/JAWS/Cache_Manager.h index af2c54ca3fb..5705521a6c9 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.h @@ -10,7 +10,7 @@ class JAWS_String_Hash_Functor { public: JAWS_String_Hash_Functor (const char *s); - operator unsigned long (void) const; + operator unsigned long () const; private: unsigned long i_; @@ -20,7 +20,7 @@ class JAWS_String_Equal_Functor { public: JAWS_String_Equal_Functor (const char *s1, const char *s2); - operator int (void) const; + operator int () const; private: int i_; @@ -35,7 +35,7 @@ public: JAWS_Strdup_String (const JAWS_Strdup_String &s); ~JAWS_Strdup_String (void); - operator const char * (void) const; + operator const char * () const; void operator = (const char *s); void operator = (const JAWS_Strdup_String &s); diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp index fe9cabbedad..5dd377d766f 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp @@ -522,13 +522,13 @@ JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~JAWS_Cache_Proxy (void) } template <class KEY, class DATA, class CACHE_MANAGER> DATA * -JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data (void) const +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data () const { return this->object_ ? (DATA *) this->object_->data () : 0; } template <class KEY, class DATA, class CACHE_MANAGER> -JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * (void) const +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * () const { return this->data (); } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h index 9c8c1de7307..22dcbbd4d20 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h @@ -160,8 +160,8 @@ public: virtual ~JAWS_Cache_Proxy (void); - DATA *data (void) const; - operator DATA * (void) const; + DATA *data () const; + operator DATA * () const; virtual int close (DATA *); diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp index b036842f65e..b024434f121 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp @@ -20,7 +20,7 @@ JAWS_Cache_Object::~JAWS_Cache_Object () } void * -JAWS_Cache_Object::internal (void) const +JAWS_Cache_Object::internal () const { return this->internal_; } @@ -32,19 +32,19 @@ JAWS_Cache_Object::internal (void *item) } const void * -JAWS_Cache_Object::data (void) const +JAWS_Cache_Object::data () const { return this->data_; } size_t -JAWS_Cache_Object::size (void) const +JAWS_Cache_Object::size () const { return this->size_; } unsigned int -JAWS_Cache_Object::count (void) const +JAWS_Cache_Object::count () const { return this->count_i (); } @@ -64,25 +64,25 @@ JAWS_Cache_Object::release (void) } time_t -JAWS_Cache_Object::last_access (void) const +JAWS_Cache_Object::last_access () const { return this->last_access_; } time_t -JAWS_Cache_Object::first_access (void) const +JAWS_Cache_Object::first_access () const { return this->first_access_; } unsigned int -JAWS_Cache_Object::priority (void) const +JAWS_Cache_Object::priority () const { return this->priority_i (); } void * -JAWS_Cache_Object::heap_item (void) const +JAWS_Cache_Object::heap_item () const { return this->heap_item_; } @@ -112,7 +112,7 @@ JAWS_Referenced_Cache_Object::lock (void) } unsigned int -JAWS_Referenced_Cache_Object::count_i (void) const +JAWS_Referenced_Cache_Object::count_i () const { if (this->count_.tryacquire_write () == 0) return 0; @@ -133,7 +133,7 @@ JAWS_Referenced_Cache_Object::release_i (void) } unsigned int -JAWS_Referenced_Cache_Object::priority_i (void) const +JAWS_Referenced_Cache_Object::priority_i () const { unsigned int priority = ~(0U); double delta @@ -167,7 +167,7 @@ JAWS_Counted_Cache_Object::lock (void) } unsigned int -JAWS_Counted_Cache_Object::count_i (void) const +JAWS_Counted_Cache_Object::count_i () const { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); @@ -194,7 +194,7 @@ JAWS_Counted_Cache_Object::release_i (void) } unsigned int -JAWS_Counted_Cache_Object::priority_i (void) const +JAWS_Counted_Cache_Object::priority_i () const { return this->count_i (); } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.h b/ACE/apps/JAWS2/JAWS/Cache_Object.h index 19c717f336e..3c92bdbb0bf 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.h @@ -23,34 +23,34 @@ public: JAWS_Cache_Object (const void *, size_t); virtual ~JAWS_Cache_Object (void); - void *internal (void) const; + void *internal () const; void internal (void *); - const void *data (void) const; - size_t size (void) const; - unsigned int count (void) const; + const void *data () const; + size_t size () const; + unsigned int count () const; int acquire (void); int release (void); - time_t last_access (void) const; - time_t first_access (void) const; + time_t last_access () const; + time_t first_access () const; - unsigned int priority (void) const; + unsigned int priority () const; enum { ACE_CO_REFERENCED, ACE_CO_COUNTED }; - void *heap_item (void) const; + void *heap_item () const; void heap_item (void *item); virtual ACE_Lock & lock (void) = 0; protected: - virtual unsigned int count_i (void) const = 0; + virtual unsigned int count_i () const = 0; virtual int acquire_i (void) = 0; virtual int release_i (void) = 0; - virtual unsigned int priority_i (void) const = 0; + virtual unsigned int priority_i () const = 0; private: @@ -76,10 +76,10 @@ public: protected: - virtual unsigned int count_i (void) const; + virtual unsigned int count_i () const; virtual int acquire_i (void); virtual int release_i (void); - virtual unsigned int priority_i (void) const; + virtual unsigned int priority_i () const; private: @@ -98,10 +98,10 @@ public: protected: - virtual unsigned int count_i (void) const; + virtual unsigned int count_i () const; virtual int acquire_i (void); virtual int release_i (void); - virtual unsigned int priority_i (void) const; + virtual unsigned int priority_i () const; private: diff --git a/ACE/apps/JAWS2/JAWS/FILE.cpp b/ACE/apps/JAWS2/JAWS/FILE.cpp index f731cb2a956..2667ed4f2f6 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.cpp +++ b/ACE/apps/JAWS2/JAWS/FILE.cpp @@ -65,7 +65,7 @@ JAWS_FILE::mem_map (int length, ACE_Mem_Map * -JAWS_FILE::map (void) const +JAWS_FILE::map () const { return this->map_; } diff --git a/ACE/apps/JAWS2/JAWS/FILE.h b/ACE/apps/JAWS2/JAWS/FILE.h index 3ab96227ad7..b06b3e7ef2c 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.h +++ b/ACE/apps/JAWS2/JAWS/FILE.h @@ -33,7 +33,7 @@ public: ACE_OFF_T offset = 0, LPSECURITY_ATTRIBUTES sa = 0) const; - ACE_Mem_Map *map (void) const; + ACE_Mem_Map *map () const; private: diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp index 097f932b0c3..0a5ca46367f 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp @@ -60,7 +60,7 @@ JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: template <class EXT_ID, class INT_ID> int JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: -is_empty (void) const +is_empty () const { return this->head_ == 0 && this->tail_ == 0; } @@ -288,7 +288,7 @@ prev (JAWS_HASH_BUCKET_ITEM *&item) const } template <class EXT_ID, class INT_ID> int -JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done () const { return this->done_; } diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h index 670834267fe..16ef1b45200 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h @@ -64,7 +64,7 @@ public: JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0); ~JAWS_Hash_Bucket_DLCStack (void); - int is_empty (void) const; + int is_empty () const; // Returns 1 if the container is empty, otherwise returns 0. JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *push (const EXT_ID &ext_id, @@ -131,7 +131,7 @@ public: // Pass back the previous item. Returns 0 if done is true, 1 // otherwise. - int done (void) const; + int done () const; // Returns 1 if done_ flag is set, 0 otherwise. done_ flag is set // if next takes us to first element or prev takes us to last // element. diff --git a/ACE/apps/JAWS2/JAWS/Headers.cpp b/ACE/apps/JAWS2/JAWS/Headers.cpp index ca36aa11f31..f536db5b0bf 100644 --- a/ACE/apps/JAWS2/JAWS/Headers.cpp +++ b/ACE/apps/JAWS2/JAWS/Headers.cpp @@ -32,19 +32,19 @@ JAWS_Header_Data::~JAWS_Header_Data (void) } const char * -JAWS_Header_Data::header_name (void) const +JAWS_Header_Data::header_name () const { return this->header_name_; } const char * -JAWS_Header_Data::header_value (void) const +JAWS_Header_Data::header_value () const { return this->header_value_; } int -JAWS_Header_Data::header_type (void) const +JAWS_Header_Data::header_type () const { return this->header_type_; } diff --git a/ACE/apps/JAWS2/JAWS/Headers.h b/ACE/apps/JAWS2/JAWS/Headers.h index 54d4ede3231..889bc2e2a70 100644 --- a/ACE/apps/JAWS2/JAWS/Headers.h +++ b/ACE/apps/JAWS2/JAWS/Headers.h @@ -29,9 +29,9 @@ public: JAWS_Header_Data (const char *name, int type, const char *value = 0); ~JAWS_Header_Data (void); - const char * header_name (void) const; - const char * header_value (void) const; - int header_type (void) const; + const char * header_name () const; + const char * header_value () const; + int header_type () const; void header_name (const char *name); void header_value (const char *value); diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp index 0d2207d83d0..98eb420d4e7 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp @@ -166,7 +166,7 @@ JAWS_IO_Handler::factory (void) } ACE_HANDLE -JAWS_IO_Handler::handle (void) const +JAWS_IO_Handler::handle () const { return this->handle_; } @@ -354,7 +354,7 @@ JAWS_Asynch_Handler::act (const void *act_ref) #if 0 ACE_HANDLE -JAWS_Asynch_Handler::handle (void) const +JAWS_Asynch_Handler::handle () const { return this->ioh_->handle (); } diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h index e7ea5383746..9d23baa2205 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.h +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h @@ -111,7 +111,7 @@ public: virtual JAWS_IO_Handler_Factory *factory (void) = 0; /// Returns the socket handle for this handler - virtual ACE_HANDLE handle (void) const = 0; + virtual ACE_HANDLE handle () const = 0; /// Cleans up the handler. virtual void done (void) = 0; @@ -177,7 +177,7 @@ public: /// Receives the ACT. virtual void act (const void *act_ref); - //virtual ACE_HANDLE handle (void) const; + //virtual ACE_HANDLE handle () const; private: JAWS_Asynch_IO_Handler *ioh_; @@ -206,7 +206,7 @@ public: virtual void error_message_complete (void); virtual JAWS_IO_Handler_Factory *factory (void); - virtual ACE_HANDLE handle (void) const; + virtual ACE_HANDLE handle () const; virtual void done (void); virtual int status (void); diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp index cc3ac3f120d..63b00475404 100644 --- a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp +++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp @@ -3,7 +3,7 @@ #include "ace/Log_Msg.h" #define ACCESSOR(T,C,x) \ -T C :: x (void) const { return this-> x##_; }\ +T C :: x () const { return this-> x##_; }\ void C :: x (T t) { this-> x##_ = t; } int @@ -418,13 +418,13 @@ JAWS_Header_Info::header_buf (void) } const char * -JAWS_Header_Info::last_header_name (void) const +JAWS_Header_Info::last_header_name () const { return this->last_header_data_ ? this->last_header_data_->header_name () : 0; } const JAWS_Header_Data * -JAWS_Header_Info::last_header_data (void) const +JAWS_Header_Info::last_header_data () const { return this->last_header_data_; } diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.h b/ACE/apps/JAWS2/JAWS/Parse_Headers.h index 6aefd116307..e2cddf11460 100644 --- a/ACE/apps/JAWS2/JAWS/Parse_Headers.h +++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.h @@ -20,15 +20,15 @@ public: JAWS_Header_Info (void); ~JAWS_Header_Info (void); - int end_of_line (void) const; + int end_of_line () const; void end_of_line (int flag); - const char *last_header_name (void) const; + const char *last_header_name () const; - int last_header_length (void) const; + int last_header_length () const; void last_header_length (int len); - const JAWS_Header_Data * last_header_data (void) const; + const JAWS_Header_Data * last_header_data () const; char *header_buf (void); @@ -46,10 +46,10 @@ public: // This will insert last_header_data into the table if it is not // null. - int end_of_headers (void) const; + int end_of_headers () const; void end_of_headers (int flag); - int status (void) const; + int status () const; void status (int s); JAWS_Headers *table (void); diff --git a/ACE/apps/JAWS3/jaws3/Event_Result.h b/ACE/apps/JAWS3/jaws3/Event_Result.h index 875d3366c1c..c2a20d68a29 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Result.h +++ b/ACE/apps/JAWS3/jaws3/Event_Result.h @@ -77,14 +77,14 @@ public: this->error_number_ = errno; } - size_t bytes (void) const { return this->bytes_; } + size_t bytes () const { return this->bytes_; } - int status (void) const { return this->status_; } - int reason (void) const { return this->reason_; } + int status () const { return this->status_; } + int reason () const { return this->reason_; } - int error_number (void) const { return (errno = this->error_number_); } + int error_number () const { return (errno = this->error_number_); } - void * data (void) const { return this->data_; } + void * data () const { return this->data_; } private: diff --git a/ACE/apps/JAWS3/jaws3/FILE.cpp b/ACE/apps/JAWS3/jaws3/FILE.cpp index a19ef5bc3dd..2d27cb76e40 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.cpp +++ b/ACE/apps/JAWS3/jaws3/FILE.cpp @@ -79,7 +79,7 @@ JAWS_FILE::mem_map (int length, ACE_Mem_Map * -JAWS_FILE::map (void) const +JAWS_FILE::map () const { return this->map_; } diff --git a/ACE/apps/JAWS3/jaws3/FILE.h b/ACE/apps/JAWS3/jaws3/FILE.h index d7ff3d58749..e729add3126 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.h +++ b/ACE/apps/JAWS3/jaws3/FILE.h @@ -31,7 +31,7 @@ public: ACE_OFF_T offset = 0, LPSECURITY_ATTRIBUTES sa = 0) const; - ACE_Mem_Map *map (void) const; + ACE_Mem_Map *map () const; void can_map (int); diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h index ce956045436..780737ec32b 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h @@ -31,7 +31,7 @@ public: int handle_exception (ACE_HANDLE); - ACE_HANDLE get_handle (void) const { return this->handle_; } + ACE_HANDLE get_handle () const { return this->handle_; } void set_handle (ACE_HANDLE handle) { this->handle_ = handle; } diff --git a/ACE/examples/APG/Containers/DataElement.h b/ACE/examples/APG/Containers/DataElement.h index 49e103b7aa6..b6a5712add4 100644 --- a/ACE/examples/APG/Containers/DataElement.h +++ b/ACE/examples/APG/Containers/DataElement.h @@ -32,7 +32,7 @@ public: ~DataElement () { count_--; } - int getData (void) const { return data_; } + int getData () const { return data_; } void setData (int val) { data_ = val; } diff --git a/ACE/examples/APG/Containers/Hash_Map_Hash.h b/ACE/examples/APG/Containers/Hash_Map_Hash.h index a2a5c1dde96..143ef6f2553 100644 --- a/ACE/examples/APG/Containers/Hash_Map_Hash.h +++ b/ACE/examples/APG/Containers/Hash_Map_Hash.h @@ -13,7 +13,7 @@ public: KeyType (const KeyType& kt) { this->val_ = kt.val_; } - operator int (void) const { return val_; } + operator int () const { return val_; } private: int val_; diff --git a/ACE/examples/APG/Naming/Graphable_Element.h b/ACE/examples/APG/Naming/Graphable_Element.h index a1b1aa53c57..ae2e0c16150 100644 --- a/ACE/examples/APG/Naming/Graphable_Element.h +++ b/ACE/examples/APG/Naming/Graphable_Element.h @@ -21,7 +21,7 @@ public: // Listing 1 // Listing 2 code/ch21 - inline int when (void) const + inline int when () const { return this->when_; } diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp index f4d25a2e1dd..cd2c4d1bcfe 100644 --- a/ACE/examples/APG/Reactor/HAStatus.cpp +++ b/ACE/examples/APG/Reactor/HAStatus.cpp @@ -18,7 +18,7 @@ public: //FUZZ: enable check_for_lack_ACE_OS // Get this handler's I/O handle. - virtual ACE_HANDLE get_handle (void) const + virtual ACE_HANDLE get_handle () const { return this->acceptor_.get_handle (); } // Called when a connection is ready to accept. @@ -49,7 +49,7 @@ public: //FUZZ: enable check_for_lack_ACE_OS // Get this handler's I/O handle. - virtual ACE_HANDLE get_handle (void) const + virtual ACE_HANDLE get_handle () const { return this->sock_.get_handle (); } // Called when input is available from the client. diff --git a/ACE/examples/APG/Reactor/Timer_State_Data.cpp b/ACE/examples/APG/Reactor/Timer_State_Data.cpp index cf3ff32e522..a1b8056b49d 100644 --- a/ACE/examples/APG/Reactor/Timer_State_Data.cpp +++ b/ACE/examples/APG/Reactor/Timer_State_Data.cpp @@ -31,7 +31,7 @@ public: return ++this->count_; } - float temperature (void) const + float temperature () const { return this->temperature_; } diff --git a/ACE/examples/APG/Streams/RecordingDevice.h b/ACE/examples/APG/Streams/RecordingDevice.h index db73f6ba4a9..41a9739d987 100644 --- a/ACE/examples/APG/Streams/RecordingDevice.h +++ b/ACE/examples/APG/Streams/RecordingDevice.h @@ -24,7 +24,7 @@ public: { } - virtual const ACE_TCHAR *get_name (void) const + virtual const ACE_TCHAR *get_name () const { return ACE_TEXT ("UNKNOWN"); } @@ -56,7 +56,7 @@ public: // Get the handler of the device so that wait_for_activity() can // wait for data to arrive. - virtual ACE_Event_Handler *get_handler (void) const + virtual ACE_Event_Handler *get_handler () const { return 0; } diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp index bced70944ff..cf6cc0c084c 100644 --- a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp +++ b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp @@ -23,7 +23,7 @@ int TextListenerAcceptor::open (ACE_INET_Addr &addr) return 0; } -ACE_HANDLE TextListenerAcceptor::get_handle (void) const +ACE_HANDLE TextListenerAcceptor::get_handle () const { return this->acceptor_.get_handle (); } @@ -57,7 +57,7 @@ int TextListenerAcceptor::init (int argc, ACE_TCHAR *argv[]) return 0; } -ACE_Event_Handler *TextListenerAcceptor::get_handler (void) const +ACE_Event_Handler *TextListenerAcceptor::get_handler () const { return (ACE_Event_Handler *)this; } @@ -102,7 +102,7 @@ TextListener::TextListener (TextListenerAcceptor *acceptor) } // Listing 01 -const ACE_TCHAR *TextListener::get_name (void) const +const ACE_TCHAR *TextListener::get_name () const { return ACE_TEXT ("TextListener"); } diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.h b/ACE/examples/APG/Streams/RecordingDevice_Text.h index 979b2e80909..10dc44df1f6 100644 --- a/ACE/examples/APG/Streams/RecordingDevice_Text.h +++ b/ACE/examples/APG/Streams/RecordingDevice_Text.h @@ -26,7 +26,7 @@ public: int open (ACE_INET_Addr &addr); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; int handle_input (ACE_HANDLE); @@ -37,7 +37,7 @@ public: // Open a listening socket on the port specified by argv. int init (int argc, ACE_TCHAR *argv[]); - ACE_Event_Handler *get_handler (void) const; + ACE_Event_Handler *get_handler () const; virtual RecordingDevice *wait_for_activity (void); @@ -59,7 +59,7 @@ class TextListener : public RecordingDevice public: TextListener (TextListenerAcceptor *acceptor); - virtual const ACE_TCHAR *get_name (void) const; + virtual const ACE_TCHAR *get_name () const; int answer_call (void); diff --git a/ACE/examples/APG/Timers/PCB.cpp b/ACE/examples/APG/Timers/PCB.cpp index 399f356a799..542ca97946f 100644 --- a/ACE/examples/APG/Timers/PCB.cpp +++ b/ACE/examples/APG/Timers/PCB.cpp @@ -56,7 +56,7 @@ PCB::setID (long timerID) } long -PCB::getID (void) const +PCB::getID () const { ACE_TRACE ("PCB::getID"); return timerID_; diff --git a/ACE/examples/APG/Timers/PCB.h b/ACE/examples/APG/Timers/PCB.h index 1aa9766f169..abe953b30c5 100644 --- a/ACE/examples/APG/Timers/PCB.h +++ b/ACE/examples/APG/Timers/PCB.h @@ -11,7 +11,7 @@ public: // Set/get the timer id that is being handled by this instance. void setID (long timerID); - long getID (void) const; + long getID () const; // Handle a timeout event, cancel, and close. virtual int handleEvent (const void *arg); diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp index 088a7b2a3b9..41f00d1bb4c 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp @@ -342,7 +342,7 @@ Peer_Router::Peer_Router (Peer_Router_Context *prc) } Peer_Router_Context * -Peer_Router::context (void) const +Peer_Router::context () const { return this->peer_router_context_; } diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h index 9925bad78d4..1e28194917a 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h @@ -136,7 +136,7 @@ protected: virtual int control (ACE_Message_Block *); // Handle control messages arriving from adjacent Modules. - Peer_Router_Context *context (void) const; + Peer_Router_Context *context () const; // Returns the routing context. typedef ACE_Task<ACE_SYNCH> inherited; diff --git a/ACE/examples/C++NPv2/Logging_Event_Handler.h b/ACE/examples/C++NPv2/Logging_Event_Handler.h index 286193ef9cb..210e2eb7782 100644 --- a/ACE/examples/C++NPv2/Logging_Event_Handler.h +++ b/ACE/examples/C++NPv2/Logging_Event_Handler.h @@ -41,7 +41,7 @@ public: ACE_Reactor_Mask = 0); // Return socket handle of the contained <Logging_Handler>. - virtual ACE_HANDLE get_handle (void) const { + virtual ACE_HANDLE get_handle () const { // Need a non-const reference to call peer(), but that's // safe since we call a const method using it. Logging_Handler& h = diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.cpp b/ACE/examples/Connection/blocking/SPIPE-connector.cpp index 8c1e704a5e1..61ef11b801c 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-connector.cpp @@ -117,7 +117,7 @@ Peer_Handler::handle_close (ACE_HANDLE, } ACE_HANDLE -Peer_Handler::get_handle (void) const +Peer_Handler::get_handle () const { return this->peer ().get_handle (); } diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.h b/ACE/examples/Connection/blocking/SPIPE-connector.h index 029fc11217a..ae11b7e8b62 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.h +++ b/ACE/examples/Connection/blocking/SPIPE-connector.h @@ -33,7 +33,7 @@ public: virtual int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE, ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; private: void display_menu (void); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index c2f135b880e..95634d813bc 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -84,13 +84,13 @@ Options::init (void) } size_t -Options::message_len (void) const +Options::message_len () const { return this->message_len_; } const void * -Options::message_buf (void) const +Options::message_buf () const { return this->message_buf_; } @@ -161,31 +161,31 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } u_short -Options::port (void) const +Options::port () const { return this->port_; } const ACE_TCHAR * -Options::host (void) const +Options::host () const { return this->host_; } const ACE_TCHAR * -Options::quit_string (void) const +Options::quit_string () const { return this->quit_string_; } size_t -Options::threads (void) const +Options::threads () const { return this->threads_; } const ACE_Time_Value & -Options::sleep_time (void) const +Options::sleep_time () const { return this->sleep_time_; } diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h index ebbe0de4512..e06aaf8268e 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h @@ -22,29 +22,29 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments. - const ACE_Time_Value &sleep_time (void) const; + const ACE_Time_Value &sleep_time () const; // Return the amount of time to sleep in order to implement the // proper transmission rates. - u_short port (void) const; + u_short port () const; // Port of the server. - const ACE_TCHAR *host (void) const; + const ACE_TCHAR *host () const; // Host of the server. - size_t threads (void) const; + size_t threads () const; // Number of threads. - const ACE_TCHAR *quit_string (void) const; + const ACE_TCHAR *quit_string () const; // String that shuts down the client/server. ssize_t read (void *buf, size_t len, size_t &iterations); // Read from the appropriate location. - size_t message_len (void) const; + size_t message_len () const; // Returns the length of the message to send. - const void *message_buf (void) const; + const void *message_buf () const; // Returns a pointer to the message. ACE_THR_FUNC thr_func (void); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index 1bf30a36ab5..369bde93281 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -131,19 +131,19 @@ private: }; u_short -Options::port (void) const +Options::port () const { return this->port_; } int -Options::verbose (void) const +Options::verbose () const { return this->verbose_; } int -Options::reply_message_len (void) const +Options::reply_message_len () const { return this->reply_message_len_; } diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h index 8b649146efb..6d9adcf89fd 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h @@ -18,13 +18,13 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments. - int verbose (void) const; + int verbose () const; // Are we running in verbose mode? - u_short port (void) const; + u_short port () const; // Port number that we are listening at. - int reply_message_len (void) const; + int reply_message_len () const; // Size of the reply message. private: diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp index 95c2d891a67..4a1b8667898 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp @@ -68,13 +68,13 @@ Options::init (void) } size_t -Options::message_len (void) const +Options::message_len () const { return this->message_len_; } const void * -Options::message_buf (void) const +Options::message_buf () const { return this->message_buf_; } @@ -145,25 +145,25 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } u_short -Options::port (void) const +Options::port () const { return this->port_; } const ACE_TCHAR * -Options::host (void) const +Options::host () const { return this->host_; } const char * -Options::quit_string (void) const +Options::quit_string () const { return this->quit_string_; } const ACE_Time_Value & -Options::sleep_time (void) const +Options::sleep_time () const { return this->sleep_time_; } diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h index db1ad45bf4c..5284aaa8957 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h @@ -22,26 +22,26 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments. - const ACE_Time_Value &sleep_time (void) const; + const ACE_Time_Value &sleep_time () const; // Return the amount of time to sleep in order to implement the // proper transmission rates. - u_short port (void) const; + u_short port () const; // Port of the server. - const ACE_TCHAR *host (void) const; + const ACE_TCHAR *host () const; // Host of the server. - const char *quit_string (void) const; + const char *quit_string () const; // String that shuts down the client/server. ssize_t read (void *buf, size_t len, size_t &iterations); // Read from the appropriate location. - size_t message_len (void) const; + size_t message_len () const; // Returns the length of the message to send. - const void *message_buf (void) const; + const void *message_buf () const; // Returns a pointer to the message. void run (void); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp index 680b58e8788..ffbeedbf8eb 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp @@ -78,13 +78,13 @@ Options::init (void) } size_t -Options::message_len (void) const +Options::message_len () const { return this->message_len_; } const void * -Options::message_buf (void) const +Options::message_buf () const { return this->message_buf_; } @@ -160,31 +160,31 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } u_short -Options::port (void) const +Options::port () const { return this->port_; } const ACE_TCHAR * -Options::host (void) const +Options::host () const { return this->host_; } const char * -Options::quit_string (void) const +Options::quit_string () const { return this->quit_string_; } size_t -Options::threads (void) const +Options::threads () const { return this->threads_; } const ACE_Time_Value & -Options::sleep_time (void) const +Options::sleep_time () const { return this->sleep_time_; } diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h index e445e35c147..db869ac2b6a 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h @@ -25,28 +25,28 @@ public: // Return the amount of time to sleep in order to implement the // proper transmission rates. - const ACE_Time_Value &sleep_time (void) const; + const ACE_Time_Value &sleep_time () const; // Port of the server. - u_short port (void) const; + u_short port () const; // Host of the server. - const ACE_TCHAR *host (void) const; + const ACE_TCHAR *host () const; // Number of threads. - size_t threads (void) const; + size_t threads () const; // String that shuts down the client/server. - const char *quit_string (void) const; + const char *quit_string () const; // Read from the appropriate location. ssize_t read (void *buf, size_t len, size_t &iterations); // Returns the length of the message to send. - size_t message_len (void) const; + size_t message_len () const; // Returns a pointer to the message. - const void *message_buf (void) const; + const void *message_buf () const; // Returns a pointer to the entry point into the thread that runs // the client test function. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp index c9521664bc7..2601dc12389 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -138,19 +138,19 @@ private: }; u_short -Options::port (void) const +Options::port () const { return this->port_; } int -Options::verbose (void) const +Options::verbose () const { return this->verbose_; } int -Options::reply_message_len (void) const +Options::reply_message_len () const { return ACE_Utils::truncate_cast<int> (this->reply_message_len_); } diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h index f7782bb2cdd..3fb64a1c7eb 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h @@ -19,13 +19,13 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments. - int verbose (void) const; + int verbose () const; // Are we running in verbose mode? - u_short port (void) const; + u_short port () const; // Port number that we are listening at. - int reply_message_len (void) const; + int reply_message_len () const; // Size of the reply message. private: diff --git a/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp b/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp index 12f0d4918b0..ab6987ffc65 100644 --- a/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp +++ b/ACE/examples/Logger/simple-server/Logging_Acceptor.cpp @@ -43,7 +43,7 @@ Logging_Acceptor::~Logging_Acceptor (void) // Returns underlying device descriptor. ACE_HANDLE -Logging_Acceptor::get_handle (void) const +Logging_Acceptor::get_handle () const { return this->peer_acceptor_.get_handle (); } diff --git a/ACE/examples/Logger/simple-server/Logging_Acceptor.h b/ACE/examples/Logger/simple-server/Logging_Acceptor.h index c3ff2eaf6a8..757e9e1aea3 100644 --- a/ACE/examples/Logger/simple-server/Logging_Acceptor.h +++ b/ACE/examples/Logger/simple-server/Logging_Acceptor.h @@ -43,7 +43,7 @@ private: // = Demuxing hooks. virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// By making this private we ensure that the <Logging_Acceptor> is /// allocated dynamically. diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp index a7776fcaf87..1f9de262cba 100644 --- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp +++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp @@ -141,7 +141,7 @@ Logging_Handler::handle_input (ACE_HANDLE) // Extract underlying device descriptor. ACE_HANDLE -Logging_Handler::get_handle (void) const +Logging_Handler::get_handle () const { return this->cli_stream_.get_handle (); } diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.h b/ACE/examples/Logger/simple-server/Logging_Handler.h index 8c795336ef6..8ba6e160ed7 100644 --- a/ACE/examples/Logger/simple-server/Logging_Handler.h +++ b/ACE/examples/Logger/simple-server/Logging_Handler.h @@ -47,7 +47,7 @@ public: protected: // = Demultiplexing hooks. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); diff --git a/ACE/examples/Misc/test_XtReactor1.cpp b/ACE/examples/Misc/test_XtReactor1.cpp index 7bf5ae8156d..3a946887c17 100644 --- a/ACE/examples/Misc/test_XtReactor1.cpp +++ b/ACE/examples/Misc/test_XtReactor1.cpp @@ -29,7 +29,7 @@ public: "Unable to set stdout to non-block.")); } - ACE_HANDLE get_handle (void) const { return ACE_STDOUT; } + ACE_HANDLE get_handle () const { return ACE_STDOUT; } int handle_output (ACE_HANDLE) { diff --git a/ACE/examples/Misc/test_XtReactor2.cpp b/ACE/examples/Misc/test_XtReactor2.cpp index 2e949ad27c6..4eb1ac92b69 100644 --- a/ACE/examples/Misc/test_XtReactor2.cpp +++ b/ACE/examples/Misc/test_XtReactor2.cpp @@ -13,7 +13,7 @@ class Stdin : public ACE_Event_Handler { public: - ACE_HANDLE get_handle (void) const { return ACE_STDIN; } + ACE_HANDLE get_handle () const { return ACE_STDIN; } int handle_input (ACE_HANDLE) { diff --git a/ACE/examples/Misc/test_dump.h b/ACE/examples/Misc/test_dump.h index dad48dae3ab..bd7bb5ff9e3 100644 --- a/ACE/examples/Misc/test_dump.h +++ b/ACE/examples/Misc/test_dump.h @@ -13,7 +13,7 @@ public: SOCK (void) { ACE_REGISTER_OBJECT (SOCK); } ~SOCK (void) { ACE_REMOVE_OBJECT; } - void dump (void) const { + void dump () const { ACE_DEBUG ((LM_DEBUG, "hello from SOCK = %@\n", this)); } @@ -26,7 +26,7 @@ public: SOCK_Acceptor (void) { ACE_REGISTER_OBJECT (SOCK_Acceptor); } ~SOCK_Acceptor (void) { ACE_REMOVE_OBJECT; } - void dump (void) const { + void dump () const { ACE_DEBUG ((LM_DEBUG, "hello from SOCK_Acceptor = %@\n", this)); } @@ -39,7 +39,7 @@ public: SOCK_Stream (void) { ACE_REGISTER_OBJECT (SOCK_Stream); } ~SOCK_Stream (void) { ACE_REMOVE_OBJECT; } - void dump (void) const { + void dump () const { ACE_DEBUG ((LM_DEBUG, "hello from SOCK_Stream = %@\n", this)); } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index 71d0685af14..e8ae923d642 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -90,31 +90,31 @@ QoS_Util::parse_args (void) } ACE_INET_Addr * -QoS_Util::mult_session_addr (void) const +QoS_Util::mult_session_addr () const { return this->mult_session_addr_; } ACE_INET_Addr * -QoS_Util::dest_addr (void) const +QoS_Util::dest_addr () const { return this->dest_addr_; } u_short -QoS_Util::source_port (void) const +QoS_Util::source_port () const { return this->source_port_; } ACE_Protocol_ID -QoS_Util::protocol (void) const +QoS_Util::protocol () const { return this->protocol_; } int -QoS_Util::multicast_flag (void) const +QoS_Util::multicast_flag () const { return this->multicast_flag_; } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h index 1240cb23530..3c9716d63cd 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h @@ -36,15 +36,15 @@ public: int parse_args (void); // GET methods. - ACE_INET_Addr *mult_session_addr (void) const; + ACE_INET_Addr *mult_session_addr () const; - ACE_INET_Addr *dest_addr (void) const; + ACE_INET_Addr *dest_addr () const; - u_short source_port (void) const; + u_short source_port () const; - ACE_Protocol_ID protocol (void) const; + ACE_Protocol_ID protocol () const; - int multicast_flag (void) const; + int multicast_flag () const; private: diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp index 8f3fc7e690f..f20d0937f87 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp @@ -35,7 +35,7 @@ Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) // Return the handle of the Dgram_Mcast. This method is called // internally by the reactor. ACE_HANDLE -Receiver_QoS_Event_Handler::get_handle (void) const +Receiver_QoS_Event_Handler::get_handle () const { return this->dgram_mcast_qos_.get_handle (); } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h index dfb58886838..b6a31e43ead 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h @@ -33,7 +33,7 @@ public: /// Override this to return the handle of the Dgram_Mcast /// that we are using. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Handles a READ event. virtual int handle_input (ACE_HANDLE fd); diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp index 4536fdbba82..1eab340fd82 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp @@ -37,7 +37,7 @@ Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) // internally by the reactor. ACE_HANDLE -Sender_QoS_Event_Handler::get_handle (void) const +Sender_QoS_Event_Handler::get_handle () const { return this->dgram_mcast_qos_.get_handle (); } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h index dbeac69bb35..5d04e7ed862 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h @@ -36,7 +36,7 @@ public: /// Override this to return the handle of the Dgram_Mcast /// that we are using. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Handles a QoS event. Right now, just /// prints a message. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index 71d0685af14..e8ae923d642 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -90,31 +90,31 @@ QoS_Util::parse_args (void) } ACE_INET_Addr * -QoS_Util::mult_session_addr (void) const +QoS_Util::mult_session_addr () const { return this->mult_session_addr_; } ACE_INET_Addr * -QoS_Util::dest_addr (void) const +QoS_Util::dest_addr () const { return this->dest_addr_; } u_short -QoS_Util::source_port (void) const +QoS_Util::source_port () const { return this->source_port_; } ACE_Protocol_ID -QoS_Util::protocol (void) const +QoS_Util::protocol () const { return this->protocol_; } int -QoS_Util::multicast_flag (void) const +QoS_Util::multicast_flag () const { return this->multicast_flag_; } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h index 1240cb23530..3c9716d63cd 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h @@ -36,15 +36,15 @@ public: int parse_args (void); // GET methods. - ACE_INET_Addr *mult_session_addr (void) const; + ACE_INET_Addr *mult_session_addr () const; - ACE_INET_Addr *dest_addr (void) const; + ACE_INET_Addr *dest_addr () const; - u_short source_port (void) const; + u_short source_port () const; - ACE_Protocol_ID protocol (void) const; + ACE_Protocol_ID protocol () const; - int multicast_flag (void) const; + int multicast_flag () const; private: diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp index a4aa915d0fa..1a4d08b08ea 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp @@ -35,7 +35,7 @@ Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) // Return the handle of the Dgram_Mcast. This method is called // internally by the reactor. ACE_HANDLE -Receiver_QoS_Event_Handler::get_handle (void) const +Receiver_QoS_Event_Handler::get_handle () const { return this->dgram_mcast_qos_.get_handle (); } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h index dfb58886838..b6a31e43ead 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h @@ -33,7 +33,7 @@ public: /// Override this to return the handle of the Dgram_Mcast /// that we are using. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Handles a READ event. virtual int handle_input (ACE_HANDLE fd); diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp index 75e7632e299..f98eed6ab35 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp @@ -37,7 +37,7 @@ Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) // internally by the reactor. ACE_HANDLE -Sender_QoS_Event_Handler::get_handle (void) const +Sender_QoS_Event_Handler::get_handle () const { return this->dgram_mcast_qos_.get_handle (); } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h index dbeac69bb35..5d04e7ed862 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h @@ -36,7 +36,7 @@ public: /// Override this to return the handle of the Dgram_Mcast /// that we are using. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Handles a QoS event. Right now, just /// prints a message. diff --git a/ACE/examples/QOS/Diffserv/server.cpp b/ACE/examples/QOS/Diffserv/server.cpp index abe0babb3d7..d09a51797af 100644 --- a/ACE/examples/QOS/Diffserv/server.cpp +++ b/ACE/examples/QOS/Diffserv/server.cpp @@ -24,7 +24,7 @@ public: Dgram_Endpoint (const ACE_INET_Addr &local_addr); // = Hook methods inherited from the <ACE_Event_Handler>. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); virtual int handle_timeout (const ACE_Time_Value & tv, const void *arg = 0); @@ -55,7 +55,7 @@ Dgram_Endpoint::Dgram_Endpoint (const ACE_INET_Addr &local_addr) } ACE_HANDLE -Dgram_Endpoint::get_handle (void) const +Dgram_Endpoint::get_handle () const { return this->endpoint_.get_handle (); } diff --git a/ACE/examples/QOS/Simple/QoS_Util.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp index 71d0685af14..e8ae923d642 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.cpp +++ b/ACE/examples/QOS/Simple/QoS_Util.cpp @@ -90,31 +90,31 @@ QoS_Util::parse_args (void) } ACE_INET_Addr * -QoS_Util::mult_session_addr (void) const +QoS_Util::mult_session_addr () const { return this->mult_session_addr_; } ACE_INET_Addr * -QoS_Util::dest_addr (void) const +QoS_Util::dest_addr () const { return this->dest_addr_; } u_short -QoS_Util::source_port (void) const +QoS_Util::source_port () const { return this->source_port_; } ACE_Protocol_ID -QoS_Util::protocol (void) const +QoS_Util::protocol () const { return this->protocol_; } int -QoS_Util::multicast_flag (void) const +QoS_Util::multicast_flag () const { return this->multicast_flag_; } diff --git a/ACE/examples/QOS/Simple/QoS_Util.h b/ACE/examples/QOS/Simple/QoS_Util.h index 1240cb23530..3c9716d63cd 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.h +++ b/ACE/examples/QOS/Simple/QoS_Util.h @@ -36,15 +36,15 @@ public: int parse_args (void); // GET methods. - ACE_INET_Addr *mult_session_addr (void) const; + ACE_INET_Addr *mult_session_addr () const; - ACE_INET_Addr *dest_addr (void) const; + ACE_INET_Addr *dest_addr () const; - u_short source_port (void) const; + u_short source_port () const; - ACE_Protocol_ID protocol (void) const; + ACE_Protocol_ID protocol () const; - int multicast_flag (void) const; + int multicast_flag () const; private: diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp index 9a894e4e6a3..c253dc28381 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp @@ -34,7 +34,7 @@ Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) // Return the handle of the Dgram_Mcast. This method is called // internally by the reactor. ACE_HANDLE -Receiver_QoS_Event_Handler::get_handle (void) const +Receiver_QoS_Event_Handler::get_handle () const { return this->dgram_mcast_qos_.get_handle (); } diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h index dfb58886838..b6a31e43ead 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h @@ -33,7 +33,7 @@ public: /// Override this to return the handle of the Dgram_Mcast /// that we are using. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Handles a READ event. virtual int handle_input (ACE_HANDLE fd); diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp index 399b5932d9d..a259a2a04e0 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp @@ -37,7 +37,7 @@ Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) // internally by the reactor. ACE_HANDLE -Sender_QoS_Event_Handler::get_handle (void) const +Sender_QoS_Event_Handler::get_handle () const { return this->dgram_mcast_qos_.get_handle (); } diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h index dbeac69bb35..5d04e7ed862 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h @@ -36,7 +36,7 @@ public: /// Override this to return the handle of the Dgram_Mcast /// that we are using. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Handles a QoS event. Right now, just /// prints a message. diff --git a/ACE/examples/Reactor/Dgram/CODgram.cpp b/ACE/examples/Reactor/Dgram/CODgram.cpp index cfa1b404e5a..2b531e2c3dd 100644 --- a/ACE/examples/Reactor/Dgram/CODgram.cpp +++ b/ACE/examples/Reactor/Dgram/CODgram.cpp @@ -44,7 +44,7 @@ public: const ACE_INET_Addr &local_addr); // = Hook methods inherited from the <ACE_Event_Handler>. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); virtual int handle_timeout (const ACE_Time_Value & tv, const void *arg = 0); @@ -85,7 +85,7 @@ Dgram_Endpoint::Dgram_Endpoint (const ACE_INET_Addr &remote_addr, } ACE_HANDLE -Dgram_Endpoint::get_handle (void) const +Dgram_Endpoint::get_handle () const { return this->endpoint_.get_handle (); } diff --git a/ACE/examples/Reactor/Dgram/Dgram.cpp b/ACE/examples/Reactor/Dgram/Dgram.cpp index c80eb8bcaea..04944fc5704 100644 --- a/ACE/examples/Reactor/Dgram/Dgram.cpp +++ b/ACE/examples/Reactor/Dgram/Dgram.cpp @@ -42,7 +42,7 @@ public: Dgram_Endpoint (const ACE_INET_Addr &local_addr); // = Hook methods inherited from the <ACE_Event_Handler>. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); virtual int handle_timeout (const ACE_Time_Value & tv, const void *arg = 0); @@ -73,7 +73,7 @@ Dgram_Endpoint::Dgram_Endpoint (const ACE_INET_Addr &local_addr) } ACE_HANDLE -Dgram_Endpoint::get_handle (void) const +Dgram_Endpoint::get_handle () const { return this->endpoint_.get_handle (); } diff --git a/ACE/examples/Reactor/FIFO/server.cpp b/ACE/examples/Reactor/FIFO/server.cpp index 422a246f821..a3f264170c0 100644 --- a/ACE/examples/Reactor/FIFO/server.cpp +++ b/ACE/examples/Reactor/FIFO/server.cpp @@ -14,7 +14,7 @@ public: FIFO_Recv_Handler (void); ~FIFO_Recv_Handler (void); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); private: @@ -37,7 +37,7 @@ FIFO_Recv_Handler::FIFO_Recv_Handler (void) } ACE_HANDLE -FIFO_Recv_Handler::get_handle (void) const +FIFO_Recv_Handler::get_handle () const { return this->fifo_reader_.get_handle (); } diff --git a/ACE/examples/Reactor/Misc/pingpong.cpp b/ACE/examples/Reactor/Misc/pingpong.cpp index 1b4c72dd20c..0da26118eb0 100644 --- a/ACE/examples/Reactor/Misc/pingpong.cpp +++ b/ACE/examples/Reactor/Misc/pingpong.cpp @@ -50,7 +50,7 @@ class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t> { public: Ping_Pong (char b[], ACE_HANDLE f); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); virtual int handle_output (ACE_HANDLE); virtual int handle_timeout (const ACE_Time_Value &, @@ -86,7 +86,7 @@ Ping_Pong::Ping_Pong (char b[], ACE_HANDLE f) } ACE_HANDLE -Ping_Pong::get_handle (void) const +Ping_Pong::get_handle () const { return this->handle_; } diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp index f320d5bc17f..61c6f75f290 100644 --- a/ACE/examples/Reactor/Misc/test_demuxing.cpp +++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp @@ -29,7 +29,7 @@ class Sig_Handler : public ACE_Event_Handler // handler functions or global signal handler data. public: Sig_Handler (void); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); //FUZZ: disable check_for_lack_ACE_OS @@ -87,7 +87,7 @@ Sig_Handler::Sig_Handler (void) // Called by the ACE_Reactor to extract the handle. ACE_HANDLE -Sig_Handler::get_handle (void) const +Sig_Handler::get_handle () const { return this->handle_; } diff --git a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp index 654f159d3dc..40d16a72f60 100644 --- a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp +++ b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp @@ -6,7 +6,7 @@ class ACE_Test_Sig_Handler public: ACE_Test_Sig_Handler (void) {} virtual ~ACE_Test_Sig_Handler (void) {} - virtual ACE_HANDLE get_handle (void) const { return 0; } + virtual ACE_HANDLE get_handle () const { return 0; } virtual void set_handle (ACE_HANDLE) {} virtual int handle_async_io (ACE_HANDLE) { return 0; } diff --git a/ACE/examples/Reactor/Multicast/server.cpp b/ACE/examples/Reactor/Multicast/server.cpp index e12bcb8f86e..ee081dd0948 100644 --- a/ACE/examples/Reactor/Multicast/server.cpp +++ b/ACE/examples/Reactor/Multicast/server.cpp @@ -29,7 +29,7 @@ public: virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; ACE_Time_Value *wait_time (void); @@ -61,7 +61,7 @@ static const int UDP_PORT = ACE_DEFAULT_MULTICAST_PORT; static const int DURATION = 5; ACE_HANDLE -Server_Events::get_handle (void) const +Server_Events::get_handle () const { return this->mcast_dgram_.get_handle (); } diff --git a/ACE/examples/Reactor/Ntalker/ntalker.cpp b/ACE/examples/Reactor/Ntalker/ntalker.cpp index 4dbd8d4726b..62006269d14 100644 --- a/ACE/examples/Reactor/Ntalker/ntalker.cpp +++ b/ACE/examples/Reactor/Ntalker/ntalker.cpp @@ -36,7 +36,7 @@ public: virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; private: ACE_SOCK_Dgram_Mcast mcast_; @@ -47,7 +47,7 @@ private: }; ACE_HANDLE -Handler::get_handle (void) const +Handler::get_handle () const { return this->mcast_.get_handle (); } diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp index 237e27b1734..e944f6b2f89 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp @@ -284,7 +284,7 @@ public: int open (const ACE_TCHAR *host, u_short port); - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; void handle (ACE_HANDLE); protected: @@ -358,7 +358,7 @@ Sender::~Sender (void) } ACE_HANDLE -Sender::handle (void) const +Sender::handle () const { return this->stream_.get_handle (); } diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp index d4ed31bf263..900eca4a0be 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp @@ -372,7 +372,7 @@ public: int open (const ACE_TCHAR *host, u_short port); void close (); - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; void handle (ACE_HANDLE); protected: @@ -426,7 +426,7 @@ void Sender::close () this->stream_.close (); } -ACE_HANDLE Sender::handle (void) const +ACE_HANDLE Sender::handle () const { return this->stream_.get_handle (); } diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index 66a6a1a00e1..096e89b0021 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -430,7 +430,7 @@ public: int open (const ACE_TCHAR *host, u_short port); void close (void); - ACE_HANDLE handle (void) const; + ACE_HANDLE handle () const; virtual void handle (ACE_HANDLE); protected: @@ -482,7 +482,7 @@ void Sender::close (void) this->stream_.close (); } -ACE_HANDLE Sender::handle (void) const +ACE_HANDLE Sender::handle () const { return this->stream_.get_handle (); } diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp index fbd6d962e89..228c504ca1b 100644 --- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp +++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp @@ -52,7 +52,7 @@ int AcceptHandler::open(void) { return 0; } -ACE_HANDLE AcceptHandler::get_handle(void) const { +ACE_HANDLE AcceptHandler::get_handle() const { ACE_TRACE("AcceptHandler::get_handle(void)"); return mAcceptor.get_handle(); } diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h index e2f80f297b6..ba388aaac29 100644 --- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h @@ -55,7 +55,7 @@ class AcceptHandler : public ACE_Event_Handler { /** * Provides the handle of mAcceptor. */ - virtual ACE_HANDLE get_handle(void) const; + virtual ACE_HANDLE get_handle() const; /** * Create a read handler for the new connection and register that diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp index 6a52ff086f1..b5116b0e2ce 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp @@ -49,7 +49,7 @@ ACE_SOCK_Stream &ReadHandler::getStream(void) { return mStream; } -ACE_HANDLE ReadHandler::get_handle(void) const { +ACE_HANDLE ReadHandler::get_handle() const { ACE_TRACE("ReadHandler::get_handle(void)"); return mStream.get_handle(); } diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h index 083722eb278..2f3fcaf13c9 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h @@ -71,7 +71,7 @@ class ReadHandler : public ACE_Event_Handler { /** * Provides the handle of mStream; */ - virtual ACE_HANDLE get_handle(void) const; + virtual ACE_HANDLE get_handle() const; /** * Handles the data excahnge between client and server. On the first diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp index a0e512a6fc5..18e0373eccc 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp @@ -45,7 +45,7 @@ public: return 0; } - ACE_HANDLE get_handle (void) const + ACE_HANDLE get_handle () const { return this->event_.handle (); } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index 750c399d116..71511985a77 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -62,7 +62,7 @@ public: this->reactor (0); } - ACE_HANDLE get_handle (void) const + ACE_HANDLE get_handle () const { return this->pipe_.read_handle (); } @@ -123,7 +123,7 @@ public: this->reactor (0); } - ACE_HANDLE get_handle (void) const + ACE_HANDLE get_handle () const { return this->pipe_.read_handle (); } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp index e189903e309..304b746e536 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp @@ -41,7 +41,7 @@ public: virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; ACE_SOCK_Stream stream_; @@ -57,7 +57,7 @@ Network_Handler::Network_Handler (ACE_SOCK_Stream &s) } ACE_HANDLE -Network_Handler::get_handle (void) const +Network_Handler::get_handle () const { return this->stream_.get_handle (); } @@ -118,7 +118,7 @@ public: virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; ACE_INET_Addr local_address_; ACE_SOCK_Acceptor acceptor_; @@ -139,7 +139,7 @@ Network_Listener::~Network_Listener (void) } ACE_HANDLE -Network_Listener::get_handle (void) const +Network_Listener::get_handle () const { return this->acceptor_.get_handle (); } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp index 1e982f01047..ce267ee9541 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp @@ -58,7 +58,7 @@ public: return 0; } - virtual ACE_HANDLE get_handle (void) const + virtual ACE_HANDLE get_handle () const { return event_.handle (); } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp index 72c4307d8a6..942fd9e9795 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp @@ -21,7 +21,7 @@ class Event_Handler : public ACE_Event_Handler { public: - ACE_HANDLE get_handle (void) const + ACE_HANDLE get_handle () const { return this->event_.handle (); } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp index 05df818992f..decac6d0b97 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -183,7 +183,7 @@ public: * called by the ACE_Asynch_* classes when an ACE_INVALID_HANDLE is * passed to <open>. */ - virtual ACE_HANDLE handle (void) const; + virtual ACE_HANDLE handle () const; /// Set the ACE_HANDLE value for this Handler. void handle (ACE_HANDLE); @@ -395,7 +395,7 @@ Peer_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) // This is so the Proactor can get our handle. ACE_HANDLE -Peer_Handler::handle (void) const +Peer_Handler::handle () const { return this->stream_.get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h index fff847ceea8..dac570674eb 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h @@ -28,7 +28,7 @@ public: private: int open (const ACE_INET_Addr &r, int async = 0); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl index d820bb9b25c..b043d4cc003 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl @@ -85,7 +85,7 @@ Handle_Broadcast::fini (void) } ACE_INLINE ACE_HANDLE -Handle_Broadcast::get_handle (void) const +Handle_Broadcast::get_handle () const { return this->ACE_SOCK_Dgram::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h index aeebf5a6971..d7e54b2e4c8 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h @@ -28,7 +28,7 @@ public: public: int open (const ACE_UNIX_Addr &suad, int async = 0); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl index 17082efe49f..856a2ffa99a 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl @@ -76,7 +76,7 @@ Handle_L_CODgram::fini(void) } ACE_INLINE ACE_HANDLE -Handle_L_CODgram::get_handle (void) const +Handle_L_CODgram::get_handle () const { return ACE_LSOCK_CODgram::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h index e1c53b53129..53059e67004 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h @@ -28,7 +28,7 @@ public: private: int open (const ACE_UNIX_Addr &suad, int async = 0); - virtual int get_handle (void) const; + virtual int get_handle () const; virtual int handle_input (int fd); virtual int handle_close (int fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl index 19600242b4a..c53e6841a64 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl @@ -77,7 +77,7 @@ Handle_L_Dgram::fini (void) } ACE_INLINE int -Handle_L_Dgram::get_handle (void) const +Handle_L_Dgram::get_handle () const { return this->ACE_LSOCK_Dgram::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h index 8e9185f91da..989dd102f91 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h @@ -27,7 +27,7 @@ public: private: int open (const ACE_TCHAR *rendezvous_fifo); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl index 4ca235b3757..1684001b85f 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl @@ -77,7 +77,7 @@ Handle_L_FIFO::fini (void) } ACE_INLINE ACE_HANDLE -Handle_L_FIFO::get_handle (void) const +Handle_L_FIFO::get_handle () const { return this->ACE_FIFO::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h index 02363f695db..3e944acc5e2 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h @@ -30,7 +30,7 @@ public: private: int open (const ACE_UNIX_Addr &suap, int async = 0); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl index fd457236a5b..e9bc4503657 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl @@ -80,7 +80,7 @@ Handle_L_Pipe::fini (void) } ACE_INLINE int -Handle_L_Pipe::get_handle (void) const +Handle_L_Pipe::get_handle () const { return ACE_LSOCK_Acceptor::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h index 665b1759405..79fa31707c8 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h @@ -28,7 +28,7 @@ public: private: int open (const ACE_SPIPE_Addr &rendezvous_spipe); - virtual int get_handle (void) const; + virtual int get_handle () const; virtual int handle_input (int fd); virtual int handle_close (int fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl index 964754090c5..7981fb6519a 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl @@ -82,7 +82,7 @@ Handle_L_SPIPE::fini (void) } ACE_INLINE int -Handle_L_SPIPE::get_handle (void) const +Handle_L_SPIPE::get_handle () const { return ACE_SPIPE::get_handle(); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h index cd7ae8e7857..a56631f61e6 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h @@ -29,7 +29,7 @@ public: private: int open (const ACE_UNIX_Addr &suas, int async = 0); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl index 7dbac2b1838..4cb5b66e16e 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl @@ -92,7 +92,7 @@ Handle_L_Stream::fini (void) } ACE_INLINE ACE_HANDLE -Handle_L_Stream::get_handle (void) const +Handle_L_Stream::get_handle () const { return ACE_LSOCK_Acceptor::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h index 01da58ddbe1..6c0be72cb70 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h @@ -26,7 +26,7 @@ public: private: int open (const ACE_INET_Addr &r, int async = 0); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl index c8c1a9f2ec7..f4ac2cb07d2 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl @@ -71,7 +71,7 @@ Handle_R_Dgram::fini (void) } ACE_INLINE ACE_HANDLE -Handle_R_Dgram::get_handle (void) const +Handle_R_Dgram::get_handle () const { return ACE_SOCK_Dgram::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h index 4f9dc98c304..e192ccab1c6 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h @@ -28,7 +28,7 @@ public: private: int open (const ACE_INET_Addr &sia, int async = 0); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl index 6f5286bad5e..59582edb6a2 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl @@ -97,7 +97,7 @@ Handle_R_Stream::fini (void) } ACE_INLINE ACE_HANDLE -Handle_R_Stream::get_handle (void) const +Handle_R_Stream::get_handle () const { return ACE_SOCK_Acceptor::get_handle (); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h index 39858c7f062..5e3ddd628d2 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h @@ -24,7 +24,7 @@ public: virtual int fini (); private: - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); int count; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl index 1091d8b925f..ca8f917ad5b 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl @@ -69,7 +69,7 @@ Handle_Timeout::fini (void) } ACE_INLINE ACE_HANDLE -Handle_Timeout::get_handle (void) const +Handle_Timeout::get_handle () const { return ACE_INVALID_HANDLE; } diff --git a/ACE/examples/Shared_Malloc/test_persistence.cpp b/ACE/examples/Shared_Malloc/test_persistence.cpp index 6333a19a01d..43007928ccc 100644 --- a/ACE/examples/Shared_Malloc/test_persistence.cpp +++ b/ACE/examples/Shared_Malloc/test_persistence.cpp @@ -38,7 +38,7 @@ public: ~Employee (void) { shmem_allocator->free (this->name_); } - const char *name (void) const { return this->name_; } + const char *name () const { return this->name_; } void name (const char *name) { @@ -50,7 +50,7 @@ public: ACE_OS::strcpy (this->name_, name); } - u_long id (void) const { return id_; } + u_long id () const { return id_; } void id (u_long id) { id_ = id; } diff --git a/ACE/examples/Web_Crawler/HTTP_URL.cpp b/ACE/examples/Web_Crawler/HTTP_URL.cpp index 16cea94a372..af4d404072d 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.cpp +++ b/ACE/examples/Web_Crawler/HTTP_URL.cpp @@ -8,7 +8,7 @@ const ACE_URL_Addr & -HTTP_URL::url_addr (void) const +HTTP_URL::url_addr () const { return this->url_addr_; } diff --git a/ACE/examples/Web_Crawler/HTTP_URL.h b/ACE/examples/Web_Crawler/HTTP_URL.h index e782c274523..87ab46b56a5 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.h +++ b/ACE/examples/Web_Crawler/HTTP_URL.h @@ -50,7 +50,7 @@ public: virtual ssize_t send_request (void); /// Returns the URL that we represent. - virtual const ACE_URL_Addr &url_addr (void) const; + virtual const ACE_URL_Addr &url_addr () const; /// Commit suicide int destroy (void); diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp index f343b3e7fea..532f1b636c7 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp @@ -19,7 +19,7 @@ Mem_Map_Stream::send_n (const void *buf, size_t size, ACE_Time_Value *tv) } int -Mem_Map_Stream::eof (void) const +Mem_Map_Stream::eof () const { return this->get_pos_ >= this->end_of_mapping_plus1_; } @@ -56,7 +56,7 @@ Mem_Map_Stream::peek_char (size_t offset) } const char * -Mem_Map_Stream::recv (void) const +Mem_Map_Stream::recv () const { return this->recv_pos_; } @@ -76,7 +76,7 @@ Mem_Map_Stream::recv (size_t &len) } size_t -Mem_Map_Stream::recv_len (void) const +Mem_Map_Stream::recv_len () const { return this->get_pos_ - this->recv_pos_; } diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.h b/ACE/examples/Web_Crawler/Mem_Map_Stream.h index e421e2861c5..60a504f3b2d 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.h +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.h @@ -98,11 +98,11 @@ public: /// Returns a pointer to array of characters starting at the <recv> /// position. - virtual const char *recv (void) const; + virtual const char *recv () const; /// Returns the length in bytes between the <get> position and the /// <recv> position. - virtual size_t recv_len (void) const; + virtual size_t recv_len () const; /** * Resets the <get> and <recv> positions to the beginning of the @@ -142,7 +142,7 @@ public: virtual ACE_OFF_T seek (ACE_OFF_T offset, int whence = SEEK_CUR); /// Returns 1 if we're at the end of the HTTP stream, else 0. - virtual int eof (void) const; + virtual int eof () const; /* diff --git a/ACE/examples/Web_Crawler/Options.cpp b/ACE/examples/Web_Crawler/Options.cpp index deca0e76778..b09d892e053 100644 --- a/ACE/examples/Web_Crawler/Options.cpp +++ b/ACE/examples/Web_Crawler/Options.cpp @@ -96,60 +96,60 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } int -Options::port_no (void) const +Options::port_no () const { return this->port_no_; } int -Options::recurse (void) const +Options::recurse () const { return this->recurse_; } const ACE_Time_Value * -Options::timeout (void) const +Options::timeout () const { return &this->timeout_; } int -Options::debug (void) const +Options::debug () const { return this->debug_; } int -Options::verbose (void) const +Options::verbose () const { return this->verbose_; } const ACE_TCHAR * -Options::order (void) const +Options::order () const { return this->order_; } const ACE_TCHAR * -Options::hostname (void) const +Options::hostname () const { return this->hostname_; } const ACE_TCHAR * -Options::path_name (void) const +Options::path_name () const { return this->uri_; } const ACE_TCHAR * -Options::url_filter (void) const +Options::url_filter () const { return this->url_filter_; } Command_Processor * -Options::command_processor (void) const +Options::command_processor () const { return this->command_processor_; } @@ -161,7 +161,7 @@ Options::command_processor (Command_Processor *cp) } URL_Visitor * -Options::visitor (void) const +Options::visitor () const { return this->visitor_; } diff --git a/ACE/examples/Web_Crawler/Options.h b/ACE/examples/Web_Crawler/Options.h index 1036fa95b65..7a8b9f02f48 100644 --- a/ACE/examples/Web_Crawler/Options.h +++ b/ACE/examples/Web_Crawler/Options.h @@ -40,39 +40,39 @@ public: /// If non-0 and the link is an HTML file then recursively check all /// links that are embedded in the body of file. - int recurse (void) const; + int recurse () const; /// Return the hostname of the initial Web server. - const ACE_TCHAR *hostname (void) const; + const ACE_TCHAR *hostname () const; /// Return the initial URI. - const ACE_TCHAR *path_name (void) const; + const ACE_TCHAR *path_name () const; /// String used to filter out which URLs to validate. - const ACE_TCHAR *url_filter (void) const; + const ACE_TCHAR *url_filter () const; /// Are we debugging? - int debug (void) const; + int debug () const; /// Are we being verbose? - int verbose (void) const; + int verbose () const; /// Which order? LIFO|FIFO?? - const ACE_TCHAR *order (void) const; + const ACE_TCHAR *order () const; /// Port # - int port_no (void) const; + int port_no () const; /// Return the timeout used to prevent hanging on <recv> and /// <connect> calls to broken servers. - const ACE_Time_Value *timeout (void) const; + const ACE_Time_Value *timeout () const; // = Get/set the <Command_Processor>. - Command_Processor *command_processor (void) const; + Command_Processor *command_processor () const; void command_processor (Command_Processor *); // = Get/set the <URL_Visitor>. - URL_Visitor *visitor (void) const; + URL_Visitor *visitor () const; void visitor (URL_Visitor *); // Get the handle_limit. diff --git a/ACE/examples/Web_Crawler/URL.h b/ACE/examples/Web_Crawler/URL.h index a1fe83371ea..bbbc8b37655 100644 --- a/ACE/examples/Web_Crawler/URL.h +++ b/ACE/examples/Web_Crawler/URL.h @@ -52,7 +52,7 @@ public: virtual ssize_t send_request (void) = 0; /// Returns the URL that we represent. - virtual const ACE_URL_Addr &url_addr (void) const = 0; + virtual const ACE_URL_Addr &url_addr () const = 0; /// Returns the <Mem_Map_Stream>. virtual Mem_Map_Stream &stream (void); diff --git a/ACE/examples/Web_Crawler/URL_Addr.cpp b/ACE/examples/Web_Crawler/URL_Addr.cpp index 8dc2054a909..f7d92b2c13e 100644 --- a/ACE/examples/Web_Crawler/URL_Addr.cpp +++ b/ACE/examples/Web_Crawler/URL_Addr.cpp @@ -171,7 +171,7 @@ ACE_URL_Addr::operator= (const ACE_URL_Addr &addr) } u_long -ACE_URL_Addr::hash (void) const +ACE_URL_Addr::hash () const { u_long result = this->ACE_INET_Addr::hash () + ACE::hash_pjw (this->get_path_name ()); @@ -205,7 +205,7 @@ ACE_URL_Addr::ACE_URL_Addr (const ACE_TCHAR *host_name, } const ACE_TCHAR * -ACE_URL_Addr::get_path_name (void) const +ACE_URL_Addr::get_path_name () const { return this->path_name_; } diff --git a/ACE/examples/Web_Crawler/URL_Addr.h b/ACE/examples/Web_Crawler/URL_Addr.h index 376c0d30755..565b1d068e7 100644 --- a/ACE/examples/Web_Crawler/URL_Addr.h +++ b/ACE/examples/Web_Crawler/URL_Addr.h @@ -95,10 +95,10 @@ public: bool operator != (const ACE_URL_Addr &SAP) const; /// Computes and returns hash value. - virtual u_long hash (void) const; + virtual u_long hash () const; /// Return the path name. - const ACE_TCHAR *get_path_name (void) const; + const ACE_TCHAR *get_path_name () const; /// Commit suicide. int destroy (void); diff --git a/ACE/examples/Web_Crawler/URL_Status.cpp b/ACE/examples/Web_Crawler/URL_Status.cpp index 9ba42e9f76b..29a3d017fd8 100644 --- a/ACE/examples/Web_Crawler/URL_Status.cpp +++ b/ACE/examples/Web_Crawler/URL_Status.cpp @@ -14,7 +14,7 @@ URL_Status::URL_Status (const URL_Status &s) } URL_Status::STATUS_CODE -URL_Status::status (void) const +URL_Status::status () const { return this->status_; } diff --git a/ACE/examples/Web_Crawler/URL_Status.h b/ACE/examples/Web_Crawler/URL_Status.h index 31a7ae2d75d..08760a3ee27 100644 --- a/ACE/examples/Web_Crawler/URL_Status.h +++ b/ACE/examples/Web_Crawler/URL_Status.h @@ -47,7 +47,7 @@ public: URL_Status (STATUS_CODE = STATUS_INSUFFICIENT_DATA); URL_Status (const URL_Status &); - STATUS_CODE status (void) const; + STATUS_CODE status () const; void status (int); void status (STATUS_CODE); int destroy (void); diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp index fd8b6486e59..87c1ff3266f 100644 --- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp +++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp @@ -72,7 +72,7 @@ ACE_Client_Logging_Handler::open (void *) } /* VIRTUAL */ ACE_HANDLE -ACE_Client_Logging_Handler::get_handle (void) const +ACE_Client_Logging_Handler::get_handle () const { ACE_TRACE ("ACE_Client_Logging_Handler::get_handle"); diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.h b/ACE/netsvcs/lib/Client_Logging_Handler.h index 1bd17078bc0..3917776d05e 100644 --- a/ACE/netsvcs/lib/Client_Logging_Handler.h +++ b/ACE/netsvcs/lib/Client_Logging_Handler.h @@ -61,7 +61,7 @@ public: virtual int open (void * = 0); /// Return the handle of the IPC endpoint. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Called when object is removed from the ACE_Reactor. virtual int close (u_long); diff --git a/ACE/netsvcs/lib/Name_Handler.cpp b/ACE/netsvcs/lib/Name_Handler.cpp index d13c45f9adb..eda7174db1b 100644 --- a/ACE/netsvcs/lib/Name_Handler.cpp +++ b/ACE/netsvcs/lib/Name_Handler.cpp @@ -225,7 +225,7 @@ ACE_Name_Handler::handle_timeout (const ACE_Time_Value &, const void *) // Return the underlying ACE_HANDLE. /* VIRTUAL */ ACE_HANDLE -ACE_Name_Handler::get_handle (void) const +ACE_Name_Handler::get_handle () const { ACE_TRACE ("ACE_Name_Handler::get_handle"); return this->peer ().get_handle (); diff --git a/ACE/netsvcs/lib/Name_Handler.h b/ACE/netsvcs/lib/Name_Handler.h index 355646a741b..43a063beb9a 100644 --- a/ACE/netsvcs/lib/Name_Handler.h +++ b/ACE/netsvcs/lib/Name_Handler.h @@ -91,7 +91,7 @@ protected: // = Demultiplexing hooks. /// Return the underlying <ACE_HANDLE>. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Callback method invoked by the <ACE_Reactor> when client events /// arrive. diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp index 8b56b5f1790..82ded8f1eec 100644 --- a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp +++ b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp @@ -127,7 +127,7 @@ ACE_TS_Clerk_Handler::open (void *) } ACE_HANDLE -ACE_TS_Clerk_Handler::get_handle (void) const +ACE_TS_Clerk_Handler::get_handle () const { ACE_TRACE ("ACE_TS_Clerk_Handler::get_handle"); return this->peer().get_handle (); diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.h b/ACE/netsvcs/lib/TS_Clerk_Handler.h index d2d05c13b14..268ba5b1f08 100644 --- a/ACE/netsvcs/lib/TS_Clerk_Handler.h +++ b/ACE/netsvcs/lib/TS_Clerk_Handler.h @@ -97,7 +97,7 @@ public: virtual int open (void * = 0); /// Return the handle of the message_fifo_; - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Called when object is removed from the ACE_Reactor virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, diff --git a/ACE/netsvcs/lib/TS_Server_Handler.cpp b/ACE/netsvcs/lib/TS_Server_Handler.cpp index f3f789998b2..5844aa2eb98 100644 --- a/ACE/netsvcs/lib/TS_Server_Handler.cpp +++ b/ACE/netsvcs/lib/TS_Server_Handler.cpp @@ -167,7 +167,7 @@ ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *) // Return the underlying ACE_HANDLE. /* VIRTUAL */ ACE_HANDLE -ACE_TS_Server_Handler::get_handle (void) const +ACE_TS_Server_Handler::get_handle () const { ACE_TRACE ("ACE_TS_Server_Handler::get_handle"); return this->peer ().get_handle (); diff --git a/ACE/netsvcs/lib/TS_Server_Handler.h b/ACE/netsvcs/lib/TS_Server_Handler.h index 36c57f28a9e..14bd8d59e06 100644 --- a/ACE/netsvcs/lib/TS_Server_Handler.h +++ b/ACE/netsvcs/lib/TS_Server_Handler.h @@ -68,7 +68,7 @@ protected: // = Demultiplexing hooks. /// Return the underlying <ACE_HANDLE>. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Callback method invoked by the <ACE_Reactor> when client events /// arrive. diff --git a/ACE/netsvcs/lib/Time_Request_Reply.cpp b/ACE/netsvcs/lib/Time_Request_Reply.cpp index f23cc9d1b7a..e04d5212b8e 100644 --- a/ACE/netsvcs/lib/Time_Request_Reply.cpp +++ b/ACE/netsvcs/lib/Time_Request_Reply.cpp @@ -42,7 +42,7 @@ ACE_Time_Request::ACE_Time_Request (ACE_INT32 t, // Type of request. // Get the fixed size of message ssize_t -ACE_Time_Request::size (void) const +ACE_Time_Request::size () const { ACE_TRACE ("ACE_Time_Request::size"); return sizeof (this->transfer_); @@ -50,7 +50,7 @@ ACE_Time_Request::size (void) const // = Set/get the type of the message. ACE_INT32 -ACE_Time_Request::msg_type (void) const +ACE_Time_Request::msg_type () const { ACE_TRACE ("ACE_Time_Request::msg_type"); return this->transfer_.msg_type_; @@ -65,7 +65,7 @@ ACE_Time_Request::msg_type (ACE_INT32 t) // = Set/get the blocking semantics. ACE_UINT32 -ACE_Time_Request::block_forever (void) const +ACE_Time_Request::block_forever () const { ACE_TRACE ("ACE_Time_Request::block_forever"); return this->transfer_.block_forever_; @@ -80,7 +80,7 @@ ACE_Time_Request::block_forever (ACE_UINT32 bs) // = Set/get the timeout. ACE_Time_Value -ACE_Time_Request::timeout (void) const +ACE_Time_Request::timeout () const { ACE_TRACE ("ACE_Time_Request::timeout"); time_t sec = ACE_Utils::truncate_cast<time_t> (this->transfer_.sec_timeout_); @@ -97,7 +97,7 @@ ACE_Time_Request::timeout (const ACE_Time_Value& timeout) // = Set/get the time time_t -ACE_Time_Request::time (void) const +ACE_Time_Request::time () const { ACE_TRACE ("ACE_Time_Request::time"); return this->time_; @@ -156,7 +156,7 @@ ACE_Time_Request::decode (void) // Print out the current values of the ACE_Time_Request. void -ACE_Time_Request::dump (void) const +ACE_Time_Request::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Time_Request::dump"); diff --git a/ACE/netsvcs/lib/Time_Request_Reply.h b/ACE/netsvcs/lib/Time_Request_Reply.h index 44be414b744..3ef13b3e221 100644 --- a/ACE/netsvcs/lib/Time_Request_Reply.h +++ b/ACE/netsvcs/lib/Time_Request_Reply.h @@ -57,28 +57,28 @@ public: ACE_Time_Value *timeout = 0); // Get the fixed size of message - ssize_t size (void) const; + ssize_t size () const; /// Get the type of the message. - ACE_INT32 msg_type (void) const; + ACE_INT32 msg_type () const; /// Set the type of the message. void msg_type (ACE_INT32); /// Get the time - time_t time (void) const; + time_t time () const; // Set the time void time (time_t t); /// Get the blocking semantics. - ACE_UINT32 block_forever (void) const; + ACE_UINT32 block_forever () const; /// Set the blocking semantics. void block_forever (ACE_UINT32); /// Get the timeout. - ACE_Time_Value timeout (void) const; + ACE_Time_Value timeout () const; /// Set the timeout. void timeout (const ACE_Time_Value& timeout); diff --git a/ACE/netsvcs/lib/Token_Handler.cpp b/ACE/netsvcs/lib/Token_Handler.cpp index 36d6fa2fcba..cc7e80b1965 100644 --- a/ACE/netsvcs/lib/Token_Handler.cpp +++ b/ACE/netsvcs/lib/Token_Handler.cpp @@ -558,7 +558,7 @@ ACE_TS_Mutex::token_acquired (ACE_TPQ_Entry *e) } ACE_Token_Proxy * -ACE_TS_Mutex::clone (void) const +ACE_TS_Mutex::clone () const { ACE_TRACE ("ACE_TS_Mutex::clone"); ACE_Token_Proxy *temp; @@ -602,7 +602,7 @@ ACE_TS_RLock::token_acquired (ACE_TPQ_Entry *e) } ACE_Token_Proxy * -ACE_TS_RLock::clone (void) const +ACE_TS_RLock::clone () const { ACE_TRACE ("ACE_TS_RLock::clone"); ACE_Token_Proxy *temp; @@ -647,7 +647,7 @@ ACE_TS_WLock::token_acquired (ACE_TPQ_Entry *e) } ACE_Token_Proxy * -ACE_TS_WLock::clone (void) const +ACE_TS_WLock::clone () const { ACE_TRACE ("ACE_TS_WLock::clone"); ACE_Token_Proxy *temp; diff --git a/ACE/netsvcs/lib/Token_Handler.h b/ACE/netsvcs/lib/Token_Handler.h index 6e8a5741dba..bbfa532c8b1 100644 --- a/ACE/netsvcs/lib/Token_Handler.h +++ b/ACE/netsvcs/lib/Token_Handler.h @@ -176,7 +176,7 @@ protected: ACE_TS_Mutex (const ACE_TS_Mutex &); /// Return a deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; private: /// The Token Handler associated with this proxy. Set at @@ -211,7 +211,7 @@ protected: ACE_TS_RLock (const ACE_TS_RLock&); /// Return a deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; private: /// the Token Handler associated with this proxy. Set at @@ -246,7 +246,7 @@ protected: ACE_TS_WLock (const ACE_TS_WLock&); /// Return a deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; private: /// the Token Handler associated with this proxy. Set at diff --git a/ACE/performance-tests/Misc/basic_perf.cpp b/ACE/performance-tests/Misc/basic_perf.cpp index 47dec359719..559f6d6bcf0 100644 --- a/ACE/performance-tests/Misc/basic_perf.cpp +++ b/ACE/performance-tests/Misc/basic_perf.cpp @@ -147,7 +147,7 @@ public: virtual void run (void); - ACE_hrtime_t empty_iteration_time (void) const + ACE_hrtime_t empty_iteration_time () const { return elapsed_time_; } diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp index 783b212563d..6c11f893bb8 100644 --- a/ACE/performance-tests/TCP/tcp_test.cpp +++ b/ACE/performance-tests/TCP/tcp_test.cpp @@ -97,7 +97,7 @@ public: virtual ~Client (void); // = Override <ACE_Event_Handler> methods. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); @@ -154,7 +154,7 @@ Client::~Client (void) } ACE_HANDLE -Client::get_handle (void) const +Client::get_handle () const { return this->endpoint_.get_handle (); } @@ -295,7 +295,7 @@ public: virtual ~Server (void); // = Override <ACE_Event_Handler> methods. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); @@ -371,7 +371,7 @@ Server::~Server (void) } ACE_HANDLE -Server::get_handle (void) const +Server::get_handle () const { return this->endpoint_.get_handle (); } diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp index 3b8cec8e6cd..cb6793475ee 100644 --- a/ACE/performance-tests/UDP/udp_test.cpp +++ b/ACE/performance-tests/UDP/udp_test.cpp @@ -89,7 +89,7 @@ public: virtual ~Client (void); // = Override <ACE_Event_Handler> methods. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); @@ -141,7 +141,7 @@ Client::~Client (void) } ACE_HANDLE -Client::get_handle (void) const +Client::get_handle () const { return endpoint_.get_handle (); } @@ -472,7 +472,7 @@ public: virtual ~Server (void); // = Override <ACE_Event_Handler> methods. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); @@ -504,7 +504,7 @@ Server::~Server (void) } ACE_HANDLE -Server::get_handle (void) const +Server::get_handle () const { return endpoint_.get_handle (); } diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp index 834308692cd..910aa1a5232 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp @@ -55,7 +55,7 @@ ACE::HTBP::Addr::set_htid (const char *htid) } const char * -ACE::HTBP::Addr::get_htid (void) const +ACE::HTBP::Addr::get_htid () const { return this->htid_.c_str(); } diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h index 2cb7febf4dc..24f754703f6 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.h +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h @@ -74,7 +74,7 @@ namespace ACE int address_facmily = AF_UNSPEC); int set_htid(const char *htid); - const char *get_htid (void) const; + const char *get_htid () const; private: /// HTID - web-obtained unique-identifier diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp index 4547109ab46..b39b6976fab 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp @@ -103,7 +103,7 @@ ACE::HTBP::Channel::~Channel (void) /// Dump the state of an object. void -ACE::HTBP::Channel::dump (void) const +ACE::HTBP::Channel::dump () const { } @@ -141,7 +141,7 @@ ACE::HTBP::Channel::notifier (void) } ACE_HANDLE -ACE::HTBP::Channel::get_handle (void) const +ACE::HTBP::Channel::get_handle () const { return this->ace_stream_.get_handle (); } diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h index d473bd58e66..02c4285fa1a 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.h +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h @@ -180,16 +180,16 @@ namespace ACE ACE_ALLOC_HOOK_DECLARE; public: - Session *session (void) const; + Session *session () const; void session (Session *); Notifier *notifier (void); void register_notifier (ACE_Reactor *r); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; - const ACE_SOCK_Stream &ace_stream (void) const; + const ACE_SOCK_Stream &ace_stream () const; ACE_SOCK_Stream &ace_stream (void); ///@notes Added the following methods to continue with @@ -215,18 +215,18 @@ namespace ACE // buffer related methods. ACE_Message_Block &leftovers (void); - size_t data_len (void) const; + size_t data_len () const; void data_len (size_t n); - size_t data_consumed (void) const; + size_t data_consumed () const; void data_consumed (size_t n); int load_buffer (void); int flush_buffer (void); int recv_ack (void); int send_ack (void); unsigned long request_count(); - Filter *filter (void) const; + Filter *filter () const; void filter (Filter *); - State state (void) const; + State state () const; void state (Channel::State s); int pre_recv(void); int consume_error (void); diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.inl b/ACE/protocols/ace/HTBP/HTBP_Channel.inl index 0807c14dd96..c0ffb7ec252 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.inl +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE::HTBP::Session * -ACE::HTBP::Channel::session (void) const +ACE::HTBP::Channel::session () const { return this->session_; } @@ -22,7 +22,7 @@ ACE::HTBP::Channel::session (ACE::HTBP::Session *s) // should not be stored. ACE_INLINE ACE::HTBP::Filter * -ACE::HTBP::Channel::filter (void) const +ACE::HTBP::Channel::filter () const { return this->filter_; } @@ -60,7 +60,7 @@ ACE::HTBP::Channel::close (void) ACE_INLINE ACE::HTBP::Channel::State -ACE::HTBP::Channel::state (void) const +ACE::HTBP::Channel::state () const { return this->state_; } @@ -74,7 +74,7 @@ ACE::HTBP::Channel::leftovers (void) ACE_INLINE size_t -ACE::HTBP::Channel::data_len(void) const +ACE::HTBP::Channel::data_len() const { return this->data_len_; } @@ -88,7 +88,7 @@ ACE::HTBP::Channel::data_len(size_t n) ACE_INLINE size_t -ACE::HTBP::Channel::data_consumed(void) const +ACE::HTBP::Channel::data_consumed() const { return this->data_consumed_; } @@ -96,7 +96,7 @@ ACE::HTBP::Channel::data_consumed(void) const ACE_INLINE const ACE_SOCK_Stream& -ACE::HTBP::Channel::ace_stream (void) const +ACE::HTBP::Channel::ace_stream () const { return this->ace_stream_; } diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp index 568dd8b4b25..6caeb70eb0d 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp @@ -82,7 +82,7 @@ ACE::HTBP::Notifier::unregister (void) } ACE_HANDLE -ACE::HTBP::Notifier::get_handle(void) const +ACE::HTBP::Notifier::get_handle() const { return this->channel_->ace_stream().get_handle(); } diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.h b/ACE/protocols/ace/HTBP/HTBP_Notifier.h index 331d6dc9f00..ef17804fdcb 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Notifier.h +++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.h @@ -38,7 +38,7 @@ namespace ACE void unregister (void); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; private: Channel *channel_; diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp index 8bb83f3b66f..7f13e9ef770 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp @@ -155,7 +155,7 @@ ACE::HTBP::Session::close (void) ACE::HTBP::Channel * -ACE::HTBP::Session::outbound (void) const +ACE::HTBP::Session::outbound () const { if (!this->closed_ && this->proxy_addr_) this->reconnect(); @@ -269,13 +269,13 @@ ACE::HTBP::Session::flush_outbound_queue (void) } int -ACE::HTBP::Session::close_inbound (void) const +ACE::HTBP::Session::close_inbound () const { return this->inbound_ ? this->inbound_->close() : 0; } int -ACE::HTBP::Session::close_outbound (void) const +ACE::HTBP::Session::close_outbound () const { return this->outbound_ ? this->outbound_->close() : 0; } diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.h b/ACE/protocols/ace/HTBP/HTBP_Session.h index 7098bf0b8fa..f9edc5eb650 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.h +++ b/ACE/protocols/ace/HTBP/HTBP_Session.h @@ -99,14 +99,14 @@ namespace ACE static int find_session (const Session_Id_t&, Session *&out); - Stream *stream (void) const; + Stream *stream () const; void stream (Stream *); int enqueue (ACE_Message_Block *msg); int flush_outbound_queue (void); - int close_inbound (void) const; - int close_outbound (void) const; + int close_inbound () const; + int close_outbound () const; /// get references to the actual streams based on the direction /// of data flow if this session is on the inside of the proxy @@ -117,22 +117,22 @@ namespace ACE /// request or reply data, it uses the outbound stream, and it /// should associate an event handler with the inbound stream /// for receiving data. - Channel *inbound (void) const; - Channel *outbound (void) const; + Channel *inbound () const; + Channel *outbound () const; void inbound (Channel *); void outbound (Channel *); int enable (int value); int disable (int value); - const Session_Id_t& session_id(void) const; + const Session_Id_t& session_id() const; void session_id (ACE_UINT32 ); - const ACE_INET_Addr *proxy_addr (void) const; + const ACE_INET_Addr *proxy_addr () const; void proxy_addr (ACE_INET_Addr *, int destroy = 0); - const Addr &peer_addr (void) const; - const Addr &local_addr (void) const; + const Addr &peer_addr () const; + const Addr &local_addr () const; void peer_addr (const Addr &); void local_addr (const Addr &); @@ -145,7 +145,7 @@ namespace ACE void reactor (ACE_Reactor *); void detach (Channel *); - int sock_flags(void) const; + int sock_flags() const; private: /// Connected Stream ensures that the particular stream is diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.inl b/ACE/protocols/ace/HTBP/HTBP_Session.inl index 5cee38b71fc..fa05f2100b0 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.inl +++ b/ACE/protocols/ace/HTBP/HTBP_Session.inl @@ -33,14 +33,14 @@ ACE::HTBP::Session::outbound (ACE::HTBP::Channel *s) ACE_INLINE ACE::HTBP::Channel * -ACE::HTBP::Session::inbound (void) const +ACE::HTBP::Session::inbound () const { return this->inbound_; } ACE_INLINE const ACE::HTBP::Session_Id_t& -ACE::HTBP::Session::session_id(void) const +ACE::HTBP::Session::session_id() const { return this->session_id_; } @@ -55,21 +55,21 @@ ACE::HTBP::Session::session_id (ACE_UINT32 id) ACE_INLINE const ACE_INET_Addr * -ACE::HTBP::Session::proxy_addr (void) const +ACE::HTBP::Session::proxy_addr () const { return this->proxy_addr_; } ACE_INLINE const ACE::HTBP::Addr & -ACE::HTBP::Session::peer_addr (void) const +ACE::HTBP::Session::peer_addr () const { return this->session_id_.peer_; } ACE_INLINE const ACE::HTBP::Addr & -ACE::HTBP::Session::local_addr (void) const +ACE::HTBP::Session::local_addr () const { return this->session_id_.local_; } @@ -86,7 +86,7 @@ ACE::HTBP::Session::proxy_addr (ACE_INET_Addr *pa, int destroy) ACE_INLINE int -ACE::HTBP::Session::sock_flags (void) const +ACE::HTBP::Session::sock_flags () const { return this->sock_flags_; } diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp index 77e7a3415b0..a371cfc68d4 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp @@ -34,7 +34,7 @@ ACE::HTBP::Stream::~Stream (void) /// Dump the state of an object. void -ACE::HTBP::Stream::dump (void) const +ACE::HTBP::Stream::dump () const { } @@ -329,7 +329,7 @@ ACE::HTBP::Stream::get_remote_addr (ACE::HTBP::Addr &peer_addr) const } ACE::HTBP::Session * -ACE::HTBP::Stream::session (void) const +ACE::HTBP::Stream::session () const { return this->session_; } @@ -344,7 +344,7 @@ ACE::HTBP::Stream::session (ACE::HTBP::Session *s) ACE_HANDLE -ACE::HTBP::Stream::get_handle (void) const +ACE::HTBP::Stream::get_handle () const { return ACE_INVALID_HANDLE; } diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.h b/ACE/protocols/ace/HTBP/HTBP_Stream.h index 5289e2577c5..e6f5f3a7ca1 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.h +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.h @@ -238,9 +238,9 @@ namespace ACE /// future. - Priyanka /// {@ void set_handle (ACE_HANDLE h); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; - Session *session (void) const; + Session *session () const; void session (Session *s); /** diff --git a/ACE/protocols/ace/INet/ConnectionCache.cpp b/ACE/protocols/ace/INet/ConnectionCache.cpp index 8de43f7f9ac..064baaf346b 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.cpp +++ b/ACE/protocols/ace/INet/ConnectionCache.cpp @@ -73,7 +73,7 @@ namespace ACE return *this; } - u_long ConnectionCacheKey::hash (void) const + u_long ConnectionCacheKey::hash () const { return this->key_ ? this->key ().hash () : 0; } diff --git a/ACE/protocols/ace/INet/HTTPS_Context.h b/ACE/protocols/ace/INet/HTTPS_Context.h index 8eb511d9b33..41e46cde316 100644 --- a/ACE/protocols/ace/INet/HTTPS_Context.h +++ b/ACE/protocols/ace/INet/HTTPS_Context.h @@ -48,13 +48,13 @@ namespace ACE ~Context (); - operator bool (void) const; + operator bool () const; - bool operator ! (void) const; + bool operator ! () const; ACE_SSL_Context& ssl_context (void); - const ACE_SSL_Context& ssl_context (void) const; + const ACE_SSL_Context& ssl_context () const; bool use_default_ca (); diff --git a/ACE/protocols/ace/INet/HTTPS_Context.inl b/ACE/protocols/ace/INet/HTTPS_Context.inl index 16d07bac2bc..98c2e3ca271 100644 --- a/ACE/protocols/ace/INet/HTTPS_Context.inl +++ b/ACE/protocols/ace/INet/HTTPS_Context.inl @@ -7,13 +7,13 @@ namespace ACE { ACE_INLINE - Context::operator bool (void) const + Context::operator bool () const { return this->ssl_ctx_ != 0; } ACE_INLINE - bool Context::operator ! (void) const + bool Context::operator ! () const { return this->ssl_ctx_ == 0; } @@ -25,7 +25,7 @@ namespace ACE } ACE_INLINE - const ACE_SSL_Context& Context::ssl_context (void) const + const ACE_SSL_Context& Context::ssl_context () const { return *this->ssl_ctx_; } diff --git a/ACE/protocols/ace/INet/HeaderBase.h b/ACE/protocols/ace/INet/HeaderBase.h index b71eeb9fc69..ed1c26317ac 100644 --- a/ACE/protocols/ace/INet/HeaderBase.h +++ b/ACE/protocols/ace/INet/HeaderBase.h @@ -46,11 +46,11 @@ namespace ACE bool operator ==(const NVPair& pair) const; bool operator <(const NVPair& pair) const; - const ACE_CString& first (void) const; + const ACE_CString& first () const; void first (const ACE_CString& t1); - const ACE_CString& second (void) const; + const ACE_CString& second () const; void second (const ACE_CString& t2); diff --git a/ACE/protocols/ace/INet/HeaderBase.inl b/ACE/protocols/ace/INet/HeaderBase.inl index 3a0f57f17bd..fee02f025b1 100644 --- a/ACE/protocols/ace/INet/HeaderBase.inl +++ b/ACE/protocols/ace/INet/HeaderBase.inl @@ -124,7 +124,7 @@ namespace ACE } ACE_INLINE - const ACE_CString& NVPair::first (void) const + const ACE_CString& NVPair::first () const { return this->first_; } @@ -136,7 +136,7 @@ namespace ACE } ACE_INLINE - const ACE_CString& NVPair::second (void) const + const ACE_CString& NVPair::second () const { return this->second_; } diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp index 6236d229d83..834345bb963 100644 --- a/ACE/tests/FlReactor_Test.cpp +++ b/ACE/tests/FlReactor_Test.cpp @@ -45,7 +45,7 @@ public: Test_Window (int x, int y, int w, int h, const char * l = 0); - int sides (void) const; + int sides () const; void sides (int s); void incr_sides (void); @@ -65,7 +65,7 @@ Test_Window::Test_Window (int x, int y, } int -Test_Window::sides (void) const +Test_Window::sides () const { return this->sides_; } diff --git a/ACE/tests/Message_Queue_Test_Ex.h b/ACE/tests/Message_Queue_Test_Ex.h index cf2417410c6..bee0a36c50f 100644 --- a/ACE/tests/Message_Queue_Test_Ex.h +++ b/ACE/tests/Message_Queue_Test_Ex.h @@ -33,7 +33,7 @@ public: ~User_Class (void) { delete [] this->message_; } - const char *message (void) const + const char *message () const { return this->message_; } diff --git a/ACE/tests/Network_Adapters_Test.h b/ACE/tests/Network_Adapters_Test.h index 20fa181c299..4fe8cf6dbe0 100644 --- a/ACE/tests/Network_Adapters_Test.h +++ b/ACE/tests/Network_Adapters_Test.h @@ -92,7 +92,7 @@ public: ACE_Addr const & local_addr = ACE_Addr::sap_any); /// Returns reference to the ACE::Ping_Socket. Necessary for ACE_Reactor. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /** * Takes care of the input. Reads the incoming ICMP datagrams and diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp index 819413a431e..b85526f970e 100644 --- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp +++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp @@ -268,7 +268,7 @@ public: int write (ACE_Message_Block &mb, size_t bytes_to_write); //FUZZ: enable check_for_lack_ACE_OS - int safe_to_delete (void) const; + int safe_to_delete () const; private: mutable ACE_SYNCH_RECURSIVE_MUTEX mtx_; @@ -528,7 +528,7 @@ Server_Service_Handler::write (ACE_Message_Block &mb, size_t bytes_to_write) } int -Server_Service_Handler::safe_to_delete (void) const +Server_Service_Handler::safe_to_delete () const { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); @@ -560,7 +560,7 @@ public: virtual void handle_accept (const ACE_Asynch_Accept::Result &result); - int safe_to_delete (void) const; + int safe_to_delete () const; void prepare_for_connection (Server_Service_Handler *service_handler); @@ -605,7 +605,7 @@ Acceptor::cancel (void) } int -Acceptor::safe_to_delete (void) const +Acceptor::safe_to_delete () const { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); return (this->cancel_flag_ != 0 && this->accept_cnt_ == 0) ? 1 : 0; @@ -707,13 +707,13 @@ public: int write (ACE_Message_Block &mb, size_t bytes_to_write); //FUZZ: enable check_for_lack_ACE_OS - int safe_to_delete (void) const; + int safe_to_delete () const; int wait_for_external_write_queue (ACE_Time_Value *wait_time); int wait_for_read_completed (ACE_Time_Value *wait_time); - int read_successful (void) const; + int read_successful () const; private: mutable ACE_SYNCH_RECURSIVE_MUTEX mtx_; @@ -989,7 +989,7 @@ Client_Service_Handler::write (ACE_Message_Block &mb, size_t bytes_to_write) } int -Client_Service_Handler::safe_to_delete (void) const +Client_Service_Handler::safe_to_delete () const { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); @@ -1011,7 +1011,7 @@ Client_Service_Handler::wait_for_read_completed (ACE_Time_Value *wait_time) } int -Client_Service_Handler::read_successful (void) const +Client_Service_Handler::read_successful () const { return this->read_successful_; } @@ -1040,7 +1040,7 @@ public: const ACE_INET_Addr &remote, const ACE_INET_Addr& local); - int safe_to_delete (void) const; + int safe_to_delete () const; void prepare_for_connection (Client_Service_Handler *service_handler); @@ -1122,7 +1122,7 @@ Connector::make_handler (void) } int -Connector::safe_to_delete (void) const +Connector::safe_to_delete () const { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); diff --git a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp index 6e3271b3c93..3bfe9271e7f 100644 --- a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp +++ b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp @@ -96,7 +96,7 @@ public: //FUZZ: enable check_for_lack_ACE_OS // Get the I/O handle. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; // Called when a new connection is ready to accept. virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); @@ -409,7 +409,7 @@ Server_Acceptor::open (const ACE_INET_Addr &listen_addr) } ACE_HANDLE -Server_Acceptor::get_handle (void) const +Server_Acceptor::get_handle () const { return this->acceptor_.get_handle (); } diff --git a/ACE/tests/STL_algorithm_Test_T.cpp b/ACE/tests/STL_algorithm_Test_T.cpp index 29e34919c26..5c9b99cfe68 100644 --- a/ACE/tests/STL_algorithm_Test_T.cpp +++ b/ACE/tests/STL_algorithm_Test_T.cpp @@ -27,7 +27,7 @@ public: return *this; } - typename T::difference_type get_count (void) const + typename T::difference_type get_count () const { return this->count_; } diff --git a/ACE/websvcs/lib/URL_Addr.h b/ACE/websvcs/lib/URL_Addr.h index 8d0a9009e77..a3e2ba7ba40 100644 --- a/ACE/websvcs/lib/URL_Addr.h +++ b/ACE/websvcs/lib/URL_Addr.h @@ -46,7 +46,7 @@ public: virtual ~ACE_URL_Addr (void); /// Get the original URL - const ACE_TCHAR *get_url (void) const; + const ACE_TCHAR *get_url () const; /// Essentially the copy constructor. int set (const ACE_URL_Addr& address); @@ -79,7 +79,7 @@ public: static int known_scheme (const ACE_TCHAR *url); /// Hash function - u_long hash (void) const; + u_long hash () const; protected: /// Allows the derived classes to store the compact representation of @@ -191,19 +191,19 @@ public: * URL can be can be refering to an hostname that cannot be * validated at this point. */ - ACE_INET_Addr get_inet_address (void) const; + ACE_INET_Addr get_inet_address () const; /// Get the name of the host. - const ACE_TCHAR *get_hostname (void) const; + const ACE_TCHAR *get_hostname () const; /// Get the port number. - u_short get_port_number (void) const; + u_short get_port_number () const; /// Get the path component in the URL - const ACE_TCHAR *get_path (void) const; + const ACE_TCHAR *get_path () const; /// Get the query component in the URL - const ACE_TCHAR *get_query (void) const; + const ACE_TCHAR *get_query () const; /** * Create an address from a (possibly) relative URL, such as @@ -290,20 +290,20 @@ public: virtual ~ACE_FTP_Addr (void); /// Get the host name component in the URL - const ACE_TCHAR *get_hostname (void) const; + const ACE_TCHAR *get_hostname () const; /// Get the username component in the URL - const ACE_TCHAR *get_user (void) const; + const ACE_TCHAR *get_user () const; /// Get the password component in the URL - const ACE_TCHAR *get_passwd (void) const; + const ACE_TCHAR *get_passwd () const; /// Get the path component in the URL - const ACE_TCHAR *get_path (void) const; + const ACE_TCHAR *get_path () const; /// Obtain the INET_Address implicit in the URL, can be used to /// obtain the host and the port. - ACE_INET_Addr get_inet_address (void) const; + ACE_INET_Addr get_inet_address () const; // = The ACE_Addr methods, see the documentation above. virtual int string_to_addr (const ACE_TCHAR *address); @@ -370,13 +370,13 @@ public: virtual ~ACE_Mailto_Addr (void); /// Get the username component in the URL - const ACE_TCHAR *get_user (void) const; + const ACE_TCHAR *get_user () const; /// Get the hostname component in the URL - const ACE_TCHAR *get_hostname (void) const; + const ACE_TCHAR *get_hostname () const; /// Get the headers as a single string - const ACE_TCHAR *get_headers (void) const; + const ACE_TCHAR *get_headers () const; // @@ TODO A mailto: URL can contain multiple headers, an iterator // over them would be a good idea. Similarly a method to *add* diff --git a/ACE/websvcs/lib/URL_Addr.inl b/ACE/websvcs/lib/URL_Addr.inl index 9a808e0fa7f..8eff186e66f 100644 --- a/ACE/websvcs/lib/URL_Addr.inl +++ b/ACE/websvcs/lib/URL_Addr.inl @@ -21,7 +21,7 @@ ACE_URL_Addr::operator= (const ACE_URL_Addr& address) } ACE_INLINE const ACE_TCHAR * -ACE_URL_Addr::get_url (void) const +ACE_URL_Addr::get_url () const { return this->url_; } @@ -33,7 +33,7 @@ ACE_URL_Addr::set_url (ACE_TCHAR *url) } ACE_INLINE u_long -ACE_URL_Addr::hash (void) const +ACE_URL_Addr::hash () const { return ACE::hash_pjw (this->url_); } @@ -51,31 +51,31 @@ ACE_HTTP_Addr::operator= (const ACE_HTTP_Addr& rhs) } ACE_INLINE ACE_INET_Addr -ACE_HTTP_Addr::get_inet_address (void) const +ACE_HTTP_Addr::get_inet_address () const { return ACE_INET_Addr (this->port_number_, this->hostname_); } ACE_INLINE const ACE_TCHAR * -ACE_HTTP_Addr::get_hostname (void) const +ACE_HTTP_Addr::get_hostname () const { return this->hostname_; } ACE_INLINE u_short -ACE_HTTP_Addr::get_port_number (void) const +ACE_HTTP_Addr::get_port_number () const { return this->port_number_; } ACE_INLINE const ACE_TCHAR * -ACE_HTTP_Addr::get_path (void) const +ACE_HTTP_Addr::get_path () const { return this->path_; } ACE_INLINE const ACE_TCHAR * -ACE_HTTP_Addr::get_query (void) const +ACE_HTTP_Addr::get_query () const { return this->query_; } @@ -93,31 +93,31 @@ ACE_FTP_Addr::operator= (const ACE_FTP_Addr& rhs) } ACE_INLINE const ACE_TCHAR * -ACE_FTP_Addr::get_user (void) const +ACE_FTP_Addr::get_user () const { return this->user_; } ACE_INLINE const ACE_TCHAR * -ACE_FTP_Addr::get_hostname (void) const +ACE_FTP_Addr::get_hostname () const { return this->hostname_; } ACE_INLINE const ACE_TCHAR * -ACE_FTP_Addr::get_passwd (void) const +ACE_FTP_Addr::get_passwd () const { return this->password_; } ACE_INLINE const ACE_TCHAR * -ACE_FTP_Addr::get_path (void) const +ACE_FTP_Addr::get_path () const { return this->path_; } ACE_INLINE ACE_INET_Addr -ACE_FTP_Addr::get_inet_address (void) const +ACE_FTP_Addr::get_inet_address () const { return ACE_INET_Addr (ACE_TEXT ("ftp"), this->hostname_); } @@ -135,19 +135,19 @@ ACE_Mailto_Addr::operator= (const ACE_Mailto_Addr& rhs) } ACE_INLINE const ACE_TCHAR * -ACE_Mailto_Addr::get_user (void) const +ACE_Mailto_Addr::get_user () const { return this->user_; } ACE_INLINE const ACE_TCHAR * -ACE_Mailto_Addr::get_hostname (void) const +ACE_Mailto_Addr::get_hostname () const { return this->hostname_; } ACE_INLINE const ACE_TCHAR * -ACE_Mailto_Addr::get_headers (void) const +ACE_Mailto_Addr::get_headers () const { return this->headers_; } diff --git a/TAO/docs/transport_current/index.html b/TAO/docs/transport_current/index.html index c2e484d7e5f..0bedc8fa041 100644 --- a/TAO/docs/transport_current/index.html +++ b/TAO/docs/transport_current/index.html @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- --> @@ -429,15 +429,15 @@ information about how a transport is used: Stats (); void messages_sent (size_t message_length); - CORBA::LongLong messages_sent (void) const; - CORBA::LongLong bytes_sent (void) const; + CORBA::LongLong messages_sent () const; + CORBA::LongLong bytes_sent () const; void messages_received (size_t message_length); - CORBA::LongLong messages_received (void) const; - CORBA::LongLong bytes_received (void) const; + CORBA::LongLong messages_received () const; + CORBA::LongLong bytes_received () const; void opened_since (const ACE_Time_Value& tv); - const ACE_Time_Value& opened_since (void) const; + const ACE_Time_Value& opened_since () const; private: CORBA::LongLong messages_rcvd_; // 32bits not enough (?) diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index e82cacb225d..6d93850e49f 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -341,7 +341,7 @@ Consumer_Handler::run (void) } ACE_Reactor * -Consumer_Handler::reactor_used (void) const +Consumer_Handler::reactor_used () const { return this->orb_->orb_core ()->reactor (); } diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h index c21f2fbbb44..de5d729bc63 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.h +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h @@ -72,7 +72,7 @@ public: Callback_Quoter::Consumer_var consumer_var_; /// This method gives the reactor pointer. - ACE_Reactor* reactor_used (void) const; + ACE_Reactor* reactor_used () const; /// Flag which notes whether the consumer has got registered with the /// Notifier-server. diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index fb6ed593ca4..7e48e7d3af4 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -299,7 +299,7 @@ Supplier::init (int argc, ACE_TCHAR **argv) } ACE_Reactor* -Supplier::reactor_used (void) const +Supplier::reactor_used () const { return ACE_Reactor::instance (); } diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h index 123a323661b..3af4b7fefe1 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.h +++ b/TAO/examples/Callback_Quoter/Supplier_i.h @@ -71,7 +71,7 @@ private: int via_naming_service(void); /// returns the TAO instance of the singleton Reactor. - ACE_Reactor *reactor_used (void) const; + ACE_Reactor *reactor_used () const; /// This method used for getting stock information from a file. int read_file (ACE_TCHAR *filename); diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp index d85c1eafab3..4e90faf42b0 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.cpp +++ b/TAO/orbsvcs/IFR_Service/be_global.cpp @@ -35,7 +35,7 @@ BE_GlobalData::~BE_GlobalData (void) } bool -BE_GlobalData::removing (void) const +BE_GlobalData::removing () const { return this->removing_; } @@ -47,7 +47,7 @@ BE_GlobalData::removing (bool value) } CORBA::ORB_ptr -BE_GlobalData::orb (void) const +BE_GlobalData::orb () const { return this->orb_.in (); } @@ -59,7 +59,7 @@ BE_GlobalData::orb (CORBA::ORB_ptr orb) } CORBA::Repository_ptr -BE_GlobalData::repository (void) const +BE_GlobalData::repository () const { return this->repository_.in (); } @@ -82,7 +82,7 @@ BE_GlobalData::destroy (void) } const char * -BE_GlobalData::filename (void) const +BE_GlobalData::filename () const { return this->filename_; } @@ -94,7 +94,7 @@ BE_GlobalData::filename (char *fname) } bool -BE_GlobalData::enable_locking (void) const +BE_GlobalData::enable_locking () const { return this->enable_locking_; } @@ -106,7 +106,7 @@ BE_GlobalData::enable_locking (bool value) } bool -BE_GlobalData::do_included_files (void) const +BE_GlobalData::do_included_files () const { return this->do_included_files_; } @@ -130,7 +130,7 @@ BE_GlobalData::allow_duplicate_typedefs (bool val) } ACE_CString -BE_GlobalData::orb_args (void) const +BE_GlobalData::orb_args () const { return this->orb_args_; } diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h index 74a71bc3b20..7ad1bb1abf7 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.h +++ b/TAO/orbsvcs/IFR_Service/be_global.h @@ -45,13 +45,13 @@ public: // Data accessors. - bool removing (void) const; + bool removing () const; void removing (bool value); - CORBA::ORB_ptr orb (void) const; + CORBA::ORB_ptr orb () const; void orb (CORBA::ORB_ptr orb); - CORBA::Repository_ptr repository (void) const; + CORBA::Repository_ptr repository () const; void repository (CORBA::Repository_ptr repo); ACE_Unbounded_Stack<CORBA::Container_ptr> &ifr_scopes (void); @@ -59,19 +59,19 @@ public: /// Cleanup function. void destroy (void); - const char *filename (void) const; + const char *filename () const; void filename (char *fname); - bool enable_locking (void) const; + bool enable_locking () const; void enable_locking (bool value); - bool do_included_files (void) const; + bool do_included_files () const; void do_included_files (bool val); bool allow_duplicate_typedefs () const; void allow_duplicate_typedefs (bool val); - ACE_CString orb_args (void) const; + ACE_CString orb_args () const; void orb_args (const ACE_CString& args); /// Command line passed to ACE_Process::spawn. Different diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index e1bc9432a95..2a622afb5af 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -418,7 +418,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) } CORBA::IDLType_ptr -ifr_adding_visitor_exception::ir_current (void) const +ifr_adding_visitor_exception::ir_current () const { return this->ir_current_.in (); } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h index a667d6a6b5b..45c4ceb6d74 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h @@ -54,7 +54,7 @@ public: virtual int visit_union (AST_Union *node); /// Lets the visitor one level above acess this value. - virtual CORBA::IDLType_ptr ir_current (void) const; + virtual CORBA::IDLType_ptr ir_current () const; private: /// Common code called whether we are creating a new exception diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp index 19227166b8e..234142c65cf 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -383,7 +383,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) } CORBA::IDLType_ptr -ifr_adding_visitor_structure::ir_current (void) const +ifr_adding_visitor_structure::ir_current () const { return this->ir_current_.in (); } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h index bbb2dca51eb..10609bf9939 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h @@ -41,7 +41,7 @@ public: virtual int visit_union (AST_Union *node); /// Lets the visitor one level above acess this value. - virtual CORBA::IDLType_ptr ir_current (void) const; + virtual CORBA::IDLType_ptr ir_current () const; private: /// Common code called whether we are creating a new struct diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp index 37915ca0a5f..4f7015b2fa6 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp @@ -459,7 +459,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) } CORBA::IDLType_ptr -ifr_adding_visitor_union::ir_current (void) const +ifr_adding_visitor_union::ir_current () const { return this->ir_current_.in (); } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h index 4235eb5b635..747fb2e7628 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h @@ -41,7 +41,7 @@ public: virtual int visit_union (AST_Union *node); /// Lets the visitor one level above acess this value. - virtual CORBA::IDLType_ptr ir_current (void) const; + virtual CORBA::IDLType_ptr ir_current () const; private: /// Common code called whether we are creating a new union diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp index bccf3878e6f..f7a0750d2cc 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp @@ -346,7 +346,7 @@ ifr_visitor::visit_fixed (AST_Fixed *node) } ACE_Lock & -ifr_visitor::lock (void) const +ifr_visitor::lock () const { return *this->lock_; } diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h index e8d955df2e6..99b48ca2a99 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h +++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h @@ -89,7 +89,7 @@ public: virtual int visit_param_holder (AST_Param_Holder *node); /// Accessor for our lock. - ACE_Lock &lock (void) const; + ACE_Lock &lock () const; protected: // Not abstract but we want to force subclassing anyway. diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index dcae5824b66..1a3ee36d37a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -230,7 +230,7 @@ Activator_Options::init_from_registry (void) } void -Activator_Options::print_usage (void) const +Activator_Options::print_usage () const { ORBSVCS_ERROR ((LM_ERROR, "Usage:\n" @@ -393,67 +393,67 @@ Activator_Options::load_registry_options () } bool -Activator_Options::service (void) const +Activator_Options::service () const { return this->service_; } bool -Activator_Options::notify_imr (void) const +Activator_Options::notify_imr () const { return this->notify_imr_; } unsigned int -Activator_Options::induce_delay (void) const +Activator_Options::induce_delay () const { return this->induce_delay_; } unsigned int -Activator_Options::debug (void) const +Activator_Options::debug () const { return this->debug_; } const ACE_TString& -Activator_Options::ior_filename (void) const +Activator_Options::ior_filename () const { return this->ior_output_file_; } Activator_Options::SERVICE_COMMAND -Activator_Options::service_command (void) const +Activator_Options::service_command () const { return this->service_command_; } const char* -Activator_Options::cmdline (void) const +Activator_Options::cmdline () const { return this->cmdline_.c_str (); } const ACE_CString& -Activator_Options::name (void) const +Activator_Options::name () const { return this->name_; } int -Activator_Options::env_buf_len (void) const +Activator_Options::env_buf_len () const { return this->env_buf_len_; } int -Activator_Options::max_env_vars (void) const +Activator_Options::max_env_vars () const { return this->max_env_vars_; } bool -Activator_Options::detach_child (void) const +Activator_Options::detach_child () const { return this->detach_child_; } diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h index e68d48075fc..6149c8f469d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h @@ -54,44 +54,44 @@ public: int init_from_registry(); /// Service Mode - bool service (void) const; + bool service () const; /// Notify the ImR when server processes die. /// @note Currently this only works on Unix. - bool notify_imr (void) const; + bool notify_imr () const; /// When notifying of child death, pause this number of milliseconds /// to simulate a heavily loaded server. - unsigned int induce_delay (void) const; + unsigned int induce_delay () const; /// Debug level for the Implementation Repository. - unsigned int debug (void) const; + unsigned int debug () const; /// Returns the file where the IOR should be stored. - const ACE_TString& ior_filename (void) const; + const ACE_TString& ior_filename () const; /// The nt service command to run (install/remove) - SERVICE_COMMAND service_command(void) const; + SERVICE_COMMAND service_command() const; /// Save the command line arguments as registry settings. (Windows only) int save_registry_options (); - const char* cmdline(void) const; + const char* cmdline() const; - const ACE_CString& name(void) const; + const ACE_CString& name() const; - int env_buf_len (void) const; + int env_buf_len () const; - int max_env_vars (void) const; + int max_env_vars () const; - bool detach_child (void) const; + bool detach_child () const; private: /// Parses and pulls out arguments for the ImR int parse_args (int &argc, ACE_TCHAR *argv[]); /// Print the usage information. - void print_usage (void) const; + void print_usage () const; /// Loads options from the registry int load_registry_options (); diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index 513f5d2e2de..75a1cf2ce32 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -51,14 +51,14 @@ AsyncAccessManager::started_running (void) } bool -AsyncAccessManager::is_terminating (void) const +AsyncAccessManager::is_terminating () const { return this->status_ == ImplementationRepository::AAM_ACTIVE_TERMINATE || remove_on_death_rh_ != 0; } bool -AsyncAccessManager::is_running (void) const +AsyncAccessManager::is_running () const { if (this->info_->is_mode (ImplementationRepository::PER_CLIENT)) { @@ -392,7 +392,7 @@ AsyncAccessManager::status_name (ImplementationRepository::AAM_Status s) } ImplementationRepository::AAM_Status -AsyncAccessManager::status (void) const +AsyncAccessManager::status () const { return this->status_; } diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h index f5fa9b4d8ef..dc2d5716bf6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h @@ -58,13 +58,13 @@ class Locator_Export AsyncAccessManager void started_running (void); - bool is_terminating (void) const; - bool is_running (void) const; + bool is_terminating () const; + bool is_running () const; bool has_server (const char *name) const; void remote_state (ImplementationRepository::AAM_Status s); void add_interest (ImR_ResponseHandler *rh, bool manual); - ImplementationRepository::AAM_Status status (void) const; + ImplementationRepository::AAM_Status status () const; bool force_remove_rh (ImR_ResponseHandler *rh); void activator_replied_start_running (bool success, int pid); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 83356ae9f9b..d9cf14c4a7d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -354,7 +354,7 @@ ImR_Locator_i::shutdown (bool wait_for_completion) } const Options * -ImR_Locator_i::opts (void) const +ImR_Locator_i::opts () const { return this->opts_; } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h index f0c363f4c96..abc250a2aa1 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h @@ -59,7 +59,7 @@ public: void shutdown (bool wait_for_completion); /// Access the options - const Options *opts (void) const; + const Options *opts () const; static int debug (void); // Note : See the IDL for descriptions of the operations. diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index 310e331b8a5..a9684eabc99 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -21,7 +21,7 @@ LiveListener::~LiveListener (void) } const char * -LiveListener::server (void) const +LiveListener::server () const { return this->server_.c_str (); } @@ -96,7 +96,7 @@ LiveEntry::set_reping_limit (int max) } bool -LiveEntry::reping_available (void) const +LiveEntry::reping_available () const { return this->repings_ < this->max_retry_; } @@ -218,7 +218,7 @@ LiveEntry::reset_status (void) } LiveStatus -LiveEntry::status (void) const +LiveEntry::status () const { if (!this->may_ping_) { @@ -308,13 +308,13 @@ LiveEntry::status (LiveStatus l) } const ACE_Time_Value & -LiveEntry::next_check (void) const +LiveEntry::next_check () const { return this->next_check_; } const char * -LiveEntry::server_name (void) const +LiveEntry::server_name () const { return this->server_.c_str(); } @@ -326,13 +326,13 @@ LiveEntry::set_pid (int pid) } int -LiveEntry::pid (void) const +LiveEntry::pid () const { return this->pid_; } bool -LiveEntry::may_ping (void) const +LiveEntry::may_ping () const { return this->may_ping_; } @@ -685,7 +685,7 @@ LC_TimeoutGuard::~LC_TimeoutGuard (void) } } -bool LC_TimeoutGuard::blocked (void) const +bool LC_TimeoutGuard::blocked () const { return this->blocked_; } @@ -757,7 +757,7 @@ LiveCheck::shutdown (void) } const ACE_Time_Value & -LiveCheck::ping_interval (void) const +LiveCheck::ping_interval () const { return this->ping_interval_; } diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h index 4d0602ddfca..610b942a4ed 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h @@ -83,7 +83,7 @@ class Locator_Export LiveListener virtual bool status_changed (LiveStatus status) = 0; /// Accessor for the server name. Used by the LiveCheck to associate a listener - const char *server (void) const; + const char *server () const; LiveListener *_add_ref (void); void _remove_ref (void); @@ -121,7 +121,7 @@ class Locator_Export LiveEntry void release_callback (void); void add_listener (LiveListener *ll); void remove_listener (LiveListener *ll); - LiveStatus status (void) const; + LiveStatus status () const; void status (LiveStatus l); void reset_status (void); @@ -131,16 +131,16 @@ class Locator_Export LiveEntry void update_listeners (void); bool validate_ping (bool &want_reping, ACE_Time_Value &next); void do_ping (PortableServer::POA_ptr poa); - const ACE_Time_Value &next_check (void) const; + const ACE_Time_Value &next_check () const; static void set_reping_limit (int max); - bool reping_available (void) const; + bool reping_available () const; int next_reping (void); void max_retry_msec (int max); - const char *server_name (void) const; + const char *server_name () const; void set_pid (int pid); bool has_pid (int pid) const; - int pid (void) const; - bool may_ping (void) const; + int pid () const; + bool may_ping () const; private: LiveCheck *owner_; @@ -225,7 +225,7 @@ class Locator_Export LC_TimeoutGuard ~LC_TimeoutGuard (void); /// Returns true if the in handle timeout in the owner was already set. - bool blocked (void) const; + bool blocked () const; private: LiveCheck *owner_; @@ -272,7 +272,7 @@ class Locator_Export LiveCheck : public ACE_Event_Handler void remove_listener (LiveListener *listener); bool schedule_ping (LiveEntry *entry); LiveStatus is_alive (const char *server); - const ACE_Time_Value &ping_interval (void) const; + const ACE_Time_Value &ping_interval () const; private: void enter_handle_timeout (void); diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 51667657123..ae17ac4ad0a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -367,7 +367,7 @@ Options::init_from_registry (void) void -Options::print_usage (void) const +Options::print_usage () const { ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Usage:\n") @@ -666,71 +666,71 @@ Options::load_registry_options () } bool -Options::service (void) const +Options::service () const { return this->service_; } unsigned int -Options::debug (void) const +Options::debug () const { return this->debug_; } const ACE_TString& -Options::ior_filename (void) const +Options::ior_filename () const { return this->ior_output_file_; } bool -Options::multicast (void) const +Options::multicast () const { return this->multicast_; } Options::SERVICE_COMMAND -Options::service_command(void) const +Options::service_command() const { return this->service_command_; } const char* -Options::cmdline(void) const { +Options::cmdline() const { return this->cmdline_.c_str (); } const ACE_TString& -Options::persist_file_name(void) const { +Options::persist_file_name() const { return this->persist_file_name_; } ACE_Time_Value -Options::startup_timeout (void) const +Options::startup_timeout () const { return this->startup_timeout_; } bool -Options::ping_external (void) const +Options::ping_external () const { return this->ping_external_; } ACE_Time_Value -Options::ping_interval (void) const +Options::ping_interval () const { return this->ping_interval_; } ACE_Time_Value -Options::ping_timeout (void) const +Options::ping_timeout () const { return this->ping_timeout_; } LiveCheck * -Options::pinger (void) const +Options::pinger () const { return this->pinger_; } @@ -742,55 +742,55 @@ Options::pinger (LiveCheck *p) } Options::RepoMode -Options::repository_mode (void) const +Options::repository_mode () const { return this->repo_mode_; } bool -Options::repository_erase (void) const +Options::repository_erase () const { return this->erase_repo_; } bool -Options::readonly (void) const +Options::readonly () const { return this->readonly_; } bool -Options::unregister_if_address_reused (void) const +Options::unregister_if_address_reused () const { return this->unregister_if_address_reused_; } bool -Options::lockout (void) const +Options::lockout () const { return this->lockout_; } bool -Options::throw_shutdown_exceptions (void) const +Options::throw_shutdown_exceptions () const { return this->throw_shutdown_exceptions_; } Options::ImrType -Options::imr_type (void) const +Options::imr_type () const { return this->imr_type_; } const ACE_CString & -Options::ft_endpoint (void) const +Options::ft_endpoint () const { return this->ft_endpoint_; } ACE_Time_Value -Options::ft_update_delay (void) const +Options::ft_update_delay () const { return this->ft_update_delay_; } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h index 0000bb2bc7b..ce0cb52bef6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h @@ -49,30 +49,30 @@ public: int init_from_registry(); /// Service Mode - bool service (void) const; + bool service () const; /// Debug level for the Implementation Repository. - unsigned int debug (void) const; + unsigned int debug () const; /// Returns the file where the IOR should be stored. - const ACE_TString& ior_filename (void) const; + const ACE_TString& ior_filename () const; /// Will we listen for multicast location requests? - bool multicast (void) const; + bool multicast () const; /// The nt service command to run (install/remove) - SERVICE_COMMAND service_command(void) const; + SERVICE_COMMAND service_command() const; int save_registry_options(); - const char* cmdline(void) const; + const char* cmdline() const; /// File that contains the activator related information /// that the persistent locator has to save. - const ACE_TString& persist_file_name(void) const; + const ACE_TString& persist_file_name() const; /// Do we allow modifications to the servers? - bool readonly (void) const; + bool readonly () const; /// Which type of repository is to be used? enum RepoMode { @@ -82,13 +82,13 @@ public: REPO_HEAP_FILE, REPO_REGISTRY }; - RepoMode repository_mode (void) const; + RepoMode repository_mode () const; /// Do we wish to clear out the repository - bool repository_erase (void) const; + bool repository_erase () const; /// Returns the timeout value for program starting. - ACE_Time_Value startup_timeout (void) const; + ACE_Time_Value startup_timeout () const; /// Servers may be started externally to the ImR but register with it /// so that clients may still be forwarded to it. Traditionally, such @@ -99,39 +99,39 @@ public: /// active servers, so enabling the ping_external_ option will override /// the assumption of liveness and actively ping, based on the existing /// rules, all registered servers. - bool ping_external (void) const; + bool ping_external () const; /// If the server hasn't been verified for a while, then we'll /// ping it. Note : No timers are currently used. We simply ping() /// during indirect invocations, if this interval has elapsed. - ACE_Time_Value ping_interval (void) const; + ACE_Time_Value ping_interval () const; /// When pinging, this is the timeout - ACE_Time_Value ping_timeout (void) const; + ACE_Time_Value ping_timeout () const; - LiveCheck *pinger (void) const; + LiveCheck *pinger () const; void pinger (LiveCheck *); - bool unregister_if_address_reused (void) const; + bool unregister_if_address_reused () const; - bool lockout (void) const; + bool lockout () const; - bool throw_shutdown_exceptions (void) const; + bool throw_shutdown_exceptions () const; /// Indicate what type of ImR Locator this is. enum ImrType { BACKUP_IMR, PRIMARY_IMR, STANDALONE_IMR }; - ImrType imr_type(void) const; + ImrType imr_type() const; - const ACE_CString &ft_endpoint (void) const; + const ACE_CString &ft_endpoint () const; - ACE_Time_Value ft_update_delay (void) const; + ACE_Time_Value ft_update_delay () const; private: /// Parses and pulls out arguments for the ImR int parse_args (int &argc, ACE_TCHAR *argv[]); /// Print the usage information. - void print_usage (void) const; + void print_usage () const; /// Run a service command. int run_service_command (const ACE_TString& cmdline); diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index 91a58124f98..2c41bddea40 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -651,7 +651,7 @@ Locator_Repository::servers (void) } const Locator_Repository::SIMap& -Locator_Repository::servers (void) const +Locator_Repository::servers () const { return server_infos_; } @@ -663,7 +663,7 @@ Locator_Repository::activators (void) } const Locator_Repository::AIMap& -Locator_Repository::activators (void) const +Locator_Repository::activators () const { return activator_infos_; } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h index aef0d6c3983..45dd43ffbff 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h @@ -114,13 +114,13 @@ public: /// Returns the internal hash map containing the server information. SIMap& servers(void); - const SIMap& servers(void) const; + const SIMap& servers() const; /// Returns the internal hash map containing the activator information. AIMap& activators(void); - const AIMap& activators(void) const; + const AIMap& activators() const; /// Indicate the persistence mode for the repository - virtual const ACE_TCHAR* repo_mode(void) const = 0; + virtual const ACE_TCHAR* repo_mode() const = 0; /// Convert to lower case static ACE_CString lcase (const ACE_CString& s); diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp index 293d0f9511a..254fbf91d31 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp @@ -105,7 +105,7 @@ Server_Info::active_info (void) } const Server_Info * -Server_Info::active_info (void) const +Server_Info::active_info () const { return this->alt_info_.null() ? this : this->alt_info_.get(); } @@ -123,7 +123,7 @@ Server_Info::is_mode (ImplementationRepository::ActivationMode m) const } ImplementationRepository::ActivationMode -Server_Info::mode (void) const +Server_Info::mode () const { return this->active_info ()->activation_mode_; } @@ -146,7 +146,7 @@ Server_Info::is_server (const char *name) const } bool -Server_Info::is_running (void) const +Server_Info::is_running () const { return !CORBA::is_nil (this->server.in()) || this->ior.length () > 0; } @@ -265,7 +265,7 @@ Server_Info::setImRInfo (ImplementationRepository::ServerInformation* info) cons } ImplementationRepository::ServerInformation* -Server_Info::createImRServerInfo (void) const +Server_Info::createImRServerInfo () const { ImplementationRepository::ServerInformation* info; ACE_NEW_THROW_EX (info, @@ -325,7 +325,7 @@ Server_Info::update_options (const ImplementationRepository::StartupOptions &opt } const char * -Server_Info::ping_id (void) const +Server_Info::ping_id () const { return this->active_info ()->key_name_.c_str(); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h index 69badf3be32..069b8764293 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h @@ -53,16 +53,16 @@ struct Server_Info /// Convert to the corba type void setImRInfo (ImplementationRepository::ServerInformation* info) const; - ImplementationRepository::ServerInformation* createImRServerInfo(void) const; + ImplementationRepository::ServerInformation* createImRServerInfo() const; void reset_runtime (void); bool is_server (const char *name) const; bool has_peer (const char *name) const; bool is_mode (ImplementationRepository::ActivationMode m) const; - ImplementationRepository::ActivationMode mode (void) const; + ImplementationRepository::ActivationMode mode () const; - bool is_running (void) const; + bool is_running () const; bool start_allowed (void); void started (bool success); @@ -75,9 +75,9 @@ struct Server_Info ImplementationRepository::ServerObject_ptr svrobj); Server_Info *active_info (void); - const Server_Info *active_info (void) const; + const Server_Info *active_info () const; - const char * ping_id (void) const; + const char * ping_id () const; static bool parse_id (const char * id, ACE_CString& server_id, diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h index 9c5234063f9..daf9eb94551 100644 --- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h +++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h @@ -66,7 +66,7 @@ public: const Server_Info_Ptr& edit(bool active = true); /// Indicate it Server_Info_Ptr is null - bool null(void) const; + bool null() const; private: const UpdateableServerInfo& operator=(const UpdateableServerInfo& ); diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h index 6cf01c7d8a7..8a327299054 100644 --- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h +++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h @@ -47,7 +47,7 @@ public: virtual ~XML_Backing_Store (void); /// indicate the XML filename as the persistence mode for the repository - virtual const ACE_TCHAR* repo_mode (void) const; + virtual const ACE_TCHAR* repo_mode () const; /// create the Server_Info server object /// @param info the source Server_Info data diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp index 07824aa8bc2..fcbfaa73162 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp @@ -59,7 +59,7 @@ ORBInitializer::load_alert (void) } ServerRequestInterceptor * -ORBInitializer::interceptor (void) const +ORBInitializer::interceptor () const { return this->interceptor_; } diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h index f427726c256..3d1c5d184a1 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h @@ -64,7 +64,7 @@ public: /// Return a reference to the LoadAlert object. TAO_LB_LoadAlert & load_alert (void); - ServerRequestInterceptor * interceptor (void) const; + ServerRequestInterceptor * interceptor () const; private: diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index f245d0d2535..52dc4412cc4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -175,7 +175,7 @@ public: const MMDevice_Map_Hash_Key &right); /// hash function for this mmdevice. - u_long hash (void) const; + u_long hash () const; static const int hash_maximum_; protected: diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index 3e88f853cfa..4f39bd240ef 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -112,10 +112,10 @@ public: virtual Role role (void) = 0; void role (Role role); /// accessor to string version of direction . - const char * direction_str (void) const; + const char * direction_str () const; /// accessor to the flow protocol string. - const char *flow_protocol_str (void) const; + const char *flow_protocol_str () const; /// set the flow protocol string. void flow_protocol_str (const char *flow_protocol_str); @@ -128,20 +128,20 @@ public: void control_address (ACE_Addr *address); /// Address in string format i. hostname:port. - const char *address_str (void) const; - // const char * peer_address_str (void) const; + const char *address_str () const; + // const char * peer_address_str () const; /// accessor to carrier protocol i.e TCP,UDP,RTP/UDP. TAO_AV_Core::Protocol carrier_protocol (void); /// accessor to string version of carrier protocol. - const char * carrier_protocol_str (void) const; + const char * carrier_protocol_str () const; /// accessor to format to be used for this flow. - const char *format (void) const; + const char *format () const; /// accessor to name of this flow. - const char *flowname (void) const; + const char *flowname () const; /// converts the entry to a string. virtual const char *entry_to_string (void) = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl index bf8bb0e2f6b..85c5e0b0e43 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl @@ -46,14 +46,14 @@ TAO_FlowSpec_Entry::direction (void) ACE_INLINE const char * -TAO_FlowSpec_Entry::direction_str (void) const +TAO_FlowSpec_Entry::direction_str () const { return this->direction_str_.c_str(); } ACE_INLINE const char * -TAO_FlowSpec_Entry::flow_protocol_str (void) const +TAO_FlowSpec_Entry::flow_protocol_str () const { return this->flow_protocol_.c_str(); } @@ -74,7 +74,7 @@ TAO_FlowSpec_Entry::carrier_protocol (void) ACE_INLINE const char * -TAO_FlowSpec_Entry::carrier_protocol_str (void) const +TAO_FlowSpec_Entry::carrier_protocol_str () const { return this->carrier_protocol_.c_str(); } @@ -113,21 +113,21 @@ TAO_FlowSpec_Entry::control_address (ACE_Addr *addr) ACE_INLINE const char * -TAO_FlowSpec_Entry::address_str (void) const +TAO_FlowSpec_Entry::address_str () const { return this->address_str_.c_str(); } ACE_INLINE const char* -TAO_FlowSpec_Entry::format (void) const +TAO_FlowSpec_Entry::format () const { return this->format_.c_str(); } ACE_INLINE const char * -TAO_FlowSpec_Entry::flowname (void) const +TAO_FlowSpec_Entry::flowname () const { return this->flowname_.c_str(); } diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index 82d21df0ceb..a42b01c815a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -94,10 +94,10 @@ public: /// Dtor TAO_AV_UDP_MCast_Flow_Handler (void); virtual ~TAO_AV_UDP_MCast_Flow_Handler (void); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); - ACE_SOCK_Dgram_Mcast *get_mcast_socket (void) const; + ACE_SOCK_Dgram_Mcast *get_mcast_socket () const; virtual ACE_Event_Handler* event_handler (void){ return this; } void set_peer_addr (ACE_INET_Addr *peer_addr); protected: diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.inl b/TAO/orbsvcs/orbsvcs/AV/MCast.inl index 6587ee4a5b0..fa30c274b4e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.inl +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //----------------------------------------------------------- ACE_INLINE ACE_SOCK_Dgram_Mcast * -TAO_AV_UDP_MCast_Flow_Handler::get_mcast_socket (void) const +TAO_AV_UDP_MCast_Flow_Handler::get_mcast_socket () const { return this->dgram_mcast_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index ef83a1898ac..4d3a2c5dc31 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -543,7 +543,7 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) ACE_HANDLE -TAO_AV_UDP_QoS_Flow_Handler::get_handle (void) const +TAO_AV_UDP_QoS_Flow_Handler::get_handle () const { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 2d2bf234502..2b2cd75f0d0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -117,7 +117,7 @@ public: int open (ACE_Addr &address); virtual TAO_AV_Transport *transport (void); virtual int set_remote_address (ACE_Addr *address); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); virtual int change_qos (AVStreams::QoS); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index ae028ee296e..19a16f4903b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -118,10 +118,10 @@ public: int close (void); virtual TAO_AV_Transport *transport (void); virtual int set_remote_address (ACE_Addr *address); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); - const ACE_SOCK_Dgram *get_socket (void) const; + const ACE_SOCK_Dgram *get_socket () const; virtual ACE_Event_Handler* event_handler (void){ return this; } /// Change the QoS virtual int change_qos (AVStreams::QoS); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.inl b/TAO/orbsvcs/orbsvcs/AV/UDP.inl index d28ab71bde8..d1d330728fb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.inl +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_SOCK_Dgram * -TAO_AV_UDP_Flow_Handler::get_socket (void) const +TAO_AV_UDP_Flow_Handler::get_socket () const { return &this->sock_dgram_; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 89b23490c51..90304ed1fd1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -137,19 +137,19 @@ public: virtual void shutdown (void); /// Access the dispatching module.... - TAO_CEC_Dispatching* dispatching (void) const; + TAO_CEC_Dispatching* dispatching () const; /// Access the consumer admin implementation. - TAO_CEC_ConsumerAdmin* consumer_admin (void) const; + TAO_CEC_ConsumerAdmin* consumer_admin () const; /// Access the supplier admin implementation. - TAO_CEC_SupplierAdmin* supplier_admin (void) const; + TAO_CEC_SupplierAdmin* supplier_admin () const; /// Access the consumer control strategy. - TAO_CEC_ConsumerControl* consumer_control (void) const; + TAO_CEC_ConsumerControl* consumer_control () const; /// Access the supplier control strategy. - TAO_CEC_SupplierControl* supplier_control (void) const; + TAO_CEC_SupplierControl* supplier_control () const; // = The factory methods, they delegate on the CEC_Factory. /// Create and destroy a ProxyPushSupplier @@ -215,14 +215,14 @@ 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; // = The CosEventChannelAdmin::EventChannel methods... /// The default implementation is: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl index b17aaa32ddc..1de0e16e264 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl @@ -14,31 +14,31 @@ TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr s_poa, } ACE_INLINE TAO_CEC_Dispatching* -TAO_CEC_EventChannel::dispatching (void) const +TAO_CEC_EventChannel::dispatching () const { return this->dispatching_; } ACE_INLINE TAO_CEC_ConsumerAdmin* -TAO_CEC_EventChannel::consumer_admin (void) const +TAO_CEC_EventChannel::consumer_admin () const { return this->consumer_admin_; } ACE_INLINE TAO_CEC_SupplierAdmin* -TAO_CEC_EventChannel::supplier_admin (void) const +TAO_CEC_EventChannel::supplier_admin () const { return this->supplier_admin_; } ACE_INLINE TAO_CEC_ConsumerControl* -TAO_CEC_EventChannel::consumer_control (void) const +TAO_CEC_EventChannel::consumer_control () const { return this->consumer_control_; } ACE_INLINE TAO_CEC_SupplierControl* -TAO_CEC_EventChannel::supplier_control (void) const +TAO_CEC_EventChannel::supplier_control () const { return this->supplier_control_; } @@ -176,19 +176,19 @@ TAO_CEC_EventChannel::destroy_supplier_lock (ACE_Lock* x) } ACE_INLINE int -TAO_CEC_EventChannel::consumer_reconnect (void) const +TAO_CEC_EventChannel::consumer_reconnect () const { return this->consumer_reconnect_; } ACE_INLINE int -TAO_CEC_EventChannel::supplier_reconnect (void) const +TAO_CEC_EventChannel::supplier_reconnect () const { return this->supplier_reconnect_; } ACE_INLINE int -TAO_CEC_EventChannel::disconnect_callbacks (void) const +TAO_CEC_EventChannel::disconnect_callbacks () const { return this->disconnect_callbacks_; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 1aee32c5be7..aeea3d822b8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -62,11 +62,11 @@ public: virtual void deactivate (void); /// Return 0 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. - CosEventComm::PullSupplier_ptr supplier (void) const; + CosEventComm::PullSupplier_ptr supplier () const; /// Pulls from the supplier, verifies that it is connected. CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event); @@ -103,7 +103,7 @@ protected: void supplier_i (CosEventComm::PullSupplier_ptr supplier); /// The private version (without locking) of is_connected(). - CORBA::Boolean is_connected_i (void) const; + CORBA::Boolean is_connected_i () const; /// Release the supplier void cleanup_i (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl index d0a626e9b03..67c14522c64 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPullConsumer::is_connected_i (void) const +TAO_CEC_ProxyPullConsumer::is_connected_i () const { return !CORBA::is_nil (this->supplier_.in ()); } ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPullConsumer::is_connected (void) const +TAO_CEC_ProxyPullConsumer::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); @@ -16,7 +16,7 @@ TAO_CEC_ProxyPullConsumer::is_connected (void) const } ACE_INLINE CosEventComm::PullSupplier_ptr -TAO_CEC_ProxyPullConsumer::supplier (void) const +TAO_CEC_ProxyPullConsumer::supplier () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return CosEventComm::PullSupplier::_duplicate (this->supplier_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index a7bc5e5c17c..2660286b370 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -69,7 +69,7 @@ public: virtual void deactivate (void); /// Return 0 if no consumer is connected... - CORBA::Boolean is_connected (void) const; + CORBA::Boolean is_connected () const; /** * Return the consumer object reference. It returns nil() if it has @@ -77,7 +77,7 @@ public: * @note This method does not return a new reference!!! Doing so * will increase the locking overhead on the critical path. */ - CosEventComm::PullConsumer_ptr consumer (void) const; + CosEventComm::PullConsumer_ptr consumer () const; /// The event channel is shutting down virtual void shutdown (void); @@ -115,7 +115,7 @@ protected: void consumer_i (CosEventComm::PullConsumer_ptr consumer); /// 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); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl index 9101a57bc0b..6940b725b7c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPullSupplier::is_connected_i (void) const +TAO_CEC_ProxyPullSupplier::is_connected_i () const { return this->connected_; } ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPullSupplier::is_connected (void) const +TAO_CEC_ProxyPullSupplier::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); @@ -16,7 +16,7 @@ TAO_CEC_ProxyPullSupplier::is_connected (void) const } ACE_INLINE CosEventComm::PullConsumer_ptr -TAO_CEC_ProxyPullSupplier::consumer (void) const +TAO_CEC_ProxyPullSupplier::consumer () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index e6bcd1b2178..5bbf33df9f3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -64,11 +64,11 @@ public: virtual void deactivate (void); /// 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. - CosEventComm::PushSupplier_ptr supplier (void) const; + CosEventComm::PushSupplier_ptr supplier () const; /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -105,7 +105,7 @@ 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; /// Release the supplier void cleanup_i (void); @@ -167,7 +167,7 @@ public: ~TAO_CEC_ProxyPushConsumer_Guard (void); /// Returns true if the reference count successfully acquired - bool locked (void) const; + bool locked () const; private: /// The lock used to protect the reference count diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl index d93fc640172..1428e5c0789 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPushConsumer::is_connected_i (void) const +TAO_CEC_ProxyPushConsumer::is_connected_i () const { return this->connected_; } ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPushConsumer::is_connected (void) const +TAO_CEC_ProxyPushConsumer::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); @@ -16,7 +16,7 @@ TAO_CEC_ProxyPushConsumer::is_connected (void) const } ACE_INLINE CosEventComm::PushSupplier_ptr -TAO_CEC_ProxyPushConsumer::supplier (void) const +TAO_CEC_ProxyPushConsumer::supplier () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return CosEventComm::PushSupplier::_duplicate (this->supplier_.in ()); @@ -39,7 +39,7 @@ TAO_CEC_ProxyPushConsumer::supplier (CosEventComm::PushSupplier_ptr supplier) // **************************************************************** ACE_INLINE bool -TAO_CEC_ProxyPushConsumer_Guard::locked (void) const +TAO_CEC_ProxyPushConsumer_Guard::locked () const { return this->locked_; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 7be8914cb03..b7fec15b0b8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -80,7 +80,7 @@ public: virtual void deactivate (void); /// Return 0 if no consumer is connected... - CORBA::Boolean is_connected (void) const; + CORBA::Boolean is_connected () const; /** * Return the consumer object reference. It returns nil() if it has @@ -88,7 +88,7 @@ public: * NOTE: This method does not return a new reference!!! Doing so * will increase the locking overhead on the critical path. */ - CosEventComm::PushConsumer_ptr consumer (void) const; + CosEventComm::PushConsumer_ptr consumer () const; /// The event channel is shutting down virtual void shutdown (void); @@ -141,13 +141,13 @@ protected: #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// 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); #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) - CORBA::Boolean is_typed_ec (void) const; + CORBA::Boolean is_typed_ec () const; #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ /// Assigns the parameter to both consumer_ and nopolicy_consumer_, and diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl index 995109cfb53..ac0814c734b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPushSupplier::is_connected_i (void) const +TAO_CEC_ProxyPushSupplier::is_connected_i () const { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->is_typed_ec ()) @@ -19,7 +19,7 @@ TAO_CEC_ProxyPushSupplier::is_connected_i (void) const } ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPushSupplier::is_connected (void) const +TAO_CEC_ProxyPushSupplier::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); @@ -27,7 +27,7 @@ TAO_CEC_ProxyPushSupplier::is_connected (void) const } ACE_INLINE CosEventComm::PushConsumer_ptr -TAO_CEC_ProxyPushSupplier::consumer (void) const +TAO_CEC_ProxyPushSupplier::consumer () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -79,7 +79,7 @@ TAO_CEC_ProxyPushSupplier::consumer (CosTypedEventComm::TypedPushConsumer_ptr ty #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) ACE_INLINE CORBA::Boolean -TAO_CEC_ProxyPushSupplier::is_typed_ec (void) const +TAO_CEC_ProxyPushSupplier::is_typed_ec () const { if (this->typed_event_channel_ != 0) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 727e1a03872..43c7cbd5c52 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -147,19 +147,19 @@ public: virtual void shutdown (void); /// Access the dispatching module.... - TAO_CEC_Dispatching* dispatching (void) const; + TAO_CEC_Dispatching* dispatching () const; /// Access the consumer admin implementation. - TAO_CEC_TypedConsumerAdmin* typed_consumer_admin (void) const; + TAO_CEC_TypedConsumerAdmin* typed_consumer_admin () const; /// Access the supplier admin implementation. - TAO_CEC_TypedSupplierAdmin* typed_supplier_admin (void) const; + TAO_CEC_TypedSupplierAdmin* typed_supplier_admin () const; /// Access the consumer control strategy. - TAO_CEC_ConsumerControl* consumer_control (void) const; + TAO_CEC_ConsumerControl* consumer_control () const; /// Access the supplier control strategy. - TAO_CEC_SupplierControl* supplier_control (void) const; + TAO_CEC_SupplierControl* supplier_control () const; // = The factory methods, they delegate on the CEC_Factory. /// Create and destroy a ProxyPushSupplier @@ -204,14 +204,14 @@ public: virtual void disconnected (TAO_CEC_ProxyPushSupplier*); /// 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; // Hash map which will operate as a IFR cache for the Supported Interface's operations and parameters typedef ACE_Hash_Map_Manager_Ex<const char *, TAO_CEC_Operation_Params *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> InterfaceDescription; @@ -227,13 +227,13 @@ public: int supplier_register_supported_interface (const char *supported_interface); /// Function to return the supported_interface_ - const char * supported_interface (void) const; + const char * supported_interface () const; /// Function to return the base_interfaces_ CORBA::RepositoryId base_interfaces (CORBA::ULong index) const; /// Function to return the number of base_interfaces_ - CORBA::ULong number_of_base_interfaces (void) const; + CORBA::ULong number_of_base_interfaces () const; /// Function populates the NVList from the provide param information virtual void create_operation_list (TAO_CEC_Operation_Params *oper_params, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl index 145340dc989..b7e5dc7e0fd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl @@ -21,31 +21,31 @@ TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr s_poa, } ACE_INLINE TAO_CEC_Dispatching* -TAO_CEC_TypedEventChannel::dispatching (void) const +TAO_CEC_TypedEventChannel::dispatching () const { return this->dispatching_; } ACE_INLINE TAO_CEC_TypedConsumerAdmin* -TAO_CEC_TypedEventChannel::typed_consumer_admin (void) const +TAO_CEC_TypedEventChannel::typed_consumer_admin () const { return this->typed_consumer_admin_; } ACE_INLINE TAO_CEC_TypedSupplierAdmin* -TAO_CEC_TypedEventChannel::typed_supplier_admin (void) const +TAO_CEC_TypedEventChannel::typed_supplier_admin () const { return this->typed_supplier_admin_; } ACE_INLINE TAO_CEC_ConsumerControl* -TAO_CEC_TypedEventChannel::consumer_control (void) const +TAO_CEC_TypedEventChannel::consumer_control () const { return this->consumer_control_; } ACE_INLINE TAO_CEC_SupplierControl* -TAO_CEC_TypedEventChannel::supplier_control (void) const +TAO_CEC_TypedEventChannel::supplier_control () const { return this->supplier_control_; } @@ -135,25 +135,25 @@ TAO_CEC_TypedEventChannel::destroy_supplier_lock (ACE_Lock* x) } ACE_INLINE int -TAO_CEC_TypedEventChannel::consumer_reconnect (void) const +TAO_CEC_TypedEventChannel::consumer_reconnect () const { return this->consumer_reconnect_; } ACE_INLINE int -TAO_CEC_TypedEventChannel::supplier_reconnect (void) const +TAO_CEC_TypedEventChannel::supplier_reconnect () const { return this->supplier_reconnect_; } ACE_INLINE int -TAO_CEC_TypedEventChannel::disconnect_callbacks (void) const +TAO_CEC_TypedEventChannel::disconnect_callbacks () const { return this->disconnect_callbacks_; } ACE_INLINE const char * -TAO_CEC_TypedEventChannel::supported_interface (void) const +TAO_CEC_TypedEventChannel::supported_interface () const { return this->supported_interface_.c_str (); } @@ -165,7 +165,7 @@ TAO_CEC_TypedEventChannel::base_interfaces (CORBA::ULong index) const } ACE_INLINE CORBA::ULong -TAO_CEC_TypedEventChannel::number_of_base_interfaces (void) const +TAO_CEC_TypedEventChannel::number_of_base_interfaces () const { return this->base_interfaces_.length (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 17905ab6d3e..016cb1c681c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -89,7 +89,7 @@ protected: friend class TAO_CEC_TypedProxyPushConsumer_Guard; /// The private version (without locking) of is_connected(). - CORBA::Boolean is_connected_i (void) const; + CORBA::Boolean is_connected_i () const; /// Release the supplier void cleanup_i (void); @@ -159,7 +159,7 @@ public: ~TAO_CEC_TypedProxyPushConsumer_Guard (void); /// Returns 1 if the reference count successfully acquired - int locked (void) const; + int locked () const; private: /// The lock used to protect the reference count diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl index c42ee7ad6ec..a2ae8dcb2ee 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_CEC_TypedProxyPushConsumer::is_connected_i (void) const +TAO_CEC_TypedProxyPushConsumer::is_connected_i () const { return this->connected_; } @@ -10,7 +10,7 @@ TAO_CEC_TypedProxyPushConsumer::is_connected_i (void) const // **************************************************************** ACE_INLINE int -TAO_CEC_TypedProxyPushConsumer_Guard::locked (void) const +TAO_CEC_TypedProxyPushConsumer_Guard::locked () const { return this->locked_; } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl index 5178a5a2a41..34c682b59a6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl @@ -14,7 +14,7 @@ TAO_ESF_Proxy_List<PROXY>::end (void) } template<class PROXY> ACE_INLINE size_t -TAO_ESF_Proxy_List<PROXY>::size (void) const +TAO_ESF_Proxy_List<PROXY>::size () const { return this->impl_.size (); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl index 993cda700a7..a5cf13695a9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl @@ -58,7 +58,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::end (void) } template<class PROXY> ACE_INLINE size_t -TAO_ESF_Proxy_RB_Tree<PROXY>::size (void) const +TAO_ESF_Proxy_RB_Tree<PROXY>::size () const { return this->impl_.current_size (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl index 0508e402fb3..c941146ebac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl @@ -35,7 +35,7 @@ TAO_ECG_CDR_Message_Sender::get_local_addr (ACE_INET_Addr& addr) } ACE_INLINE CORBA::ULong -TAO_ECG_CDR_Message_Sender::mtu (void) const +TAO_ECG_CDR_Message_Sender::mtu () const { return this->mtu_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl index 57d16eefb3c..e800afa98bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl @@ -24,7 +24,7 @@ TAO_ECG_UDP_Sender::TAO_ECG_UDP_Sender (CORBA::Boolean crc) } ACE_INLINE CORBA::ULong -TAO_ECG_UDP_Sender::mtu (void) const +TAO_ECG_UDP_Sender::mtu () const { return this->cdr_sender_.mtu (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl index 75498ef3164..e6a6308afea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl @@ -30,25 +30,25 @@ TAO_EC_Default_Factory::TAO_EC_Default_Factory (void) } ACE_INLINE int -TAO_EC_Default_Factory::consumer_collection (void) const +TAO_EC_Default_Factory::consumer_collection () const { return this->consumer_collection_; } ACE_INLINE int -TAO_EC_Default_Factory::supplier_collection (void) const +TAO_EC_Default_Factory::supplier_collection () const { return this->supplier_collection_; } ACE_INLINE int -TAO_EC_Default_Factory::supplier_filtering (void) const +TAO_EC_Default_Factory::supplier_filtering () const { return this->supplier_filtering_; } ACE_INLINE const ACE_CString& -TAO_EC_Default_Factory::orb_id (void) const +TAO_EC_Default_Factory::orb_id () const { return this->orbid_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl index 562eef64822..d412117261f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl @@ -8,7 +8,7 @@ TAO_EC_Filter::TAO_EC_Filter (void) } ACE_INLINE TAO_EC_Filter* -TAO_EC_Filter::parent (void) const +TAO_EC_Filter::parent () const { return this->parent_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl index badb7966c3a..28b4ba7a46e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -TAO_EC_Gateway_IIOP_Factory::use_ttl (void) const +TAO_EC_Gateway_IIOP_Factory::use_ttl () const { return this->use_ttl_; } ACE_INLINE int -TAO_EC_Gateway_IIOP_Factory::use_consumer_proxy_map (void) const +TAO_EC_Gateway_IIOP_Factory::use_consumer_proxy_map () const { return this->use_consumer_proxy_map_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index 769e92d5afe..d630ec559f2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h @@ -60,9 +60,9 @@ public: // = 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, @@ -72,7 +72,7 @@ public: 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 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_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl index 39b6a165cea..f37cc2d6a4b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl @@ -43,7 +43,7 @@ TAO_EC_Object_Deactivator::~TAO_EC_Object_Deactivator (void) } ACE_INLINE PortableServer::POA_var -TAO_EC_Object_Deactivator::poa (void) const +TAO_EC_Object_Deactivator::poa () const { return this->poa_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl index fce2b690b8c..e30a5788f06 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_EC_ProxyPushConsumer::is_connected_i (void) const +TAO_EC_ProxyPushConsumer::is_connected_i () const { return this->connected_; } ACE_INLINE CORBA::Boolean -TAO_EC_ProxyPushConsumer::is_connected (void) const +TAO_EC_ProxyPushConsumer::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false); @@ -16,7 +16,7 @@ TAO_EC_ProxyPushConsumer::is_connected (void) const } ACE_INLINE RtecEventComm::PushSupplier_ptr -TAO_EC_ProxyPushConsumer::supplier (void) const +TAO_EC_ProxyPushConsumer::supplier () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return RtecEventComm::PushSupplier::_duplicate (this->supplier_.in ()); @@ -37,7 +37,7 @@ TAO_EC_ProxyPushConsumer::supplier (RtecEventComm::PushSupplier_ptr supplier) } ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& -TAO_EC_ProxyPushConsumer::publications (void) const +TAO_EC_ProxyPushConsumer::publications () const { // @@ TODO There should some way to signal errors here. ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, this->qos_); @@ -46,13 +46,13 @@ TAO_EC_ProxyPushConsumer::publications (void) const } ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& -TAO_EC_ProxyPushConsumer::publications_i (void) const +TAO_EC_ProxyPushConsumer::publications_i () const { return this->qos_; } ACE_INLINE TAO_EC_Supplier_Filter * -TAO_EC_ProxyPushConsumer::filter_i (void) const +TAO_EC_ProxyPushConsumer::filter_i () const { return this->filter_; } @@ -60,7 +60,7 @@ TAO_EC_ProxyPushConsumer::filter_i (void) const // **************************************************************** ACE_INLINE bool -TAO_EC_ProxyPushConsumer_Guard::locked (void) const +TAO_EC_ProxyPushConsumer_Guard::locked () const { return this->locked_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl index 7ed19308c8f..72b948b752f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl @@ -36,13 +36,13 @@ TAO_EC_ProxyPushSupplier::resume_connection_locked (void) } ACE_INLINE CORBA::Boolean -TAO_EC_ProxyPushSupplier::is_connected_i (void) const +TAO_EC_ProxyPushSupplier::is_connected_i () const { return !CORBA::is_nil (this->consumer_.in ()); } ACE_INLINE CORBA::Boolean -TAO_EC_ProxyPushSupplier::is_connected (void) const +TAO_EC_ProxyPushSupplier::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -50,7 +50,7 @@ TAO_EC_ProxyPushSupplier::is_connected (void) const } ACE_INLINE CORBA::Boolean -TAO_EC_ProxyPushSupplier::is_suspended (void) const +TAO_EC_ProxyPushSupplier::is_suspended () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -58,7 +58,7 @@ TAO_EC_ProxyPushSupplier::is_suspended (void) const } ACE_INLINE RtecEventComm::PushConsumer_ptr -TAO_EC_ProxyPushSupplier::consumer (void) const +TAO_EC_ProxyPushSupplier::consumer () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ()); @@ -79,7 +79,7 @@ TAO_EC_ProxyPushSupplier::consumer (RtecEventComm::PushConsumer_ptr consumer) } ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& -TAO_EC_ProxyPushSupplier::subscriptions (void) const +TAO_EC_ProxyPushSupplier::subscriptions () const { // @@ TODO There should be a better way to signal errors here. ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, this->qos_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index 6bb039d6bc3..83731da3946 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -60,9 +60,9 @@ public: // = 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, @@ -72,7 +72,7 @@ public: 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 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_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl index 4e49106469c..e68db9a46ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const TAO_EC_QOS_Info& -TAO_EC_Timeout_Filter::qos_info (void) const +TAO_EC_Timeout_Filter::qos_info () const { return this->qos_info_; } ACE_INLINE RtecEventComm::EventType -TAO_EC_Timeout_Filter::type (void) const +TAO_EC_Timeout_Filter::type () const { return this->type_; } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index e5d3386c30a..379bc6d240b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -57,7 +57,7 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_FT_Request_Duration_Policy *clone (void) const; + virtual TAO_FT_Request_Duration_Policy *clone () const; // = The FT::RequestDurationPolicy methods virtual TimeBase::TimeT request_duration_policy_value (void); @@ -104,7 +104,7 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_FT_Heart_Beat_Policy *clone (void) const; + virtual TAO_FT_Heart_Beat_Policy *clone () const; // = The FT::HeartBeatPolicy methods virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index eb6abd1857b..8c6351a7475 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -47,7 +47,7 @@ public: // CORBA::ORB::create_policy. /// Returns a copy of <this>. - virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const; + virtual TAO_FT_Heart_Beat_Enabled_Policy *clone () const; // = The FT::HeartBeatPolicy methods virtual CORBA::Boolean heartbeat_enabled_policy_value (); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index d23b5c4a4d5..ce4067245dd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -96,11 +96,11 @@ public: /// Access the consumer admin implementation, useful for controlling /// the activation... - TAO_FTEC_ConsumerAdmin* consumer_admin (void) const; + TAO_FTEC_ConsumerAdmin* consumer_admin () const; /// Access the supplier admin implementation, useful for controlling /// the activation... - TAO_FTEC_SupplierAdmin* supplier_admin (void) const; + TAO_FTEC_SupplierAdmin* supplier_admin () const; TAO_FTEC_ProxyPushSupplier* find_proxy_push_supplier(const FtRtecEventChannelAdmin::ObjectId& id); TAO_FTEC_ProxyPushConsumer* find_proxy_push_consumer(const FtRtecEventChannelAdmin::ObjectId& id); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index 628321fcdb4..6b2201c1c7d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -30,10 +30,10 @@ public: virtual ~FT_ProxyAdmin_Base(); void activate(const FtRtecEventComm::ObjectId& oid); - const FtRtecEventComm::ObjectId& object_id(void) const; + const FtRtecEventComm::ObjectId& object_id() const; /// Returns an CORBA object reference when the servant is activated - CORBA::Object_var reference(void) const; + CORBA::Object_var reference() const; protected: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index f831f4fce36..8065b6d832a 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h @@ -71,7 +71,7 @@ namespace TAO /// @@ Helper method for the implementation repository, should go /// away - const ACE::HTBP::Addr& address (void) const; + const ACE::HTBP::Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE::HTBP::Addr *endpoints (void); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl index a7d7eb06e2d..66763452d71 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE::HTBP::Addr& -TAO::HTIOP::Acceptor::address (void) const +TAO::HTIOP::Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h index ede29964650..1e9bfc1fcb7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h @@ -87,7 +87,7 @@ namespace TAO virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// @} protected: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h index ebbcee9086f..507990b5ffd 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h @@ -93,25 +93,25 @@ namespace TAO // = HTIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE::HTBP::Addr &object_addr (void) const; + const ACE::HTBP::Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *htid (void) const; + const char *htid () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl index a310cd3b769..c2fcfcd536b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE::HTBP::Addr & -TAO::HTIOP::Endpoint::object_addr (void) const +TAO::HTIOP::Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -50,19 +50,19 @@ TAO::HTIOP::Endpoint::object_addr (void) const } ACE_INLINE const char * -TAO::HTIOP::Endpoint::host (void) const +TAO::HTIOP::Endpoint::host () const { return this->host_.in (); } ACE_INLINE const char * -TAO::HTIOP::Endpoint::htid (void) const +TAO::HTIOP::Endpoint::htid () const { return this->htid_.in (); } ACE_INLINE CORBA::UShort -TAO::HTIOP::Endpoint::port (void) const +TAO::HTIOP::Endpoint::port () const { return this->port_; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index f453b5cf8fa..473fded9872 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -53,16 +53,16 @@ namespace TAO virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; private: /// Configuration reference diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index c8be5d232af..86f83a5222e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h @@ -51,7 +51,7 @@ namespace TAO public: /// The object key delimiter that HTIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -85,7 +85,7 @@ namespace TAO * This is used to create url-style reference. Only one * endpoint is included into the string. */ - virtual char * to_string (void) const; + virtual char * to_string () const; /** * Endpoints are transmitted using TAO-proprietory tagged component. @@ -99,7 +99,7 @@ namespace TAO virtual TAO_Endpoint *endpoint (void); /// Return how many endpoints this profile contains. - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h index 9a19efbaaca..4357fce5603 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h @@ -45,22 +45,22 @@ public: ACE_TCHAR *argv[]); /// Return the file where the IOR of the server object is stored. - const char *ior_output_file (void) const; + const char *ior_output_file () const; /// Is the Interface Repository persistent? - int persistent (void) const; + int persistent () const; /// Return the default filename for persistent IFR. - const char *persistent_file (void) const; + const char *persistent_file () const; /// Are we using a WIN32 registry as the backing store? - int using_registry (void) const; + int using_registry () const; /// Should the repository have a real mutex or a null mutex? - int enable_locking (void) const; + int enable_locking () const; /// should the service support discovery via multicast? - int support_multicast_discovery (void) const; + int support_multicast_discovery () const; private: /// File where the IOR of the server object is stored. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index c97f1fb20e7..f9b5317e35a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -152,47 +152,47 @@ public: CORBA::DefinitionKind def_kind) const; /// Accessor for the POA that is dispatching the current call. - PortableServer::Current_ptr poa_current (void) const; + PortableServer::Current_ptr poa_current () const; /// Accessor for the ACE_Configuration database. - ACE_Configuration *config (void) const; + ACE_Configuration *config () const; /// Accessor for the Typecode factory. - CORBA::TypeCodeFactory_ptr tc_factory (void) const; + CORBA::TypeCodeFactory_ptr tc_factory () const; /// Accessor/mutator for our object reference. - CORBA::Repository_ptr repo_objref (void) const; + CORBA::Repository_ptr repo_objref () const; void repo_objref (CORBA::Repository_ptr objref); /// Accessor for the root key for all IR objects. - ACE_Configuration_Section_Key root_key (void) const; + ACE_Configuration_Section_Key root_key () const; /// Accessor for the repository ids root key. - ACE_Configuration_Section_Key repo_ids_key (void) const; + ACE_Configuration_Section_Key repo_ids_key () const; /// Accessor for the primitive kinds section. - ACE_Configuration_Section_Key pkinds_key (void) const; + ACE_Configuration_Section_Key pkinds_key () const; /// Accessor for the bounded strings section. - ACE_Configuration_Section_Key strings_key (void) const; + ACE_Configuration_Section_Key strings_key () const; /// Accessor for the bounded wstrings section. - ACE_Configuration_Section_Key wstrings_key (void) const; + ACE_Configuration_Section_Key wstrings_key () const; /// Accessor for the fixed types section. - ACE_Configuration_Section_Key fixeds_key (void) const; + ACE_Configuration_Section_Key fixeds_key () const; /// Accessor for the anonymous arrays section. - ACE_Configuration_Section_Key arrays_key (void) const; + ACE_Configuration_Section_Key arrays_key () const; /// Accessor for the anonymous sequences section. - ACE_Configuration_Section_Key sequences_key (void) const; + ACE_Configuration_Section_Key sequences_key () const; /// Accessor for the name extension string. - const char *extension (void) const; + const char *extension () const; /// Repo lock. - ACE_Lock &lock (void) const; + ACE_Lock &lock () const; /** * Used ONLY with Purify, for memory leak checking. @@ -305,7 +305,7 @@ private: const char *pkind_to_string (CORBA::PrimitiveKind pkind) const; /// Return the number of entries in the CORBA::PrimitiveKind enum. - u_int num_pkinds (void) const; + u_int num_pkinds () const; }; diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index ee9d60d922a..b077f2c05ef 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -76,7 +76,7 @@ public: const void *arg); /// Returns the internal handle used to receive multicast. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; private: /// Factor common functionality from the two init functions. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index 035fdf21aeb..b95446f33db 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -49,7 +49,7 @@ public: /// Has this LoadAlert servant been alerted of a high load condition /// by the LoadManager. - CORBA::Boolean alerted (void) const; + CORBA::Boolean alerted () const; // protected: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl index f4bc3ae49c6..30d9b720b71 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_LB_LoadAlert::alerted (void) const +TAO_LB_LoadAlert::alerted () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, monitor, this->lock_, 0); diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h index 080308c38be..620ffc0f3fb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h @@ -81,7 +81,7 @@ public: /// Gets the administrative state of the log virtual DsLogAdmin::AdministrativeState - get_administrative_state (void) const; + get_administrative_state () const; /// Sets the administrative state of the log virtual void @@ -89,7 +89,7 @@ public: /// Get the capacity alarm thresholds virtual DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (void) const; + get_capacity_alarm_thresholds () const; /// Set the capacity alarm thresholds virtual void @@ -97,39 +97,39 @@ public: /// Gets the forwarding state virtual DsLogAdmin::ForwardingState - get_forwarding_state (void) const; + get_forwarding_state () const; /// Sets the forwarding state virtual void set_forwarding_state (DsLogAdmin::ForwardingState state); /// Get the log duration - virtual DsLogAdmin::TimeInterval get_interval (void) const; + virtual DsLogAdmin::TimeInterval get_interval () const; /// Set the log duration. virtual void set_interval (const DsLogAdmin::TimeInterval & interval); /// Gets the log full action - virtual DsLogAdmin::LogFullActionType get_log_full_action (void) const; + virtual DsLogAdmin::LogFullActionType get_log_full_action () const; /// Sets the log full action virtual void set_log_full_action(DsLogAdmin::LogFullActionType action); /// Get the list of the QoS properties supported by the log. - virtual DsLogAdmin::QoSList* get_log_qos (void) const; + virtual DsLogAdmin::QoSList* get_log_qos () const; /// Set the list of the QoS properties supported by the log. virtual void set_log_qos (const DsLogAdmin::QoSList& qos); /// Gets the max record life - virtual CORBA::ULong get_max_record_life (void) const; + virtual CORBA::ULong get_max_record_life () const; /// Sets the max record life virtual void set_max_record_life (CORBA::ULong life); /// Get the current set value of the max size of the log data. - virtual CORBA::ULongLong get_max_size (void) const; + virtual CORBA::ULongLong get_max_size () const; /// Set the max size of log data. size == 0, => infinite. virtual void set_max_size (CORBA::ULongLong size); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 886bbe93c05..b942044cf4a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -50,7 +50,7 @@ public: /// Gets the administrative state of the log virtual DsLogAdmin::AdministrativeState - get_administrative_state (void) const = 0; + get_administrative_state () const = 0; /// Sets the administrative state of the log virtual void @@ -58,7 +58,7 @@ public: /// Get the capacity alarm thresholds virtual DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (void) const = 0; + get_capacity_alarm_thresholds () const = 0; /// Set the capacity alarm thresholds virtual void @@ -66,14 +66,14 @@ public: /// Gets the forwarding state virtual DsLogAdmin::ForwardingState - get_forwarding_state (void) const = 0; + get_forwarding_state () const = 0; /// Sets the forwarding state virtual void set_forwarding_state (DsLogAdmin::ForwardingState state) = 0; /// Get the log duration - virtual DsLogAdmin::TimeInterval get_interval (void) const = 0; + virtual DsLogAdmin::TimeInterval get_interval () const = 0; /// Set the log duration. virtual void @@ -81,7 +81,7 @@ public: /// Get the log full action virtual DsLogAdmin::LogFullActionType - get_log_full_action (void) const = 0; + get_log_full_action () const = 0; /// Set the log full action virtual void @@ -89,7 +89,7 @@ public: /// Get the list of the QoS properties supported by the log. virtual DsLogAdmin::QoSList* - get_log_qos (void) const = 0; + get_log_qos () const = 0; /// Set the list of the QoS properties supported by the log. virtual void @@ -97,7 +97,7 @@ public: /// Gets the max record life virtual CORBA::ULong - get_max_record_life (void) const = 0; + get_max_record_life () const = 0; /// Sets the max record life virtual void @@ -105,7 +105,7 @@ public: /// Get the current set value of the max size of the log data. virtual CORBA::ULongLong - get_max_size (void) const = 0; + get_max_size () const = 0; /// Set the max size of log data. size == 0, => infinite. virtual void diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 54c07a7c6a9..e8710317a12 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -106,7 +106,7 @@ public: /// <hash> function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. - u_long hash (void) const; + u_long hash () const; // = Data members. diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h index fe6358773f2..c58e81e7e3e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h @@ -67,12 +67,12 @@ public: * Accessors and mutators for object references. */ /// Returns a <NamingContext_ptr> for the root Naming Context. - CosNaming::NamingContext_ptr my_root_context (void) const; - CosNaming::NamingContext_ptr ft_root_context (void) const; + CosNaming::NamingContext_ptr my_root_context () const; + CosNaming::NamingContext_ptr ft_root_context () const; /// Returns the reference for this servers local naming manager servant. - ::FT_Naming::NamingManager_ptr my_naming_manager (void) const; - ::FT_Naming::NamingManager_ptr ft_naming_manager (void) const; + ::FT_Naming::NamingManager_ptr my_naming_manager () const; + ::FT_Naming::NamingManager_ptr ft_naming_manager () const; /// Initialize the naming manager with the ORB. int init_naming_manager_with_orb (int , ACE_TCHAR * [], CORBA::ORB_ptr orb); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h index 2679c17385d..e09e93c265d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h @@ -52,14 +52,14 @@ public: ~TAO_Naming_Client (void); /// Returns a pointer to the root Naming Context. - CosNaming::NamingContext_ptr operator-> (void) const; + CosNaming::NamingContext_ptr operator-> () const; /** * Returns a pointer to the root Naming Context. This ptr is * duplicated via <_duplicate> so that it can be stored into a * <*_var>. */ - CosNaming::NamingContext_ptr get_context (void) const; + CosNaming::NamingContext_ptr get_context () const; protected: /// Reference to the root Naming Context. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index 860828f8187..de2dc9dc6d1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -134,7 +134,7 @@ public: char * naming_service_ior (void); /// Returns a <NamingContext_ptr> for the root Naming Context. - CosNaming::NamingContext_ptr operator-> (void) const; + CosNaming::NamingContext_ptr operator-> () const; protected: struct IOR_Bundle { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index b4b2978482b..babe95ecbab 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -55,7 +55,7 @@ ACE_NS_Node<T>::ACE_NS_Node (const ACE_NS_Node<T> &s) ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_List) template <class T> size_t -ACE_Unbounded_List<T>::size (void) const +ACE_Unbounded_List<T>::size () const { // ACE_TRACE ("ACE_Unbounded_List<T>::size"); return this->cur_size_; @@ -93,7 +93,7 @@ ACE_Unbounded_List<T>::reset (void) } template <class T> void -ACE_Unbounded_List<T>::dump (void) const +ACE_Unbounded_List<T>::dump () const { ACE_TRACE ("ACE_Unbounded_List<T>::dump"); @@ -263,7 +263,7 @@ ACE_Unbounded_List<T>::end (void) ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_List_Iterator) template <class T> void -ACE_Unbounded_List_Iterator<T>::dump (void) const +ACE_Unbounded_List_Iterator<T>::dump () const { // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::dump"); } @@ -293,7 +293,7 @@ ACE_Unbounded_List_Iterator<T>::first (void) } template <class T> int -ACE_Unbounded_List_Iterator<T>::done (void) const +ACE_Unbounded_List_Iterator<T>::done () const { ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::done"); @@ -366,14 +366,14 @@ ACE_Unbounded_List_Iterator<T>::operator!= (const ACE_Unbounded_List_Iterator<T> // --- template <class T> int -ACE_Unbounded_List<T>::is_empty (void) const +ACE_Unbounded_List<T>::is_empty () const { ACE_TRACE ("ACE_Unbounded_List<T>::is_empty"); return this->head_ == this->head_->next_; } template <class T> int -ACE_Unbounded_List<T>::is_full (void) const +ACE_Unbounded_List<T>::is_full () const { ACE_TRACE ("ACE_Unbounded_List<T>::is_full"); return 0; // We should implement a "node of last resort for this..." diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index fdca3733dba..df514f3a72a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -83,7 +83,7 @@ public: int first (void); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Dump the state of an object. void dump () const; @@ -149,10 +149,10 @@ public: // = Check boundary conditions. /// Returns 1 if the container is empty, otherwise returns 0. - int is_empty (void) const; + int is_empty () const; /// Returns 1 if the container is full, otherwise returns 0. - int is_full (void) const; + int is_full () const; // = Classic unordered set operations. @@ -171,7 +171,7 @@ public: int remove (const T &item); /// Size of the set. - size_t size (void) const; + size_t size () const; /// Dump the state of an object. void dump () const; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index 9fcf9bb7edd..e2d89857f97 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -108,7 +108,7 @@ public: /// hash() function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. - u_long hash (void) const; + u_long hash () const; // = Data members. @@ -210,7 +210,7 @@ public: /// <hash> function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. - u_long hash (void) const; + u_long hash () const; // = Data member. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index 16d821211d8..62735014be3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -90,7 +90,7 @@ public: /// <hash> function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. - u_long hash (void) const; + u_long hash () const; // = Data members. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index bb69ea09d2f..ae81025fe23 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -87,7 +87,7 @@ public: protected: void save_attrs (TAO_Notify::NVPList& attrs); - virtual const char * get_admin_type_name (void) const = 0; + virtual const char * get_admin_type_name () const = 0; typedef TAO_Notify_Container_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Container; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl index 12e1b5af3fa..db6dd43b5bf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl @@ -36,7 +36,7 @@ TAO_Notify_Admin::set_default (bool is_default) ACE_INLINE bool -TAO_Notify_Admin::is_default (void) const +TAO_Notify_Admin::is_default () const { return this->is_default_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h index 6cad4f7e189..79b5819ec45 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h @@ -52,10 +52,10 @@ public: void init (); // = Const Accessors - const TAO_Notify_Property_Long& max_global_queue_length (void) const; - const TAO_Notify_Property_Long& max_consumers (void) const; - const TAO_Notify_Property_Long& max_suppliers (void) const; - const TAO_Notify_Property_Boolean& reject_new_events (void) const; + const TAO_Notify_Property_Long& max_global_queue_length () const; + const TAO_Notify_Property_Long& max_consumers () const; + const TAO_Notify_Property_Long& max_suppliers () const; + const TAO_Notify_Property_Boolean& reject_new_events () const; // = Non-const accessors TAO_Notify_Property_Long & max_global_queue_length (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl index c6be9762948..7ef751cc024 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_global_queue_length (void) const +TAO_Notify_AdminProperties::max_global_queue_length () const { return this->max_global_queue_length_; } @@ -14,7 +14,7 @@ TAO_Notify_AdminProperties::max_global_queue_length (void) } ACE_INLINE const TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_consumers (void) const +TAO_Notify_AdminProperties::max_consumers () const { return this->max_consumers_; } @@ -26,7 +26,7 @@ TAO_Notify_AdminProperties::max_consumers (void) } ACE_INLINE const TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_suppliers (void) const +TAO_Notify_AdminProperties::max_suppliers () const { return this->max_suppliers_; } @@ -38,7 +38,7 @@ TAO_Notify_AdminProperties::max_suppliers (void) } ACE_INLINE const TAO_Notify_Property_Boolean& -TAO_Notify_AdminProperties::reject_new_events (void) const +TAO_Notify_AdminProperties::reject_new_events () const { return this->reject_new_events_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index 73a0efdd6ee..a0877cc5bee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -42,7 +42,7 @@ public: virtual ~TAO_Notify_AnyEvent_No_Copy (); /// Get the event type. - virtual const TAO_Notify_EventType& type (void) const; + virtual const TAO_Notify_EventType& type () const; CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const; @@ -74,7 +74,7 @@ public: protected: /// returns a copy of this event allocated from the heap - virtual TAO_Notify_Event * copy (void) const; + virtual TAO_Notify_Event * copy () const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index 54a19ae2ace..e5f29255b3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -44,7 +44,7 @@ public: virtual ~TAO_Notify_CosEC_ProxyPushConsumer (); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; virtual void validate (); virtual void configure(TAO_Notify_SupplierAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index 5e77dd65aa5..3657bc830e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -48,7 +48,7 @@ public: /// Destructor virtual ~TAO_Notify_CosEC_ProxyPushSupplier (); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; // = Interface methods virtual void connect_push_consumer ( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 70e088c628a..425e4f150bc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -44,7 +44,7 @@ public: /// Destructor virtual ~TAO_Notify_ProxyPushConsumer (); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; virtual void load_attrs (const TAO_Notify::NVPList& attrs); virtual void validate (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index 7d80cc85949..28291efd0f2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -50,7 +50,7 @@ public: /// Destructor virtual ~TAO_Notify_ProxyPushSupplier (); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; virtual void load_attrs (const TAO_Notify::NVPList& attrs); virtual void validate (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index a0a635de456..6af79236b79 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -47,7 +47,7 @@ public: virtual void push (const CosNotification::EventBatch& event); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual ACE_CString get_ior () const; /// on reconnect we need to move events from the old consumer /// to the new one diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index af410bc01ae..ccb3d90c259 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -40,7 +40,7 @@ public: void init (CosEventComm::PushSupplier_ptr push_supplier); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual ACE_CString get_ior () const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index dcbc1f9f77d..8a7a61cf680 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -59,7 +59,7 @@ public: static void translate (const CosNotification::StructuredEvent& notification, CORBA::Any& any); /// Get the event type. - virtual const TAO_Notify_EventType& type (void) const = 0; + virtual const TAO_Notify_EventType& type () const = 0; /// Returns true if the filter matches. virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const = 0; @@ -85,7 +85,7 @@ public: /// Return a pointer to a copy of this event on the heap. The /// event is not owned by the caller, so it should not be deleted or /// released. - TAO_Notify_Event* queueable_copy (void) const; + TAO_Notify_Event* queueable_copy () const; /// marshal this event into a CDR buffer (for persistence) virtual void marshal (TAO_OutputCDR& cdr) const = 0; @@ -95,16 +95,16 @@ public: ///= Accessors /// Priority - const TAO_Notify_Property_Short& priority (void) const; + const TAO_Notify_Property_Short& priority () const; /// Timeout - const TAO_Notify_Property_Time& timeout (void) const; + const TAO_Notify_Property_Time& timeout () const; /// Reliable - const TAO_Notify_Property_Boolean& reliable(void) const; + const TAO_Notify_Property_Boolean& reliable() const; /// Event creation time - const ACE_Time_Value& creation_time (void) const; + const ACE_Time_Value& creation_time () const; protected: /// = QoS properties @@ -120,7 +120,7 @@ protected: private: /// Return a pointer to a copy of this event on the heap - virtual TAO_Notify_Event* copy (void) const = 0; + virtual TAO_Notify_Event* copy () const = 0; virtual void release (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl index 13215cceee2..4270742ef5a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl @@ -2,32 +2,32 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const TAO_Notify_Property_Short& -TAO_Notify_Event::priority (void) const +TAO_Notify_Event::priority () const { return this->priority_; } ACE_INLINE const TAO_Notify_Property_Time& -TAO_Notify_Event::timeout (void) const +TAO_Notify_Event::timeout () const { return this->timeout_; } ACE_INLINE const TAO_Notify_Property_Boolean& -TAO_Notify_Event::reliable (void) const +TAO_Notify_Event::reliable () const { return this->reliable_; } ACE_INLINE const ACE_Time_Value& -TAO_Notify_Event::creation_time (void) const +TAO_Notify_Event::creation_time () const { return this->time_; } ACE_INLINE TAO_Notify_Event* -TAO_Notify_Event::queueable_copy (void) const +TAO_Notify_Event::queueable_copy () const { if ( is_on_heap_ ) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 50ae4b8eb32..d14af24693c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -93,7 +93,7 @@ public: //-- Topology_Parent - virtual bool is_persistent (void) const; + virtual bool is_persistent () const; virtual void save_persistent (TAO_Notify::Topology_Saver& saver); virtual bool change_to_parent (void); @@ -117,7 +117,7 @@ public: TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position); TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position); TAO_Notify_Object * follow_id_path (TAO_Notify::IdVec & id_path, size_t position); - virtual TAO_Notify_Object::ID get_id (void) const; + virtual TAO_Notify_Object::ID get_id () const; private: diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index ca5bed88301..b91b3fae433 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -43,7 +43,7 @@ public: virtual ~TAO_Notify_EventType (); /// hash value - u_long hash (void) const; + u_long hash () const; /// Assignment from CosNotification::EventType TAO_Notify_EventType& operator=(const CosNotification::EventType& event_type); @@ -61,10 +61,10 @@ public: static TAO_Notify_EventType special (void); /// Is this the special event (accept everything). - CORBA::Boolean is_special (void) const; + CORBA::Boolean is_special () const; /// Get the type underneath us. - const CosNotification::EventType& native (void) const; + const CosNotification::EventType& native () const; /// Helper to print contents. void dump () const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl index 579d009d734..8a89632f573 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE u_long -TAO_Notify_EventType::hash (void) const +TAO_Notify_EventType::hash () const { return this->hash_value_; } ACE_INLINE const CosNotification::EventType& -TAO_Notify_EventType::native (void) const +TAO_Notify_EventType::native () const { return event_type_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index c9281a4bffd..10844c15661 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -91,10 +91,10 @@ public: void subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed); /// What are the types being offered. - const TAO_Notify_EventTypeSeq& offered_types (void) const; + const TAO_Notify_EventTypeSeq& offered_types () const; /// What are the types being subscribed. - const TAO_Notify_EventTypeSeq& subscription_types (void) const; + const TAO_Notify_EventTypeSeq& subscription_types () const; protected: /// Subscribe <proxy_supplier> to the event type sequence list <seq>. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index cec38aa7217..d8a1ba1ffad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -64,7 +64,7 @@ public: void init (const TAO_Notify_Event * event); /// The creation time of the event to which this request corresponds. - const ACE_Time_Value& creation_time (void) const; + const ACE_Time_Value& creation_time () const; private: ACE_Time_Value time_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h index 1c7441ce69b..5a1457bab05 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h @@ -24,7 +24,7 @@ public: virtual ~TAO_NS_Control (void); /// Return the name of this control object. - const ACE_CString& name (void) const; + const ACE_CString& name () const; /// Execute the control object. Only return false if the command /// specified is not supported. diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h index b86bd4e1147..37ef14ab0b6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h @@ -61,7 +61,7 @@ public: CosNotifyChannelAdmin::ProxyID_out proxy_id); - TAO_MonitorEventChannel* get_ec (void) const; + TAO_MonitorEventChannel* get_ec () const; const ACE_CString & stat_name (void)const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h index bde87202bf9..bbf50f47875 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h @@ -48,7 +48,7 @@ public: ~TAO_MonitorEventChannel (void); /// Return the name of this event channel. - const ACE_CString& name (void) const; + const ACE_CString& name () const; /// Register a single statistic with the EC and statistic registry. bool register_statistic (const ACE_CString& name, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 14e7a5b62bd..8f5b994ecb4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -52,7 +52,7 @@ public: virtual ~TAO_Notify_Object (void); /// This Object's ID - ID id (void) const; + ID id () const; /// Activate virtual CORBA::Object_ptr activate (PortableServer::Servant servant); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl index 40354be0e8e..0e1b720c43c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Long -TAO_Notify_Object::id (void) const +TAO_Notify_Object::id () const { return id_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 49ff94f1226..31590d5984e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -63,7 +63,7 @@ public: void handle_dispatch_exception (void); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const = 0; + virtual ACE_CString get_ior () const = 0; protected: /// Implementation of Peer specific dispatch_updates diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index 83954d0cb07..129b70db084 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -54,13 +54,13 @@ public: void get (CosNotification::PropertySeq& prop_seq); /// Return the name - const char * name (void) const; + const char * name () const; /// Return the value. - CORBA::Boolean value (void) const; + CORBA::Boolean value () const; /// Is the current value valid - CORBA::Boolean is_valid (void) const; + CORBA::Boolean is_valid () const; protected: /// The Property name. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl index 589012eace3..fd624841f29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl @@ -39,19 +39,19 @@ TAO_Notify_Property_Boolean::operator!= (const CORBA::Boolean &rhs) const ACE_INLINE const char * -TAO_Notify_Property_Boolean::name (void) const +TAO_Notify_Property_Boolean::name () const { return this->name_; } ACE_INLINE CORBA::Boolean -TAO_Notify_Property_Boolean::value (void) const +TAO_Notify_Property_Boolean::value () const { return this->value_; } ACE_INLINE CORBA::Boolean -TAO_Notify_Property_Boolean::is_valid (void) const +TAO_Notify_Property_Boolean::is_valid () const { return this->valid_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 42a07f313a2..987171f8857 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -59,13 +59,13 @@ public: void assign (const TYPE& value); /// Return the value. - const TYPE& value (void) const; + const TYPE& value () const; /// Return the name - const char * name (void) const; + const char * name () const; /// Is the current value valid - CORBA::Boolean is_valid (void) const; + CORBA::Boolean is_valid () const; /// Invalidate this property's value. void invalidate (void); @@ -128,13 +128,13 @@ public: int set (const TAO_Notify_PropertySeq& property_seq); /// Return the name - const char * name (void) const; + const char * name () const; /// Return the value. - const TYPE& value (void) const; + const TYPE& value () const; /// Is the current value valid - CORBA::Boolean is_valid (void) const; + CORBA::Boolean is_valid () const; protected: /// The Property name. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl index df92df49e9c..17130a3a969 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl @@ -2,20 +2,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class TYPE> ACE_INLINE const TYPE& -TAO_Notify_PropertyBase_T<TYPE>::value (void) const +TAO_Notify_PropertyBase_T<TYPE>::value () const { return this->value_; } template <class TYPE> ACE_INLINE const char * -TAO_Notify_PropertyBase_T<TYPE>::name (void) const +TAO_Notify_PropertyBase_T<TYPE>::name () const { return this->name_; } template <class TYPE> ACE_INLINE CORBA::Boolean -TAO_Notify_PropertyBase_T<TYPE>::is_valid (void) const +TAO_Notify_PropertyBase_T<TYPE>::is_valid () const { return this->valid_; } @@ -52,13 +52,13 @@ TAO_Notify_PropertyBase_T<TYPE>:: assign (const TYPE& value) template <class TYPE> ACE_INLINE const char * -TAO_Notify_StructProperty_T<TYPE>::name (void) const +TAO_Notify_StructProperty_T<TYPE>::name () const { return this->name_; } template <class TYPE> ACE_INLINE const TYPE& -TAO_Notify_StructProperty_T<TYPE>::value (void) const +TAO_Notify_StructProperty_T<TYPE>::value () const { return this->value_; } @@ -66,7 +66,7 @@ TAO_Notify_StructProperty_T<TYPE>::value (void) const template <class TYPE> ACE_INLINE CORBA::Boolean -TAO_Notify_StructProperty_T<TYPE>::is_valid (void) const +TAO_Notify_StructProperty_T<TYPE>::is_valid () const { return this->valid_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 89d9461cd8d..9a2ab7a4e8c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -98,7 +98,7 @@ public: virtual void save_persistent (TAO_Notify::Topology_Saver& saver); virtual void save_attrs(TAO_Notify::NVPList& attrs); - virtual const char * get_proxy_type_name (void) const = 0; + virtual const char * get_proxy_type_name () const = 0; virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id, const TAO_Notify::NVPList& attrs); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index b376bfceb0d..ca388ef578c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -60,7 +60,7 @@ public: virtual void destroy (void); /// Return true if connected - bool is_connected (void) const; + bool is_connected () const; /// The SA parent. TAO_Notify_SupplierAdmin& supplier_admin (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl index 1449e61150c..5f9deb58c82 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE bool -TAO_Notify_ProxyConsumer::is_connected (void) const +TAO_Notify_ProxyConsumer::is_connected () const { return (this->supplier_.get() != 0); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 14c1afe7413..a49ec312c7b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -69,7 +69,7 @@ public: virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties); /// Returns true if connected - bool is_connected (void) const; + bool is_connected () const; /// Access the Consumer TAO_Notify_Consumer* consumer (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl index 753d2626dad..7f7d079890a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE bool -TAO_Notify_ProxySupplier::is_connected (void) const +TAO_Notify_ProxySupplier::is_connected () const { return ( this->consumer_.get() != 0 ); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h index 51418e38273..201628c5b82 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h @@ -51,20 +51,20 @@ public: int transfer (TAO_Notify_QoSProperties& qos_properties); ///= Accessors - const TAO_Notify_Property_ThreadPool& thread_pool (void) const; - const TAO_Notify_Property_ThreadPoolLanes& thread_pool_lane (void) const; - - const TAO_Notify_Property_Short& event_reliability (void) const; - const TAO_Notify_Property_Short& connection_reliability (void) const; - const TAO_Notify_Property_Short& priority (void) const; - const TAO_Notify_Property_Time& timeout (void) const; - const TAO_Notify_Property_Boolean& stop_time_supported (void) const; - const TAO_Notify_Property_Long& maximum_batch_size (void) const; - const TAO_Notify_Property_Time& pacing_interval (void) const; - const TAO_Notify_Property_Long& max_events_per_consumer (void) const; - const TAO_Notify_Property_Short& discard_policy(void) const; - const TAO_Notify_Property_Short& order_policy(void) const; - const TAO_Notify_Property_Time& blocking_policy(void) const; + const TAO_Notify_Property_ThreadPool& thread_pool () const; + const TAO_Notify_Property_ThreadPoolLanes& thread_pool_lane () const; + + const TAO_Notify_Property_Short& event_reliability () const; + const TAO_Notify_Property_Short& connection_reliability () const; + const TAO_Notify_Property_Short& priority () const; + const TAO_Notify_Property_Time& timeout () const; + const TAO_Notify_Property_Boolean& stop_time_supported () const; + const TAO_Notify_Property_Long& maximum_batch_size () const; + const TAO_Notify_Property_Time& pacing_interval () const; + const TAO_Notify_Property_Long& max_events_per_consumer () const; + const TAO_Notify_Property_Short& discard_policy() const; + const TAO_Notify_Property_Short& order_policy() const; + const TAO_Notify_Property_Time& blocking_policy() const; // The non-const accessors are used during topology load TAO_Notify_Property_Short& event_reliability (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl index 2a0637c73d5..db79570bce6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl @@ -3,87 +3,87 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::event_reliability(void) const +TAO_Notify_QoSProperties::event_reliability() const { return this->event_reliability_; } ACE_INLINE const TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::connection_reliability(void) const +TAO_Notify_QoSProperties::connection_reliability() const { return this->connection_reliability_; } ACE_INLINE const TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::priority(void) const +TAO_Notify_QoSProperties::priority() const { return this->priority_; } ACE_INLINE const TAO_Notify_Property_Time& -TAO_Notify_QoSProperties::timeout(void) const +TAO_Notify_QoSProperties::timeout() const { return this->timeout_; } ACE_INLINE const TAO_Notify_Property_Boolean& -TAO_Notify_QoSProperties::stop_time_supported(void) const +TAO_Notify_QoSProperties::stop_time_supported() const { return this->stop_time_supported_; } ACE_INLINE const TAO_Notify_Property_Long& -TAO_Notify_QoSProperties::maximum_batch_size (void) const +TAO_Notify_QoSProperties::maximum_batch_size () const { return this->maximum_batch_size_; } ACE_INLINE const TAO_Notify_Property_Time& -TAO_Notify_QoSProperties::pacing_interval (void) const +TAO_Notify_QoSProperties::pacing_interval () const { return this->pacing_interval_; } ACE_INLINE const TAO_Notify_Property_Long& -TAO_Notify_QoSProperties::max_events_per_consumer (void) const +TAO_Notify_QoSProperties::max_events_per_consumer () const { return this->max_events_per_consumer_; } ACE_INLINE const TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::discard_policy(void) const +TAO_Notify_QoSProperties::discard_policy() const { return this->discard_policy_; } ACE_INLINE const TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::order_policy(void) const +TAO_Notify_QoSProperties::order_policy() const { return this->order_policy_; } ACE_INLINE const TAO_Notify_Property_ThreadPool& -TAO_Notify_QoSProperties::thread_pool (void) const +TAO_Notify_QoSProperties::thread_pool () const { return this->thread_pool_; } ACE_INLINE const TAO_Notify_Property_ThreadPoolLanes& -TAO_Notify_QoSProperties::thread_pool_lane (void) const +TAO_Notify_QoSProperties::thread_pool_lane () const { return this->thread_pool_lane_; } ACE_INLINE const TAO_Notify_Property_Time& -TAO_Notify_QoSProperties::blocking_policy(void) const +TAO_Notify_QoSProperties::blocking_policy() const { return this->blocking_policy_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index adbacff8bcd..fc1eb795058 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -41,13 +41,13 @@ public: ~TAO_Notify_Refcountable_Guard_T (); /// Redirection operator - T* get (void) const; + T* get () const; /// Boolean test - bool isSet (void) const; + bool isSet () const; /// Redirection operator - T* operator -> (void) const; + T* operator -> () const; /// Dereference operator T& operator * () const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl index 874c8d31942..13455481ebd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl @@ -25,14 +25,14 @@ TAO_Notify_Refcountable_Guard_T<T>::~TAO_Notify_Refcountable_Guard_T () template <class T> ACE_INLINE T* -TAO_Notify_Refcountable_Guard_T<T>::get (void) const +TAO_Notify_Refcountable_Guard_T<T>::get () const { return this->t_; } template <class T> ACE_INLINE bool -TAO_Notify_Refcountable_Guard_T<T>::isSet (void) const +TAO_Notify_Refcountable_Guard_T<T>::isSet () const { return ( this->t_ != static_cast< T* >( 0 ) ); } @@ -40,7 +40,7 @@ TAO_Notify_Refcountable_Guard_T<T>::isSet (void) const template <class T> ACE_INLINE T* -TAO_Notify_Refcountable_Guard_T<T>::operator-> (void) const +TAO_Notify_Refcountable_Guard_T<T>::operator-> () const { ACE_ASSERT ( this->t_ != static_cast< T* >( 0 ) ); return this->t_; @@ -48,7 +48,7 @@ TAO_Notify_Refcountable_Guard_T<T>::operator-> (void) const template <class T> ACE_INLINE T& -TAO_Notify_Refcountable_Guard_T<T>::operator* (void) const +TAO_Notify_Refcountable_Guard_T<T>::operator* () const { ACE_ASSERT ( this->t_ != static_cast< T* >( 0 ) ); return *this->t_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index d69981d552b..33e2f07b2cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -44,7 +44,7 @@ public: /// Destructor virtual ~TAO_Notify_SequenceProxyPushConsumer (); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; virtual void load_attrs (const TAO_Notify::NVPList& attrs); virtual void validate (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 6e3b06398f8..4d277a370d0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -51,7 +51,7 @@ public: virtual ~TAO_Notify_SequenceProxyPushSupplier (); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; virtual void load_attrs (const TAO_Notify::NVPList& attrs); virtual void validate (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index a6472fcb43e..1d5b3a70076 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -64,7 +64,7 @@ public: virtual void push (const CosNotification::EventBatch& event); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual ACE_CString get_ior () const; /// on reconnect we need to move events from the old consumer /// to the new one diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index 486b9af9258..26bdd19cb1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -43,7 +43,7 @@ public: virtual void release (void); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual ACE_CString get_ior () const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index 37bb574e7ca..ae0e1cc86dc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -46,7 +46,7 @@ public: virtual void convert (CosNotification::StructuredEvent& notification) const; /// Get the event type. - virtual const TAO_Notify_EventType& type (void) const; + virtual const TAO_Notify_EventType& type () const; /// Push event to consumer virtual void push (TAO_Notify_Consumer* consumer) const; @@ -69,7 +69,7 @@ public: protected: /// returns a copy of this event allocated on the heap - virtual TAO_Notify_Event * copy (void) const; + virtual TAO_Notify_Event * copy () const; /// Structured Event const CosNotification::StructuredEvent* notification_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index dbbd81d75dc..21ac1c2cd3b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -66,7 +66,7 @@ protected: virtual void disconnect_structured_push_consumer ( ); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; private: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index 49786359491..2df948724bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -66,7 +66,7 @@ public: virtual void disconnect_structured_push_supplier ( ); - virtual const char * get_proxy_type_name (void) const; + virtual const char * get_proxy_type_name () const; virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 0a0ff07041c..5d34c6a6043 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -52,7 +52,7 @@ public: virtual void push (const CosNotification::EventBatch& event); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual ACE_CString get_ior () const; /// on reconnect we need to move events from the old consumer /// to the new one diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index e8ccfa3cdf0..dceff67a466 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -40,7 +40,7 @@ public: void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier); /// Retrieve the ior of this peer - virtual ACE_CString get_ior (void) const; + virtual ACE_CString get_ior () const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index 286f2c6a53b..de3803bc12b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -130,13 +130,13 @@ namespace TAO_Notify /// A bit of a hack because id is unknown to Topology_Object /// the get_id returns the same thing as id -- we just need someone /// to find it for us. - virtual TAO_Notify_Object::ID get_id (void) const; + virtual TAO_Notify_Object::ID get_id () const; /// \brief Get the path of id's from the root to this object. void get_id_path (IdVec & id_path) const; /// \brief Is there an unsaved change for this object or its children? - bool is_changed (void) const; + bool is_changed () const; protected: /// \brief Should this object be saved? @@ -144,7 +144,7 @@ namespace TAO_Notify /// This is a way for send_change() and save_persistent() to find out /// if this object has a persistent QoS connection property. /// \return true (default) if object should be saved. - virtual bool is_persistent (void) const; + virtual bool is_persistent () const; /// \brief Method to report change in this object /// diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index 7b5f475be60..da7ae5f6567 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -54,7 +54,7 @@ public: /// @@ Helper method for the implementation repository, should go /// away - const ACE_INET_Addr& address (void) const; + const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE_INET_Addr *endpoints (void); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl index 3c40a4ca1dd..9ecf57d37c7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& -TAO_UIPMC_Acceptor::address (void) const +TAO_UIPMC_Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index 4135d5f01b9..a0992d8de03 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -94,15 +94,15 @@ public: int set_dscp_codepoint (CORBA::Long dscp_codepoint); // UIPMC Additions - Begin - const ACE_INET_Addr &addr (void) const; + const ACE_INET_Addr &addr () const; void addr (const ACE_INET_Addr &addr); - const ACE_INET_Addr &local_addr (void) const; + const ACE_INET_Addr &local_addr () const; void local_addr (const ACE_INET_Addr &addr); - u_long send_hi_water_mark (void) const; + u_long send_hi_water_mark () const; // UIPMC Additions - End protected: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index b830f785d8f..5b2371230ea 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -53,7 +53,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; protected: /// = More TAO_Connector methods, please check the documentation on diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h index 1d8b07eb972..81aab15f534 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h @@ -73,17 +73,17 @@ public: // = UIPMC_Endpoint-specific methods. /// Return a reference to the object_addr . - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Set the IP multicast address and port. void object_addr (const ACE_INET_Addr &addr); /// Return a pointer to the stringified host address (not including the /// port). This class retains ownership of the address memory. - const char *host (void) const; + const char *host () const; /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); //@@ Frank - deprecate this. @@ -91,10 +91,10 @@ public: //TAO_UIPMC_Connection_Handler *&hint (void); // Access to our <hint_>. /// Do we have a preferred local network interface set for this target? - bool is_preferred_network (void) const; + bool is_preferred_network () const; /// Return the preferred network interface if any. - const char *preferred_network (void) const; + const char *preferred_network () const; /// Transform this endpoint into (potentially) a chain of endpoints /// in preferrence order of specific local interface bind address (if @@ -102,12 +102,12 @@ public: CORBA::ULong preferred_interfaces (TAO_ORB_Core *oc); /// Acessor for the preferred network interface name if set - const char *preferred_if (void) const; + const char *preferred_if () const; private: /// Helper methods for getting and setting the IP address. @@ Vadym - deprecate these. - ACE_UINT32 uint_ip_addr (void) const; + ACE_UINT32 uint_ip_addr () const; void uint_ip_addr (ACE_UINT32 ip_addr); /// Helper method to update the cached object address. @@ Vadym - deprecate this. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl index 32861f9f6c0..d44dee9b2fc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl @@ -2,14 +2,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr & -TAO_UIPMC_Endpoint::object_addr (void) const +TAO_UIPMC_Endpoint::object_addr () const { return this->object_addr_; } ACE_INLINE CORBA::UShort -TAO_UIPMC_Endpoint::port (void) const +TAO_UIPMC_Endpoint::port () const { return this->port_; } @@ -22,7 +22,7 @@ TAO_UIPMC_Endpoint::port (CORBA::UShort p) ACE_INLINE ACE_UINT32 -TAO_UIPMC_Endpoint::uint_ip_addr (void) const +TAO_UIPMC_Endpoint::uint_ip_addr () const { return (((ACE_UINT32)this->class_d_address_[0] << 24) | ((ACE_UINT32)this->class_d_address_[1] << 16) | diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h index ecdf3c5590a..aa6b8127098 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h @@ -42,16 +42,16 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; private: /// Changing the version number can be used to provide backwards diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h index 3ce9702937c..6f5cdb32aa6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h @@ -87,11 +87,11 @@ public: int add_transport_to_cache (void); // UIPMC Additions - Begin - const ACE_INET_Addr &addr (void) const; + const ACE_INET_Addr &addr () const; void addr (const ACE_INET_Addr &addr); - const ACE_INET_Addr &local_addr (void) const; + const ACE_INET_Addr &local_addr () const; void local_addr (const ACE_INET_Addr &addr); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index 8f4a9cdd228..d15514aa6bd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -51,7 +51,7 @@ class TAO_PortableGroup_Export TAO_UIPMC_Profile : public TAO_Profile public: /// The object key delimiter that UIPMC uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -80,17 +80,17 @@ public: /// a useable decode_endpoints virtual int decode (TAO_InputCDR &cdr); virtual void parse_string (const char *string); - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual void encodeAddressInfo (TAO_OutputCDR &stream) const; virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); virtual IOP::TaggedProfile &create_tagged_profile (void); virtual void request_target_specifier ( TAO_Target_Specification &target_spec, TAO_Target_Specification::TAO_Target_Address r); - virtual int supports_multicast (void) const; + virtual int supports_multicast () const; virtual void addressing_mode (CORBA::Short addr_mode); static int extract_group_component (const IOP::TaggedProfile &profile, PortableGroup::TagGroupTaggedComponent &group); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h index 8c6b648fbe6..821082e9cda 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h @@ -67,9 +67,9 @@ namespace TAO_PG /// Returns the time when the first fragment was received or /// ACE_Time_Value::zero if the whole packet was not able to /// reconstruct for some reason. - ACE_Time_Value const &started (void) const; + ACE_Time_Value const &started () const; - CORBA::ULong data_length (void) const; + CORBA::ULong data_length () const; /// Copies fragments to buf. Caller ensures that the buf is big enough /// for all fragments. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h index f4b283e939e..8d5624add13 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h @@ -45,8 +45,8 @@ public: virtual int wait (ACE_Time_Value *max_wait_time, TAO_Synch_Reply_Dispatcher &rd); virtual int register_handler (void); - virtual bool non_blocking (void) const; - virtual bool can_process_upcalls (void) const; + virtual bool non_blocking () const; + virtual bool can_process_upcalls () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h index 62a80ca2f2b..ed8084de762 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h @@ -67,32 +67,32 @@ public: * @name Member Accessors */ //@{ - TAO_PG::Fragments_Cleanup_Strategy *fragments_cleanup_strategy (void) const; + TAO_PG::Fragments_Cleanup_Strategy *fragments_cleanup_strategy () const; /// Get Maximum number of fragments allowed. - u_long max_fragments (void) const; + u_long max_fragments () const; /// Get MTU value (roughly). - u_long max_fragment_size (void) const; + u_long max_fragment_size () const; /// Get time required for transfering one maximum sized fragment. - u_long max_fragment_rate (void) const; + u_long max_fragment_rate () const; /// Get number of bytes that can be sent without delay. - u_long send_hi_water_mark (void) const; + u_long send_hi_water_mark () const; /// Get the desired socket transmit buffer's size in bytes (Zero is unspecified). - u_long send_buffer_size (void) const; + u_long send_buffer_size () const; /// Get the desired socket receive buffer's size in bytes (Zero is unspecified). - u_long receive_buffer_size (void) const; + u_long receive_buffer_size () const; //@} /// Get the client-side transmission rate throttling enable flag. - bool enable_throttling (void) const; + bool enable_throttling () const; /// Get the server-side eager complete message dequeuing enable flag. - bool enable_eager_dequeue (void) const; + bool enable_eager_dequeue () const; private: enum Fragments_Cleanup_Strategy_Type diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 5dc9c9f71b4..e057cbf5925 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -60,7 +60,7 @@ public: virtual bool operator == (const CosProperty_Hash_Key &hash_key) const; // The operator for hash binding and "find"ing. - virtual u_long hash (void) const; + virtual u_long hash () const; // The function that computes a hash value. // private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index bff291674b7..6a60f33a322 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -84,7 +84,7 @@ namespace TAO /// Retrieve the CSIv1 SSLIOP::SSL component associated with the /// endpoints set up by this acceptor. - const ::SSLIOP::SSL &ssl_component (void) const; + const ::SSLIOP::SSL &ssl_component () const; private: /// Implement the common part of the open*() methods. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl index ed65fecb083..df5369150b7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const SSLIOP::SSL & -TAO::SSLIOP::Acceptor::ssl_component (void) const +TAO::SSLIOP::Acceptor::ssl_component () const { return this->ssl_component_; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index 8e38967aa94..d468ae1ac59 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -110,7 +110,7 @@ namespace TAO bool operator== (const SSLIOP_Credentials &rhs); - CORBA::ULong hash (void) const; + CORBA::ULong hash () const; // The static operations. static SSLIOP::Credentials_ptr _duplicate (SSLIOP::Credentials_ptr obj); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 590cf0ebd8c..dc39617d0f5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -116,7 +116,7 @@ namespace TAO return (Current_ptr)0; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl index b796efe0e6e..bdcb30639af 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_IIOP_Endpoint * -TAO_SSLIOP_Endpoint::iiop_endpoint (void) const +TAO_SSLIOP_Endpoint::iiop_endpoint () const { return this->iiop_endpoint_; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 7fcacc9fbf5..aa19cfd95f4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -68,16 +68,16 @@ namespace TAO virtual int match_prefix (const ACE_CString & prefix); /// Returns the prefix used by the protocol. - virtual const char * prefix (void) const; + virtual const char * prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. virtual TAO_Acceptor * make_acceptor (void); virtual TAO_Connector * make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index 4261c841534..24dbbc2d4eb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -96,17 +96,17 @@ namespace TAO OpenSSL_st_var<T> & operator= (T const & st); //@} - T const * operator-> (void) const; + T const * operator-> () const; T* operator-> (void); operator const T& () const; operator T& (); - T* in (void) const; + T* in () const; T*& inout (void); T*& out (void); T* _retn (void); - T* ptr (void) const; + T* ptr () const; private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl index b14d3ae93d1..06691af5980 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl @@ -103,7 +103,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::operator= (T const & st) } template <typename T> ACE_INLINE T const * -TAO::SSLIOP::OpenSSL_st_var<T>::operator-> (void) const +TAO::SSLIOP::OpenSSL_st_var<T>::operator-> () const { return this->st_; } @@ -127,7 +127,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::operator T &() } template <typename T> ACE_INLINE T * -TAO::SSLIOP::OpenSSL_st_var<T>::in (void) const +TAO::SSLIOP::OpenSSL_st_var<T>::in () const { return this->st_; } @@ -156,7 +156,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::_retn (void) } template <typename T> ACE_INLINE T * -TAO::SSLIOP::OpenSSL_st_var<T>::ptr (void) const +TAO::SSLIOP::OpenSSL_st_var<T>::ptr () const { return this->st_; } diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 968064cbc37..0033bc0613a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -586,9 +586,9 @@ public: Time deadline () const; // accessor and mutator for next and prev slices for this dispatch - TimeLine_Entry *next (void) const; + TimeLine_Entry *next () const; void next (TimeLine_Entry *); - TimeLine_Entry *prev (void) const; + TimeLine_Entry *prev () const; void prev (TimeLine_Entry *); bool operator < (const TimeLine_Entry&) const; diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl index 54131103e55..9e3b672e574 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl @@ -375,7 +375,7 @@ TimeLine_Entry::deadline () const // accessor for next slice for this dispatch ACE_INLINE TimeLine_Entry * -TimeLine_Entry::next (void) const +TimeLine_Entry::next () const { return next_; } @@ -389,7 +389,7 @@ TimeLine_Entry::next (TimeLine_Entry *t) // accessor for previous slice for this dispatch ACE_INLINE TimeLine_Entry * -TimeLine_Entry::prev (void) const +TimeLine_Entry::prev () const { return prev_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index 09218e77bbb..4d7d76cb14b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -78,7 +78,7 @@ namespace TAO * The concrete thread-specific storage SecurityCurrent * implementations will each use this slot ID. */ - size_t tss_slot (void) const; + size_t tss_slot () const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl index 1553ccaeb93..a0f7eac384d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE size_t -TAO::SL3::SecurityCurrent::tss_slot (void) const +TAO::SL3::SecurityCurrent::tss_slot () const { return this->tss_slot_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index cb8a06bff3f..a8427985509 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -64,7 +64,7 @@ namespace TAO //@} /// Return the unique tag that identifies the concrete subclass. - virtual CORBA::ULong tag (void) const = 0; + virtual CORBA::ULong tag () const = 0; }; } // End Security namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 848378452a3..a247302d9f0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -80,7 +80,7 @@ public: * The concrete TSS SecurityCurrent implementations will each use * this slot ID. */ - size_t tss_slot (void) const; + size_t tss_slot () const; protected: /// Destructor diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl index 04fe1c19fe3..a799af3e796 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE size_t -TAO_Security_Current::tss_slot (void) const +TAO_Security_Current::tss_slot () const { return this->tss_slot_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index 3931509fc0a..fad2ea9eeb6 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -75,7 +75,7 @@ namespace TAO //@} /// Return the unique tag that identifies the concrete subclass. - virtual CORBA::ULong tag (void) const = 0; + virtual CORBA::ULong tag () const = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index 3f03064bb22..d10e0e61d3b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -60,7 +60,7 @@ public: virtual int accept (TAO_Constraint_Visitor* visitor) = 0; /// Return the expression type represented by this node. - virtual TAO_Expression_Type expr_type (void) const = 0; + virtual TAO_Expression_Type expr_type () const = 0; virtual ~TAO_Constraint (void) {} }; @@ -78,7 +78,7 @@ public: virtual int accept (TAO_Constraint_Visitor* visitor); - virtual TAO_Expression_Type expr_type (void) const + virtual TAO_Expression_Type expr_type () const { return this->type_; } private: @@ -102,14 +102,14 @@ public: virtual ~TAO_Binary_Constraint (void); - virtual TAO_Expression_Type expr_type (void) const + virtual TAO_Expression_Type expr_type () const { return this->op_; } /// Return the left operand of the binary expression - TAO_Constraint* left_operand (void) const; + TAO_Constraint* left_operand () const; /// Return the right operand of the binary expression - TAO_Constraint* right_operand (void) const; + TAO_Constraint* right_operand () const; // Allow double dispatching without creating an inundation of // classes by using a dispatch table of static method pointers to @@ -158,7 +158,7 @@ public: virtual int accept (TAO_Constraint_Visitor* visitor); - virtual TAO_Expression_Type expr_type (void) const + virtual TAO_Expression_Type expr_type () const { return this->op_; } TAO_Constraint* operand (void); @@ -189,10 +189,10 @@ public: virtual int accept (TAO_Constraint_Visitor* visitor); - virtual TAO_Expression_Type expr_type (void) const; + virtual TAO_Expression_Type expr_type () const; /// Returns the name of the property. - const char* name (void) const; + const char* name () const; private: TAO_Property_Constraint (const TAO_Property_Constraint&); @@ -231,19 +231,19 @@ public: /// Visitor accept methods. virtual int accept (TAO_Constraint_Visitor* visitor); - virtual TAO_Expression_Type expr_type (void) const + virtual TAO_Expression_Type expr_type () const { return type_; } /// Assignment operator. void operator= (const TAO_Literal_Constraint& co); // Conversion routines. - operator CORBA::Boolean (void) const; - operator CORBA::ULongLong (void) const; - operator CORBA::LongLong (void) const; - operator CORBA::Double (void) const; - operator const char* (void) const; - operator const CORBA::Any* (void) const; + operator CORBA::Boolean () const; + operator CORBA::ULongLong () const; + operator CORBA::LongLong () const; + operator CORBA::Double () const; + operator const char* () const; + operator const CORBA::Any* () const; // Return the type represented by this MysteryOperand. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 9946ed22ff9..b915e373f07 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -147,19 +147,19 @@ public: ~TAO_Support_Attributes_i (); // = Accessor methods. - CORBA::Boolean supports_modifiable_properties (void) const; + CORBA::Boolean supports_modifiable_properties () const; void supports_modifiable_properties (CORBA::Boolean); - CORBA::Boolean supports_dynamic_properties (void) const; + CORBA::Boolean supports_dynamic_properties () const; void supports_dynamic_properties (CORBA::Boolean); - CORBA::Boolean supports_proxy_offers (void) const; + CORBA::Boolean supports_proxy_offers () const; void supports_proxy_offers (CORBA::Boolean); - CosTrading::TypeRepository_ptr type_repos (void) const; + CosTrading::TypeRepository_ptr type_repos () const; void type_repos (CosTrading::TypeRepository_ptr); - CosTradingRepos::ServiceTypeRepository_ptr service_type_repos (void) const; + CosTradingRepos::ServiceTypeRepository_ptr service_type_repos () const; private: @@ -199,7 +199,7 @@ public: // = Accessor methods. - CosTrading::FollowOption max_link_follow_policy (void) const; + CosTrading::FollowOption max_link_follow_policy () const; void max_link_follow_policy (CosTrading::FollowOption); private: @@ -228,37 +228,37 @@ public: // = Accessor methods. - CORBA::ULong def_search_card (void) const; + CORBA::ULong def_search_card () const; void def_search_card (CORBA::ULong); - CORBA::ULong max_search_card (void) const; + CORBA::ULong max_search_card () const; void max_search_card (CORBA::ULong); - CORBA::ULong def_match_card (void) const; + CORBA::ULong def_match_card () const; void def_match_card (CORBA::ULong); - CORBA::ULong max_match_card (void) const; + CORBA::ULong max_match_card () const; void max_match_card (CORBA::ULong); - CORBA::ULong def_return_card (void) const; + CORBA::ULong def_return_card () const; void def_return_card (CORBA::ULong); - CORBA::ULong max_return_card (void) const; + CORBA::ULong max_return_card () const; void max_return_card (CORBA::ULong); - CORBA::ULong max_list (void) const; + CORBA::ULong max_list () const; void max_list (CORBA::ULong); - CORBA::ULong def_hop_count (void) const; + CORBA::ULong def_hop_count () const; void def_hop_count (CORBA::ULong); - CORBA::ULong max_hop_count (void) const; + CORBA::ULong max_hop_count () const; void max_hop_count (CORBA::ULong); - CosTrading::FollowOption def_follow_policy (void) const; + CosTrading::FollowOption def_follow_policy () const; void def_follow_policy (CosTrading::FollowOption); - CosTrading::FollowOption max_follow_policy (void) const; + CosTrading::FollowOption max_follow_policy () const; void max_follow_policy (CosTrading::FollowOption); private: @@ -323,35 +323,35 @@ public: /// Returns an object reference to the Lookup interface of the trader. /// Returns nil if the trader does not support Lookup interface. - CosTrading::Lookup_ptr lookup_if (void) const; + CosTrading::Lookup_ptr lookup_if () const; /// Set the reference to the Lookup interface. void lookup_if (CosTrading::Lookup_ptr); /// Returns object reference for the Register interface of the trader. /// Returns nil if the trader does not support Register interface. - CosTrading::Register_ptr register_if (void) const; + CosTrading::Register_ptr register_if () const; /// Set the reference to the Register interface of the trader. void register_if (CosTrading::Register_ptr); /// Returns object reference for the Link interface of the trader. /// Returns nil if the trader does not support Link interface. - CosTrading::Link_ptr link_if (void) const; + CosTrading::Link_ptr link_if () const; /// Set the reference to the Link interface of the trader. void link_if (CosTrading::Link_ptr); /// Returns object reference to the Proxy interface of the trader. /// Returns nil if the trader does not support Proxy interface. - CosTrading::Proxy_ptr proxy_if (void) const; + CosTrading::Proxy_ptr proxy_if () const; /// Set the reference to the Proxy interface of the trader. void proxy_if (CosTrading::Proxy_ptr); /// Returns object reference for the Admin interface of the trader. /// Returns nil if the trader does not support Admin interface. - CosTrading::Admin_ptr admin_if (void) const; + CosTrading::Admin_ptr admin_if () const; /// Set the reference to the Admin interface of the trader. void admin_if (CosTrading::Admin_ptr); @@ -404,19 +404,19 @@ public: TAO_Trading_Components_i &trading_components (void); - const TAO_Trading_Components_i &trading_components (void) const; + const TAO_Trading_Components_i &trading_components () const; TAO_Import_Attributes_i &import_attributes (void); - const TAO_Import_Attributes_i &import_attributes (void) const; + const TAO_Import_Attributes_i &import_attributes () const; TAO_Support_Attributes_i &support_attributes (void); - const TAO_Support_Attributes_i &support_attributes (void) const; + const TAO_Support_Attributes_i &support_attributes () const; TAO_Link_Attributes_i &link_attributes (void); - const TAO_Link_Attributes_i &link_attributes (void) const; + const TAO_Link_Attributes_i &link_attributes () const; // = Accessor for trader's lock. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index cf24bbcd1d3..702038862df 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -270,7 +270,7 @@ public: ~TAO_Policies (void); - CORBA::ULong search_card (void) const; + CORBA::ULong search_card () const; // BEGIN SPEC // The "search_card" policy indicates to the trader the maximum @@ -281,7 +281,7 @@ public: // trader's def_search_card attribute is used. // END SPEC - CORBA::ULong match_card (void) const; + CORBA::ULong match_card () const; // BEGIN SPEC // The "match_card" policy indicates to the trader the maximum @@ -292,7 +292,7 @@ public: // attribute is used. // END SPEC - CORBA::ULong return_card (void) const; + CORBA::ULong return_card () const; // BEGIN SPEC // The "return_card" policy indicates to the trader the maximum @@ -305,7 +305,7 @@ public: // = Offer consideration policies - CORBA::Boolean use_modifiable_properties (void) const; + CORBA::Boolean use_modifiable_properties () const; // BEGIN SPEC // The "use_modifiable_properties" policy indicates whether the @@ -317,7 +317,7 @@ public: // included. // END SPEC - CORBA::Boolean use_dynamic_properties (void) const; + CORBA::Boolean use_dynamic_properties () const; // BEGIN SPEC // The "use_dynamic_properties" policy indicates whether the trader @@ -329,7 +329,7 @@ public: // included. // END SPEC - CORBA::Boolean use_proxy_offers (void) const; + CORBA::Boolean use_proxy_offers () const; // BEGIN SPEC // The "use_proxy_offers" policy indicates whether the trader should @@ -340,7 +340,7 @@ public: // specified, such offers will be included. // END SPEC - CORBA::Boolean exact_type_match (void) const; + CORBA::Boolean exact_type_match () const; // BEGIN SPEC // The "exact_type_match" policy indicates to the trader whether the @@ -368,10 +368,10 @@ public: * "starting_trader" policy with the first component removed. * END SPEC */ - const CosTrading::TraderName* starting_trader (void) const; + const CosTrading::TraderName* starting_trader () const; /// Determine the link follow policy for this query overall. - CosTrading::FollowOption link_follow_rule (void) const; + CosTrading::FollowOption link_follow_rule () const; // BEGIN SPEC //The "link_follow_rule" policy indicates how the client wishes @@ -392,7 +392,7 @@ public: */ CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const; - CORBA::ULong hop_count (void) const; + CORBA::ULong hop_count () const; // BEGIN SPEC // The "hop_count" policy indicates to the trader the maximum number @@ -408,7 +408,7 @@ public: /// Return the request_id passed to the query method across a link to /// another trader. - const CosTrading::Admin::OctetSeq* request_id (void) const; + const CosTrading::Admin::OctetSeq* request_id () const; /// Policies to forward to the next trader in a federated query. void copy_to_pass (CosTrading::PolicySeq& policy_seq, @@ -506,11 +506,11 @@ public: void exact_type_match (CORBA::Boolean exact_type); /// Return the constructed policy sequence. - operator const CosTrading::PolicySeq& (void) const; + operator const CosTrading::PolicySeq& () const; /// Return a PolicySeq suitable for passing to the query method of /// the Lookup interface. - const CosTrading::PolicySeq& policy_seq (void) const; + const CosTrading::PolicySeq& policy_seq () const; private: @@ -659,8 +659,8 @@ public: CosTrading::PolicyNameSeq* limits_applied (void); /// Accessors to retrieve the adjusted cardinalities. - CORBA::ULong search_card_remaining (void) const; - CORBA::ULong match_card_remaining (void) const; + CORBA::ULong search_card_remaining () const; + CORBA::ULong match_card_remaining () const; private: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index 15b264d3e34..032a70bbe8a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -58,7 +58,7 @@ ORBInitializer::load_alert (void) } ServerRequestInterceptor * -ORBInitializer::interceptor (void) const +ORBInitializer::interceptor () const { return this->interceptor_; } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h index 8f3d00e3bde..ca9288a9379 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h @@ -64,7 +64,7 @@ public: /// Return a reference to the LoadAlert object. TAO_LB_LoadAlert & load_alert (void); - ServerRequestInterceptor * interceptor (void) const; + ServerRequestInterceptor * interceptor () const; private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h index 8da358fa34d..86d5de46f3e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h @@ -77,13 +77,13 @@ public: //@{ /** @name Accessors */ - Supplier *supplier (void) const; + Supplier *supplier () const; - Consumer *consumer (void) const; + Consumer *consumer () const; - Loopback_Supplier *loopback_supplier (void) const; + Loopback_Supplier *loopback_supplier () const; - Loopback_Consumer *loopback_consumer (void) const; + Loopback_Consumer *loopback_consumer () const; //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl index c8386b7e077..6f858db202d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl @@ -10,25 +10,25 @@ Client_Group::Client_Group (void) } ACE_INLINE Supplier * -Client_Group::supplier (void) const +Client_Group::supplier () const { return this->client_pair_.supplier (); } ACE_INLINE Consumer * -Client_Group::consumer (void) const +Client_Group::consumer () const { return this->client_pair_.consumer (); } ACE_INLINE Loopback_Supplier * -Client_Group::loopback_supplier (void) const +Client_Group::loopback_supplier () const { return this->loopback_pair_.loopback_supplier (); } ACE_INLINE Loopback_Consumer * -Client_Group::loopback_consumer (void) const +Client_Group::loopback_consumer () const { return this->loopback_pair_.loopback_consumer (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h index 5f494600416..d2a3e8c656b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h @@ -80,9 +80,9 @@ public: //@{ /** @name Accessors */ - Supplier *supplier (void) const; + Supplier *supplier () const; - Consumer *consumer (void) const; + Consumer *consumer () const; //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl index 00ed4bf5241..68caec3c217 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl @@ -10,13 +10,13 @@ Client_Pair::Client_Pair (void) } ACE_INLINE Supplier * -Client_Pair::supplier (void) const +Client_Pair::supplier () const { return this->supplier_.in (); } ACE_INLINE Consumer * -Client_Pair::consumer (void) const +Client_Pair::consumer () const { return this->consumer_.in (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h index 670ac2a2441..d21244b7387 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h @@ -59,9 +59,9 @@ public: //@{ /** @name Accessors */ - Loopback_Supplier *loopback_supplier (void) const; + Loopback_Supplier *loopback_supplier () const; - Loopback_Consumer *loopback_consumer (void) const; + Loopback_Consumer *loopback_consumer () const; //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl index 42292537d45..a338fed194f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl @@ -10,13 +10,13 @@ Loopback_Pair::Loopback_Pair (void) } ACE_INLINE Loopback_Supplier * -Loopback_Pair::loopback_supplier (void) const +Loopback_Pair::loopback_supplier () const { return this->loopback_supplier_.in (); } ACE_INLINE Loopback_Consumer * -Loopback_Pair::loopback_consumer (void) const +Loopback_Pair::loopback_consumer () const { return this->loopback_consumer_.in (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl index d8a79d51cf0..7d7371f190a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl @@ -11,13 +11,13 @@ ORB_Holder::orb (void) } ACE_INLINE -ORB_Holder::operator CORBA::ORB_ptr (void) const +ORB_Holder::operator CORBA::ORB_ptr () const { return this->orb_.in (); } ACE_INLINE CORBA::ORB_ptr -ORB_Holder::operator-> (void) const +ORB_Holder::operator-> () const { return this->orb_.in (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h index 68c7fe741ce..fc7ece30b54 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.h @@ -30,7 +30,7 @@ public: int svc (void); /// Smart-pointer operator - CORBA::ORB_ptr operator-> (void) const; + CORBA::ORB_ptr operator-> () const; private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl index 0fb7b20d29d..0e97454caf7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl @@ -5,7 +5,7 @@ */ ACE_INLINE CORBA::ORB_ptr -ORB_Task::operator-> (void) const +ORB_Task::operator-> () const { return this->orb_.in (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h index c817a22f08c..d65c7180ab8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h @@ -31,10 +31,10 @@ public: int nthreads); /// Return the thread pool lanes appropriate for the benchamrks - const RTCORBA::ThreadpoolLanes & lanes (void) const; + const RTCORBA::ThreadpoolLanes & lanes () const; /// Return the priority of the process - RTCORBA::Priority process_priority (void) const; + RTCORBA::Priority process_priority () const; private: void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.inl index 3c86500140c..ebb52289761 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.inl @@ -5,13 +5,13 @@ */ ACE_INLINE const RTCORBA::ThreadpoolLanes & -RTCORBA_Setup::lanes (void) const +RTCORBA_Setup::lanes () const { return this->lanes_; } ACE_INLINE RTCORBA::Priority -RTCORBA_Setup::process_priority (void) const +RTCORBA_Setup::process_priority () const { return this->process_priority_; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h index 82ee76d81fa..19aac261469 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h @@ -34,7 +34,7 @@ public: int nthreads); /// Return non-zero if RTCORBA is enabled - int use_rt_corba (void) const; + int use_rt_corba () const; /// Return the underlying RTCORBA_Setup pointer RTCORBA_Setup *rtcorba_setup (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl index 61d4ce13605..42071dbb049 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl @@ -5,7 +5,7 @@ */ ACE_INLINE int -RTClient_Setup::use_rt_corba (void) const +RTClient_Setup::use_rt_corba () const { return this->use_rt_corba_; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h index 283983e7234..09c7381a4d9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.h @@ -29,21 +29,21 @@ public: */ //@{ /// Return the process scheduling class selected for the test - int prc_sched_class (void) const; + int prc_sched_class () const; /// Return the thread scheduling class selected for the test - int thr_sched_class (void) const; + int thr_sched_class () const; /// Return the process priority selected for the test - int priority_process (void) const; + int priority_process () const; /// Return the (thread, native) priority for the high priority /// task(s) in the test - int priority_high (void) const; + int priority_high () const; /// Return the (thread, native) priority for the low priority /// task(s) in the test - int priority_low (void) const; + int priority_low () const; //@} diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.inl index f61d2d90aa6..6f52979ea6b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RT_Class.inl @@ -5,31 +5,31 @@ */ ACE_INLINE int -RT_Class::prc_sched_class (void) const +RT_Class::prc_sched_class () const { return this->prc_sched_class_; } ACE_INLINE int -RT_Class::thr_sched_class (void) const +RT_Class::thr_sched_class () const { return this->thr_sched_class_; } ACE_INLINE int -RT_Class::priority_process (void) const +RT_Class::priority_process () const { return this->priority_process_; } ACE_INLINE int -RT_Class::priority_high (void) const +RT_Class::priority_high () const { return this->priority_high_; } ACE_INLINE int -RT_Class::priority_low (void) const +RT_Class::priority_low () const { return this->priority_low_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index edf9b208740..167b84ac85e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -205,7 +205,7 @@ Distributer::init (int argc, ACE_TCHAR *argv[]) } int -Distributer::done (void) const +Distributer::done () const { return this->done_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h index 111238b0802..687d48db000 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h @@ -124,7 +124,7 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); // Flag to know when we are done. - int done (void) const; + int done () const; void done (int); /// Accessor to connection manager. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index d96e98353b5..29dac6fe83a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -368,7 +368,7 @@ Distributer::init (int argc, } bool -Distributer::done (void) const +Distributer::done () const { return this->done_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index 6eca9f6a293..1a4a1038377 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -188,7 +188,7 @@ public: ACE_TCHAR **argv); /// Flag to know when we are done. - bool done (void) const; + bool done () const; void done (bool); //// Accessor to connection manager. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index ed682834aea..08e7e6c15ab 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -269,7 +269,7 @@ Distributer::receiver_streamctrl (void) } int -Distributer::done (void) const +Distributer::done () const { return this->done_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h index 2f1a7ffa800..071fc07d339 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h @@ -133,7 +133,7 @@ public: TAO_AV_Protocol_Object *sender_protocol_object (void); // Flag to know when we are done. - int done (void) const; + int done () const; void done (int); protected: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h index 757c1cb9c91..8fb1f0083e1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h @@ -36,7 +36,7 @@ public: Receiver_Stats (void); /// The number of samples received so far - ACE_UINT32 samples_count (void) const; + ACE_UINT32 samples_count () const; /// Record one sample. void sample (ACE_UINT64 value); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl index 6dda78254f7..cde3e4b96ea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl @@ -11,7 +11,7 @@ Receiver_Stats::Receiver_Stats (void) } ACE_INLINE ACE_UINT32 -Receiver_Stats::samples_count (void) const +Receiver_Stats::samples_count () const { return this->samples_count_; } diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp index ba73b4a8f06..cbfb9a5c7a9 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp @@ -26,7 +26,7 @@ void NamingTask::end() } CosNaming::NamingContext_ptr -NamingTask::root (void) const +NamingTask::root () const { return CosNaming::NamingContext::_duplicate (root_); } diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h index 9064ea21d21..ca2819c9e9d 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h @@ -14,7 +14,7 @@ public: void waitInit (); void end(); - CosNaming::NamingContext_ptr root (void) const; + CosNaming::NamingContext_ptr root () const; private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 9c0adf80b8c..587936448f3 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -477,7 +477,7 @@ Test_Supplier::disconnect_push_supplier (void) RtecEventChannelAdmin::ProxyPushConsumer::_nil (); } -int Test_Supplier::supplier_id (void) const +int Test_Supplier::supplier_id () const { return this->supplier_id_; } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index adaf3a06890..9726d936a7e 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -47,7 +47,7 @@ public: virtual void disconnect_push_supplier (void); // The methods in the skeleton. - RtecEventComm::EventSourceID supplier_id (void) const; + RtecEventComm::EventSourceID supplier_id () const; // The supplier ID. RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void); diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index ed75cb23729..a21e9be6afa 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -693,7 +693,7 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec, } int -ECM_Supplier::supplier_id (void) const +ECM_Supplier::supplier_id () const { return this->supplier_id_; } @@ -1024,7 +1024,7 @@ ECM_Local_Federation::close_receiver (void) } void -ECM_Local_Federation::dump_results (void) const +ECM_Local_Federation::dump_results () const { double unfiltered_ratio = 0; if (this->recv_count_ != 0) diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index 944e88002da..1311ca53bf9 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -89,13 +89,13 @@ public: ~ECM_Federation (void); // Dtor - const char* name (void) const; + const char* name () const; // The name of the federation.... - CORBA::UShort mcast_port (void) const; + CORBA::UShort mcast_port () const; // The port used by this federation to receive mcast messages. - int supplier_types (void) const; + int supplier_types () const; // The number of different event types published by this federation. const char* supplier_name (CORBA::ULong i) const; @@ -104,7 +104,7 @@ public: CORBA::ULong supplier_ipaddr (CORBA::ULong i) const; // The ipaddr (in host byte order) of the event type <i> - int consumer_types (void) const; + int consumer_types () const; // The number of different event types consumed by this federation. const char* consumer_name (CORBA::ULong i) const; @@ -176,7 +176,7 @@ public: RtecEventComm::Time interval); // Connect as a consumer to start receiving events. - RtecEventComm::EventSourceID supplier_id (void) const; + RtecEventComm::EventSourceID supplier_id () const; // The supplier ID. void push (const RtecEventComm::EventSet& events); @@ -276,7 +276,7 @@ public: const RtecEventComm::EventSet& event); // The consumer just received an event. - const ECM_Federation *federation (void) const; + const ECM_Federation *federation () const; // The federation description. void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, @@ -286,7 +286,7 @@ public: void close_receiver (void); // Close the UDP receiver, disconnect from the EC - void dump_results (void) const; + void dump_results () const; // Report the results back to the user... void subscribed_bit (int i, CORBA::Boolean x); @@ -295,12 +295,12 @@ public: // that we actually publish. // = Delegate on the federation description - const char* name (void) const; - CORBA::UShort mcast_port (void) const; - int supplier_types (void) const; + const char* name () const; + CORBA::UShort mcast_port () const; + int supplier_types () const; const char* supplier_name (CORBA::ULong i) const; CORBA::ULong supplier_ipaddr (CORBA::ULong i) const; - int consumer_types (void) const; + int consumer_types () const; const char* consumer_name (CORBA::ULong i) const; CORBA::ULong consumer_ipaddr (CORBA::ULong i) const; diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl index 62e0128ade6..a4be43018e0 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl @@ -7,19 +7,19 @@ ECM_Federation::sender_local_addr (ACE_INET_Addr& addr) ACE_INLINE const char* -ECM_Federation::name (void) const +ECM_Federation::name () const { return this->name_; } ACE_INLINE CORBA::UShort -ECM_Federation::mcast_port (void) const +ECM_Federation::mcast_port () const { return this->mcast_port_; } ACE_INLINE int -ECM_Federation::supplier_types (void) const +ECM_Federation::supplier_types () const { return this->supplier_types_; } @@ -41,7 +41,7 @@ ECM_Federation::supplier_ipaddr (CORBA::ULong i) const } ACE_INLINE int -ECM_Federation::consumer_types (void) const +ECM_Federation::consumer_types () const { return this->consumer_types_; } @@ -63,25 +63,25 @@ ECM_Federation::consumer_ipaddr (CORBA::ULong i) const } ACE_INLINE const ECM_Federation* -ECM_Local_Federation::federation (void) const +ECM_Local_Federation::federation () const { return this->federation_; } ACE_INLINE const char* -ECM_Local_Federation::name (void) const +ECM_Local_Federation::name () const { return this->federation_->name (); } ACE_INLINE CORBA::UShort -ECM_Local_Federation::mcast_port (void) const +ECM_Local_Federation::mcast_port () const { return this->federation_->mcast_port (); } ACE_INLINE int -ECM_Local_Federation::supplier_types (void) const +ECM_Local_Federation::supplier_types () const { return this->federation_->supplier_types (); } @@ -99,7 +99,7 @@ ECM_Local_Federation::supplier_ipaddr (CORBA::ULong i) const } ACE_INLINE int -ECM_Local_Federation::consumer_types (void) const +ECM_Local_Federation::consumer_types () const { return this->federation_->consumer_types (); } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index b94687511fa..feeff227a42 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -1402,7 +1402,7 @@ Test_Supplier::disconnect_push_consumer (void) { } -int Test_Supplier::supplier_id (void) const +int Test_Supplier::supplier_id () const { return this->supplier_id_; } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index c0e92439226..57c4b31dc6e 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -68,7 +68,7 @@ public: virtual void disconnect_push_supplier (void); // The methods in the skeleton. - RtecEventComm::EventSourceID supplier_id (void) const; + RtecEventComm::EventSourceID supplier_id () const; // The supplier ID. private: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index eed3d2b98c1..60cfca06515 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -220,7 +220,7 @@ Test_Supplier::disconnect_push_supplier (void) { } -int Test_Supplier::supplier_id (void) const +int Test_Supplier::supplier_id () const { return this->supplier_id_; } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h index df062485bc0..2a2a442a65a 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h @@ -53,7 +53,7 @@ public: virtual void disconnect_push_supplier (void); // The methods in the skeleton. - RtecEventComm::EventSourceID supplier_id (void) const; + RtecEventComm::EventSourceID supplier_id () const; // The supplier ID. RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 063f5556bf2..095c7869dae 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -52,7 +52,7 @@ EC_BCast::parse_args (int& argc, ACE_TCHAR* argv[]) } void -EC_BCast::print_args (void) const +EC_BCast::print_args () const { this->EC_Driver::print_args (); } diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 2ea495a6405..60953f5bc95 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -31,7 +31,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable bcastions virtual int parse_args (int& argc, ACE_TCHAR* argv[]); - virtual void print_args (void) const; + virtual void print_args () const; virtual void print_usage (void); /// set the bcastion flags diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 425b64dcf12..f39d36996f4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -193,7 +193,7 @@ EC_Master::parse_args (int &argc, ACE_TCHAR *argv []) } int -EC_Master::channel_count (void) const +EC_Master::channel_count () const { return this->n_channels_; } @@ -238,7 +238,7 @@ EC_Observer::parse_args (int& argc, ACE_TCHAR* argv[]) } void -EC_Observer::print_args (void) const +EC_Observer::print_args () const { this->EC_Driver::print_args (); } diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index 120af473405..5dc1f40ce7e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -42,7 +42,7 @@ public: virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]); /// Accessors - int channel_count (void) const; + int channel_count () const; EC_Observer* channel (int i) const; private: @@ -85,7 +85,7 @@ public: /// add some command line args to enable/disable observerions virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]); virtual int parse_args (int& argc, ACE_TCHAR* argv[]); - virtual void print_args (void) const; + virtual void print_args () const; virtual void print_usage (void); /// Run the suppliers, using the <thread_manager> parameter diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 2fdb2af44b5..cf10b808d83 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -55,7 +55,7 @@ EC_Reconnect::parse_args (int& argc, ACE_TCHAR* argv[]) } void -EC_Reconnect::print_args (void) const +EC_Reconnect::print_args () const { this->EC_Driver::print_args (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h index 38aa520d04a..77b9275e1f5 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h @@ -42,7 +42,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable reconnections virtual int parse_args (int& argc, ACE_TCHAR* argv[]); - virtual void print_args (void) const; + virtual void print_args () const; virtual void print_usage (void); /// set the reconnection flags diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index 335ad144b0c..b7662e40b11 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -35,7 +35,7 @@ EC_Schedule::parse_args (int& argc, ACE_TCHAR* argv[]) } void -EC_Schedule::print_args (void) const +EC_Schedule::print_args () const { this->EC_Driver::print_args (); } diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index f5f625ac886..f4f4827af2f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -46,7 +46,7 @@ public: /// add some command line args to change the scheduling service to /// use. virtual int parse_args (int& argc, ACE_TCHAR* argv[]); - virtual void print_args (void) const; + virtual void print_args () const; virtual void print_usage (void); /// Set the scheduling service attribute diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 2d8f1b6b350..f810a281bc7 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -81,7 +81,7 @@ EC_Connect::print_usage (void) } void -EC_Connect::print_args (void) const +EC_Connect::print_args () const { this->EC_Driver::print_args (); diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h index d9272ca9ff9..22623793bea 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.h +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h @@ -43,7 +43,7 @@ public: // = The EC_Driver methods virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_usage (void); - virtual void print_args (void) const; + virtual void print_args () const; /// Don't run the suppliers, just test connect and disconnect calls. void execute_test (void); diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index bc9995de9dc..780e75ac9f1 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -26,7 +26,7 @@ EC_Throughput::parse_args (int& argc, ACE_TCHAR* argv[]) } void -EC_Throughput::print_args (void) const +EC_Throughput::print_args () const { this->EC_Driver::print_args (); } diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h index 4082f96ecbd..1b414749d8b 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h @@ -31,7 +31,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable throughputions virtual int parse_args (int& argc, ACE_TCHAR* argv[]); - virtual void print_args (void) const; + virtual void print_args () const; virtual void print_usage (void); /// set the throughpution flags diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp index c93d4f6dd0d..b6b70325e93 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp @@ -11,7 +11,7 @@ Consumer::Consumer (bool valuetype) } CORBA::ULong -Consumer::event_count (void) const +Consumer::event_count () const { return this->event_count_; } diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h index 574aa4dc030..c5cca80be8c 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h @@ -44,7 +44,7 @@ public: virtual void push (const RtecEventComm::EventSet& events); virtual void disconnect_push_consumer (void); - CORBA::ULong event_count (void) const; + CORBA::ULong event_count () const; private: /// Keep track of the number of events received. CORBA::ULong event_count_; diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index ff6d6ce4c89..4872289a5a3 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -47,7 +47,7 @@ EC_Consumer::connect ( } int -EC_Consumer::connected (void) const +EC_Consumer::connected () const { return !CORBA::is_nil (this->supplier_proxy_.in ()); } diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index 31ba5063eba..d8dd29aba14 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -57,7 +57,7 @@ public: int shutdown_event_type); /// returns 0 if it is not connected - virtual int connected (void) const; + virtual int connected () const; /// The application can invoke this method to disconnect from the EC /// and deactivate this class. diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 5b389cac642..ea034f0539b 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -178,7 +178,7 @@ EC_Driver::initialize_orb_and_poa (int &argc, ACE_TCHAR* argv[]) } void -EC_Driver::print_args (void) const +EC_Driver::print_args () const { ACE_DEBUG ((LM_DEBUG, "Execution parameters:\n" diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index a4594cbf159..833a401925b 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -57,7 +57,7 @@ public: virtual ~EC_Driver (void); /// Flag to indicate in the test should be verbose. - int verbose (void) const; + int verbose () const; /// Execute the test. virtual int run (int argc, ACE_TCHAR* argv[]); @@ -78,7 +78,7 @@ public: virtual void print_usage (void); /// Print out the arguments - virtual void print_args (void) const; + virtual void print_args () const; /// Run the test in the real-time class, return -1 on error. virtual int move_to_rt_class (void); diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.inl b/TAO/orbsvcs/tests/Event/lib/Driver.inl index 0a23040f1dd..9997de4c97d 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.inl +++ b/TAO/orbsvcs/tests/Event/lib/Driver.inl @@ -1,5 +1,5 @@ ACE_INLINE int -EC_Driver::verbose (void) const +EC_Driver::verbose () const { return this->verbose_; } diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp index 178ccf3f4da..dd57ca7633d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp @@ -38,7 +38,7 @@ Test_i::trigger (void) } int -Test_i::exit_code (void) const +Test_i::exit_code () const { return exit_code_; } diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h index d9e0964b1bf..4012e77da02 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h @@ -22,7 +22,7 @@ public: virtual void trigger (void); - int exit_code (void) const; + int exit_code () const; private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h index 51d3cb05875..a4b708b86c0 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h @@ -16,7 +16,7 @@ public: DllOrb (void); virtual ~DllOrb (void); - CORBA::ORB_ptr orb (void) const { return CORBA::ORB::_duplicate(mv_orb_.in()); } + CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); } virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index 428172716f1..a8359d0a8eb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -150,7 +150,7 @@ Notify_Test_Client::consumer_done (TAO_Notify_Tests_Peer*) } bool -Notify_Test_Client::is_done (void) const +Notify_Test_Client::is_done () const { return this->done_; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 589614045cf..93f28c2c2c1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -52,7 +52,7 @@ public: void consumer_done (TAO_Notify_Tests_Peer*); /// Access the done boolean. - bool is_done (void) const; + bool is_done () const; /// Access the ORB. This class retains ownership. CORBA::ORB_ptr orb (void); diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp index 30510235e30..54a67ee5c7d 100644 --- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp +++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp @@ -82,7 +82,7 @@ public: bool test (const char* str, T expected); void constraint (TAO_Literal_Constraint& constraint); - const TAO_Literal_Constraint& constraint (void) const; + const TAO_Literal_Constraint& constraint () const; private: bool compare (T expected) const; @@ -137,7 +137,7 @@ Literal_Interpreter<T>::constraint (TAO_Literal_Constraint& constraint) } template<class T> const TAO_Literal_Constraint& -Literal_Interpreter<T>::constraint (void) const +Literal_Interpreter<T>::constraint () const { return this->constraint_; } diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp index 981b3480ff6..a7b12e089c8 100644 --- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp +++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp @@ -7,7 +7,7 @@ Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks) } int -Roundtrip_Handler::pending_callbacks (void) const +Roundtrip_Handler::pending_callbacks () const { return this->pending_callbacks_; } diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h index 1c5482c6a3f..b7f3332e45a 100644 --- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h +++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h @@ -15,7 +15,7 @@ public: Roundtrip_Handler (int expected_callbacks); /// Return the number of pending callbacks - int pending_callbacks (void) const; + int pending_callbacks () const; /// Dump the results void dump_results (ACE_High_Res_Timer::global_scale_factor_type gsf); diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp index ae2ce1f7833..63acb1c980c 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp @@ -7,7 +7,7 @@ Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks) } int -Roundtrip_Handler::pending_callbacks (void) const +Roundtrip_Handler::pending_callbacks () const { return this->pending_callbacks_; } diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h index 1689bf80ef4..15644ab0415 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h +++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h @@ -15,7 +15,7 @@ public: Roundtrip_Handler (int expected_callbacks); /// Return the number of pending callbacks - int pending_callbacks (void) const; + int pending_callbacks () const; /// Dump the results void dump_results (ACE_High_Res_Timer::global_scale_factor_type gsf); diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index a00da5e1a22..0ecd203dcc1 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -62,7 +62,7 @@ CORBA::NVList::NVList (void) ACE_INLINE CORBA::ULong -CORBA::NVList::count (void) const +CORBA::NVList::count () const { (const_cast<CORBA::NVList *> (this))->evaluate (); diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index bf7cedff22d..2b803184a4c 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -76,7 +76,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i ( template <typename StringType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Objref<StringType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -122,7 +122,7 @@ TAO::TypeCode::Objref<StringType, template <typename StringType, class RefCountPolicy> char const * -TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (void) const +TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -131,7 +131,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (void) const template <typename StringType, class RefCountPolicy> char const * -TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (void) const +TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index bd81dd1ea7a..8af341e0ea8 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -103,7 +103,7 @@ TAO::TypeCode::Sequence<TypeCodeType, template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (void) const +TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i () const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -121,14 +121,14 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (v template <typename TypeCodeType, class RefCountPolicy> CORBA::ULong -TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i (void) const +TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i () const { return this->length_; } template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i (void) const +TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp index b1424e84b7d..f1a3399c936 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp @@ -61,7 +61,7 @@ TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc) con template <class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (void) const +TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i () const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -75,7 +75,7 @@ TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (void) const template <class RefCountPolicy> CORBA::ULong -TAO::TypeCode::String<RefCountPolicy>::length_i (void) const +TAO::TypeCode::String<RefCountPolicy>::length_i () const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index 882ddd9bfef..797b5469fd9 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -113,7 +113,7 @@ const FieldArrayType& TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::fields (void) const + RefCountPolicy>::fields () const { return fields_; } @@ -210,7 +210,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -260,7 +260,7 @@ char const * TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -275,7 +275,7 @@ char const * TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -290,7 +290,7 @@ CORBA::ULong TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->nfields_; } diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp index 9b8f98173ee..3308443c50d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp @@ -20,7 +20,7 @@ template <typename StringType, typename TypeCodeType> TAO::TypeCode::Case<StringType, TypeCodeType> * TAO::TypeCode::Case_Enum_T<StringType, - TypeCodeType>::clone (void) const + TypeCodeType>::clone () const { Case<StringType, TypeCodeType> * p = 0; @@ -74,7 +74,7 @@ template <typename StringType, typename TypeCodeType> CORBA::Any * TAO::TypeCode::Case_Enum_T<StringType, - TypeCodeType>::label (void) const + TypeCodeType>::label () const { TAO_OutputCDR out_cdr; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index faf3d0745af..7bee7becd9a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -76,7 +76,7 @@ template <typename DiscriminatorType, TAO::TypeCode::Case<StringType, TypeCodeType> * TAO::TypeCode::Case_T<DiscriminatorType, StringType, - TypeCodeType>::clone (void) const + TypeCodeType>::clone () const { Case<StringType, TypeCodeType> * p = 0; @@ -138,7 +138,7 @@ template <typename DiscriminatorType, CORBA::Any * TAO::TypeCode::Case_T<DiscriminatorType, StringType, - TypeCodeType>::label (void) const + TypeCodeType>::label () const { CORBA::Any * value = 0; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index dbb16217c47..0942b2988ac 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -109,7 +109,7 @@ const CaseArrayType & TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::cases (void) const + RefCountPolicy>::cases () const { return cases_; } @@ -234,7 +234,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -289,7 +289,7 @@ char const * TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -304,7 +304,7 @@ char const * TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -319,7 +319,7 @@ CORBA::ULong TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->ncases_; } @@ -403,7 +403,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::discriminator_type_i (void) const + RefCountPolicy>::discriminator_type_i () const { return CORBA::TypeCode::_duplicate ( @@ -418,7 +418,7 @@ CORBA::Long TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::default_index_i (void) const + RefCountPolicy>::default_index_i () const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 32e79789204..5d5fa5dbc72 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -118,7 +118,7 @@ const TypeCodeType& TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::concrete_base (void) const + RefCountPolicy>::concrete_base () const { return concrete_base_; } @@ -131,7 +131,7 @@ const FieldArrayType& TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::fields (void) const + RefCountPolicy>::fields () const { return fields_; } @@ -275,7 +275,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -328,7 +328,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -343,7 +343,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -358,7 +358,7 @@ CORBA::ULong TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->nfields_; } @@ -423,7 +423,7 @@ CORBA::ValueModifier TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::type_modifier_i (void) const + RefCountPolicy>::type_modifier_i () const { return this->type_modifier_; } @@ -436,7 +436,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::concrete_base_type_i (void) const + RefCountPolicy>::concrete_base_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index e7e793c952c..0a0a90daa93 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -110,7 +110,7 @@ public: TAO_SYSTEM_EXCEPTION (InvalidPolicies) #define TAO_SYSTEM_EXCEPTION(name) \ - virtual CORBA::TypeCode_ptr _tao_type_ ## name (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type_ ## name () const = 0; ANYTYPECODE__EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h index 3ff6041fdd3..b782fb89cea 100644 --- a/TAO/tao/Asynch_Queued_Message.h +++ b/TAO/tao/Asynch_Queued_Message.h @@ -64,8 +64,8 @@ public: * @name Implement the Template Methods from TAO_Queued_Message */ //@{ - virtual size_t message_length (void) const; - virtual int all_data_sent (void) const; + virtual size_t message_length () const; + virtual int all_data_sent () const; virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const; virtual void bytes_transferred (size_t &byte_count); /// @note No reason to believe why this would be called. But have diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index 5990bb81f54..b7031f3623a 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -47,7 +47,7 @@ namespace TAO virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type const * arg (void) const; + typename S_var::s_traits::char_type const * arg () const; protected: typename S_var::s_traits::char_type const * x_; diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl index be53dfee5bf..cc4e6c2b853 100644 --- a/TAO/tao/BD_String_Argument_T.inl +++ b/TAO/tao/BD_String_Argument_T.inl @@ -16,7 +16,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE const typename S_var::s_traits::char_type * -TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) const +TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h index f3ce69b4a54..b499969a3df 100644 --- a/TAO/tao/Base_Transport_Property.h +++ b/TAO/tao/Base_Transport_Property.h @@ -58,7 +58,7 @@ public: const TAO_Transport_Descriptor_Interface *other_prop); /// Generate hash value for our class - virtual u_long hash (void) const; + virtual u_long hash () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index 7cf80980fa3..c0cd04fa721 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -12,7 +12,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::In_Basic_Argument_T<S, Insert_Policy>::arg (void) const +TAO::In_Basic_Argument_T<S, Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index 0f3d7ebcf06..28530309a67 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -37,7 +37,7 @@ TAO_BidirectionalPolicy::policy_type (void) TAO_BidirectionalPolicy * -TAO_BidirectionalPolicy::clone (void) const +TAO_BidirectionalPolicy::clone () const { TAO_BidirectionalPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -72,7 +72,7 @@ TAO_BidirectionalPolicy::value (void) TAO_Cached_Policy_Type -TAO_BidirectionalPolicy::_tao_cached_type (void) const +TAO_BidirectionalPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP; } diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 718ae38a5f5..d75c47d80ff 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -49,7 +49,7 @@ public: TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs); /// Returns a copy of <this>. - virtual TAO_BidirectionalPolicy *clone (void) const; + virtual TAO_BidirectionalPolicy *clone () const; /// = The BiDir::BidirectionalPolicy methods virtual BiDirPolicy::BidirectionalPolicyValue value (void); @@ -60,7 +60,7 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index 0bbc9aa51a3..89958d671dd 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -10,7 +10,7 @@ TAO_OutputCDR::~TAO_OutputCDR (void) } ACE_INLINE bool -TAO_OutputCDR::more_fragments (void) const +TAO_OutputCDR::more_fragments () const { return this->more_fragments_; } @@ -34,25 +34,25 @@ TAO_OutputCDR::message_attributes (CORBA::ULong request_id, } ACE_INLINE CORBA::ULong -TAO_OutputCDR::request_id (void) const +TAO_OutputCDR::request_id () const { return this->request_id_; } ACE_INLINE TAO_Stub * -TAO_OutputCDR::stub (void) const +TAO_OutputCDR::stub () const { return this->stub_; } ACE_INLINE TAO_Message_Semantics -TAO_OutputCDR::message_semantics (void) const +TAO_OutputCDR::message_semantics () const { return this->message_semantics_; } ACE_INLINE ACE_Time_Value * -TAO_OutputCDR::timeout (void) const +TAO_OutputCDR::timeout () const { return this->timeout_; } @@ -267,7 +267,7 @@ TAO_InputCDR::~TAO_InputCDR (void) } ACE_INLINE TAO_ORB_Core* -TAO_InputCDR::orb_core (void) const +TAO_InputCDR::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index c9ab1052c91..08f821911df 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -79,7 +79,7 @@ public: /// Servant Dispatching Strategy proxy accessor. TAO::CSD::Strategy_Proxy& - servant_dispatching_strategy_proxy (void) const; + servant_dispatching_strategy_proxy () const; private: TAO::CSD::Strategy_Proxy* sds_proxy_; diff --git a/TAO/tao/CSD_Framework/CSD_POA.inl b/TAO/tao/CSD_Framework/CSD_POA.inl index bfc547f58cd..948d7f064cd 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.inl +++ b/TAO/tao/CSD_Framework/CSD_POA.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::Strategy_Proxy& -TAO_CSD_POA::servant_dispatching_strategy_proxy (void) const +TAO_CSD_POA::servant_dispatching_strategy_proxy () const { return *sds_proxy_; } diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl index d8b868cd666..3fd2e46a546 100644 --- a/TAO/tao/Cleanup_Func_Registry.inl +++ b/TAO/tao/Cleanup_Func_Registry.inl @@ -8,7 +8,7 @@ TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void) } ACE_INLINE size_t -TAO_Cleanup_Func_Registry::size (void) const +TAO_Cleanup_Func_Registry::size () const { return this->cleanup_funcs_.size (); } diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index aab10247f2b..75aac37a839 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -74,19 +74,19 @@ TAO_Codeset_Descriptor::ncs (ACE_CDR::ULong n) } ACE_CDR::ULong -TAO_Codeset_Descriptor::ncs (void) const +TAO_Codeset_Descriptor::ncs () const { return this->ncs_; } int -TAO_Codeset_Descriptor::num_translators (void) const +TAO_Codeset_Descriptor::num_translators () const { return this->num_translators_; } int -TAO_Codeset_Descriptor::max_bytes (void) const +TAO_Codeset_Descriptor::max_bytes () const { return this->max_bytes_; } diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h index 389b6fbcaee..ef859f98830 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.h +++ b/TAO/tao/Codeset/Codeset_Descriptor.h @@ -42,9 +42,9 @@ public: void ncs (ACE_CDR::ULong ncs); void ncs (const ACE_TCHAR *name); - ACE_CDR::ULong ncs (void) const; - int max_bytes (void) const; - int num_translators (void) const; + ACE_CDR::ULong ncs () const; + int max_bytes () const; + int num_translators () const; void add_translator (const ACE_TCHAR *name); Translator_Node *translators (void); diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index c7c24bef40a..f3da5f2a337 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -19,7 +19,7 @@ TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void) } bool -TAO_Codeset_Manager_Factory::is_default (void) const +TAO_Codeset_Manager_Factory::is_default () const { return false; } diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 936c8ac97c7..46df928a484 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -41,7 +41,7 @@ class TAO_Codeset_Export TAO_Codeset_Manager_Factory : public: virtual ~TAO_Codeset_Manager_Factory (); virtual TAO_Codeset_Manager *create(void); - virtual bool is_default(void) const; + virtual bool is_default() const; }; diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h index 98d55428e17..59c25927905 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.h +++ b/TAO/tao/Codeset_Manager_Factory_Base.h @@ -54,7 +54,7 @@ public: /// to reload the factory with a dynamically linked libTAO_Codeset. /// Statically linked applications get derive implementation by /// including "tao/Codeset/Codeset.h" somewhere in their source code. - virtual bool is_default (void) const; + virtual bool is_default () const; /// Static initializer ensures the factory is loaded static int initialize (void); diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h index 411dd8e70ed..7d182e0d556 100644 --- a/TAO/tao/Codeset_Translator_Base.h +++ b/TAO/tao/Codeset_Translator_Base.h @@ -53,11 +53,11 @@ public: /// Get the native codeset ID from the base. There is no reasonable /// default for this method, so it is left abstract. - virtual CONV_FRAME::CodeSetId ncs (void) const = 0; + virtual CONV_FRAME::CodeSetId ncs () const = 0; /// Get the translated codeset ID from the base. There is no reasonable /// default for this method, so it is left abstract. - virtual CONV_FRAME::CodeSetId tcs (void) const = 0; + virtual CONV_FRAME::CodeSetId tcs () const = 0; /// Assign the translator to the supplied input CDR. This is left abstract /// since the base base does not have a reference to the actual translator diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 4a309a7ec19..80dc152804b 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -61,16 +61,16 @@ public: void transport (TAO_Transport* transport); /// Is the handler closed or timed out? - bool is_closed (void) const; + bool is_closed () const; /// Is the handler open? - bool is_open (void) const; + bool is_open () const; /// Closed due to timeout? - bool is_timeout (void) const; + bool is_timeout () const; /// Is the handler in the process of being connected? - bool is_connecting (void) const; + bool is_connecting () const; /// Close the underlying connection. /** diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index f143c25b53e..dcdf2eb1e5d 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -17,26 +17,26 @@ TAO_Connection_Handler::transport (void) } ACE_INLINE bool -TAO_Connection_Handler::is_closed (void) const +TAO_Connection_Handler::is_closed () const { return (this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED || this->state_ == TAO_LF_Event::LFS_TIMEOUT || this->is_closed_); } ACE_INLINE bool -TAO_Connection_Handler::is_timeout (void) const +TAO_Connection_Handler::is_timeout () const { return (this->state_ == TAO_LF_Event::LFS_TIMEOUT); } ACE_INLINE bool -TAO_Connection_Handler::is_open (void) const +TAO_Connection_Handler::is_open () const { return this->state_ == TAO_LF_Event::LFS_SUCCESS; } ACE_INLINE bool -TAO_Connection_Handler::is_connecting (void) const +TAO_Connection_Handler::is_connecting () const { return this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT; } diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp index dc67ef4224b..9f2f0ba9315 100644 --- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp +++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp @@ -64,7 +64,7 @@ TAO_Client_Network_Priority_Policy::policy_type (void) } TAO_Client_Network_Priority_Policy * -TAO_Client_Network_Priority_Policy::clone (void) const +TAO_Client_Network_Priority_Policy::clone () const { TAO_Client_Network_Priority_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -129,13 +129,13 @@ TAO_Client_Network_Priority_Policy::destroy (void) } TAO_Cached_Policy_Type -TAO_Client_Network_Priority_Policy::_tao_cached_type (void) const +TAO_Client_Network_Priority_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_CLIENT_NETWORK_PRIORITY; } TAO_Policy_Scope -TAO_Client_Network_Priority_Policy::_tao_scope (void) const +TAO_Client_Network_Priority_Policy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h index e42caa337f5..93b933ed808 100644 --- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h +++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h @@ -58,7 +58,7 @@ public: const TAO_Client_Network_Priority_Policy &rhs); /// Returns a copy of <this>. - TAO_Client_Network_Priority_Policy *clone (void) const; + TAO_Client_Network_Priority_Policy *clone () const; TAO::DiffservCodepoint request_diffserv_codepoint (void); @@ -81,10 +81,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: /// The attribute diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp index 33500fa2b47..4e156ca184a 100644 --- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp +++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp @@ -65,7 +65,7 @@ TAO_Server_Network_Priority_Policy::policy_type (void) } TAO_Server_Network_Priority_Policy * -TAO_Server_Network_Priority_Policy::clone (void) const +TAO_Server_Network_Priority_Policy::clone () const { TAO_Server_Network_Priority_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -130,13 +130,13 @@ TAO_Server_Network_Priority_Policy::destroy (void) } TAO_Cached_Policy_Type -TAO_Server_Network_Priority_Policy::_tao_cached_type (void) const +TAO_Server_Network_Priority_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_NETWORK_PRIORITY; } TAO_Policy_Scope -TAO_Server_Network_Priority_Policy::_tao_scope (void) const +TAO_Server_Network_Priority_Policy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h index 41e22e0e1e7..fd8eb16f60a 100644 --- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h +++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h @@ -59,7 +59,7 @@ public: const TAO_Server_Network_Priority_Policy &rhs); /// Returns a copy of <this>. - TAO_Server_Network_Priority_Policy *clone (void) const; + TAO_Server_Network_Priority_Policy *clone () const; TAO::DiffservCodepoint request_diffserv_codepoint (void); @@ -82,10 +82,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// This method writes a CDR representation of the object state. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index 04e5211f63f..55026b9f5a8 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -80,7 +80,7 @@ TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var ( } TAO_AMH_DSI_Exception_Holder * -TAO_AMH_DSI_Exception_Holder_var::ptr (void) const +TAO_AMH_DSI_Exception_Holder_var::ptr () const { return this->ptr_; } @@ -131,13 +131,13 @@ TAO_AMH_DSI_Exception_Holder_var::operator TAO_AMH_DSI_Exception_Holder*& () } TAO_AMH_DSI_Exception_Holder * -TAO_AMH_DSI_Exception_Holder_var::operator-> (void) const +TAO_AMH_DSI_Exception_Holder_var::operator-> () const { return this->ptr_; } TAO_AMH_DSI_Exception_Holder * -TAO_AMH_DSI_Exception_Holder_var::in (void) const +TAO_AMH_DSI_Exception_Holder_var::in () const { return this->ptr_; } @@ -247,7 +247,7 @@ TAO_AMH_DSI_Exception_Holder::_downcast (CORBA::ValueBase * v) } const char * -TAO_AMH_DSI_Exception_Holder::_tao_obv_repository_id (void) const +TAO_AMH_DSI_Exception_Holder::_tao_obv_repository_id () const { return this->_tao_obv_static_repository_id (); } @@ -482,13 +482,13 @@ TAO_AMH_DSI_Response_Handler::_unchecked_narrow (CORBA::Object_ptr obj) } const char* -TAO_AMH_DSI_Response_Handler::_interface_repository_id (void) const +TAO_AMH_DSI_Response_Handler::_interface_repository_id () const { return 0; } CORBA::TypeCode_ptr -TAO_AMH_DSI_Exception_Holder::_tao_type (void) const +TAO_AMH_DSI_Exception_Holder::_tao_type () const { return 0; } diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h index 70abfe5ad7c..c6b9d09b047 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h @@ -49,16 +49,16 @@ public: TAO_AMH_DSI_Response_Handler_ptr); TAO_AMH_DSI_Response_Handler_var &operator= ( const TAO_AMH_DSI_Response_Handler_var &); - TAO_AMH_DSI_Response_Handler_ptr operator-> (void) const; + TAO_AMH_DSI_Response_Handler_ptr operator-> () const; operator const TAO_AMH_DSI_Response_Handler_ptr &() const; operator TAO_AMH_DSI_Response_Handler_ptr &(); - TAO_AMH_DSI_Response_Handler_ptr in (void) const; + TAO_AMH_DSI_Response_Handler_ptr in () const; TAO_AMH_DSI_Response_Handler_ptr &inout (void); TAO_AMH_DSI_Response_Handler_ptr &out (void); TAO_AMH_DSI_Response_Handler_ptr _retn (void); - TAO_AMH_DSI_Response_Handler_ptr ptr (void) const; + TAO_AMH_DSI_Response_Handler_ptr ptr () const; private: TAO_AMH_DSI_Response_Handler_ptr ptr_; @@ -86,16 +86,16 @@ public: TAO_AMH_DSI_Exception_Holder_var &operator= (TAO_AMH_DSI_Exception_Holder*); TAO_AMH_DSI_Exception_Holder_var &operator= ( const TAO_AMH_DSI_Exception_Holder_var &); - TAO_AMH_DSI_Exception_Holder* operator-> (void) const; + TAO_AMH_DSI_Exception_Holder* operator-> () const; operator const TAO_AMH_DSI_Exception_Holder* () const; operator TAO_AMH_DSI_Exception_Holder*& (); - TAO_AMH_DSI_Exception_Holder* in (void) const; + TAO_AMH_DSI_Exception_Holder* in () const; TAO_AMH_DSI_Exception_Holder*& inout (void); TAO_AMH_DSI_Exception_Holder*& out (void); TAO_AMH_DSI_Exception_Holder* _retn (void); - TAO_AMH_DSI_Exception_Holder* ptr (void) const; + TAO_AMH_DSI_Exception_Holder* ptr () const; // Hooks used by template sequence and valuetype manager classes // for non-defined forward declared valuetypes. @@ -151,14 +151,14 @@ public: static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, TAO_AMH_DSI_Exception_Holder *& ); - virtual const char* _tao_obv_repository_id (void) const; + virtual const char* _tao_obv_repository_id () const; static const char* _tao_obv_static_repository_id (void); static void _tao_any_destructor (void *); virtual void raise_invoke ( ); - CORBA::TypeCode_ptr _tao_type (void) const; + CORBA::TypeCode_ptr _tao_type () const; void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const; CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const; diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl index e322c651073..3562b7c9a19 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl @@ -44,7 +44,7 @@ TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var (void) } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::ptr (void) const +TAO_AMH_DSI_Response_Handler_var::ptr () const { return this->ptr_; } @@ -86,13 +86,13 @@ TAO_AMH_DSI_Response_Handler_var::operator TAO_AMH_DSI_Response_Handler_ptr &() } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::operator-> (void) const +TAO_AMH_DSI_Response_Handler_var::operator-> () const { return this->ptr_; } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::in (void) const +TAO_AMH_DSI_Response_Handler_var::in () const { return this->ptr_; } diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 1ecc267b2de..c94438783e7 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -37,13 +37,13 @@ CORBA::Context::_decr_refcount () } const char * -CORBA::Context::context_name (void) const +CORBA::Context::context_name () const { throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } CORBA::Context_ptr -CORBA::Context::parent (void) const +CORBA::Context::parent () const { throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h index 9505f07b941..66fbb404d28 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.h +++ b/TAO/tao/DynamicInterface/DII_Arguments.h @@ -51,7 +51,7 @@ namespace TAO virtual void interceptor_value (CORBA::Any *any) const; - int byte_order (void) const; + int byte_order () const; private: CORBA::NamedValue_ptr x_; diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl index 201f07d2c6f..29122b9427d 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.inl +++ b/TAO/tao/DynamicInterface/DII_Arguments.inl @@ -11,7 +11,7 @@ namespace TAO } ACE_INLINE int - NamedValue_Argument::byte_order (void) const + NamedValue_Argument::byte_order () const { return this->byte_order_; } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h index 802bddd0b3b..3c4ec944f7b 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h @@ -44,16 +44,16 @@ public: TAO_DII_Reply_Handler_var &operator= (TAO_DII_Reply_Handler_ptr); TAO_DII_Reply_Handler_var &operator= (const TAO_DII_Reply_Handler_var &); - TAO_DII_Reply_Handler_ptr operator-> (void) const; + TAO_DII_Reply_Handler_ptr operator-> () const; operator const TAO_DII_Reply_Handler_ptr &() const; operator TAO_DII_Reply_Handler_ptr &(); - TAO_DII_Reply_Handler_ptr in (void) const; + TAO_DII_Reply_Handler_ptr in () const; TAO_DII_Reply_Handler_ptr &inout (void); TAO_DII_Reply_Handler_ptr &out (void); TAO_DII_Reply_Handler_ptr _retn (void); - TAO_DII_Reply_Handler_ptr ptr (void) const; + TAO_DII_Reply_Handler_ptr ptr () const; private: TAO_DII_Reply_Handler_ptr ptr_; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl index 9cba5d062f3..736cd4372d5 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl @@ -32,7 +32,7 @@ TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var (void) } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::ptr (void) const +TAO_DII_Reply_Handler_var::ptr () const { return this->ptr_; } @@ -75,13 +75,13 @@ TAO_DII_Reply_Handler_var::operator TAO_DII_Reply_Handler_ptr &() } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::operator-> (void) const +TAO_DII_Reply_Handler_var::operator-> () const { return this->ptr_; } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::in (void) const +TAO_DII_Reply_Handler_var::in () const { return this->ptr_; } diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index 982ab13ebb7..61298d32691 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -62,7 +62,7 @@ TAO_DynamicImplementation::_get_interface (void) } const char * -TAO_DynamicImplementation::_interface_repository_id (void) const +TAO_DynamicImplementation::_interface_repository_id () const { // This should never be called. return 0; diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index cff817fd412..ca6cd84b0c8 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -72,7 +72,7 @@ public: protected: /// Return 0. Should never be used. - virtual const char *_interface_repository_id (void) const; + virtual const char *_interface_repository_id () const; /// Simply returns "this" virtual void *_downcast (const char *repository_id); diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index b2431504fbf..e9a50696c97 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -67,10 +67,10 @@ namespace CORBA { public: /// Return the target of this request. - CORBA::Object_ptr target (void) const; + CORBA::Object_ptr target () const; /// Return the operation name for the request. - const CORBA::Char *operation (void) const; + const CORBA::Char *operation () const; /// Return the arguments for the request. CORBA::NVList_ptr arguments (void); @@ -82,7 +82,7 @@ namespace CORBA CORBA::ExceptionList_ptr exceptions (void); /// Accessor for the Context member. - CORBA::Context_ptr ctx (void) const; + CORBA::Context_ptr ctx () const; /// Mutator for the Context member. void ctx (CORBA::Context_ptr); diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index ea1b7f79204..4003a9bae87 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -109,7 +109,7 @@ CORBA::Request::return_value (void ) } ACE_INLINE CORBA::Context_ptr -CORBA::Request::ctx (void) const +CORBA::Request::ctx () const { return this->ctx_; } @@ -127,7 +127,7 @@ CORBA::Request::_tao_lazy_evaluation (bool lazy_evaluation) } ACE_INLINE int -CORBA::Request::_tao_byte_order (void) const +CORBA::Request::_tao_byte_order () const { return this->byte_order_; } diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 47660cea05f..80daba964d4 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -92,13 +92,13 @@ namespace CORBA void dsi_marshal (void); /// Accessor for the Context member. - CORBA::Context_ptr ctx (void) const; + CORBA::Context_ptr ctx () const; /// Mutator for the Context member. void ctx (CORBA::Context_ptr); /// Get the operation name. - const char *operation (void) const; + const char *operation () const; // Pseudo object methods. static ServerRequest_ptr _duplicate (ServerRequest_ptr); @@ -112,7 +112,7 @@ namespace CORBA void _tao_lazy_evaluation (bool lazy_evaluation); /// Get the byte order of the incoming CDR stream. - int _tao_incoming_byte_order (void) const; + int _tao_incoming_byte_order () const; /// Set the byte order of the outgoing CDR stream. void _tao_reply_byte_order (int byte_order); diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index 73b9112cd31..13efdb7d4fb 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -31,7 +31,7 @@ CORBA::ServerRequest::ctx (CORBA::Context_ptr ctx) } ACE_INLINE const char * -CORBA::ServerRequest::operation (void) const +CORBA::ServerRequest::operation () const { return this->orb_server_request_.operation (); } @@ -43,7 +43,7 @@ CORBA::ServerRequest::_tao_lazy_evaluation (bool lazy_evaluation) } ACE_INLINE int -CORBA::ServerRequest::_tao_incoming_byte_order (void) const +CORBA::ServerRequest::_tao_incoming_byte_order () const { return this->orb_server_request_.incoming ()->byte_order (); } diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 46d984c0dad..c58073a777c 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -61,13 +61,13 @@ CORBA::UnknownUserException::_downcast (CORBA::Exception const * ex) } void -CORBA::UnknownUserException::_raise (void) const +CORBA::UnknownUserException::_raise () const { throw *this; } CORBA::Exception * -CORBA::UnknownUserException::_tao_duplicate (void) const +CORBA::UnknownUserException::_tao_duplicate () const { CORBA::Exception *result = nullptr; ACE_NEW_RETURN ( @@ -90,13 +90,13 @@ CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &) } const char * -CORBA::UnknownUserException::_rep_id (void) const +CORBA::UnknownUserException::_rep_id () const { return this->exception_->_tao_get_typecode ()->id (); } CORBA::TypeCode_ptr -CORBA::UnknownUserException::_tao_type (void) const +CORBA::UnknownUserException::_tao_type () const { //return CORBA::_tc_UnknownUserException; return this->exception_->_tao_get_typecode (); diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index 1d77cf0ec79..4a2a88379a1 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -60,9 +60,9 @@ namespace CORBA CORBA::Any& exception (void); /// To throw an UnknownUserException of this type. - virtual void _raise (void) const; + virtual void _raise () const; - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; virtual void _tao_encode (TAO_OutputCDR &cdr) const; virtual void _tao_decode (TAO_InputCDR &cdr); @@ -71,12 +71,12 @@ namespace CORBA static UnknownUserException const * _downcast (CORBA::Exception const * ex); /// Return the repository ID of the Exception. - virtual const char * _rep_id (void) const; + virtual const char * _rep_id () const; // = TAO specific extension. /// This class has a specific typecode. - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; private: /// Holder for the actual exception. diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index bfc7bcc1a0d..852e4862245 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -177,7 +177,7 @@ TAO_DTP_Thread_Pool::above_minimum (void) } CORBA::ULong -TAO_DTP_Thread_Pool::current_threads (void) const +TAO_DTP_Thread_Pool::current_threads () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, @@ -564,7 +564,7 @@ TAO_DTP_Thread_Pool_Manager::create_threadpool_helper (TAO_DTP_Thread_Pool *thre } TAO_ORB_Core & -TAO_DTP_Thread_Pool_Manager::orb_core (void) const +TAO_DTP_Thread_Pool_Manager::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index df83f5f3124..6789f78a869 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h @@ -78,7 +78,7 @@ public: int svc (void); /// Accessor to the pool to which this thread belongs to. - TAO_DTP_Thread_Pool &pool (void) const; + TAO_DTP_Thread_Pool &pool () const; protected: /// Do the real work @@ -161,12 +161,12 @@ public: /// @name Accessors // @{ - bool use_timeouts (void) const; - const ACE_Time_Value& dynamic_thread_time (void) const; + bool use_timeouts () const; + const ACE_Time_Value& dynamic_thread_time () const; - TAO_DTP_Thread_Pool_Manager &manager (void) const; - CORBA::ULong id (void) const; - CORBA::ULong current_threads (void) const; + TAO_DTP_Thread_Pool_Manager &manager () const; + CORBA::ULong id () const; + CORBA::ULong current_threads () const; void add_active (void); bool remove_active (bool force); @@ -237,7 +237,7 @@ public: /// @name Accessors // @{ - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; // @} private: diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl index dc69f734e13..105c1891782 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl @@ -3,35 +3,35 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_DTP_Thread_Pool & -TAO_DTP_Thread_Pool_Threads::pool (void) const +TAO_DTP_Thread_Pool_Threads::pool () const { return this->pool_; } ACE_INLINE TAO_DTP_Thread_Pool_Manager & -TAO_DTP_Thread_Pool::manager (void) const +TAO_DTP_Thread_Pool::manager () const { return this->manager_; } ACE_INLINE CORBA::ULong -TAO_DTP_Thread_Pool::id (void) const +TAO_DTP_Thread_Pool::id () const { return this->id_; } ACE_INLINE bool -TAO_DTP_Thread_Pool::use_timeouts (void) const +TAO_DTP_Thread_Pool::use_timeouts () const { return this->definition_.max_threads_ > -1; } ACE_INLINE const ACE_Time_Value& -TAO_DTP_Thread_Pool::dynamic_thread_time (void) const +TAO_DTP_Thread_Pool::dynamic_thread_time () const { return this->definition_.timeout_; } diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp index 1dd94ee7058..2b7092ae0f2 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp @@ -151,12 +151,12 @@ TAO_ETCL_Literal_Constraint::operator= (const TAO_ETCL_Literal_Constraint& co) this->copy (co); } -TAO_ETCL_Literal_Constraint::operator CORBA::Boolean (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::Boolean () const { return this->ETCL_Literal_Constraint::operator ACE_CDR::Boolean (); } -TAO_ETCL_Literal_Constraint::operator CORBA::ULong (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::ULong () const { switch (this->type_) { @@ -174,7 +174,7 @@ TAO_ETCL_Literal_Constraint::operator CORBA::ULong (void) const } } -TAO_ETCL_Literal_Constraint::operator CORBA::Long (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::Long () const { switch (this->type_) { @@ -192,7 +192,7 @@ TAO_ETCL_Literal_Constraint::operator CORBA::Long (void) const } } -TAO_ETCL_Literal_Constraint::operator CORBA::Double (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::Double () const { switch (this->type_) { @@ -210,7 +210,7 @@ TAO_ETCL_Literal_Constraint::operator CORBA::Double (void) const } } -TAO_ETCL_Literal_Constraint::operator const char* (void) const +TAO_ETCL_Literal_Constraint::operator const char* () const { switch (this->type_) { @@ -228,7 +228,7 @@ TAO_ETCL_Literal_Constraint::operator const char* (void) const } } -TAO_ETCL_Literal_Constraint::operator TAO::Any_Impl* (void) const +TAO_ETCL_Literal_Constraint::operator TAO::Any_Impl* () const { return (this->type_ == ACE_ETCL_COMPONENT) ? this->any_ : 0; } diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.h b/TAO/tao/ETCL/TAO_ETCL_Constraint.h index d927d1a051c..7187aa54804 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.h +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.h @@ -62,12 +62,12 @@ public: void operator= (const TAO_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 TAO::Any_Impl* (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; + operator TAO::Any_Impl* () const; // Return the type represented by this MysteryOperand. diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index b5f931e3026..8119ff6643b 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -53,13 +53,13 @@ public: virtual ~TAO_Endpoint () = default; /// IOP protocol tag accessor. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// @c priority_ attribute setter. void priority (CORBA::Short priority); /// @c priority_ attribute getter. - CORBA::Short priority (void) const; + CORBA::Short priority () const; /** * @name TAO_Endpoint Template Methods diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp index 079baa48b27..a245b774cb1 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp @@ -29,7 +29,7 @@ TAO_EndpointPolicy_i::policy_type (void) } TAO_EndpointPolicy_i * -TAO_EndpointPolicy_i::clone (void) const +TAO_EndpointPolicy_i::clone () const { TAO_EndpointPolicy_i *copy = 0; ACE_NEW_RETURN (copy, @@ -67,7 +67,7 @@ TAO_EndpointPolicy_i::destroy (void) } TAO_Cached_Policy_Type -TAO_EndpointPolicy_i::_tao_cached_type (void) const +TAO_EndpointPolicy_i::_tao_cached_type () const { return TAO_CACHED_POLICY_ENDPOINT; } diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h index 2d28585fe82..5fe59a50bb5 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h @@ -53,7 +53,7 @@ public: virtual ~TAO_EndpointPolicy_i (); /// Returns a copy of this> - virtual TAO_EndpointPolicy_i *clone (void) const; + virtual TAO_EndpointPolicy_i *clone () const; // = The EndpointPolicy::Policy methods @@ -64,7 +64,7 @@ public: virtual void destroy (void); // Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; virtual EndpointPolicy::EndpointList * value (void); diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 4c2e9d7cfc7..126b3476a5e 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -165,7 +165,7 @@ namespace CORBA * class SomeException : public // Derives from CORBA::Exception * { * public: - * virtual CORBA::Exception *_tao_duplicate (void) const + * virtual CORBA::Exception *_tao_duplicate () const * { * CORBA::Exception *result = 0; * ACE_NEW_RETURN ( diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index 5ca66d03114..9f7ac53d101 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE const typename S_forany::_slice_type * -TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) const +TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl index 1b361835386..09a8bd2d4c6 100644 --- a/TAO/tao/Fixed_Size_Argument_T.inl +++ b/TAO/tao/Fixed_Size_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE const S & -TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) const +TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg () const { return *this->x_; } diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h index 7192fbc14dd..71f35eef866 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.h +++ b/TAO/tao/GIOP_Message_Locate_Header.h @@ -40,10 +40,10 @@ public: void request_id (CORBA::ULong id); /// Get the request id - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Get the object_key in read mode.. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Get the object_key in read/write mode.. TAO::ObjectKey &object_key (void); diff --git a/TAO/tao/GIOP_Message_Locate_Header.inl b/TAO/tao/GIOP_Message_Locate_Header.inl index 9a97ae2d600..4d38b855e10 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.inl +++ b/TAO/tao/GIOP_Message_Locate_Header.inl @@ -19,13 +19,13 @@ TAO_GIOP_Locate_Request_Header::request_id (CORBA::ULong id) } ACE_INLINE CORBA::ULong -TAO_GIOP_Locate_Request_Header::request_id (void) const +TAO_GIOP_Locate_Request_Header::request_id () const { return this->request_id_; } ACE_INLINE const TAO::ObjectKey & -TAO_GIOP_Locate_Request_Header::object_key (void) const +TAO_GIOP_Locate_Request_Header::object_key () const { return this->profile_.object_key (); } diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl index 5fb5c6b5536..b60c5827ffe 100644 --- a/TAO/tao/GIOP_Message_Version.inl +++ b/TAO/tao/GIOP_Message_Version.inl @@ -30,13 +30,13 @@ TAO_GIOP_Message_Version::operator!= (const TAO_GIOP_Message_Version &src) const } ACE_INLINE CORBA::Octet -TAO_GIOP_Message_Version::major_version (void) const +TAO_GIOP_Message_Version::major_version () const { return this->major; } ACE_INLINE CORBA::Octet -TAO_GIOP_Message_Version::minor_version (void) const +TAO_GIOP_Message_Version::minor_version () const { return this->minor; } diff --git a/TAO/tao/HTTP_Handler.h b/TAO/tao/HTTP_Handler.h index ee85c1d971f..60bc2d2869f 100644 --- a/TAO/tao/HTTP_Handler.h +++ b/TAO/tao/HTTP_Handler.h @@ -47,7 +47,7 @@ public: ACE_TCHAR *filename); /// returns the number of bytes read/written in the last operation. - size_t byte_count (void) const; + size_t byte_count () const; /// Activate this instance of the <HTTP_Handler> virtual int open (void * = 0); diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 361580a4f40..124d7f78697 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -53,13 +53,13 @@ public: /// @@ Helper method for the implementation repository, should go /// away - const ACE_INET_Addr& address (void) const; + const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE_INET_Addr *endpoints (void); /// Returns address for default endpoint - const ACE_INET_Addr& default_address (void) const; + const ACE_INET_Addr& default_address () const; /// Set address for default endpoint void set_default_address (const ACE_INET_Addr& addr); diff --git a/TAO/tao/IIOP_Acceptor.inl b/TAO/tao/IIOP_Acceptor.inl index c0912da1c6c..b5ca077b2aa 100644 --- a/TAO/tao/IIOP_Acceptor.inl +++ b/TAO/tao/IIOP_Acceptor.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& -TAO_IIOP_Acceptor::address (void) const +TAO_IIOP_Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); @@ -25,7 +25,7 @@ TAO_IIOP_Acceptor::endpoints (void) } ACE_INLINE const ACE_INET_Addr& -TAO_IIOP_Acceptor::default_address (void) const +TAO_IIOP_Acceptor::default_address () const { return this->default_address_; } diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index 1ecabbcf012..7012aac3152 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -64,7 +64,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; public: typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler> @@ -86,7 +86,7 @@ protected: /// connection attempts. The base implementation always returns /// 0. Override to return non-zero if parallel connection attempts /// may be tried. - virtual int supports_parallel_connects (void) const; + virtual int supports_parallel_connects () const; // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index 4279c0fa733..d8f7647c6a5 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -109,31 +109,31 @@ public: // = IIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); /// Do we have a preferred local network for the target? - bool is_preferred_network (void) const; + bool is_preferred_network () const; /// Return the preferred network if any. - const char *preferred_network (void) const; + const char *preferred_network () const; #if defined (ACE_HAS_IPV6) /// Does the host string represent an IPv6 decimal address. - bool is_ipv6_decimal (void) const; + bool is_ipv6_decimal () const; #endif /* ACE_HAS_IPV6 */ /// Need to have an assignment operator since the IIOP_Profile class may @@ -160,7 +160,7 @@ private: int use_dotted_decimal_addresses); /// Helper method for object_addr () call. - void object_addr_i (void) const; + void object_addr_i () const; /// Generate preferred interfaces from the options passed in by the /// user. diff --git a/TAO/tao/IIOP_Endpoint.inl b/TAO/tao/IIOP_Endpoint.inl index d00dc77ff6a..06ba4371cc3 100644 --- a/TAO/tao/IIOP_Endpoint.inl +++ b/TAO/tao/IIOP_Endpoint.inl @@ -4,13 +4,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_IIOP_Endpoint::host (void) const +TAO_IIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_IIOP_Endpoint::port (void) const +TAO_IIOP_Endpoint::port () const { return this->port_; } @@ -23,7 +23,7 @@ TAO_IIOP_Endpoint::port (CORBA::UShort p) #if defined (ACE_HAS_IPV6) ACE_INLINE bool -TAO_IIOP_Endpoint::is_ipv6_decimal (void) const +TAO_IIOP_Endpoint::is_ipv6_decimal () const { return this->is_ipv6_decimal_; } diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h index d024ff09126..d912f287795 100644 --- a/TAO/tao/IIOP_Factory.h +++ b/TAO/tao/IIOP_Factory.h @@ -44,16 +44,16 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory) diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index a3c45dc3fca..98248d2b542 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -86,10 +86,10 @@ public: virtual void add_generic_endpoint (TAO_Endpoint *ep); /// The object key delimiter that IIOP uses or expects. - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Template methods. Please see Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; /// Encode endpoints for RT profiles, using a single TAO_TAG_ENDPOINT /// component. @@ -106,7 +106,7 @@ public: /// regardless of the final type of the profile. virtual TAO_Endpoint *base_endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); protected: diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp index 74dc4170f9f..b2a8384ff51 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp +++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp @@ -79,7 +79,7 @@ TAO_AMH_Locate_ResponseHandler::_unchecked_narrow (CORBA::Object_ptr obj) } const char* -TAO_AMH_Locate_ResponseHandler::_interface_repository_id (void) const +TAO_AMH_Locate_ResponseHandler::_interface_repository_id () const { return 0; } diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h index 788c66983b0..f07c884b168 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.h +++ b/TAO/tao/IORTable/Locate_ResponseHandler.h @@ -58,16 +58,16 @@ public: TAO_AMH_Locate_ResponseHandler_ptr); TAO_AMH_Locate_ResponseHandler_var &operator= ( const TAO_AMH_Locate_ResponseHandler_var &); - TAO_AMH_Locate_ResponseHandler_ptr operator-> (void) const; + TAO_AMH_Locate_ResponseHandler_ptr operator-> () const; operator const TAO_AMH_Locate_ResponseHandler_ptr &() const; operator TAO_AMH_Locate_ResponseHandler_ptr &(); - TAO_AMH_Locate_ResponseHandler_ptr in (void) const; + TAO_AMH_Locate_ResponseHandler_ptr in () const; TAO_AMH_Locate_ResponseHandler_ptr &inout (void); TAO_AMH_Locate_ResponseHandler_ptr &out (void); TAO_AMH_Locate_ResponseHandler_ptr _retn (void); - TAO_AMH_Locate_ResponseHandler_ptr ptr (void) const; + TAO_AMH_Locate_ResponseHandler_ptr ptr () const; private: TAO_AMH_Locate_ResponseHandler_ptr ptr_; diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl index ad103ae89bf..0049174c13a 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.inl +++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl @@ -32,7 +32,7 @@ TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var (void) } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::ptr (void) const +TAO_AMH_Locate_ResponseHandler_var::ptr () const { return this->ptr_; } @@ -74,13 +74,13 @@ TAO_AMH_Locate_ResponseHandler_var::operator TAO_AMH_Locate_ResponseHandler_ptr } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::operator-> (void) const +TAO_AMH_Locate_ResponseHandler_var::operator-> () const { return this->ptr_; } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::in (void) const +TAO_AMH_Locate_ResponseHandler_var::in () const { return this->ptr_; } diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index 200ed522c12..f6240e35da4 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -69,7 +69,7 @@ TAO_Table_Adapter::check_close (int) } int -TAO_Table_Adapter::priority (void) const +TAO_Table_Adapter::priority () const { return static_cast<int> (TAO_DEFAULT_ADAPTER_REGISTRY_SIZE); } @@ -89,7 +89,7 @@ TAO_Table_Adapter::dispatch (TAO::ObjectKey &key, } const char * -TAO_Table_Adapter::name (void) const +TAO_Table_Adapter::name () const { return "IORTable"; } diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index bacc09725f3..6b0e775a3b3 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -44,12 +44,12 @@ public: virtual void open (void); virtual void close (int wait_for_completion); virtual void check_close (int wait_for_completion); - virtual int priority (void) const; + virtual int priority () const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out foward_to); - virtual const char *name (void) const; + virtual const char *name () const; virtual CORBA::Object_ptr root (void); virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl index f9623de1742..fcf39d83a9b 100644 --- a/TAO/tao/Incoming_Message_Queue.inl +++ b/TAO/tao/Incoming_Message_Queue.inl @@ -11,7 +11,7 @@ TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core) } ACE_INLINE CORBA::ULong -TAO_Incoming_Message_Queue::queue_length (void) const +TAO_Incoming_Message_Queue::queue_length () const { return this->size_; } diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl index 955310daf83..17e2988230e 100644 --- a/TAO/tao/Invocation_Base.inl +++ b/TAO/tao/Invocation_Base.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE TAO_Stub * - Invocation_Base::stub (void) const + Invocation_Base::stub () const { return this->stub_; } @@ -30,13 +30,13 @@ namespace TAO } ACE_INLINE CORBA::Boolean - Invocation_Base::response_expected (void) const + Invocation_Base::response_expected () const { return this->response_expected_; } ACE_INLINE GIOP::ReplyStatusType - Invocation_Base::reply_status (void) const + Invocation_Base::reply_status () const { return this->reply_status_; } @@ -48,13 +48,13 @@ namespace TAO } ACE_INLINE CORBA::Object_ptr - Invocation_Base::target (void) const + Invocation_Base::target () const { return this->otarget_; } ACE_INLINE CORBA::Object_ptr - Invocation_Base::effective_target (void) const + Invocation_Base::effective_target () const { return this->target_; } @@ -79,7 +79,7 @@ namespace TAO } ACE_INLINE TAO::Invocation_Status - Invocation_Base::invoke_status (void) const + Invocation_Base::invoke_status () const { return this->invoke_status_; } @@ -91,7 +91,7 @@ namespace TAO } ACE_INLINE bool - Invocation_Base::is_remote_request (void) const + Invocation_Base::is_remote_request () const { return this->is_remote_request_; } diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h index 0f9a99c40e1..4e2c5a0a8a7 100644 --- a/TAO/tao/LF_CH_Event.h +++ b/TAO/tao/LF_CH_Event.h @@ -57,7 +57,7 @@ public: //@{ protected: /// Check whether we have reached the final state.. - virtual bool is_state_final (void) const; + virtual bool is_state_final () const; //@} private: @@ -100,11 +100,11 @@ private: /// Return true if the condition was satisfied successfully, false if it /// has not - virtual bool successful_i (void) const; + virtual bool successful_i () const; /// Return true if an error was detected while waiting for the /// event - virtual bool error_detected_i (void) const; + virtual bool error_detected_i () const; /// Set the state irrespective of anything. virtual void set_state (LFS_STATE new_state); diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h index 56abc8cde0e..6d661658616 100644 --- a/TAO/tao/LF_Event.h +++ b/TAO/tao/LF_Event.h @@ -125,18 +125,18 @@ protected: virtual void state_changed_i (LFS_STATE new_state) = 0; /// Check if we should keep waiting. - bool keep_waiting_i (void) const; + bool keep_waiting_i () const; /// Return true if the condition was satisfied successfully, false if it /// has not - virtual bool successful_i (void) const = 0 ; + virtual bool successful_i () const = 0 ; /// Return true if an error was detected while waiting for the /// event - virtual bool error_detected_i (void) const = 0; + virtual bool error_detected_i () const = 0; /// Check whether we have reached the final state.. - virtual bool is_state_final (void) const = 0; + virtual bool is_state_final () const = 0; private: diff --git a/TAO/tao/LF_Event.inl b/TAO/tao/LF_Event.inl index dccfae380bb..f47b63d0b67 100644 --- a/TAO/tao/LF_Event.inl +++ b/TAO/tao/LF_Event.inl @@ -26,7 +26,7 @@ TAO_LF_Event::reset_state (LFS_STATE new_state) } ACE_INLINE bool -TAO_LF_Event::keep_waiting_i (void) const +TAO_LF_Event::keep_waiting_i () const { return (!this->successful_i ()) && (!this->error_detected_i ()); } diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h index 9b6373d23d6..71462061a0e 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.h +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h @@ -40,7 +40,7 @@ public: ~TAO_LF_Event_Loop_Thread_Helper (void); /// Calls @c set_event_loop_thread on the leader/followers object. - int event_loop_return (void) const; + int event_loop_return () const; private: /// Reference to leader/followers object. diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl index de0689bed3d..57ca9424aca 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl @@ -22,7 +22,7 @@ TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void) } ACE_INLINE int -TAO_LF_Event_Loop_Thread_Helper::event_loop_return (void) const +TAO_LF_Event_Loop_Thread_Helper::event_loop_return () const { return this->event_loop_return_; } diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h index de5a422f4c3..1af364d0044 100644 --- a/TAO/tao/LF_Invocation_Event.h +++ b/TAO/tao/LF_Invocation_Event.h @@ -62,15 +62,15 @@ protected: /// Return true if the condition was satisfied successfully, false if it /// has not - virtual bool successful_i (void) const; + virtual bool successful_i () const; /// Return true if an error was detected while waiting for the /// event - virtual bool error_detected_i (void) const; + virtual bool error_detected_i () const; private: /// Check whether we have reached the final state.. - bool is_state_final (void) const; + bool is_state_final () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h index 8411652f92a..bb8497e3df1 100644 --- a/TAO/tao/LF_Multi_Event.h +++ b/TAO/tao/LF_Multi_Event.h @@ -68,17 +68,17 @@ protected: virtual void state_changed_i (LFS_STATE new_state); /// Check whether we have reached the final state.. - virtual bool is_state_final (void) const; + virtual bool is_state_final () const; /// Return true if the condition was satisfied successfully, false if it /// has not - This iterates over the list of attached events and /// returns true if any of them return true from successful. - virtual bool successful_i (void) const; + virtual bool successful_i () const; /// Return true if an error was detected while waiting for the /// event - This iterates over the list of events and returns /// true only if all of them return true from error_detected(). - virtual bool error_detected_i (void) const; + virtual bool error_detected_i () const; private: diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 053c2d3f9e2..204541e7678 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -68,7 +68,7 @@ public: void set_upcall_thread (void); /// Is there any thread running as a leader? - bool leader_available (void) const; + bool leader_available () const; /// A server thread is making a request. void set_client_thread (void); @@ -107,7 +107,7 @@ public: void set_client_leader_thread (ACE_thread_t thread_ID); /// Checks if we are a leader thread - bool is_client_leader_thread (void) const; + bool is_client_leader_thread () const; /// Sets the client leader avoidance flag true. This is used with the /// noupcall wait strategy to allow the creation of dynamic threads @@ -163,7 +163,7 @@ public: /** * @return true if there follower set is not empty */ - bool follower_available (void) const; + bool follower_available () const; //@} @@ -180,7 +180,7 @@ public: ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock (void); /// Check if there are any client threads running - bool has_clients (void) const; + bool has_clients () const; /// Accessor to the reactor ACE_Reactor *reactor (void); @@ -198,7 +198,7 @@ public: private: /// Shortcut to obtain the TSS resources of the orb core. - TAO_ORB_Core_TSS_Resources *get_tss_resources (void) const; + TAO_ORB_Core_TSS_Resources *get_tss_resources () const; /// Wait for the client leader to complete. int wait_for_client_leader_to_complete (ACE_Time_Value *max_wait_time); diff --git a/TAO/tao/Leader_Follower.inl b/TAO/tao/Leader_Follower.inl index 5c9c7d546ea..c49cb5d2bb4 100644 --- a/TAO/tao/Leader_Follower.inl +++ b/TAO/tao/Leader_Follower.inl @@ -23,7 +23,7 @@ TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core, } ACE_INLINE TAO_ORB_Core_TSS_Resources * -TAO_Leader_Follower::get_tss_resources (void) const +TAO_Leader_Follower::get_tss_resources () const { return this->orb_core_->get_tss_resources (); } @@ -35,7 +35,7 @@ TAO_Leader_Follower::set_avoid_client_leader (void) } ACE_INLINE bool -TAO_Leader_Follower::follower_available (void) const +TAO_Leader_Follower::follower_available () const { return !this->follower_set_.is_empty (); } @@ -158,7 +158,7 @@ TAO_Leader_Follower::set_upcall_thread (void) } ACE_INLINE bool -TAO_Leader_Follower::leader_available (void) const +TAO_Leader_Follower::leader_available () const { return this->leaders_ != 0; } @@ -188,7 +188,7 @@ TAO_Leader_Follower::reset_client_leader_thread (void) } ACE_INLINE bool -TAO_Leader_Follower::is_client_leader_thread (void) const +TAO_Leader_Follower::is_client_leader_thread () const { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); return tss->client_leader_thread_ != 0; @@ -213,7 +213,7 @@ TAO_Leader_Follower::reverse_lock (void) } ACE_INLINE bool -TAO_Leader_Follower::has_clients (void) const +TAO_Leader_Follower::has_clients () const { return this->clients_; } diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl index 6622142746f..83707de5eef 100644 --- a/TAO/tao/MProfile.inl +++ b/TAO/tao/MProfile.inl @@ -121,7 +121,7 @@ TAO_MProfile::get_current_handle (void) } ACE_INLINE TAO_PHandle -TAO_MProfile::get_current_handle (void) const +TAO_MProfile::get_current_handle () const { if (current_ > 0) return current_ - 1; @@ -164,13 +164,13 @@ TAO_MProfile::forward_from (void) } ACE_INLINE CORBA::ULong -TAO_MProfile::profile_count (void) const +TAO_MProfile::profile_count () const { return this->last_; } ACE_INLINE CORBA::ULong -TAO_MProfile::size (void) const +TAO_MProfile::size () const { return this->size_; } @@ -184,7 +184,7 @@ TAO_MProfile::get_profile (CORBA::ULong slot) const } ACE_INLINE TAO_Profile ** -TAO_MProfile::pfiles (void) const +TAO_MProfile::pfiles () const { return this->pfiles_; } diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index 3c1f7d936c7..e66f3a52033 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -74,7 +74,7 @@ CORBA::ORB::_use_omg_ior_format (void) } ACE_INLINE TAO_ORB_Core * -CORBA::ORB::orb_core (void) const +CORBA::ORB::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index f6ebac0549d..2b2091241ac 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Service_Gestalt* -TAO_ORB_Core::configuration (void) const +TAO_ORB_Core::configuration () const { return this->config_.get (); } @@ -17,7 +17,7 @@ TAO_ORB_Core::_incr_refcnt (void) } ACE_INLINE unsigned long -TAO_ORB_Core::_refcnt (void) const +TAO_ORB_Core::_refcnt () const { return this->refcount_; } @@ -204,7 +204,7 @@ TAO_ORB_Core::optimize_collocation_objects (CORBA::Boolean opt) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::optimize_collocation_objects (void) const +TAO_ORB_Core::optimize_collocation_objects () const { return this->opt_for_collocation_; } @@ -216,13 +216,13 @@ TAO_ORB_Core::use_global_collocation (CORBA::Boolean opt) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::use_global_collocation (void) const +TAO_ORB_Core::use_global_collocation () const { return this->use_global_collocation_; } ACE_INLINE CORBA::ULong -TAO_ORB_Core::get_collocation_strategy (void) const +TAO_ORB_Core::get_collocation_strategy () const { return this->collocation_strategy_; } @@ -328,7 +328,7 @@ TAO_ORB_Core::tss_cleanup (ACE_Array_Base<void *> &ts_objects) } ACE_INLINE bool -TAO_ORB_Core::has_shutdown (void) const +TAO_ORB_Core::has_shutdown () const { return this->has_shutdown_; } @@ -341,7 +341,7 @@ TAO_ORB_Core::thread_per_connection_timeout (ACE_Time_Value &timeout) const } ACE_INLINE const char * -TAO_ORB_Core::orbid (void) const +TAO_ORB_Core::orbid () const { return this->orbid_; } @@ -417,7 +417,7 @@ TAO_ORB_Core::resolve_compression_manager (void) } ACE_INLINE const char * -TAO_ORB_Core::server_id (void) const +TAO_ORB_Core::server_id () const { return this->server_id_.c_str(); } diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl index 85d46f6c3c9..a44313f7874 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.inl +++ b/TAO/tao/ORB_Core_Auto_Ptr.inl @@ -9,7 +9,7 @@ TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p) } ACE_INLINE TAO_ORB_Core * -TAO_ORB_Core_Auto_Ptr::get (void) const +TAO_ORB_Core_Auto_Ptr::get () const { return this->p_; } diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl index 7a46a14512f..06bb71e0764 100644 --- a/TAO/tao/Object_Argument_T.inl +++ b/TAO/tao/Object_Argument_T.inl @@ -12,7 +12,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg (void) const +TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index e6f00479b3c..1f053542e9d 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -45,7 +45,7 @@ TAO_Object_Ref_Table::end (void) } ACE_INLINE size_t -TAO_Object_Ref_Table::current_size (void) const +TAO_Object_Ref_Table::current_size () const { return this->table_.size (); } diff --git a/TAO/tao/Objref_VarOut_T.inl b/TAO/tao/Objref_VarOut_T.inl index 8f56018c5f6..36a0e5a0dcb 100644 --- a/TAO/tao/Objref_VarOut_T.inl +++ b/TAO/tao/Objref_VarOut_T.inl @@ -18,7 +18,7 @@ TAO_Objref_Var_T<T>::~TAO_Objref_Var_T (void) template <typename T> ACE_INLINE T * -TAO_Objref_Var_T<T>::operator-> (void) const +TAO_Objref_Var_T<T>::operator-> () const { return this->ptr_; } @@ -40,7 +40,7 @@ TAO_Objref_Var_T<T>::operator T *& () template <typename T> ACE_INLINE T * -TAO_Objref_Var_T<T>::in (void) const +TAO_Objref_Var_T<T>::in () const { return this->ptr_; } @@ -76,7 +76,7 @@ TAO_Objref_Var_T<T>::_retn (void) template <typename T> ACE_INLINE T * -TAO_Objref_Var_T<T>::ptr (void) const +TAO_Objref_Var_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index d40ecfdb54d..1fd298a8791 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -32,7 +32,7 @@ namespace TAO template <typename InterceptorType, typename DetailsType> size_t - Interceptor_List<InterceptorType,DetailsType>::size (void) const + Interceptor_List<InterceptorType,DetailsType>::size () const { return this->interceptors_.size (); } diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl index 470ae448192..6dbf4a37bdf 100644 --- a/TAO/tao/PI/ORBInitInfo.inl +++ b/TAO/tao/PI/ORBInitInfo.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ORB_Core * -TAO_ORBInitInfo::orb_core (void) const +TAO_ORBInitInfo::orb_core () const { return this->orb_core_; } @@ -15,7 +15,7 @@ TAO_ORBInitInfo::invalidate (void) } ACE_INLINE PortableInterceptor::SlotId -TAO_ORBInitInfo::slot_count (void) const +TAO_ORBInitInfo::slot_count () const { return this->slot_count_; } diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl index f4feb5dff02..98d3f773177 100644 --- a/TAO/tao/PI/PICurrent.inl +++ b/TAO/tao/PI/PICurrent.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableInterceptor::SlotId -TAO::PICurrent::slot_count (void) const +TAO::PICurrent::slot_count () const { return this->slot_count_; } diff --git a/TAO/tao/Parser_Registry.inl b/TAO/tao/Parser_Registry.inl index 2ebe7c17722..78f43c4e8be 100644 --- a/TAO/tao/Parser_Registry.inl +++ b/TAO/tao/Parser_Registry.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Parser_Registry::Parser_Iterator -TAO_Parser_Registry::begin (void) const +TAO_Parser_Registry::begin () const { return this->parsers_; } ACE_INLINE TAO_Parser_Registry::Parser_Iterator -TAO_Parser_Registry::end (void) const +TAO_Parser_Registry::end () const { return this->parsers_ + this->size_; } diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl index 2dd22a60f12..e067d668d8f 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.inl +++ b/TAO/tao/Pluggable_Messaging_Utils.inl @@ -16,7 +16,7 @@ TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void) } ACE_INLINE GIOP::ReplyStatusType -TAO_Pluggable_Reply_Params_Base::reply_status (void) const +TAO_Pluggable_Reply_Params_Base::reply_status () const { return this->reply_status_; } @@ -28,7 +28,7 @@ TAO_Pluggable_Reply_Params_Base::reply_status (GIOP::ReplyStatusType status) } ACE_INLINE GIOP::LocateStatusType -TAO_Pluggable_Reply_Params_Base::locate_reply_status (void) const +TAO_Pluggable_Reply_Params_Base::locate_reply_status () const { return this->locate_reply_status_; } diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h index fb4ce4372f2..5770b261738 100644 --- a/TAO/tao/Policy_Current.h +++ b/TAO/tao/Policy_Current.h @@ -55,7 +55,7 @@ public: CORBA::SetOverrideType set_add); // = Set and get the implementation. - TAO_Policy_Current_Impl &implementation (void) const; + TAO_Policy_Current_Impl &implementation () const; TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &); }; diff --git a/TAO/tao/Policy_Set.inl b/TAO/tao/Policy_Set.inl index bd1fd8f2b05..8a1474a7866 100644 --- a/TAO/tao/Policy_Set.inl +++ b/TAO/tao/Policy_Set.inl @@ -16,7 +16,7 @@ TAO_Policy_Set::get_policy_by_index (CORBA::ULong index) const } ACE_INLINE CORBA::ULong -TAO_Policy_Set::num_policies (void) const +TAO_Policy_Set::num_policies () const { return this->policy_list_.length(); } diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index 4258e4a19d6..61d2bb711a6 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -7,49 +7,49 @@ namespace TAO { ACE_INLINE ThreadStrategy* - Active_Policy_Strategies::thread_strategy (void) const + Active_Policy_Strategies::thread_strategy () const { return this->thread_strategy_; } ACE_INLINE RequestProcessingStrategy* - Active_Policy_Strategies::request_processing_strategy (void) const + Active_Policy_Strategies::request_processing_strategy () const { return this->request_processing_strategy_; } ACE_INLINE IdAssignmentStrategy * - Active_Policy_Strategies::id_assignment_strategy (void) const + Active_Policy_Strategies::id_assignment_strategy () const { return this->id_assignment_strategy_; } ACE_INLINE IdUniquenessStrategy * - Active_Policy_Strategies::id_uniqueness_strategy (void) const + Active_Policy_Strategies::id_uniqueness_strategy () const { return this->id_uniqueness_strategy_; } ACE_INLINE LifespanStrategy* - Active_Policy_Strategies::lifespan_strategy (void) const + Active_Policy_Strategies::lifespan_strategy () const { return this->lifespan_strategy_; } ACE_INLINE ImplicitActivationStrategy* - Active_Policy_Strategies::implicit_activation_strategy (void) const + Active_Policy_Strategies::implicit_activation_strategy () const { return this->implicit_activation_strategy_; } ACE_INLINE ServantRetentionStrategy* - Active_Policy_Strategies::servant_retention_strategy (void) const + Active_Policy_Strategies::servant_retention_strategy () const { return this->servant_retention_strategy_; } diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h index 672669ea00c..9b682bd4bbd 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.h +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h @@ -45,7 +45,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - const typename S_var::s_traits::char_type * arg (void) const; + const typename S_var::s_traits::char_type * arg () const; private: S_var x_; diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl index fd3b9a1c555..6616af35a12 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl @@ -15,7 +15,7 @@ template<typename S_var, ACE_INLINE const typename S_var::s_traits::char_type * TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) const +arg () const { return this->x_.in (); } diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl index ad55e7d9bc8..b9d5f96a1f4 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl @@ -11,7 +11,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl index 10b275e2435..7308e632c6f 100644 --- a/TAO/tao/PortableServer/Creation_Time.inl +++ b/TAO/tao/PortableServer/Creation_Time.inl @@ -37,7 +37,7 @@ namespace TAO } ACE_INLINE const void * - Creation_Time::creation_time (void) const + Creation_Time::creation_time () const { return &this->time_stamp_; } diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl index 9843888e5bb..11e778ca6a9 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl @@ -14,7 +14,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type const * TAO::In_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) const + Insert_Policy>::arg () const { S_forany tmp (this->x_); return tmp.in (); diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl index 69029fde51c..c93447fbe10 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl @@ -5,7 +5,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S const & -TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl index eb9d69ca13c..d9b4fc5439a 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl @@ -6,7 +6,7 @@ namespace TAO namespace Portable_Server { ACE_INLINE ::TAO_Root_POA & - Non_Servant_Upcall::poa (void) const + Non_Servant_Upcall::poa () const { return this->poa_; } diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 41fa5df4626..603fac7b612 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -129,19 +129,19 @@ TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_name, } ACE_INLINE TAO_Root_POA * -TAO_Object_Adapter::root_poa (void) const +TAO_Object_Adapter::root_poa () const { return this->root_; } ACE_INLINE TAO_ORB_Core & -TAO_Object_Adapter::orb_core (void) const +TAO_Object_Adapter::orb_core () const { return this->orb_core_; } ACE_INLINE TAO::Portable_Server::Non_Servant_Upcall * -TAO_Object_Adapter::non_servant_upcall_in_progress (void) const +TAO_Object_Adapter::non_servant_upcall_in_progress () const { return this->non_servant_upcall_in_progress_; } diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl index fdda464dbdf..d7e8a6fa572 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.inl +++ b/TAO/tao/PortableServer/Object_SArgument_T.inl @@ -7,7 +7,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) const +TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index efb11b50208..05fc7d21eb6 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -67,7 +67,7 @@ TAO_POA_Manager::get_state (void) } ACE_INLINE char* -TAO_POA_Manager::generate_manager_id (void) const +TAO_POA_Manager::generate_manager_id () const { // The AdapterManagerId must be unique across all Adapter Managers // (e.g. POAManagers) within a given process. To avoid locking diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl index 0af8dc775eb..8be5ab21972 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.inl +++ b/TAO/tao/PortableServer/POA_Current_Impl.inl @@ -14,7 +14,7 @@ namespace TAO } ACE_INLINE ::TAO_Root_POA * - POA_Current_Impl::poa (void) const + POA_Current_Impl::poa () const { return this->poa_; } @@ -41,7 +41,7 @@ namespace TAO } ACE_INLINE const PortableServer::ObjectId & - POA_Current_Impl::object_id (void) const + POA_Current_Impl::object_id () const { return this->object_id_; } @@ -65,7 +65,7 @@ namespace TAO } ACE_INLINE const TAO::ObjectKey & - POA_Current_Impl::object_key (void) const + POA_Current_Impl::object_key () const { return *this->object_key_; } @@ -77,7 +77,7 @@ namespace TAO } ACE_INLINE PortableServer::Servant - POA_Current_Impl::servant (void) const + POA_Current_Impl::servant () const { return this->servant_; } @@ -89,7 +89,7 @@ namespace TAO } ACE_INLINE CORBA::Short - POA_Current_Impl::priority (void) const + POA_Current_Impl::priority () const { return this->priority_; } diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl index 6b8620f566f..26a39c0ec81 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.inl +++ b/TAO/tao/PortableServer/POA_Policy_Set.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -TAO_POA_Policy_Set::num_policies (void) const +TAO_POA_Policy_Set::num_policies () const { return this->impl_.num_policies (); } diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index f83dc99c883..e3dabccb7ac 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -81,7 +81,7 @@ TAO_Root_POA::persistent (void) } ACE_INLINE const ACE_CString & -TAO_Root_POA::name (void) const +TAO_Root_POA::name () const { return this->name_; } @@ -93,13 +93,13 @@ TAO_Root_POA::the_name (void) } ACE_INLINE const TAO_Object_Adapter::poa_name & -TAO_Root_POA::folded_name (void) const +TAO_Root_POA::folded_name () const { return this->folded_name_; } ACE_INLINE const TAO_Object_Adapter::poa_name & -TAO_Root_POA::system_name (void) const +TAO_Root_POA::system_name () const { return this->system_name_.in (); } @@ -177,7 +177,7 @@ TAO_Root_POA::root_key_type_length (void) } ACE_INLINE CORBA::ULong -TAO_Root_POA::outstanding_requests (void) const +TAO_Root_POA::outstanding_requests () const { return this->outstanding_requests_; } @@ -195,13 +195,13 @@ TAO_Root_POA::decrement_outstanding_requests (void) } ACE_INLINE CORBA::Boolean -TAO_Root_POA::waiting_destruction (void) const +TAO_Root_POA::waiting_destruction () const { return this->waiting_destruction_; } ACE_INLINE TAO_ORB_Core & -TAO_Root_POA::orb_core (void) const +TAO_Root_POA::orb_core () const { return this->orb_core_; } @@ -213,7 +213,7 @@ TAO_Root_POA::get_adapter_state (void) } ACE_INLINE void * -TAO_Root_POA::thread_pool (void) const +TAO_Root_POA::thread_pool () const { return 0; } diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl index 55a62063a64..e275e7a55a0 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Servant_Upcall.inl @@ -6,25 +6,25 @@ namespace TAO namespace Portable_Server { ACE_INLINE ::TAO_Root_POA & - Servant_Upcall::poa (void) const + Servant_Upcall::poa () const { return *this->poa_; } ACE_INLINE PortableServer::Servant - Servant_Upcall::servant (void) const + Servant_Upcall::servant () const { return this->servant_; } ACE_INLINE TAO_Object_Adapter & - Servant_Upcall::object_adapter (void) const + Servant_Upcall::object_adapter () const { return *this->object_adapter_; } ACE_INLINE const PortableServer::ObjectId & - Servant_Upcall::id (void) const + Servant_Upcall::id () const { return this->system_id_; } @@ -37,7 +37,7 @@ namespace TAO } ACE_INLINE const PortableServer::ObjectId & - Servant_Upcall::user_id (void) const + Servant_Upcall::user_id () const { return *(this->user_id_); } @@ -45,7 +45,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE void* - Servant_Upcall::locator_cookie (void) const + Servant_Upcall::locator_cookie () const { return this->cookie_; } @@ -57,7 +57,7 @@ namespace TAO } ACE_INLINE const char * - Servant_Upcall::operation (void) const + Servant_Upcall::operation () const { return this->operation_; } @@ -77,19 +77,19 @@ namespace TAO } ACE_INLINE TAO_Active_Object_Map_Entry * - Servant_Upcall::active_object_map_entry (void) const + Servant_Upcall::active_object_map_entry () const { return this->active_object_map_entry_; } ACE_INLINE CORBA::Short - Servant_Upcall::priority (void) const + Servant_Upcall::priority () const { return this->current_context_.priority (); } ACE_INLINE Servant_Upcall::State - Servant_Upcall::state (void) const + Servant_Upcall::state () const { return this->state_; } diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl index d3b4b51c590..8b27ee076d7 100644 --- a/TAO/tao/PortableServer/Servant_var.inl +++ b/TAO/tao/PortableServer/Servant_var.inl @@ -81,7 +81,7 @@ ACE_INLINE PortableServer::Servant_var<T>::operator void const * () const template <class T> ACE_INLINE T * -PortableServer::Servant_var<T>::in (void) const +PortableServer::Servant_var<T>::in () const { return this->ptr_; } diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index 734692c5848..e08e74db721 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -17,7 +17,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S const & -TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const +TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl index 2476cbcfd75..1dca942a25d 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl @@ -8,7 +8,7 @@ TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void) template<typename S, typename S_var> const S * -TAO::In_UB_String_SArgument_T<S,S_var>::arg (void) const +TAO::In_UB_String_SArgument_T<S,S_var>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index cfbc2319434..c4655848d33 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -13,7 +13,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type const * TAO::In_Var_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) const + Insert_Policy>::arg () const { S_forany tmp (this->x_); return tmp.in (); diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl index 6e7b63d6253..015c9c1c053 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, template <typename> class Insert_Policy> S const & -TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h index 958d8234fe5..e72993a27d4 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.h +++ b/TAO/tao/PortableServer/Vector_SArgument_T.h @@ -38,7 +38,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.inl b/TAO/tao/PortableServer/Vector_SArgument_T.inl index 32db5ff5f3e..1ade6aa3b16 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.inl +++ b/TAO/tao/PortableServer/Vector_SArgument_T.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, template <typename> class Insert_Policy> S const & -TAO::In_Vector_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Vector_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Profile.inl b/TAO/tao/Profile.inl index 3076b19cce4..733cb9d93c8 100644 --- a/TAO/tao/Profile.inl +++ b/TAO/tao/Profile.inl @@ -2,19 +2,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -TAO_Profile::tag (void) const +TAO_Profile::tag () const { return this->tag_; } ACE_INLINE const TAO_GIOP_Message_Version & -TAO_Profile::version (void) const +TAO_Profile::version () const { return this->version_; } ACE_INLINE TAO_ORB_Core * -TAO_Profile::orb_core (void) const +TAO_Profile::orb_core () const { return this->orb_core_; } @@ -38,7 +38,7 @@ TAO_Profile::forward_to_i (void) } ACE_INLINE const TAO_Tagged_Components& -TAO_Profile::tagged_components (void) const +TAO_Profile::tagged_components () const { return this->tagged_components_; } @@ -50,13 +50,13 @@ TAO_Profile::tagged_components (void) } ACE_INLINE CORBA::Short -TAO_Profile::addressing_mode (void) const +TAO_Profile::addressing_mode () const { return this->addressing_mode_; } ACE_INLINE const TAO::ObjectKey & -TAO_Profile::object_key (void) const +TAO_Profile::object_key () const { return this->ref_object_key_->object_key (); } diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl index e1a8e716b6a..4b066ac14f1 100644 --- a/TAO/tao/Profile_Transport_Resolver.inl +++ b/TAO/tao/Profile_Transport_Resolver.inl @@ -20,43 +20,43 @@ namespace TAO } ACE_INLINE TAO_Stub * - Profile_Transport_Resolver::stub (void) const + Profile_Transport_Resolver::stub () const { return this->stub_; } ACE_INLINE CORBA::Object_ptr - Profile_Transport_Resolver::object (void) const + Profile_Transport_Resolver::object () const { return this->obj_; } ACE_INLINE TAO_Profile * - Profile_Transport_Resolver::profile (void) const + Profile_Transport_Resolver::profile () const { return this->profile_; } ACE_INLINE TAO_Transport * - Profile_Transport_Resolver::transport (void) const + Profile_Transport_Resolver::transport () const { return this->transport_.get (); } ACE_INLINE bool - Profile_Transport_Resolver::blocked_connect (void) const + Profile_Transport_Resolver::blocked_connect () const { return this->blocked_; } ACE_INLINE void - Profile_Transport_Resolver::transport_released (void) const + Profile_Transport_Resolver::transport_released () const { this->is_released_ = true; } ACE_INLINE CORBA::PolicyList * - Profile_Transport_Resolver::inconsistent_policies (void) const + Profile_Transport_Resolver::inconsistent_policies () const { return this->inconsistent_policies_; } diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 63b5c5accf5..9a54afb1e17 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -40,17 +40,17 @@ public: /// The protocol tag, each concrete class will have a specific tag /// value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Verify prefix is a match virtual int match_prefix (const ACE_CString &prefix) = 0; /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const = 0; + virtual const char *prefix () const = 0; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const = 0; + virtual char options_delimiter () const = 0; // Factory methods /// Create an acceptor @@ -66,7 +66,7 @@ public: * point if the server crashes. For those protocols it is better to * create the endpoint only if the user requests one. */ - virtual int requires_explicit_endpoint (void) const = 0; + virtual int requires_explicit_endpoint () const = 0; private: diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl index 92e327d3f18..b311939f02a 100644 --- a/TAO/tao/Pseudo_VarOut_T.inl +++ b/TAO/tao/Pseudo_VarOut_T.inl @@ -56,7 +56,7 @@ TAO_Pseudo_Var_T<T>::operator typename T::_ptr_type & () template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::operator-> (void) const +TAO_Pseudo_Var_T<T>::operator-> () const { return this->ptr_; } @@ -64,7 +64,7 @@ TAO_Pseudo_Var_T<T>::operator-> (void) const template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::in (void) const +TAO_Pseudo_Var_T<T>::in () const { return this->ptr_; } @@ -100,7 +100,7 @@ TAO_Pseudo_Var_T<T>::_retn (void) template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::ptr (void) const +TAO_Pseudo_Var_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/Queued_Data.inl b/TAO/tao/Queued_Data.inl index c5cf403eafb..c90cb50c2e1 100644 --- a/TAO/tao/Queued_Data.inl +++ b/TAO/tao/Queued_Data.inl @@ -61,7 +61,7 @@ TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd) ACE_INLINE size_t -TAO_Queued_Data::missing_data (void) const +TAO_Queued_Data::missing_data () const { return this->missing_data_; } @@ -73,31 +73,31 @@ TAO_Queued_Data::missing_data (size_t data) } ACE_INLINE TAO_GIOP_Message_Version const & -TAO_Queued_Data::giop_version (void) const +TAO_Queued_Data::giop_version () const { return this->state_.giop_version (); } ACE_INLINE CORBA::Octet -TAO_Queued_Data::byte_order (void) const +TAO_Queued_Data::byte_order () const { return this->state_.byte_order (); } ACE_INLINE CORBA::Boolean -TAO_Queued_Data::more_fragments (void) const +TAO_Queued_Data::more_fragments () const { return this->state_.more_fragments (); } ACE_INLINE GIOP::MsgType -TAO_Queued_Data::msg_type (void) const +TAO_Queued_Data::msg_type () const { return this->state_.message_type (); } ACE_INLINE TAO_Queued_Data * -TAO_Queued_Data::next (void) const +TAO_Queued_Data::next () const { return this->next_; } @@ -109,7 +109,7 @@ TAO_Queued_Data::next (TAO_Queued_Data* qd) } ACE_INLINE ACE_Message_Block * -TAO_Queued_Data::msg_block (void) const +TAO_Queued_Data::msg_block () const { return this->msg_block_; } @@ -127,7 +127,7 @@ TAO_Queued_Data::state (const TAO_GIOP_Message_State& state) } ACE_INLINE const TAO_GIOP_Message_State& -TAO_Queued_Data::state (void) const +TAO_Queued_Data::state () const { return this->state_; } diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index b88ccc5c81e..2decc9345f5 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -106,10 +106,10 @@ public: */ //@{ /// Set/get the next element in the list - TAO_Queued_Message *next (void) const; + TAO_Queued_Message *next () const; /// Set/get the previous element in the list - TAO_Queued_Message *prev (void) const; + TAO_Queued_Message *prev () const; /// Remove this element from the list void remove_from_list (TAO_Queued_Message *&head, @@ -133,10 +133,10 @@ public: * If the message has been partially sent it returns the number of * bytes that are still not sent. */ - virtual size_t message_length (void) const = 0; + virtual size_t message_length () const = 0; /// Return 1 if all the data has been sent - virtual int all_data_sent (void) const = 0; + virtual int all_data_sent () const = 0; /// Fill up an io vector using the connects of the message /** diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl index e3a6cf8b456..3b06604891c 100644 --- a/TAO/tao/Queued_Message.inl +++ b/TAO/tao/Queued_Message.inl @@ -1,13 +1,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Queued_Message * -TAO_Queued_Message::next (void) const +TAO_Queued_Message::next () const { return this->next_; } ACE_INLINE TAO_Queued_Message * -TAO_Queued_Message::prev (void) const +TAO_Queued_Message::prev () const { return this->prev_; } diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index aa311e58224..a49e502ffaa 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -37,7 +37,7 @@ TAO_Network_Priority_Mapping_Manager::_duplicate ( } const char* -TAO_Network_Priority_Mapping_Manager::_interface_repository_id (void) const +TAO_Network_Priority_Mapping_Manager::_interface_repository_id () const { return "IDL:Network_Priority_Mapping_Manager:1.0"; } diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index be5a8568954..df2c5ca5080 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -71,7 +71,7 @@ public: return nullptr; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: @@ -100,16 +100,16 @@ public: TAO_Network_Priority_Mapping_Manager_var &operator= (TAO_Network_Priority_Mapping_Manager_ptr); TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Network_Priority_Mapping_Manager_var &); - TAO_Network_Priority_Mapping_Manager_ptr operator-> (void) const; + TAO_Network_Priority_Mapping_Manager_ptr operator-> () const; /// in, inout, out, _retn operator const TAO_Network_Priority_Mapping_Manager_ptr &() const; operator TAO_Network_Priority_Mapping_Manager_ptr &(); - TAO_Network_Priority_Mapping_Manager_ptr in (void) const; + TAO_Network_Priority_Mapping_Manager_ptr in () const; TAO_Network_Priority_Mapping_Manager_ptr &inout (void); TAO_Network_Priority_Mapping_Manager_ptr &out (void); TAO_Network_Priority_Mapping_Manager_ptr _retn (void); - TAO_Network_Priority_Mapping_Manager_ptr ptr (void) const; + TAO_Network_Priority_Mapping_Manager_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl index 9b2e45ec772..fc1de165745 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl @@ -16,7 +16,7 @@ TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_v {} ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::ptr (void) const +TAO_Network_Priority_Mapping_Manager_var::ptr () const { return this->ptr_; } @@ -65,13 +65,13 @@ TAO_Network_Priority_Mapping_Manager_var::operator ::TAO_Network_Priority_Mappin } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::operator-> (void) const +TAO_Network_Priority_Mapping_Manager_var::operator-> () const { return this->ptr_; } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::in (void) const +TAO_Network_Priority_Mapping_Manager_var::in () const { return this->ptr_; } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index bba2c40b318..cc64c8f81cd 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -30,7 +30,7 @@ TAO_Priority_Mapping_Manager::_duplicate (TAO_Priority_Mapping_Manager_ptr obj) } const char* -TAO_Priority_Mapping_Manager::_interface_repository_id (void) const +TAO_Priority_Mapping_Manager::_interface_repository_id () const { return "IDL:Priority_Mapping_Manager:1.0"; } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 783e1487f93..a2dd7b48886 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -92,16 +92,16 @@ public: TAO_Priority_Mapping_Manager_var &operator= (TAO_Priority_Mapping_Manager_ptr); TAO_Priority_Mapping_Manager_var &operator= (const TAO_Priority_Mapping_Manager_var &); - TAO_Priority_Mapping_Manager_ptr operator-> (void) const; + TAO_Priority_Mapping_Manager_ptr operator-> () const; /// in, inout, out, _retn operator const TAO_Priority_Mapping_Manager_ptr &() const; operator TAO_Priority_Mapping_Manager_ptr &(); - TAO_Priority_Mapping_Manager_ptr in (void) const; + TAO_Priority_Mapping_Manager_ptr in () const; TAO_Priority_Mapping_Manager_ptr &inout (void); TAO_Priority_Mapping_Manager_ptr &out (void); TAO_Priority_Mapping_Manager_ptr _retn (void); - TAO_Priority_Mapping_Manager_ptr ptr (void) const; + TAO_Priority_Mapping_Manager_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl index c6eef8a2abd..dffaea89b8e 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl @@ -16,7 +16,7 @@ TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (TAO_Priority {} ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::ptr (void) const +TAO_Priority_Mapping_Manager_var::ptr () const { return this->ptr_; } @@ -65,13 +65,13 @@ TAO_Priority_Mapping_Manager_var::operator ::TAO_Priority_Mapping_Manager_ptr &( } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::operator-> (void) const +TAO_Priority_Mapping_Manager_var::operator-> () const { return this->ptr_; } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::in (void) const +TAO_Priority_Mapping_Manager_var::in () const { return this->ptr_; } diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index d129d4e2de4..157b5747100 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -63,7 +63,7 @@ TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time) } const char * -TAO_RT_Mutex::name (void) const +TAO_RT_Mutex::name () const { return 0; } @@ -76,7 +76,7 @@ TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name) } const char * -TAO_Named_RT_Mutex::name (void) const +TAO_Named_RT_Mutex::name () const { return this->name_.c_str (); } diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index 5ac0b0156e8..b17cf860b16 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -66,7 +66,7 @@ public: virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait); /// Returns the name of the mutex. - virtual const char *name (void) const; + virtual const char *name () const; /// Destructor. virtual ~TAO_RT_Mutex (void); @@ -89,7 +89,7 @@ public: TAO_Named_RT_Mutex (const char *name); /// Returns the name of the mutex. - virtual const char *name (void) const; + virtual const char *name () const; protected: diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 1505d6a7a28..3a2229b58e3 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -426,13 +426,13 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco } TAO_Thread_Pool_Manager & -TAO_RT_ORB::tp_manager (void) const +TAO_RT_ORB::tp_manager () const { return *this->tp_manager_; } TAO_ORB_Core * -TAO_RT_ORB::orb_core (void) const +TAO_RT_ORB::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 782fa8c0b83..12fd4afb9ec 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -228,10 +228,10 @@ public: create_client_protocol_policy (const RTCORBA::ProtocolList & protocols); /// Reference to our creating ORB Core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Get the Thread Pool Manager. - TAO_Thread_Pool_Manager &tp_manager (void) const; + TAO_Thread_Pool_Manager &tp_manager () const; /** * This method changes the scheduling policy of the calling thread diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index a7f5a437a8e..453572829f9 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -114,13 +114,13 @@ TAO_PriorityModelPolicy::_tao_decode (TAO_InputCDR &in_cdr) } TAO_Cached_Policy_Type -TAO_PriorityModelPolicy::_tao_cached_type (void) const +TAO_PriorityModelPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_PRIORITY_MODEL; } TAO_Policy_Scope -TAO_PriorityModelPolicy::_tao_scope (void) const +TAO_PriorityModelPolicy::_tao_scope () const { // Note that this policy is propagated to the client even though // it is not specified here. The reason for this is that the @@ -201,13 +201,13 @@ TAO_ThreadpoolPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_ThreadpoolPolicy::_tao_cached_type (void) const +TAO_ThreadpoolPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_THREADPOOL; } TAO_Policy_Scope -TAO_ThreadpoolPolicy::_tao_scope (void) const +TAO_ThreadpoolPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE | TAO_POLICY_POA_SCOPE); @@ -271,13 +271,13 @@ TAO_PrivateConnectionPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_PrivateConnectionPolicy::_tao_cached_type (void) const +TAO_PrivateConnectionPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION; } TAO_Policy_Scope -TAO_PrivateConnectionPolicy::_tao_scope (void) const +TAO_PrivateConnectionPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_OBJECT_SCOPE | TAO_POLICY_THREAD_SCOPE | @@ -376,13 +376,13 @@ TAO_PriorityBandedConnectionPolicy::_tao_decode (TAO_InputCDR &in_cdr) } TAO_Cached_Policy_Type -TAO_PriorityBandedConnectionPolicy::_tao_cached_type (void) const +TAO_PriorityBandedConnectionPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION; } TAO_Policy_Scope -TAO_PriorityBandedConnectionPolicy::_tao_scope (void) const +TAO_PriorityBandedConnectionPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); @@ -470,13 +470,13 @@ TAO_ServerProtocolPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_ServerProtocolPolicy::_tao_cached_type (void) const +TAO_ServerProtocolPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_SERVER_PROTOCOL; } TAO_Policy_Scope -TAO_ServerProtocolPolicy::_tao_scope (void) const +TAO_ServerProtocolPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE | TAO_POLICY_POA_SCOPE); @@ -569,13 +569,13 @@ TAO_ClientProtocolPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_ClientProtocolPolicy::_tao_cached_type (void) const +TAO_ClientProtocolPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL; } TAO_Policy_Scope -TAO_ClientProtocolPolicy::_tao_scope (void) const +TAO_ClientProtocolPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 89d48daf6bb..b145bb51e29 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -79,10 +79,10 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -135,10 +135,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -185,10 +185,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -248,10 +248,10 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -311,10 +311,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -377,10 +377,10 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp index c2d3aa2ba91..c7ae47b6ab6 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp @@ -167,7 +167,7 @@ RTCORBA::ProtocolProperties::_is_a (const char *value) } } -const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const +const char* RTCORBA::ProtocolProperties::_interface_repository_id () const { return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"; } diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h index d45c28b2535..f32303eb9ba 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h @@ -109,7 +109,7 @@ namespace RTCORBA // be\be_visitor_interface/interface_ch.cpp:216 virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); // CDR Encoder/Decoder methods. (handcrafted) diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp index b429de80109..ce87cde295e 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp @@ -105,7 +105,7 @@ TAO_RT_Transport_Descriptor::is_equivalent (const TAO_Transport_Descriptor_Inter } u_long -TAO_RT_Transport_Descriptor::hash (void) const +TAO_RT_Transport_Descriptor::hash () const { return this->endpoint_->hash (); } diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h index 20e3f23682c..58144c5adc7 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h @@ -56,7 +56,7 @@ public: const TAO_Transport_Descriptor_Interface *other_prop); /// Generate hash value for our class - virtual u_long hash (void) const; + virtual u_long hash () const; private: /// Stack of properties. diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 9f7e37d1229..241f24e2501 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -384,7 +384,7 @@ TAO_Thread_Lane::is_collocated (const TAO_MProfile &mprofile) } CORBA::ULong -TAO_Thread_Lane::current_threads (void) const +TAO_Thread_Lane::current_threads () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, @@ -943,7 +943,7 @@ TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ) } TAO_ORB_Core & -TAO_Thread_Pool_Manager::orb_core (void) const +TAO_Thread_Pool_Manager::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index 6fd40ceb412..1ce347b00e6 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -78,7 +78,7 @@ public: int svc (void); /// Accessor to the lane to which this thread belongs to. - TAO_Thread_Lane &lane (void) const; + TAO_Thread_Lane &lane () const; /// Set TSS resources for the current thread. static void set_tss_resources (TAO_ORB_Core &orb_core, @@ -173,22 +173,22 @@ public: /// @name Accessors // @{ - TAO_Thread_Pool &pool (void) const; - CORBA::ULong id (void) const; + TAO_Thread_Pool &pool () const; + CORBA::ULong id () const; - CORBA::Short lane_priority (void) const; - CORBA::ULong static_threads (void) const; - CORBA::ULong dynamic_threads (void) const; + CORBA::Short lane_priority () const; + CORBA::ULong static_threads () const; + CORBA::ULong dynamic_threads () const; - CORBA::ULong current_threads (void) const; + CORBA::ULong current_threads () const; - CORBA::Short native_priority (void) const; + CORBA::Short native_priority () const; TAO_Thread_Lane_Resources &resources (void); - TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan (void) const; + TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan () const; - ACE_Time_Value const &dynamic_thread_time (void) const; + ACE_Time_Value const &dynamic_thread_time () const; // @} private: @@ -307,22 +307,22 @@ public: int create_static_threads (void); /// Check if this thread pool has (explicit) lanes. - bool with_lanes (void) const; + bool with_lanes () const; /// @name Accessors // @{ - TAO_Thread_Pool_Manager &manager (void) const; - CORBA::ULong id (void) const; + TAO_Thread_Pool_Manager &manager () const; + CORBA::ULong id () const; - CORBA::ULong stack_size (void) const; - CORBA::Boolean allow_borrowing (void) const; - CORBA::Boolean allow_request_buffering (void) const; - CORBA::ULong max_buffered_requests (void) const; - CORBA::ULong max_request_buffer_size (void) const; + CORBA::ULong stack_size () const; + CORBA::Boolean allow_borrowing () const; + CORBA::Boolean allow_request_buffering () const; + CORBA::ULong max_buffered_requests () const; + CORBA::ULong max_request_buffer_size () const; TAO_Thread_Lane **lanes (void); - CORBA::ULong number_of_lanes (void) const; + CORBA::ULong number_of_lanes () const; // @} private: @@ -407,7 +407,7 @@ public: /// @name Accessors // @{ - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; // @} private: diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl index f28ea573729..a08e0dffc39 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.inl +++ b/TAO/tao/RTCORBA/Thread_Pool.inl @@ -3,49 +3,49 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Thread_Lane & -TAO_Thread_Pool_Threads::lane (void) const +TAO_Thread_Pool_Threads::lane () const { return this->lane_; } ACE_INLINE CORBA::ULong -TAO_Thread_Lane::id (void) const +TAO_Thread_Lane::id () const { return this->id_; } ACE_INLINE TAO_Thread_Pool & -TAO_Thread_Lane::pool (void) const +TAO_Thread_Lane::pool () const { return this->pool_; } ACE_INLINE CORBA::Short -TAO_Thread_Lane::lane_priority (void) const +TAO_Thread_Lane::lane_priority () const { return this->lane_priority_; } ACE_INLINE CORBA::Short -TAO_Thread_Lane::native_priority (void) const +TAO_Thread_Lane::native_priority () const { return this->native_priority_; } ACE_INLINE CORBA::ULong -TAO_Thread_Lane::static_threads (void) const +TAO_Thread_Lane::static_threads () const { return this->static_threads_number_; } ACE_INLINE CORBA::ULong -TAO_Thread_Lane::dynamic_threads (void) const +TAO_Thread_Lane::dynamic_threads () const { return this->dynamic_threads_number_; } @@ -59,70 +59,70 @@ TAO_Thread_Lane::resources (void) ACE_INLINE TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan -TAO_Thread_Lane::lifespan (void) const +TAO_Thread_Lane::lifespan () const { return this->lifespan_; } ACE_INLINE ACE_Time_Value const & -TAO_Thread_Lane::dynamic_thread_time (void) const +TAO_Thread_Lane::dynamic_thread_time () const { return this->dynamic_thread_time_; } ACE_INLINE bool -TAO_Thread_Pool::with_lanes (void) const +TAO_Thread_Pool::with_lanes () const { return this->with_lanes_; } ACE_INLINE TAO_Thread_Pool_Manager & -TAO_Thread_Pool::manager (void) const +TAO_Thread_Pool::manager () const { return this->manager_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::id (void) const +TAO_Thread_Pool::id () const { return this->id_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::stack_size (void) const +TAO_Thread_Pool::stack_size () const { return this->stack_size_; } ACE_INLINE CORBA::Boolean -TAO_Thread_Pool::allow_borrowing (void) const +TAO_Thread_Pool::allow_borrowing () const { return this->allow_borrowing_; } ACE_INLINE CORBA::Boolean -TAO_Thread_Pool::allow_request_buffering (void) const +TAO_Thread_Pool::allow_request_buffering () const { return this->allow_request_buffering_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::max_buffered_requests (void) const +TAO_Thread_Pool::max_buffered_requests () const { return this->max_buffered_requests_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::max_request_buffer_size (void) const +TAO_Thread_Pool::max_request_buffer_size () const { return this->max_request_buffer_size_; } @@ -136,7 +136,7 @@ TAO_Thread_Pool::lanes (void) ACE_INLINE CORBA::ULong -TAO_Thread_Pool::number_of_lanes (void) const +TAO_Thread_Pool::number_of_lanes () const { return this->number_of_lanes_; } diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 2e90b0f4046..97662624749 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -186,7 +186,7 @@ public: virtual ~TAO_RT_POA (void); - void *thread_pool (void) const; + void *thread_pool () const; protected: diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl index ef48b7390bc..8326d0903a1 100644 --- a/TAO/tao/RTPortableServer/RT_POA.inl +++ b/TAO/tao/RTPortableServer/RT_POA.inl @@ -102,7 +102,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId #endif ACE_INLINE void * -TAO_RT_POA::thread_pool (void) const +TAO_RT_POA::thread_pool () const { return this->thread_pool_; } diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 7865ac7dc3b..4cb6456e278 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -814,13 +814,13 @@ TAO_RTScheduler_Current_var::operator ::TAO_RTScheduler_Current_ptr &() } TAO_RTScheduler_Current_ptr -TAO_RTScheduler_Current_var::operator-> (void) const +TAO_RTScheduler_Current_var::operator-> () const { return this->ptr_; } TAO_RTScheduler_Current_ptr -TAO_RTScheduler_Current_var::in (void) const +TAO_RTScheduler_Current_var::in () const { return this->ptr_; } @@ -896,7 +896,7 @@ TAO_RTScheduler_Current::_duplicate (TAO_RTScheduler_Current_ptr obj) return obj; } -const char* TAO_RTScheduler_Current::_interface_repository_id (void) const +const char* TAO_RTScheduler_Current::_interface_repository_id () const { return "IDL:TAO_RTScheduler_Current:1.0"; } diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index f018140c012..3cba1c6667b 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -152,7 +152,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current return nullptr; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; //@} private: @@ -179,16 +179,16 @@ public: TAO_RTScheduler_Current_var &operator= (TAO_RTScheduler_Current_ptr); TAO_RTScheduler_Current_var &operator= (const TAO_RTScheduler_Current_var &); - TAO_RTScheduler_Current_ptr operator-> (void) const; + TAO_RTScheduler_Current_ptr operator-> () const; operator const TAO_RTScheduler_Current_ptr &() const; operator TAO_RTScheduler_Current_ptr &(); // in, inout, out, _retn - TAO_RTScheduler_Current_ptr in (void) const; + TAO_RTScheduler_Current_ptr in () const; TAO_RTScheduler_Current_ptr &inout (void); TAO_RTScheduler_Current_ptr &out (void); TAO_RTScheduler_Current_ptr _retn (void); - TAO_RTScheduler_Current_ptr ptr (void) const; + TAO_RTScheduler_Current_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp index a5b75dc14a5..c592e98ac50 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp @@ -33,7 +33,7 @@ TAO_RTScheduler_Manager::_duplicate (TAO_RTScheduler_Manager_ptr obj) } const char* -TAO_RTScheduler_Manager::_interface_repository_id (void) const +TAO_RTScheduler_Manager::_interface_repository_id () const { return "IDL:RTScheduler_Manager:1.0"; } diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index b0d0221e9a7..f3b0513c27f 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -54,7 +54,7 @@ public: return nullptr; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: @@ -83,16 +83,16 @@ public: TAO_RTScheduler_Manager_var &operator= (TAO_RTScheduler_Manager_ptr); TAO_RTScheduler_Manager_var &operator= (const TAO_RTScheduler_Manager_var &); - TAO_RTScheduler_Manager_ptr operator-> (void) const; + TAO_RTScheduler_Manager_ptr operator-> () const; /// in, inout, out, _retn operator const TAO_RTScheduler_Manager_ptr &() const; operator TAO_RTScheduler_Manager_ptr &(); - TAO_RTScheduler_Manager_ptr in (void) const; + TAO_RTScheduler_Manager_ptr in () const; TAO_RTScheduler_Manager_ptr &inout (void); TAO_RTScheduler_Manager_ptr &out (void); TAO_RTScheduler_Manager_ptr _retn (void); - TAO_RTScheduler_Manager_ptr ptr (void) const; + TAO_RTScheduler_Manager_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl index 8247beea3a8..7c8698b9c60 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl @@ -20,7 +20,7 @@ TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var ( {} ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::ptr (void) const +TAO_RTScheduler_Manager_var::ptr () const { return this->ptr_; } @@ -71,13 +71,13 @@ TAO_RTScheduler_Manager_var::operator ::TAO_RTScheduler_Manager_ptr &() // cast } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::operator-> (void) const +TAO_RTScheduler_Manager_var::operator-> () const { return this->ptr_; } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::in (void) const +TAO_RTScheduler_Manager_var::in () const { return this->ptr_; } diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl index 35fa18b2ea3..aef3dc53236 100644 --- a/TAO/tao/Refcounted_ObjectKey.inl +++ b/TAO/tao/Refcounted_ObjectKey.inl @@ -8,7 +8,7 @@ TAO::Refcounted_ObjectKey::incr_refcount (void) } ACE_INLINE const TAO::ObjectKey & -TAO::Refcounted_ObjectKey::object_key (void) const +TAO::Refcounted_ObjectKey::object_key () const { return this->object_key_; } diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl index bee41dfe39c..6d96a3176af 100644 --- a/TAO/tao/Seq_Var_T.inl +++ b/TAO/tao/Seq_Var_T.inl @@ -25,7 +25,7 @@ TAO_Seq_Var_Base_T<T>::~TAO_Seq_Var_Base_T (void) template<typename T> ACE_INLINE const T * -TAO_Seq_Var_Base_T<T>::operator-> (void) const +TAO_Seq_Var_Base_T<T>::operator-> () const { return this->ptr_; } @@ -62,7 +62,7 @@ TAO_Seq_Var_Base_T<T>::operator T & () const template<typename T> ACE_INLINE const T & -TAO_Seq_Var_Base_T<T>::in (void) const +TAO_Seq_Var_Base_T<T>::in () const { return *this->ptr_; } @@ -98,7 +98,7 @@ TAO_Seq_Var_Base_T<T>::_retn (void) template<typename T> ACE_INLINE T * -TAO_Seq_Var_Base_T<T>::ptr (void) const +TAO_Seq_Var_Base_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl index 60bb3b0cc7f..f2cb3f6e078 100644 --- a/TAO/tao/Service_Context.inl +++ b/TAO/tao/Service_Context.inl @@ -14,7 +14,7 @@ TAO_Service_Context::service_info (void) } ACE_INLINE const IOP::ServiceContextList & -TAO_Service_Context::service_info (void) const +TAO_Service_Context::service_info () const { return this->service_context_; } diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl index d36f60b04bd..0fe4c12ecc3 100644 --- a/TAO/tao/Special_Basic_Argument_T.inl +++ b/TAO/tao/Special_Basic_Argument_T.inl @@ -18,7 +18,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S const & -TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) const +TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Storable_Base.h b/TAO/tao/Storable_Base.h index 5a07734f47f..dc5a6422002 100644 --- a/TAO/tao/Storable_Base.h +++ b/TAO/tao/Storable_Base.h @@ -79,15 +79,15 @@ namespace TAO void setstate (Storable_State state); - Storable_State rdstate (void) const; + Storable_State rdstate () const; - bool good (void) const; + bool good () const; - bool bad (void) const; + bool bad () const; - bool eof (void) const; + bool eof () const; - bool fail (void) const; + bool fail () const; static ACE_CString state_as_string (Storable_State state); diff --git a/TAO/tao/Storable_Base.inl b/TAO/tao/Storable_Base.inl index 27999dd25e9..53d866ce893 100644 --- a/TAO/tao/Storable_Base.inl +++ b/TAO/tao/Storable_Base.inl @@ -41,31 +41,31 @@ TAO::Storable_Base::setstate (TAO::Storable_Base::Storable_State state) } ACE_INLINE TAO::Storable_Base::Storable_State -TAO::Storable_Base::rdstate (void) const +TAO::Storable_Base::rdstate () const { return this->state_; } ACE_INLINE bool -TAO::Storable_Base::good (void) const +TAO::Storable_Base::good () const { return (this->state_ == goodbit); } ACE_INLINE bool -TAO::Storable_Base::bad (void) const +TAO::Storable_Base::bad () const { return (this->state_ & badbit); } ACE_INLINE bool -TAO::Storable_Base::eof (void) const +TAO::Storable_Base::eof () const { return (this->state_ & eofbit); } ACE_INLINE bool -TAO::Storable_Base::fail (void) const +TAO::Storable_Base::fail () const { return (this->state_ & failbit); } diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp index a56d1b804c7..21bbaad9dac 100644 --- a/TAO/tao/Strategies/COIOP_Connector.cpp +++ b/TAO/tao/Strategies/COIOP_Connector.cpp @@ -128,7 +128,7 @@ TAO_COIOP_Connector::check_prefix (const char *endpoint) } char -TAO_COIOP_Connector::object_key_delimiter (void) const +TAO_COIOP_Connector::object_key_delimiter () const { return TAO_COIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h index 0560ba245e4..5f6fff50bcf 100644 --- a/TAO/tao/Strategies/COIOP_Connector.h +++ b/TAO/tao/Strategies/COIOP_Connector.h @@ -64,7 +64,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; //@} protected: diff --git a/TAO/tao/Strategies/COIOP_Endpoint.h b/TAO/tao/Strategies/COIOP_Endpoint.h index d5737929cca..a6fad6bc309 100644 --- a/TAO/tao/Strategies/COIOP_Endpoint.h +++ b/TAO/tao/Strategies/COIOP_Endpoint.h @@ -76,7 +76,7 @@ public: /// Return a pointer to the host string. This object maintains /// ownership of this string. - const ACE_Utils::UUID& uuid (void) const; + const ACE_Utils::UUID& uuid () const; private: /// UUID uniquely identifying this COIOP endpoint diff --git a/TAO/tao/Strategies/COIOP_Endpoint.inl b/TAO/tao/Strategies/COIOP_Endpoint.inl index 4cf5ccc3437..f4c0dea98b3 100644 --- a/TAO/tao/Strategies/COIOP_Endpoint.inl +++ b/TAO/tao/Strategies/COIOP_Endpoint.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_Utils::UUID& -TAO_COIOP_Endpoint::uuid (void) const +TAO_COIOP_Endpoint::uuid () const { return this->uuid_; } diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp index 00a5ad1d67f..d239c961daf 100644 --- a/TAO/tao/Strategies/COIOP_Factory.cpp +++ b/TAO/tao/Strategies/COIOP_Factory.cpp @@ -30,13 +30,13 @@ TAO_COIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_COIOP_Protocol_Factory::prefix (void) const +TAO_COIOP_Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO_COIOP_Protocol_Factory::options_delimiter (void) const +TAO_COIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -72,7 +72,7 @@ TAO_COIOP_Protocol_Factory::make_connector (void) } int -TAO_COIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_COIOP_Protocol_Factory::requires_explicit_endpoint () const { return 0; } diff --git a/TAO/tao/Strategies/COIOP_Factory.h b/TAO/tao/Strategies/COIOP_Factory.h index c8f7fcc69af..19c95335947 100644 --- a/TAO/tao/Strategies/COIOP_Factory.h +++ b/TAO/tao/Strategies/COIOP_Factory.h @@ -49,11 +49,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -63,7 +63,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} }; diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp index 9802c361d07..edfcbd0435a 100644 --- a/TAO/tao/Strategies/COIOP_Profile.cpp +++ b/TAO/tao/Strategies/COIOP_Profile.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_COIOP_Profile::object_key_delimiter_ = '/'; char -TAO_COIOP_Profile::object_key_delimiter (void) const +TAO_COIOP_Profile::object_key_delimiter () const { return TAO_COIOP_Profile::object_key_delimiter_; } @@ -186,7 +186,7 @@ TAO_COIOP_Profile::endpoint (void) } CORBA::ULong -TAO_COIOP_Profile::endpoint_count (void) const +TAO_COIOP_Profile::endpoint_count () const { return this->count_; } @@ -201,7 +201,7 @@ TAO_COIOP_Profile::add_endpoint (TAO_COIOP_Endpoint *endp) } char * -TAO_COIOP_Profile::to_string (void) const +TAO_COIOP_Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h index 3ee737d614b..85038ff65b5 100644 --- a/TAO/tao/Strategies/COIOP_Profile.h +++ b/TAO/tao/Strategies/COIOP_Profile.h @@ -44,7 +44,7 @@ class TAO_Strategies_Export TAO_COIOP_Profile : public TAO_Profile public: /// The object key delimiter that COIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -63,10 +63,10 @@ public: ~TAO_COIOP_Profile (void); /// Template methods. Please tao/Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index 9119bdc17c8..bd64aee4f6d 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -52,13 +52,13 @@ public: /// @@ Helper method for the implementation repository, should go /// away - const ACE_INET_Addr& address (void) const; + const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE_INET_Addr *endpoints (void); /// Returns address for default endpoint - const ACE_INET_Addr& default_address (void) const; + const ACE_INET_Addr& default_address () const; /// Set address for default endpoint void set_default_address (const ACE_INET_Addr& addr); diff --git a/TAO/tao/Strategies/DIOP_Acceptor.inl b/TAO/tao/Strategies/DIOP_Acceptor.inl index 13df2475e50..88346814360 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.inl +++ b/TAO/tao/Strategies/DIOP_Acceptor.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& -TAO_DIOP_Acceptor::address (void) const +TAO_DIOP_Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); @@ -23,7 +23,7 @@ TAO_DIOP_Acceptor::endpoints (void) } ACE_INLINE const ACE_INET_Addr& -TAO_DIOP_Acceptor::default_address (void) const +TAO_DIOP_Acceptor::default_address () const { return this->default_address_; } diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 80545ddae9f..b4b24ddd3bb 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -274,7 +274,7 @@ TAO_DIOP_Connector::check_prefix (const char *endpoint) } char -TAO_DIOP_Connector::object_key_delimiter (void) const +TAO_DIOP_Connector::object_key_delimiter () const { return TAO_DIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index 710591a1f1e..7448c5938ed 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -64,7 +64,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; //@} protected: diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index e22a32fc888..7cea233a221 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -232,7 +232,7 @@ TAO_DIOP_Endpoint::hash (void) } const ACE_INET_Addr & -TAO_DIOP_Endpoint::object_addr (void) const +TAO_DIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -257,7 +257,7 @@ TAO_DIOP_Endpoint::object_addr (void) const } void -TAO_DIOP_Endpoint::object_addr_i (void) const +TAO_DIOP_Endpoint::object_addr_i () const { // We should have already held the lock diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index 62b26560d2b..ae1f8a3e70d 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -90,18 +90,18 @@ public: // = DIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); @@ -113,7 +113,7 @@ private: int use_dotted_decimal_addresses); /// Helper method for object_addr () call. - void object_addr_i (void) const; + void object_addr_i () const; /// String representing the host name. CORBA::String_var host_; diff --git a/TAO/tao/Strategies/DIOP_Endpoint.inl b/TAO/tao/Strategies/DIOP_Endpoint.inl index 424df7563f4..f9455e90305 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.inl +++ b/TAO/tao/Strategies/DIOP_Endpoint.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_DIOP_Endpoint::host (void) const +TAO_DIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_DIOP_Endpoint::port (void) const +TAO_DIOP_Endpoint::port () const { return this->port_; } diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index 055afeaa5a1..c29d38219b1 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -30,13 +30,13 @@ TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_DIOP_Protocol_Factory::prefix (void) const +TAO_DIOP_Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO_DIOP_Protocol_Factory::options_delimiter (void) const +TAO_DIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -71,7 +71,7 @@ TAO_DIOP_Protocol_Factory::make_connector (void) } int -TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_DIOP_Protocol_Factory::requires_explicit_endpoint () const { // This switch is actually meant to distinguish between pluggable // protocols which are able to clean up their endpoints and such diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index d72b366eac8..e63cc69399a 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -49,11 +49,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -63,7 +63,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} }; diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index d8566303445..b362e145a27 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -22,7 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_DIOP_Profile::object_key_delimiter_ = '/'; char -TAO_DIOP_Profile::object_key_delimiter (void) const +TAO_DIOP_Profile::object_key_delimiter () const { return TAO_DIOP_Profile::object_key_delimiter_; } @@ -348,7 +348,7 @@ TAO_DIOP_Profile::endpoint (void) } CORBA::ULong -TAO_DIOP_Profile::endpoint_count (void) const +TAO_DIOP_Profile::endpoint_count () const { return this->count_; } @@ -363,7 +363,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp) } char * -TAO_DIOP_Profile::to_string (void) const +TAO_DIOP_Profile::to_string () const { // corbaloc:diop:1.2@host:port,diop:1.2@host:port,.../key diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index d473c0f8ef9..1946349b1e8 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -44,7 +44,7 @@ class TAO_Strategies_Export TAO_DIOP_Profile : public TAO_Profile public: /// The object key delimiter that DIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -74,10 +74,10 @@ public: /// Template methods. Please tao/Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp index 29cb374e9c7..0aa3c9a7d60 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp @@ -15,7 +15,7 @@ TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport&) } int -TAO_NULL_Connection_Purging_Strategy::cache_maximum (void) const +TAO_NULL_Connection_Purging_Strategy::cache_maximum () const { return -1; } diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h index 7617ff62e87..a7fe50788cc 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h @@ -41,7 +41,7 @@ public: virtual void update_item (TAO_Transport& transport); /// Returns -1 to signify no maximum - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index ed76fe47c55..43aa383c072 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -53,7 +53,7 @@ public: /// @@ Helper method for the implementation repository, should go /// away - const ACE_INET_Addr& address (void) const; + const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE_INET_Addr *endpoints (void); diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.inl b/TAO/tao/Strategies/SCIOP_Acceptor.inl index 51acffee405..840862e2710 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.inl +++ b/TAO/tao/Strategies/SCIOP_Acceptor.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& -TAO_SCIOP_Acceptor::address (void) const +TAO_SCIOP_Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index b11b0340d5a..d41dc1a1752 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -380,7 +380,7 @@ TAO_SCIOP_Connector::check_prefix (const char *endpoint) } char -TAO_SCIOP_Connector::object_key_delimiter (void) const +TAO_SCIOP_Connector::object_key_delimiter () const { return TAO_SCIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 5eeb57a523d..ee026db87bc 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -61,7 +61,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; public: diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 213d7e52f01..9f56b3a88ca 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -218,7 +218,7 @@ TAO_SCIOP_Endpoint::hash (void) } const ACE_INET_Addr & -TAO_SCIOP_Endpoint::object_addr (void) const +TAO_SCIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -244,7 +244,7 @@ TAO_SCIOP_Endpoint::object_addr (void) const } void -TAO_SCIOP_Endpoint::object_addr_i (void) const +TAO_SCIOP_Endpoint::object_addr_i () const { if (this->object_addr_.set (this->port_, this->host_.in ()) == -1) { @@ -349,13 +349,13 @@ TAO_SCIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) } bool -TAO_SCIOP_Endpoint::is_preferred_network (void) const +TAO_SCIOP_Endpoint::is_preferred_network () const { return (this->preferred_path_.host.in () != 0); } const char * -TAO_SCIOP_Endpoint::preferred_network (void) const +TAO_SCIOP_Endpoint::preferred_network () const { return this->preferred_path_.host.in (); } diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index 8badf822cb7..99c843e9d3b 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -87,27 +87,27 @@ public: // = SCIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); /// Do we have a preferred local network for the target? - bool is_preferred_network (void) const; + bool is_preferred_network () const; /// Return the preferred network if any. - const char *preferred_network (void) const; + const char *preferred_network () const; private: @@ -116,7 +116,7 @@ private: int use_dotted_decimal_addresses); /// Helper method for object_addr (). - void object_addr_i (void) const; + void object_addr_i () const; /// Generate preferred interfaces from the options passed in by the /// user. diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.inl b/TAO/tao/Strategies/SCIOP_Endpoint.inl index 41d5ea3712c..28032ca78a5 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.inl +++ b/TAO/tao/Strategies/SCIOP_Endpoint.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_SCIOP_Endpoint::host (void) const +TAO_SCIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_SCIOP_Endpoint::port (void) const +TAO_SCIOP_Endpoint::port () const { return this->port_; } diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp index 751ce499473..d744c95c97a 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Factory.cpp @@ -28,13 +28,13 @@ TAO_SCIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_SCIOP_Protocol_Factory::prefix (void) const +TAO_SCIOP_Protocol_Factory::prefix () const { return ::prefix_; } char -TAO_SCIOP_Protocol_Factory::options_delimiter (void) const +TAO_SCIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -69,7 +69,7 @@ TAO_SCIOP_Protocol_Factory::make_connector (void) } int -TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint () const { return 1; } diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index 6178e3a1b57..a0930ed6432 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -46,16 +46,16 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; }; diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 5619222b443..eaf71d16817 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -18,7 +18,7 @@ const char TAO_SCIOP_Profile::object_key_delimiter_ = '/'; TAO_BEGIN_VERSIONED_NAMESPACE_DECL char -TAO_SCIOP_Profile::object_key_delimiter (void) const +TAO_SCIOP_Profile::object_key_delimiter () const { return TAO_SCIOP_Profile::object_key_delimiter_; } @@ -290,7 +290,7 @@ TAO_SCIOP_Profile::endpoint (void) } CORBA::ULong -TAO_SCIOP_Profile::endpoint_count (void) const +TAO_SCIOP_Profile::endpoint_count () const { return this->count_; } @@ -305,7 +305,7 @@ TAO_SCIOP_Profile::add_endpoint (TAO_SCIOP_Endpoint *endp) } char * -TAO_SCIOP_Profile::to_string (void) const +TAO_SCIOP_Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index 0b043b1784d..d644f758d3b 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -43,7 +43,7 @@ class TAO_Strategies_Export TAO_SCIOP_Profile : public TAO_Profile public: /// The object key delimiter that SCIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -71,10 +71,10 @@ public: ~TAO_SCIOP_Profile (void); /// Template methods. Please see Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 37197284327..121185f4bd9 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -324,7 +324,7 @@ TAO_SHMIOP_Connector::check_prefix (const char *endpoint) } char -TAO_SHMIOP_Connector::object_key_delimiter (void) const +TAO_SHMIOP_Connector::object_key_delimiter () const { return TAO_SHMIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index c68f26c3a60..72426bb2dea 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -68,7 +68,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; //@} public: diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp index 354172a95ca..bb69096a8fd 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp @@ -208,7 +208,7 @@ TAO_SHMIOP_Endpoint::hash (void) } const ACE_INET_Addr & -TAO_SHMIOP_Endpoint::object_addr (void) const +TAO_SHMIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h index 66953d2c6b1..3199b2d684d 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.h +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h @@ -92,18 +92,18 @@ public: // = SHMIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.inl b/TAO/tao/Strategies/SHMIOP_Endpoint.inl index 1b0af76c7d5..d7d8ab4780a 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.inl +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_SHMIOP_Endpoint::host (void) const +TAO_SHMIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_SHMIOP_Endpoint::port (void) const +TAO_SHMIOP_Endpoint::port () const { return this->port_; } diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 646969d8956..d2950755688 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -35,13 +35,13 @@ TAO_SHMIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_SHMIOP_Protocol_Factory::prefix (void) const +TAO_SHMIOP_Protocol_Factory::prefix () const { return ::prefix_; } char -TAO_SHMIOP_Protocol_Factory::options_delimiter (void) const +TAO_SHMIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -105,7 +105,7 @@ TAO_SHMIOP_Protocol_Factory::make_connector (void) } int -TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint () const { return 1; } diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h index ef8bbfbba33..f6eb29a88d5 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.h +++ b/TAO/tao/Strategies/SHMIOP_Factory.h @@ -49,11 +49,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -63,7 +63,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} /// Set mmap file prefix diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index eb01ce6655b..ca5cbea5c7a 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -22,7 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/'; char -TAO_SHMIOP_Profile::object_key_delimiter (void) const +TAO_SHMIOP_Profile::object_key_delimiter () const { return TAO_SHMIOP_Profile::object_key_delimiter_; } @@ -87,7 +87,7 @@ TAO_SHMIOP_Profile::endpoint (void) } CORBA::ULong -TAO_SHMIOP_Profile::endpoint_count (void) const +TAO_SHMIOP_Profile::endpoint_count () const { return this->count_; } @@ -322,7 +322,7 @@ TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp) } char * -TAO_SHMIOP_Profile::to_string (void) const +TAO_SHMIOP_Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index 666b5b633ba..fdf1f24a4b7 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -45,7 +45,7 @@ class TAO_Strategies_Export TAO_SHMIOP_Profile : public TAO_Profile public: /// The object key delimiter that SHMIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -74,10 +74,10 @@ public: /// Template methods, please see Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 2bbc354a4ff..5203ed8c22f 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -353,7 +353,7 @@ TAO_UIOP_Connector::check_prefix (const char *endpoint) } char -TAO_UIOP_Connector::object_key_delimiter (void) const +TAO_UIOP_Connector::object_key_delimiter () const { return TAO_UIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 76a974e3498..c16b3a412fb 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -71,7 +71,7 @@ public: virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Cancel the passed cvs handler from the connector virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index f2f60256a25..06ec08810b0 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -71,11 +71,11 @@ public: // = UIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_UNIX_Addr &object_addr (void) const; + const ACE_UNIX_Addr &object_addr () const; /// Return a pointer to the rendezvous point string. /// This object maintains ownership of the returned string. - const char *rendezvous_point (void) const; + const char *rendezvous_point () const; private: diff --git a/TAO/tao/Strategies/UIOP_Endpoint.inl b/TAO/tao/Strategies/UIOP_Endpoint.inl index e8c5f07516e..a021e9de274 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.inl +++ b/TAO/tao/Strategies/UIOP_Endpoint.inl @@ -4,13 +4,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_UNIX_Addr & -TAO_UIOP_Endpoint::object_addr (void) const +TAO_UIOP_Endpoint::object_addr () const { return this->object_addr_; } ACE_INLINE const char * -TAO_UIOP_Endpoint::rendezvous_point (void) const +TAO_UIOP_Endpoint::rendezvous_point () const { return this->object_addr_.get_path_name (); } diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index df2b317a518..05bd45b381f 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -29,13 +29,13 @@ TAO_UIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_UIOP_Protocol_Factory::prefix (void) const +TAO_UIOP_Protocol_Factory::prefix () const { return ::prefix_; } char -TAO_UIOP_Protocol_Factory::options_delimiter (void) const +TAO_UIOP_Protocol_Factory::options_delimiter () const { return '|'; } @@ -71,7 +71,7 @@ TAO_UIOP_Protocol_Factory::make_connector (void) } int -TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_UIOP_Protocol_Factory::requires_explicit_endpoint () const { return 1; } diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h index 6f6d9253065..6aa7f179bc4 100644 --- a/TAO/tao/Strategies/UIOP_Factory.h +++ b/TAO/tao/Strategies/UIOP_Factory.h @@ -48,11 +48,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -62,7 +62,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} }; diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index 15a4e5c94bf..baa42e7b683 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -47,7 +47,7 @@ class TAO_Strategies_Export TAO_UIOP_Profile : public TAO_Profile public: /// The object key delimiter that UIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -73,10 +73,10 @@ public: ~TAO_UIOP_Profile (void); /// Template methods. Please see Profile.h for documentation. - virtual char *to_string (void) const; + virtual char *to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add @a endp to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index b4fdb54c24b..6757ac01249 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -414,7 +414,7 @@ TAO_Advanced_Resource_Factory::get_protocol_factories (void) } ACE_Reactor_Impl * -TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const +TAO_Advanced_Resource_Factory::allocate_reactor_impl () const { ACE_Reactor_Impl *impl = 0; diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index f13f56ae2f2..e09dd3c0038 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -100,7 +100,7 @@ public: protected: /// Obtain the reactor implementation - virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const; + virtual ACE_Reactor_Impl *allocate_reactor_impl () const; void report_option_value_error (const ACE_TCHAR* option_name, const ACE_TCHAR* option_value); diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index 146414ac160..dfc4a708bfc 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -15,7 +15,7 @@ TAO_Stub::reset_base (void) ACE_INLINE const TAO_SYNCH_MUTEX& -TAO_Stub::profile_lock (void) const +TAO_Stub::profile_lock () const { return this->profile_lock_; } @@ -208,7 +208,7 @@ TAO_Stub::set_valid_profile (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::valid_profile (void) const +TAO_Stub::valid_profile () const { return this->profile_success_; } @@ -274,7 +274,7 @@ TAO_Stub::next_profile_retry (void) } ACE_INLINE const TAO_MProfile& -TAO_Stub::base_profiles (void) const +TAO_Stub::base_profiles () const { return this->base_profiles_; } @@ -286,7 +286,7 @@ TAO_Stub::base_profiles (void) } ACE_INLINE const TAO_MProfile * -TAO_Stub::forward_profiles (void) const +TAO_Stub::forward_profiles () const { return this->forward_profiles_; } @@ -298,13 +298,13 @@ TAO_Stub::forward_profiles (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::is_collocated (void) const +TAO_Stub::is_collocated () const { return this->is_collocated_; } ACE_INLINE TAO_ORB_Core* -TAO_Stub::orb_core (void) const +TAO_Stub::orb_core () const { return this->orb_core_.get (); } @@ -330,7 +330,7 @@ TAO_Stub::servant_orb (CORBA::ORB_ptr orb) } ACE_INLINE TAO_Abstract_ServantBase * -TAO_Stub::collocated_servant (void) const +TAO_Stub::collocated_servant () const { return collocated_servant_; } @@ -342,7 +342,7 @@ TAO_Stub::collocated_servant (TAO_Abstract_ServantBase * servant) } ACE_INLINE TAO::Object_Proxy_Broker * -TAO_Stub::object_proxy_broker (void) const +TAO_Stub::object_proxy_broker () const { return this->object_proxy_broker_; } @@ -361,7 +361,7 @@ TAO_Stub::destroy (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::optimize_collocation_objects (void) const +TAO_Stub::optimize_collocation_objects () const { return this->collocation_opt_; } @@ -413,7 +413,7 @@ TAO_Stub::_decr_refcnt (void) ACE_INLINE CORBA::Boolean -TAO_Stub::at_starting_profile (void) const +TAO_Stub::at_starting_profile () const { return profile_in_use_ == base_profiles_.get_profile(0); } @@ -429,7 +429,7 @@ TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr (TAO_Stub *p) } ACE_INLINE TAO_Stub * -TAO_Stub_Auto_Ptr::get (void) const +TAO_Stub_Auto_Ptr::get () const { ACE_TRACE ("TAO_Stub_Auto_Ptr::get"); return this->p_; diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h index 20ca9632f06..f7fdb843f84 100644 --- a/TAO/tao/Synch_Queued_Message.h +++ b/TAO/tao/Synch_Queued_Message.h @@ -59,13 +59,13 @@ public: /// Destructor virtual ~TAO_Synch_Queued_Message (void); - const ACE_Message_Block *current_block (void) const; + const ACE_Message_Block *current_block () const; /** @name Implement the Template Methods from TAO_Queued_Message */ //@{ - virtual size_t message_length (void) const; - virtual int all_data_sent (void) const; + virtual size_t message_length () const; + virtual int all_data_sent () const; virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const; virtual void bytes_transferred (size_t &byte_count); virtual TAO_Queued_Message *clone (ACE_Allocator *alloc); diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 13a837277c4..486f1cf2eed 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -933,7 +933,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::TypeCode_ptr \ -CORBA::name ::_tao_type (void) const \ +CORBA::name ::_tao_type () const \ { \ TAO_AnyTypeCode_Adapter *adapter = \ ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ( \ @@ -967,7 +967,7 @@ TAO::create_system_exception (const char *id) #define TAO_SYSTEM_EXCEPTION(name) \ void \ -CORBA::name ::_raise (void) const \ +CORBA::name ::_raise () const \ { \ throw *this; \ } @@ -977,7 +977,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::Exception * \ -CORBA::name ::_tao_duplicate (void) const \ +CORBA::name ::_tao_duplicate () const \ { \ CORBA::Exception * result = 0; \ ACE_NEW_RETURN (result, CORBA::name (*this), 0); \ diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index f52e0414820..10ffd265862 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -189,10 +189,10 @@ namespace CORBA CORBA::CompletionStatus completed); \ static name * _downcast (CORBA::Exception* exception); \ static name const * _downcast (CORBA::Exception const * exception); \ - virtual void _raise (void) const; \ - virtual CORBA::TypeCode_ptr _tao_type (void) const; \ + virtual void _raise () const; \ + virtual CORBA::TypeCode_ptr _tao_type () const; \ static void _tao_any_destructor (void*); \ - virtual CORBA::Exception *_tao_duplicate (void) const; \ + virtual CORBA::Exception *_tao_duplicate () const; \ static CORBA::SystemException *_tao_create (void); \ }; \ diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl index 979f5d18373..4240665c94c 100644 --- a/TAO/tao/SystemException.inl +++ b/TAO/tao/SystemException.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -CORBA::SystemException::minor (void) const +CORBA::SystemException::minor () const { return this->minor_; } @@ -14,7 +14,7 @@ CORBA::SystemException::minor (CORBA::ULong m) } ACE_INLINE CORBA::CompletionStatus -CORBA::SystemException::completed (void) const +CORBA::SystemException::completed () const { return this->completed_; } diff --git a/TAO/tao/TAO_Server_Request.inl b/TAO/tao/TAO_Server_Request.inl index 337e172490a..8b9a1519556 100644 --- a/TAO/tao/TAO_Server_Request.inl +++ b/TAO/tao/TAO_Server_Request.inl @@ -37,25 +37,25 @@ TAO_ServerRequest::TAO_ServerRequest (void) } ACE_INLINE TAO_ORB_Core * -TAO_ServerRequest::orb_core (void) const +TAO_ServerRequest::orb_core () const { return this->orb_core_; } ACE_INLINE TAO_InputCDR * -TAO_ServerRequest::incoming (void) const +TAO_ServerRequest::incoming () const { return this->incoming_; } ACE_INLINE TAO_OutputCDR * -TAO_ServerRequest::outgoing (void) const +TAO_ServerRequest::outgoing () const { return this->outgoing_; } ACE_INLINE const char * -TAO_ServerRequest::operation (void) const +TAO_ServerRequest::operation () const { return (this->operation_ == 0 ? "" : this->operation_); } @@ -74,19 +74,19 @@ TAO_ServerRequest::operation (const char *operation, } ACE_INLINE size_t -TAO_ServerRequest::operation_length (void) const +TAO_ServerRequest::operation_length () const { return this->operation_len_; } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::response_expected (void) const +TAO_ServerRequest::response_expected () const { return this->response_expected_; } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::deferred_reply (void) const +TAO_ServerRequest::deferred_reply () const { return this->deferred_reply_; } @@ -120,7 +120,7 @@ TAO_ServerRequest::sync_after_dispatch (void) } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::sync_with_server (void) const +TAO_ServerRequest::sync_with_server () const { return this->sync_with_server_; } @@ -132,7 +132,7 @@ TAO_ServerRequest::sync_with_server (CORBA::Boolean sync_flag) } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::is_queued (void) const +TAO_ServerRequest::is_queued () const { return this->is_queued_; } @@ -212,7 +212,7 @@ TAO_ServerRequest::forward_location (void) } ACE_INLINE bool -TAO_ServerRequest::is_forwarded (void) const +TAO_ServerRequest::is_forwarded () const { return this->is_forwarded_; } @@ -236,7 +236,7 @@ TAO_ServerRequest::is_dsi (void) } ACE_INLINE TAO_Operation_Details const * -TAO_ServerRequest::operation_details (void) const +TAO_ServerRequest::operation_details () const { return this->operation_details_; } @@ -260,7 +260,7 @@ TAO_ServerRequest::argument_flag (CORBA::Boolean flag) } ACE_INLINE bool -TAO_ServerRequest::collocated (void) const +TAO_ServerRequest::collocated () const { return this->transport_.get () == 0; } diff --git a/TAO/tao/Tagged_Profile.inl b/TAO/tao/Tagged_Profile.inl index 15abf95aff9..683ead394da 100644 --- a/TAO/tao/Tagged_Profile.inl +++ b/TAO/tao/Tagged_Profile.inl @@ -33,31 +33,31 @@ TAO_Tagged_Profile::object_key (TAO::ObjectKey &object_key) } ACE_INLINE const TAO::ObjectKey & -TAO_Tagged_Profile::object_key (void) const +TAO_Tagged_Profile::object_key () const { return const_cast<TAO_Tagged_Profile *> (this)->object_key (); } ACE_INLINE const IOP::TaggedProfile & -TAO_Tagged_Profile::tagged_profile (void) const +TAO_Tagged_Profile::tagged_profile () const { return this->profile_; } ACE_INLINE CORBA::ULong -TAO_Tagged_Profile::profile_index (void) const +TAO_Tagged_Profile::profile_index () const { return this->profile_index_; } ACE_INLINE const char* -TAO_Tagged_Profile::type_id (void) const +TAO_Tagged_Profile::type_id () const { return this->type_id_ == 0 ? "" : this->type_id_; } ACE_INLINE CORBA::Short -TAO_Tagged_Profile::discriminator (void) const +TAO_Tagged_Profile::discriminator () const { return this->discriminator_; } diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index 59f0589dc8e..cadf737ec18 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -2,38 +2,38 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE bool -TAO_Transport::queue_is_empty_i (void) const +TAO_Transport::queue_is_empty_i () const { return (this->head_ == 0); } ACE_INLINE CORBA::ULong -TAO_Transport::tag (void) const +TAO_Transport::tag () const { return this->tag_; } ACE_INLINE TAO_ORB_Core * -TAO_Transport::orb_core (void) const +TAO_Transport::orb_core () const { return this->orb_core_; } ACE_INLINE TAO_Transport_Mux_Strategy * -TAO_Transport::tms (void) const +TAO_Transport::tms () const { return tms_; } // Return the Wait strategy used by the Transport. ACE_INLINE TAO_Wait_Strategy * -TAO_Transport::wait_strategy (void) const +TAO_Transport::wait_strategy () const { return this->ws_; } ACE_INLINE int -TAO_Transport::bidirectional_flag (void) const +TAO_Transport::bidirectional_flag () const { return this->bidirectional_flag_; } @@ -72,7 +72,7 @@ TAO_Transport::cache_map_entry ( } ACE_INLINE unsigned long -TAO_Transport::purging_order (void) const +TAO_Transport::purging_order () const { return this->purging_order_; } @@ -88,7 +88,7 @@ TAO_Transport::purging_order (unsigned long value) } ACE_INLINE size_t -TAO_Transport::id (void) const +TAO_Transport::id () const { return this->id_; } @@ -110,7 +110,7 @@ TAO_Transport::queue_is_empty (void) } ACE_INLINE int -TAO_Transport::flush_timer_pending (void) const +TAO_Transport::flush_timer_pending () const { return this->flush_timer_id_ != -1; } @@ -133,13 +133,13 @@ TAO_Transport::messaging_object (void) ACE_INLINE TAO_Codeset_Translator_Base * -TAO_Transport::char_translator (void) const +TAO_Transport::char_translator () const { return this->char_translator_; } ACE_INLINE TAO_Codeset_Translator_Base * -TAO_Transport::wchar_translator (void) const +TAO_Transport::wchar_translator () const { return this->wchar_translator_; } @@ -160,7 +160,7 @@ TAO_Transport::wchar_translator (TAO_Codeset_Translator_Base *tf) /// CodeSet negotiation ACE_INLINE CORBA::Boolean -TAO_Transport::is_tcs_set(void) const +TAO_Transport::is_tcs_set() const { return tcs_set_; } @@ -172,13 +172,13 @@ TAO_Transport::first_request_sent (bool flag) } ACE_INLINE bool -TAO_Transport::first_request (void) const +TAO_Transport::first_request () const { return this->first_request_; } ACE_INLINE bool -TAO_Transport::is_connected (void) const +TAO_Transport::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, false); return this->is_connected_; @@ -191,13 +191,13 @@ TAO_Transport::connection_handler (void) } ACE_INLINE size_t -TAO_Transport::recv_buffer_size (void) const +TAO_Transport::recv_buffer_size () const { return this->recv_buffer_size_; } ACE_INLINE size_t -TAO_Transport::sent_byte_count (void) const +TAO_Transport::sent_byte_count () const { return this->sent_byte_count_; } @@ -205,7 +205,7 @@ TAO_Transport::sent_byte_count (void) const #if TAO_HAS_TRANSPORT_CURRENT == 1 ACE_INLINE TAO::Transport::Stats* -TAO_Transport::stats (void) const +TAO_Transport::stats () const { return this->stats_; } @@ -230,7 +230,7 @@ TAO::Transport::Stats::messages_sent (size_t message_length) } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::messages_sent (void) const +TAO::Transport::Stats::messages_sent () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -238,7 +238,7 @@ TAO::Transport::Stats::messages_sent (void) const } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::bytes_sent (void) const +TAO::Transport::Stats::bytes_sent () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -255,7 +255,7 @@ TAO::Transport::Stats::messages_received (size_t message_length) } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::messages_received (void) const +TAO::Transport::Stats::messages_received () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -263,7 +263,7 @@ TAO::Transport::Stats::messages_received (void) const } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::bytes_received (void) const +TAO::Transport::Stats::bytes_received () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -279,7 +279,7 @@ TAO::Transport::Stats::opened_since (const ACE_Time_Value& tv) } ACE_INLINE const ACE_Time_Value& -TAO::Transport::Stats::opened_since (void) const +TAO::Transport::Stats::opened_since () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, ACE_Time_Value::zero); diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp index 850ce1d621f..3ccc5a27601 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/Current_Impl.cpp @@ -37,7 +37,7 @@ namespace TAO /// if, there was no "current" transport selected on the current /// thread. const TAO_Transport* - Current_Impl::transport (void) const + Current_Impl::transport () const { Transport_Selection_Guard* topguard = Transport_Selection_Guard::current (this->core_, this->tss_slot_id_); @@ -52,7 +52,7 @@ namespace TAO /// Obtains the current transport's stats const TAO::Transport::Stats* - Current_Impl::transport_stats (void) const + Current_Impl::transport_stats () const { static const TAO::Transport::Stats dummy; diff --git a/TAO/tao/Transport_Acceptor.inl b/TAO/tao/Transport_Acceptor.inl index 700216cd082..0071127f4e4 100644 --- a/TAO/tao/Transport_Acceptor.inl +++ b/TAO/tao/Transport_Acceptor.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -TAO_Acceptor::tag (void) const +TAO_Acceptor::tag () const { return this->tag_; } diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index cc57a5abd5b..f0600e15df1 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -69,7 +69,7 @@ public: * profile0} {tag1, profile1} ...}. The IOP module defines the * ProfileId typedef to be a CORBA::ULong. */ - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Parse a string containing a URL style IOR and return an /// MProfile. Verify that ior is in the correct format. @@ -113,13 +113,13 @@ public: virtual int check_prefix (const char *endpoint) = 0; /// Return the object key delimiter to use or expect. - virtual char object_key_delimiter (void) const = 0; + virtual char object_key_delimiter () const = 0; protected: /// A flag indicating the actual connector supports parallel connection /// attempts. The base implementation always returns 0. Override to return /// non-zero if parallel connection attempts may be tried. - virtual int supports_parallel_connects (void) const; + virtual int supports_parallel_connects () const; /// Create a profile with a given endpoint. virtual TAO_Profile *make_profile (void) = 0; diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl index 30c7d450024..802e7bfdf1f 100644 --- a/TAO/tao/Transport_Connector.inl +++ b/TAO/tao/Transport_Connector.inl @@ -14,7 +14,7 @@ TAO_Connector::orb_core (TAO_ORB_Core *orb_core) } ACE_INLINE CORBA::ULong -TAO_Connector::tag (void) const +TAO_Connector::tag () const { return this->tag_; } diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h index 3ca7b30257c..0986b3c4c60 100644 --- a/TAO/tao/Transport_Descriptor_Interface.h +++ b/TAO/tao/Transport_Descriptor_Interface.h @@ -57,7 +57,7 @@ public: const TAO_Transport_Descriptor_Interface *other_prop) = 0; /// Generate hash value for our class - virtual u_long hash (void) const = 0; + virtual u_long hash () const = 0; /// Return the underlying endpoint object TAO_Endpoint *endpoint (void); diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl index dbdc0e033ab..957afc63702 100644 --- a/TAO/tao/UB_String_Argument_T.inl +++ b/TAO/tao/UB_String_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE const typename S_var::s_traits::char_type * -TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) const +TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index a7d7df325c3..c968219535f 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -137,13 +137,13 @@ CORBA::AbstractBase::_is_a (const char *type_id) } const char * -CORBA::AbstractBase::_interface_repository_id (void) const +CORBA::AbstractBase::_interface_repository_id () const { return "IDL:omg.org/CORBA/AbstractBase:1.0"; } const char * -CORBA::AbstractBase::_tao_obv_repository_id (void) const +CORBA::AbstractBase::_tao_obv_repository_id () const { return "IDL:omg.org/CORBA/AbstractBase:1.0"; } diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 456947d78bd..7189243b08a 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1426,7 +1426,7 @@ CORBA::DefaultValueRefCountBase::_tao_remove_ref (void) } CORBA::ULong -CORBA::DefaultValueRefCountBase::_tao_refcount_value (void) const +CORBA::DefaultValueRefCountBase::_tao_refcount_value () const { return this->refcount_; } diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp index 65255c04e5f..c136bde51c9 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.cpp +++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp @@ -78,14 +78,14 @@ TAO_Value_Var_T<T>::operator T *& () template <typename T> T * -TAO_Value_Var_T<T>::operator-> (void) const +TAO_Value_Var_T<T>::operator-> () const { return this->ptr_; } template <typename T> T * -TAO_Value_Var_T<T>::in (void) const +TAO_Value_Var_T<T>::in () const { return this->ptr_; } @@ -117,7 +117,7 @@ TAO_Value_Var_T<T>::_retn (void) template <typename T> T * -TAO_Value_Var_T<T>::ptr (void) const +TAO_Value_Var_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp index bd64c481071..3e95c82454f 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp @@ -36,7 +36,7 @@ TAO_Valuetype_Adapter_Impl::stream_to_abstract_base ( } CORBA::Long -TAO_Valuetype_Adapter_Impl::type_info_single (void) const +TAO_Valuetype_Adapter_Impl::type_info_single () const { return TAO_OBV_GIOP_Flags::Type_info_single; } diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h index 79bfdfe8b67..aba0ca95696 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h @@ -51,7 +51,7 @@ public: TAO_InputCDR &, CORBA::AbstractBase_ptr &); - virtual CORBA::Long type_info_single (void) const; + virtual CORBA::Long type_info_single () const; virtual CORBA::Boolean is_type_info_implied (CORBA::Long) const; virtual CORBA::Boolean is_type_info_single (CORBA::Long) const; diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl index 10da0ada3a3..8b2fd7d0529 100644 --- a/TAO/tao/Var_Array_Argument_T.inl +++ b/TAO/tao/Var_Array_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type const * -TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void) const +TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl index eba3d623bea..82cb065b1de 100644 --- a/TAO/tao/Var_Size_Argument_T.inl +++ b/TAO/tao/Var_Size_Argument_T.inl @@ -13,7 +13,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE const S & -TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg (void) const +TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg () const { return *this->x_; } diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h index 3dd1055f799..5741902c931 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.h +++ b/TAO/tao/Wait_On_LF_No_Upcall.h @@ -51,7 +51,7 @@ namespace TAO TAO_Synch_Reply_Dispatcher &rd); /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; /*! @copydoc TAO_Wait_Strategy::defer_upcall() */ virtual int defer_upcall (ACE_Event_Handler*); diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h index 527e5f58981..cca3a7fb3d0 100644 --- a/TAO/tao/Wait_On_Leader_Follower.h +++ b/TAO/tao/Wait_On_Leader_Follower.h @@ -56,10 +56,10 @@ public: virtual int register_handler (void); /*! @copydoc TAO_Wait_Strategy::non_blocking() */ - virtual bool non_blocking (void) const; + virtual bool non_blocking () const; /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; }; diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h index b38aeb46bca..57993e40f77 100644 --- a/TAO/tao/Wait_On_Reactor.h +++ b/TAO/tao/Wait_On_Reactor.h @@ -44,10 +44,10 @@ public: virtual int register_handler (void); /*! @copydoc TAO_Wait_Strategy::non_blocking() */ - virtual bool non_blocking (void) const; + virtual bool non_blocking () const; /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h index 85a8930f8e7..fde048dc907 100644 --- a/TAO/tao/Wait_On_Read.h +++ b/TAO/tao/Wait_On_Read.h @@ -48,10 +48,10 @@ public: virtual int register_handler (void); /*! @copydoc TAO_Wait_Strategy::non_blocking() */ - virtual bool non_blocking (void) const; + virtual bool non_blocking () const; /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_Strategy.inl b/TAO/tao/Wait_Strategy.inl index ba6720dd49b..2fc8fedf227 100644 --- a/TAO/tao/Wait_Strategy.inl +++ b/TAO/tao/Wait_Strategy.inl @@ -1,7 +1,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE bool -TAO_Wait_Strategy::is_registered (void) const +TAO_Wait_Strategy::is_registered () const { return this->is_registered_; } diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp index c74ee3336e8..1c252dee3e9 100644 --- a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp +++ b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp @@ -46,7 +46,7 @@ CompressorIdLevelListPolicy::policy_type (void) CompressorIdLevelListPolicy * -CompressorIdLevelListPolicy::clone (void) const +CompressorIdLevelListPolicy::clone () const { CompressorIdLevelListPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -78,13 +78,13 @@ CompressorIdLevelListPolicy::compressor_ids (void) } TAO_Cached_Policy_Type -CompressorIdLevelListPolicy::_tao_cached_type (void) const +CompressorIdLevelListPolicy::_tao_cached_type () const { return TAO_CACHED_COMPRESSION_ID_LEVEL_LIST_POLICY; } TAO_Policy_Scope -CompressorIdLevelListPolicy::_tao_scope (void) const +CompressorIdLevelListPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); @@ -140,7 +140,7 @@ CompressionEnablingPolicy::policy_type (void) CompressionEnablingPolicy * -CompressionEnablingPolicy::clone (void) const +CompressionEnablingPolicy::clone () const { CompressionEnablingPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -176,13 +176,13 @@ CompressionEnablingPolicy::compression_enabled (void) TAO_Cached_Policy_Type -CompressionEnablingPolicy::_tao_cached_type (void) const +CompressionEnablingPolicy::_tao_cached_type () const { return TAO_CACHED_COMPRESSION_ENABLING_POLICY; } TAO_Policy_Scope -CompressionEnablingPolicy::_tao_scope (void) const +CompressionEnablingPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); @@ -229,7 +229,7 @@ CompressionLowValuePolicy::policy_type (void) CompressionLowValuePolicy * -CompressionLowValuePolicy::clone (void) const +CompressionLowValuePolicy::clone () const { CompressionLowValuePolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -265,7 +265,7 @@ CompressionLowValuePolicy::low_value (void) TAO_Cached_Policy_Type -CompressionLowValuePolicy::_tao_cached_type (void) const +CompressionLowValuePolicy::_tao_cached_type () const { return TAO_CACHED_COMPRESSION_LOW_VALUE_POLICY; } @@ -299,7 +299,7 @@ CompressionMinRatioPolicy::policy_type (void) CompressionMinRatioPolicy * -CompressionMinRatioPolicy::clone (void) const +CompressionMinRatioPolicy::clone () const { CompressionMinRatioPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -335,7 +335,7 @@ CompressionMinRatioPolicy::ratio (void) TAO_Cached_Policy_Type -CompressionMinRatioPolicy::_tao_cached_type (void) const +CompressionMinRatioPolicy::_tao_cached_type () const { return TAO_CACHED_MIN_COMPRESSION_RATIO_POLICY; } diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.h b/TAO/tao/ZIOP/ZIOP_Policy_i.h index fd092b0f2ae..433926cf9c9 100644 --- a/TAO/tao/ZIOP/ZIOP_Policy_i.h +++ b/TAO/tao/ZIOP/ZIOP_Policy_i.h @@ -48,7 +48,7 @@ public: CompressorIdLevelListPolicy (const CompressorIdLevelListPolicy &rhs); /// Returns a copy of this CompressorIdLevelListPolicy. - virtual CompressorIdLevelListPolicy *clone (void) const; + virtual CompressorIdLevelListPolicy *clone () const; virtual ::Compression::CompressorIdLevelList * compressor_ids (); @@ -58,10 +58,10 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// This method writes a CDR representation of the current object. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -93,7 +93,7 @@ public: CompressionEnablingPolicy (const CompressionEnablingPolicy &rhs); /// Returns a copy of this CompressionEnablingPolicy. - virtual CompressionEnablingPolicy *clone (void) const; + virtual CompressionEnablingPolicy *clone () const; /// = The ZIOP::BidirectionalPolicy methods virtual ::CORBA::Boolean compression_enabled (void); @@ -104,10 +104,10 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// This method writes a CDR representation of the current object. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -139,7 +139,7 @@ public: CompressionLowValuePolicy (const CompressionLowValuePolicy &rhs); /// Returns a copy of this CompressionLowValuePolicy. - virtual CompressionLowValuePolicy *clone (void) const; + virtual CompressionLowValuePolicy *clone () const; /// = The ZIOP::BidirectionalPolicy methods virtual ::CORBA::ULong low_value (void); @@ -150,7 +150,7 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: @@ -176,7 +176,7 @@ public: CompressionMinRatioPolicy (const CompressionMinRatioPolicy &rhs); /// Returns a copy of this CompressionMinRatioPolicy. - virtual CompressionMinRatioPolicy *clone (void) const; + virtual CompressionMinRatioPolicy *clone () const; virtual ::Compression::CompressionRatio ratio (void); @@ -186,7 +186,7 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index b54b675bdef..9029b5a13ef 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -53,13 +53,13 @@ public: // following methods. virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport); virtual ACE_Lock *create_transport_mux_strategy_lock (void); - virtual int reply_dispatcher_table_size (void) const; + virtual int reply_dispatcher_table_size () const; virtual int allow_callback (void); virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport); virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *); - virtual bool use_cleanup_options (void) const; - virtual Connect_Strategy connect_strategy (void) const; - virtual const TAO::Invocation_Retry_Params &invocation_retry_params (void) const; + virtual bool use_cleanup_options () const; + virtual Connect_Strategy connect_strategy () const; + virtual const TAO::Invocation_Retry_Params &invocation_retry_params () const; virtual Messaging::SyncScope sync_scope () const; protected: diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 9e95c9be4fa..b2e556c3d91 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -194,12 +194,12 @@ protected: TAO_Time_Policy_Manager* time_policy_manager () const; #endif - ACE_Timer_Queue * create_timer_queue (void) const; + ACE_Timer_Queue * create_timer_queue () const; void destroy_timer_queue (ACE_Timer_Queue *tmq) const; /// Obtain the reactor implementation - virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const; + virtual ACE_Reactor_Impl *allocate_reactor_impl () const; /// Add a Parser name to the list of Parser names. int add_to_ior_parser_names (const char *); diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl index 216113cb758..3db521b5de2 100644 --- a/TAO/tao/operation_details.inl +++ b/TAO/tao/operation_details.inl @@ -31,32 +31,32 @@ TAO_Operation_Details::TAO_Operation_Details (const char *name, } ACE_INLINE const char* -TAO_Operation_Details::opname (void) const +TAO_Operation_Details::opname () const { return this->opname_; } ACE_INLINE CORBA::ULong -TAO_Operation_Details::opname_len (void) const +TAO_Operation_Details::opname_len () const { return this->opname_len_; } ACE_INLINE CORBA::Boolean -TAO_Operation_Details::argument_flag (void) const +TAO_Operation_Details::argument_flag () const { return (this->num_args_ > 1); } #if 1 ACE_INLINE CORBA::Boolean -TAO_Operation_Details::in_argument_flag (void) const +TAO_Operation_Details::in_argument_flag () const { return this->has_in_args_ && this->num_args_ > 1; } #else ACE_INLINE CORBA::Boolean -TAO_Operation_Details::in_argument_flag (void) const +TAO_Operation_Details::in_argument_flag () const { for (CORBA::ULong i = 1; i < this->num_args_ && !this->has_in_args_; i++) { @@ -77,7 +77,7 @@ TAO_Operation_Details::request_service_context (void) } ACE_INLINE const TAO_Service_Context & -TAO_Operation_Details::request_service_context (void) const +TAO_Operation_Details::request_service_context () const { return this->request_service_info_; } @@ -89,7 +89,7 @@ TAO_Operation_Details::request_service_info (void) } ACE_INLINE const IOP::ServiceContextList & -TAO_Operation_Details::request_service_info (void) const +TAO_Operation_Details::request_service_info () const { return this->request_service_context ().service_info (); } @@ -101,7 +101,7 @@ TAO_Operation_Details::reply_service_context (void) } ACE_INLINE const TAO_Service_Context & -TAO_Operation_Details::reply_service_context (void) const +TAO_Operation_Details::reply_service_context () const { return this->reply_service_info_; } @@ -113,7 +113,7 @@ TAO_Operation_Details::reply_service_info (void) } ACE_INLINE const IOP::ServiceContextList & -TAO_Operation_Details::reply_service_info (void) const +TAO_Operation_Details::reply_service_info () const { return this->reply_service_context ().service_info (); } @@ -136,7 +136,7 @@ TAO_Operation_Details::request_id (CORBA::ULong id) } ACE_INLINE CORBA::ULong -TAO_Operation_Details::request_id (void) const +TAO_Operation_Details::request_id () const { return this->request_id_; } @@ -148,25 +148,25 @@ TAO_Operation_Details::response_flags (CORBA::Octet flags) } ACE_INLINE CORBA::ULong -TAO_Operation_Details::ex_count (void) const +TAO_Operation_Details::ex_count () const { return this->ex_count_; } ACE_INLINE TAO::Exception_Data const * -TAO_Operation_Details::ex_data (void) const +TAO_Operation_Details::ex_data () const { return this->ex_data_; } ACE_INLINE CORBA::Octet -TAO_Operation_Details::response_flags (void) const +TAO_Operation_Details::response_flags () const { return this->response_flags_; } ACE_INLINE TAO_Target_Specification::TAO_Target_Address -TAO_Operation_Details::addressing_mode (void) const +TAO_Operation_Details::addressing_mode () const { return this->addressing_mode_; } @@ -183,19 +183,19 @@ TAO_Operation_Details::addressing_mode (CORBA::Short mode) } ACE_INLINE TAO::Argument ** -TAO_Operation_Details::args (void) const +TAO_Operation_Details::args () const { return this->args_; } ACE_INLINE CORBA::ULong -TAO_Operation_Details::args_num (void) const +TAO_Operation_Details::args_num () const { return this->num_args_; } ACE_INLINE CORBA::Boolean -TAO_Operation_Details::use_stub_args (void) const +TAO_Operation_Details::use_stub_args () const { return this->use_stub_args_; } @@ -214,7 +214,7 @@ TAO_Operation_Details::ft_expiration_time (TimeBase::TimeT time) } ACE_INLINE TimeBase::TimeT -TAO_Operation_Details::ft_expiration_time (void) const +TAO_Operation_Details::ft_expiration_time () const { return this->ft_expiration_time_; } @@ -226,14 +226,14 @@ TAO_Operation_Details::ft_retention_id (CORBA::Long request_id) } ACE_INLINE CORBA::Long -TAO_Operation_Details::ft_retention_id (void) const +TAO_Operation_Details::ft_retention_id () const { return this->ft_retention_id_; } #endif /*TAO_HAS_INTERCEPTORS == 1*/ ACE_INLINE TAO::Collocated_Arguments_Converter * -TAO_Operation_Details::cac (void) const +TAO_Operation_Details::cac () const { return this->cac_; } @@ -245,7 +245,7 @@ TAO_Operation_Details::cac (TAO::Collocated_Arguments_Converter *cac) } ACE_INLINE TAO_Reply_Dispatcher * -TAO_Operation_Details::reply_dispatcher (void) const +TAO_Operation_Details::reply_dispatcher () const { return this->reply_dispatcher_; } diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 885cb7eaab6..10382be69ed 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -316,7 +316,7 @@ TAO_ORB_Parameters::prefer_ipv6_interfaces (bool p) } bool -TAO_ORB_Parameters::prefer_ipv6_interfaces (void) const +TAO_ORB_Parameters::prefer_ipv6_interfaces () const { return this->prefer_ipv6_interfaces_; } @@ -328,7 +328,7 @@ TAO_ORB_Parameters::connect_ipv6_only (bool p) } bool -TAO_ORB_Parameters::connect_ipv6_only (void) const +TAO_ORB_Parameters::connect_ipv6_only () const { return this->connect_ipv6_only_; } @@ -340,7 +340,7 @@ TAO_ORB_Parameters::use_ipv6_link_local (bool p) } bool -TAO_ORB_Parameters::use_ipv6_link_local (void) const +TAO_ORB_Parameters::use_ipv6_link_local () const { return this->use_ipv6_link_local_; } diff --git a/TAO/tao/params.h b/TAO/tao/params.h index fe06a81b545..8e85b937e0f 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -225,13 +225,13 @@ public: #if defined (ACE_HAS_IPV6) void prefer_ipv6_interfaces (bool p); - bool prefer_ipv6_interfaces (void) const; + bool prefer_ipv6_interfaces () const; void connect_ipv6_only (bool p); - bool connect_ipv6_only (void) const; + bool connect_ipv6_only () const; void use_ipv6_link_local (bool p); - bool use_ipv6_link_local (void) const; + bool use_ipv6_link_local () const; #endif /* ACE_HAS_IPV6 */ void negotiate_codesets (bool c); diff --git a/TAO/tao/params.inl b/TAO/tao/params.inl index b6093aed662..e2ede8c30bf 100644 --- a/TAO/tao/params.inl +++ b/TAO/tao/params.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -TAO_ORB_Parameters::sock_rcvbuf_size (void) const +TAO_ORB_Parameters::sock_rcvbuf_size () const { return sock_rcvbuf_size_; } @@ -14,7 +14,7 @@ TAO_ORB_Parameters::sock_rcvbuf_size (int s) } ACE_INLINE int -TAO_ORB_Parameters::sock_sndbuf_size (void) const +TAO_ORB_Parameters::sock_sndbuf_size () const { return sock_sndbuf_size_; } @@ -26,7 +26,7 @@ TAO_ORB_Parameters::sock_sndbuf_size (int s) } ACE_INLINE int -TAO_ORB_Parameters::cdr_memcpy_tradeoff (void) const +TAO_ORB_Parameters::cdr_memcpy_tradeoff () const { return this->cdr_memcpy_tradeoff_; } @@ -38,7 +38,7 @@ TAO_ORB_Parameters::cdr_memcpy_tradeoff (int x) } ACE_INLINE ACE_CDR::ULong -TAO_ORB_Parameters::max_message_size (void) const +TAO_ORB_Parameters::max_message_size () const { return this->max_message_size_; } @@ -50,7 +50,7 @@ TAO_ORB_Parameters::max_message_size (ACE_CDR::ULong size) } ACE_INLINE int -TAO_ORB_Parameters::use_dotted_decimal_addresses (void) const +TAO_ORB_Parameters::use_dotted_decimal_addresses () const { return this->use_dotted_decimal_addresses_; } @@ -62,7 +62,7 @@ TAO_ORB_Parameters::use_dotted_decimal_addresses (int x) } ACE_INLINE int -TAO_ORB_Parameters::cache_incoming_by_dotted_decimal_address (void) const +TAO_ORB_Parameters::cache_incoming_by_dotted_decimal_address () const { return this->cache_incoming_by_dotted_decimal_address_; } @@ -74,7 +74,7 @@ TAO_ORB_Parameters::cache_incoming_by_dotted_decimal_address (int x) } ACE_INLINE int -TAO_ORB_Parameters::linger (void) const +TAO_ORB_Parameters::linger () const { return this->linger_; } @@ -87,7 +87,7 @@ TAO_ORB_Parameters::linger (int x) ACE_INLINE time_t -TAO_ORB_Parameters::accept_error_delay (void) const +TAO_ORB_Parameters::accept_error_delay () const { return this->accept_error_delay_; } @@ -119,7 +119,7 @@ TAO_ORB_Parameters::mcast_discovery_endpoint (const char *mde) } ACE_INLINE const char * -TAO_ORB_Parameters::mcast_discovery_endpoint (void) const +TAO_ORB_Parameters::mcast_discovery_endpoint () const { return this->mcast_discovery_endpoint_.in (); } @@ -131,13 +131,13 @@ TAO_ORB_Parameters::default_init_ref (const char *default_init_ref) } ACE_INLINE char * -TAO_ORB_Parameters::default_init_ref (void) const +TAO_ORB_Parameters::default_init_ref () const { return CORBA::string_dup (this->default_init_ref_.c_str ()); } ACE_INLINE bool -TAO_ORB_Parameters::std_profile_components (void) const +TAO_ORB_Parameters::std_profile_components () const { return this->std_profile_components_; } @@ -149,7 +149,7 @@ TAO_ORB_Parameters::std_profile_components (bool x) } ACE_INLINE int -TAO_ORB_Parameters::nodelay (void) const +TAO_ORB_Parameters::nodelay () const { return this->nodelay_; } @@ -234,7 +234,7 @@ TAO_ORB_Parameters::iiop_client_port_span (u_short s) } ACE_INLINE int -TAO_ORB_Parameters::ace_sched_policy (void) const +TAO_ORB_Parameters::ace_sched_policy () const { return this->ace_sched_policy_; } @@ -246,7 +246,7 @@ TAO_ORB_Parameters::ace_sched_policy (int x) } ACE_INLINE long -TAO_ORB_Parameters::sched_policy (void) const +TAO_ORB_Parameters::sched_policy () const { return this->sched_policy_; } @@ -258,7 +258,7 @@ TAO_ORB_Parameters::sched_policy (long x) } ACE_INLINE long -TAO_ORB_Parameters::scope_policy (void) const +TAO_ORB_Parameters::scope_policy () const { return this->scope_policy_; } @@ -270,7 +270,7 @@ TAO_ORB_Parameters::scope_policy (long x) } ACE_INLINE long -TAO_ORB_Parameters::thread_creation_flags (void) const +TAO_ORB_Parameters::thread_creation_flags () const { return this->scope_policy () | @@ -278,7 +278,7 @@ TAO_ORB_Parameters::thread_creation_flags (void) const } ACE_INLINE int -TAO_ORB_Parameters::single_read_optimization (void) const +TAO_ORB_Parameters::single_read_optimization () const { return this->single_read_optimization_; } @@ -290,7 +290,7 @@ TAO_ORB_Parameters::single_read_optimization (int x) } ACE_INLINE bool -TAO_ORB_Parameters::use_parallel_connects (void) const +TAO_ORB_Parameters::use_parallel_connects () const { return this->use_parallel_connects_; } @@ -302,7 +302,7 @@ TAO_ORB_Parameters::use_parallel_connects (bool x) } ACE_INLINE unsigned long -TAO_ORB_Parameters::parallel_connect_delay (void) const +TAO_ORB_Parameters::parallel_connect_delay () const { return this->parallel_connect_delay_; } @@ -314,7 +314,7 @@ TAO_ORB_Parameters::parallel_connect_delay (unsigned long x) } ACE_INLINE int -TAO_ORB_Parameters::shared_profile (void) const +TAO_ORB_Parameters::shared_profile () const { return this->shared_profile_; } @@ -326,7 +326,7 @@ TAO_ORB_Parameters::shared_profile (int x) } ACE_INLINE bool -TAO_ORB_Parameters::disable_rt_collocation_resolver (void) const +TAO_ORB_Parameters::disable_rt_collocation_resolver () const { return this->disable_rt_collocation_resolver_; } @@ -339,7 +339,7 @@ TAO_ORB_Parameters::disable_rt_collocation_resolver (bool x) ACE_INLINE bool -TAO_ORB_Parameters::negotiate_codesets (void) const +TAO_ORB_Parameters::negotiate_codesets () const { return this->negotiate_codesets_; } @@ -351,7 +351,7 @@ TAO_ORB_Parameters::negotiate_codesets (bool x) } ACE_INLINE bool -TAO_ORB_Parameters::ami_collication (void) const +TAO_ORB_Parameters::ami_collication () const { return this->ami_collication_; } @@ -369,13 +369,13 @@ TAO_ORB_Parameters::collocation_resolver_name (const char *s) } ACE_INLINE const char * -TAO_ORB_Parameters::collocation_resolver_name (void) const +TAO_ORB_Parameters::collocation_resolver_name () const { return this->collocation_resolver_name_.c_str (); } ACE_INLINE bool -TAO_ORB_Parameters::forward_invocation_on_object_not_exist (void) const +TAO_ORB_Parameters::forward_invocation_on_object_not_exist () const { return this->forward_invocation_on_object_not_exist_; } @@ -387,7 +387,7 @@ TAO_ORB_Parameters::forward_invocation_on_object_not_exist (bool x) } ACE_INLINE int -TAO_ORB_Parameters::forward_once_exception (void) const +TAO_ORB_Parameters::forward_once_exception () const { return this->forward_once_exception_; } @@ -399,7 +399,7 @@ TAO_ORB_Parameters::forward_once_exception (const int ef) } ACE_INLINE bool -TAO_ORB_Parameters::allow_ziop_no_server_policies (void) const +TAO_ORB_Parameters::allow_ziop_no_server_policies () const { return this->allow_ziop_no_server_policies_; } diff --git a/TAO/tests/Alt_Mapping/options.cpp b/TAO/tests/Alt_Mapping/options.cpp index fc146142491..923d6ed5fa7 100644 --- a/TAO/tests/Alt_Mapping/options.cpp +++ b/TAO/tests/Alt_Mapping/options.cpp @@ -127,7 +127,7 @@ Options::read_ior (ACE_TCHAR *filename) } char const * -Options::param_test_ior (void) const +Options::param_test_ior () const { return this->ior_.in (); } @@ -151,13 +151,13 @@ Options::loop_count (void) } CORBA::Boolean -Options::debug (void) const +Options::debug () const { return this->debug_; } CORBA::Boolean -Options::shutdown (void) const +Options::shutdown () const { return this->shutdown_; } diff --git a/TAO/tests/Alt_Mapping/options.h b/TAO/tests/Alt_Mapping/options.h index 67596279459..8a6796c3cef 100644 --- a/TAO/tests/Alt_Mapping/options.h +++ b/TAO/tests/Alt_Mapping/options.h @@ -49,7 +49,7 @@ public: int parse_args (int argc, ACE_TCHAR **argv); /// return the IOR for the servant - char const * param_test_ior (void) const; + char const * param_test_ior () const; /// what test to run TEST_TYPE test_type (void); @@ -61,10 +61,10 @@ public: CORBA::ULong loop_count (void); /// whether debug option is on or not - CORBA::Boolean debug (void) const; + CORBA::Boolean debug () const; /// If we should request the server to shutdown. - CORBA::Boolean shutdown (void) const; + CORBA::Boolean shutdown () const; private: /// Function to read the servant IOR from a file. diff --git a/TAO/tests/Alt_Mapping/ub_string.cpp b/TAO/tests/Alt_Mapping/ub_string.cpp index fc24fb6afd1..a1cb328c8a5 100644 --- a/TAO/tests/Alt_Mapping/ub_string.cpp +++ b/TAO/tests/Alt_Mapping/ub_string.cpp @@ -29,7 +29,7 @@ Test_Unbounded_String::~Test_Unbounded_String (void) } const char * -Test_Unbounded_String::opname (void) const +Test_Unbounded_String::opname () const { return this->opname_; } diff --git a/TAO/tests/Alt_Mapping/ub_string.h b/TAO/tests/Alt_Mapping/ub_string.h index f3d12300da0..7326aa8f5de 100644 --- a/TAO/tests/Alt_Mapping/ub_string.h +++ b/TAO/tests/Alt_Mapping/ub_string.h @@ -31,7 +31,7 @@ public: int run_sii_test (Alt_Mapping_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Alt_Mapping_ptr objref); diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp index f282ddcd698..95673f39d4b 100644 --- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp +++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp @@ -33,7 +33,7 @@ Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence ( } const char * -Test_Unbounded_Struct_Sequence::opname (void) const +Test_Unbounded_Struct_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.h b/TAO/tests/Alt_Mapping/ub_struct_seq.h index d4bc70446ce..973f9a0f186 100644 --- a/TAO/tests/Alt_Mapping/ub_struct_seq.h +++ b/TAO/tests/Alt_Mapping/ub_struct_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Alt_Mapping_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Alt_Mapping_ptr objref); diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index a0f249fbe80..9824af20cbb 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -71,7 +71,7 @@ public: ~Handler (void) {}; /// Get the reply count - long reply_count (void) const + long reply_count () const { return reply_count_.value (); } diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp index 3947b758e4c..7b5cb6645c6 100644 --- a/TAO/tests/Big_Oneways/Coordinator.cpp +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -14,7 +14,7 @@ Coordinator::~Coordinator (void) } int -Coordinator::has_all_peers (void) const +Coordinator::has_all_peers () const { return this->peer_count_ == this->peer_max_; } diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h index 04c4f1fbd32..72e79a9389e 100644 --- a/TAO/tests/Big_Oneways/Coordinator.h +++ b/TAO/tests/Big_Oneways/Coordinator.h @@ -15,7 +15,7 @@ public: /// Check if all the peers have registered already - int has_all_peers (void) const; + int has_all_peers () const; /// Check a session on each peer void create_session_list (Test::Session_Control_ptr session_control, diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp index 5d22fa39b08..5f205cd73a8 100644 --- a/TAO/tests/Big_Oneways/Session.cpp +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -209,7 +209,7 @@ Session::destroy (void) } int -Session::more_work (void) const +Session::more_work () const { if (this->expected_messages_ > 0 || this->active_thread_count_ > 0 diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h index 7dad8676bc4..13fe7148e09 100644 --- a/TAO/tests/Big_Oneways/Session.h +++ b/TAO/tests/Big_Oneways/Session.h @@ -46,7 +46,7 @@ private: void terminate (CORBA::Boolean success); /// Return 1 if all the work in this session has been completed - int more_work (void) const; + int more_work () const; /// Make sure that all threads have connections avaiable to the /// other sessions. diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp index cacbbd889db..bccb40f881d 100644 --- a/TAO/tests/Big_Oneways/Session_Control.cpp +++ b/TAO/tests/Big_Oneways/Session_Control.cpp @@ -7,7 +7,7 @@ Session_Control::Session_Control (CORBA::ULong session_count) } int -Session_Control::all_sessions_finished (void) const +Session_Control::all_sessions_finished () const { return this->session_count_ == 0; } diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h index edb4799cc78..7b7791f5f67 100644 --- a/TAO/tests/Big_Oneways/Session_Control.h +++ b/TAO/tests/Big_Oneways/Session_Control.h @@ -20,7 +20,7 @@ public: virtual ~Session_Control (void); /// Return 1 when all sessions have finished - int all_sessions_finished (void) const; + int all_sessions_finished () const; // = The skeleton methods virtual void session_finished (CORBA::Boolean success); diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp index 2dee638293e..df1cd5a53b2 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp +++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp @@ -28,7 +28,7 @@ Client_Task::Client_Task (ACE_Thread_Manager *thr_mgr, } bool -Client_Task::done(void) const +Client_Task::done() const { if (tasks_running_ == 0) return done_; @@ -38,7 +38,7 @@ Client_Task::done(void) const } const char * -Client_Task::ID (void) const +Client_Task::ID () const { return id_.c_str (); } diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h index 4bd2b296eef..0b130075d98 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.h +++ b/TAO/tests/Big_Request_Muxing/Client_Task.h @@ -30,8 +30,8 @@ public: /// Thread entry point int svc (void); - bool done(void) const; - const char *ID (void) const; + bool done() const; + const char *ID () const; private: /// Make sure that all threads have connections available to diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp index e00cf0ba178..7813458813f 100644 --- a/TAO/tests/Big_Twoways/Coordinator.cpp +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -14,7 +14,7 @@ Coordinator::~Coordinator (void) } int -Coordinator::has_all_peers (void) const +Coordinator::has_all_peers () const { return this->peer_count_ == this->peer_max_; } diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h index 82b169f6b7e..15809cba47e 100644 --- a/TAO/tests/Big_Twoways/Coordinator.h +++ b/TAO/tests/Big_Twoways/Coordinator.h @@ -14,7 +14,7 @@ public: Coordinator (CORBA::ULong peer_count); /// Check if all the peers have registered already - int has_all_peers (void) const; + int has_all_peers () const; /// Check a session on each peer void create_session_list (Test::Session_Control_ptr session_control, diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp index 3e0e27a2a68..13edf85c678 100644 --- a/TAO/tests/Big_Twoways/Session.cpp +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -195,7 +195,7 @@ Session::destroy (void) } int -Session::more_work (void) const +Session::more_work () const { if (this->expected_messages_ > 0 || this->active_thread_count_ > 0 diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h index 1ba68b85b77..7ee8c297f2e 100644 --- a/TAO/tests/Big_Twoways/Session.h +++ b/TAO/tests/Big_Twoways/Session.h @@ -45,7 +45,7 @@ private: void terminate (CORBA::Boolean success); /// Return 1 if all the work in this session has been completed - int more_work (void) const; + int more_work () const; /// Validate all the connections void validate_connections (void); diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp index 5fcd3cfe35f..027bd658625 100644 --- a/TAO/tests/Big_Twoways/Session_Control.cpp +++ b/TAO/tests/Big_Twoways/Session_Control.cpp @@ -7,7 +7,7 @@ Session_Control::Session_Control (CORBA::ULong session_count) } int -Session_Control::all_sessions_finished (void) const +Session_Control::all_sessions_finished () const { return this->session_count_ == 0; } diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h index edb4799cc78..7b7791f5f67 100644 --- a/TAO/tests/Big_Twoways/Session_Control.h +++ b/TAO/tests/Big_Twoways/Session_Control.h @@ -20,7 +20,7 @@ public: virtual ~Session_Control (void); /// Return 1 when all sessions have finished - int all_sessions_finished (void) const; + int all_sessions_finished () const; // = The skeleton methods virtual void session_finished (CORBA::Boolean success); diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp index 7960342ab5a..ad02084fb96 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp +++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp @@ -28,13 +28,13 @@ Sender_i::send_ready_message (void) } CORBA::ULong -Sender_i::get_number_received (void) const +Sender_i::get_number_received () const { return number_received_; } CORBA::ULong -Sender_i::get_active_objects (void) const +Sender_i::get_active_objects () const { return active_objects_; } diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h index 0a18875b1ff..fc561ccfdd4 100644 --- a/TAO/tests/Bug_2677_Regression/DllORB.h +++ b/TAO/tests/Bug_2677_Regression/DllORB.h @@ -12,7 +12,7 @@ public: DllORB (void); virtual ~DllORB (void); - CORBA::ORB_ptr orb (void) const; + CORBA::ORB_ptr orb () const; virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h index de48025da89..24dae5c923e 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.h +++ b/TAO/tests/Bug_3251_Regression/DllOrb.h @@ -16,7 +16,7 @@ public: DllOrb (void); virtual ~DllOrb (void); - CORBA::ORB_ptr orb (void) const { return CORBA::ORB::_duplicate(mv_orb_.in()); } + CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); } virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index 2e9a80a1bfe..44221124f40 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -201,7 +201,7 @@ public: Test_Resource_Factory () {} - virtual ACE_Reactor_Impl* allocate_reactor_impl (void) const + virtual ACE_Reactor_Impl* allocate_reactor_impl () const { ACE_Reactor_Impl *impl = 0; ACE_NEW_RETURN (impl, @@ -248,12 +248,12 @@ public: } protected: - virtual bool successful_i (void) const + virtual bool successful_i () const { return this->state_ == TAO_LF_Event::LFS_SUCCESS; } - virtual bool error_detected_i (void) const + virtual bool error_detected_i () const { return (this->state_ == TAO_LF_Event::LFS_FAILURE || this->state_ == TAO_LF_Event::LFS_TIMEOUT @@ -264,7 +264,7 @@ protected: this->state_ = new_state; } - virtual bool is_state_final (void) const + virtual bool is_state_final () const { if (this->state_ == TAO_LF_Event::LFS_TIMEOUT || this->state_ == TAO_LF_Event::LFS_FAILURE) diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h index 1030d5b022d..5e320d6f9e9 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.h +++ b/TAO/tests/Bug_3542_Regression/DllOrb.h @@ -16,7 +16,7 @@ public: DllOrb (void); virtual ~DllOrb (void); - CORBA::ORB_ptr orb (void) const { return CORBA::ORB::_duplicate(mv_orb_.in()); } + CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); } virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_3597_Regression/server.cpp b/TAO/tests/Bug_3597_Regression/server.cpp index 30d0588d9c4..23276610023 100644 --- a/TAO/tests/Bug_3597_Regression/server.cpp +++ b/TAO/tests/Bug_3597_Regression/server.cpp @@ -19,7 +19,7 @@ public: virtual ssize_t log (ACE_Log_Record &log_record); - bool ok (void) const; + bool ok () const; private: bool ok_; @@ -52,7 +52,7 @@ Backend::log (ACE_Log_Record &) } bool -Backend::ok (void) const +Backend::ok () const { return this->ok_; } diff --git a/TAO/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp index d28e168eedf..9b7d558812c 100644 --- a/TAO/tests/Bug_3953_Regression/client.cpp +++ b/TAO/tests/Bug_3953_Regression/client.cpp @@ -21,7 +21,7 @@ public: server_ptr s); int svc (void); - bool exception (void) const; + bool exception () const; private: client_var client_; diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp index 2fb5b3cd48c..dbe5c1ac4f4 100644 --- a/TAO/tests/Bug_3953_Regression/server_i.cpp +++ b/TAO/tests/Bug_3953_Regression/server_i.cpp @@ -17,7 +17,7 @@ server_i::start (client_ptr c, } bool -server_i::exception (void) const +server_i::exception () const { return this->exception_; } diff --git a/TAO/tests/Bug_3953_Regression/server_i.h b/TAO/tests/Bug_3953_Regression/server_i.h index c8605f01478..7aa8275ab28 100644 --- a/TAO/tests/Bug_3953_Regression/server_i.h +++ b/TAO/tests/Bug_3953_Regression/server_i.h @@ -13,7 +13,7 @@ public: void shutdown (void); - bool exception (void) const; + bool exception () const; private: int quiet_; // Be quiet. diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp index 33c6bae4274..bd29e654510 100644 --- a/TAO/tests/Client_Leaks/Client_Task.cpp +++ b/TAO/tests/Client_Leaks/Client_Task.cpp @@ -10,7 +10,7 @@ Client_Task::Client_Task (Test::Process_Factory_ptr process_factory, } int -Client_Task::successful_calls (void) const +Client_Task::successful_calls () const { return this->successful_calls_; } diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h index fb03f4a5bc7..a8da84944ea 100644 --- a/TAO/tests/Client_Leaks/Client_Task.h +++ b/TAO/tests/Client_Leaks/Client_Task.h @@ -19,7 +19,7 @@ public: int iterations); /// Return the total number of successful calls - int successful_calls (void) const; + int successful_calls () const; /// Thread entry point int svc (void); diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index 1bc74d3fe5a..53128689442 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -31,7 +31,7 @@ Test_DynAny::~Test_DynAny (void) } const char* -Test_DynAny::test_name (void) const +Test_DynAny::test_name () const { return this->test_name_; } diff --git a/TAO/tests/DynAny_Test/test_dynany.h b/TAO/tests/DynAny_Test/test_dynany.h index d4bca09a771..c04e394ed54 100644 --- a/TAO/tests/DynAny_Test/test_dynany.h +++ b/TAO/tests/DynAny_Test/test_dynany.h @@ -21,7 +21,7 @@ public: Test_DynAny (CORBA::ORB_var orb, int debug); ~Test_DynAny (void); - const char* test_name (void) const; + const char* test_name () const; int run_test (void); diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index cd275a1d9a2..18a43659558 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -30,7 +30,7 @@ Test_DynArray::~Test_DynArray (void) } const char* -Test_DynArray::test_name (void) const +Test_DynArray::test_name () const { return this->test_name_; } diff --git a/TAO/tests/DynAny_Test/test_dynarray.h b/TAO/tests/DynAny_Test/test_dynarray.h index 9796ce4e693..50367b2a930 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.h +++ b/TAO/tests/DynAny_Test/test_dynarray.h @@ -20,7 +20,7 @@ public: Test_DynArray (CORBA::ORB_var orb, int debug); ~Test_DynArray (void); - const char* test_name (void) const; + const char* test_name () const; int run_test (void); diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index 494522dc89d..9980259db9b 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -31,7 +31,7 @@ Test_DynEnum::~Test_DynEnum (void) } const char* -Test_DynEnum::test_name (void) const +Test_DynEnum::test_name () const { return this->test_name_; } diff --git a/TAO/tests/DynAny_Test/test_dynenum.h b/TAO/tests/DynAny_Test/test_dynenum.h index 4b4d2c9b44c..e6714028824 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.h +++ b/TAO/tests/DynAny_Test/test_dynenum.h @@ -20,7 +20,7 @@ public: Test_DynEnum (CORBA::ORB_var orb, int debug); ~Test_DynEnum (void); - const char* test_name (void) const; + const char* test_name () const; int run_test (void); diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 3c8eb33be0b..441ded57aca 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -61,7 +61,7 @@ Test_DynSequence::~Test_DynSequence (void) } const char* -Test_DynSequence::test_name (void) const +Test_DynSequence::test_name () const { return this->test_name_; } diff --git a/TAO/tests/DynAny_Test/test_dynsequence.h b/TAO/tests/DynAny_Test/test_dynsequence.h index 327402b7e71..afe325722a6 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.h +++ b/TAO/tests/DynAny_Test/test_dynsequence.h @@ -20,7 +20,7 @@ public: Test_DynSequence (CORBA::ORB_var orb, int debug); ~Test_DynSequence (void); - const char* test_name (void) const; + const char* test_name () const; int run_test (void); diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 1d7151f0eb4..915835bfa73 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -31,7 +31,7 @@ Test_DynStruct::~Test_DynStruct (void) } const char* -Test_DynStruct::test_name (void) const +Test_DynStruct::test_name () const { return this->test_name_; } diff --git a/TAO/tests/DynAny_Test/test_dynstruct.h b/TAO/tests/DynAny_Test/test_dynstruct.h index a8b41721f7a..408d626dda8 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.h +++ b/TAO/tests/DynAny_Test/test_dynstruct.h @@ -20,7 +20,7 @@ public: Test_DynStruct (CORBA::ORB_var orb, int debug); ~Test_DynStruct (void); - const char* test_name (void) const; + const char* test_name () const; int run_test (void); diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index f95ecd1e332..f51f05ec3b9 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -30,7 +30,7 @@ Test_DynUnion::~Test_DynUnion (void) } const char* -Test_DynUnion::test_name (void) const +Test_DynUnion::test_name () const { return this->test_name_; } diff --git a/TAO/tests/DynAny_Test/test_dynunion.h b/TAO/tests/DynAny_Test/test_dynunion.h index deae61b0f60..77ddc0eeef2 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.h +++ b/TAO/tests/DynAny_Test/test_dynunion.h @@ -20,7 +20,7 @@ public: Test_DynUnion (CORBA::ORB_var orb, int debug); ~Test_DynUnion (void); - const char* test_name (void) const; + const char* test_name () const; int run_test (void); diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h index 8f7a80057a5..d6ba365e769 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h @@ -21,7 +21,7 @@ public: virtual void shutdown (void); - int get_count (void) const; + int get_count () const; public: int count_; diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h index f7b15e2132c..25d0748febd 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h @@ -21,7 +21,7 @@ public: virtual void shutdown (void); - int get_count (void) const; + int get_count () const; public: int count_; diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp index 80d96c756be..f7f449f47b6 100644 --- a/TAO/tests/HandleExhaustion/server.cpp +++ b/TAO/tests/HandleExhaustion/server.cpp @@ -84,7 +84,7 @@ public: cout << "Server: Descriptors::leak did not saturate fdset" << endl; } - bool ok (void) const + bool ok () const { return this->ok_; } diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index 97770fe0546..4d22dcf690a 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -22,19 +22,19 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb, } int -Client_Task::successful_calls (void) const +Client_Task::successful_calls () const { return this->successful_calls_; } int -Client_Task::timed_out_calls (void) const +Client_Task::timed_out_calls () const { return this->timed_out_calls_; } int -Client_Task::too_big_difference_calls (void) const +Client_Task::too_big_difference_calls () const { return this->too_big_difference_; } diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h index 59bd1886a34..9bde5efdf45 100644 --- a/TAO/tests/MT_Timeout/Client_Task.h +++ b/TAO/tests/MT_Timeout/Client_Task.h @@ -38,14 +38,14 @@ public: CORBA::ULong timeout); /// Return the total number of successful calls - int successful_calls (void) const; + int successful_calls () const; /// Return the total number of timed out calls - int timed_out_calls (void) const; + int timed_out_calls () const; /// Return the number of calls with a too huge difference in /// timeout versus actual response arrival. - int too_big_difference_calls (void) const; + int too_big_difference_calls () const; /// Thread entry point int svc (void); diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h index 883d6c025a5..a3082202111 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h +++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h @@ -28,7 +28,7 @@ class DllOrb_Export DllOrb /// Destructor. ~DllOrb (void) throw (); - CORBA::ORB_ptr orb (void) const; + CORBA::ORB_ptr orb () const; virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h index 4adee3cc6d7..ec627e5e18e 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h @@ -33,7 +33,7 @@ public: virtual ~Abstract_Worker (void); virtual int test_main (int argc, ACE_TCHAR *argv[]) = 0; - virtual const ACE_TCHAR * kind (void) const = 0; + virtual const ACE_TCHAR * kind () const = 0; protected: ACE_TString ior_file_; }; @@ -47,7 +47,7 @@ public: Server_Worker (); ~Server_Worker (void); int test_main (int argc, ACE_TCHAR *argv[]); - const ACE_TCHAR * kind (void) const; + const ACE_TCHAR * kind () const; private: int parse_args (int argc, ACE_TCHAR *argv[]); @@ -62,7 +62,7 @@ public: Client_Worker (); ~Client_Worker (void); int test_main (int argc, ACE_TCHAR *argv[]); - const ACE_TCHAR * kind (void) const; + const ACE_TCHAR * kind () const; private: int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp index d5717fabb68..ca2e889c6c6 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp @@ -12,7 +12,7 @@ Client_Worker::Client_Worker () } const ACE_TCHAR * -Client_Worker::kind (void) const +Client_Worker::kind () const { return ACE_TEXT ("Client"); } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp index 98caf3d4143..0323af204ae 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -13,7 +13,7 @@ Server_Worker::Server_Worker () // const ACE_TCHAR * -Server_Worker::kind (void) const +Server_Worker::kind () const { return ACE_TEXT ("Server"); } diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h index 6e8ad2850e8..48d00ac8139 100644 --- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h +++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h @@ -40,17 +40,17 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt } }; - size_t command_line_directives_count (void) const + size_t command_line_directives_count () const { return this->svc_queue_->size (); }; - size_t service_config_files_count (void) const + size_t service_config_files_count () const { return this->svc_conf_file_queue_->size (); }; - size_t services_count (void) const + size_t services_count () const { return this->repo_->current_size (); }; diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp index 1f1c34d115e..d6d92f509fa 100644 --- a/TAO/tests/POA/DSI/Database_i.cpp +++ b/TAO/tests/POA/DSI/Database_i.cpp @@ -310,7 +310,7 @@ DatabaseImpl::Employee::~Employee (void) } const char * -DatabaseImpl::Employee::name (void) const +DatabaseImpl::Employee::name () const { return this->name_; } @@ -328,7 +328,7 @@ DatabaseImpl::Employee::name (const char* name) } CORBA::Long -DatabaseImpl::Employee::id (void) const +DatabaseImpl::Employee::id () const { return this->id_; } diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h index b4da8da23ae..4bfdc8c8714 100644 --- a/TAO/tests/POA/DSI/Database_i.h +++ b/TAO/tests/POA/DSI/Database_i.h @@ -106,10 +106,10 @@ public: ~Employee (void); - const char *name (void) const; + const char *name () const; void name (const char* name); - CORBA::Long id (void) const; + CORBA::Long id () const; void id (CORBA::Long id); #if defined (ACE_HAS_NEW_NOTHROW) diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp index f84623cbe4f..c80c4284949 100644 --- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp +++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp @@ -2,7 +2,7 @@ #include "ace/WFMO_Reactor.h" ACE_Reactor_Impl * -My_Resource_Factory::allocate_reactor_impl (void) const +My_Resource_Factory::allocate_reactor_impl () const { errno = 0; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h index 206c0a1ee8b..1b5094621f8 100644 --- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h +++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h @@ -4,7 +4,7 @@ class Alt_Resource_Factory_Export My_Resource_Factory : public TAO_Default_Resource_Factory { public: - ACE_Reactor_Impl *allocate_reactor_impl (void) const; + ACE_Reactor_Impl *allocate_reactor_impl () const; }; ACE_FACTORY_DECLARE (Alt_Resource_Factory, My_Resource_Factory) diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index 3500f89a4a7..3fd3c35123a 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -34,7 +34,7 @@ Test_Any::~Test_Any (void) } const char * -Test_Any::opname (void) const +Test_Any::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h index 13d2b14703d..b0515dfb0ef 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -45,7 +45,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp index 266bca9e168..665479c78e3 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -36,7 +36,7 @@ Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence (void) } const char * -Test_Bounded_Array_Sequence::opname (void) const +Test_Bounded_Array_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h index bd915a975f1..aa65c023b62 100644 --- a/TAO/tests/Param_Test/bd_array_seq.h +++ b/TAO/tests/Param_Test/bd_array_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp index 195cad52c53..7354e5c44b6 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -33,7 +33,7 @@ Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence (void) } const char * -Test_Bounded_Long_Sequence::opname (void) const +Test_Bounded_Long_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h index 525104c9351..fc0c65c72c6 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index 6f896872412..4e0a2cf1bbd 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -33,7 +33,7 @@ Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence (void) } const char * -Test_Bounded_Short_Sequence::opname (void) const +Test_Bounded_Short_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h index 0819447f430..f148bba9f5a 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index fc9dd8cce61..a7a4f410df2 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -33,7 +33,7 @@ Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence (void) } const char * -Test_Bounded_String_Sequence::opname (void) const +Test_Bounded_String_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h index da9bb7a65c1..1b4fb023039 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp index ce5976ddbab..66f62ecaf4f 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -41,7 +41,7 @@ Test_Bounded_String::~Test_Bounded_String (void) } const char * -Test_Bounded_String::opname (void) const +Test_Bounded_String::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h index d9088cf2c7f..a7202b49cac 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp index 7a4cae63357..c91122d68ab 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -36,7 +36,7 @@ Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence (void) } const char * -Test_Bounded_Struct_Sequence::opname (void) const +Test_Bounded_Struct_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h index 6f61d2a4b6c..bbda8071ff4 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp index 345f99c5133..544840dd110 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -34,7 +34,7 @@ Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence (void) } const char * -Test_Bounded_WString_Sequence::opname (void) const +Test_Bounded_WString_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h index d190e6b8493..c9a754dde2e 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.h +++ b/TAO/tests/Param_Test/bd_wstr_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp index e756b2ae028..eab4463dedc 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -42,7 +42,7 @@ Test_Bounded_WString::~Test_Bounded_WString (void) } const char * -Test_Bounded_WString::opname (void) const +Test_Bounded_WString::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h index 666230f90d9..7c691d97a4f 100644 --- a/TAO/tests/Param_Test/bd_wstring.h +++ b/TAO/tests/Param_Test/bd_wstring.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp index f03f3c91d50..044f92400d0 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -31,7 +31,7 @@ Test_Big_Union::~Test_Big_Union (void) } const char * -Test_Big_Union::opname (void) const +Test_Big_Union::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h index 7a69d326b78..07e4deb5422 100644 --- a/TAO/tests/Param_Test/big_union.h +++ b/TAO/tests/Param_Test/big_union.h @@ -35,7 +35,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 7d3330c2258..7696218e2e5 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -39,7 +39,7 @@ Test_Complex_Any::~Test_Complex_Any (void) } const char * -Test_Complex_Any::opname (void) const +Test_Complex_Any::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h index 8b43e72e771..b0ac49b1ecc 100644 --- a/TAO/tests/Param_Test/complex_any.h +++ b/TAO/tests/Param_Test/complex_any.h @@ -33,7 +33,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 616ef6659d6..d8760f9f6ef 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -33,7 +33,7 @@ Test_Exception::~Test_Exception (void) } const char * -Test_Exception::opname (void) const +Test_Exception::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h index 726c7d97f4a..6bb02bd3d81 100644 --- a/TAO/tests/Param_Test/except.h +++ b/TAO/tests/Param_Test/except.h @@ -28,7 +28,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index 45f86f6f59d..b4e9cf443e7 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -30,7 +30,7 @@ Test_Fixed_Array::~Test_Fixed_Array (void) } const char * -Test_Fixed_Array::opname (void) const +Test_Fixed_Array::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h index 7bfa844260a..f6cec4953e6 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp index d8eea89b958..ad71a5f7a03 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -29,7 +29,7 @@ Test_Fixed_Struct::~Test_Fixed_Struct (void) } const char * -Test_Fixed_Struct::opname (void) const +Test_Fixed_Struct::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h index 06e2685149d..ac0393a0303 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp index 7a260e9fe93..4711438c044 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -34,7 +34,7 @@ Test_Multdim_Array::~Test_Multdim_Array (void) } const char * -Test_Multdim_Array::opname (void) const +Test_Multdim_Array::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h index 340584fe9dd..af149eafb9e 100644 --- a/TAO/tests/Param_Test/multdim_array.h +++ b/TAO/tests/Param_Test/multdim_array.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index b3f52f871a0..1424ce43835 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -34,7 +34,7 @@ Test_Nested_Struct::~Test_Nested_Struct (void) } const char * -Test_Nested_Struct::opname (void) const +Test_Nested_Struct::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h index 75f44a1e616..2ca813c4142 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 0532a9e23e5..e879993797b 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -29,7 +29,7 @@ Test_ObjRef::~Test_ObjRef (void) } const char * -Test_ObjRef::opname (void) const +Test_ObjRef::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h index f9934729b77..9f2aa04c937 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp index 41c48a99846..454cfb7b059 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -34,7 +34,7 @@ Test_Objref_Struct::~Test_Objref_Struct (void) } const char * -Test_Objref_Struct::opname (void) const +Test_Objref_Struct::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h index 06757a3241c..a7b8fb748a3 100644 --- a/TAO/tests/Param_Test/objref_struct.h +++ b/TAO/tests/Param_Test/objref_struct.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index 52dc12bd4ba..6db5429ab92 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -194,7 +194,7 @@ Options::read_ior (ACE_TCHAR *filename) } char const * -Options::param_test_ior (void) const +Options::param_test_ior () const { return this->ior_.in (); } @@ -218,13 +218,13 @@ Options::loop_count (void) } CORBA::Boolean -Options::debug (void) const +Options::debug () const { return this->debug_; } CORBA::Boolean -Options::shutdown (void) const +Options::shutdown () const { return this->shutdown_; } diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h index c96104fc824..1659ce72f23 100644 --- a/TAO/tests/Param_Test/options.h +++ b/TAO/tests/Param_Test/options.h @@ -83,7 +83,7 @@ public: int parse_args (int argc, ACE_TCHAR **argv); /// return the IOR for the servant - char const * param_test_ior (void) const; + char const * param_test_ior () const; /// what test to run TEST_TYPE test_type (void); @@ -95,10 +95,10 @@ public: CORBA::ULong loop_count (void); /// whether debug option is on or not - CORBA::Boolean debug (void) const; + CORBA::Boolean debug () const; /// If we should request the server to shutdown. - CORBA::Boolean shutdown (void) const; + CORBA::Boolean shutdown () const; private: /// Function to read the servant IOR from a file. diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index e1c09e1bce0..83f03893c24 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -34,7 +34,7 @@ Test_Recursive_Struct::~Test_Recursive_Struct (void) } const char * -Test_Recursive_Struct::opname (void) const +Test_Recursive_Struct::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h index b75de8f4494..3e4141324a1 100644 --- a/TAO/tests/Param_Test/recursive_struct.h +++ b/TAO/tests/Param_Test/recursive_struct.h @@ -34,7 +34,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp index 131bd96766a..3b19bc3033e 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -33,7 +33,7 @@ Test_Recursive_Union::~Test_Recursive_Union (void) } const char * -Test_Recursive_Union::opname (void) const +Test_Recursive_Union::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h index dc8263bc8d6..8b62bfea172 100644 --- a/TAO/tests/Param_Test/recursive_union.h +++ b/TAO/tests/Param_Test/recursive_union.h @@ -33,7 +33,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index 36848f636c4..3cf8c0d1d84 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -29,7 +29,7 @@ Test_Short::~Test_Short (void) } const char * -Test_Short::opname (void) const +Test_Short::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h index c4880a118c1..3434515f78e 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp index 4f2053fe554..a1f64a7c57c 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -31,7 +31,7 @@ Test_Small_Union::~Test_Small_Union (void) } const char * -Test_Small_Union::opname (void) const +Test_Small_Union::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h index 0666aaa0526..5a0479ba21c 100644 --- a/TAO/tests/Param_Test/small_union.h +++ b/TAO/tests/Param_Test/small_union.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index c610acd0abd..0e478e64972 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -29,7 +29,7 @@ Test_TypeCode::~Test_TypeCode (void) } const char * -Test_TypeCode::opname (void) const +Test_TypeCode::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h index 66a4cff0e6a..93c83c58b7d 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index 5787515235c..d922962b7b5 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -37,7 +37,7 @@ Test_AnySeq::~Test_AnySeq (void) } const char * -Test_AnySeq::opname (void) const +Test_AnySeq::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index 335d49a1af7..50e8431a480 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp index 509654d394f..f899067802b 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -34,7 +34,7 @@ Test_Array_Sequence::~Test_Array_Sequence (void) } const char * -Test_Array_Sequence::opname (void) const +Test_Array_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h index 9e8d7a3e4fb..87701ffaee7 100644 --- a/TAO/tests/Param_Test/ub_array_seq.h +++ b/TAO/tests/Param_Test/ub_array_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index 96b1429e91c..21992565ad6 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -33,7 +33,7 @@ Test_Long_Sequence::~Test_Long_Sequence (void) } const char * -Test_Long_Sequence::opname (void) const +Test_Long_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index aa184c62905..4050e7dc570 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index de8da49add5..d92d3ae9f84 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -43,7 +43,7 @@ Test_ObjRef_Sequence::~Test_ObjRef_Sequence (void) } const char * -Test_ObjRef_Sequence::opname (void) const +Test_ObjRef_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h index eceffb0640e..b9165d990cb 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index 50cf2c2064f..9138a7f0acf 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -33,7 +33,7 @@ Test_Short_Sequence::~Test_Short_Sequence (void) } const char * -Test_Short_Sequence::opname (void) const +Test_Short_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index dd2f0c7f75b..1105cae9bf7 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 8fc56d50925..8ca94a0121d 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -33,7 +33,7 @@ Test_String_Sequence::~Test_String_Sequence (void) } const char * -Test_String_Sequence::opname (void) const +Test_String_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index 4b5c580d06e..a4340e8c5d5 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp index 8034dfcad4c..024c7b6864e 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -41,7 +41,7 @@ Test_Unbounded_String::~Test_Unbounded_String (void) } const char * -Test_Unbounded_String::opname (void) const +Test_Unbounded_String::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h index 18c4990da14..d633291c015 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -30,7 +30,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 7770f7fd5f5..274b08dd5af 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -35,7 +35,7 @@ Test_Struct_Sequence::~Test_Struct_Sequence (void) } const char * -Test_Struct_Sequence::opname (void) const +Test_Struct_Sequence::opname () const { return this->opname_; } @@ -232,7 +232,7 @@ Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence (void) } const char * -Test_Unbounded_Struct_Sequence::opname (void) const +Test_Unbounded_Struct_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index b3afb229bab..4c3ac7ea6db 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); @@ -93,7 +93,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index 0aff960b0c8..5a8a760fa44 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -34,7 +34,7 @@ Test_WString_Sequence::~Test_WString_Sequence (void) } const char * -Test_WString_Sequence::opname (void) const +Test_WString_Sequence::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h index 350d4811905..8e30b16baf3 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.h +++ b/TAO/tests/Param_Test/ub_wstr_seq.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index 300589237f6..2ac6eb0a5f7 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -42,7 +42,7 @@ Test_Unbounded_WString::~Test_Unbounded_WString (void) } const char * -Test_Unbounded_WString::opname (void) const +Test_Unbounded_WString::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h index 4198984b8e3..9363e126dc9 100644 --- a/TAO/tests/Param_Test/ub_wstring.h +++ b/TAO/tests/Param_Test/ub_wstring.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp index 25d28f27068..6f17cb122cd 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -25,7 +25,7 @@ Test_ULongLong::~Test_ULongLong (void) } const char * -Test_ULongLong::opname (void) const +Test_ULongLong::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h index cef67dbda49..3ac6270a6a9 100644 --- a/TAO/tests/Param_Test/ulonglong.h +++ b/TAO/tests/Param_Test/ulonglong.h @@ -28,7 +28,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp index aabb3698ed1..ada1500d3c4 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -31,7 +31,7 @@ Test_Var_Array::~Test_Var_Array (void) } const char * -Test_Var_Array::opname (void) const +Test_Var_Array::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h index 3a09358eccb..6bdfb158f99 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -31,7 +31,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index b151e26ddb2..87ceee7b536 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -34,7 +34,7 @@ Test_Var_Struct::~Test_Var_Struct (void) } const char * -Test_Var_Struct::opname (void) const +Test_Var_Struct::opname () const { return this->opname_; } diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h index c5f18f1d19b..810060418bd 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -32,7 +32,7 @@ public: int run_sii_test (Param_Test_ptr objref); /// return operation name - const char *opname (void) const; + const char *opname () const; /// set values for parameters int init_parameters (Param_Test_ptr objref); diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp index 571249c85f8..f42f292c474 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp @@ -32,7 +32,7 @@ Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *) } CORBA::ULong -Echo_Handler::replies (void) const +Echo_Handler::replies () const { return this->replies_; } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h index 4a0aca20158..da7f3446d66 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h @@ -20,7 +20,7 @@ public: virtual void shutdown(void); virtual void shutdown_excep(::Messaging::ExceptionHolder * h); - CORBA::ULong replies (void) const; + CORBA::ULong replies () const; private: CORBA::ULong replies_; diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp index b6ec4f91abd..696af631cbd 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp @@ -10,13 +10,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (void) } CORBA::ULong -Client_Request_Interceptor::receive_exception_count (void) const +Client_Request_Interceptor::receive_exception_count () const { return this->receive_exception_count_; } CORBA::ULong -Client_Request_Interceptor::request_count (void) const +Client_Request_Interceptor::request_count () const { return this->request_count_; } diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h index 8b106735713..143f7b9f0c6 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h @@ -61,9 +61,9 @@ public: PortableInterceptor::ClientRequestInfo_ptr ri); //@} - CORBA::ULong request_count (void) const; + CORBA::ULong request_count () const; - CORBA::ULong receive_exception_count (void) const; + CORBA::ULong receive_exception_count () const; private: /// The number of requests intercepted by this interceptor. diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h index 9dc0cb89b6e..617fef26373 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h @@ -27,7 +27,7 @@ public: void run_test (Test_Interceptors::Visual_ptr server); /// The status of the svc loop - int status (void) const; + int status () const; private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h index 8306c7f8a9a..ce62b3f44da 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h @@ -30,7 +30,7 @@ public: int svc (void); /// The status of the svc loop - int status (void) const; + int status () const; private: /// Output file for IOR diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h index ff9d33073a1..6490e7cd1c6 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h @@ -27,7 +27,7 @@ public: void run_test (Test_Interceptors::Visual_ptr server); /// The status of the svc loop - int status (void) const; + int status () const; private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h index cc5cd7a8eb6..9915f4e1969 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h @@ -30,7 +30,7 @@ public: int svc (void); /// The status of the svc loop - int status (void) const; + int status () const; private: /// Output file for IOR diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index 479385bf9da..097c5217a69 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -27,7 +27,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) } bool -Smart_Test_Proxy::can_convert_to_ior (void) const +Smart_Test_Proxy::can_convert_to_ior () const { // Even though a smart proxy is local, this one can be stringified return true; diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h index 6059b92b107..f749b8d668c 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h @@ -15,7 +15,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual bool can_convert_to_ior (void) const; + virtual bool can_convert_to_ior () const; virtual char* convert_to_ior (bool use_omg_ior_format, const char* ior_prefix) const; diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp index ea06ddcb33e..bcc4987e608 100644 --- a/TAO/tests/Stack_Recursion/Sender.cpp +++ b/TAO/tests/Stack_Recursion/Sender.cpp @@ -20,7 +20,7 @@ Sender::dump_results (void) } bool -Sender::is_done (void) const +Sender::is_done () const { return this->is_done_; } diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h index d0b38efbcfa..c403ab93083 100644 --- a/TAO/tests/Stack_Recursion/Sender.h +++ b/TAO/tests/Stack_Recursion/Sender.h @@ -20,7 +20,7 @@ public: void dump_results (void); /// Get the status of the flag.. - bool is_done (void) const; + bool is_done () const; // = The skeleton methods virtual CORBA::Boolean get_data (CORBA::ULong size, diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h index d46efb35454..07b0831456d 100644 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h +++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h @@ -51,7 +51,7 @@ public: public: /// Reports if unexpected errors have been encountered for the /// lifetime of the instance - bool is_successful (void) const; + bool is_successful () const; private: void test_transport_current (void); diff --git a/TAO/tests/Transport_Cache_Manager/mock_transport.h b/TAO/tests/Transport_Cache_Manager/mock_transport.h index 6ad84edf323..1a383b0dd59 100644 --- a/TAO/tests/Transport_Cache_Manager/mock_transport.h +++ b/TAO/tests/Transport_Cache_Manager/mock_transport.h @@ -2,11 +2,11 @@ class mock_transport { public: mock_transport () : id_(0), is_connected_(false), entry_(0), purging_order_ (0), purged_count_ (0) {} - size_t id (void) const {return id_;} + size_t id () const {return id_;} void id (size_t id) { this->id_ = id;} - unsigned long purging_order (void) const {return purging_order_;} + unsigned long purging_order () const {return purging_order_;} void purging_order (unsigned long purging_order) { this->purging_order_ = purging_order;} - bool is_connected (void) const {return is_connected_;} + bool is_connected () const {return is_connected_;} void is_connected (bool is_connected) { this->is_connected_ = is_connected;} ACE_Event_Handler::Reference_Count add_reference (void) {return 0;} ACE_Event_Handler::Reference_Count remove_reference (void) {return 0;} diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp index fdf08f63fc7..f0e763bd113 100644 --- a/TAO/utils/logWalker/GIOP_Buffer.cpp +++ b/TAO/utils/logWalker/GIOP_Buffer.cpp @@ -267,19 +267,19 @@ GIOP_Buffer::add_octets (const char *text, size_t offset) } bool -GIOP_Buffer::sending (void) const +GIOP_Buffer::sending () const { return this->sending_; } bool -GIOP_Buffer::is_full (void) const +GIOP_Buffer::is_full () const { return this->buffer_size_ > 0 && this->cur_size() == this->buffer_size_; } char -GIOP_Buffer::type (void) const +GIOP_Buffer::type () const { if (this->octets_ == 0) return 127; @@ -287,25 +287,25 @@ GIOP_Buffer::type (void) const } char -GIOP_Buffer::expected_type (void) const +GIOP_Buffer::expected_type () const { return this->expected_type_; } char -GIOP_Buffer::minor_version (void) const +GIOP_Buffer::minor_version () const { return this->ver_minor_; } size_t -GIOP_Buffer::reply_status (void) const +GIOP_Buffer::reply_status () const { return this->reply_status_; } size_t -GIOP_Buffer::num_contexts (void) const +GIOP_Buffer::num_contexts () const { return this->num_contexts_; } @@ -325,7 +325,7 @@ GIOP_Buffer::is_oneway (void) } size_t -GIOP_Buffer::log_posn (void) const +GIOP_Buffer::log_posn () const { return this->log_offset_; } @@ -337,7 +337,7 @@ GIOP_Buffer::thread (void) } const ACE_Time_Value & -GIOP_Buffer::time (void) const +GIOP_Buffer::time () const { return this->time_; } @@ -349,13 +349,13 @@ GIOP_Buffer::time (const ACE_Time_Value &t) } const ACE_CString & -GIOP_Buffer::preamble (void) const +GIOP_Buffer::preamble () const { return this->preamble_; } size_t -GIOP_Buffer::expected_size (void) const +GIOP_Buffer::expected_size () const { return this->expected_size_; } @@ -371,7 +371,7 @@ GIOP_Buffer::msg_size (void) } size_t -GIOP_Buffer::expected_req_id (void) const +GIOP_Buffer::expected_req_id () const { return this->expected_req_id_; } @@ -389,7 +389,7 @@ GIOP_Buffer::actual_req_id (void) } size_t -GIOP_Buffer::cur_size (void) const +GIOP_Buffer::cur_size () const { return this->wr_pos_ - this->octets_; } @@ -554,7 +554,7 @@ GIOP_Buffer::payload (void) } bool -GIOP_Buffer::has_octets (void) const +GIOP_Buffer::has_octets () const { return (octets_ != 0); } diff --git a/TAO/utils/logWalker/GIOP_Buffer.h b/TAO/utils/logWalker/GIOP_Buffer.h index 46209b1bc74..ed1549e86ef 100644 --- a/TAO/utils/logWalker/GIOP_Buffer.h +++ b/TAO/utils/logWalker/GIOP_Buffer.h @@ -49,34 +49,34 @@ public: void init_buf (const char *text, size_t offset); int add_octets(const char *text, size_t offset); - char type (void) const; - char expected_type (void) const; - bool sending (void) const; - char minor_version (void) const; - size_t reply_status (void) const; - size_t num_contexts (void) const; + char type () const; + char expected_type () const; + bool sending () const; + char minor_version () const; + size_t reply_status () const; + size_t num_contexts () const; bool is_oneway (void); - bool is_full (void) const; - size_t log_posn (void) const; + bool is_full () const; + size_t log_posn () const; Thread *thread (void); - const ACE_Time_Value & time (void) const; + const ACE_Time_Value & time () const; void time (const ACE_Time_Value &); - const ACE_CString &preamble(void) const; - size_t expected_req_id(void) const; + const ACE_CString &preamble() const; + size_t expected_req_id() const; size_t actual_req_id(void); - size_t expected_size (void) const; - size_t buf_size (void) const; - size_t cur_size(void) const; + size_t expected_size () const; + size_t buf_size () const; + size_t cur_size() const; size_t msg_size (void); const char * target_oid (size_t &len); const char * operation (void); ACE_InputCDR &payload (void); - bool has_octets (void) const; + bool has_octets () const; bool validate (void); bool matches (GIOP_Buffer *other) const; diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp index 07055375e40..dea98ef4939 100644 --- a/TAO/utils/logWalker/HostProcess.cpp +++ b/TAO/utils/logWalker/HostProcess.cpp @@ -51,7 +51,7 @@ HostProcess::proc_name (const ACE_CString &name) } const ACE_CString& -HostProcess::proc_name (void) const +HostProcess::proc_name () const { return this->proc_name_; } @@ -139,14 +139,14 @@ HostProcess::find_peer (long h) long -HostProcess::pid (void) const +HostProcess::pid () const { return this->pid_; } const ACE_Time_Value & -HostProcess::start_time (void) const +HostProcess::start_time () const { return this->start_time_; } diff --git a/TAO/utils/logWalker/HostProcess.h b/TAO/utils/logWalker/HostProcess.h index 4ea6a493c0b..2d00b7c8ea4 100644 --- a/TAO/utils/logWalker/HostProcess.h +++ b/TAO/utils/logWalker/HostProcess.h @@ -50,7 +50,7 @@ public: // set/get the name of the process. This is only provided by // an alias supplied to the logWalker command line or manifest file. void proc_name (const ACE_CString &name); - const ACE_CString &proc_name (void) const; + const ACE_CString &proc_name () const; // Returns a thread instance based on thread id. Will create an instance // as needed. @@ -64,9 +64,9 @@ public: Thread * find_thread_for_handle (long h); // Returns the process id. - long pid (void) const; + long pid () const; - const ACE_Time_Value &start_time (void) const; + const ACE_Time_Value &start_time () const; void start_time (const ACE_Time_Value &); // Return true if the supplied endpoint has been visited before. This diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index e7d4ac18dd4..f62e1545889 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -60,7 +60,7 @@ Invocation::add_notify_incident (const ACE_CString &text, size_t /* offset */) } bool -Invocation::is_oneway(void) const +Invocation::is_oneway() const { return this->req_octets_ == 0 ? false : this->req_octets_->is_oneway(); } @@ -135,7 +135,7 @@ Invocation::set_octets (bool request, GIOP_Buffer *octets) } bool -Invocation::sent_request (void) const +Invocation::sent_request () const { if (this->req_octets_) return this->req_octets_->sending(); @@ -145,13 +145,13 @@ Invocation::sent_request (void) const } size_t -Invocation::request_id (void) const +Invocation::request_id () const { return this->req_octets_ == 0 ? this->req_id_ : this->req_octets_->expected_req_id(); } size_t -Invocation::expected_size (void) const +Invocation::expected_size () const { if (repl_octets_ != 0) return repl_octets_->expected_size(); @@ -159,19 +159,19 @@ Invocation::expected_size (void) const } size_t -Invocation::request_bytes (void) const +Invocation::request_bytes () const { return req_octets_ != 0 ? req_octets_->expected_size() : 0; } Thread * -Invocation::waiter (void) const +Invocation::waiter () const { return this->waiter_; } long -Invocation::handle (void) const +Invocation::handle () const { return this->handle_; } diff --git a/TAO/utils/logWalker/Invocation.h b/TAO/utils/logWalker/Invocation.h index 6c296d9c468..787a68c0832 100644 --- a/TAO/utils/logWalker/Invocation.h +++ b/TAO/utils/logWalker/Invocation.h @@ -48,7 +48,7 @@ public: ~Invocation (void); // return true if the invocation was a oneway - bool is_oneway(void) const; + bool is_oneway() const; // return true if the request is a oneway and has all its octets, or // if it also has all its reply octets. The side-effect of this call @@ -56,16 +56,16 @@ public: // it with the peer process. bool message_complete (void); - size_t request_id (void) const; + size_t request_id () const; // returns true if this request was sent by the host process. - bool sent_request (void) const; + bool sent_request () const; // returns the size parsed from either the request or reply preamble // which can be used to match a HEXDUMP b - size_t expected_size (void) const; + size_t expected_size () const; - size_t request_bytes (void) const; + size_t request_bytes () const; void set_target (const char *oid, size_t oid_len); @@ -78,8 +78,8 @@ public: size_t repl_line (void); void add_notify_incident (const ACE_CString &text, size_t offset); - Thread *waiter (void) const; - long handle (void) const; + Thread *waiter () const; + long handle () const; void new_line (ostream &strm, size_t indent, int offset, bool add_nl, bool show_indent); void dump_detail (ostream &strm, size_t indent, Dump_Mode mode, bool show_handle); diff --git a/TAO/utils/logWalker/PeerProcess.cpp b/TAO/utils/logWalker/PeerProcess.cpp index d920ef7ad24..bb312fa3fc1 100644 --- a/TAO/utils/logWalker/PeerProcess.cpp +++ b/TAO/utils/logWalker/PeerProcess.cpp @@ -81,7 +81,7 @@ Endpoint::operator < (const Endpoint &other) const } bool -Endpoint::is_client (void) const +Endpoint::is_client () const { return this->role_ != ER_SERVER; } @@ -162,25 +162,25 @@ PeerProcess::match_server_addr (const Endpoint &addr) const } const Endpoint & -PeerProcess::server_addr (void) const +PeerProcess::server_addr () const { return this->server_ep_; } const Endpoint & -PeerProcess::last_client_addr (void) const +PeerProcess::last_client_addr () const { return this->last_transport_->client_endpoint_; } bool -PeerProcess::is_server (void) const +PeerProcess::is_server () const { return this->is_server_role_; } size_t -PeerProcess::offset (void) const +PeerProcess::offset () const { return this->origin_offset_; } @@ -240,7 +240,7 @@ PeerProcess::match_hosts (Session *session) } const char * -PeerProcess::id (void) const +PeerProcess::id () const { if (this->remote_ != 0) { diff --git a/TAO/utils/logWalker/PeerProcess.h b/TAO/utils/logWalker/PeerProcess.h index 3c96836082f..f4c062c885b 100644 --- a/TAO/utils/logWalker/PeerProcess.h +++ b/TAO/utils/logWalker/PeerProcess.h @@ -35,7 +35,7 @@ public: Endpoint & operator = (const Endpoint &other); bool operator == (const Endpoint &other) const; bool operator < (const Endpoint &other) const; - bool is_client (void) const; + bool is_client () const; ACE_CString addr_; ACE_CString host_; @@ -72,7 +72,7 @@ public: virtual ~PeerProcess (void); - const char * id (void) const; + const char * id () const; void split_filename (char *buffer, size_t len) const; void set_owner (HostProcess *host); @@ -80,11 +80,11 @@ public: void match_hosts (Session *session); void set_server_addr (const ACE_CString &addr); - const Endpoint &server_addr (void) const; - const Endpoint &last_client_addr (void) const; + const Endpoint &server_addr () const; + const Endpoint &last_client_addr () const; - bool is_server (void) const; - size_t offset (void) const; + bool is_server () const; + size_t offset () const; void ssl (bool is_ssl); void add_transport (Transport *t); Transport *last_transport (void); diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp index 72fca9285b1..d7e1bc9fa5a 100644 --- a/TAO/utils/logWalker/Thread.cpp +++ b/TAO/utils/logWalker/Thread.cpp @@ -52,7 +52,7 @@ Thread::pop_new_connection (void) } PeerProcess * -Thread::peek_new_connection (void) const +Thread::peek_new_connection () const { PeerProcess *pp = 0; this->new_connection_.top (pp); @@ -66,7 +66,7 @@ Thread::pending_local_addr (const ACE_CString &addr) } const ACE_CString & -Thread::pending_local_addr (void) const +Thread::pending_local_addr () const { return this->pending_local_addr_; } @@ -116,19 +116,19 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum) } long -Thread::max_depth (void) const +Thread::max_depth () const { return static_cast<long> (this->max_depth_); } long -Thread::id (void) const +Thread::id () const { return this->id_; } const ACE_CString & -Thread::alias (void) const +Thread::alias () const { return this->alias_; } @@ -151,7 +151,7 @@ Thread::incoming_from (PeerProcess *pp) } PeerProcess * -Thread::incoming (void) const +Thread::incoming () const { return this->incoming_; } @@ -163,7 +163,7 @@ Thread::active_handle (long handle) } long -Thread::active_handle (void) const +Thread::active_handle () const { return this->active_handle_; } @@ -245,7 +245,7 @@ Thread::pop_invocation (void) } Invocation * -Thread::current_invocation (void) const +Thread::current_invocation () const { Invocation *inv = 0; if (this->current_invocation_.size() > 0) diff --git a/TAO/utils/logWalker/Thread.h b/TAO/utils/logWalker/Thread.h index 951a9a6d864..25b583e1883 100644 --- a/TAO/utils/logWalker/Thread.h +++ b/TAO/utils/logWalker/Thread.h @@ -21,20 +21,20 @@ public: Thread (long tid, const char *alias, size_t offset); void add_time (const ACE_CString &time); - long max_depth (void) const; - long client_encounters (void) const; - long server_encounters (void) const; - long id (void) const; - const ACE_CString &alias (void) const; + long max_depth () const; + long client_encounters () const; + long server_encounters () const; + long id () const; + const ACE_CString &alias () const; void split_filename (char *buff, size_t len) const; void incoming_from (PeerProcess *); void add_invocation (Invocation *); void push_invocation (Invocation *); void pop_invocation (void); - Invocation *current_invocation (void) const; + Invocation *current_invocation () const; - PeerProcess *incoming (void) const; + PeerProcess *incoming () const; void handle_request (void); void enter_wait (PeerProcess *); void exit_wait (PeerProcess *, size_t linenum); @@ -48,12 +48,12 @@ public: void push_new_connection (PeerProcess *pp); PeerProcess *pop_new_connection (void); - PeerProcess *peek_new_connection (void) const; + PeerProcess *peek_new_connection () const; void pending_local_addr (const ACE_CString &addr); - const ACE_CString& pending_local_addr (void) const; + const ACE_CString& pending_local_addr () const; void active_handle (long handle); - long active_handle (void) const; + long active_handle () const; void set_dup (Thread *other, bool set_other); void clear_dup (void); void swap_target (void); diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp index 3186f2d8db1..ff1e56eb987 100644 --- a/TAO/utils/nsgroup/nsgroup.cpp +++ b/TAO/utils/nsgroup/nsgroup.cpp @@ -95,11 +95,11 @@ public: /// Display command line interface usage int show_usage( void ); - const ACE_TCHAR * group_arg(void) const { return group_arg_; } - const ACE_TCHAR * policy_arg(void) const { return policy_arg_; } - const ACE_TCHAR * location_arg(void) const { return location_arg_; } - const ACE_TCHAR * ior_arg(void) const { return ior_arg_; } - const ACE_TCHAR * namepath_arg(void) const { return namepath_arg_; } + const ACE_TCHAR * group_arg() const { return group_arg_; } + const ACE_TCHAR * policy_arg() const { return policy_arg_; } + const ACE_TCHAR * location_arg() const { return location_arg_; } + const ACE_TCHAR * ior_arg() const { return ior_arg_; } + const ACE_TCHAR * namepath_arg() const { return namepath_arg_; } private: diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.h b/TAO/utils/wxNamingViewer/wxNamingTree.h index b048a03ebe2..72d8ece9bde 100644 --- a/TAO/utils/wxNamingViewer/wxNamingTree.h +++ b/TAO/utils/wxNamingViewer/wxNamingTree.h @@ -36,7 +36,7 @@ private: }; void clearChildren (void); void clearChildren (wxTreeItemId& item); - WxNamingObject* getTreeObject(void) const; + WxNamingObject* getTreeObject() const; WxNamingObject* getTreeObject(wxTreeItemId& item) const; void listBindingList( wxTreeItemId& item, |