diff options
| author | Knut Petter Svendsen <knut@altuma.no> | 2022-09-13 22:57:39 +0200 |
|---|---|---|
| committer | Knut Petter Svendsen <knut@altuma.no> | 2022-09-13 22:57:39 +0200 |
| commit | 3da59eac098c1ef9d2c98f2079185ff35c3b6105 (patch) | |
| tree | 379c29e09bf55597fe6740cd163478cd1204a181 /ACE/ace | |
| parent | fe03724176dcfd20e0f9a6e493198469242be6b6 (diff) | |
| download | ATCD-3da59eac098c1ef9d2c98f2079185ff35c3b6105.tar.gz | |
Remove obsolescent (void) in functions with no parameters
Diffstat (limited to 'ACE/ace')
285 files changed, 1424 insertions, 1424 deletions
diff --git a/ACE/ace/ATM_Stream.h b/ACE/ace/ATM_Stream.h index e140d97477f..6bf102b933e 100644 --- a/ACE/ace/ATM_Stream.h +++ b/ACE/ace/ATM_Stream.h @@ -59,7 +59,7 @@ public: ACE_HANDLE get_handle () const; /// Get the underlying stream. - ATM_Stream& get_stream (void); + ATM_Stream& get_stream (); /// Get the name of the connected host. char* get_peer_name () const; diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h index 2e5d8f75f1f..f9401839f62 100644 --- a/ACE/ace/Activation_Queue.h +++ b/ACE/ace/Activation_Queue.h @@ -77,7 +77,7 @@ public: ACE_Allocator *db_alloc = 0); /// Destructor. - virtual ~ACE_Activation_Queue (void); + virtual ~ACE_Activation_Queue (); // = Activate Queue operations. diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp index ddf9531f10a..a3e1c267686 100644 --- a/ACE/ace/Argv_Type_Converter.cpp +++ b/ACE/ace/Argv_Type_Converter.cpp @@ -78,7 +78,7 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter () #if defined (ACE_USES_WCHAR) void -ACE_Argv_Type_Converter::initialize (void) +ACE_Argv_Type_Converter::initialize () { if (this->original_type_) { @@ -100,7 +100,7 @@ ACE_Argv_Type_Converter::initialize (void) void -ACE_Argv_Type_Converter::align_char_with_wchar (void) +ACE_Argv_Type_Converter::align_char_with_wchar () { for (int wchar_argv_index = 0; wchar_argv_index < this->saved_argc_; ++wchar_argv_index) @@ -131,7 +131,7 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) } void -ACE_Argv_Type_Converter::align_wchar_with_char (void) +ACE_Argv_Type_Converter::align_wchar_with_char () { for (int char_argv_index = 0; char_argv_index < saved_argc_; ++char_argv_index) @@ -163,7 +163,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) } void -ACE_Argv_Type_Converter::cleanup (void) +ACE_Argv_Type_Converter::cleanup () { for (int i = this->saved_argc_; i < this->before_pass_argc_; ++i) { diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp index 80ec155ce91..eff953ef89a 100644 --- a/ACE/ace/Asynch_Acceptor.cpp +++ b/ACE/ace/Asynch_Acceptor.cpp @@ -23,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class HANDLER> -ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor (void) +ACE_Asynch_Acceptor<HANDLER>::ACE_Asynch_Acceptor () : addr_family_ (0), listen_handle_ (ACE_INVALID_HANDLE), pass_addresses_ (false), @@ -351,7 +351,7 @@ ACE_Asynch_Acceptor<HANDLER>::validate_connection } template <class HANDLER> int -ACE_Asynch_Acceptor<HANDLER>::cancel (void) +ACE_Asynch_Acceptor<HANDLER>::cancel () { ACE_TRACE ("ACE_Asynch_Acceptor<>::cancel"); @@ -430,13 +430,13 @@ ACE_Asynch_Acceptor<HANDLER>::handle (ACE_HANDLE h) } template <class HANDLER> ACE_Asynch_Accept & -ACE_Asynch_Acceptor<HANDLER>::asynch_accept (void) +ACE_Asynch_Acceptor<HANDLER>::asynch_accept () { return this->asynch_accept_; } template <class HANDLER> HANDLER * -ACE_Asynch_Acceptor<HANDLER>::make_handler (void) +ACE_Asynch_Acceptor<HANDLER>::make_handler () { // Default behavior HANDLER *handler = 0; @@ -495,7 +495,7 @@ ACE_Asynch_Acceptor<HANDLER>::bytes_to_read (size_t new_value) } template <class HANDLER> int -ACE_Asynch_Acceptor<HANDLER>::should_reissue_accept (void) +ACE_Asynch_Acceptor<HANDLER>::should_reissue_accept () { return this->reissue_accept_; } diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h index 172649e5000..7760ba53d5c 100644 --- a/ACE/ace/Asynch_Acceptor.h +++ b/ACE/ace/Asynch_Acceptor.h @@ -45,10 +45,10 @@ class ACE_Asynch_Acceptor : public ACE_Handler { public: /// A do nothing constructor. - ACE_Asynch_Acceptor (void); + ACE_Asynch_Acceptor (); /// Virtual destruction - virtual ~ACE_Asynch_Acceptor (void); + virtual ~ACE_Asynch_Acceptor (); /** * @c open starts one or more asynchronous accept requests on a @@ -138,7 +138,7 @@ public: * @note On Windows, only accept operations initiated by the calling thread * are canceled. */ - virtual int cancel (void); + virtual int cancel (); /** * Template method to validate peer before service is opened. @@ -175,7 +175,7 @@ public: * @c open() method's @a reissue_accept argument. That value can also * be changed using the @c reissue_accept() method. */ - virtual int should_reissue_accept (void); + virtual int should_reissue_accept (); // // These are low level tweaking methods @@ -224,14 +224,14 @@ protected: ACE_INET_Addr &local_address); /// Return the asynch accept object. - ACE_Asynch_Accept &asynch_accept (void); + ACE_Asynch_Accept &asynch_accept (); /** * This is the template method used to create new handler. * Subclasses must overwrite this method if a new handler creation * strategy is required. */ - virtual HANDLER *make_handler (void); + virtual HANDLER *make_handler (); /// Address family used to open this object. Obtained from @a address passed /// to @c open(). diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp index fbb86182517..480c24b9551 100644 --- a/ACE/ace/Asynch_Connector.cpp +++ b/ACE/ace/Asynch_Connector.cpp @@ -20,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class HANDLER> -ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector (void) +ACE_Asynch_Connector<HANDLER>::ACE_Asynch_Connector () : pass_addresses_ (false), validate_new_connection_ (false) { @@ -167,7 +167,7 @@ ACE_Asynch_Connector<HANDLER>::validate_connection } template <class HANDLER> int -ACE_Asynch_Connector<HANDLER>::cancel (void) +ACE_Asynch_Connector<HANDLER>::cancel () { return this->asynch_connect_.cancel (); } @@ -218,13 +218,13 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result & template <class HANDLER> ACE_Asynch_Connect & -ACE_Asynch_Connector<HANDLER>::asynch_connect (void) +ACE_Asynch_Connector<HANDLER>::asynch_connect () { return this->asynch_connect_; } template <class HANDLER> HANDLER * -ACE_Asynch_Connector<HANDLER>::make_handler (void) +ACE_Asynch_Connector<HANDLER>::make_handler () { // Default behavior HANDLER *handler = 0; diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h index f7162cdb04b..ad09d0a1879 100644 --- a/ACE/ace/Asynch_Connector.h +++ b/ACE/ace/Asynch_Connector.h @@ -45,7 +45,7 @@ class ACE_Asynch_Connector : public ACE_Handler { public: /// A do nothing constructor. - ACE_Asynch_Connector (void); + ACE_Asynch_Connector (); /// Virtual destruction virtual ~ACE_Asynch_Connector () = default; @@ -73,7 +73,7 @@ public: * * @note On POSIX, delegates cancelation to ACE_POSIX_Asynch_Connect. */ - virtual int cancel (void); + virtual int cancel (); /** @@ -132,14 +132,14 @@ protected: ACE_INET_Addr &local_address); /// Return the asynch Connect object. - ACE_Asynch_Connect & asynch_connect (void); + ACE_Asynch_Connect & asynch_connect (); /** * This is the template method used to create new handler. * Subclasses must overwrite this method if a new handler creation * strategy is required. */ - virtual HANDLER *make_handler (void); + virtual HANDLER *make_handler (); private: /// Asynch_Connect used to make life easier :-) diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 933ee627d10..3e25b110f31 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -166,7 +166,7 @@ public: /// Destructor. - virtual ~ACE_Asynch_Result (void); + virtual ~ACE_Asynch_Result (); protected: /// Constructor. This implementation will not be deleted. The @@ -244,7 +244,7 @@ public: * For requested operations that are successfully canceled, the * associated error status is set to ECANCELED. */ - int cancel (void); + int cancel (); // = Access methods. @@ -288,10 +288,10 @@ class ACE_Export ACE_Asynch_Read_Stream : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Read_Stream (void); + ACE_Asynch_Read_Stream (); /// Destructor - virtual ~ACE_Asynch_Read_Stream (void); + virtual ~ACE_Asynch_Read_Stream (); /** * Initializes the factory with information which will be used with @@ -400,7 +400,7 @@ public: Result (ACE_Asynch_Read_Stream_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Read_Stream_Result_Impl *implementation_; @@ -430,10 +430,10 @@ class ACE_Export ACE_Asynch_Write_Stream : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Write_Stream (void); + ACE_Asynch_Write_Stream (); /// Destructor. - virtual ~ACE_Asynch_Write_Stream (void); + virtual ~ACE_Asynch_Write_Stream (); /** * Initializes the factory with information which will be used with @@ -554,7 +554,7 @@ public: Result (ACE_Asynch_Write_Stream_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Write_Stream_Result_Impl *implementation_; @@ -587,10 +587,10 @@ class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream { public: /// A do nothing constructor. - ACE_Asynch_Read_File (void); + ACE_Asynch_Read_File (); /// Destructor. - virtual ~ACE_Asynch_Read_File (void); + virtual ~ACE_Asynch_Read_File (); /** * Initializes the factory with information which will be used with @@ -698,7 +698,7 @@ public: Result (ACE_Asynch_Read_File_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Read_File_Result_Impl *implementation_; @@ -736,10 +736,10 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream { public: /// A do nothing constructor. - ACE_Asynch_Write_File (void); + ACE_Asynch_Write_File (); /// Destructor. - virtual ~ACE_Asynch_Write_File (void); + virtual ~ACE_Asynch_Write_File (); /** * Initializes the factory with information which will be used with @@ -832,7 +832,7 @@ public: Result (ACE_Asynch_Write_File_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Write_File_Result_Impl *implementation_; @@ -868,10 +868,10 @@ class ACE_Export ACE_Asynch_Accept : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Accept (void); + ACE_Asynch_Accept (); /// Destructor. - virtual ~ACE_Asynch_Accept (void); + virtual ~ACE_Asynch_Accept (); /** * Initializes the factory with information which will be used with @@ -975,7 +975,7 @@ public: Result (ACE_Asynch_Accept_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Accept_Result_Impl *implementation_; @@ -1003,10 +1003,10 @@ class ACE_Export ACE_Asynch_Connect : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Connect (void); + ACE_Asynch_Connect (); /// Destructor. - virtual ~ACE_Asynch_Connect (void); + virtual ~ACE_Asynch_Connect (); /** * Initializes the factory with information which will be used with @@ -1069,7 +1069,7 @@ public: Result (ACE_Asynch_Connect_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Connect_Result_Impl *implementation_; @@ -1108,10 +1108,10 @@ public: class Header_And_Trailer; /// A do nothing constructor. - ACE_Asynch_Transmit_File (void); + ACE_Asynch_Transmit_File (); /// Destructor. - virtual ~ACE_Asynch_Transmit_File (void); + virtual ~ACE_Asynch_Transmit_File (); /** * Initializes the factory with information which will be used with @@ -1209,7 +1209,7 @@ public: Result (ACE_Asynch_Transmit_File_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Transmit_File_Result_Impl *implementation_; @@ -1234,7 +1234,7 @@ public: size_t trailer_bytes = 0); /// Destructor - virtual ~Header_And_Trailer (void); + virtual ~Header_And_Trailer (); /// This method allows all the member to be set in one fell swoop. void header_and_trailer (ACE_Message_Block *header = 0, @@ -1267,7 +1267,7 @@ public: void trailer_bytes (size_t bytes); /// Conversion routine. - ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers (void); + ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers (); protected: /// Header data. @@ -1313,10 +1313,10 @@ class ACE_Export ACE_Asynch_Read_Dgram : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Read_Dgram (void); + ACE_Asynch_Read_Dgram (); /// Destructor - virtual ~ACE_Asynch_Read_Dgram (void); + virtual ~ACE_Asynch_Read_Dgram (); /** * Initializes the factory with information which will be used with @@ -1415,7 +1415,7 @@ public: Result (ACE_Asynch_Read_Dgram_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// The implementation class. ACE_Asynch_Read_Dgram_Result_Impl *implementation_; @@ -1446,10 +1446,10 @@ class ACE_Export ACE_Asynch_Write_Dgram : public ACE_Asynch_Operation { public: /// A do nothing constructor. - ACE_Asynch_Write_Dgram (void); + ACE_Asynch_Write_Dgram (); /// Destructor. - virtual ~ACE_Asynch_Write_Dgram (void); + virtual ~ACE_Asynch_Write_Dgram (); /** * Initializes the factory with information which will be used with @@ -1545,7 +1545,7 @@ public: Result (ACE_Asynch_Write_Dgram_Result_Impl *implementation); /// Destructor. - virtual ~Result (void); + virtual ~Result (); /// Implementation class. ACE_Asynch_Write_Dgram_Result_Impl *implementation_; @@ -1567,13 +1567,13 @@ class ACE_Export ACE_Handler { public: /// A do nothing constructor. - ACE_Handler (void); + ACE_Handler (); /// A do nothing constructor which allows proactor to be set to \<p\>. ACE_Handler (ACE_Proactor *p); /// Virtual destruction. - virtual ~ACE_Handler (void); + virtual ~ACE_Handler (); /// This method will be called when an asynchronous read completes on /// a stream. @@ -1619,10 +1619,10 @@ public: * ACE_Proactor. A special {Wake_Up_Completion} is used to wake up * all the threads that are blocking for completions. */ - virtual void handle_wakeup (void); + virtual void handle_wakeup (); /// Get the proactor associated with this handler. - ACE_Proactor *proactor (void); + ACE_Proactor *proactor (); /// Set the proactor. void proactor (ACE_Proactor *p); @@ -1657,7 +1657,7 @@ public: }; typedef ACE_Refcounted_Auto_Ptr<Proxy, ACE_SYNCH_MUTEX> Proxy_Ptr; - Proxy_Ptr &proxy (void); + Proxy_Ptr &proxy (); protected: /// The proactor associated with this handler. @@ -1699,10 +1699,10 @@ class ACE_Export ACE_Service_Handler : public ACE_Handler public: /// A do nothing constructor. - ACE_Service_Handler (void); + ACE_Service_Handler (); /// Virtual destruction. - virtual ~ACE_Service_Handler (void); + virtual ~ACE_Service_Handler (); /** * {open} is called by ACE_Asynch_Acceptor to initialize a new diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h index 01880bc1dbc..b87c9930482 100644 --- a/ACE/ace/Asynch_IO_Impl.h +++ b/ACE/ace/Asynch_IO_Impl.h @@ -46,7 +46,7 @@ class ACE_Proactor_Impl; class ACE_Export ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Result_Impl (void); + virtual ~ACE_Asynch_Result_Impl (); /// Number of bytes transferred by the operation. virtual size_t bytes_transferred () const = 0; @@ -97,7 +97,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Result_Impl (void); + ACE_Asynch_Result_Impl (); }; /** @@ -110,7 +110,7 @@ protected: class ACE_Export ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Operation_Impl (void); + virtual ~ACE_Asynch_Operation_Impl (); /** * Initializes the factory with information which will be used with @@ -137,7 +137,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Operation_Impl (void); + ACE_Asynch_Operation_Impl (); }; /** @@ -150,7 +150,7 @@ protected: class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Read_Stream_Impl (void); + virtual ~ACE_Asynch_Read_Stream_Impl (); /// This starts off an asynchronous read. Upto @a bytes_to_read will /// be read and stored in the @a message_block. @@ -174,7 +174,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Read_Stream_Impl (void); + ACE_Asynch_Read_Stream_Impl (); }; /** @@ -187,7 +187,7 @@ protected: class ACE_Export ACE_Asynch_Read_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Read_Stream_Result_Impl (void); + virtual ~ACE_Asynch_Read_Stream_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous read. @@ -201,7 +201,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Read_Stream_Result_Impl (void); + ACE_Asynch_Read_Stream_Result_Impl (); }; /** @@ -214,7 +214,7 @@ protected: class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Write_Stream_Impl (void); + virtual ~ACE_Asynch_Write_Stream_Impl (); /// This starts off an asynchronous write. Upto @a bytes_to_write /// will be written from the @a message_block. @@ -238,7 +238,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Write_Stream_Impl (void); + ACE_Asynch_Write_Stream_Impl (); }; /** @@ -251,7 +251,7 @@ protected: class ACE_Export ACE_Asynch_Write_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Write_Stream_Result_Impl (void); + virtual ~ACE_Asynch_Write_Stream_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -265,7 +265,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Write_Stream_Result_Impl (void); + ACE_Asynch_Write_Stream_Result_Impl (); }; /** @@ -278,7 +278,7 @@ protected: class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stream_Impl { public: - virtual ~ACE_Asynch_Read_File_Impl (void); + virtual ~ACE_Asynch_Read_File_Impl (); /** * This starts off an asynchronous read. Upto @a bytes_to_read will @@ -331,7 +331,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Read_File_Impl (void); + ACE_Asynch_Read_File_Impl (); }; /** @@ -344,11 +344,11 @@ class ACE_Export ACE_Asynch_Read_File_Result_Impl : public virtual ACE_Asynch_Re { public: /// Destructor. - virtual ~ACE_Asynch_Read_File_Result_Impl (void); + virtual ~ACE_Asynch_Read_File_Result_Impl (); protected: /// Do-nothing constructor. - ACE_Asynch_Read_File_Result_Impl (void); + ACE_Asynch_Read_File_Result_Impl (); }; /** @@ -361,7 +361,7 @@ protected: class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_Stream_Impl { public: - virtual ~ACE_Asynch_Write_File_Impl (void); + virtual ~ACE_Asynch_Write_File_Impl (); /** * This starts off an asynchronous write. Upto @a bytes_to_write @@ -414,7 +414,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Write_File_Impl (void); + ACE_Asynch_Write_File_Impl (); }; /** @@ -427,11 +427,11 @@ protected: class ACE_Export ACE_Asynch_Write_File_Result_Impl : public virtual ACE_Asynch_Write_Stream_Result_Impl { public: - virtual ~ACE_Asynch_Write_File_Result_Impl (void); + virtual ~ACE_Asynch_Write_File_Result_Impl (); protected: /// Do-nothing constructor. - ACE_Asynch_Write_File_Result_Impl (void); + ACE_Asynch_Write_File_Result_Impl (); }; /** @@ -444,7 +444,7 @@ protected: class ACE_Export ACE_Asynch_Accept_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Accept_Impl (void); + virtual ~ACE_Asynch_Accept_Impl (); /** * This starts off an asynchronous accept. The asynchronous accept @@ -467,7 +467,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Accept_Impl (void); + ACE_Asynch_Accept_Impl (); }; /** @@ -480,7 +480,7 @@ protected: class ACE_Export ACE_Asynch_Accept_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Accept_Result_Impl (void); + virtual ~ACE_Asynch_Accept_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous accept. @@ -497,7 +497,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Accept_Result_Impl (void); + ACE_Asynch_Accept_Result_Impl (); }; @@ -511,7 +511,7 @@ protected: class ACE_Export ACE_Asynch_Connect_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Connect_Impl (void); + virtual ~ACE_Asynch_Connect_Impl (); /** * This starts off an asynchronous connect @@ -526,7 +526,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Connect_Impl (void); + ACE_Asynch_Connect_Impl (); }; /** @@ -539,14 +539,14 @@ protected: class ACE_Export ACE_Asynch_Connect_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Connect_Result_Impl (void); + virtual ~ACE_Asynch_Connect_Result_Impl (); /// I/O handle for the connection. virtual ACE_HANDLE connect_handle () const = 0; protected: /// Do-nothing constructor. - ACE_Asynch_Connect_Result_Impl (void); + ACE_Asynch_Connect_Result_Impl (); }; @@ -560,7 +560,7 @@ protected: class ACE_Asynch_Transmit_File_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Transmit_File_Impl (void); + virtual ~ACE_Asynch_Transmit_File_Impl (); /// This starts off an asynchronous transmit file. virtual int transmit_file (ACE_HANDLE file, @@ -576,7 +576,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Transmit_File_Impl (void); + ACE_Asynch_Transmit_File_Impl (); }; /** @@ -589,7 +589,7 @@ protected: class ACE_Export ACE_Asynch_Transmit_File_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Transmit_File_Result_Impl (void); + virtual ~ACE_Asynch_Transmit_File_Result_Impl (); /// Socket used for transmitting the file. virtual ACE_HANDLE socket () const = 0; @@ -613,7 +613,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Transmit_File_Result_Impl (void); + ACE_Asynch_Transmit_File_Result_Impl (); }; @@ -627,7 +627,7 @@ protected: class ACE_Export ACE_Asynch_Read_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Read_Dgram_Impl (void); + virtual ~ACE_Asynch_Read_Dgram_Impl (); /** This starts off an asynchronous read. Upto * <message_block->total_size()> will be read and stored in the @@ -665,7 +665,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Read_Dgram_Impl (void); + ACE_Asynch_Read_Dgram_Impl (); }; /** @@ -678,7 +678,7 @@ protected: class ACE_Export ACE_Asynch_Read_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Read_Dgram_Result_Impl (void); + virtual ~ACE_Asynch_Read_Dgram_Result_Impl (); /// Message block which contains the read data virtual ACE_Message_Block *message_block () const = 0; @@ -698,7 +698,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Read_Dgram_Result_Impl (void); + ACE_Asynch_Read_Dgram_Result_Impl (); }; /** @@ -711,7 +711,7 @@ protected: class ACE_Export ACE_Asynch_Write_Dgram_Impl : public virtual ACE_Asynch_Operation_Impl { public: - virtual ~ACE_Asynch_Write_Dgram_Impl (void); + virtual ~ACE_Asynch_Write_Dgram_Impl (); /** This starts off an asynchronous send. Upto * <message_block->total_length()> will be sent. @a message_block's @@ -749,7 +749,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Write_Dgram_Impl (void); + ACE_Asynch_Write_Dgram_Impl (); }; /** @@ -762,7 +762,7 @@ protected: class ACE_Export ACE_Asynch_Write_Dgram_Result_Impl : public virtual ACE_Asynch_Result_Impl { public: - virtual ~ACE_Asynch_Write_Dgram_Result_Impl (void); + virtual ~ACE_Asynch_Write_Dgram_Result_Impl (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -779,7 +779,7 @@ public: protected: /// Do-nothing constructor. - ACE_Asynch_Write_Dgram_Result_Impl (void); + ACE_Asynch_Write_Dgram_Result_Impl (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Asynch_Pseudo_Task.h b/ACE/ace/Asynch_Pseudo_Task.h index 0e311721a9d..8bf712e7687 100644 --- a/ACE/ace/Asynch_Pseudo_Task.h +++ b/ACE/ace/Asynch_Pseudo_Task.h @@ -34,8 +34,8 @@ public: ACE_Asynch_Pseudo_Task(); virtual ~ACE_Asynch_Pseudo_Task(); - int start (void); - int stop (void); + int start (); + int stop (); int register_io_handler (ACE_HANDLE handle, ACE_Event_Handler *handler, diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp index 6edc7020aae..4b16b311743 100644 --- a/ACE/ace/Atomic_Op.cpp +++ b/ACE/ace/Atomic_Op.cpp @@ -238,7 +238,7 @@ long (*ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange_fn_) (volatile long *, lo long (*ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange_add_fn_) (volatile long *, long) = multi_cpu_exchange_add; void -ACE_Atomic_Op<ACE_Thread_Mutex, long>::init_functions (void) +ACE_Atomic_Op<ACE_Thread_Mutex, long>::init_functions () { if (ACE_OS::num_processors () == 1) { @@ -271,7 +271,7 @@ long (*ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange_fn_) (volatile l long (*ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange_add_fn_) (volatile long *, long) = multi_cpu_exchange_add; void -ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::init_functions (void) +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::init_functions () { if (ACE_OS::num_processors () == 1) { diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h index 146cb7c8acd..3534c1bef0c 100644 --- a/ACE/ace/Atomic_Op.h +++ b/ACE/ace/Atomic_Op.h @@ -72,7 +72,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long> { public: /// Initialize @c value_ to 0. - ACE_Atomic_Op (void); + ACE_Atomic_Op (); /// Initialize @c value_ to c. ACE_Atomic_Op (long c); @@ -81,7 +81,7 @@ public: ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &c); /// Atomically pre-increment @c value_. - long operator++ (void); + long operator++ (); /// Atomically post-increment @c value_. long operator++ (int); @@ -90,7 +90,7 @@ public: long operator+= (long rhs); /// Atomically pre-decrement @c value_. - long operator-- (void); + long operator-- (); /// Atomically post-decrement @c value_. long operator-- (int); @@ -132,20 +132,20 @@ public: void dump () const; /// Explicitly return @c value_ (by reference). - volatile long &value_i (void); + volatile long &value_i (); // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. /// Used during ACE object manager initialization to optimize the fast /// atomic op implementation according to the number of CPUs. - static void init_functions (void); + static void init_functions (); private: /// This function cannot be supported by this template specialization. /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex /// template instead. - ACE_Thread_Mutex &mutex (void); + ACE_Thread_Mutex &mutex (); private: /// Current object decorated by the atomic op. @@ -170,7 +170,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> { public: /// Initialize @c value_ to 0. - ACE_Atomic_Op (void); + ACE_Atomic_Op (); /// Initialize @c value_ to c. ACE_Atomic_Op (unsigned long c); @@ -179,7 +179,7 @@ public: ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c); /// Atomically pre-increment @c value_. - unsigned long operator++ (void); + unsigned long operator++ (); /// Atomically post-increment @c value_. unsigned long operator++ (int); @@ -188,7 +188,7 @@ public: unsigned long operator+= (unsigned long rhs); /// Atomically pre-decrement @c value_. - unsigned long operator-- (void); + unsigned long operator-- (); /// Atomically post-decrement @c value_. unsigned long operator-- (int); @@ -230,20 +230,20 @@ public: void dump () const; /// Explicitly return @c value_ (by reference). - volatile unsigned long &value_i (void); + volatile unsigned long &value_i (); // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. /// Used during ACE object manager initialization to optimize the fast /// atomic op implementation according to the number of CPUs. - static void init_functions (void); + static void init_functions (); private: /// This function cannot be supported by this template specialization. /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex /// template instead. - ACE_Thread_Mutex &mutex (void); + ACE_Thread_Mutex &mutex (); private: /// Current object decorated by the atomic op. diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index 78916c408c8..dde2b427a93 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -42,7 +42,7 @@ public: ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter); /// Implicitly decrement the counter. - ~ACE_Auto_IncDec (void); + ~ACE_Auto_IncDec (); /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h index 5d9fc10ef2d..8a65e572655 100644 --- a/ACE/ace/Base_Thread_Adapter.h +++ b/ACE/ace/Base_Thread_Adapter.h @@ -99,7 +99,7 @@ public: #ifdef ACE_USES_GPROF /// Accessor to the itimer_ /// followed http://sam.zoy.org/writings/programming/gprof.html - struct itimerval* timerval (void); + struct itimerval* timerval (); #endif // ACE_USES_PROF /// Invoke the close_log_msg_hook, if it is present diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h index ba0fa32fcf0..1b88fed51bf 100644 --- a/ACE/ace/Based_Pointer_Repository.h +++ b/ACE/ace/Based_Pointer_Repository.h @@ -41,8 +41,8 @@ class ACE_Export ACE_Based_Pointer_Repository public: // = Use ACE_Null_Mutex to allow locking while iterating. - ACE_Based_Pointer_Repository (void); - ~ACE_Based_Pointer_Repository (void); + ACE_Based_Pointer_Repository (); + ~ACE_Based_Pointer_Repository (); // = Search structure methods. /** diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h index 8ad197b03ac..d29a1a3975d 100644 --- a/ACE/ace/CDR_Size.h +++ b/ACE/ace/CDR_Size.h @@ -48,7 +48,7 @@ public: bool good_bit () const; /// Reset current size. - void reset (void); + void reset (); /// Return current size. size_t total_length () const; diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 1ac9dee887c..f30f3aa1fb5 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1053,7 +1053,7 @@ ACE_OutputCDR::register_monitor (const char *id) } void -ACE_OutputCDR::unregister_monitor (void) +ACE_OutputCDR::unregister_monitor () { this->monitor_->remove_from_registry (); } @@ -2337,7 +2337,7 @@ ACE_InputCDR::register_monitor (const char *id) } void -ACE_InputCDR::unregister_monitor (void) +ACE_InputCDR::unregister_monitor () { this->monitor_->remove_from_registry (); } diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h index 6cb27ede244..c1cd9973303 100644 --- a/ACE/ace/CDR_Stream.h +++ b/ACE/ace/CDR_Stream.h @@ -536,7 +536,7 @@ public: #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) /// Register and unregister our buffer size monitor. void register_monitor (const char* id); - void unregister_monitor (void); + void unregister_monitor (); #endif /* ACE_HAS_MONITOR_POINTS==1 */ private: @@ -1086,7 +1086,7 @@ public: #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) /// Register and unregister our buffer size monitor. void register_monitor (const char* id); - void unregister_monitor (void); + void unregister_monitor (); #endif /* ACE_HAS_MONITOR_POINTS==1 */ protected: diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h index f2497487d42..032f03924b6 100644 --- a/ACE/ace/CE_Screen_Output.h +++ b/ACE/ace/CE_Screen_Output.h @@ -48,7 +48,7 @@ class ACE_Export ACE_CE_Screen_Output : public ACE_Log_Msg_Callback public: ACE_CE_Screen_Output (HWND hEdit); - ACE_CE_Screen_Output (void); + ACE_CE_Screen_Output (); virtual ~ACE_CE_Screen_Output(); @@ -58,7 +58,7 @@ public: /// Interface to specify active window handle. void SetOutputWindow (HWND hWnd); - void clear (void); + void clear (); /// Stream insertion operator that performs actual print out. /** diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index 40933e8928e..229b982ac96 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -33,7 +33,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> -ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Manager (void) +ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Manager () { this->close (); } @@ -47,7 +47,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> int -ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::close (void) +ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>::close () { return this->map_.close (); } diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index 74de2ec6bb3..10490c2167e 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -98,14 +98,14 @@ public: /// Close down a <Cache_Map_Manager> and release dynamically allocated /// resources. - virtual ~ACE_Cache_Map_Manager (void); + virtual ~ACE_Cache_Map_Manager (); /// Initialize a cache with size @a length. int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = nullptr); /// Close down a cache and release dynamically allocated resources. - int close (void); + int close (); /** * Associate @a key with @a value. If @a key is already in the CMAP_TYPE @@ -187,7 +187,7 @@ public: VALUE &value); /// Remove entries from the cache depending upon the strategy. - int purge (void); + int purge (); /// Return the current size of the cache. size_t current_size () const; @@ -201,18 +201,18 @@ public: // = STL styled iterator factory functions. /// Return forward iterator. - ITERATOR begin (void); - ITERATOR end (void); + ITERATOR begin (); + ITERATOR end (); /// Return reverse iterator. - REVERSE_ITERATOR rbegin (void); - REVERSE_ITERATOR rend (void); + REVERSE_ITERATOR rbegin (); + REVERSE_ITERATOR rend (); /// The map managed by the Cache_Map_Manager. - CMAP_TYPE &map (void); + CMAP_TYPE &map (); /// The caching strategy used on the cache. - CACHING_STRATEGY &caching_strategy (void); + CACHING_STRATEGY &caching_strategy (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -278,20 +278,20 @@ public: // = STL styled iteration, compare, and reference functions. /// Prefix advance - ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void); + ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (); /// Postfix advance. ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int); /// Prefix reverse. - ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void); + ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (); /// Postfix reverse. ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int); /// Returns the iterator of the internal map in the custody of the /// Cache_Map_Manager. - IMPLEMENTATION &iterator_implementation (void); + IMPLEMENTATION &iterator_implementation (); /// Dump the state of an object. void dump () const; @@ -351,20 +351,20 @@ public: // = STL styled iteration, compare, and reference functions. /// Prefix advance - ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void); + ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (); /// Postfix advance. ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int); /// Prefix reverse. - ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void); + ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (); /// Postfix reverse. ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int); /// Returns the iterator of the internal map in the custody of the /// Cache_Map_Manager. - REVERSE_IMPLEMENTATION &iterator_implementation (void); + REVERSE_IMPLEMENTATION &iterator_implementation (); /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp index 2fa0f6bfa83..ee11f25d8ae 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.cpp +++ b/ACE/ace/Cached_Connect_Strategy_T.cpp @@ -36,7 +36,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> -ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void) +ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::~ACE_Cached_Connect_Strategy_Ex () { cleanup (); } @@ -457,13 +457,13 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> int -ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections (void) +ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::purge_connections () { return this->connection_cache_.purge (); } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> CACHING_STRATEGY & -ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy (void) +ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::caching_strategy () { return this->connection_cache_.caching_strategy (); } @@ -522,7 +522,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX> void -ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup (void) +ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>::cleanup () { // Excluded other threads from changing the cache while we cleanup ACE_GUARD (MUTEX, ace_mon, *this->lock_); diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h index ef2a0a8c33d..dd7ac7d3da2 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.h +++ b/ACE/ace/Cached_Connect_Strategy_T.h @@ -57,10 +57,10 @@ public: int delete_lock = 0); /// Destructor - virtual ~ACE_Cached_Connect_Strategy_Ex (void); + virtual ~ACE_Cached_Connect_Strategy_Ex (); /// Explicit purging of connection entries from the connection cache. - virtual int purge_connections (void); + virtual int purge_connections (); /// Mark as closed (non-locking version). This is used during the cleanup of the /// connections purged. @@ -71,7 +71,7 @@ public: * method had to be devised to avoid memory leaks and perform * cleanup of the <connection_cache_>. */ - void cleanup (void); + void cleanup (); // = Typedefs for managing the map typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> @@ -100,7 +100,7 @@ public: CCSBASE; // = Accessor. - CACHING_STRATEGY &caching_strategy (void); + CACHING_STRATEGY &caching_strategy (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Caching_Strategies_T.cpp b/ACE/ace/Caching_Strategies_T.cpp index 0cc25407a26..27d1827c575 100644 --- a/ACE/ace/Caching_Strategies_T.cpp +++ b/ACE/ace/Caching_Strategies_T.cpp @@ -15,14 +15,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class ATTRIBUTES, class CACHING_UTILITY> -ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::~ACE_Caching_Strategy (void) +ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::~ACE_Caching_Strategy () { } ////////////////////////////////////////////////////////////////////////////////// template<class ATTRIBUTES, class CACHING_UTILITY> -ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy (void) +ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy () : timer_ (0), purge_percent_ (10) { @@ -31,7 +31,7 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LRU_Caching_Strategy //////////////////////////////////////////////////////////////////////////////////////////////// template<class ATTRIBUTES, class CACHING_UTILITY> -ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy (void) +ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy () : purge_percent_ (10) { } @@ -39,7 +39,7 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_LFU_Caching_Strategy //////////////////////////////////////////////////////////////////////////////////////////////// template<class ATTRIBUTES, class CACHING_UTILITY> -ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_FIFO_Caching_Strategy (void) +ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::ACE_FIFO_Caching_Strategy () : order_ (0), purge_percent_ (10) { diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h index c46e30dd957..4441c1ae104 100644 --- a/ACE/ace/Caching_Strategies_T.h +++ b/ACE/ace/Caching_Strategies_T.h @@ -43,7 +43,7 @@ class ACE_Caching_Strategy { public: /// Destructor. - virtual ~ACE_Caching_Strategy (void); + virtual ~ACE_Caching_Strategy (); /// Accessor method for the timer attributes. virtual ATTRIBUTES attributes (void) = 0; @@ -113,13 +113,13 @@ public: bool delete_implementation = false); /// Destructor. - ~ACE_Caching_Strategy_Adapter (void); + ~ACE_Caching_Strategy_Adapter (); /// Accessor method for the timer attributes. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -152,10 +152,10 @@ public: const ATTRIBUTES &attr); /// Accessor to the implementation. - IMPLEMENTATION &implementation (void); + IMPLEMENTATION &implementation (); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -209,15 +209,15 @@ public: * in the cache which can be purged automagically and by default is * set to 10%. */ - ACE_LRU_Caching_Strategy (void); + ACE_LRU_Caching_Strategy (); // = Operations of the strategy. /// Accessor method for the timer attributes. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -251,7 +251,7 @@ public: const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -310,15 +310,15 @@ public: * in the cache which can be purged automagically and by default is * set to 10%. */ - ACE_LFU_Caching_Strategy (void); + ACE_LFU_Caching_Strategy (); // = Strategy methods. /// Access the attributes. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -350,7 +350,7 @@ public: const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -402,15 +402,15 @@ public: * in the cache which can be purged automagically and by default is * set to 10%. */ - ACE_FIFO_Caching_Strategy (void); + ACE_FIFO_Caching_Strategy (); // = Strategy methods. /// Accessor method. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -441,7 +441,7 @@ public: const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; @@ -484,10 +484,10 @@ public: // = Strategy methods. All are NO_OP methods!!! /// Accessor method. - ATTRIBUTES attributes (void); + ATTRIBUTES attributes (); /// Get the percentage of entries to purge. - double purge_percent (void); + double purge_percent (); /// Set the percentage of entries to purge. void purge_percent (double percentage); @@ -518,7 +518,7 @@ public: const ATTRIBUTES &attr); /// Purge the cache. - CACHING_UTILITY &caching_utility (void); + CACHING_UTILITY &caching_utility (); /// Dumps the state of the object. void dump () const; diff --git a/ACE/ace/Caching_Utility_T.cpp b/ACE/ace/Caching_Utility_T.cpp index e9260b64872..2f0ea2c295a 100644 --- a/ACE/ace/Caching_Utility_T.cpp +++ b/ACE/ace/Caching_Utility_T.cpp @@ -31,7 +31,7 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Pair_ } template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Pair_Caching_Utility (void) +ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Pair_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -129,7 +129,7 @@ ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUT } template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Recyclable_Handler_Caching_Utility (void) +ACE_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Recyclable_Handler_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -249,7 +249,7 @@ ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATO } template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void) +ACE_Refcounted_Recyclable_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Refcounted_Recyclable_Handler_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -373,7 +373,7 @@ ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Ha } template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Handler_Caching_Utility (void) +ACE_Handler_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Handler_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; @@ -466,7 +466,7 @@ ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::ACE_Null_ } template <class KEY, class VALUE, class CONTAINER, class ITERATOR, class ATTRIBUTES> -ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Null_Caching_Utility (void) +ACE_Null_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::~ACE_Null_Caching_Utility () { if (this->delete_cleanup_strategy_) delete this->cleanup_strategy_; diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h index a86b87d7318..a8d4755541b 100644 --- a/ACE/ace/Caching_Utility_T.h +++ b/ACE/ace/Caching_Utility_T.h @@ -50,7 +50,7 @@ public: bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Pair_Caching_Utility (void); + ~ACE_Pair_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do the @@ -98,7 +98,7 @@ public: bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Recyclable_Handler_Caching_Utility (void); + ~ACE_Recyclable_Handler_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do @@ -148,7 +148,7 @@ public: bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (void); + ~ACE_Refcounted_Recyclable_Handler_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do @@ -204,7 +204,7 @@ public: bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Handler_Caching_Utility (void); + ~ACE_Handler_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do @@ -257,7 +257,7 @@ public: bool delete_cleanup_strategy = false); /// Destructor. - ~ACE_Null_Caching_Utility (void); + ~ACE_Null_Caching_Utility (); /** * Purge entries from the @a container. The Cleanup_Strategy will do diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h index 96abff06465..a5364e4ac7b 100644 --- a/ACE/ace/Capabilities.h +++ b/ACE/ace/Capabilities.h @@ -135,10 +135,10 @@ public: typedef ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_CapEntry *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> CAPABILITIES_MAP; /// The Constructor - ACE_Capabilities (void); + ACE_Capabilities (); /// The Destructor - ~ACE_Capabilities(void); + ~ACE_Capabilities(); public: /// Get a string entry. @@ -172,7 +172,7 @@ protected: int is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line); /// Reset the set of capabilities - void resetcaps (void); + void resetcaps (); private: /// This is the set of ACE_CapEntry. diff --git a/ACE/ace/Cleanup_Strategies_T.cpp b/ACE/ace/Cleanup_Strategies_T.cpp index ecf960124fa..004b9c0c0a7 100644 --- a/ACE/ace/Cleanup_Strategies_T.cpp +++ b/ACE/ace/Cleanup_Strategies_T.cpp @@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL //////////////////////////////////////////////////////////////////////////// template <class KEY, class VALUE, class CONTAINER> -ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void) +ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy () { } diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h index c90dd5c5a5b..65a67cb3143 100644 --- a/ACE/ace/Cleanup_Strategies_T.h +++ b/ACE/ace/Cleanup_Strategies_T.h @@ -37,7 +37,7 @@ class ACE_Cleanup_Strategy { public: /// Destructor. - virtual ~ACE_Cleanup_Strategy (void); + virtual ~ACE_Cleanup_Strategy (); /// The method which will do the cleanup of the entry in the container. virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value); diff --git a/ACE/ace/Codecs.h b/ACE/ace/Codecs.h index 48a3a48eabd..c311393ac18 100644 --- a/ACE/ace/Codecs.h +++ b/ACE/ace/Codecs.h @@ -87,7 +87,7 @@ private: ACE_Base64 & operator= (ACE_Base64 const &) = delete; /// Initialize the tables for encoding/decoding. - static void init (void); + static void init (); private: /// Alphabet used for decoding i.e decoder_[alphabet_[i = 0..63]] = i diff --git a/ACE/ace/Codeset_IBM1047.cpp b/ACE/ace/Codeset_IBM1047.cpp index 014a833ec1f..04938ad7443 100644 --- a/ACE/ace/Codeset_IBM1047.cpp +++ b/ACE/ace/Codeset_IBM1047.cpp @@ -63,11 +63,11 @@ namespace ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_IBM1047_ISO8859::ACE_IBM1047_ISO8859 (void) +ACE_IBM1047_ISO8859::ACE_IBM1047_ISO8859 () { } -ACE_IBM1047_ISO8859::~ACE_IBM1047_ISO8859 (void) +ACE_IBM1047_ISO8859::~ACE_IBM1047_ISO8859 () { } @@ -212,11 +212,11 @@ ACE_IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out, // **************************************************************** -ACE_ISO8859_IBM1047::ACE_ISO8859_IBM1047 (void) +ACE_ISO8859_IBM1047::ACE_ISO8859_IBM1047 () { } -ACE_ISO8859_IBM1047::~ACE_ISO8859_IBM1047 (void) +ACE_ISO8859_IBM1047::~ACE_ISO8859_IBM1047 () { } diff --git a/ACE/ace/Codeset_IBM1047.h b/ACE/ace/Codeset_IBM1047.h index d9d84aa4019..d4014982d7f 100644 --- a/ACE/ace/Codeset_IBM1047.h +++ b/ACE/ace/Codeset_IBM1047.h @@ -43,10 +43,10 @@ class ACE_Export ACE_IBM1047_ISO8859 : public ACE_Char_Codeset_Translator { public: /// A do nothing constructor. - ACE_IBM1047_ISO8859 (void); + ACE_IBM1047_ISO8859 (); /// Virtual destruction - virtual ~ACE_IBM1047_ISO8859 (void); + virtual ~ACE_IBM1047_ISO8859 (); // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, @@ -88,10 +88,10 @@ class ACE_Export ACE_ISO8859_IBM1047 : public ACE_Char_Codeset_Translator { public: /// A do nothing constructor. - ACE_ISO8859_IBM1047 (void); + ACE_ISO8859_IBM1047 (); /// Virtual destruction - virtual ~ACE_ISO8859_IBM1047 (void); + virtual ~ACE_ISO8859_IBM1047 (); // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 65a5424aecd..7f2a954a814 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -417,7 +417,7 @@ ACE_Section_Key_Win32::ACE_Section_Key_Win32 (HKEY hKey) { } -ACE_Section_Key_Win32::~ACE_Section_Key_Win32 (void) +ACE_Section_Key_Win32::~ACE_Section_Key_Win32 () { ::RegCloseKey (hKey_); } @@ -449,7 +449,7 @@ ACE_Configuration_Win32Registry::ACE_Configuration_Win32Registry (HKEY hKey, u_l } -ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry (void) +ACE_Configuration_Win32Registry::~ACE_Configuration_Win32Registry () { } diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h index c192f0090a9..b9cb18204d9 100644 --- a/ACE/ace/Configuration.h +++ b/ACE/ace/Configuration.h @@ -108,7 +108,7 @@ public: ACE_Configuration_Section_Key (const ACE_Configuration_Section_Key &rhs); /// Destructor, decrements reference count on the referenced key. - ~ACE_Configuration_Section_Key (void); + ~ACE_Configuration_Section_Key (); /// Assignment operator, increments reference count for this object /// and decrements it on @a rhs. @@ -528,7 +528,7 @@ protected: int load_key (const ACE_Configuration_Section_Key& key, HKEY& hKey); // Not used - ACE_Configuration_Win32Registry (void); + ACE_Configuration_Win32Registry (); ACE_Configuration_Win32Registry (const ACE_Configuration_Win32Registry& rhs); ACE_Configuration_Win32Registry& operator= (const ACE_Configuration_Win32Registry& rhs); @@ -612,7 +612,7 @@ class ACE_Export ACE_Configuration_Value_IntId { public: /// Default constructor - ACE_Configuration_Value_IntId (void); + ACE_Configuration_Value_IntId (); /// String constructor, takes ownership of string explicit ACE_Configuration_Value_IntId (ACE_TCHAR* string); @@ -627,7 +627,7 @@ public: ACE_Configuration_Value_IntId (const ACE_Configuration_Value_IntId& rhs); /// Destructor - ~ACE_Configuration_Value_IntId (void); + ~ACE_Configuration_Value_IntId (); /// Assignment operator ACE_Configuration_Value_IntId& operator= ( @@ -673,7 +673,7 @@ class ACE_Export ACE_Configuration_Section_IntId { public: /// Default ctor - ACE_Configuration_Section_IntId (void); + ACE_Configuration_Section_IntId (); /// Named ctor ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map, @@ -683,7 +683,7 @@ public: ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs); /// Destructor - ~ACE_Configuration_Section_IntId (void); + ~ACE_Configuration_Section_IntId (); /// Assignment operator ACE_Configuration_Section_IntId& operator= ( @@ -739,7 +739,7 @@ public: protected: /// Destructor - will delete the iterators - virtual ~ACE_Configuration_Section_Key_Heap (void); + virtual ~ACE_Configuration_Section_Key_Heap (); // Not used ACE_Configuration_Section_Key_Heap (const ACE_Configuration_Section_Key_Heap& rhs); diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 0e64c23d5d7..4e7f83b3687 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -44,21 +44,21 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler (A } template <typename SVC_HANDLER> -ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::~ACE_NonBlocking_Connect_Handler (void) +ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::~ACE_NonBlocking_Connect_Handler () { if (this->cleanup_svc_handler_) this->cleanup_svc_handler_->remove_reference (); } template <typename SVC_HANDLER> SVC_HANDLER * -ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler (void) +ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler () { ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler"); return this->svc_handler_; } template <typename SVC_HANDLER> long -ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (void) +ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id () { ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id"); return this->timer_id_; @@ -213,7 +213,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception (ACE_HANDLE h) } template <typename SVC_HANDLER> int -ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler (void) +ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler () { return ACE_Event_Handler::ACE_EVENT_HANDLER_NOT_RESUMED; } @@ -612,7 +612,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::nonblocking_connect } template <typename SVC_HANDLER, typename PEER_CONNECTOR> -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector (void) +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector () { ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector"); @@ -669,13 +669,13 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor () const } template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Unbounded_Set<ACE_HANDLE> & -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::non_blocking_handles (void) +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::non_blocking_handles () { return this->non_blocking_handles_; } template <typename SVC_HANDLER, typename PEER_CONNECTOR> int -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void) +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close () { // If there are no non-blocking handle pending, return immediately. if (this->non_blocking_handles ().size () == 0) @@ -734,7 +734,7 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void) } template <typename SVC_HANDLER, typename PEER_CONNECTOR> int -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini (void) +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini () { ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini"); @@ -751,14 +751,14 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::init (int, ACE_TCHAR *[]) } template <typename SVC_HANDLER, typename PEER_CONNECTOR> int -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend (void) +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend () { ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend"); return -1; } template <typename SVC_HANDLER, typename PEER_CONNECTOR> int -ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume (void) +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume () { ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume"); return -1; @@ -896,7 +896,7 @@ ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Strategy_Connector } template <typename SVC_HANDLER, typename PEER_CONNECTOR> -ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector (void) +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector () { ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector"); @@ -905,7 +905,7 @@ ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector (vo } template <typename SVC_HANDLER, typename PEER_CONNECTOR> int -ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void) +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::close () { if (this->delete_creation_strategy_) delete this->creation_strategy_; diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index d611f9d6b99..11617eeb870 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -348,7 +348,7 @@ protected: /// Return the handle set representing the non-blocking connects in /// progress. - ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles (void); + ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles (); // = Dynamic linking hooks. /// Default version does no work and returns -1. Must be overloaded @@ -463,10 +463,10 @@ public: int flags = 0); /// Shutdown a connector and release resources. - virtual ~ACE_Strategy_Connector (void); + virtual ~ACE_Strategy_Connector (); /// Close down the Connector - virtual int close (void); + virtual int close (); // = Strategies accessors virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy () const; diff --git a/ACE/ace/DEV.h b/ACE/ace/DEV.h index c7940ff8dc5..16f9423796d 100644 --- a/ACE/ace/DEV.h +++ b/ACE/ace/DEV.h @@ -33,7 +33,7 @@ class ACE_Export ACE_DEV : public ACE_IO_SAP { public: /// Close down the DEVICE - int close (void); + int close (); /// Dump the state of an object. void dump () const; @@ -50,7 +50,7 @@ public: protected: /// Ensure that this class is an abstract base class - ACE_DEV (void); + ACE_DEV (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/DEV_Addr.h b/ACE/ace/DEV_Addr.h index 2609a3febc0..8a22565a570 100644 --- a/ACE/ace/DEV_Addr.h +++ b/ACE/ace/DEV_Addr.h @@ -32,7 +32,7 @@ class ACE_Export ACE_DEV_Addr : public ACE_Addr { public: /// Default constructor. - ACE_DEV_Addr (void); + ACE_DEV_Addr (); /// Copy constructor. ACE_DEV_Addr (const ACE_DEV_Addr &sa); diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h index 6363cba6e15..123fb54dca7 100644 --- a/ACE/ace/DEV_Connector.h +++ b/ACE/ace/DEV_Connector.h @@ -31,7 +31,7 @@ class ACE_Export ACE_DEV_Connector { public: /// Default constructor. - ACE_DEV_Connector (void); + ACE_DEV_Connector (); /** * Actively connect and produce a @a new_io if things go well. diff --git a/ACE/ace/DEV_IO.h b/ACE/ace/DEV_IO.h index 8188daf4ea4..06cbb39479f 100644 --- a/ACE/ace/DEV_IO.h +++ b/ACE/ace/DEV_IO.h @@ -41,7 +41,7 @@ public: friend class ACE_DEV_Connector; /// Default constructor. - ACE_DEV_IO (void); + ACE_DEV_IO (); // = Various send operations. /// send upto @a n bytes in @a buf. diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h index 9c320d20553..6adcc2ceaa8 100644 --- a/ACE/ace/DLL_Manager.h +++ b/ACE/ace/DLL_Manager.h @@ -271,13 +271,13 @@ protected: ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE); /// Destructor. - ~ACE_DLL_Manager (void); + ~ACE_DLL_Manager (); /// Allocate handle_vector_. int open (int size); /// Close all open dlls and deallocate memory. - int close (void); + int close (); /// Find dll in handle_vector_. ACE_DLL_Handle *find_dll (const ACE_TCHAR *dll_name) const; @@ -287,7 +287,7 @@ protected: private: /// Close the singleton instance. - static void close_singleton (void); + static void close_singleton (); ACE_DLL_Manager (const ACE_DLL_Manager &) = delete; void operator= (const ACE_DLL_Manager &) = delete; diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index 05efadb696a..6b0d99b5e94 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -67,7 +67,7 @@ class ACE_Dev_Poll_Reactor_Notify : public ACE_Reactor_Notify { public: /// Constructor - ACE_Dev_Poll_Reactor_Notify (void); + ACE_Dev_Poll_Reactor_Notify (); /** * @name Initialization and Termination Methods @@ -78,7 +78,7 @@ public: virtual int open (ACE_Reactor_Impl *, ACE_Timer_Queue *timer_queue = 0, int disable_notify = 0); - virtual int close (void); + virtual int close (); /** * Called by a thread when it wants to unblock the Reactor_Impl. @@ -107,7 +107,7 @@ public: /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock /// the Reactor_Impl. - virtual ACE_HANDLE notify_handle (void); + virtual ACE_HANDLE notify_handle (); /// Verify whether the buffer has dispatchable info or not. virtual int is_dispatchable (ACE_Notification_Buffer &buffer); @@ -142,7 +142,7 @@ public: * passed in via the notify queue before breaking out of its event * loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -314,7 +314,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl { public: /// Constructor. - Handler_Repository (void); + Handler_Repository (); /// Initialize a repository that can map handles up to the value @a size. /// Since the event tuples are accessed directly using the handle as @@ -322,7 +322,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl int open (size_t size); /// Close down the repository. - int close (void); + int close (); /** * @name Repository Manipulation Operations @@ -346,7 +346,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl int unbind (ACE_HANDLE handle, bool decr_refcnt = true); /// Remove all the registered tuples. - int unbind_all (void); + int unbind_all (); //@} @@ -431,7 +431,7 @@ public: int s_queue = ACE_DEV_POLL_TOKEN::FIFO); /// Close down and release all resources. - virtual ~ACE_Dev_Poll_Reactor (void); + virtual ~ACE_Dev_Poll_Reactor (); /// Initialization. virtual int open (size_t size, @@ -461,7 +461,7 @@ public: virtual ACE_Timer_Queue *timer_queue () const; /// Close down and release all resources. - virtual int close (void); + virtual int close (); // = Event loop drivers. /** @@ -522,7 +522,7 @@ public: * non-zero, @c handle_events() and * @c handle_alertable_events() return -1 immediately. */ - virtual int deactivated (void); + virtual int deactivated (); /** * Control whether the Reactor will handle any more incoming events @@ -632,7 +632,7 @@ public: virtual int suspend_handler (const ACE_Handle_Set &handles); /// Suspend all handles temporarily. - virtual int suspend_handlers (void); + virtual int suspend_handlers (); /// Resume event_handler. Use ACE_Event_Handler::get_handle() to /// get the handle. @@ -645,16 +645,16 @@ public: virtual int resume_handler (const ACE_Handle_Set &handles); /// Resume all handles. - virtual int resume_handlers (void); + virtual int resume_handlers (); /// Does the reactor allow the application to resume the handle on /// its own, i.e., can it pass on the control of handle resumption to /// the application. - virtual int resumable_handler (void); + virtual int resumable_handler (); /// Return true if we any event associations were made by the reactor /// for the handles that it waits on, false otherwise. - virtual bool uses_event_associations (void); + virtual bool uses_event_associations (); // = Timer management. @@ -760,7 +760,7 @@ public: * via the notify queue before breaking out of its * ACE_Message_Queue::dequeue() loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -795,17 +795,17 @@ public: /// Returns true if Reactor has been successfully initialized, else /// false. - virtual bool initialized (void); + virtual bool initialized (); /// Returns the current size of the Reactor's internal descriptor /// table. virtual size_t size () const; /// Returns a reference to the Reactor's internal repository lock. - virtual ACE_Lock &lock (void); + virtual ACE_Lock &lock (); /// Wake up all threads waiting in the event loop. - virtual void wakeup_all_threads (void); + virtual void wakeup_all_threads (); /// Transfers ownership of Reactor_Impl to the @a new_owner. /** @@ -826,7 +826,7 @@ public: virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual bool restart (void); + virtual bool restart (); /// Set a new value for restart and return the original value. /** @@ -848,7 +848,7 @@ public: /** * @note This is currently a no-op. */ - virtual int requeue_position (void); + virtual int requeue_position (); /** * @name Low-level wait_set mask manipulation methods @@ -1096,14 +1096,14 @@ protected: /// Destructor. This will release the token if it hasn't been /// released till this point - ~Token_Guard (void); + ~Token_Guard (); /// Release the token .. - void release_token (void); + void release_token (); /// Returns whether the thread that created this object owns the /// token or not. - bool is_owner (void); + bool is_owner (); /// A helper method that acquires the token 1) at a low priority, and /// 2) wait quietly for the token, not waking another thread. This @@ -1162,11 +1162,11 @@ public: * The destructor decrements the reference count on the event * handler corresponding to the given handle. */ - ~ACE_Dev_Poll_Handler_Guard (void); + ~ACE_Dev_Poll_Handler_Guard (); /// Release the event handler from this guard; when the destructor is /// called, the handler's reference count will not be decremented. - void release (void); + void release (); private: /// The event handler being managed. diff --git a/ACE/ace/Dump.h b/ACE/ace/Dump.h index c07193a5b0b..0547266a4a9 100644 --- a/ACE/ace/Dump.h +++ b/ACE/ace/Dump.h @@ -115,7 +115,7 @@ public: /// Iterates through the entire set of registered objects and /// dumps their state. - void dump_objects (void); + void dump_objects (); /// Add the tuple <dumper, this_> to the list of registered ACE objects. void register_object (const ACE_Dumpable *dumper); @@ -125,7 +125,7 @@ public: void remove_object (const void *this_); /// Interface to the Singleton instance of the object database. - static ACE_ODB *instance (void); + static ACE_ODB *instance (); ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Dump_T.cpp b/ACE/ace/Dump_T.cpp index 240d2fbfc42..6d0bc56d0e0 100644 --- a/ACE/ace/Dump_T.cpp +++ b/ACE/ace/Dump_T.cpp @@ -13,7 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class Concrete> -ACE_Dumpable_Adapter<Concrete>::~ACE_Dumpable_Adapter (void) +ACE_Dumpable_Adapter<Concrete>::~ACE_Dumpable_Adapter () { ACE_TRACE ("ACE_Dumpable_Adapter<Concrete>::~ACE_Dumpable_Adapter"); } diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h index b9200fbc1b9..ead87898acf 100644 --- a/ACE/ace/Dump_T.h +++ b/ACE/ace/Dump_T.h @@ -39,7 +39,7 @@ class ACE_Dumpable_Adapter : public ACE_Dumpable { public: ACE_Dumpable_Adapter (const Concrete *t); - ~ACE_Dumpable_Adapter (void); + ~ACE_Dumpable_Adapter (); /// Concrete dump method (simply delegates to the dump() method of /// <class Concrete>). diff --git a/ACE/ace/Dynamic_Service_Dependency.h b/ACE/ace/Dynamic_Service_Dependency.h index bb5294f408e..484660eb717 100644 --- a/ACE/ace/Dynamic_Service_Dependency.h +++ b/ACE/ace/Dynamic_Service_Dependency.h @@ -51,7 +51,7 @@ public: ACE_Dynamic_Service_Dependency (const ACE_Service_Gestalt *cfg, const ACE_TCHAR *principal); ACE_Dynamic_Service_Dependency (const ACE_TCHAR *principal); - ~ACE_Dynamic_Service_Dependency (void); + ~ACE_Dynamic_Service_Dependency (); private: void init (const ACE_Service_Gestalt *cfg, const ACE_TCHAR *principal); diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp index e5d6fe7dc6f..74569e80eae 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint.cpp @@ -67,7 +67,7 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint ( this->op_.str_ = ACE::strnew (str); } -ETCL_Literal_Constraint::~ETCL_Literal_Constraint (void) +ETCL_Literal_Constraint::~ETCL_Literal_Constraint () { if (this->type_ == ACE_ETCL_STRING) { @@ -384,7 +384,7 @@ ETCL_Literal_Constraint::operator/ (const ETCL_Literal_Constraint & rhs) } ETCL_Literal_Constraint -ETCL_Literal_Constraint::operator- (void) +ETCL_Literal_Constraint::operator- () { switch (this->type_) { @@ -465,7 +465,7 @@ ETCL_Identifier::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Union_Value::~ETCL_Union_Value (void) +ETCL_Union_Value::~ETCL_Union_Value () { delete this->string_; delete this->integer_; @@ -479,7 +479,7 @@ ETCL_Union_Value::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Union_Pos::~ETCL_Union_Pos (void) +ETCL_Union_Pos::~ETCL_Union_Pos () { delete this->component_; delete this->union_value_; @@ -493,7 +493,7 @@ ETCL_Union_Pos::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component_Pos::~ETCL_Component_Pos (void) +ETCL_Component_Pos::~ETCL_Component_Pos () { delete this->component_; delete this->integer_; @@ -507,7 +507,7 @@ ETCL_Component_Pos::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component_Assoc::~ETCL_Component_Assoc (void) +ETCL_Component_Assoc::~ETCL_Component_Assoc () { delete this->component_; delete this->identifier_; @@ -521,7 +521,7 @@ ETCL_Component_Assoc::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component_Array::~ETCL_Component_Array (void) +ETCL_Component_Array::~ETCL_Component_Array () { delete this->component_; delete this->integer_; @@ -543,7 +543,7 @@ ETCL_Special::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Component::~ETCL_Component (void) +ETCL_Component::~ETCL_Component () { delete this->component_; delete this->identifier_; @@ -557,7 +557,7 @@ ETCL_Component::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Dot::~ETCL_Dot (void) +ETCL_Dot::~ETCL_Dot () { delete this->component_; } @@ -570,7 +570,7 @@ ETCL_Dot::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Eval::~ETCL_Eval (void) +ETCL_Eval::~ETCL_Eval () { delete this->component_; } @@ -583,7 +583,7 @@ ETCL_Eval::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Default::~ETCL_Default (void) +ETCL_Default::~ETCL_Default () { delete this->component_; } @@ -596,7 +596,7 @@ ETCL_Default::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Exist::~ETCL_Exist (void) +ETCL_Exist::~ETCL_Exist () { delete this->component_; } @@ -609,7 +609,7 @@ ETCL_Exist::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Unary_Expr::~ETCL_Unary_Expr (void) +ETCL_Unary_Expr::~ETCL_Unary_Expr () { delete this->subexpr_; } @@ -622,7 +622,7 @@ ETCL_Unary_Expr::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Binary_Expr::~ETCL_Binary_Expr (void) +ETCL_Binary_Expr::~ETCL_Binary_Expr () { delete this->lhs_; delete this->rhs_; @@ -636,7 +636,7 @@ ETCL_Binary_Expr::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Preference::~ETCL_Preference (void) +ETCL_Preference::~ETCL_Preference () { delete this->subexpr_; } diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp index 50d666025d8..7c220fbb6a0 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp @@ -11,11 +11,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ETCL_Constraint_Visitor::ETCL_Constraint_Visitor (void) +ETCL_Constraint_Visitor::ETCL_Constraint_Visitor () { } -ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor (void) +ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor () { } diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h index ea790676c9a..f83413f6339 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h @@ -41,8 +41,8 @@ class ETCL_Preference; class ACE_ETCL_Export ETCL_Constraint_Visitor { public: - ETCL_Constraint_Visitor (void); - virtual ~ETCL_Constraint_Visitor (void); + ETCL_Constraint_Visitor (); + virtual ~ETCL_Constraint_Visitor (); virtual int visit_literal (ETCL_Literal_Constraint *); virtual int visit_identifier (ETCL_Identifier *); diff --git a/ACE/ace/ETCL/ETCL_Interpreter.cpp b/ACE/ace/ETCL/ETCL_Interpreter.cpp index 0eab66a65df..79f06d1e18d 100644 --- a/ACE/ace/ETCL/ETCL_Interpreter.cpp +++ b/ACE/ace/ETCL/ETCL_Interpreter.cpp @@ -10,12 +10,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ETCL_Parser_Export ACE_SYNCH_MUTEX ETCL_Interpreter::parserMutex__; -ETCL_Interpreter::ETCL_Interpreter (void) +ETCL_Interpreter::ETCL_Interpreter () : root_ (0) { } -ETCL_Interpreter::~ETCL_Interpreter (void) +ETCL_Interpreter::~ETCL_Interpreter () { delete this->root_; } diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp index b2bc659285e..32b64630ded 100644 --- a/ACE/ace/ETCL/ETCL_l.cpp +++ b/ACE/ace/ETCL/ETCL_l.cpp @@ -1399,7 +1399,7 @@ static int input() } #endif /* YY_NO_INPUT */ -void yyflush_current_buffer (void) +void yyflush_current_buffer () { YY_FLUSH_BUFFER; } @@ -1865,7 +1865,7 @@ extract_string(char* str) } int -yywrap (void) +yywrap () { return 1; } diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp index 3f27b8a8670..15e2c0116c2 100644 --- a/ACE/ace/ETCL/ETCL_y.cpp +++ b/ACE/ace/ETCL/ETCL_y.cpp @@ -64,8 +64,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -extern int yylex (void); -extern void yyflush_current_buffer (void); +extern int yylex (); +extern void yyflush_current_buffer (); static void yyerror (const char *) { @@ -538,7 +538,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #ifdef YYPARSE_PARAM int yyparse (void *); #else -int yyparse (void); +int yyparse (); #endif #endif diff --git a/ACE/ace/Encoding_Converter.cpp b/ACE/ace/Encoding_Converter.cpp index 29a3a1d18f9..9c6e71ee5f6 100644 --- a/ACE/ace/Encoding_Converter.cpp +++ b/ACE/ace/Encoding_Converter.cpp @@ -3,7 +3,7 @@ #if defined (ACE_USES_WCHAR) ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Encoding_Converter::~ACE_Encoding_Converter (void) +ACE_Encoding_Converter::~ACE_Encoding_Converter () { } diff --git a/ACE/ace/Encoding_Converter.h b/ACE/ace/Encoding_Converter.h index c430e8f93a6..9b08f6c7d73 100644 --- a/ACE/ace/Encoding_Converter.h +++ b/ACE/ace/Encoding_Converter.h @@ -41,7 +41,7 @@ public: /// This destructor is here (and virtual) because we have virtual /// functions. - virtual ~ACE_Encoding_Converter (void); + virtual ~ACE_Encoding_Converter (); /// Convert the source (which can be in any encoding) to UTF-8 and /// store it in the provided target buffer. diff --git a/ACE/ace/Event_Handler_T.cpp b/ACE/ace/Event_Handler_T.cpp index 6c403c143ca..6e15cbbc94f 100644 --- a/ACE/ace/Event_Handler_T.cpp +++ b/ACE/ace/Event_Handler_T.cpp @@ -25,7 +25,7 @@ ACE_Event_Handler_T<T>::dump () const } template<class T> -ACE_Event_Handler_T<T>::~ACE_Event_Handler_T (void) +ACE_Event_Handler_T<T>::~ACE_Event_Handler_T () { ACE_TRACE ("ACE_Event_Handler_T<T>::~ACE_Event_Handler_T"); if (this->delete_handler_) diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index 258396372a8..a222459388e 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -90,7 +90,7 @@ public: IO_HANDLER except = 0); /// Close down and delete the <op_handler> - ~ACE_Event_Handler_T (void); + ~ACE_Event_Handler_T (); // = Override all the ACE_Event_Handler methods. @@ -105,7 +105,7 @@ public: virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); // = Get/set the operations handler. - T *op_handler (void); + T *op_handler (); void op_handler (T *); // = Get/set the target pointer-to-method used for dispatching. diff --git a/ACE/ace/FIFO.h b/ACE/ace/FIFO.h index efbbf8c1403..f738aa783d4 100644 --- a/ACE/ace/FIFO.h +++ b/ACE/ace/FIFO.h @@ -52,11 +52,11 @@ public: LPSECURITY_ATTRIBUTES sa = 0); /// Close down the ACE_FIFO without removing the rendezvous point. - int close (void); + int close (); /// Close down the ACE_FIFO and remove the rendezvous point from the /// file system. - int remove (void); + int remove (); /// Return the local address of this endpoint. int get_local_addr (const ACE_TCHAR *&rendezvous) const; @@ -74,7 +74,7 @@ protected: */ //@{ /// Default constructor. - ACE_FIFO (void); + ACE_FIFO (); /// Open up the named pipe on the @a rendezvous in accordance with the /// flags. diff --git a/ACE/ace/FIFO_Recv.h b/ACE/ace/FIFO_Recv.h index 796aadeca0d..c34bd2180ad 100644 --- a/ACE/ace/FIFO_Recv.h +++ b/ACE/ace/FIFO_Recv.h @@ -45,7 +45,7 @@ public: /// aren't any writers at the moment! //@{ /// Default constructor. - ACE_FIFO_Recv (void); + ACE_FIFO_Recv (); /// Open up a bytestream named pipe for reading. ACE_FIFO_Recv (const ACE_TCHAR *rendezvous, @@ -63,7 +63,7 @@ public: //@} /// Close down the fifo. - int close (void); + int close (); /// Recv @a buf of up to @a len bytes. ssize_t recv (void *buf, size_t len); diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h index c1a39a9669b..f731231c830 100644 --- a/ACE/ace/File_Lock.h +++ b/ACE/ace/File_Lock.h @@ -59,7 +59,7 @@ public: mode_t mode = 0); /// Remove a File lock by releasing it and closing down the <handle_>. - ~ACE_File_Lock (void); + ~ACE_File_Lock (); /// Remove a File lock by releasing it and closing down the /// <handle_>. If @a unlink_file is true then we unlink the file. diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp index ecb2f088a19..9c3cf5992de 100644 --- a/ACE/ace/FlReactor/FlReactor.cpp +++ b/ACE/ace/FlReactor/FlReactor.cpp @@ -29,7 +29,7 @@ ACE_FlReactor::ACE_FlReactor (size_t size, #endif /* ACE_MT_SAFE */ } -ACE_FlReactor::~ACE_FlReactor (void) +ACE_FlReactor::~ACE_FlReactor () { } @@ -230,7 +230,7 @@ ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles, // timeout in the Reactor's Timer_Queue. void -ACE_FlReactor::reset_timeout (void) +ACE_FlReactor::reset_timeout () { ACE_Time_Value *max_wait_time = this->timer_queue_->calculate_timeout (0); diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor/FlReactor.h index e5dbee8af10..b2d3283fcb6 100644 --- a/ACE/ace/FlReactor/FlReactor.h +++ b/ACE/ace/FlReactor/FlReactor.h @@ -47,7 +47,7 @@ public: ACE_FlReactor (size_t size = DEFAULT_SIZE, bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_FlReactor (void); + virtual ~ACE_FlReactor (); // = Timer operations. virtual long schedule_timer (ACE_Event_Handler *event_handler, @@ -89,7 +89,7 @@ protected: private: /// This method ensures there's an Fl timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); // = Integrate with the FL callback function mechanism. static void fl_io_proc (int fd, void*); diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp index 339107ba842..7bd06e49b7e 100644 --- a/ACE/ace/FoxReactor/FoxReactor.cpp +++ b/ACE/ace/FoxReactor/FoxReactor.cpp @@ -35,7 +35,7 @@ ACE_FoxReactor::ACE_FoxReactor (FXApp* a, #endif /* ACE_MT_SAFE */ } -ACE_FoxReactor::~ACE_FoxReactor (void) +ACE_FoxReactor::~ACE_FoxReactor () { } @@ -232,7 +232,7 @@ ACE_FoxReactor::remove_handler_i (const ACE_Handle_Set &handles, // timeout in the Reactor's Timer_Queue. void -ACE_FoxReactor::reset_timeout (void) +ACE_FoxReactor::reset_timeout () { ACE_Time_Value *max_wait_time = this->timer_queue_->calculate_timeout (0); diff --git a/ACE/ace/FoxReactor/FoxReactor.h b/ACE/ace/FoxReactor/FoxReactor.h index 220d2b56a24..f837af62f16 100644 --- a/ACE/ace/FoxReactor/FoxReactor.h +++ b/ACE/ace/FoxReactor/FoxReactor.h @@ -43,7 +43,7 @@ public: size_t size = DEFAULT_SIZE, bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_FoxReactor (void); + virtual ~ACE_FoxReactor (); void fxapplication(FXApp* a); @@ -94,7 +94,7 @@ protected: private: /// This method ensures there's an Fox timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); FXApp *fxapp; diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index d77b8c0a28c..311d9df096a 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -20,7 +20,7 @@ ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future_Rep) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Future) template <class T> -ACE_Future_Holder<T>::ACE_Future_Holder (void) +ACE_Future_Holder<T>::ACE_Future_Holder () { } @@ -31,17 +31,17 @@ ACE_Future_Holder<T>::ACE_Future_Holder (const ACE_Future<T> &item) } template <class T> -ACE_Future_Holder<T>::~ACE_Future_Holder (void) +ACE_Future_Holder<T>::~ACE_Future_Holder () { } template <class T> -ACE_Future_Observer<T>::ACE_Future_Observer (void) +ACE_Future_Observer<T>::ACE_Future_Observer () { } template <class T> -ACE_Future_Observer<T>::~ACE_Future_Observer (void) +ACE_Future_Observer<T>::~ACE_Future_Observer () { } @@ -72,7 +72,7 @@ ACE_Future_Rep<T>::dump () const } template <class T> ACE_Future_Rep<T> * -ACE_Future_Rep<T>::internal_create (void) +ACE_Future_Rep<T>::internal_create () { ACE_Future_Rep<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -82,7 +82,7 @@ ACE_Future_Rep<T>::internal_create (void) } template <class T> ACE_Future_Rep<T> * -ACE_Future_Rep<T>::create (void) +ACE_Future_Rep<T>::create () { // Yes set ref count to zero. ACE_Future_Rep<T> *temp = internal_create (); @@ -142,7 +142,7 @@ ACE_Future_Rep<T>::assign (ACE_Future_Rep<T>*& rep, ACE_Future_Rep<T>* new_rep) } template <class T> -ACE_Future_Rep<T>::ACE_Future_Rep (void) +ACE_Future_Rep<T>::ACE_Future_Rep () : value_ (0), ref_count_ (0), value_ready_ (value_ready_mutex_) @@ -150,7 +150,7 @@ ACE_Future_Rep<T>::ACE_Future_Rep (void) } template <class T> -ACE_Future_Rep<T>::~ACE_Future_Rep (void) +ACE_Future_Rep<T>::~ACE_Future_Rep () { delete this->value_; } @@ -288,7 +288,7 @@ ACE_Future_Rep<T>::operator T () } template <class T> -ACE_Future<T>::ACE_Future (void) +ACE_Future<T>::ACE_Future () : future_rep_ (FUTURE_REP::create ()) { } @@ -307,7 +307,7 @@ ACE_Future<T>::ACE_Future (const T &r) } template <class T> -ACE_Future<T>::~ACE_Future (void) +ACE_Future<T>::~ACE_Future () { FUTURE_REP::detach (future_rep_); } @@ -332,7 +332,7 @@ ACE_Future<T>::cancel (const T &r) } template <class T> int -ACE_Future<T>::cancel (void) +ACE_Future<T>::cancel () { // If this ACE_Future is already attached to a ACE_Future_Rep, // detach it (maybe delete the ACE_Future_Rep). diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index f63695202fa..4858bcad6f8 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -47,7 +47,7 @@ class ACE_Future_Holder { public: ACE_Future_Holder (const ACE_Future<T> &future); - ~ACE_Future_Holder (void); + ~ACE_Future_Holder (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -55,7 +55,7 @@ public: ACE_Future<T> item_; protected: - ACE_Future_Holder (void); + ACE_Future_Holder (); }; /** @@ -73,7 +73,7 @@ class ACE_Future_Observer { public: /// Destructor - virtual ~ACE_Future_Observer (void); + virtual ~ACE_Future_Observer (); /// Called by the ACE_Future in which we are subscribed to when /// its value is written to. @@ -84,7 +84,7 @@ public: protected: /// Constructor - ACE_Future_Observer (void); + ACE_Future_Observer (); }; /** @@ -163,10 +163,10 @@ private: /// Allocate a new ACE_Future_Rep<T> instance, returning NULL if it /// cannot be created. - static ACE_Future_Rep<T> *internal_create (void); + static ACE_Future_Rep<T> *internal_create (); /// Create a ACE_Future_Rep<T> and initialize the reference count. - static ACE_Future_Rep<T> *create (void); + static ACE_Future_Rep<T> *create (); /** * Increase the reference count and return argument. Uses the @@ -232,7 +232,7 @@ class ACE_Future { public: /// Constructor. - ACE_Future (void); + ACE_Future (); /// Copy constructor binds @a this and @a r to the same /// ACE_Future_Rep. An ACE_Future_Rep is created if necessary. @@ -243,7 +243,7 @@ public: ACE_Future (const T &r); /// Destructor. - ~ACE_Future (void); + ~ACE_Future (); /// Assignment operator that binds @a this and @a r to the same /// ACE_Future_Rep. An ACE_Future_Rep is created if necessary. @@ -259,7 +259,7 @@ public: * to reuse the ACE_Future. But remember, the ACE_Future * is now bound to a new ACE_Future_Rep. */ - int cancel (void); + int cancel (); /** * Equality operator that returns @c true if both ACE_Future objects @@ -348,7 +348,7 @@ public: * rarely, if ever, be used and that modifying the underlying * ACE_Future_Rep should be done with extreme caution. */ - ACE_Future_Rep<T> *get_rep (void); + ACE_Future_Rep<T> *get_rep (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Future_Set.cpp b/ACE/ace/Future_Set.cpp index 413539b2a86..ed9b3c4037d 100644 --- a/ACE/ace/Future_Set.cpp +++ b/ACE/ace/Future_Set.cpp @@ -28,7 +28,7 @@ ACE_Future_Set<T>::ACE_Future_Set (ACE_Message_Queue<ACE_SYNCH> *new_queue) } template <class T> -ACE_Future_Set<T>::~ACE_Future_Set (void) +ACE_Future_Set<T>::~ACE_Future_Set () { // Detach ourselves from all remaining futures, if any, in our map. typename FUTURE_HASH_MAP::iterator iterator = diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp index 9c325096aa7..0e128647915 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp @@ -143,7 +143,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::op } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i (void) +ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i () { // Protect against "double-deletion" in case the destructor also // gets called. @@ -178,7 +178,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::cl } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i (void) +ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i () { // Iterate through the entire map calling the destuctor of each // <ACE_Hash_Multi_Map_Entry>. @@ -462,7 +462,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> int -ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void) +ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i"); @@ -492,7 +492,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> int -ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void) +ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i"); @@ -534,7 +534,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> int -ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void) +ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i"); @@ -564,7 +564,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> int -ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void) +ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i () { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i"); diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index d92cc190bd7..c3e446e1876 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -66,10 +66,10 @@ public: ~ACE_Hash_Multi_Map_Entry () = default; /// Key accessor. - EXT_ID& key (void); + EXT_ID& key (); /// Item accessor. - ACE_Unbounded_Set<INT_ID>& item (void); + ACE_Unbounded_Set<INT_ID>& item (); public: /// Key used to look up an entry. @@ -222,13 +222,13 @@ public: /// Close down a Hash_Multi_Map_Manager and release dynamically allocated /// resources. - int close (void); + int close (); /// Removes all the entries in Hash_Multi_Map_Manager. - int unbind_all (void); + int unbind_all (); /// Cleanup the Hash_Multi_Map_Manager. - ~ACE_Hash_Multi_Map_Manager (void); + ~ACE_Hash_Multi_Map_Manager (); /** * Associate @a ext_id with @a int_id. If @a ext_id and @a int_id is already @@ -406,7 +406,7 @@ public: * guard the state of an iterator. * @note The right name would be lock, but HP/C++ will choke on that! */ - ACE_LOCK &mutex (void); + ACE_LOCK &mutex (); /// Dump the state of an object. void dump () const; @@ -414,12 +414,12 @@ public: // = STL styled iterator factory functions. /// Return forward iterator. - ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> begin (void); - ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> end (void); + ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> begin (); + ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> end (); /// Return reverse iterator. - ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rbegin (void); - ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rend (void); + ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rbegin (); + ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> rend (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -539,11 +539,11 @@ protected: /// Close down a Map_Manager. Must be called with /// locks held. - int close_i (void); + int close_i (); /// Removes all the entries in Map_Manager. Must be called with /// locks held. - int unbind_all_i (void); + int unbind_all_i (); /// Pointer to a memory allocator used for table_, so it should /// supply size*sizeof (@c ACE_Hash_Multi_Map_Entry<@c EXT_ID, @c INT_ID>), @@ -572,7 +572,7 @@ protected: size_t &loc); /// Accessor of the underlying table - ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *table (void); + ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *table (); /// Accessor of the current size attribute size_t cur_size () const; @@ -632,7 +632,7 @@ public: /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated /// over. - ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void); + ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const; @@ -644,11 +644,11 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. void dump_i () const; @@ -698,7 +698,7 @@ public: /// Returns reference the @c Hash_Multi_Map_Manager that is being iterated /// over. - const ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void); + const ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const; @@ -710,11 +710,11 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. void dump_i () const; @@ -752,7 +752,7 @@ public: // = Iteration methods. /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. void dump () const; @@ -760,13 +760,13 @@ public: // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Hash_Multi_Map_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); @@ -797,7 +797,7 @@ public: // = Iteration methods. /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. void dump () const; @@ -805,13 +805,13 @@ public: // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Hash_Multi_Map_Const_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); @@ -850,13 +850,13 @@ public: // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); @@ -869,7 +869,7 @@ public: /// Returns reference the Hash_Multi_Map_Manager that is being iterated /// over. - ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void); + ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Multi_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const; @@ -878,11 +878,11 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Map we are iterating over. ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_; @@ -917,7 +917,7 @@ public: // = Iteration methods. /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. void dump () const; @@ -925,13 +925,13 @@ public: // = STL styled iteration, compare, and reference functions. /// Prefix reverse. - ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix reverse. ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix advance. - ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix advance. ACE_Hash_Multi_Map_Reverse_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); diff --git a/ACE/ace/IOStream.cpp b/ACE/ace/IOStream.cpp index a4158b00140..8d282688785 100644 --- a/ACE/ace/IOStream.cpp +++ b/ACE/ace/IOStream.cpp @@ -85,7 +85,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_HANDLE -ACE_Streambuf::get_handle (void) +ACE_Streambuf::get_handle () { return 0; } @@ -106,7 +106,7 @@ ACE_Streambuf::recv_timeout (ACE_Time_Value *tv) } int -ACE_Streambuf::underflow (void) +ACE_Streambuf::underflow () { // If input mode is not set, any attempt to read from the stream is // a failure. @@ -314,7 +314,7 @@ ACE_Streambuf::overflow (int c) // syncin int -ACE_Streambuf::syncin (void) +ACE_Streambuf::syncin () { // As discussed, there really isn't any way to sync input from a // socket-like device. We specifially override this base-class @@ -325,7 +325,7 @@ ACE_Streambuf::syncin (void) // syncout int -ACE_Streambuf::syncout (void) +ACE_Streambuf::syncout () { // Unlike syncin, syncout is a doable thing. All we have to do is // write whatever is in the output buffer to the peer. flushbuf () @@ -338,7 +338,7 @@ ACE_Streambuf::syncout (void) } int -ACE_Streambuf::sync (void) +ACE_Streambuf::sync () { // sync () is fairly traditional in that it syncs both input and // output. We could have omitted the call to syncin () but someday, @@ -358,7 +358,7 @@ ACE_Streambuf::sync (void) // flushbuf int -ACE_Streambuf::flushbuf (void) +ACE_Streambuf::flushbuf () { // pptr () is one character beyond the last character put into the // buffer. pbase () points to the beginning of the put buffer. @@ -415,7 +415,7 @@ ACE_Streambuf::flushbuf (void) } int -ACE_Streambuf::get_one_byte (void) +ACE_Streambuf::get_one_byte () { this->timeout_ = 0; @@ -439,7 +439,7 @@ ACE_Streambuf::get_one_byte (void) // (ie -- gptr == egptr). int -ACE_Streambuf::fillbuf (void) +ACE_Streambuf::fillbuf () { // Invoke recv_n to get exactly one byte from the remote. This will // block until something shows up. @@ -485,7 +485,7 @@ ACE_Streambuf::ACE_Streambuf (u_int streambuf_size, int io_mode) } u_int -ACE_Streambuf::streambuf_size (void) +ACE_Streambuf::streambuf_size () { return streambuf_size_; } @@ -494,7 +494,7 @@ ACE_Streambuf::streambuf_size (void) // gptr. u_int -ACE_Streambuf::get_waiting (void) +ACE_Streambuf::get_waiting () { return this->gptr_saved_ - this->eback_saved_; } @@ -503,7 +503,7 @@ ACE_Streambuf::get_waiting (void) // gotten); eback + get_avail = egptr. u_int -ACE_Streambuf::get_avail (void) +ACE_Streambuf::get_avail () { return this->egptr_saved_ - this->eback_saved_; } @@ -512,7 +512,7 @@ ACE_Streambuf::get_avail (void) // pbase + put_avail = pptr. u_int -ACE_Streambuf::put_avail (void) +ACE_Streambuf::put_avail () { return this->pptr_saved_ - this->pbase_saved_; } @@ -624,7 +624,7 @@ ACE_Streambuf::reset_put_buffer (char *newBuffer, } void -ACE_Streambuf::reset_base (void) +ACE_Streambuf::reset_base () { // Until we experience the first get or put operation, we do not // know what our current IO mode is. @@ -642,13 +642,13 @@ ACE_Streambuf::reset_base (void) // would be deleted when the object destructs. Since we are providing // separate read/write buffers, it is up to us to manage their memory. -ACE_Streambuf::~ACE_Streambuf (void) +ACE_Streambuf::~ACE_Streambuf () { delete [] this->eback_saved_; delete [] this->pbase_saved_; } -u_char ACE_Streambuf::timeout (void) +u_char ACE_Streambuf::timeout () { u_char rval = this->timeout_; this->timeout_ = 0; diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index e04a1583710..8be12fee0fe 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -134,7 +134,7 @@ public: * providing separate read/write buffers, it is up to us to manage * their memory. */ - virtual ~ACE_Streambuf (void); + virtual ~ACE_Streambuf (); /// Get the current Time_Value pointer and provide a new one. ACE_Time_Value *recv_timeout (ACE_Time_Value *tv = 0); @@ -154,7 +154,7 @@ public: /// Return the number of bytes to be 'put' onto the stream media. /// pbase + put_avail = pptr - u_int put_avail (void); + u_int put_avail (); /** * Use this to allocate a new/different buffer for get operations. @@ -172,18 +172,18 @@ public: /// Return the number of bytes not yet gotten. eback + get_waiting = /// gptr - u_int get_waiting (void); + u_int get_waiting (); /// Return the number of bytes in the get area (includes some already /// gotten); eback + get_avail = egptr - u_int get_avail (void); + u_int get_avail (); /// Query the streambuf for the size of its buffers. - u_int streambuf_size (void); + u_int streambuf_size (); /// Did we take an error because of an IO operation timeout? /// @note Invoking this resets the flag. - u_char timeout (void); + u_char timeout (); protected: ACE_Streambuf (u_int streambuf_size, @@ -191,10 +191,10 @@ protected: /// Sync both input and output. See syncin/syncout below for /// descriptions. - virtual int sync (void); + virtual int sync (); // = Signatures for the underflow/overflow discussed above. - virtual int underflow (void); + virtual int underflow (); /// The overflow function receives the character which caused the /// overflow. @@ -202,7 +202,7 @@ protected: /// Resets the <base> pointer and streambuf mode. This is used /// internally when get/put buffers are allocatd. - void reset_base (void); + void reset_base (); protected: // = Two pointer sets for manipulating the read/write areas. @@ -245,22 +245,22 @@ protected: * filebuf, the single common buffer is used forcing the <seek> * call. */ - int syncin (void); + int syncin (); /// syncout() is called when the output needs to be flushed. This is /// easily done by calling the peer's send_n function. - int syncout (void); + int syncout (); /// flushbuf() is the worker of syncout. It is a separate function /// because it gets used sometimes in different context. - int flushbuf (void); + int flushbuf (); /** * fillbuf is called in a couple of places. This is the worker of * underflow. It will attempt to fill the read buffer from the * peer. */ - int fillbuf (void); + int fillbuf (); /** * Used by fillbuf and others to get exactly one byte from the peer. @@ -268,7 +268,7 @@ protected: * It is virtual because we really need to override it for * datagram-derived objects. */ - virtual int get_one_byte (void); + virtual int get_one_byte (); /** * Stream connections and "unconnected connections" (ie -- @@ -290,7 +290,7 @@ protected: int flags = 0, ACE_Time_Value *tv = 0) = 0; - virtual ACE_HANDLE get_handle (void); + virtual ACE_HANDLE get_handle (); # if !defined (ACE_USES_OLD_IOSTREAMS) char *base () const @@ -314,7 +314,7 @@ protected: setbuf (b, (eb - b)); } - int out_waiting (void) + int out_waiting () { return pptr () - pbase (); } diff --git a/ACE/ace/IOStream_T.cpp b/ACE/ace/IOStream_T.cpp index f0d10ad35a9..a3d8dd9b4d8 100644 --- a/ACE/ace/IOStream_T.cpp +++ b/ACE/ace/IOStream_T.cpp @@ -89,7 +89,7 @@ ACE_Streambuf_T<STREAM>::recv_n (char *buf, } template <class STREAM> ACE_HANDLE -ACE_Streambuf_T<STREAM>::get_handle (void) +ACE_Streambuf_T<STREAM>::get_handle () { return peer_ ? peer_->get_handle () : 0; } @@ -124,7 +124,7 @@ ACE_IOStream<STREAM>::ACE_IOStream (u_int streambuf_size) // iostream () template <class STREAM> -ACE_IOStream<STREAM>::~ACE_IOStream (void) +ACE_IOStream<STREAM>::~ACE_IOStream () { delete this->streambuf_; } @@ -133,7 +133,7 @@ ACE_IOStream<STREAM>::~ACE_IOStream (void) // function. template <class STREAM> int -ACE_IOStream<STREAM>::close (void) +ACE_IOStream<STREAM>::close () { return STREAM::close (); } diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h index 49ddbf0ad09..ffa6fafffb4 100644 --- a/ACE/ace/IOStream_T.h +++ b/ACE/ace/IOStream_T.h @@ -68,7 +68,7 @@ public: ACE_Time_Value *tv = 0); protected: - virtual ACE_HANDLE get_handle (void); + virtual ACE_HANDLE get_handle (); /// This will be our ACE_SOCK_Stream or similar object. STREAM *peer_; @@ -119,11 +119,11 @@ public: /// We have to get rid of the <streambuf_> ourselves since we gave it /// to the <iostream> base class; - virtual ~ACE_IOStream (void); + virtual ~ACE_IOStream (); /// The only ambiguity in the multiple inheritance is the <close> /// function. - virtual int close (void); + virtual int close (); /** * Returns 1 if we're at the end of the <STREAM>, i.e., if the @@ -184,7 +184,7 @@ public: return (0); } virtual void isfx (void) { return; } - virtual int opfx (void) + virtual int opfx () { if (good () && tie () != 0) tie ()->flush (); @@ -243,7 +243,7 @@ template <class STREAM> class ACE_SOCK_Dgram_SC : public STREAM { public: - ACE_SOCK_Dgram_SC (void); + ACE_SOCK_Dgram_SC (); ACE_SOCK_Dgram_SC (STREAM &source, ACE_INET_Addr &dest); ssize_t send_n (char *buf, ssize_t len); diff --git a/ACE/ace/Init_ACE.h b/ACE/ace/Init_ACE.h index dbf06ead97b..e1fe7427174 100644 --- a/ACE/ace/Init_ACE.h +++ b/ACE/ace/Init_ACE.h @@ -37,7 +37,7 @@ namespace ACE * @return Returns 0 on success, -1 on failure, and 1 if it had * already been called. */ - extern ACE_Export int init (void); + extern ACE_Export int init (); /** * Finalize the ACE library services and releases ACE's internal @@ -48,7 +48,7 @@ namespace ACE * @return Returns 0 on success, -1 on failure, and 1 if it had already been * called. */ - extern ACE_Export int fini (void); + extern ACE_Export int fini (); // private: // Used internally, so not exported. diff --git a/ACE/ace/LOCK_SOCK_Acceptor.cpp b/ACE/ace/LOCK_SOCK_Acceptor.cpp index 65a5512ba80..400517cf40b 100644 --- a/ACE/ace/LOCK_SOCK_Acceptor.cpp +++ b/ACE/ace/LOCK_SOCK_Acceptor.cpp @@ -23,7 +23,7 @@ ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::accept (ACE_SOCK_Stream &stream, } template <class ACE_LOCK> ACE_LOCK & -ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::lock (void) +ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::lock () { return this->lock_; } diff --git a/ACE/ace/LSOCK_Acceptor.h b/ACE/ace/LSOCK_Acceptor.h index 330101fcc75..8459ba4806e 100644 --- a/ACE/ace/LSOCK_Acceptor.h +++ b/ACE/ace/LSOCK_Acceptor.h @@ -40,7 +40,7 @@ class ACE_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor { public: /// Default constructor. - ACE_LSOCK_Acceptor (void); + ACE_LSOCK_Acceptor (); /// Initiate a passive mode socket. ACE_LSOCK_Acceptor (const ACE_Addr &local_sap, @@ -65,7 +65,7 @@ public: /// Close down the ACE_LSOCK and remove the rendezvous point from the /// file system. - int remove (void); + int remove (); /// Return the local endpoint address. int get_local_addr (ACE_Addr &) const; diff --git a/ACE/ace/LSOCK_Dgram.h b/ACE/ace/LSOCK_Dgram.h index 4c859a516b1..79d52e0ecb8 100644 --- a/ACE/ace/LSOCK_Dgram.h +++ b/ACE/ace/LSOCK_Dgram.h @@ -35,7 +35,7 @@ class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK { public: /// Default constructor. - ACE_LSOCK_Dgram (void); + ACE_LSOCK_Dgram (); /// Initiate a local dgram. ACE_LSOCK_Dgram (const ACE_Addr &local, diff --git a/ACE/ace/Local_Memory_Pool.h b/ACE/ace/Local_Memory_Pool.h index ecf5e38ec0f..0df0631a9be 100644 --- a/ACE/ace/Local_Memory_Pool.h +++ b/ACE/ace/Local_Memory_Pool.h @@ -52,7 +52,7 @@ public: ACE_Local_Memory_Pool (const ACE_TCHAR *backing_store_name = 0, const OPTIONS *options = 0); - virtual ~ACE_Local_Memory_Pool (void); + virtual ~ACE_Local_Memory_Pool (); /// Ask system for initial chunk of local memory. virtual void *init_acquire (size_t nbytes, diff --git a/ACE/ace/Local_Name_Space.h b/ACE/ace/Local_Name_Space.h index ea7845baa8f..b2bf2948b9f 100644 --- a/ACE/ace/Local_Name_Space.h +++ b/ACE/ace/Local_Name_Space.h @@ -39,7 +39,7 @@ class ACE_Export ACE_NS_String public: // = Initialization. /// Default "no-op" constructor. - ACE_NS_String (void); + ACE_NS_String (); /// Initialization method. ACE_NS_String (ACE_WCHAR_T *dst, @@ -50,7 +50,7 @@ public: ACE_NS_String (const ACE_NS_WString &); /// Destructor - ~ACE_NS_String (void); + ~ACE_NS_String (); /// Converts an ACE_NS_String to fresh copy of an ACE_NS_WString; operator ACE_NS_WString () const; @@ -98,7 +98,7 @@ class ACE_Export ACE_NS_Internal { public: /// No-op constructor. - ACE_NS_Internal (void); + ACE_NS_Internal (); /// Constructor. ACE_NS_Internal (ACE_NS_String &value, const char *type); @@ -107,10 +107,10 @@ public: bool operator == (const ACE_NS_Internal &) const; /// Return value. - ACE_NS_String value (void); + ACE_NS_String value (); /// Return type. - const char *type (void); + const char *type (); private: /// Contains the value of the string. diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp index 6b568ab0798..0ebce658148 100644 --- a/ACE/ace/Local_Name_Space_T.cpp +++ b/ACE/ace/Local_Name_Space_T.cpp @@ -358,7 +358,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::open ( } template <ACE_MEM_POOL_1, class ACE_LOCK> -ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space (void) +ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space () : allocator_ (0), name_space_map_ (0), name_options_ (0) @@ -381,7 +381,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space ( } template <ACE_MEM_POOL_1, class ACE_LOCK> -ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Local_Name_Space (void) +ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Local_Name_Space () { ACE_TRACE ("ACE_Local_Name_Space::~ACE_Local_Name_Space"); @@ -393,7 +393,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::~ACE_Local_Name_Space (void) ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Local_Name_Space) template <ACE_MEM_POOL_1, class ACE_LOCK> int -ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager (void) +ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager () { // Note that we *must* use structured exception handling here // because (1) we may need to commit virtual memory pages and (2) @@ -411,7 +411,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager (void) template <ACE_MEM_POOL_1, class ACE_LOCK> int -ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) +ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i () { ACE_TRACE ("ACE_Local_Name_Space::create_manager_i"); // Get directory name diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h index 531e2a3e18e..6a65c22448e 100644 --- a/ACE/ace/Local_Name_Space_T.h +++ b/ACE/ace/Local_Name_Space_T.h @@ -122,7 +122,7 @@ public: /// Destructor, do some cleanup :TBD: last dtor should "compress" /// file - ~ACE_Local_Name_Space (void); + ~ACE_Local_Name_Space (); /// Bind a new name to a naming context (Wide character strings). virtual int bind (const ACE_NS_WString &name, @@ -229,8 +229,8 @@ private: /// Allocate the appropriate type of map manager that stores the /// key/value binding. - int create_manager (void); - int create_manager_i (void); + int create_manager (); + int create_manager_i (); /// Pointer to the allocator ALLOCATOR *allocator_; diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp index 85fe6d8bb67..215517c3157 100644 --- a/ACE/ace/Local_Tokens.cpp +++ b/ACE/ace/Local_Tokens.cpp @@ -28,7 +28,7 @@ ACE_Tokens::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Tokens::ACE_Tokens (void) +ACE_Tokens::ACE_Tokens () : visited_ (0), reference_count_ (0) { @@ -114,7 +114,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy, } } -ACE_TPQ_Entry::ACE_TPQ_Entry (void) +ACE_TPQ_Entry::ACE_TPQ_Entry () : cond_var_ (lock_), proxy_ (0), nesting_level_ (0), @@ -130,7 +130,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_TPQ_Entry &rhs) *this = rhs; } -ACE_TPQ_Entry::~ACE_TPQ_Entry (void) +ACE_TPQ_Entry::~ACE_TPQ_Entry () { ACE_TRACE ("ACE_TPQ_Entry::~ACE_TPQ_Entry"); } @@ -196,7 +196,7 @@ ACE_TSS_TPQ_Entry::make_TSS_TYPE () const return temp; } -ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * (void) +ACE_TSS_TPQ_Entry::operator ACE_TPQ_Entry * () { #if !defined (ACE_NO_TSS_TOKENS) return (ACE_TPQ_Entry *) (*((ACE_TSS<ACE_TPQ_Entry> *) this)); @@ -236,7 +236,7 @@ ACE_TPQ_Iterator::done () const } void -ACE_TPQ_Iterator::advance (void) +ACE_TPQ_Iterator::advance () { ACE_TRACE ("ACE_TPQ_Iterator::advance"); @@ -276,7 +276,7 @@ ACE_Token_Proxy_Queue::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Token_Proxy_Queue::ACE_Token_Proxy_Queue (void) +ACE_Token_Proxy_Queue::ACE_Token_Proxy_Queue () : head_ (0), tail_ (0), size_ (0) @@ -337,7 +337,7 @@ ACE_Token_Proxy_Queue::enqueue (ACE_TPQ_Entry *tpq, } void -ACE_Token_Proxy_Queue::dequeue (void) +ACE_Token_Proxy_Queue::dequeue () { ACE_TRACE ("ACE_Token_Proxy_Queue::dequeue"); @@ -447,7 +447,7 @@ ACE_Mutex_Token::ACE_Mutex_Token (const ACE_TCHAR *name) ACE_MAXTOKENNAMELEN); } -ACE_Mutex_Token::~ACE_Mutex_Token (void) +ACE_Mutex_Token::~ACE_Mutex_Token () { ACE_TRACE ("ACE_Mutex_Token::~ACE_Mutex_Token"); } @@ -704,7 +704,7 @@ ACE_RW_Token::ACE_RW_Token (const ACE_TCHAR *name) ACE_MAXTOKENNAMELEN); } -ACE_RW_Token::~ACE_RW_Token (void) +ACE_RW_Token::~ACE_RW_Token () { ACE_TRACE ("ACE_RW_Token::~ACE_RW_Token"); } @@ -1103,7 +1103,7 @@ ACE_Token_Proxy::client_id (const ACE_TCHAR *client_id) } const ACE_TCHAR * -ACE_Token_Proxy::owner_id (void) +ACE_Token_Proxy::owner_id () { ACE_TRACE ("ACE_Token_Proxy::owner_id"); return this->token_->owner_id (); @@ -1120,7 +1120,7 @@ ACE_Token_Proxy::name () const # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ #endif -ACE_Token_Proxy::ACE_Token_Proxy (void) +ACE_Token_Proxy::ACE_Token_Proxy () : token_ (0), waiter_ (this, 0) { @@ -1142,7 +1142,7 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &) #endif // @@ should I do a mutex_->release ()? -ACE_Token_Proxy::~ACE_Token_Proxy (void) +ACE_Token_Proxy::~ACE_Token_Proxy () { ACE_TRACE ("ACE_Token_Proxy::~ACE_Token_Proxy"); @@ -1407,7 +1407,7 @@ ACE_Token_Proxy::remove (ACE_Synch_Options &) } void -ACE_Token_Proxy::sleep_hook (void) +ACE_Token_Proxy::sleep_hook () { ACE_TRACE ("ACE_Token_Proxy::sleep_hook"); // Somebody wants our token! (Let'em wait...) @@ -1522,13 +1522,13 @@ ACE_Local_Mutex::create_token (const ACE_TCHAR *name) return temp; } -ACE_Local_Mutex::~ACE_Local_Mutex (void) +ACE_Local_Mutex::~ACE_Local_Mutex () { } // ************************************************************ -ACE_Local_RLock::~ACE_Local_RLock (void) +ACE_Local_RLock::~ACE_Local_RLock () { } @@ -1562,7 +1562,7 @@ ACE_Local_RLock::clone () const // ************************************************************ -ACE_Local_WLock::~ACE_Local_WLock (void) +ACE_Local_WLock::~ACE_Local_WLock () { } diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h index 6b137152143..fcfe7766c3e 100644 --- a/ACE/ace/Local_Tokens.h +++ b/ACE/ace/Local_Tokens.h @@ -109,7 +109,7 @@ public: typedef void (*PTVF) (void *); /// Null constructor. - ACE_TPQ_Entry (void); + ACE_TPQ_Entry (); /// Constructor. ACE_TPQ_Entry (const ACE_Token_Proxy *proxy, @@ -119,7 +119,7 @@ public: ACE_TPQ_Entry (const ACE_TPQ_Entry &rhs); /// Destructor. - ~ACE_TPQ_Entry (void); + ~ACE_TPQ_Entry (); /// Copy operator use by the queue. void operator= (const ACE_TPQ_Entry &rhs); @@ -155,7 +155,7 @@ public: PTVF sleep_hook () const; /// Call the sleep hook function or method passing arg. - void call_sleep_hook (void); + void call_sleep_hook (); /// Dump the state of the class. void dump () const; @@ -222,13 +222,13 @@ public: virtual ACE_TPQ_Entry *make_TSS_TYPE () const; /// Operator overloading and inheritance don't mix. - operator ACE_TPQ_Entry *(void); + operator ACE_TPQ_Entry *(); /// Dump the state of the class. void dump () const; #if defined (ACE_NO_TSS_TOKENS) - ACE_TPQ_Entry *operator-> (void) + ACE_TPQ_Entry *operator-> () { return (ACE_TPQ_Entry *) this; } @@ -274,7 +274,7 @@ public: int done () const; /// Move forward by one element in the queue. - void advance (void); + void advance (); /// Dump the state of an object. void dump () const; @@ -304,7 +304,7 @@ public: friend class ACE_TPQ_Iterator; /// Constructor. - ACE_Token_Proxy_Queue (void); + ACE_Token_Proxy_Queue (); /// Destructor. ~ACE_Token_Proxy_Queue () = default; @@ -318,19 +318,19 @@ public: int position); /// Top of the queue. - const ACE_TPQ_Entry* head (void); + const ACE_TPQ_Entry* head (); // int member (const ACE_TCHAR *id); // Is this id in the waiter list? /// Remove the top waiter. - void dequeue (void); + void dequeue (); /// Remove the waiter whose proxy ref matches @a remove_me. void remove (const ACE_TPQ_Entry *remove_me); /// The number of waiters. - int size (void); + int size (); /// Dump the state of the class. void dump () const; @@ -412,22 +412,22 @@ public: virtual int is_owner (const ACE_TCHAR *id) = 0; /// Return the queue of waiters. - virtual ACE_Token_Proxy_Queue *waiters (void); + virtual ACE_Token_Proxy_Queue *waiters (); /// Return the number of proxies that are currently waiting to get /// the token. - virtual int no_of_waiters (void); + virtual int no_of_waiters (); /// The current owner. - const ACE_TCHAR *owner_id (void); + const ACE_TCHAR *owner_id (); /// Token name. - const ACE_TCHAR* name (void); + const ACE_TCHAR* name (); // = Reference counting. These are only called by the // Token_Manager. - void inc_reference (void); - int dec_reference (void); + void inc_reference (); + int dec_reference (); /// Dump the state of the class. void dump () const; @@ -453,10 +453,10 @@ public: void visit (int v); /// Check if the token has been visited. - int visited (void); + int visited (); /// All the data of the current owner. - ACE_TPQ_Entry *owner (void); + ACE_TPQ_Entry *owner (); protected: /// For the deadlock detection algorithm. @@ -497,7 +497,7 @@ public: explicit ACE_Mutex_Token (const ACE_TCHAR* name); /// Destructor - virtual ~ACE_Mutex_Token (void); + virtual ~ACE_Mutex_Token (); // = Synchronization operations. // With acquire, renew, and release, the caller must be specified so @@ -592,7 +592,7 @@ public: explicit ACE_RW_Token (const ACE_TCHAR* name); /// Destructor. - virtual ~ACE_RW_Token (void); + virtual ~ACE_RW_Token (); // = Synchronization operations. // With acquire, renew, and release, the caller must be specified so @@ -695,7 +695,7 @@ public: ACE_Token_Name (const ACE_Token_Name &rhs); /// Destructor. - virtual ~ACE_Token_Name (void); + virtual ~ACE_Token_Name (); /// Copy. void operator= (const ACE_Token_Name &rhs); @@ -751,10 +751,10 @@ public: // Initialization and termination methods. /// Construction. - ACE_Token_Proxy (void); + ACE_Token_Proxy (); /// Destructor. - virtual ~ACE_Token_Proxy (void); + virtual ~ACE_Token_Proxy (); /** * Open the <ACE_Token>. @@ -846,14 +846,14 @@ public: * by ACE_Token_xx's when another proxy enters the waiting list and * requests that the current token holder be notified. */ - virtual void sleep_hook (void); + virtual void sleep_hook (); /// This is called when a queued (waiting) proxy is removed from the /// waiters list and given the token. virtual void token_acquired (ACE_TPQ_Entry *); /// The client id of the current token holder - virtual const ACE_TCHAR *owner_id (void); + virtual const ACE_TCHAR *owner_id (); /// Return a dynamically allocated clone of the derived class. virtual ACE_Token_Proxy *clone () const = 0; @@ -975,7 +975,7 @@ public: int debug = 0); /// Destructor - ~ACE_Local_Mutex (void); + ~ACE_Local_Mutex (); /// Dump the state of the class. void dump () const; @@ -1027,7 +1027,7 @@ public: int debug = 0); /// Destructor - ~ACE_Local_RLock (void); + ~ACE_Local_RLock (); /// Dump the state of the class. void dump () const; diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h index dcf8cabaa0d..2ee834409cf 100644 --- a/ACE/ace/MEM_Acceptor.h +++ b/ACE/ace/MEM_Acceptor.h @@ -53,10 +53,10 @@ class ACE_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor { public: /// Default constructor. - ACE_MEM_Acceptor (void); + ACE_MEM_Acceptor (); /// Destructor. - ~ACE_MEM_Acceptor (void); + ~ACE_MEM_Acceptor (); /// Initiate a passive mode socket. ACE_MEM_Acceptor (const ACE_MEM_Addr &remote_sap, diff --git a/ACE/ace/MEM_Connector.h b/ACE/ace/MEM_Connector.h index 1182198fa74..334ab605901 100644 --- a/ACE/ace/MEM_Connector.h +++ b/ACE/ace/MEM_Connector.h @@ -36,7 +36,7 @@ class ACE_Export ACE_MEM_Connector : public ACE_SOCK_Connector { public: /// Default constructor. - ACE_MEM_Connector (void); + ACE_MEM_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_MEM_Stream diff --git a/ACE/ace/MEM_IO.h b/ACE/ace/MEM_IO.h index a7a582e1f07..9f9b4787c59 100644 --- a/ACE/ace/MEM_IO.h +++ b/ACE/ace/MEM_IO.h @@ -32,9 +32,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP { public: - ACE_Reactive_MEM_IO (void); + ACE_Reactive_MEM_IO (); - virtual ~ACE_Reactive_MEM_IO (void); + virtual ~ACE_Reactive_MEM_IO (); /** * Initialize the MEM_SAP object. @@ -85,14 +85,14 @@ public: class Simple_Queue { public: - Simple_Queue (void); + Simple_Queue (); Simple_Queue (MQ_Struct *mq); int init (MQ_Struct *mq, ACE_MEM_SAP::MALLOC_TYPE *malloc); int write (ACE_MEM_SAP_Node *new_msg); - ACE_MEM_SAP_Node *read (void); + ACE_MEM_SAP_Node *read (); private: MQ_Struct *mq_; ACE_MEM_SAP::MALLOC_TYPE *malloc_; @@ -105,9 +105,9 @@ public: Simple_Queue queue_; } Channel; - ACE_MT_MEM_IO (void); + ACE_MT_MEM_IO (); - virtual ~ACE_MT_MEM_IO (void); + virtual ~ACE_MT_MEM_IO (); /** * Initialize the MEM_SAP object. @@ -171,10 +171,10 @@ class ACE_Export ACE_MEM_IO : public ACE_SOCK { public: /// Constructor. - ACE_MEM_IO (void); + ACE_MEM_IO (); /// Destructor. - ~ACE_MEM_IO (void); + ~ACE_MEM_IO (); typedef enum { @@ -193,7 +193,7 @@ public: * Finalizing the MEM_IO object. This method doesn't invoke * the <remove> method. */ - int fini (void); + int fini (); /// Send an @a n byte buffer to the other process using shm_malloc_ /// connected thru the socket. diff --git a/ACE/ace/MEM_SAP.h b/ACE/ace/MEM_SAP.h index 295beec2c17..7b19e8da1ae 100644 --- a/ACE/ace/MEM_SAP.h +++ b/ACE/ace/MEM_SAP.h @@ -76,7 +76,7 @@ public: typedef ACE_MMAP_Memory_Pool_Options MALLOC_OPTIONS; /// Destructor. - virtual ~ACE_MEM_SAP (void); + virtual ~ACE_MEM_SAP (); /** * Initialize the MEM_SAP object. @@ -136,7 +136,7 @@ protected: /// Close down the share memory pool. Clean up the /// mmap file if we are the last one using it. - int close_shm_malloc (void); + int close_shm_malloc (); ACE_HANDLE handle_; @@ -144,7 +144,7 @@ protected: MALLOC_TYPE *shm_malloc_; /// Constructor. Prevent this class from being instantiated. - ACE_MEM_SAP (void); + ACE_MEM_SAP (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/MEM_Stream.h b/ACE/ace/MEM_Stream.h index 55f8db9c23a..c9e6e5a2330 100644 --- a/ACE/ace/MEM_Stream.h +++ b/ACE/ace/MEM_Stream.h @@ -59,13 +59,13 @@ public: // Initialization and termination methods. /// Constructor. - ACE_MEM_Stream (void); + ACE_MEM_Stream (); /// Constructor (sets the underlying ACE_HANDLE with <h>). ACE_MEM_Stream (ACE_HANDLE h); /// Destructor. - ~ACE_MEM_Stream (void); + ~ACE_MEM_Stream (); //= The following two methods use write and read system calls. /// Send n bytes, keep trying until n are sent. @@ -82,17 +82,17 @@ public: // = Selectively close endpoints. /// Close down the reader. - int close_reader (void); + int close_reader (); /// Close down the writer. - int close_writer (void); + int close_writer (); /** * Close down the socket (we need this to make things work correctly * on Win32, which requires use to do a <close_writer> before doing * the close to avoid losing data). */ - int close (void); + int close (); // = Meta-type info typedef ACE_Addr PEER_ADDR; diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h index c150243e150..d53c43574bd 100644 --- a/ACE/ace/MMAP_Memory_Pool.h +++ b/ACE/ace/MMAP_Memory_Pool.h @@ -140,7 +140,7 @@ public: const OPTIONS *options = 0); /// Destructor. - virtual ~ACE_MMAP_Memory_Pool (void); + virtual ~ACE_MMAP_Memory_Pool (); /// Ask system for initial chunk of shared memory. virtual void *init_acquire (size_t nbytes, @@ -219,7 +219,7 @@ public: ACE_Mem_Map const & mmap () const; /// Get reference to underlying ACE_Mem_Map object. - ACE_Mem_Map & mmap (void); + ACE_Mem_Map & mmap (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -320,7 +320,7 @@ public: const OPTIONS *options = 0); /// Destructor. - virtual ~ACE_Lite_MMAP_Memory_Pool (void); + virtual ~ACE_Lite_MMAP_Memory_Pool (); /// Overwrite the default sync behavior with no-op virtual int sync (size_t len, int flags = MS_SYNC); diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index c61b0151cfd..de9f79aad1d 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -145,7 +145,7 @@ ACE_Control_Block::ACE_Name_Node::dump () const #if defined (ACE_HAS_MALLOC_STATS) -ACE_Malloc_Stats::ACE_Malloc_Stats (void) +ACE_Malloc_Stats::ACE_Malloc_Stats () : nchunks_ (0), nblocks_ (0), ninuse_ (0) diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index e7c28760a8c..c519caff0ed 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -416,9 +416,9 @@ class ACE_Malloc_FIFO_Iterator_T; * - constructor (const ACE_TCHAR *pool_name, const MEMORY_POOL_OPTIONS *options) * - 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) + * - int release () * - void *acquire (size_t nbytes, size_t &rounded_bytes) - * - void *base_addr (void) + * - void *base_addr () * - seh_selector() (only needed on Windows) * * Note that the ACE_Allocator_Adapter class can be used to integrate allocator diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp index c2222bb4279..9b5e9052e44 100644 --- a/ACE/ace/Map_Manager.cpp +++ b/ACE/ace/Map_Manager.cpp @@ -133,7 +133,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::next_free (ACE_UINT32 &free_slot) #if defined (ACE_HAS_LAZY_MAP_MANAGER) template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::move_all_free_slots_from_occupied_list (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::move_all_free_slots_from_occupied_list () { // // In the case of lazy map managers, the movement of free slots from diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index d559d00ef8a..0fa8735c88e 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -389,7 +389,7 @@ protected: * free slots in the free list. This function goes through the * entire occupied list, moving free slots to the free list. */ - void move_all_free_slots_from_occupied_list (void); + void move_all_free_slots_from_occupied_list (); #endif /* ACE_HAS_LAZY_MAP_MANAGER */ diff --git a/ACE/ace/Mem_Map.h b/ACE/ace/Mem_Map.h index b44241b064d..9f728fa2e09 100644 --- a/ACE/ace/Mem_Map.h +++ b/ACE/ace/Mem_Map.h @@ -40,7 +40,7 @@ class ACE_Export ACE_Mem_Map : private ACE_Copy_Disabled { public: /// Default constructor. - ACE_Mem_Map (void); + ACE_Mem_Map (); /// Map a file from an open file descriptor @a handle. This function /// will lookup the length of the file if it is not given. diff --git a/ACE/ace/Message_Queue_NT.cpp b/ACE/ace/Message_Queue_NT.cpp index 0273fe9f841..e3d82e10ea2 100644 --- a/ACE/ace/Message_Queue_NT.cpp +++ b/ACE/ace/Message_Queue_NT.cpp @@ -38,7 +38,7 @@ ACE_Message_Queue_NT::open (DWORD max_threads) } int -ACE_Message_Queue_NT::close (void) +ACE_Message_Queue_NT::close () { ACE_TRACE ("ACE_Message_Queue_NT::close"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -46,7 +46,7 @@ ACE_Message_Queue_NT::close (void) return (::CloseHandle (this->completion_port_) ? 0 : -1 ); } -ACE_Message_Queue_NT::~ACE_Message_Queue_NT (void) +ACE_Message_Queue_NT::~ACE_Message_Queue_NT () { ACE_TRACE ("ACE_Message_Queue_NT::~ACE_Message_Queue_NT"); this->close (); @@ -131,7 +131,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item, } int -ACE_Message_Queue_NT::deactivate (void) +ACE_Message_Queue_NT::deactivate () { ACE_TRACE ("ACE_Message_Queue_NT::deactivate"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -155,7 +155,7 @@ ACE_Message_Queue_NT::deactivate (void) } int -ACE_Message_Queue_NT::activate (void) +ACE_Message_Queue_NT::activate () { ACE_TRACE ("ACE_Message_Queue_NT::activate"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -165,7 +165,7 @@ ACE_Message_Queue_NT::activate (void) } int -ACE_Message_Queue_NT::pulse (void) +ACE_Message_Queue_NT::pulse () { ACE_TRACE ("ACE_Message_Queue_NT::pulse"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h index 0cde39ca08a..60a20242d39 100644 --- a/ACE/ace/Message_Queue_NT.h +++ b/ACE/ace/Message_Queue_NT.h @@ -167,7 +167,7 @@ public: // = Not currently implemented... int peek_dequeue_head (ACE_Message_Block *&first_item, ACE_Time_Value *timeout = 0); - ACE_Notification_Strategy *notification_strategy (void); + ACE_Notification_Strategy *notification_strategy (); void notification_strategy (ACE_Notification_Strategy *s); // = Notification hook. diff --git a/ACE/ace/Message_Queue_Vx.cpp b/ACE/ace/Message_Queue_Vx.cpp index 5136bb58538..ae7a1b1df18 100644 --- a/ACE/ace/Message_Queue_Vx.cpp +++ b/ACE/ace/Message_Queue_Vx.cpp @@ -69,7 +69,7 @@ ACE_Message_Queue_Vx::ACE_Message_Queue_Vx (size_t max_messages, ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("open"))); } -ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void) +ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx () { ACE_TRACE ("ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx"); @@ -113,7 +113,7 @@ ACE_Message_Queue_Vx::open (size_t max_messages, // Clean up the queue if we have not already done so! int -ACE_Message_Queue_Vx::close (void) +ACE_Message_Queue_Vx::close () { ACE_TRACE ("ACE_Message_Queue_Vx::close"); // Don't lock, because we don't have a lock. It shouldn't be @@ -129,14 +129,14 @@ ACE_Message_Queue_Vx::close (void) } bool -ACE_Message_Queue_Vx::is_empty_i (void) +ACE_Message_Queue_Vx::is_empty_i () { ACE_TRACE ("ACE_Message_Queue_Vx::is_empty_i"); return ::msgQNumMsgs (msgq ()) == 0; } bool -ACE_Message_Queue_Vx::is_full_i (void) +ACE_Message_Queue_Vx::is_full_i () { ACE_TRACE ("ACE_Message_Queue_Vx::is_full_i"); return ::msgQNumMsgs (msgq ()) >= max_messages_; diff --git a/ACE/ace/Metrics_Cache_T.cpp b/ACE/ace/Metrics_Cache_T.cpp index c2611b921d3..a9967e460ac 100644 --- a/ACE/ace/Metrics_Cache_T.cpp +++ b/ACE/ace/Metrics_Cache_T.cpp @@ -105,7 +105,7 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::is_event (const ACE_Metrics_Timeprob template <class ACE_LOCK, class ALLOCATOR> const char * -ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (void) +ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name () { return name_; } @@ -131,7 +131,7 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (char * name) template <class ACE_LOCK, class ALLOCATOR> u_int -ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_id (void) +ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_id () { return id_; } @@ -206,7 +206,7 @@ ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::~ACE_Metrics_Cache () // the singleton allocator in the current process is used. template <class ACE_LOCK, class ALLOCATOR> ALLOCATOR * -ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::allocator (void) +ACE_Metrics_Cache<ACE_LOCK, ALLOCATOR>::allocator () { ALLOCATOR * alloc = allocator_; return alloc diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h index 254cba424f3..46ba0333fe2 100644 --- a/ACE/ace/Metrics_Cache_T.h +++ b/ACE/ace/Metrics_Cache_T.h @@ -80,11 +80,11 @@ public: ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::event_id id); /// Accessor and mutator for probe name. - const char * probe_name (void); + const char * probe_name (); void probe_name (char * name); /// Accessor for probe id. - u_int probe_id (void); + u_int probe_id (); /// Mutator for probe id. void probe_id (u_int id); @@ -164,7 +164,7 @@ protected: /// Obtain an allocator pointer correctly thunked for the current /// address space. If there is no allocator stored in the instance, /// the singleton allocator in the current process is used. - ALLOCATOR * allocator (void); + ALLOCATOR * allocator (); // = Implementation members. diff --git a/ACE/ace/Monitor_Admin_Manager.h b/ACE/ace/Monitor_Admin_Manager.h index 5b4f04c2302..f3c27214bf5 100644 --- a/ACE/ace/Monitor_Admin_Manager.h +++ b/ACE/ace/Monitor_Admin_Manager.h @@ -42,10 +42,10 @@ namespace ACE { public: /// Access the admin instance. - ACE::Monitor_Control::Monitor_Admin& admin (void); + ACE::Monitor_Control::Monitor_Admin& admin (); /// Used to force initialization of the MC service. - static int Initializer (void); + static int Initializer (); private: Monitor_Admin admin_; diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp index e65e4f2ec97..ad603b39aa1 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp @@ -12,12 +12,12 @@ namespace ACE { namespace Monitor_Control { - Auto_Update_Starter::Auto_Update_Starter (void) + Auto_Update_Starter::Auto_Update_Starter () { } int - Auto_Update_Starter::svc (void) + Auto_Update_Starter::svc () { MC_ADMINMANAGER* mgr = ACE_Dynamic_Service<MC_ADMINMANAGER>::instance ("MC_ADMINMANAGER"); diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.h b/ACE/ace/Monitor_Control/Auto_Update_Starter.h index 7a488d5370f..f773b24217c 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.h +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.h @@ -43,9 +43,9 @@ namespace ACE class MONITOR_CONTROL_Export Auto_Update_Starter : public ACE_Task_Base { public: - Auto_Update_Starter (void); + Auto_Update_Starter (); - int svc (void); + int svc (); }; } } diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp index 1e8a99d2876..718e603d911 100644 --- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp @@ -27,20 +27,20 @@ namespace ACE } void - BSD_Network_Interface_Monitor::update_i (void) + BSD_Network_Interface_Monitor::update_i () { this->fetch(this->value_); this->value_ -= this->start_; } void - BSD_Network_Interface_Monitor::clear_impl (void) + BSD_Network_Interface_Monitor::clear_impl () { this->init(); } void - BSD_Network_Interface_Monitor::init (void) + BSD_Network_Interface_Monitor::init () { this->fetch(this->start_); this->value_ = 0UL; diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp index 0cca617c78f..9ed53f08b30 100644 --- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp @@ -30,7 +30,7 @@ namespace ACE {} void - Bytes_Received_Monitor::update (void) + Bytes_Received_Monitor::update () { this->update_i (); @@ -39,13 +39,13 @@ namespace ACE } const char* - Bytes_Received_Monitor::default_name (void) + Bytes_Received_Monitor::default_name () { return Bytes_Received_Monitor::default_name_; } void - Bytes_Received_Monitor::clear_i (void) + Bytes_Received_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h index eabb99399ca..cecc79da264 100644 --- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h +++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h @@ -68,14 +68,14 @@ namespace ACE Bytes_Received_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp index 7e1e408a5f9..98a05b365ed 100644 --- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp @@ -30,7 +30,7 @@ namespace ACE {} void - Bytes_Sent_Monitor::update (void) + Bytes_Sent_Monitor::update () { this->update_i (); @@ -39,13 +39,13 @@ namespace ACE } const char* - Bytes_Sent_Monitor::default_name (void) + Bytes_Sent_Monitor::default_name () { return Bytes_Sent_Monitor::default_name_; } void - Bytes_Sent_Monitor::clear_i (void) + Bytes_Sent_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h index 7cf0def29da..132b6d74004 100644 --- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h +++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h @@ -68,14 +68,14 @@ namespace ACE Bytes_Sent_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp index 5aa5b944bf2..60ca87f76c4 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp @@ -47,7 +47,7 @@ namespace ACE } void - CPU_Load_Monitor::update (void) + CPU_Load_Monitor::update () { #if defined (ACE_HAS_WIN32_PDH) this->update_i (); @@ -82,13 +82,13 @@ namespace ACE } const char* - CPU_Load_Monitor::default_name (void) + CPU_Load_Monitor::default_name () { return CPU_Load_Monitor::default_name_; } void - CPU_Load_Monitor::clear_i (void) + CPU_Load_Monitor::clear_i () { #if defined (ACE_HAS_WIN32_PDH) this->clear_impl (); @@ -99,7 +99,7 @@ namespace ACE } void - CPU_Load_Monitor::init (void) + CPU_Load_Monitor::init () { #if defined (ACE_LINUX) /// All data in this file are stored as running 'jiffy' totals, so we diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h index 7ae6dda69d5..037cb5d19b2 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h @@ -50,17 +50,17 @@ namespace ACE CPU_Load_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); /// Common code to the constructor and to clear_i(). - void init (void); + void init (); private: #if defined (ACE_LINUX) diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp index f6b4f685958..7cd1922fd3a 100644 --- a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp +++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp @@ -14,11 +14,11 @@ namespace ACE { namespace Monitor_Control { - Constraint_Interpreter::Constraint_Interpreter (void) + Constraint_Interpreter::Constraint_Interpreter () { } - Constraint_Interpreter::~Constraint_Interpreter (void) + Constraint_Interpreter::~Constraint_Interpreter () { } diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.h b/ACE/ace/Monitor_Control/Constraint_Interpreter.h index d63bf35f816..e867c72ef0d 100644 --- a/ACE/ace/Monitor_Control/Constraint_Interpreter.h +++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.h @@ -44,9 +44,9 @@ namespace ACE : public ETCL_Interpreter { public: - Constraint_Interpreter (void); + Constraint_Interpreter (); - virtual ~Constraint_Interpreter (void); + virtual ~Constraint_Interpreter (); /** * This method builds an expression tree representing the diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp index 1348f6a21c6..e793a54d722 100644 --- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp @@ -28,20 +28,20 @@ namespace ACE } void - FreeBSD_Network_Interface_Monitor::update_i (void) + FreeBSD_Network_Interface_Monitor::update_i () { this->fetch(this->value_); this->value_ -= this->start_; } void - FreeBSD_Network_Interface_Monitor::clear_impl (void) + FreeBSD_Network_Interface_Monitor::clear_impl () { this->init(); } void - FreeBSD_Network_Interface_Monitor::init (void) + FreeBSD_Network_Interface_Monitor::init () { this->fetch(this->start_); this->value_ = 0UL; diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h index 61a650c4c56..521f746df81 100644 --- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h @@ -41,16 +41,16 @@ namespace ACE FreeBSD_Network_Interface_Monitor (const ACE_TCHAR *lookup_str); /// Platform-specific implementation. - void update_i (void); + void update_i (); /// Platform-specific reset. - void clear_impl (void); + void clear_impl (); protected: ACE_UINT64 value_; private: - void init (void); + void init (); void fetch (ACE_UINT64& value) const; ACE_UINT64 start_; diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp index a92f82b8816..b0534ca00be 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp @@ -21,7 +21,7 @@ namespace ACE } void - Linux_Network_Interface_Monitor::update_i (void) + Linux_Network_Interface_Monitor::update_i () { char buf[1024]; FILE* fp = ACE_OS::fopen (ACE_TEXT ("/proc/net/dev"), @@ -66,13 +66,13 @@ namespace ACE } void - Linux_Network_Interface_Monitor::clear_impl (void) + Linux_Network_Interface_Monitor::clear_impl () { this->init (); } void - Linux_Network_Interface_Monitor::init (void) + Linux_Network_Interface_Monitor::init () { for (unsigned long i = 0UL; i < MAX_INTERFACES; ++i) { diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h index 0320bfa3f8c..5622c7138f3 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h @@ -44,17 +44,17 @@ namespace ACE Linux_Network_Interface_Monitor (const char *scan_format); /// Platform-specific implementation. - void update_i (void); + void update_i (); /// Platform-specific reset. - void clear_impl (void); + void clear_impl (); protected: ACE_UINT64 value_; private: /// Common code. - void init (void); + void init (); private: static const unsigned long MAX_INTERFACES = 10UL; diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp index 73b29f73abd..49593fee95c 100644 --- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp @@ -24,7 +24,7 @@ namespace ACE } void - Memory_Usage_Monitor::update (void) + Memory_Usage_Monitor::update () { #if defined (ACE_HAS_WIN32_PDH) this->update_i (); @@ -54,13 +54,13 @@ namespace ACE } const char* - Memory_Usage_Monitor::default_name (void) + Memory_Usage_Monitor::default_name () { return Memory_Usage_Monitor::default_name_; } void - Memory_Usage_Monitor::clear_i (void) + Memory_Usage_Monitor::clear_i () { #if defined (ACE_HAS_WIN32_PDH) this->clear_impl (); diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h index c8eb730767b..064b5e74e2d 100644 --- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h +++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h @@ -50,14 +50,14 @@ namespace ACE Memory_Usage_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Monitor_Group.cpp b/ACE/ace/Monitor_Control/Monitor_Group.cpp index 77cc456797f..42c8b824bb5 100644 --- a/ACE/ace/Monitor_Control/Monitor_Group.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Group.cpp @@ -19,7 +19,7 @@ namespace ACE } void - Monitor_Group::update (void) + Monitor_Group::update () { for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ()) { @@ -48,7 +48,7 @@ namespace ACE } void - Monitor_Group::clear (void) + Monitor_Group::clear () { for (MEMBERS_ITERATOR i (this->members_); !i.done (); i.advance ()) { diff --git a/ACE/ace/Monitor_Control/Monitor_Group.h b/ACE/ace/Monitor_Control/Monitor_Group.h index 2ce370c860b..6aa62894936 100644 --- a/ACE/ace/Monitor_Control/Monitor_Group.h +++ b/ACE/ace/Monitor_Control/Monitor_Group.h @@ -41,14 +41,14 @@ namespace ACE void add_member (Monitor_Base* member); - virtual void update (void); + virtual void update (); /// These are overridden to be no-ops. virtual void receive (double data); virtual void receive (size_t data); virtual void receive (const Monitor_Control_Types::NameList& data); - virtual void clear (void); + virtual void clear (); private: typedef ACE_Unbounded_Queue<Monitor_Base *> diff --git a/ACE/ace/Monitor_Control/Monitor_Query.cpp b/ACE/ace/Monitor_Control/Monitor_Query.cpp index 6de953b1619..e51595c3545 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Query.cpp @@ -48,7 +48,7 @@ namespace ACE } void - Monitor_Query::query (void) + Monitor_Query::query () { if (this->monitor_ == 0) { diff --git a/ACE/ace/Monitor_Control/Monitor_Query.h b/ACE/ace/Monitor_Control/Monitor_Query.h index 5c24c7f4ab4..2cfe0461b9d 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.h +++ b/ACE/ace/Monitor_Control/Monitor_Query.h @@ -59,7 +59,7 @@ namespace ACE public: Monitor_Query (const char* monitor_name); - void query (void); + void query (); private: Monitor_Base* monitor_; diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp index ad554ca17cd..4a52c001503 100644 --- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp @@ -6,19 +6,19 @@ namespace ACE { namespace Monitor_Control { - Null_Network_Interface_Monitor::Null_Network_Interface_Monitor (void) + Null_Network_Interface_Monitor::Null_Network_Interface_Monitor () : value_ (0UL) { } void - Null_Network_Interface_Monitor::update_i (void) + Null_Network_Interface_Monitor::update_i () { /// No-op. } void - Null_Network_Interface_Monitor::clear_impl (void) + Null_Network_Interface_Monitor::clear_impl () { /// No-op. } diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h index 82fd3170784..568a1ed2a34 100644 --- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h @@ -38,13 +38,13 @@ namespace ACE class MONITOR_CONTROL_Export Null_Network_Interface_Monitor { protected: - Null_Network_Interface_Monitor (void); + Null_Network_Interface_Monitor (); /// Platform-specific implementation. - void update_i (void); + void update_i (); /// Platform-specific reset. - void clear_impl (void); + void clear_impl (); protected: ACE_UINT64 value_; diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp index f4a33708133..c42fac4f098 100644 --- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp @@ -30,7 +30,7 @@ namespace ACE } void - Num_Threads_Monitor::update (void) + Num_Threads_Monitor::update () { #if defined (ACE_HAS_WIN32_PDH) this->update_i (); @@ -75,13 +75,13 @@ namespace ACE } const char* - Num_Threads_Monitor::default_name (void) + Num_Threads_Monitor::default_name () { return Num_Threads_Monitor::default_name_; } void - Num_Threads_Monitor::clear_i (void) + Num_Threads_Monitor::clear_i () { #if defined (ACE_HAS_WIN32_PDH) this->clear_impl (); diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h index 2c44c0e7f4a..422a71c79ea 100644 --- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h +++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h @@ -56,14 +56,14 @@ namespace ACE Num_Threads_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp index f0029acd6a8..c01091eacce 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp @@ -30,7 +30,7 @@ namespace ACE {} void - Packets_Received_Monitor::update (void) + Packets_Received_Monitor::update () { this->update_i (); @@ -39,13 +39,13 @@ namespace ACE } const char* - Packets_Received_Monitor::default_name (void) + Packets_Received_Monitor::default_name () { return Packets_Received_Monitor::default_name_; } void - Packets_Received_Monitor::clear_i (void) + Packets_Received_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h index bb0e7d0763f..d7f80a1491d 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h @@ -68,14 +68,14 @@ namespace ACE Packets_Received_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp index de5cfd37813..fc880ed7ae0 100644 --- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp @@ -30,7 +30,7 @@ namespace ACE {} void - Packets_Sent_Monitor::update (void) + Packets_Sent_Monitor::update () { this->update_i (); @@ -39,13 +39,13 @@ namespace ACE } const char* - Packets_Sent_Monitor::default_name (void) + Packets_Sent_Monitor::default_name () { return Packets_Sent_Monitor::default_name_; } void - Packets_Sent_Monitor::clear_i (void) + Packets_Sent_Monitor::clear_i () { this->clear_impl (); this->Monitor_Base::clear_i (); diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h index 1ad0a2d9a6c..c547434b46a 100644 --- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h +++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h @@ -68,14 +68,14 @@ namespace ACE Packets_Sent_Monitor (const char* name); /// Implementation of the pure virtual method. - virtual void update (void); + virtual void update (); /// Stores the default name, used if none is supplied by the user. - static const char* default_name (void); + static const char* default_name (); private: /// Overridden reset, calls platform-specific reset. - virtual void clear_i (void); + virtual void clear_i (); private: static const char* default_name_; diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp index d57dc88ad37..a3e09a8afa2 100644 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp @@ -21,20 +21,20 @@ namespace ACE } void - Solaris_Network_Interface_Monitor::update_i (void) + Solaris_Network_Interface_Monitor::update_i () { this->access_kstats (this->value_); this->value_ -= this->start_; } void - Solaris_Network_Interface_Monitor::clear_impl (void) + Solaris_Network_Interface_Monitor::clear_impl () { this->init (); } void - Solaris_Network_Interface_Monitor::init (void) + Solaris_Network_Interface_Monitor::init () { unsigned long i; diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h index 83f02f71e05..15dbc9c50e1 100644 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h @@ -46,10 +46,10 @@ namespace ACE Solaris_Network_Interface_Monitor (const ACE_TCHAR *lookup_str); /// Platform-specific implementation. - void update_i (void); + void update_i (); /// Platform-specific reset. - void clear_impl (void); + void clear_impl (); protected: ACE_UINT64 value_; @@ -57,7 +57,7 @@ namespace ACE private: /// Common code. - void init (void); + void init (); void access_kstats (ACE_UINT64 &which_member); int check_ks_module (const unsigned long ks_instance, const unsigned long which_max, diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Monitor.cpp index d44f7e58a24..2759ee6c2a0 100644 --- a/ACE/ace/Monitor_Control/Windows_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Monitor.cpp @@ -21,7 +21,7 @@ namespace ACE } void - Windows_Monitor::update_i (void) + Windows_Monitor::update_i () { PdhCollectQueryData (this->query_); PDH_FMT_COUNTERVALUE pdh_value; @@ -35,13 +35,13 @@ namespace ACE } void - Windows_Monitor::clear_impl (void) + Windows_Monitor::clear_impl () { this->init (); } void - Windows_Monitor::init (void) + Windows_Monitor::init () { /// Create a query and a counter here so it doesn't have /// to be done with each update. diff --git a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp index 7d3b68d5c0e..8a38444b76a 100644 --- a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp @@ -60,7 +60,7 @@ namespace ACE GlobalFree (paths); } - Windows_Multi_Instance_Monitor::~Windows_Multi_Instance_Monitor (void) + Windows_Multi_Instance_Monitor::~Windows_Multi_Instance_Monitor () { Windows_Monitor *instance = 0; @@ -72,7 +72,7 @@ namespace ACE } void - Windows_Multi_Instance_Monitor::update_i (void) + Windows_Multi_Instance_Monitor::update_i () { Windows_Monitor **current_instance = 0; @@ -88,7 +88,7 @@ namespace ACE } void - Windows_Multi_Instance_Monitor::clear_impl (void) + Windows_Multi_Instance_Monitor::clear_impl () { Windows_Monitor **current_instance = 0; diff --git a/ACE/ace/Monitor_Control_Action.h b/ACE/ace/Monitor_Control_Action.h index aea10b43b46..8f061459ffb 100644 --- a/ACE/ace/Monitor_Control_Action.h +++ b/ACE/ace/Monitor_Control_Action.h @@ -44,8 +44,8 @@ namespace ACE virtual void execute (const char* command = 0) = 0; /// Refcounting methods. - void add_ref (void); - void remove_ref (void); + void add_ref (); + void remove_ref (); protected: Control_Action (); diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp index b4488bb6e7d..57682de44f3 100644 --- a/ACE/ace/Msg_WFMO_Reactor.cpp +++ b/ACE/ace/Msg_WFMO_Reactor.cpp @@ -22,7 +22,7 @@ ACE_Msg_WFMO_Reactor::ACE_Msg_WFMO_Reactor (size_t size, { } -ACE_Msg_WFMO_Reactor::~ACE_Msg_WFMO_Reactor (void) +ACE_Msg_WFMO_Reactor::~ACE_Msg_WFMO_Reactor () { } @@ -43,7 +43,7 @@ ACE_Msg_WFMO_Reactor::wait_for_multiple_events (int timeout, } int -ACE_Msg_WFMO_Reactor::dispatch_window_messages (void) +ACE_Msg_WFMO_Reactor::dispatch_window_messages () { int number_of_messages = 0; MSG msg; diff --git a/ACE/ace/Msg_WFMO_Reactor.h b/ACE/ace/Msg_WFMO_Reactor.h index 6adb3d5d433..3381da09d5d 100644 --- a/ACE/ace/Msg_WFMO_Reactor.h +++ b/ACE/ace/Msg_WFMO_Reactor.h @@ -55,7 +55,7 @@ public: ACE_Timer_Queue * = 0); /// Close down the ACE_Msg_WFMO_Reactor and release all of its resources. - virtual ~ACE_Msg_WFMO_Reactor (void); + virtual ~ACE_Msg_WFMO_Reactor (); /** * This event loop driver blocks for up to @a max_wait_time before @@ -102,7 +102,7 @@ protected: virtual DWORD poll_remaining_handles (DWORD index); /// Dispatches window messages. - virtual int dispatch_window_messages (void); + virtual int dispatch_window_messages (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Multihomed_INET_Addr.h b/ACE/ace/Multihomed_INET_Addr.h index 496efc73bc6..58879c62632 100644 --- a/ACE/ace/Multihomed_INET_Addr.h +++ b/ACE/ace/Multihomed_INET_Addr.h @@ -34,7 +34,7 @@ class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr { public: /// Default constructor. - ACE_Multihomed_INET_Addr (void); + ACE_Multihomed_INET_Addr (); /** * Initializes an ACE_Multihomed_INET_Addr from the @a address, @@ -102,7 +102,7 @@ public: /// Use compiler-generated assignment operator. /// Default destructor. - ~ACE_Multihomed_INET_Addr (void); + ~ACE_Multihomed_INET_Addr (); // = Direct initialization methods. diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp index 3af1814f415..cdc6ecc5bc8 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -17,7 +17,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_NT_Service) // ACE_NT_Service destructor. -ACE_NT_Service::~ACE_NT_Service (void) +ACE_NT_Service::~ACE_NT_Service () { if (this->svc_sc_handle_ != 0) { @@ -236,7 +236,7 @@ ACE_NT_Service::insert (DWORD start_type, } int -ACE_NT_Service::remove (void) +ACE_NT_Service::remove () { if (this->svc_sc_handle () == 0) return -1; @@ -275,7 +275,7 @@ ACE_NT_Service::startup (DWORD startup) // Returns the current startup type. DWORD -ACE_NT_Service::startup (void) +ACE_NT_Service::startup () { // The query buffer will hold strings as well as the defined struct. // The string pointers in the struct point to other areas in the @@ -516,7 +516,7 @@ ACE_NT_Service::report_status (DWORD new_status, } SC_HANDLE -ACE_NT_Service::svc_sc_handle (void) +ACE_NT_Service::svc_sc_handle () { if (this->svc_sc_handle_ == 0) { diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h index cca6f82600c..5c9f282884f 100644 --- a/ACE/ace/NT_Service.h +++ b/ACE/ace/NT_Service.h @@ -110,7 +110,7 @@ public: DWORD service_type = SERVICE_WIN32_OWN_PROCESS, DWORD controls_mask = SERVICE_ACCEPT_STOP); - virtual ~ACE_NT_Service (void); + virtual ~ACE_NT_Service (); // = Functions to operate the service @@ -225,7 +225,7 @@ public: * first method called to be sure that any logging done is incorporated * correctly into the process's established logging setup. */ - void inherit_log_msg_attributes (void); + void inherit_log_msg_attributes (); // = Methods which control the service's execution. @@ -323,7 +323,7 @@ protected: * retrieves the handle from the Service Control Manager and caches * it. */ - SC_HANDLE svc_sc_handle (void); + SC_HANDLE svc_sc_handle (); /** * Waits for the service to reach @a desired_state or get diff --git a/ACE/ace/Name_Request_Reply.h b/ACE/ace/Name_Request_Reply.h index ec49d3679c4..0dcfeb7a240 100644 --- a/ACE/ace/Name_Request_Reply.h +++ b/ACE/ace/Name_Request_Reply.h @@ -67,7 +67,7 @@ public: }; /// Default constructor. - ACE_Name_Request (void); + ACE_Name_Request (); /// Create a ACE_Name_Request message. ACE_Name_Request (ACE_INT32 msg_type, // Type of request. @@ -81,7 +81,7 @@ public: /// Initialize length_ in order to ensure correct byte ordering /// before a request is sent. - void init (void); + void init (); // = Set/get the length of the encoded/decoded message. ACE_UINT32 length () const; @@ -127,7 +127,7 @@ public: int encode (void *&); /// Decode message after reception. - int decode (void); + int decode (); /// Print out the values of the message for debugging purposes. void dump () const; @@ -201,14 +201,14 @@ public: }; /// Default constructor. - ACE_Name_Reply (void); + ACE_Name_Reply (); /// Create a ACE_Name_Reply message. ACE_Name_Reply (ACE_UINT32 type, ACE_UINT32 err); // Type of reply. /// Initialize length_ in order to ensure correct byte ordering /// before a reply is sent. - void init (void); + void init (); // = Set/get the length of the encoded/decoded message. ACE_UINT32 length () const; @@ -230,7 +230,7 @@ public: int encode (void *&); /// Decode a message after reception. - int decode (void); + int decode (); /// Print out the values of the message for debugging purposes. void dump () const; diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h index c7b7969678f..e109bfa58ff 100644 --- a/ACE/ace/Naming_Context.h +++ b/ACE/ace/Naming_Context.h @@ -87,14 +87,14 @@ public: /// Deletes the instance of Name Space. Must be called before /// switching name spaces. - int close (void); + int close (); /// Release all resources. Gets called by destructor and fini. - int close_down (void); + int close_down (); /// destructor, do some cleanup :TBD: last dtor should "compress" /// file - ~ACE_Naming_Context (void); + ~ACE_Naming_Context (); // = Dynamic initialization hooks. /// Initialize name options and naming context when dynamically @@ -108,7 +108,7 @@ public: virtual int info (ACE_TCHAR **strp, size_t length) const; /// Returns the ACE_Name_Options associated with the Naming_Context - ACE_Name_Options *name_options (void); + ACE_Name_Options *name_options (); /// Bind a new name to a naming context (Wide character strings). int bind (const ACE_NS_WString &name_in, @@ -246,7 +246,7 @@ public: const char *pattern_in); /// Dump the state of the object. - void dump (void); + void dump (); private: /// Keep track of the options such as database name etc per Naming Context @@ -265,7 +265,7 @@ private: int netnameserver_port_; /// 1 if we're on the same local machine as the name server, else 0. - int local (void); + int local (); }; /** @@ -276,8 +276,8 @@ private: class ACE_Export ACE_Name_Options { public: - ACE_Name_Options (void); - ~ACE_Name_Options (void); + ACE_Name_Options (); + ~ACE_Name_Options (); /// Parse arguments. void parse_args (int argc, @@ -287,10 +287,10 @@ public: void nameserver_port (int port); /// Get the port number - int nameserver_port (void); + int nameserver_port (); /// Get the context - ACE_Naming_Context::Context_Scope_Type context (void); + ACE_Naming_Context::Context_Scope_Type context (); /// Set the context void context (ACE_Naming_Context::Context_Scope_Type); @@ -299,31 +299,31 @@ public: void nameserver_host (const ACE_TCHAR *host); /// Get the host name - const ACE_TCHAR *nameserver_host (void); + const ACE_TCHAR *nameserver_host (); /// Set name space directory void namespace_dir (const ACE_TCHAR *dir); /// Get name space directory - const ACE_TCHAR *namespace_dir (void); + const ACE_TCHAR *namespace_dir (); /// Set process name void process_name (const ACE_TCHAR *dir); /// Get process name - const ACE_TCHAR *process_name (void); + const ACE_TCHAR *process_name (); /// Set database name void database (const ACE_TCHAR *); /// Get database name - const ACE_TCHAR *database (void); + const ACE_TCHAR *database (); /// Set base address of the underlying allocator void base_address (char *address); /// Get base address of the underlying allocator - char *base_address (void); + char *base_address (); /// Get use of registry in naming bool use_registry () const; @@ -332,10 +332,10 @@ public: void use_registry (bool x); /// Return debug status - bool debug (void); + bool debug (); /// Return verbose status - bool verbose (void); + bool verbose (); ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h index 9d53b94e8da..a2bbb238ee8 100644 --- a/ACE/ace/Netlink_Addr.h +++ b/ACE/ace/Netlink_Addr.h @@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Netlink_Addr : public ACE_Addr { public: /// Default constructor. - ACE_Netlink_Addr (void); + ACE_Netlink_Addr (); /// Copy constructor. ACE_Netlink_Addr (const ACE_Netlink_Addr &); @@ -93,7 +93,7 @@ private: /** * set nl_ @see nl_ to zero and sets address family to default value */ - void reset (void); + void reset (); sockaddr_nl nl_; }; diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 1d454befb1b..a99cdd35ef2 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -346,7 +346,7 @@ ACE_TSS_Ref::ACE_TSS_Ref (ACE_thread_t id) ACE_OS_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref"); } -ACE_TSS_Ref::ACE_TSS_Ref (void) +ACE_TSS_Ref::ACE_TSS_Ref () { ACE_OS_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref"); } @@ -386,7 +386,7 @@ ACE_TSS_Info::ACE_TSS_Info (ACE_thread_key_t key, ACE_OS_TRACE ("ACE_TSS_Info::ACE_TSS_Info"); } -ACE_TSS_Info::ACE_TSS_Info (void) +ACE_TSS_Info::ACE_TSS_Info () : key_ (ACE_OS::NULL_key), destructor_ (0), thread_count_ (-1) @@ -413,7 +413,7 @@ ACE_TSS_Info::operator != (const ACE_TSS_Info &info) const } void -ACE_TSS_Info::dump (void) +ACE_TSS_Info::dump () { # if defined (ACE_HAS_DUMP) // ACE_OS_TRACE ("ACE_TSS_Info::dump"); @@ -430,7 +430,7 @@ ACE_TSS_Info::dump (void) // Moved class ACE_TSS_Keys declaration to OS.h so it can be visible // to the single file of template instantiations. -ACE_TSS_Keys::ACE_TSS_Keys (void) +ACE_TSS_Keys::ACE_TSS_Keys () { for (u_int i = 0; i < ACE_WORDS; ++i) { @@ -518,10 +518,10 @@ public: /// Cleanup the thread-specific objects. Does _NOT_ exit the thread. /// For each used key perform the same actions as free_key. - void thread_exit (void); + void thread_exit (); private: - void dump (void); + void dump (); /// Release a key used by this thread /// @param info reference to the info for this key @@ -546,8 +546,8 @@ private: ACE_TSS_Keys *tss_keys (); /// Ensure singleton. - ACE_TSS_Cleanup (void); - ~ACE_TSS_Cleanup (void); + ACE_TSS_Cleanup (); + ~ACE_TSS_Cleanup (); /// ACE_TSS_Cleanup access only via TSS_Cleanup_Instance friend class TSS_Cleanup_Instance; @@ -671,7 +671,7 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose) } } -TSS_Cleanup_Instance::~TSS_Cleanup_Instance (void) +TSS_Cleanup_Instance::~TSS_Cleanup_Instance () { // Variable to hold the mutex_ to delete outside the scope of the // guard. @@ -735,12 +735,12 @@ ACE_TSS_Cleanup * TSS_Cleanup_Instance::instance_ = 0; ACE_Thread_Mutex* TSS_Cleanup_Instance::mutex_ = 0; ACE_Condition_Thread_Mutex* TSS_Cleanup_Instance::condition_ = 0; -ACE_TSS_Cleanup::~ACE_TSS_Cleanup (void) +ACE_TSS_Cleanup::~ACE_TSS_Cleanup () { } void -ACE_TSS_Cleanup::thread_exit (void) +ACE_TSS_Cleanup::thread_exit () { ACE_OS_TRACE ("ACE_TSS_Cleanup::thread_exit"); // variables to hold the destructors, keys @@ -822,7 +822,7 @@ ACE_TSS_Cleanup_keys_destroyer (void *tss_keys) delete static_cast <ACE_TSS_Keys *> (tss_keys); } -ACE_TSS_Cleanup::ACE_TSS_Cleanup (void) +ACE_TSS_Cleanup::ACE_TSS_Cleanup () : in_use_ (ACE_OS::NULL_key) { ACE_OS_TRACE ("ACE_TSS_Cleanup::ACE_TSS_Cleanup"); @@ -975,7 +975,7 @@ ACE_TSS_Cleanup::thread_use_key (ACE_thread_key_t key) } void -ACE_TSS_Cleanup::dump (void) +ACE_TSS_Cleanup::dump () { # if defined (ACE_HAS_DUMP) // Iterate through all the thread-specific items and dump them all. diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 9a0bfecc5d4..8ae8f7141aa 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -926,7 +926,7 @@ public: ACE_TSS_Ref (ACE_thread_t id); /// Default constructor - ACE_TSS_Ref (void); + ACE_TSS_Ref (); /// Check for equality. bool operator== (const ACE_TSS_Ref &) const; @@ -957,7 +957,7 @@ public: Destructor dest = 0); /// Default constructor - ACE_TSS_Info (void); + ACE_TSS_Info (); /// Returns 1 if the key is in use, 0 if not. int key_in_use () const { return thread_count_ != -1; } @@ -973,7 +973,7 @@ public: bool operator!= (const ACE_TSS_Info &) const; /// Dump the state. - void dump (void); + void dump (); private: /// Key to the thread-specific storage item. @@ -1006,7 +1006,7 @@ public: ACE_ALLOC_HOOK_DECLARE; /// Default constructor, to initialize all bits to zero (unused). - ACE_TSS_Keys (void); + ACE_TSS_Keys (); /// Mark the specified key as being in use, if it was not already so marked. /// Returns 1 if the had already been marked, 0 if not. diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index ad949935525..e60ac8a418e 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -563,7 +563,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL int -ACE_OS::netdb_acquire (void) +ACE_OS::netdb_acquire () { return ACE_OS::thread_mutex_lock ((ACE_thread_mutex_t *) ACE_OS_Object_Manager::preallocated_object[ @@ -571,7 +571,7 @@ ACE_OS::netdb_acquire (void) } int -ACE_OS::netdb_release (void) +ACE_OS::netdb_release () { return ACE_OS::thread_mutex_unlock ((ACE_thread_mutex_t *) ACE_OS_Object_Manager::preallocated_object[ diff --git a/ACE/ace/OS_NS_netdb.h b/ACE/ace/OS_NS_netdb.h index 3cc5720173e..bcf82cf22bc 100644 --- a/ACE/ace/OS_NS_netdb.h +++ b/ACE/ace/OS_NS_netdb.h @@ -134,10 +134,10 @@ namespace ACE_OS # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) extern ACE_Export - int netdb_acquire (void); + int netdb_acquire (); extern ACE_Export - int netdb_release (void); + int netdb_release (); # endif /* defined (ACE_MT_SAFE) && ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ } /* namespace ACE_OS */ diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 68c06a014ef..3a4e6bdf91c 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -339,14 +339,14 @@ namespace ACE_OS { // = Win32 OS version determination function. /// Return the win32 OSVERSIONINFO structure. ACE_NAMESPACE_INLINE_FUNCTION - const ACE_TEXT_OSVERSIONINFO &get_win32_versioninfo (void); + const ACE_TEXT_OSVERSIONINFO &get_win32_versioninfo (); // = A pair of functions for modifying ACE's Win32 resource usage. /// Return the handle of the module containing ACE's resources. By /// default, for a DLL build of ACE this is a handle to the ACE DLL /// itself, and for a static build it is a handle to the executable. ACE_NAMESPACE_INLINE_FUNCTION - HINSTANCE get_win32_resource_module (void); + HINSTANCE get_win32_resource_module (); /// Allow an application to modify which module contains ACE's /// resources. This is mainly useful for a static build of ACE where diff --git a/ACE/ace/OS_Thread_Adapter.h b/ACE/ace/OS_Thread_Adapter.h index 536d06079ef..af0ea6aa94e 100644 --- a/ACE/ace/OS_Thread_Adapter.h +++ b/ACE/ace/OS_Thread_Adapter.h @@ -55,13 +55,13 @@ public: * @c this, thereby rendering the object useless after the call * returns. */ - virtual ACE_THR_FUNC_RETURN invoke (void); + virtual ACE_THR_FUNC_RETURN invoke (); ACE_ALLOC_HOOK_DECLARE; protected: /// Ensure that this object is allocated on the heap. - ~ACE_OS_Thread_Adapter (void); + ~ACE_OS_Thread_Adapter (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h index 5f90e56b2c2..982875accbb 100644 --- a/ACE/ace/OS_main.h +++ b/ACE/ace/OS_main.h @@ -238,7 +238,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Main_Base { public: - virtual ~ACE_Main_Base (void); + virtual ~ACE_Main_Base (); int run (HINSTANCE, HINSTANCE, LPWSTR, int); virtual int run_i (int, ACE_TCHAR *[]) = 0; }; diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index a98f62fab27..0a1c0767186 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -78,7 +78,7 @@ ACE_Object_Manager_Base::shutting_down_i () extern "C" void -ACE_OS_Object_Manager_Internal_Exit_Hook (void) +ACE_OS_Object_Manager_Internal_Exit_Hook () { if (ACE_OS_Object_Manager::instance_) ACE_OS_Object_Manager::instance ()->fini (); @@ -137,7 +137,7 @@ ACE_OS_Object_Manager::thread_hook () #if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_SEH_EXCEPT_HANDLER -ACE_OS_Object_Manager::seh_except_selector (void) +ACE_OS_Object_Manager::seh_except_selector () { return ACE_OS_Object_Manager::instance ()->seh_except_selector_; } @@ -154,7 +154,7 @@ ACE_OS_Object_Manager::seh_except_selector (ACE_SEH_EXCEPT_HANDLER n) } ACE_SEH_EXCEPT_HANDLER -ACE_OS_Object_Manager::seh_except_handler (void) +ACE_OS_Object_Manager::seh_except_handler () { return ACE_OS_Object_Manager::instance ()->seh_except_handler_; } diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h index 22fa9d20602..fe4b9285d77 100644 --- a/ACE/ace/Object_Manager_Base.h +++ b/ACE/ace/Object_Manager_Base.h @@ -116,7 +116,7 @@ private: }; extern "C" -void ACE_OS_Object_Manager_Internal_Exit_Hook (void); +void ACE_OS_Object_Manager_Internal_Exit_Hook (); // @@ This forward declaration should go away. class ACE_Log_Msg; diff --git a/ACE/ace/PI_Malloc.h b/ACE/ace/PI_Malloc.h index db21328abf5..804bdec0bf8 100644 --- a/ACE/ace/PI_Malloc.h +++ b/ACE/ace/PI_Malloc.h @@ -59,7 +59,7 @@ public: class ACE_Export ACE_Malloc_Header { public: - ACE_Malloc_Header (void); + ACE_Malloc_Header (); /// Points to next block if on free list. MALLOC_HEADER_PTR next_block_; @@ -109,10 +109,10 @@ public: ACE_Name_Node (const ACE_Name_Node &); /// Constructor. - ACE_Name_Node (void); + ACE_Name_Node (); /// Constructor. - ~ACE_Name_Node (void); + ~ACE_Name_Node (); /// Initialize a name node pointer. static void init_ptr (NAME_NODE_PTR *ptr, @@ -146,7 +146,7 @@ public: }; /// Print out a bunch of size info for debugging. - static void print_alignment_info (void); + static void print_alignment_info (); /// Reference counter. int ref_counter_; diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h index e06557c67ce..13a5e8e47ca 100644 --- a/ACE/ace/POSIX_Asynch_IO.h +++ b/ACE/ace/POSIX_Asynch_IO.h @@ -103,7 +103,7 @@ public: int post_completion (ACE_Proactor_Impl *proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Result (void); + virtual ~ACE_POSIX_Asynch_Result (); /// Simulate error value to use in the post_completion () void set_error (u_long errcode); @@ -170,7 +170,7 @@ public: ACE_Proactor *proactor = 0); /// Check the documentation for ACE_Asynch_Operation::cancel. - int cancel (void); + int cancel (); // = Access methods. @@ -185,7 +185,7 @@ protected: ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Operation (void); + virtual ~ACE_POSIX_Asynch_Operation (); // This call is for the POSIX implementation. This method is used by // ACE_Asynch_Operation to store some information with the @@ -259,7 +259,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_Stream_Result (void); + virtual ~ACE_POSIX_Asynch_Read_Stream_Result (); // aiocb::aio_nbytes // Bytes requested when the asynchronous read was initiated. @@ -293,7 +293,7 @@ public: int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_Stream (void); + virtual ~ACE_POSIX_Asynch_Read_Stream (); }; @@ -346,7 +346,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_Stream_Result (void); + virtual ~ACE_POSIX_Asynch_Write_Stream_Result (); protected: // aiocb::aio_nbytes @@ -382,7 +382,7 @@ public: int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_Stream (void); + virtual ~ACE_POSIX_Asynch_Write_Stream (); }; /** @@ -421,7 +421,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_File_Result (void); + virtual ~ACE_POSIX_Asynch_Read_File_Result (); }; /** @@ -461,7 +461,7 @@ public: int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_File (void); + virtual ~ACE_POSIX_Asynch_Read_File (); private: /** @@ -524,7 +524,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_File_Result (void); + virtual ~ACE_POSIX_Asynch_Write_File_Result (); }; /** @@ -556,7 +556,7 @@ public: int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_File (void); + virtual ~ACE_POSIX_Asynch_Write_File (); private: /** @@ -625,7 +625,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Accept_Result (void); + virtual ~ACE_POSIX_Asynch_Accept_Result (); // aiocb::aio_nbytes // Bytes requested when the asynchronous read was initiated. @@ -658,7 +658,7 @@ public: ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Accept (void); + virtual ~ACE_POSIX_Asynch_Accept (); /** * This <open> belongs to ACE_POSIX_Asynch_Operation. We forward @@ -693,7 +693,7 @@ public: * Cancel all pending pseudo-asynchronus requests * Behavior as usual AIO request */ - int cancel (void); + int cancel (); /** * Close performs cancellation of all pending requests @@ -779,7 +779,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Connect_Result (void); + virtual ~ACE_POSIX_Asynch_Connect_Result (); // aiocb::aio_filedes // I/O handle for the new connection. @@ -800,7 +800,7 @@ public: ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor); /// Destructor. - virtual ~ACE_POSIX_Asynch_Connect (void); + virtual ~ACE_POSIX_Asynch_Connect (); /** * This belongs to ACE_POSIX_Asynch_Operation. We forward @@ -831,12 +831,12 @@ public: * Cancel all pending pseudo-asynchronus requests * Behavior as usual AIO request */ - int cancel (void); + int cancel (); /** * Close performs cancellation of all pending requests. */ - int close (void); + int close (); /// virtual from ACE_Event_Handler ACE_HANDLE get_handle () const; @@ -956,7 +956,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Transmit_File_Result (void); + virtual ~ACE_POSIX_Asynch_Transmit_File_Result (); /// Network I/O handle. ACE_HANDLE socket_; @@ -1015,7 +1015,7 @@ public: int signal_number = 0); /// Destructor. - virtual ~ACE_POSIX_Asynch_Transmit_File (void); + virtual ~ACE_POSIX_Asynch_Transmit_File (); }; @@ -1037,7 +1037,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dg public: /// Constructor. ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *posix_proactor); - virtual ~ACE_POSIX_Asynch_Read_Dgram (void); + virtual ~ACE_POSIX_Asynch_Read_Dgram (); /** This method queues an asynchronous read. Up to * @a message_block->total_size() bytes will be read and stored in the @@ -1070,7 +1070,7 @@ public: protected: /// Do-nothing constructor. - ACE_POSIX_Asynch_Read_Dgram (void); + ACE_POSIX_Asynch_Read_Dgram (); }; /** @@ -1122,7 +1122,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Write_Dgram_Result (void); + virtual ~ACE_POSIX_Asynch_Write_Dgram_Result (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -1160,7 +1160,7 @@ public: ACE_POSIX_Asynch_Write_Dgram (ACE_POSIX_Proactor *posix_proactor); /// Destructor - virtual ~ACE_POSIX_Asynch_Write_Dgram (void); + virtual ~ACE_POSIX_Asynch_Write_Dgram (); /** This method queues an asynchronous send. Up to * @a message_block->total_length bytes will be sent, beginning at the @@ -1193,7 +1193,7 @@ public: protected: /// Do-nothing constructor. - ACE_POSIX_Asynch_Write_Dgram (void); + ACE_POSIX_Asynch_Write_Dgram (); }; @@ -1254,7 +1254,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_POSIX_Asynch_Read_Dgram_Result (void); + virtual ~ACE_POSIX_Asynch_Read_Dgram_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index 75a43c409f9..7ded14c5643 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -96,13 +96,13 @@ public: ACE_OPCODE_WRITE = 2 }; - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /// Virtual destructor. - virtual ~ACE_POSIX_Proactor (void); + virtual ~ACE_POSIX_Proactor (); /// Close down the Proactor. - virtual int close (void); + virtual int close (); /** * Dispatch a single set of events. If @a wait_time elapses before @@ -142,7 +142,7 @@ public: const void *completion_key); /// @@ This is a no-op on POSIX platforms. Returns 0. - int wake_up_dispatch_threads (void); + int wake_up_dispatch_threads (); /// @@ This is a no-op on POSIX platforms. Returns 0. int close_dispatch_threads (int wait); @@ -157,7 +157,7 @@ public: // Methods used to create Asynch IO factory and result objects. We // create the right objects here in these methods. - virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); + virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (); virtual ACE_Asynch_Read_Stream_Result_Impl * create_asynch_read_stream_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -168,7 +168,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); + virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (); virtual ACE_Asynch_Write_Stream_Result_Impl * create_asynch_write_stream_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -179,7 +179,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); + virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (); virtual ACE_Asynch_Read_File_Result_Impl * create_asynch_read_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -192,7 +192,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); + virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (); virtual ACE_Asynch_Write_File_Result_Impl * create_asynch_write_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -205,7 +205,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); + virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (); virtual ACE_Asynch_Read_Dgram_Result_Impl * create_asynch_read_dgram_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -218,7 +218,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); + virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (); virtual ACE_Asynch_Write_Dgram_Result_Impl * create_asynch_write_dgram_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE handle, @@ -230,7 +230,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void); + virtual ACE_Asynch_Accept_Impl *create_asynch_accept (); virtual ACE_Asynch_Accept_Result_Impl * create_asynch_accept_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE listen_handle, @@ -242,7 +242,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void); + virtual ACE_Asynch_Connect_Impl *create_asynch_connect (); virtual ACE_Asynch_Connect_Result_Impl * create_asynch_connect_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE connect_handle, @@ -251,7 +251,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); - virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); + virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (); virtual ACE_Asynch_Transmit_File_Result_Impl * create_asynch_transmit_file_result (const ACE_Handler::Proxy_Ptr &handler_proxy, ACE_HANDLE socket, @@ -279,7 +279,7 @@ public: protected: /// Constructor. - ACE_POSIX_Proactor (void); + ACE_POSIX_Proactor (); /** * Protect against structured exceptions caused by user code when @@ -338,13 +338,13 @@ public: /// which can be started at the same time ACE_POSIX_AIOCB_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE); - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /// Destructor. - virtual ~ACE_POSIX_AIOCB_Proactor (void); + virtual ~ACE_POSIX_AIOCB_Proactor (); /// Close down the Proactor. - virtual int close (void); + virtual int close (); /** * Dispatch a single set of events. If @a wait_time elapses before @@ -361,7 +361,7 @@ public: * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void); + virtual int handle_events (); /// Post a result to the completion port of the Proactor. virtual int post_completion (ACE_POSIX_Asynch_Result *result); @@ -395,16 +395,16 @@ protected: size_t &transfer_count); /// Create aiocb list - int create_result_aiocb_list (void); + int create_result_aiocb_list (); /// Call this method from derived class when virtual table is /// built. - int delete_result_aiocb_list (void); + int delete_result_aiocb_list (); /// Call these methods from derived class when virtual table is /// built. - void create_notify_manager (void); - void delete_notify_manager (void); + void create_notify_manager (); + void delete_notify_manager (); /// Define the maximum number of asynchronous I/O requests /// for the current OS @@ -421,7 +421,7 @@ protected: int handle_events_i (u_long milli_seconds); /// Start deferred AIO if necessary - int start_deferred_aio (void); + int start_deferred_aio (); /// Cancel running or deferred AIO virtual int cancel_aiocb (ACE_POSIX_Asynch_Result * result); @@ -446,13 +446,13 @@ protected: int putq_result (ACE_POSIX_Asynch_Result *result); /// Get "post_completed" result from the internal queue - ACE_POSIX_Asynch_Result * getq_result (void); + ACE_POSIX_Asynch_Result * getq_result (); /// Clear the internal results queue - int clear_result_queue (void); + int clear_result_queue (); /// Process the internal results queue - int process_result_queue (void); + int process_result_queue (); /// This class takes care of doing <accept> when we use @@ -517,7 +517,7 @@ public: */ ACE_POSIX_SIG_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE); - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /** * This constructor should be used to tell the Proactor to mask and @@ -529,7 +529,7 @@ public: size_t nmaxop = ACE_AIO_DEFAULT_SIZE); /// Destructor. - virtual ~ACE_POSIX_SIG_Proactor (void); + virtual ~ACE_POSIX_SIG_Proactor (); /** * Dispatch a single set of events. If @a wait_time elapses before @@ -546,7 +546,7 @@ public: * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void); + virtual int handle_events (); /// Post a result to the completion port of the Proactor. /// now it is implemented in base ACE_POSIX_AIOCB_Proactor class diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index c69ea82f806..19516cea601 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -183,7 +183,7 @@ ACE_Pagefile_Memory_Pool::remap (void *addr) } int -ACE_Pagefile_Memory_Pool::unmap (void) +ACE_Pagefile_Memory_Pool::unmap () { #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) ACE_BASED_POINTER_REPOSITORY::instance ()->unbind diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h index bc650da1e76..254a5a7ad8a 100644 --- a/ACE/ace/Pagefile_Memory_Pool.h +++ b/ACE/ace/Pagefile_Memory_Pool.h @@ -127,7 +127,7 @@ protected: int map (int &firstTime, size_t appendBytes = 0); /// Release the mapping. - int unmap (void); + int unmap (); private: /** diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h index 930073987e5..2fac713694e 100644 --- a/ACE/ace/Parse_Node.h +++ b/ACE/ace/Parse_Node.h @@ -45,9 +45,9 @@ class ACE_Service_Type; class ACE_Parse_Node { public: - ACE_Parse_Node (void); + ACE_Parse_Node (); explicit ACE_Parse_Node (const ACE_TCHAR *name); - virtual ~ACE_Parse_Node (void); + virtual ~ACE_Parse_Node (); ACE_Parse_Node *link () const; void link (ACE_Parse_Node *); @@ -86,7 +86,7 @@ class ACE_Suspend_Node : public ACE_Parse_Node { public: ACE_Suspend_Node (const ACE_TCHAR *name); - ~ACE_Suspend_Node (void); + ~ACE_Suspend_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -114,7 +114,7 @@ class ACE_Resume_Node : public ACE_Parse_Node { public: ACE_Resume_Node (const ACE_TCHAR *name); - ~ACE_Resume_Node (void); + ~ACE_Resume_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -142,7 +142,7 @@ class ACE_Remove_Node : public ACE_Parse_Node { public: ACE_Remove_Node (const ACE_TCHAR *name); - ~ACE_Remove_Node (void); + ~ACE_Remove_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -170,7 +170,7 @@ class ACE_Static_Node : public ACE_Parse_Node { public: ACE_Static_Node (const ACE_TCHAR *name, ACE_TCHAR *params = 0); - virtual ~ACE_Static_Node (void); + virtual ~ACE_Static_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); virtual const ACE_Service_Type *record (const ACE_Service_Gestalt *g) const; @@ -209,7 +209,7 @@ class ACE_Dynamic_Node : public ACE_Static_Node public: ACE_Dynamic_Node (ACE_Service_Type_Factory const *, ACE_TCHAR *params); - virtual ~ACE_Dynamic_Node (void); + virtual ~ACE_Dynamic_Node (); // virtual const ACE_Service_Type *record () const; virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -242,7 +242,7 @@ class ACE_Stream_Node : public ACE_Parse_Node { public: ACE_Stream_Node (const ACE_Static_Node *, const ACE_Parse_Node *); - virtual ~ACE_Stream_Node (void); + virtual ~ACE_Stream_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -274,7 +274,7 @@ class ACE_Dummy_Node : public ACE_Parse_Node { public: ACE_Dummy_Node (const ACE_Static_Node *, const ACE_Parse_Node *); - ~ACE_Dummy_Node (void); + ~ACE_Dummy_Node (); virtual void apply (ACE_Service_Gestalt *cfg, int &yyerrno); @@ -306,13 +306,13 @@ private: class ACE_Location_Node { public: - ACE_Location_Node (void); - const ACE_DLL &dll (void); + ACE_Location_Node (); + const ACE_DLL &dll (); const ACE_TCHAR *pathname () const; void pathname (const ACE_TCHAR *h); int dispose () const; - virtual ~ACE_Location_Node (void); + virtual ~ACE_Location_Node (); virtual void set_symbol (void *h); /// Will update the yyerrno member and/or corresponding configuration @@ -367,7 +367,7 @@ public: virtual void *symbol (ACE_Service_Gestalt *config, int &yyerrno, ACE_Service_Object_Exterminator * = 0); - virtual ~ACE_Object_Node (void); + virtual ~ACE_Object_Node (); /// Dump the state of an object. void dump () const; @@ -400,7 +400,7 @@ public: virtual void *symbol (ACE_Service_Gestalt *config, int &yyerrno, ACE_Service_Object_Exterminator *gobbler = 0); - virtual ~ACE_Function_Node (void); + virtual ~ACE_Function_Node (); /// Dump the state of an object. void dump () const; @@ -455,7 +455,7 @@ public: virtual void *symbol (ACE_Service_Gestalt *config, int &yyerrno, ACE_Service_Object_Exterminator * = 0); - virtual ~ACE_Static_Function_Node (void); + virtual ~ACE_Static_Function_Node (); /// Dump the state of an object. void dump () const; @@ -483,7 +483,7 @@ public: ACE_Location_Node *location, bool active); - ~ACE_Service_Type_Factory (void); + ~ACE_Service_Type_Factory (); ACE_Service_Type *make_service_type (ACE_Service_Gestalt *pcfg) const; diff --git a/ACE/ace/Ping_Socket.h b/ACE/ace/Ping_Socket.h index 08a5fa4bbee..59faff255b5 100644 --- a/ACE/ace/Ping_Socket.h +++ b/ACE/ace/Ping_Socket.h @@ -40,14 +40,14 @@ class ACE_Export ACE_Ping_Socket : public ACE_ICMP_Socket typedef ACE_ICMP_Socket inherited; public: /// Default constructor. - ACE_Ping_Socket (void); + ACE_Ping_Socket (); ACE_Ping_Socket (ACE_Addr const & local, int protocol = IPPROTO_ICMP, int reuse_addr = 0); /// Destructor. - ~ACE_Ping_Socket (void); + ~ACE_Ping_Socket (); /// Wrapper around the BSD-style @c socket system call (no QoS). int open (ACE_Addr const & local = ACE_Addr::sap_any, @@ -67,7 +67,7 @@ public: bool to_connect = false, ACE_Time_Value const * timeout = &time_default_); - char * icmp_recv_buff (void); + char * icmp_recv_buff (); /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Pipe.h b/ACE/ace/Pipe.h index c257341b356..c615f8870cc 100644 --- a/ACE/ace/Pipe.h +++ b/ACE/ace/Pipe.h @@ -43,7 +43,7 @@ class ACE_Export ACE_Pipe { public: /// Default constructor (does nothing...). - ACE_Pipe (void); + ACE_Pipe (); /// Open the pipe and initialize the handles. ACE_Pipe (ACE_HANDLE handles[2]); @@ -52,7 +52,7 @@ public: ACE_Pipe (ACE_HANDLE read, ACE_HANDLE write); /// Default dtor. It doesn't close the handles for you. - ~ACE_Pipe (void); + ~ACE_Pipe (); /// Open the pipe and initialize the handles. int open (ACE_HANDLE handles[2]); @@ -61,9 +61,9 @@ public: int open (int buffer_size = ACE_DEFAULT_MAX_SOCKET_BUFSIZ); /// Close down the pipe HANDLEs; - int close (void); - int close_read (void); - int close_write (void); + int close (); + int close_read (); + int close_write (); // = Accessors. diff --git a/ACE/ace/Priority_Reactor.h b/ACE/ace/Priority_Reactor.h index 0ff760895bd..7368579d702 100644 --- a/ACE/ace/Priority_Reactor.h +++ b/ACE/ace/Priority_Reactor.h @@ -46,7 +46,7 @@ public: ACE_Timer_Queue * = 0); /// Close down the select_reactor and release all of its resources. - virtual ~ACE_Priority_Reactor (void); + virtual ~ACE_Priority_Reactor (); /// Dump the state of an object. void dump () const; @@ -68,7 +68,7 @@ protected: private: /// A small helper to initialize the bucket. - void init_bucket (void); + void init_bucket (); /// Build the bucket from the given dispatch_mask. Return -1 on /// failure, 0 otherwise. diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 61b7b9debe7..3d4206e0010 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -1135,12 +1135,12 @@ ACE_Proactor::instance (ACE_Proactor *) } void -ACE_Proactor::close_singleton (void) +ACE_Proactor::close_singleton () { } int -ACE_Proactor::run_event_loop (void) +ACE_Proactor::run_event_loop () { // not implemented return -1; @@ -1154,14 +1154,14 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &) } int -ACE_Proactor::end_event_loop (void) +ACE_Proactor::end_event_loop () { // not implemented return -1; } sig_atomic_t -ACE_Proactor::event_loop_done (void) +ACE_Proactor::event_loop_done () { return sig_atomic_t (1); } diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h index 7ddaf92696a..19bc982853c 100644 --- a/ACE/ace/Proactor.h +++ b/ACE/ace/Proactor.h @@ -59,7 +59,7 @@ class ACE_Export ACE_Proactor_Handle_Timeout_Upcall public: /// Constructor. - ACE_Proactor_Handle_Timeout_Upcall (void); + ACE_Proactor_Handle_Timeout_Upcall (); /// This method is called when a timer is registered. int registration (ACE_Proactor_Timer_Queue &timer_queue, @@ -174,7 +174,7 @@ public: ACE_Proactor_Timer_Queue *tq = 0); /// Destruction. - ~ACE_Proactor (void); + ~ACE_Proactor (); /// Get pointer to a process-wide ACE_Proactor. @a threads should /// be part of another method. @@ -186,23 +186,23 @@ public: bool delete_proactor = false); /// Delete the dynamically allocated Singleton. - static void close_singleton (void); + static void close_singleton (); /// Cleanup method, used by the ACE_Object_Manager to destroy the /// singleton. static void cleanup (void *instance, void *arg); /// Name of dll in which the singleton instance lives. - static const ACE_TCHAR *dll_name (void); + static const ACE_TCHAR *dll_name (); /// Name of component--ACE_Proactor in this case. - static const ACE_TCHAR *name (void); + static const ACE_TCHAR *name (); // = Proactor event loop management methods. /// Run the event loop until the <ACE_Proactor::handle_events> method /// returns -1 or the <end_event_loop> method is invoked. - static int run_event_loop (void); + static int run_event_loop (); /** * Run the event loop until the <ACE_Proactor::handle_events> method @@ -217,13 +217,13 @@ public: * This method wakes up all the threads blocked on waiting for * completions and end the event loop. */ - static int end_event_loop (void); + static int end_event_loop (); /** * Resets the <ACE_Proactor::end_event_loop_> static so that the * <run_event_loop> method can be restarted. */ - static int reset_event_loop (void); + static int reset_event_loop (); /** * The singleton proactor is used by the ACE_Service_Config. @@ -233,14 +233,14 @@ public: static int check_reconfiguration (ACE_Proactor *); /// Report if the <ACE_Proactor::instance> event loop is finished. - static int event_loop_done (void); + static int event_loop_done (); /// Close the associated @c ACE_Proactor_Impl implementation object. /** * If @arg delete_implementation was specified to the @c open() method, * the implementation object is also deleted. */ - int close (void); + int close (); /** * You can add a hook to various run_event methods and the hook will @@ -274,14 +274,14 @@ public: * and notifies the ACE_Proactor so that it can wake up * and close down gracefully. */ - int proactor_end_event_loop (void); + int proactor_end_event_loop (); /// Report if the ACE_Proactor event loop is finished. - int proactor_event_loop_done (void); + int proactor_event_loop_done (); /// Resets the <ACE_Proactor::end_event_loop_> static so that the /// <run_event_loop> method can be restarted. - int proactor_reset_event_loop (void); + int proactor_reset_event_loop (); /// This method adds the @a handle to the I/O completion port. This @@ -354,10 +354,10 @@ public: * @return Returns 1 when a completion is dispatched. On error, returns -1 * and sets errno accordingly. */ - int handle_events (void); + int handle_events (); /// Add wakeup dispatch threads (reinit). - int wake_up_dispatch_threads (void); + int wake_up_dispatch_threads (); /// Close all dispatch threads. int close_dispatch_threads (int wait); @@ -391,37 +391,37 @@ public: /// Create the correct implementation class for doing /// Asynch_Read_Stream. - ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); + ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (); /// Create the correct implementation class for doing /// Asynch_Write_Stream. - ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); + ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (); /// Create the correct implementation class for doing /// Asynch_Read_File. - ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); + ACE_Asynch_Read_File_Impl *create_asynch_read_file (); /// Create the correct implementation class for doing /// Asynch_Write_File. - ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); + ACE_Asynch_Write_File_Impl *create_asynch_write_file (); /// Create the correct implementation class for doing Asynch_Accept. - ACE_Asynch_Accept_Impl *create_asynch_accept (void); + ACE_Asynch_Accept_Impl *create_asynch_accept (); /// Create the correct implementation class for doing Asynch_Connect. - ACE_Asynch_Connect_Impl *create_asynch_connect (void); + ACE_Asynch_Connect_Impl *create_asynch_connect (); /// Create the correct implementation class for doing /// Asynch_Transmit_File. - ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); + ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (); /// Create the correct implementation class for doing /// Asynch_Read_Dgram. - ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); + ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (); /// Create the correct implementation class for doing /// Asynch_Write_Dgram. - ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); + ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (); // = Factory methods for the results @@ -652,19 +652,19 @@ public: static ACE_Proactor *instance (ACE_Proactor *); /// Placeholder to enable compilation on non-Win32 platforms - static void close_singleton (void); + static void close_singleton (); /// Placeholder to enable compilation on non-Win32 platforms - static int run_event_loop (void); + static int run_event_loop (); /// Placeholder to enable compilation on non-Win32 platforms static int run_event_loop (ACE_Time_Value &tv); /// Placeholder to enable compilation on non-Win32 platforms - static int end_event_loop (void); + static int end_event_loop (); /// Placeholder to enable compilation on non-Win32 platforms - static sig_atomic_t event_loop_done (void); + static sig_atomic_t event_loop_done (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index 73547b9976b..9459e3dbb3f 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -910,7 +910,7 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, #if !defined (ACE_HAS_WINCE) #if defined (ACE_WIN32) void -ACE_Process_Options::inherit_environment (void) +ACE_Process_Options::inherit_environment () { // Ensure only once execution. if (environment_inherited_) diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 6ddf5215231..21b3f065e7a 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -307,7 +307,7 @@ public: // = Non-portable accessors for when you "just have to use them." /// Used for setting and getting. - ACE_TEXT_STARTUPINFO *startup_info (void); + ACE_TEXT_STARTUPINFO *startup_info (); /// Get the process_attributes. Returns NULL if /// set_process_attributes has not been set. @@ -315,7 +315,7 @@ public: /// If this is called, a non-null process attributes is sent to /// CreateProcess. - LPSECURITY_ATTRIBUTES set_process_attributes (void); + LPSECURITY_ATTRIBUTES set_process_attributes (); /// Get the thread_attributes. Returns NULL if set_thread_attributes /// has not been set. @@ -323,7 +323,7 @@ public: /// If this is called, a non-null thread attributes is sent to /// CreateProcess. - LPSECURITY_ATTRIBUTES set_thread_attributes (void); + LPSECURITY_ATTRIBUTES set_thread_attributes (); /// Get user token. Return ACE_INVALID_HANDLE if it has not been set. HANDLE get_user_token () const; @@ -384,7 +384,7 @@ protected: #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) /// Helper function to grab win32 environment and stick it in /// environment_buf_ using this->setenv_i. - void inherit_environment (void); + void inherit_environment (); /// Ensures once only call to inherit environment. int environment_inherited_; @@ -637,7 +637,7 @@ public: void close_passed_handles (); #if defined (ACE_WIN32) - PROCESS_INFORMATION process_info (void); + PROCESS_INFORMATION process_info (); #endif /* ACE_WIN32 */ private: diff --git a/ACE/ace/Process_Mutex.h b/ACE/ace/Process_Mutex.h index aacf8700d39..c68638f7d26 100644 --- a/ACE/ace/Process_Mutex.h +++ b/ACE/ace/Process_Mutex.h @@ -126,7 +126,7 @@ public: * @note The destructor will not release an acquired mutex except * on Windows. */ - ~ACE_Process_Mutex (void); + ~ACE_Process_Mutex (); /** * Explicitly destroy the mutex. Note that only one thread should @@ -135,14 +135,14 @@ public: * * @return 0 on success; -1 on failure. */ - int remove (void); + int remove (); /** * Acquire lock ownership (wait on queue if necessary). * * @return 0 on success; -1 on failure. */ - int acquire (void); + int acquire (); /** * Acquire lock ownership, but timeout if lock if hasn't been @@ -161,37 +161,37 @@ public: * @return 0 on success; -1 on failure. If the lock could not be acquired * because someone else already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Release lock and unblock a thread at head of queue. - int release (void); + int release (); /// Acquire lock ownership (wait on queue if necessary). - int acquire_read (void); + int acquire_read (); /// Acquire lock ownership (wait on queue if necessary). - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire a lock (i.e., won't block). Returns -1 on * failure. If we "failed" because someone else already had the * lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Conditionally acquire a lock (i.e., won't block). Returns -1 on * failure. If we "failed" because someone else already had the * lock, @c errno is set to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here for consistency with the other synchronization * APIs and usability with Lock adapters. Assumes the caller already has * acquired the mutex and returns 0 in all cases. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); #if !defined (_ACE_USE_SV_SEM) /// Return the underlying mutex. @@ -217,7 +217,7 @@ private: ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN]; /// Create and return the unique name. - const ACE_TCHAR *unique_name (void); + const ACE_TCHAR *unique_name (); #if defined (_ACE_USE_SV_SEM) /// We need this to get the right semantics... diff --git a/ACE/ace/Process_Semaphore.h b/ACE/ace/Process_Semaphore.h index 8d6860fa2ad..e8fed85e7c4 100644 --- a/ACE/ace/Process_Semaphore.h +++ b/ACE/ace/Process_Semaphore.h @@ -51,11 +51,11 @@ public: * should call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /// Block the thread until the semaphore count becomes greater than /// 0, then decrement it. - int acquire (void); + int acquire (); /** * Conditionally decrement the semaphore if count is greater than 0 @@ -63,24 +63,24 @@ public: * because someone else already had the lock, @c errno is set to * @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Increment the semaphore, potentially unblocking a waiting thread. - int release (void); + int release (); /** * Acquire semaphore ownership. This calls acquire() and is only * here to make the ACE_Process_Semaphore interface consistent * with the other synchronization APIs. */ - int acquire_read (void); + int acquire_read (); /** * Acquire semaphore ownership. This calls acquire() and is only * here to make the ACE_Process_Semaphore interface consistent * with the other synchronization APIs. */ - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire semaphore (i.e., won't block). This calls @@ -89,7 +89,7 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Conditionally acquire semaphore (i.e., won't block). This calls @@ -98,7 +98,7 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here to make the ACE_Process_Semaphore @@ -106,7 +106,7 @@ public: * Assumes the caller has already acquired the semaphore using one of * the above calls, and returns 0 (success) always. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) /// Return the underlying lock. diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 1dd78c0accb..8893443c98a 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -283,7 +283,7 @@ ACE_Profile_Timer::dump () const } // Initialize interval timer. -ACE_Profile_Timer::ACE_Profile_Timer (void) +ACE_Profile_Timer::ACE_Profile_Timer () : timer_ () { ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer"); @@ -394,7 +394,7 @@ ACE_Profile_Timer::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Profile_Timer::ACE_Profile_Timer (void) +ACE_Profile_Timer::ACE_Profile_Timer () : timer_ () { ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer"); diff --git a/ACE/ace/Profile_Timer.h b/ACE/ace/Profile_Timer.h index f26e173fd1e..6d682b72c50 100644 --- a/ACE/ace/Profile_Timer.h +++ b/ACE/ace/Profile_Timer.h @@ -61,10 +61,10 @@ public: // = Timer methods. /// Activate the timer. - int start (void); + int start (); /// Stop the timer. - int stop (void); + int stop (); // = Resource utilization methods. /// Compute the time elapsed between calls to @c start() and @c stop(). diff --git a/ACE/ace/QoS/QoS_Decorator.cpp b/ACE/ace/QoS/QoS_Decorator.cpp index 13ee649acb9..3cbe77a40d4 100644 --- a/ACE/ace/QoS/QoS_Decorator.cpp +++ b/ACE/ace/QoS/QoS_Decorator.cpp @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_QOS_DECORATOR) // Constructor. -ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (void) +ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base () {} // Constructor. @@ -17,7 +17,7 @@ ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (ACE_Event_Handler } // Destructor. -ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base (void) +ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base () { } @@ -43,7 +43,7 @@ ACE_QoS_Decorator_Base::handle_qos (ACE_HANDLE fd) } // Constructor. -ACE_QoS_Decorator::ACE_QoS_Decorator (void) +ACE_QoS_Decorator::ACE_QoS_Decorator () {} // Constructor. @@ -61,7 +61,7 @@ ACE_QoS_Decorator::ACE_QoS_Decorator (ACE_Event_Handler *event_handler, } // Destructor. -ACE_QoS_Decorator::~ACE_QoS_Decorator (void) +ACE_QoS_Decorator::~ACE_QoS_Decorator () { delete this->decorator_base_; delete this->qos_event_handler_; @@ -98,7 +98,7 @@ ACE_QoS_Decorator::handle_qos (ACE_HANDLE fd) // if the application is using RAPI. Note that it is a no-op for GQoS // because an extra socket for handling QoS events is not required. int -ACE_QoS_Decorator::init (void) +ACE_QoS_Decorator::init () { #if defined (ACE_HAS_RAPI) @@ -113,7 +113,7 @@ ACE_QoS_Decorator::init (void) } // Constructor. -ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (void) +ACE_QoS_Event_Handler::ACE_QoS_Event_Handler () { } @@ -125,7 +125,7 @@ ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base } // Destructor. -ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler (void) +ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler () { } diff --git a/ACE/ace/QoS/QoS_Decorator.h b/ACE/ace/QoS/QoS_Decorator.h index a15d3654bdc..4b578cec30f 100644 --- a/ACE/ace/QoS/QoS_Decorator.h +++ b/ACE/ace/QoS/QoS_Decorator.h @@ -43,13 +43,13 @@ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler public: // Initialization and termination methods. /// Constructor. - ACE_QoS_Decorator_Base (void); + ACE_QoS_Decorator_Base (); /// Constructor. ACE_QoS_Decorator_Base (ACE_Event_Handler *event_handler); /// Destructor. - ~ACE_QoS_Decorator_Base (void); + ~ACE_QoS_Decorator_Base (); /// Forwards the request to its event_handler_ component. virtual ACE_HANDLE get_handle () const; @@ -78,7 +78,7 @@ private: class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler { /// Destructor. - ~ACE_QoS_Event_Handler (void); + ~ACE_QoS_Event_Handler (); /// Returns the RAPI file descriptor for receiving QoS events. virtual ACE_HANDLE get_handle () const; @@ -94,7 +94,7 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler private: /// Constructor is private because only ACE_QoS_Decorator should /// create this object. - ACE_QoS_Event_Handler (void); + ACE_QoS_Event_Handler (); /// The QoS Decorator passes in its base for this handler to use. ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base *decorator_base); @@ -120,7 +120,7 @@ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base public: // Initialization and termination methods. /// Constructor. - ACE_QoS_Decorator (void); + ACE_QoS_Decorator (); /// Constructor. ACE_QoS_Decorator (ACE_Event_Handler *event_handler, @@ -128,7 +128,7 @@ public: ACE_Reactor *reactor = ACE_Reactor::instance ()); /// Destructor. - ~ACE_QoS_Decorator (void); + ~ACE_QoS_Decorator (); /// Calls the base class get_handle (). virtual ACE_HANDLE get_handle () const; @@ -141,7 +141,7 @@ public: /// This method registers the QoS Event Handler with the Reactor /// to receive RAPI events. - int init (void); + int init (); private: /// Requests on the class are forwarded to this base class; diff --git a/ACE/ace/QoS/QoS_Manager.cpp b/ACE/ace/QoS/QoS_Manager.cpp index c7bbbb09182..d5437c91896 100644 --- a/ACE/ace/QoS/QoS_Manager.cpp +++ b/ACE/ace/QoS/QoS_Manager.cpp @@ -6,10 +6,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_QOS_MANAGER) -ACE_QoS_Manager::ACE_QoS_Manager (void) +ACE_QoS_Manager::ACE_QoS_Manager () {} -ACE_QoS_Manager::~ACE_QoS_Manager (void) +ACE_QoS_Manager::~ACE_QoS_Manager () {} // Adds the given session to the list of session objects joined by @@ -29,7 +29,7 @@ ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session) // Returns the QoS session set for this socket. ACE_Unbounded_Set <ACE_QoS_Session *> -ACE_QoS_Manager::qos_session_set (void) +ACE_QoS_Manager::qos_session_set () { return this->qos_session_set_; } diff --git a/ACE/ace/QoS/QoS_Manager.h b/ACE/ace/QoS/QoS_Manager.h index 81f331b4ae2..5b2b863a552 100644 --- a/ACE/ace/QoS/QoS_Manager.h +++ b/ACE/ace/QoS/QoS_Manager.h @@ -42,10 +42,10 @@ class ACE_QoS_Export ACE_QoS_Manager { public: /// Default constructor. - ACE_QoS_Manager (void); + ACE_QoS_Manager (); /// Default destructor. - ~ACE_QoS_Manager (void); + ~ACE_QoS_Manager (); /** * Join the given QoS session. A socket can join multiple QoS @@ -57,7 +57,7 @@ public: typedef ACE_Unbounded_Set <ACE_QoS_Session *> ACE_QOS_SESSION_SET; /// Get the QoS session set. - ACE_QOS_SESSION_SET qos_session_set (void); + ACE_QOS_SESSION_SET qos_session_set (); private: /// Set of QoS sessions that this socket has joined. diff --git a/ACE/ace/QoS/QoS_Session_Factory.cpp b/ACE/ace/QoS/QoS_Session_Factory.cpp index a726a5fefb2..3ff403db99d 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.cpp +++ b/ACE/ace/QoS/QoS_Session_Factory.cpp @@ -17,12 +17,12 @@ const enum ACE_QoS_Session_Factory::ACE_QoS_Session_Type # error "QoS type not supported. Cannot build." #endif /* ACE_HAS_RAPI */ -ACE_QoS_Session_Factory::ACE_QoS_Session_Factory (void) +ACE_QoS_Session_Factory::ACE_QoS_Session_Factory () { ACE_TRACE ("ACE_QoS_Session_Factory::ACE_QoS_Session_Factory"); } -ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory (void) +ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory () { ACE_TRACE ("ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory"); } diff --git a/ACE/ace/QoS/QoS_Session_Factory.h b/ACE/ace/QoS/QoS_Session_Factory.h index f3d8de8cf05..db5b9e624ad 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.h +++ b/ACE/ace/QoS/QoS_Session_Factory.h @@ -40,10 +40,10 @@ class ACE_QoS_Export ACE_QoS_Session_Factory { public : /// Default constructor. - ACE_QoS_Session_Factory (void); + ACE_QoS_Session_Factory (); /// Default destructor. - ~ACE_QoS_Session_Factory (void); + ~ACE_QoS_Session_Factory (); /// Types of sessions for this factory to manage. enum ACE_QoS_Session_Type diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp index dd247f68339..f552755488e 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.cpp +++ b/ACE/ace/QoS/QoS_Session_Impl.cpp @@ -222,7 +222,7 @@ rsvp_callback (rapi_sid_t /* sid */, } // Constructor. -ACE_RAPI_Session::ACE_RAPI_Session (void) +ACE_RAPI_Session::ACE_RAPI_Session () { ACE_TRACE ("ACE_RAPI_Session::ACE_RAPI_Session"); //this->source_port (DEFAULT_SOURCE_SENDER_PORT); @@ -269,7 +269,7 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr, // Close the RAPI QoS Session. int -ACE_RAPI_Session::close (void) +ACE_RAPI_Session::close () { this->rsvp_error = rapi_release(this->session_id_); @@ -287,7 +287,7 @@ ACE_RAPI_Session::close (void) //Get the most recent RSVP event that occurred ACE_QoS_Session::RSVP_Event_Type -ACE_RAPI_Session::rsvp_event_type (void) +ACE_RAPI_Session::rsvp_event_type () { return this->rsvp_event_type_; } @@ -523,7 +523,7 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) } int -ACE_RAPI_Session::update_qos (void) +ACE_RAPI_Session::update_qos () { // Update the session QoS Parameters based on the RSVP Event Received. if ((rsvp_error = rapi_dispatch ()) != 0) @@ -624,7 +624,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_GQoS_Session::GQoS_session_id = 0; // Constructor. -ACE_GQoS_Session::ACE_GQoS_Session (void) +ACE_GQoS_Session::ACE_GQoS_Session () { ACE_TRACE ("ACE_GQoS_Session::ACE_GQoS_Session"); } @@ -644,7 +644,7 @@ ACE_GQoS_Session::open (ACE_INET_Addr dest_addr, // Close the GQoS Session. int -ACE_GQoS_Session::close (void) +ACE_GQoS_Session::close () { // TBD. return 0; @@ -687,7 +687,7 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, } int -ACE_GQoS_Session::update_qos (void) +ACE_GQoS_Session::update_qos () { // WSAIoctl (GET_QOS) call goes here... return 0; @@ -695,7 +695,7 @@ ACE_GQoS_Session::update_qos (void) //Get the most recent RSVP event that occurred ACE_QoS_Session::RSVP_Event_Type -ACE_GQoS_Session::rsvp_event_type (void) +ACE_GQoS_Session::rsvp_event_type () { return this->rsvp_event_type_; } diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h index 284980b5d26..d87af62f6bc 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.h +++ b/ACE/ace/QoS/QoS_Session_Impl.h @@ -38,7 +38,7 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session { public: /// Default destructor. - ~ACE_RAPI_Session (void); + ~ACE_RAPI_Session (); /// Error handling for RSVP callback static int rsvp_error; @@ -48,7 +48,7 @@ public: ACE_Protocol_ID protocol_id); /// Close the RAPI QoS Session. - virtual int close (void); + virtual int close (); /// Returns the QoS for this RAPI session. virtual ACE_QoS qos () const; @@ -73,7 +73,7 @@ public: * It is a mechanism of updating the QoS for this session asynchronously, as * RSVP events occur. */ - virtual int update_qos (void); + virtual int update_qos (); /// Get methods for the flags_. virtual ACE_End_Point_Type flags () const; @@ -88,13 +88,13 @@ public: virtual void session_id (const int session_id); /// Get the RAPI file descriptor for RSVP events. - virtual ACE_HANDLE rsvp_events_handle (void); + virtual ACE_HANDLE rsvp_events_handle (); ///Set the RAPI event that last occurred virtual void rsvp_event_type (RSVP_Event_Type event_type); ///Get the RAPI event that last occurred - virtual RSVP_Event_Type rsvp_event_type (void); + virtual RSVP_Event_Type rsvp_event_type (); /// Get the destination address for this RAPI session. virtual ACE_INET_Addr dest_addr () const; @@ -124,7 +124,7 @@ public: private: /// Default constuctor. Constructor is defined private so that only /// the friend factory can instantiate this class. - ACE_RAPI_Session (void); + ACE_RAPI_Session (); /// Construct a simplified RAPI Sender TSpec object /// from an ACE_Flow_Spec object. Used internally by this class. @@ -159,7 +159,7 @@ class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session { public: /// Default destructor. - ~ACE_GQoS_Session (void); + ~ACE_GQoS_Session (); /// This is a session ID generator. It does a lot more than expected /// from an int!. @@ -170,7 +170,7 @@ public: ACE_Protocol_ID protocol_id); /// Close the GQoS Session. - virtual int close (void); + virtual int close (); /// Returns the QoS for this GQoS session. virtual ACE_QoS qos () const; @@ -192,7 +192,7 @@ public: /// Calls the ioctl (ACE_SIO_GET_QOS). It is a mechanism of updating the /// QoS for this session asynchronously, as RSVP events occur. - virtual int update_qos (void); + virtual int update_qos (); /// Get/Set methods for the flags_. virtual ACE_End_Point_Type flags () const; @@ -223,12 +223,12 @@ public: virtual void session_id (const int session_id); /// Get the file descriptor of the underlying socket. - virtual ACE_HANDLE rsvp_events_handle (void); + virtual ACE_HANDLE rsvp_events_handle (); virtual void rsvp_event_type (RSVP_Event_Type event_type); ///Set the RAPI event that last occurred - virtual RSVP_Event_Type rsvp_event_type (void); + virtual RSVP_Event_Type rsvp_event_type (); ///Get the RAPI event that last occurred /// GQoS version. diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h index 3d1ca20e881..86fc8bfa36a 100644 --- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h +++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h @@ -40,7 +40,7 @@ public: // use <ACE_SOCK_Dgram> or <ACE_SOCK_CODgram> instead. /// Default dtor. - ~ACE_SOCK_Dgram_Mcast_QoS (void); + ~ACE_SOCK_Dgram_Mcast_QoS (); // = Multicast group management routines. /** @@ -96,7 +96,7 @@ public: ACE_OVERLAPPED_COMPLETION_FUNC func) const; /// Returns the QoS manager for this socket. - ACE_QoS_Manager qos_manager (void); + ACE_QoS_Manager qos_manager (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp index 4e1e38f0938..35a87df9a4e 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor/QtReactor.cpp @@ -67,7 +67,7 @@ void ACE_QtReactor::reopen_notification_pipe( void) #endif /* ACE_MT_SAFE */ } -ACE_QtReactor::~ACE_QtReactor (void) +ACE_QtReactor::~ACE_QtReactor () { // iterate over QSocketNotifiers for read and release them MAP::ITERATOR iter = this->read_notifier_.begin (); @@ -114,7 +114,7 @@ ACE_QtReactor::qapplication (QApplication *qapp) } void -ACE_QtReactor::timeout_event (void) +ACE_QtReactor::timeout_event () { // Deal with any timer events ACE_Select_Reactor_Handle_Set handle_set; @@ -508,7 +508,7 @@ ACE_QtReactor::remove_handler_i (const ACE_Handle_Set &handles, // first timeout in the Reactor's Timer_Queue. void -ACE_QtReactor::reset_timeout (void) +ACE_QtReactor::reset_timeout () { if (this->qtime_ != 0) { diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h index 6bafe3c7f4c..25fed71affb 100644 --- a/ACE/ace/QtReactor/QtReactor.h +++ b/ACE/ace/QtReactor/QtReactor.h @@ -120,7 +120,7 @@ public: bool mask_signals = true, int s_queue = ACE_SELECT_TOKEN::FIFO); - virtual ~ACE_QtReactor (void); + virtual ~ACE_QtReactor (); void qapplication (QApplication *qapp); @@ -197,9 +197,9 @@ protected: private: /// This method ensures there's an Qt timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); /// reopens notification pipe to create SocketNotifier for it - void reopen_notification_pipe(void); + void reopen_notification_pipe(); #ifdef ACE_HAS_QT5 /// Recover the socket's ACE_HANDLE based on the sender of the Qt signal. @@ -223,7 +223,7 @@ private slots: void exception_event (ACE_QT_HANDLE_TYPE p_handle); /// Dispatch a timeout event - void timeout_event (void); + void timeout_event (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index 83404fe0e3d..03fb77f2a60 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -742,7 +742,7 @@ public: * be declared and defined in both the derived forward and * reverse iterator classes rather than in the base iterator * class because of a method signature resolution problem - * caused by the existence of the deprecated next (void) + * caused by the existence of the deprecated next () * method in the derived forward iterator class. When that * deprecated method is removed, this method should be removed * from the derived classes and placed in the base class. @@ -857,7 +857,7 @@ public: * be declared and defined in both the derived forward and * reverse iterator classes rather than in the base iterator * class because of a method signature resolution problem - * caused by the existence of the deprecated next (void) + * caused by the existence of the deprecated next () * method in the derived forward iterator class. When that * deprecated method is removed, this method should be removed * from the derived classes and placed in the base class. diff --git a/ACE/ace/RW_Process_Mutex.h b/ACE/ace/RW_Process_Mutex.h index 71244548ddc..193c88eb273 100644 --- a/ACE/ace/RW_Process_Mutex.h +++ b/ACE/ace/RW_Process_Mutex.h @@ -47,19 +47,19 @@ public: int flags = O_CREAT|O_RDWR, mode_t mode = ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS); - ~ACE_RW_Process_Mutex (void); + ~ACE_RW_Process_Mutex (); /** * Explicitly destroy the mutex. Note that only one thread should * call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /// Same as acquire_write(). /// Acquire lock ownership; blocks until the lock is acquired or the /// operation fails. - int acquire (void); + int acquire (); /** * Same as tryacquire_write(). @@ -69,18 +69,18 @@ public: * @retval -1 on failure. If the lock is already held, @c errno is set * to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Release lock. - int release (void); + int release (); /// Acquire read lock; blocks until the lock is acquired or the /// operation fails. - int acquire_read (void); + int acquire_read (); /// Acquire write lock; blocks until the lock is acquired or the /// operation fails. - int acquire_write (void); + int acquire_write (); /** * Try to acquire the read lock, but do not block if the lock is not @@ -89,7 +89,7 @@ public: * @retval -1 on failure. If the lock is already held, @c errno is set * to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Try to acquire the write lock, but do not block if the lock is not @@ -98,11 +98,11 @@ public: * @retval -1 on failure. If the lock is already held, @c errno is set * to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /// Attempt to upgrade a read lock to a write lock. Returns 0 on /// success, -1 on failure. - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /// Return the underlying lock. const ACE_File_Lock &lock () const; @@ -119,7 +119,7 @@ private: ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN]; /// Create and return the unique name. - const ACE_TCHAR *unique_name (void); + const ACE_TCHAR *unique_name (); /// We need this to get the readers/writer semantics... ACE_File_Lock lock_; diff --git a/ACE/ace/Reactor_Notification_Strategy.h b/ACE/ace/Reactor_Notification_Strategy.h index 93f58051d24..26288543a8d 100644 --- a/ACE/ace/Reactor_Notification_Strategy.h +++ b/ACE/ace/Reactor_Notification_Strategy.h @@ -36,14 +36,14 @@ public: ACE_Reactor_Mask mask); /// Default destructor. - virtual ~ACE_Reactor_Notification_Strategy (void); + virtual ~ACE_Reactor_Notification_Strategy (); - virtual int notify (void); + virtual int notify (); virtual int notify (ACE_Event_Handler *eh, ACE_Reactor_Mask mask); /// Get the reactor - ACE_Reactor *reactor (void); + ACE_Reactor *reactor (); /// Set the reactor void reactor (ACE_Reactor *r); diff --git a/ACE/ace/Reactor_Token_T.cpp b/ACE/ace/Reactor_Token_T.cpp index 827aefcc64a..01898945b8e 100644 --- a/ACE/ace/Reactor_Token_T.cpp +++ b/ACE/ace/Reactor_Token_T.cpp @@ -38,13 +38,13 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::ACE_Reactor_Token_T (int s_queue) } template <class ACE_TOKEN_TYPE> -ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::~ACE_Reactor_Token_T (void) +ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::~ACE_Reactor_Token_T () { ACE_TRACE ("ACE_Reactor_Token_T::~ACE_Reactor_Token_T"); } template <class ACE_TOKEN_TYPE> ACE_Reactor_Impl & -ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::reactor (void) +ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::reactor () { return *this->reactor_; } @@ -58,7 +58,7 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::reactor (ACE_Reactor_Impl &reactor) // Used to wakeup the reactor. template <class ACE_TOKEN_TYPE> void -ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void) +ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook () { ACE_TRACE ("ACE_Reactor_Token_T::sleep_hook"); ACE_Time_Value ping (ACE_Time_Value::zero); diff --git a/ACE/ace/Reactor_Token_T.h b/ACE/ace/Reactor_Token_T.h index 0f92ec7206c..3f9adec8e80 100644 --- a/ACE/ace/Reactor_Token_T.h +++ b/ACE/ace/Reactor_Token_T.h @@ -55,14 +55,14 @@ public: ACE_Reactor_Token_T (ACE_Reactor_Impl &r, int s_queue = ACE_TOKEN_TYPE::FIFO); ACE_Reactor_Token_T (int s_queue = ACE_TOKEN_TYPE::FIFO); - virtual ~ACE_Reactor_Token_T (void); + virtual ~ACE_Reactor_Token_T (); /// Called just before a token waiter goes to sleep. /// @see ACE_Token::sleep_hook - virtual void sleep_hook (void); + virtual void sleep_hook (); /// Get the reactor implementation - ACE_Reactor_Impl &reactor (void); + ACE_Reactor_Impl &reactor (); /// Set the reactor implementation void reactor (ACE_Reactor_Impl &); diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h index ea5cbb0c004..d91adb95f37 100644 --- a/ACE/ace/Read_Buffer.h +++ b/ACE/ace/Read_Buffer.h @@ -59,7 +59,7 @@ public: #endif // ACE_HAS_WINCE /// Closes the FILE *. - ~ACE_Read_Buffer (void); + ~ACE_Read_Buffer (); /** * Returns a pointer dynamically allocated with diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index 9e63c4421f6..4e7a2aa78e2 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -100,7 +100,7 @@ ACE_Registry::Binding::name (ACE_TString &name) // Name accessors // (String version) ACE_TString -ACE_Registry::Binding::name (void) +ACE_Registry::Binding::name () { return this->name_; } @@ -108,7 +108,7 @@ ACE_Registry::Binding::name (void) // Type accessor ACE_Registry::Binding_Type -ACE_Registry::Binding::type (void) +ACE_Registry::Binding::type () { return this->type_; } @@ -168,7 +168,7 @@ ACE_Registry::Object::type () const // Simple context constructor -ACE_Registry::Naming_Context::Naming_Context (void) +ACE_Registry::Naming_Context::Naming_Context () : key_ ((HKEY) 0), parent_key_ ((HKEY) 0), name_ () @@ -575,7 +575,7 @@ ACE_Registry::Naming_Context::resolve_context (const ACE_TString &name, // Same as unbind_context() with <this> as naming_context int -ACE_Registry::Naming_Context::destroy (void) +ACE_Registry::Naming_Context::destroy () { // hopefully the parent_key_ is still open long result = ACE_TEXT_RegDeleteKey (this->parent_key_, @@ -587,7 +587,7 @@ ACE_Registry::Naming_Context::destroy (void) // Sync content of context to disk int -ACE_Registry::Naming_Context::flush (void) +ACE_Registry::Naming_Context::flush () { long result = ::RegFlushKey (this->key_); ACE_REGISTRY_CALL_RETURN (result); @@ -596,7 +596,7 @@ ACE_Registry::Naming_Context::flush (void) // Close the handle of the context int -ACE_Registry::Naming_Context::close (void) +ACE_Registry::Naming_Context::close () { long result = this->key_ ? ::RegCloseKey (this->key_) : ERROR_SUCCESS; ACE_REGISTRY_CALL_RETURN (result); @@ -676,7 +676,7 @@ ACE_Registry::Naming_Context::key (HKEY key) // Get key HKEY -ACE_Registry::Naming_Context::key (void) +ACE_Registry::Naming_Context::key () { return this->key_; } @@ -692,7 +692,7 @@ ACE_Registry::Naming_Context::parent (HKEY parent) // Get parent HKEY -ACE_Registry::Naming_Context::parent (void) +ACE_Registry::Naming_Context::parent () { return this->parent_key_; } @@ -728,7 +728,7 @@ ACE_Registry::Naming_Context::name (const ACE_TString &name) // Get name // (String version) ACE_TString -ACE_Registry::Naming_Context::name (void) +ACE_Registry::Naming_Context::name () { return this->name_; } @@ -836,12 +836,12 @@ ACE_Registry::Binding_Iterator::Iteration_State::iterator (Binding_Iterator *ite } -ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (void) +ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State () : index_ (0) { } -ACE_Registry::Binding_Iterator::Iteration_State::~Iteration_State (void) +ACE_Registry::Binding_Iterator::Iteration_State::~Iteration_State () { } @@ -877,7 +877,7 @@ ACE_Registry::Binding_Iterator::next_n (u_long how_many, // Destroy iterator int -ACE_Registry::Binding_Iterator::destroy (void) +ACE_Registry::Binding_Iterator::destroy () { this->reset (); return 0; @@ -893,7 +893,7 @@ ACE_Registry::Binding_Iterator::naming_context (Naming_Context &naming_context) ACE_Registry::Naming_Context & -ACE_Registry::Binding_Iterator::naming_context (void) +ACE_Registry::Binding_Iterator::naming_context () { return *this->naming_context_; } @@ -908,7 +908,7 @@ ACE_Registry::Binding_Iterator::current_enumeration (Iteration_State ¤t_en ACE_Registry::Binding_Iterator::Iteration_State & -ACE_Registry::Binding_Iterator::current_enumeration (void) +ACE_Registry::Binding_Iterator::current_enumeration () { return *this->current_enumeration_; } diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h index 1878c304fe7..8d5e613116e 100644 --- a/ACE/ace/Registry.h +++ b/ACE/ace/Registry.h @@ -73,7 +73,7 @@ public: struct ACE_Export Binding { /// Empty (default) constructor - Binding (void); + Binding (); /// Constructor /// (Name version) @@ -97,10 +97,10 @@ public: void name (ACE_TString &name); /// Get Name (String version) - ACE_TString name (void); + ACE_TString name (); /// Type accessor - Binding_Type type (void); + Binding_Type type (); private: /// A binding has a name @@ -188,13 +188,13 @@ public: }; /// Empty constructor: keys will be NULL - Naming_Context (void); + Naming_Context (); /// Constructor: key_ will be set to @a key Naming_Context (const HKEY &key); /// Destructor will call <Naming_Context::close>. - ~Naming_Context (void); + ~Naming_Context (); // The following interfaces are for objects @@ -327,7 +327,7 @@ public: int unbind_context (const ACE_TString &name); /// Same as <unbind_context> with @c this as naming_context - int destroy (void); + int destroy (); /** * listing function: iterator creator @@ -347,20 +347,20 @@ public: // not part of the CORBA interface /// Sync content of context to disk - int flush (void); + int flush (); /// Close the handle of the context /// @note <close> does not call <flush> - int close (void); + int close (); // Accessors /// Get key - HKEY key (void); + HKEY key (); // void parent (HKEY parent); /// Get parent - HKEY parent (void); + HKEY parent (); /// Get name /// (Name version) @@ -370,7 +370,7 @@ public: void name (ACE_TString &name); /// Get name (String version) - ACE_TString name (void); + ACE_TString name (); protected: /// Set key @@ -418,7 +418,7 @@ public: friend class Naming_Context; /// Default constructor - Binding_Iterator (void); + Binding_Iterator (); /// Next entry int next_one (Binding &binding); @@ -428,13 +428,13 @@ public: Binding_List &list); /// Cleanup - int destroy (void); + int destroy (); /// Reset the internal state of the iterator - void reset (void); + void reset (); /// Get naming_context that the iterator is iterating over - Naming_Context &naming_context (void); + Naming_Context &naming_context (); private: /// Set naming_context that the iterator is iterating over @@ -456,10 +456,10 @@ public: { public: /// Constructor - Iteration_State (void); + Iteration_State (); /// Destructor - virtual ~Iteration_State (void); + virtual ~Iteration_State (); /// Set the iterator reference. void iterator (Binding_Iterator *iterator); @@ -469,7 +469,7 @@ public: Binding_List &list) = 0; /// Reset state - void reset (void); + void reset (); protected: /// Pointer to parent iterator @@ -520,7 +520,7 @@ public: void current_enumeration (Iteration_State& current_enumeration); /// Get current_enumeration - Iteration_State ¤t_enumeration (void); + Iteration_State ¤t_enumeration (); }; }; diff --git a/ACE/ace/Remote_Name_Space.h b/ACE/ace/Remote_Name_Space.h index cdda6074e68..3db871764c8 100644 --- a/ACE/ace/Remote_Name_Space.h +++ b/ACE/ace/Remote_Name_Space.h @@ -46,7 +46,7 @@ class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space { public: /// "Do-nothing" constructor. - ACE_Remote_Name_Space (void); + ACE_Remote_Name_Space (); /** * Specifies the scope of this namespace, opens and memory-maps the @@ -64,7 +64,7 @@ public: /// destructor, do some cleanup :TBD: last dtor should "compress" /// file - ~ACE_Remote_Name_Space (void); + ~ACE_Remote_Name_Space (); /// Bind a new name to a naming context (Wide character strings). virtual int bind (const ACE_NS_WString &name_in, diff --git a/ACE/ace/Remote_Tokens.cpp b/ACE/ace/Remote_Tokens.cpp index 866f7916201..315b464f0bf 100644 --- a/ACE/ace/Remote_Tokens.cpp +++ b/ACE/ace/Remote_Tokens.cpp @@ -32,18 +32,18 @@ ACE_TSS_Connection::set_server_address (const ACE_INET_Addr &server_address) } // Necessary to make some compilers work... -ACE_TSS_Connection::ACE_TSS_Connection (void) +ACE_TSS_Connection::ACE_TSS_Connection () { ACE_TRACE ("ACE_TSS_Connection::ACE_TSS_Connection"); } -ACE_TSS_Connection::~ACE_TSS_Connection (void) +ACE_TSS_Connection::~ACE_TSS_Connection () { ACE_TRACE ("ACE_TSS_Connection::~ACE_TSS_Connection"); } ACE_SOCK_Stream * -ACE_TSS_Connection::get_connection (void) +ACE_TSS_Connection::get_connection () { return ACE_TSS<ACE_SOCK_Stream>::operator-> (); } @@ -71,7 +71,7 @@ ACE_TSS_Connection::make_TSS_TYPE () const return stream; } -ACE_TSS_Connection::operator ACE_SOCK_Stream *(void) +ACE_TSS_Connection::operator ACE_SOCK_Stream *() { return this->get_connection (); } @@ -91,12 +91,12 @@ ACE_TSS_Connection::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy (void) +ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy () { ACE_TRACE ("ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy"); } -ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy (void) +ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy () { ACE_TRACE ("ACE_Remote_Token_Proxy::~ACE_Remote_Token_Proxy"); } @@ -119,7 +119,7 @@ ACE_Remote_Token_Proxy::set_server_address (const ACE_INET_Addr &server_address) } int -ACE_Remote_Token_Proxy::initiate_connection (void) +ACE_Remote_Token_Proxy::initiate_connection () { ACE_TRACE ("ACE_Remote_Token_Proxy::initiate_connection"); if (token_ == 0) @@ -377,7 +377,7 @@ ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) } const ACE_TCHAR* -ACE_Remote_Token_Proxy::owner_id (void) +ACE_Remote_Token_Proxy::owner_id () { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_id called\n"))); diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h index 3e6e52a25c8..0b8a3a80394 100644 --- a/ACE/ace/Remote_Tokens.h +++ b/ACE/ace/Remote_Tokens.h @@ -70,7 +70,7 @@ public: * is, every thread has only one connection that is used for all * remote tokens. */ - int initiate_connection (void); + int initiate_connection (); /** * Acquire the distributed token. If notify is specified and the @@ -126,7 +126,7 @@ public: virtual void token_acquired (ACE_TPQ_Entry *); /// The client id of the current token holder - virtual const ACE_TCHAR* owner_id (void); + virtual const ACE_TCHAR* owner_id (); /** * Sets the server address for all instances of ACE_Remote_Token_Proxy @@ -166,7 +166,7 @@ class ACE_Export ACE_Remote_Mutex : public ACE_Remote_Token_Proxy { public: /// Null creation. Remote_Token_Proxy::open must be called. - ACE_Remote_Mutex (void); + ACE_Remote_Mutex (); /// Calls Remote_Token_Proxy::open for you. ACE_Remote_Mutex (const ACE_TCHAR *token_name, @@ -201,7 +201,7 @@ protected: class ACE_Export ACE_Remote_RLock : public ACE_Remote_Token_Proxy { public: - ACE_Remote_RLock (void); + ACE_Remote_RLock (); ACE_Remote_RLock (const ACE_TCHAR *token_name, int ignore_deadlock = 0, @@ -239,7 +239,7 @@ protected: class ACE_Export ACE_Remote_WLock : public ACE_Remote_Token_Proxy { public: - ACE_Remote_WLock (void); + ACE_Remote_WLock (); ACE_Remote_WLock (const ACE_TCHAR *token_name, int ignore_deadlock = 0, @@ -275,18 +275,18 @@ class ACE_Export ACE_TSS_Connection : public ACE_TSS<ACE_SOCK_Stream> { public: // Necessary to make some compilers work... - ACE_TSS_Connection (void); - ~ACE_TSS_Connection (void); + ACE_TSS_Connection (); + ~ACE_TSS_Connection (); /// Retrieve the thread's connection - ACE_SOCK_Stream *get_connection (void); + ACE_SOCK_Stream *get_connection (); /// Factory Method that creates a new SOCK Stream. 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. - operator ACE_SOCK_Stream *(void); + operator ACE_SOCK_Stream *(); /// Set the server address. static void set_server_address (const ACE_INET_Addr &server_address); diff --git a/ACE/ace/SOCK_CODgram.h b/ACE/ace/SOCK_CODgram.h index bbe37f29623..c52f33f538f 100644 --- a/ACE/ace/SOCK_CODgram.h +++ b/ACE/ace/SOCK_CODgram.h @@ -35,7 +35,7 @@ class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO { public: /// Default constructor. - ACE_SOCK_CODgram (void); + ACE_SOCK_CODgram (); /** * Constructor with addresses specified. Calls open(). @@ -78,7 +78,7 @@ public: int reuse_addr = 0); /// Default dtor. - ~ACE_SOCK_CODgram (void); + ~ACE_SOCK_CODgram (); // Initiate a connected dgram. diff --git a/ACE/ace/SOCK_Dgram_Bcast.h b/ACE/ace/SOCK_Dgram_Bcast.h index cff20421437..9a53c4f3dac 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.h +++ b/ACE/ace/SOCK_Dgram_Bcast.h @@ -58,7 +58,7 @@ class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram { public: /// Default constructor. - ACE_SOCK_Dgram_Bcast (void); + ACE_SOCK_Dgram_Bcast (); ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, int protocol_family = PF_INET, @@ -67,7 +67,7 @@ public: const ACE_TCHAR *host_name = 0); /// Default dtor. - ~ACE_SOCK_Dgram_Bcast (void); + ~ACE_SOCK_Dgram_Bcast (); // Initiate a connectionless datagram broadcast endpoint. @@ -79,7 +79,7 @@ public: const ACE_TCHAR *host_name = 0); /// Close up and release dynamically allocated resources. - int close (void); + int close (); /// Broadcast the datagram to every interface. Returns the average /// number of bytes sent. diff --git a/ACE/ace/SOCK_Netlink.h b/ACE/ace/SOCK_Netlink.h index d9a8b965b17..f08b5a361a1 100644 --- a/ACE/ace/SOCK_Netlink.h +++ b/ACE/ace/SOCK_Netlink.h @@ -41,8 +41,8 @@ class ACE_Export ACE_SOCK_Netlink : public ACE_SOCK { public: /// Default constructor. - ACE_SOCK_Netlink(void); - ~ACE_SOCK_Netlink(void); + ACE_SOCK_Netlink(); + ~ACE_SOCK_Netlink(); ACE_SOCK_Netlink (ACE_Netlink_Addr &local, int protocol_family, int protocol); diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.h b/ACE/ace/SOCK_SEQPACK_Acceptor.h index 16e936127d7..2095e222e32 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.h +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.h @@ -44,7 +44,7 @@ class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK { public: /// Default constructor. - ACE_SOCK_SEQPACK_Acceptor (void); + ACE_SOCK_SEQPACK_Acceptor (); /** * Initialize a passive-mode BSD-style acceptor socket (no QoS). @@ -111,10 +111,10 @@ public: int protocol = 132); /// Close the socket. Returns 0 on success and -1 on failure. - int close (void); + int close (); /// Default dtor. - ~ACE_SOCK_SEQPACK_Acceptor (void); + ~ACE_SOCK_SEQPACK_Acceptor (); // = Passive connection <accept> methods. /** diff --git a/ACE/ace/SOCK_SEQPACK_Association.h b/ACE/ace/SOCK_SEQPACK_Association.h index a9a0a80cc6e..9e2265d5984 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.h +++ b/ACE/ace/SOCK_SEQPACK_Association.h @@ -77,13 +77,13 @@ class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO public: // Initialization and termination methods. /// Constructor. - ACE_SOCK_SEQPACK_Association (void); + ACE_SOCK_SEQPACK_Association (); /// Constructor (sets the underlying ACE_HANDLE with <h>). ACE_SOCK_SEQPACK_Association (ACE_HANDLE h); /// Destructor. - ~ACE_SOCK_SEQPACK_Association (void); + ~ACE_SOCK_SEQPACK_Association (); /** * Return local endpoint addresses in the referenced array of @@ -161,22 +161,22 @@ public: // = Selectively close endpoints. /// Close down the reader. - int close_reader (void); + int close_reader (); /// Close down the writer. - int close_writer (void); + int close_writer (); /** * Close down the socket (we need this to make things work correctly * on Win32, which requires use to do a <close_writer> before doing * the close to avoid losing data). */ - int close (void); + int close (); /** * Abort the association according to RFC 2960 9.1 through the API * in draft-ietf-tsvwg-sctpsocket-09 7.1.4. */ - int abort (void); + int abort (); // = Meta-type info typedef ACE_Multihomed_INET_Addr PEER_ADDR; diff --git a/ACE/ace/SOCK_SEQPACK_Connector.h b/ACE/ace/SOCK_SEQPACK_Connector.h index 59db01155c8..23e3475c9ee 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.h +++ b/ACE/ace/SOCK_SEQPACK_Connector.h @@ -49,7 +49,7 @@ class ACE_Export ACE_SOCK_SEQPACK_Connector { public: /// Default constructor. - ACE_SOCK_SEQPACK_Connector (void); + ACE_SOCK_SEQPACK_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_SOCK_SEQPACK_Association @@ -251,7 +251,7 @@ public: int protocol = 132); /// Default dtor. - ~ACE_SOCK_SEQPACK_Connector (void); + ~ACE_SOCK_SEQPACK_Connector (); // = Completion routine. /** diff --git a/ACE/ace/SPIPE.h b/ACE/ace/SPIPE.h index 485e866274d..a8b83666738 100644 --- a/ACE/ace/SPIPE.h +++ b/ACE/ace/SPIPE.h @@ -51,7 +51,7 @@ public: * @return 0 for success; -1 for failure. If a failure occurs, further * error information is available from ACE_OS::last_error(). */ - int close (void); + int close (); /// Close down the SPIPE and remove the rendezvous point from /// the file system. @@ -59,7 +59,7 @@ public: * @return 0 for success; -1 for failure. If a failure occurs, further * error information is available from ACE_OS::last_error(). */ - int remove (void); + int remove (); /// Return the local address of this endpoint. /** diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h index 0f95a384706..2f0af3aee8c 100644 --- a/ACE/ace/SPIPE_Acceptor.h +++ b/ACE/ace/SPIPE_Acceptor.h @@ -46,7 +46,7 @@ class ACE_Export ACE_SPIPE_Acceptor : public ACE_SPIPE { public: /// Default constructor. - ACE_SPIPE_Acceptor (void); + ACE_SPIPE_Acceptor (); /// Initiate a passive-mode STREAM pipe listener. /** @@ -96,10 +96,10 @@ public: int pipe_mode = PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); /// Close down the passive-mode STREAM pipe listener. - int close (void); + int close (); /// Remove the underlying mounted pipe from the file system. - int remove (void); + int remove (); // = Passive connection acceptance method. /** diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index 40bdb2869a2..a673b6f371a 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -127,7 +127,7 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( )); } -ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) +ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream () { ACE_TRACE ("ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream"); @@ -162,7 +162,7 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) // ************************************************************ int -ACE_SSL_Asynch_Stream::close (void) +ACE_SSL_Asynch_Stream::close () { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); @@ -184,7 +184,7 @@ ACE_SSL_Asynch_Stream::close (void) // cancel // ************************************************************ int -ACE_SSL_Asynch_Stream::cancel (void) +ACE_SSL_Asynch_Stream::cancel () { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); @@ -401,7 +401,7 @@ ACE_SSL_Asynch_Stream::write (ACE_Message_Block & message_block, // Main SSL engine // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) +ACE_SSL_Asynch_Stream::do_SSL_state_machine () { // this protected member should be called // with locked mutex_ @@ -434,7 +434,7 @@ ACE_SSL_Asynch_Stream::do_SSL_state_machine (void) // -1 failure // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_shutdown (void) +ACE_SSL_Asynch_Stream::do_SSL_shutdown () { if (this->flags_ & SF_SHUTDOWN_DONE) // already done return 1; @@ -485,7 +485,7 @@ ACE_SSL_Asynch_Stream::do_SSL_shutdown (void) // -1 failure // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_handshake (void) +ACE_SSL_Asynch_Stream::do_SSL_handshake () { if (SSL_is_init_finished (this->ssl_)) { @@ -550,7 +550,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) } bool -ACE_SSL_Asynch_Stream::post_handshake_check (void) +ACE_SSL_Asynch_Stream::post_handshake_check () { return true; } @@ -559,7 +559,7 @@ ACE_SSL_Asynch_Stream::post_handshake_check (void) // Perform SSL_read call if necessary and notify user // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_read (void) +ACE_SSL_Asynch_Stream::do_SSL_read () { if (this->ext_read_result_ == 0) // nothing to do { @@ -621,7 +621,7 @@ ACE_SSL_Asynch_Stream::do_SSL_read (void) // Perform SSL_write call if necessary and notify user // ************************************************************ int -ACE_SSL_Asynch_Stream::do_SSL_write (void) +ACE_SSL_Asynch_Stream::do_SSL_write () { if (this->ext_write_result_ == 0) // nothing to do { @@ -681,7 +681,7 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void) // 2 - unable to notify NOT NOTIFIED // ************************************************************ int -ACE_SSL_Asynch_Stream::notify_close (void) +ACE_SSL_Asynch_Stream::notify_close () { if (this->flags_ & SF_CLOSE_NTF_SENT) // already sent return 1; @@ -1041,7 +1041,7 @@ ACE_SSL_Asynch_Stream::handle_read_stream ( } void -ACE_SSL_Asynch_Stream::handle_wakeup (void) +ACE_SSL_Asynch_Stream::handle_wakeup () { ACE_Handler * user_handler = 0; @@ -1058,7 +1058,7 @@ ACE_SSL_Asynch_Stream::handle_wakeup (void) } int -ACE_SSL_Asynch_Stream::pending_BIO_count (void) +ACE_SSL_Asynch_Stream::pending_BIO_count () { int ret = 0; diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index 082c022f209..39fb2bb46e2 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -176,11 +176,11 @@ public: ACE_SSL_Context * context = 0); /// Destructor - virtual ~ACE_SSL_Asynch_Stream (void); + virtual ~ACE_SSL_Asynch_Stream (); - int cancel (void); + int cancel (); - int close (void); + int close (); /// Return a pointer to the underlying SSL structure. SSL *ssl () const; @@ -292,7 +292,7 @@ protected: /// This method is called when all SSL sessions are closed and no /// more pending AIOs exist. It also calls users handle_wakeup(). - virtual void handle_wakeup (void); + virtual void handle_wakeup (); /** * This method will be called after a successful SSL handshake indicating @@ -326,23 +326,23 @@ protected: * * true - Proceed with connection. The default implementation returns true. */ - virtual bool post_handshake_check (void); + virtual bool post_handshake_check (); /** * @name SSL State Machine */ //@{ - int do_SSL_state_machine (void); - int do_SSL_handshake (void); - int do_SSL_read (void); - int do_SSL_write(void); - int do_SSL_shutdown(void); + int do_SSL_state_machine (); + int do_SSL_handshake (); + int do_SSL_read (); + int do_SSL_write(); + int do_SSL_shutdown(); //@} void print_error (int err_ssl, const ACE_TCHAR *pText); - int pending_BIO_count (void); + int pending_BIO_count (); /// This method is called to notify user handler when user's read in /// done. @@ -355,7 +355,7 @@ protected: /// This method is called to notify ourself that SSL session is /// shutdown and that there is no more I/O activity now and in the /// future. - int notify_close(void); + int notify_close(); /** * @name BIO Helpers diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index ebc883ed93a..09020466e73 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -89,7 +89,7 @@ extern "C" // Return the current thread ID. OpenSSL uses this on platforms // that need it. unsigned long - ACE_SSL_THREAD_ID_NAME (void) + ACE_SSL_THREAD_ID_NAME () { return (unsigned long) ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::thr_self (); } @@ -105,7 +105,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_SSL_Context::lock_type * ACE_SSL_Context::locks_ = 0; #endif /* ACE_HAS_THREADS && (OPENSSL_VERSION_NUMBER < 0x10100000L) */ -ACE_SSL_Context::ACE_SSL_Context (void) +ACE_SSL_Context::ACE_SSL_Context () : context_ (0), mode_ (-1), default_verify_mode_ (SSL_VERIFY_NONE), @@ -117,7 +117,7 @@ ACE_SSL_Context::ACE_SSL_Context (void) ACE_SSL_Context::ssl_library_init (); } -ACE_SSL_Context::~ACE_SSL_Context (void) +ACE_SSL_Context::~ACE_SSL_Context () { ACE_TRACE ("ACE_SSL_Context::~ACE_SSL_Context"); @@ -131,7 +131,7 @@ ACE_SSL_Context::~ACE_SSL_Context (void) } ACE_SSL_Context * -ACE_SSL_Context::instance (void) +ACE_SSL_Context::instance () { ACE_TRACE ("ACE_SSL_Context::instance"); @@ -139,7 +139,7 @@ ACE_SSL_Context::instance (void) } void -ACE_SSL_Context::close (void) +ACE_SSL_Context::close () { ACE_TRACE ("ACE_SSL_Context::close"); @@ -147,7 +147,7 @@ ACE_SSL_Context::close (void) } void -ACE_SSL_Context::ssl_library_init (void) +ACE_SSL_Context::ssl_library_init () { ACE_TRACE ("ACE_SSL_Context::ssl_library_init"); @@ -214,7 +214,7 @@ ACE_SSL_Context::ssl_library_init (void) } void -ACE_SSL_Context::ssl_library_fini (void) +ACE_SSL_Context::ssl_library_fini () { ACE_TRACE ("ACE_SSL_Context::ssl_library_fini"); @@ -575,7 +575,7 @@ ACE_SSL_Context::private_key (const char *file_name, } int -ACE_SSL_Context::verify_private_key (void) +ACE_SSL_Context::verify_private_key () { ACE_TRACE ("ACE_SSL_Context::verify_private_key"); diff --git a/ACE/ace/SSL/SSL_Initializer.cpp b/ACE/ace/SSL/SSL_Initializer.cpp index d1b82afd359..7f1fcf96684 100644 --- a/ACE/ace/SSL/SSL_Initializer.cpp +++ b/ACE/ace/SSL/SSL_Initializer.cpp @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int -ACE_SSL_Initializer::static_init (void) +ACE_SSL_Initializer::static_init () { ACE_Service_Config::process_directive (ace_svc_desc_ACE_SSL_Initializer); return 0; @@ -22,7 +22,7 @@ ACE_SSL_Initializer::init (int, ACE_TCHAR *[]) } int -ACE_SSL_Initializer::fini (void) +ACE_SSL_Initializer::fini () { // Explicitly close the ACE_SSL_Context singleton. ACE_SSL_Context::close (); diff --git a/ACE/ace/SSL/SSL_Initializer.h b/ACE/ace/SSL/SSL_Initializer.h index a19b780523b..240be859fcc 100644 --- a/ACE/ace/SSL/SSL_Initializer.h +++ b/ACE/ace/SSL/SSL_Initializer.h @@ -29,7 +29,7 @@ class ACE_SSL_Export ACE_SSL_Initializer { public: /// Used to force the initialization of ACE_SSL. - static int static_init (void); + static int static_init (); /// Create ACE_SSL_Context singleton. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/ace/SSL/SSL_SOCK.cpp b/ACE/ace/SSL/SSL_SOCK.cpp index b82ec7d556f..1b39192757e 100644 --- a/ACE/ace/SSL/SSL_SOCK.cpp +++ b/ACE/ace/SSL/SSL_SOCK.cpp @@ -9,12 +9,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_SSL_SOCK::ACE_SSL_SOCK (void) +ACE_SSL_SOCK::ACE_SSL_SOCK () { ACE_TRACE ("ACE_SSL_SOCK::ACE_SSL_SOCK"); } -ACE_SSL_SOCK::~ACE_SSL_SOCK (void) +ACE_SSL_SOCK::~ACE_SSL_SOCK () { ACE_TRACE ("ACE_SSL_SOCK::~ACE_SSL_SOCK"); } diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp index 3bedfc4276d..2fcd75c2c95 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor) -ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void) +ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor () { ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor"); } diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp index b628cae9822..7d8a4623227 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp @@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector) -ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector (void) +ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector () { ACE_TRACE ("ACE_SSL_SOCK_Connector::~ACE_SSL_SOCK_Connector"); } diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.h b/ACE/ace/SSL/SSL_SOCK_Connector.h index 40a46779053..41ba382d6c1 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.h +++ b/ACE/ace/SSL/SSL_SOCK_Connector.h @@ -55,7 +55,7 @@ class ACE_SSL_Export ACE_SSL_SOCK_Connector { public: /// Default constructor. - ACE_SSL_SOCK_Connector (void); + ACE_SSL_SOCK_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream @@ -160,7 +160,7 @@ public: int perms = 0); /// Default dtor. - virtual ~ACE_SSL_SOCK_Connector (void); + virtual ~ACE_SSL_SOCK_Connector (); /** * Actively connect to a peer, producing a connected @c ACE_SSL_SOCK_Stream diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp index 961b889afb6..7216dce8685 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp @@ -37,7 +37,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) } } -ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream (void) +ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream () { ACE_TRACE ("ACE_SSL_SOCK_Stream::~ACE_SSL_SOCK_Stream"); diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp index e257cc22e70..6caf2858d67 100644 --- a/ACE/ace/SUN_Proactor.cpp +++ b/ACE/ace/SUN_Proactor.cpp @@ -23,7 +23,7 @@ ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations) } // Destructor. -ACE_SUN_Proactor::~ACE_SUN_Proactor (void) +ACE_SUN_Proactor::~ACE_SUN_Proactor () { this->close (); } @@ -37,7 +37,7 @@ ACE_SUN_Proactor::handle_events (ACE_Time_Value &wait_time) } int -ACE_SUN_Proactor::handle_events (void) +ACE_SUN_Proactor::handle_events () { return this->handle_events_i (0); } @@ -304,7 +304,7 @@ ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result) } ACE_POSIX_Proactor::Proactor_Type -ACE_SUN_Proactor::get_impl_type (void) +ACE_SUN_Proactor::get_impl_type () { return PROACTOR_SUN; } diff --git a/ACE/ace/SV_Message.h b/ACE/ace/SV_Message.h index a75ace4d2ac..7b1f5fa352f 100644 --- a/ACE/ace/SV_Message.h +++ b/ACE/ace/SV_Message.h @@ -34,7 +34,7 @@ public: ACE_SV_Message (long type = 0); /// Destructor - ~ACE_SV_Message (void); + ~ACE_SV_Message (); /// Get the message type. long type () const; diff --git a/ACE/ace/SV_Message_Queue.h b/ACE/ace/SV_Message_Queue.h index 8ded7d84362..83cbd399ded 100644 --- a/ACE/ace/SV_Message_Queue.h +++ b/ACE/ace/SV_Message_Queue.h @@ -44,7 +44,7 @@ public: }; /// Open a message queue using the <external_id>. - ACE_SV_Message_Queue (void); + ACE_SV_Message_Queue (); ACE_SV_Message_Queue (key_t external_id, int create = ACE_SV_Message_Queue::ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); @@ -52,14 +52,14 @@ public: int create = ACE_SV_Message_Queue::ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); - ~ACE_SV_Message_Queue (void); + ~ACE_SV_Message_Queue (); /// Close down this instance of the message queue without removing it /// from the system. - int close (void); + int close (); /// Close down and remove the message queue from the system. - int remove (void); + int remove (); // = Message transfer methods. ssize_t recv (ACE_SV_Message &mb, diff --git a/ACE/ace/SV_Semaphore_Complex.h b/ACE/ace/SV_Semaphore_Complex.h index b94932ac66b..a5e4084220f 100644 --- a/ACE/ace/SV_Semaphore_Complex.h +++ b/ACE/ace/SV_Semaphore_Complex.h @@ -58,7 +58,7 @@ public: ACE_OPEN = 0 }; - ACE_SV_Semaphore_Complex (void); + ACE_SV_Semaphore_Complex (); ACE_SV_Semaphore_Complex (key_t key, short create = ACE_SV_Semaphore_Complex::ACE_CREATE, int initial_value = 1, @@ -69,7 +69,7 @@ public: int initial_value = 1, u_short nsems = 1, mode_t perms = ACE_DEFAULT_FILE_PERMS); - ~ACE_SV_Semaphore_Complex (void); + ~ACE_SV_Semaphore_Complex (); /// Open or create an array of SV_Semaphores. We return 0 if all is /// OK, else -1. @@ -94,7 +94,7 @@ public: * processes using the ACE_SV_Semaphore, and if this was the last * one, we can remove the ACE_SV_Semaphore. */ - int close (void); + int close (); // = Semaphore acquire and release methods. diff --git a/ACE/ace/SV_Semaphore_Simple.h b/ACE/ace/SV_Semaphore_Simple.h index 0b33c59bbd9..600f29488a9 100644 --- a/ACE/ace/SV_Semaphore_Simple.h +++ b/ACE/ace/SV_Semaphore_Simple.h @@ -55,7 +55,7 @@ public: ACE_OPEN = 0 }; - ACE_SV_Semaphore_Simple (void); + ACE_SV_Semaphore_Simple (); ACE_SV_Semaphore_Simple (key_t key, short flags = ACE_SV_Semaphore_Simple::ACE_CREATE, int initial_value = 1, @@ -74,7 +74,7 @@ public: mode_t perms = ACE_DEFAULT_FILE_PERMS); #endif /* ACE_HAS_WCHAR */ - ~ACE_SV_Semaphore_Simple (void); + ~ACE_SV_Semaphore_Simple (); int open (const char *name, short flags = ACE_SV_Semaphore_Simple::ACE_CREATE, @@ -100,7 +100,7 @@ public: /// Close a ACE_SV_Semaphore, marking it as invalid for subsequent /// operations... - int close (void); + int close (); /** * Remove all SV_Semaphores associated with a particular key. This diff --git a/ACE/ace/SV_Shared_Memory.h b/ACE/ace/SV_Shared_Memory.h index a6734bb075b..3813212446b 100644 --- a/ACE/ace/SV_Shared_Memory.h +++ b/ACE/ace/SV_Shared_Memory.h @@ -39,7 +39,7 @@ public: ACE_OPEN = 0 }; - ACE_SV_Shared_Memory (void); + ACE_SV_Shared_Memory (); ACE_SV_Shared_Memory (key_t external_id, size_t size, int create, @@ -66,10 +66,10 @@ public: int attach (void *virtual_addr = 0, int flags = 0); /// Detach this shared memory segment. - int detach (void); + int detach (); /// Remove this shared memory segment. - int remove (void); + int remove (); /// Forward to underlying System V <shmctl>. int control (int cmd, void *buf); diff --git a/ACE/ace/Sample_History.h b/ACE/ace/Sample_History.h index fea5384037e..4c930057a50 100644 --- a/ACE/ace/Sample_History.h +++ b/ACE/ace/Sample_History.h @@ -46,7 +46,7 @@ public: ACE_Sample_History (size_t max_samples); /// Destructor - ~ACE_Sample_History (void); + ~ACE_Sample_History (); /// Record one sample. /** diff --git a/ACE/ace/Sbrk_Memory_Pool.h b/ACE/ace/Sbrk_Memory_Pool.h index ed7eaad69a0..5c38cc3713a 100644 --- a/ACE/ace/Sbrk_Memory_Pool.h +++ b/ACE/ace/Sbrk_Memory_Pool.h @@ -54,7 +54,7 @@ public: ACE_Sbrk_Memory_Pool (const ACE_TCHAR *backing_store_name = 0, const OPTIONS *options = 0); - virtual ~ACE_Sbrk_Memory_Pool (void); + virtual ~ACE_Sbrk_Memory_Pool (); // = Implementor operations. /// Ask system for initial chunk of local memory. diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h index aab32a0fa39..0019a949a05 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -90,7 +90,7 @@ class ACE_Event_Tuple { public: /// Default constructor. - ACE_Event_Tuple (void); + ACE_Event_Tuple (); /// Constructor. ACE_Event_Tuple (ACE_Event_Handler *eh, ACE_HANDLE h); @@ -128,10 +128,10 @@ class ACE_Export ACE_Select_Reactor_Notify : public ACE_Reactor_Notify { public: /// Constructor. - ACE_Select_Reactor_Notify (void); + ACE_Select_Reactor_Notify (); /// Destructor. - virtual ~ACE_Select_Reactor_Notify (void); + virtual ~ACE_Select_Reactor_Notify (); /// Initialize. virtual int open (ACE_Reactor_Impl *, @@ -139,7 +139,7 @@ public: int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT); /// Destroy. - virtual int close (void); + virtual int close (); /** * Called by a thread when it wants to unblock the @@ -164,7 +164,7 @@ public: /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock /// the Select_Reactor - virtual ACE_HANDLE notify_handle (void); + virtual ACE_HANDLE notify_handle (); /// Handle one of the notify call on the @c handle. This could be /// because of a thread trying to unblock the Reactor_Impl @@ -206,7 +206,7 @@ public: * dispatch the ACE_Event_Handlers that are passed in via the * notify pipe before breaking out of its recv loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -327,7 +327,7 @@ public: int open (size_type size); /// Close down the repository. - int close (void); + int close (); // = Search structure operations. @@ -347,7 +347,7 @@ public: ACE_Reactor_Mask mask); /// Remove all the <ACE_HANDLE, ACE_Event_Handler> tuples. - int unbind_all (void); + int unbind_all (); // = Sanity checking. @@ -425,7 +425,7 @@ public: /// Move forward by one element in the set. Returns @c false when /// all the items in the set have been seen, else @c true. - bool advance (void); + bool advance (); /// Dump the state of an object. void dump () const; @@ -475,7 +475,7 @@ public: /// its own ie. can it pass on the control of handle resumption to /// the application. The select reactor has no handlers that can be /// resumed by the application. So return 0; - virtual int resumable_handler (void); + virtual int resumable_handler (); protected: /// Allow manipulation of the <wait_set_> mask and <ready_set_> mask. @@ -572,7 +572,7 @@ protected: /// Controls/access whether the notify handler should renew the /// Select_Reactor's token or not. - bool supress_notify_renew (void); + bool supress_notify_renew (); void supress_notify_renew (bool sr); private: diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index d8bce72fa15..d9f02176e6c 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -90,7 +90,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i (int signum, } template <class ACE_SELECT_REACTOR_TOKEN> bool -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::initialized (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::initialized () { ACE_TRACE ("ACE_Select_Reactor_T::initialized"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false)); @@ -125,7 +125,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t *t_id) } template <class ACE_SELECT_REACTOR_TOKEN> bool -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart () { ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false)); return this->restart_; @@ -155,7 +155,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::requeue_position (int rp) } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::requeue_position (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::requeue_position () { ACE_TRACE ("ACE_Select_Reactor_T::requeue_position"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -172,7 +172,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations (int itera } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations () { ACE_TRACE ("ACE_Select_Reactor_T::max_notify_iterations"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -181,7 +181,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::max_notify_iterations (void) // Enqueue ourselves into the list of waiting threads. template <class ACE_SELECT_REACTOR_TOKEN> void -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::renew (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::renew () { ACE_TRACE ("ACE_Select_Reactor_T::renew"); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) @@ -225,7 +225,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handler (ACE_HANDLE hand } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handlers (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handlers () { ACE_TRACE ("ACE_Select_Reactor_T::suspend_handlers"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -243,7 +243,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::suspend_handlers (void) } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_handlers (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_handlers () { ACE_TRACE ("ACE_Select_Reactor_T::resume_handlers"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -557,7 +557,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T // event loop thread... template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close () { ACE_TRACE ("ACE_Select_Reactor_T::close"); ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1)); @@ -606,7 +606,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::current_info } template <class ACE_SELECT_REACTOR_TOKEN> -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::~ACE_Select_Reactor_T (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::~ACE_Select_Reactor_T () { ACE_TRACE ("ACE_Select_Reactor_T::~ACE_Select_Reactor_T"); this->close (); @@ -770,7 +770,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_error (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_error () { ACE_TRACE ("ACE_Select_Reactor_T::handle_error"); #if defined (ACE_LINUX) && defined (ERESTARTNOHAND) @@ -1384,7 +1384,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::release_token (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::release_token () { #if defined (ACE_WIN32) this->token_.release (); @@ -1468,7 +1468,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events_i } template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void) +ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles () { ACE_TRACE ("ACE_Select_Reactor_T::check_handles"); diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index dc0fc72a762..2b53af44ea1 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -123,10 +123,10 @@ public: virtual ACE_Timer_Queue *timer_queue () const; /// Close down the select_reactor and release all of its resources. - virtual int close (void); + virtual int close (); /// Close down the select_reactor and release all of its resources. - virtual ~ACE_Select_Reactor_T (void); + virtual ~ACE_Select_Reactor_T (); // = Event loop drivers. @@ -182,7 +182,7 @@ public: * actively handling events. If it returns non-zero, <handling_events> and * <handle_alertable_events> return -1 immediately. */ - virtual int deactivated (void); + virtual int deactivated (); /** * Control whether the Reactor will handle any more incoming events or not. @@ -304,7 +304,7 @@ public: virtual int suspend_handler (const ACE_Handle_Set &handles); /// Suspend all the <Event_Handlers> in the Select_Reactor. - virtual int suspend_handlers (void); + virtual int suspend_handlers (); /// Resume a temporarily suspend Event_Handler associated with /// @a eh. @@ -318,7 +318,7 @@ public: virtual int resume_handler (const ACE_Handle_Set &handles); /// Resume all the <Event_Handlers> in the Select_Reactor. - virtual int resume_handlers (void); + virtual int resume_handlers (); /** * Return true if we any event associations were made by the reactor @@ -326,7 +326,7 @@ public: * Select_Reactor does not do any event associations, this function * always return false. */ - virtual bool uses_event_associations (void); + virtual bool uses_event_associations (); // = Timer management. /** @@ -437,10 +437,10 @@ public: * dispatch the ACE_Event_Handlers that are passed in via the * notify pipe before breaking out of its recv loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /// Get the existing restart value. - virtual bool restart (void); + virtual bool restart (); /// Set a new value for restart and return the original value. virtual bool restart (bool r); @@ -451,7 +451,7 @@ public: /// Get position that the main ACE_Select_Reactor thread is requeued in the /// list of waiters during a <notify> callback. - virtual int requeue_position (void); + virtual int requeue_position (); // = Low-level wait_set mask manipulation methods. /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the @a eh and @@ -478,7 +478,7 @@ public: int ops); /// Wake up all threads in waiting in the event loop - virtual void wakeup_all_threads (void); + virtual void wakeup_all_threads (); // = Only the owner thread can perform a <handle_events>. @@ -514,7 +514,7 @@ public: ACE_Event_Handler ** = 0); /// Returns true if we've been successfully initialized, else false. - virtual bool initialized (void); + virtual bool initialized (); /// Returns the current size of the Reactor's internal descriptor /// table. @@ -527,7 +527,7 @@ public: * deadlock efficiently when ACE_Event_Handlers are used in * multiple threads. */ - virtual ACE_Lock &lock (void); + virtual ACE_Lock &lock (); /// Dump the state of an object. virtual void dump () const; @@ -594,10 +594,10 @@ protected: virtual int any_ready_i (ACE_Select_Reactor_Handle_Set &handle_set); /// Take corrective action when errors occur. - virtual int handle_error (void); + virtual int handle_error (); /// Make sure the handles are all valid. - virtual int check_handles (void); + virtual int check_handles (); /// Wait for events to occur. virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &, @@ -667,7 +667,7 @@ protected: /// Enqueue ourselves into the list of waiting threads at the /// appropriate point specified by <requeue_position_>. - virtual void renew (void); + virtual void renew (); /// Synchronization token for the MT_SAFE ACE_Select_Reactor. ACE_SELECT_REACTOR_TOKEN token_; @@ -676,7 +676,7 @@ protected: ACE_Lock_Adapter<ACE_SELECT_REACTOR_TOKEN> lock_adapter_; /// Release the token lock when a Win32 structured exception occurs. - int release_token (void); + int release_token (); /// Stops the VC++ compiler from bitching about exceptions and destructors int handle_events_i (ACE_Time_Value *max_wait_time = 0); diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h index 45c527484ba..51161d5746b 100644 --- a/ACE/ace/Service_Manager.h +++ b/ACE/ace/Service_Manager.h @@ -51,10 +51,10 @@ class ACE_Export ACE_Service_Manager : public ACE_Service_Object { public: /// Constructor. - ACE_Service_Manager (void); + ACE_Service_Manager (); /// Destructor. - virtual ~ACE_Service_Manager (void); + virtual ~ACE_Service_Manager (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -64,11 +64,11 @@ protected: /// Trigger a reconfiguration of the Service Configurator by /// re-reading its local <svc.conf> file. - virtual int reconfigure_services (void); + virtual int reconfigure_services (); /// Determine all the services offered by this daemon and return the /// information back to the client. - virtual int list_services (void); + virtual int list_services (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -76,8 +76,8 @@ protected: virtual int fini (); // = Scheduling hooks. - virtual int suspend (void); - virtual int resume (void); + virtual int suspend (); + virtual int resume (); /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Shared_Memory.h b/ACE/ace/Shared_Memory.h index 4b10a004d47..82d2934350d 100644 --- a/ACE/ace/Shared_Memory.h +++ b/ACE/ace/Shared_Memory.h @@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Shared_Memory { public: - virtual ~ACE_Shared_Memory (void); + virtual ~ACE_Shared_Memory (); // = Note that all the following methods are pure virtual. virtual int close (void) = 0; diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h index b3dc8f72fd6..77f9b12db9f 100644 --- a/ACE/ace/Shared_Memory_MM.h +++ b/ACE/ace/Shared_Memory_MM.h @@ -76,10 +76,10 @@ public: const ACE_TCHAR *filename () const; /// Close down the shared memory segment. - virtual int close (void); + virtual int close (); /// Remove the shared memory segment and the underlying file. - virtual int remove (void); + virtual int remove (); // = Allocation and deallocation methods. /// Create a new chuck of memory containing @a size bytes. diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h index 4e8adcf8cfb..4b5f09ca357 100644 --- a/ACE/ace/Shared_Memory_SV.h +++ b/ACE/ace/Shared_Memory_SV.h @@ -40,7 +40,7 @@ public: ACE_OPEN = 0 }; - ACE_Shared_Memory_SV (void); + ACE_Shared_Memory_SV (); ACE_Shared_Memory_SV (key_t id, size_t length, int create = ACE_Shared_Memory_SV::ACE_OPEN, @@ -56,10 +56,10 @@ public: int flags = 0); /// Close down the shared memory segment. - virtual int close (void); + virtual int close (); /// Remove the underlying shared memory segment. - virtual int remove (void); + virtual int remove (); // = Allocation and deallocation methods. /// Create a new chuck of memory containing @a size bytes. diff --git a/ACE/ace/Stats.h b/ACE/ace/Stats.h index 17ac7127138..5aaacb4e356 100644 --- a/ACE/ace/Stats.h +++ b/ACE/ace/Stats.h @@ -172,7 +172,7 @@ public: ) const; /// Initialize internal state. - void reset (void); + void reset (); /// Utility division function, for ACE_UINT64 dividend. static void quotient (const ACE_UINT64 dividend, diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp index 0079d50883a..d799bc3bc4d 100644 --- a/ACE/ace/Stream.cpp +++ b/ACE/ace/Stream.cpp @@ -540,7 +540,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::link (ACE_Stream<ACE_SYNCH_USE, TIME_POL // Must be called with locks held... template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i (void) +ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i () { ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i"); @@ -584,7 +584,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink (void) +ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink () { ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -612,7 +612,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream (void * a, } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream (void) +ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream () { ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream"); diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h index 35fb3645d4c..3e7998b68cd 100644 --- a/ACE/ace/Stream.h +++ b/ACE/ace/Stream.h @@ -154,7 +154,7 @@ public: void *args); /// Synchronize with the final close of the stream. - virtual int wait (void); + virtual int wait (); /// Dump the state of an object. virtual void dump () const; @@ -190,7 +190,7 @@ protected: private: /// Actually perform the unlinking of two Streams (must be called /// with locks held). - int unlink_i (void); + int unlink_i (); /// Actually perform the linking of two Streams (must be called with /// locks held). @@ -224,7 +224,7 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); private: /// Next ACE_Module that we haven't yet seen. diff --git a/ACE/ace/Svc_Conf.h b/ACE/ace/Svc_Conf.h index 7c47a5e5a7e..4dc2ed13b8d 100644 --- a/ACE/ace/Svc_Conf.h +++ b/ACE/ace/Svc_Conf.h @@ -35,7 +35,7 @@ int ace_yyparse (); #endif #else /* ! YYPARSE_PARAM */ #if defined __STDC__ || defined __cplusplus -int ace_yyparse (void); +int ace_yyparse (); #else int ace_yyparse (); #endif diff --git a/ACE/ace/Svc_Conf_Param.h b/ACE/ace/Svc_Conf_Param.h index fff69f2dcb7..18c285a9290 100644 --- a/ACE/ace/Svc_Conf_Param.h +++ b/ACE/ace/Svc_Conf_Param.h @@ -85,7 +85,7 @@ public: source.directive = directive; } - ~ACE_Svc_Conf_Param (void) + ~ACE_Svc_Conf_Param () { ace_yy_delete_buffer (this->buffer); } diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index bd9a781b839..a95c7f2d1fd 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -1133,7 +1133,7 @@ int ace_yyparse (); #endif #else /* ! YYPARSE_PARAM */ #if defined __STDC__ || defined __cplusplus -int ace_yyparse (void); +int ace_yyparse (); #else int ace_yyparse (); #endif @@ -1161,7 +1161,7 @@ ace_yyparse (YYPARSE_PARAM) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) int -ace_yyparse (void) +ace_yyparse () #else int ace_yyparse () diff --git a/ACE/ace/System_Time.h b/ACE/ace/System_Time.h index dca30ec97ea..3f77c031029 100644 --- a/ACE/ace/System_Time.h +++ b/ACE/ace/System_Time.h @@ -57,7 +57,7 @@ public: ACE_System_Time (const ACE_TCHAR *poolname = 0); /// Default destructor. - ~ACE_System_Time (void); + ~ACE_System_Time (); /// Get the local system time, i.e., the value returned by /// ACE_OS::time(). diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp index 72489c64a30..cdfa1db8514 100644 --- a/ACE/ace/TLI.cpp +++ b/ACE/ace/TLI.cpp @@ -27,7 +27,7 @@ ACE_TLI::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI::ACE_TLI (void) +ACE_TLI::ACE_TLI () { ACE_TRACE ("ACE_TLI::ACE_TLI"); #if defined (ACE_HAS_SVR4_TLI) @@ -62,7 +62,7 @@ ACE_TLI::open (const char device[], int oflag, struct t_info *info) return this->get_handle (); } -ACE_TLI::~ACE_TLI (void) +ACE_TLI::~ACE_TLI () { ACE_TRACE ("ACE_TLI::~ACE_TLI"); #if defined (ACE_HAS_SVR4_TLI) @@ -101,7 +101,7 @@ ACE_TLI::get_local_addr (ACE_Addr &sa) const } int -ACE_TLI::close (void) +ACE_TLI::close () { ACE_TRACE ("ACE_TLI::close"); int result = 0; // Geisler: result must be int diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp index d46865728b6..1075346b0d4 100644 --- a/ACE/ace/TLI_Acceptor.cpp +++ b/ACE/ace/TLI_Acceptor.cpp @@ -24,7 +24,7 @@ public: ACE_TLI_Request_Queue (); ACE_HANDLE open (ACE_HANDLE fd, int size); - int close (void); + int close (); int enqueue (const char device[], bool restart, int rwflag); int dequeue (ACE_TLI_Request *&ptr); @@ -88,7 +88,7 @@ ACE_TLI_Request_Queue::free (ACE_TLI_Request *node) // Remove a node from the free list stack. ACE_TLI_Request * -ACE_TLI_Request_Queue::alloc (void) +ACE_TLI_Request_Queue::alloc () { ACE_TRACE ("ACE_TLI_Request_Queue::alloc"); ACE_TLI_Request *temp = this->free_list_; @@ -106,7 +106,7 @@ ACE_TLI_Acceptor::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI_Acceptor::ACE_TLI_Acceptor (void) +ACE_TLI_Acceptor::ACE_TLI_Acceptor () : queue_ (0) { ACE_TRACE ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"); @@ -168,7 +168,7 @@ open_new_endpoint (ACE_HANDLE listen_handle, // Close down the acceptor and release resources. int -ACE_TLI_Request_Queue::close (void) +ACE_TLI_Request_Queue::close () { ACE_TRACE ("ACE_TLI_Request_Queue::close"); int res = 0; @@ -219,7 +219,7 @@ ACE_TLI_Request_Queue::open (ACE_HANDLE f, int sz) return 0; } -ACE_TLI_Request_Queue::ACE_TLI_Request_Queue (void) +ACE_TLI_Request_Queue::ACE_TLI_Request_Queue () : size_ (0), current_count_ (0), base_ (0), @@ -402,7 +402,7 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap, } int -ACE_TLI_Acceptor::close (void) +ACE_TLI_Acceptor::close () { ACE_TRACE ("ACE_TLI_Acceptor::close"); if (this->device_ != 0) diff --git a/ACE/ace/TLI_Connector.cpp b/ACE/ace/TLI_Connector.cpp index 60fb793a9bc..c8781000a78 100644 --- a/ACE/ace/TLI_Connector.cpp +++ b/ACE/ace/TLI_Connector.cpp @@ -23,7 +23,7 @@ ACE_TLI_Connector::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI_Connector::ACE_TLI_Connector (void) +ACE_TLI_Connector::ACE_TLI_Connector () { ACE_TRACE ("ACE_TLI_Connector::ACE_TLI_Connector"); } diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h index 3b2a99e09a3..4ad528ce2f8 100644 --- a/ACE/ace/TLI_Connector.h +++ b/ACE/ace/TLI_Connector.h @@ -33,7 +33,7 @@ class ACE_Export ACE_TLI_Connector { public: /// Default constructor. - ACE_TLI_Connector (void); + ACE_TLI_Connector (); /** * Actively connect and produce a <new_stream> if things go well. diff --git a/ACE/ace/TLI_Stream.cpp b/ACE/ace/TLI_Stream.cpp index 34e5ab2ae80..9acc4a0a1fe 100644 --- a/ACE/ace/TLI_Stream.cpp +++ b/ACE/ace/TLI_Stream.cpp @@ -23,7 +23,7 @@ ACE_TLI_Stream::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_TLI_Stream::ACE_TLI_Stream (void) +ACE_TLI_Stream::ACE_TLI_Stream () : rwflag_ (0) { ACE_TRACE ("ACE_TLI_Stream::ACE_TLI_Stream"); @@ -47,7 +47,7 @@ ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const // Send a release and then await the release from the other side. int -ACE_TLI_Stream::active_close (void) +ACE_TLI_Stream::active_close () { ACE_TRACE ("ACE_TLI_Stream::active_close"); char buf; @@ -72,7 +72,7 @@ ACE_TLI_Stream::active_close (void) // release to the other side. int -ACE_TLI_Stream::passive_close (void) +ACE_TLI_Stream::passive_close () { ACE_TRACE ("ACE_TLI_Stream::passive_close"); @@ -85,7 +85,7 @@ ACE_TLI_Stream::passive_close (void) } int -ACE_TLI_Stream::close (void) +ACE_TLI_Stream::close () { ACE_TRACE ("ACE_TLI_Stream::close"); diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h index bb576733de2..24e0f3209c9 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -47,7 +47,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_EH_Dispatch_Info { public: - ACE_EH_Dispatch_Info (void); + ACE_EH_Dispatch_Info (); void set (ACE_HANDLE handle, ACE_Event_Handler *event_handler, @@ -92,14 +92,14 @@ public: /// Destructor. This will release the token if it hasnt been /// released till this point - ~ACE_TP_Token_Guard (void); + ~ACE_TP_Token_Guard (); /// Release the token .. - void release_token (void); + void release_token (); /// Returns whether the thread that created this object ownes the /// token or not. - bool is_owner (void); + bool is_owner (); /// A helper method that grabs the token for us, after which the /// thread that owns that can do some actual work. @@ -216,7 +216,7 @@ public: /// its own ie. can it pass on the control of handle resumption to /// the application. The TP reactor has can allow applications to /// resume handles. So return a positive value. - virtual int resumable_handler (void); + virtual int resumable_handler (); /// Called from handle events static void no_op_sleep_hook (void *); @@ -281,7 +281,7 @@ protected: private: /// Get the handle of the notify pipe from the ready set if there is /// an event in the notify pipe. - ACE_HANDLE get_notify_handle (void); + ACE_HANDLE get_notify_handle (); /// Get socket event dispatch information. int get_socket_event_info (ACE_EH_Dispatch_Info &info); diff --git a/ACE/ace/Task_Ex_T.cpp b/ACE/ace/Task_Ex_T.cpp index 8f48df6775c..f770aff028f 100644 --- a/ACE/ace/Task_Ex_T.cpp +++ b/ACE/ace/Task_Ex_T.cpp @@ -69,7 +69,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::ACE_Task_Ex (ACE_Thre } template<ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY> -ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex (void) +ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex () { ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex"); if (this->delete_msg_queue_) @@ -81,7 +81,7 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::~ACE_Task_Ex (void) } template<ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE, class TIME_POLICY> ACE_Task<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::sibling (void) +ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::sibling () { ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::sibling"); /// @todo FIXME Need to impl ACE_Moudle to support ACE_Task as well. diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h index 905090dee5c..70cd1d7d9e7 100644 --- a/ACE/ace/Task_Ex_T.h +++ b/ACE/ace/Task_Ex_T.h @@ -75,10 +75,10 @@ public: MESSAGE_QUEUE_EX *mq = 0); /// Destructor. - virtual ~ACE_Task_Ex (void); + virtual ~ACE_Task_Ex (); /// Gets the message queue associated with this task. - MESSAGE_QUEUE_EX *msg_queue (void); + MESSAGE_QUEUE_EX *msg_queue (); /// Sets the message queue associated with this task. void msg_queue (MESSAGE_QUEUE_EX *); @@ -131,13 +131,13 @@ public: // Should be protected: // = Pointers to next ACE_Task_Base (if ACE is part of an ACE_Stream). /// Get next Task pointer. - ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next (void); + ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next (); /// Set next Task pointer. void next (ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *); /// Alwasy return 0. @todo FIXME - ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling (void); + ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling (); /// Return the Task's Module if there is one, else returns 0. ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module () const; diff --git a/ACE/ace/Thread_Hook.h b/ACE/ace/Thread_Hook.h index dcb6d396eab..0d342a3f43a 100644 --- a/ACE/ace/Thread_Hook.h +++ b/ACE/ace/Thread_Hook.h @@ -33,10 +33,10 @@ class ACE_Export ACE_Thread_Hook { public: /// Default constructor - ACE_Thread_Hook (void); + ACE_Thread_Hook (); /// Destructor. - virtual ~ACE_Thread_Hook (void); + virtual ~ACE_Thread_Hook (); /** * This method can be overridden in a subclass to customize this @@ -54,7 +54,7 @@ public: static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *hook); /// Returns the current system thread hook. - static ACE_Thread_Hook *thread_hook (void); + static ACE_Thread_Hook *thread_hook (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Timeprobe_T.cpp b/ACE/ace/Timeprobe_T.cpp index c67edb60607..a89375d753a 100644 --- a/ACE/ace/Timeprobe_T.cpp +++ b/ACE/ace/Timeprobe_T.cpp @@ -70,7 +70,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex< } template <class ACE_LOCK, class ALLOCATOR> -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::~ACE_Timeprobe_Ex (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::~ACE_Timeprobe_Ex () { ACE_DES_ARRAY_FREE ((ACE_timeprobe_t *) (this->timeprobes_), this->max_size_, @@ -127,7 +127,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobe (const char *event) } template <class ACE_LOCK, class ALLOCATOR> void -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::reset (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::reset () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); @@ -172,37 +172,37 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::increase_size (u_long size) } template <class ACE_LOCK, class ALLOCATOR> ACE_Unbounded_Set<ACE_Event_Descriptions> & -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::event_descriptions (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::event_descriptions () { return this->event_descriptions_; } template <class ACE_LOCK, class ALLOCATOR> ACE_Unbounded_Set<ACE_Event_Descriptions> & -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sorted_event_descriptions (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sorted_event_descriptions () { return this->sorted_event_descriptions_; } template <class ACE_LOCK, class ALLOCATOR> ACE_timeprobe_t * -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobes (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::timeprobes () { return this->timeprobes_; } template <class ACE_LOCK, class ALLOCATOR> ACE_LOCK & -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::lock (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::lock () { return this->lock_; } template <class ACE_LOCK, class ALLOCATOR> u_long -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::max_size (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::max_size () { return this->max_size_; } template <class ACE_LOCK, class ALLOCATOR> u_long -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::current_size (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::current_size () { return this->current_size_; } @@ -223,7 +223,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::event_descriptions (const char **descript } template <class ACE_LOCK, class ALLOCATOR> void -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); @@ -309,7 +309,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) } template <class ACE_LOCK, class ALLOCATOR> void -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times () { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); @@ -375,7 +375,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::find_description_i (u_long i) } template <class ACE_LOCK, class ALLOCATOR> void -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sort_event_descriptions_i (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sort_event_descriptions_i () { size_t total_elements = this->event_descriptions_.size (); @@ -398,7 +398,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::sort_event_descriptions_i (void) } template <class ACE_LOCK, class ALLOCATOR> ALLOCATOR * -ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::allocator (void) +ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::allocator () { return allocator_ ? allocator_ : ACE_Singleton<ALLOCATOR, ACE_LOCK>::instance (); } @@ -413,7 +413,7 @@ ACE_Function_Timeprobe<Timeprobe>::ACE_Function_Timeprobe (Timeprobe &timeprobe, } template <class Timeprobe> -ACE_Function_Timeprobe<Timeprobe>::~ACE_Function_Timeprobe (void) +ACE_Function_Timeprobe<Timeprobe>::~ACE_Function_Timeprobe () { this->timeprobe_.timeprobe (this->event_ + 1); } diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h index 9277897b5a3..0c0a670841f 100644 --- a/ACE/ace/Timeprobe_T.h +++ b/ACE/ace/Timeprobe_T.h @@ -80,7 +80,7 @@ public: ACE_Timeprobe_Ex (ALLOCATOR *allocator, u_long size = ACE_DEFAULT_TIMEPROBE_TABLE_SIZE); /// Destructor. - ~ACE_Timeprobe_Ex (void); + ~ACE_Timeprobe_Ex (); /// Record a time. @a event is used to describe this time probe. void timeprobe (u_long event); @@ -93,13 +93,13 @@ public: u_long minimum_id); /// Print the time probes. - void print_times (void); + void print_times (); /// Print the time probes. - void print_absolute_times (void); + void print_absolute_times (); /// Reset the slots. All old time probes will be lost. - void reset (void); + void reset (); void increase_size (u_long size); @@ -109,33 +109,33 @@ public: // = (Somewhat private) Accessors /// Event Descriptions - ACE_Unbounded_Set<ACE_Event_Descriptions> &event_descriptions (void); + ACE_Unbounded_Set<ACE_Event_Descriptions> &event_descriptions (); /// Sorted Event Descriptions. - ACE_Unbounded_Set<ACE_Event_Descriptions> &sorted_event_descriptions (void); + ACE_Unbounded_Set<ACE_Event_Descriptions> &sorted_event_descriptions (); /// Find description of event @a i const char *find_description_i (u_long i); /// Sort event descriptions - void sort_event_descriptions_i (void); + void sort_event_descriptions_i (); /// Time probe slots - ACE_timeprobe_t *timeprobes (void); + ACE_timeprobe_t *timeprobes (); /// Synchronization variable. - ACE_LOCK &lock (void); + ACE_LOCK &lock (); /// Max size of timestamp table - u_long max_size (void); + u_long max_size (); /// Current size of timestamp table - u_long current_size (void); + u_long current_size (); protected: /// Obtain an allocator pointer. If there is no allocator stored in /// the instance, the singleton allocator in the current process is used. - ALLOCATOR * allocator (void); + ALLOCATOR * allocator (); /// Event Descriptions EVENT_DESCRIPTIONS event_descriptions_; @@ -191,7 +191,7 @@ public: ACE_Function_Timeprobe (Timeprobe &timeprobe, u_long event); /// Destructor. - ~ACE_Function_Timeprobe (void); + ~ACE_Function_Timeprobe (); protected: /// Reference to timeprobe. diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp index b04a034c977..680d9ae4707 100644 --- a/ACE/ace/Timer_Hash_T.cpp +++ b/ACE/ace/Timer_Hash_T.cpp @@ -26,7 +26,7 @@ public: { } - Hash_Token<TYPE> *get_next (void) + Hash_Token<TYPE> *get_next () { return this->next_; } @@ -59,7 +59,7 @@ public: // Default constructor template <class TYPE, class FUNCTOR, class ACE_LOCK> -ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Hash_Upcall (void) +ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Hash_Upcall () : timer_hash_ (0) { // Nothing @@ -191,7 +191,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Ti // Positions the iterator at the first node in the timing hash table template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> void -ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::first (void) +ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::first () { for (this->position_ = 0; this->position_ < this->timer_hash_.table_size_; @@ -214,7 +214,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::first ( // bucket template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> void -ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::next (void) +ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::next () { if (this->isdone ()) return; @@ -254,7 +254,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::isdone template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> * -ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::item (void) +ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::item () { if (this->isdone ()) return 0; @@ -264,7 +264,7 @@ ACE_Timer_Hash_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::item (v template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> ACE_Timer_Queue_Iterator_T<TYPE> & -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::iter (void) +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::iter () { this->iterator_->first (); return *this->iterator_; @@ -346,7 +346,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::ACE_Timer_Hash_T // Remove all remaining items in the Queue. template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Timer_Hash_T (void) +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Timer_Hash_T () { ACE_TRACE ("ACE_Timer_Hash_T::~ACE_Timer_Hash_T"); ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_)); @@ -365,7 +365,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::~ACE_Timer_Hash_ } template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> int -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::close (void) +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::close () { ACE_TRACE ("ACE_Timer_Hash_T::close"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); @@ -709,7 +709,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::cancel (const TY // Removes the earliest node and finds the new earliest position template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> * -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::remove_first (void) +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::remove_first () { if (this->is_empty ()) return 0; @@ -727,7 +727,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::remove_first (vo // Finds a new earliest position 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>::find_new_earliest (void) +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::find_new_earliest () { for (size_t i = 0; i < this->table_size_; ++i) if (!this->table_[i]->is_empty ()) @@ -740,7 +740,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::find_new_earlies // Returns the earliest node without removing it template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> * -ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::get_first (void) +ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::get_first () { ACE_TRACE ("ACE_Timer_Hash_T::get_first"); diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp index 5705da077ff..4935c1d821d 100644 --- a/ACE/ace/Timer_List_T.cpp +++ b/ACE/ace/Timer_List_T.cpp @@ -20,14 +20,14 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_List_ } template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> -ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_Iterator_T (void) +ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_Iterator_T () { } // Positions the iterator at the node right after the dummy node template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void -ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void) +ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first () { this->current_node_ = this->list_.get_first(); } @@ -35,7 +35,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void) // Positions the iterator at the next node in the Timer Queue template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void -ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void) +ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next () { // Make sure that if we are at the end, we don't wrap around if (! this->isdone()) @@ -55,7 +55,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const // Returns the node at <position_> or 0 if we are at the end template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> * -ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void) +ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item () { if (! this->isdone()) return this->current_node_; @@ -68,7 +68,7 @@ ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void) // Return our instance of the iterator template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Queue_Iterator_T<TYPE> & -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void) +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter () { this->iterator_->first (); return *this->iterator_; @@ -119,7 +119,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::earliest_time () const // Remove all remaining items in the list. template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_T (void) +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_T () { ACE_TRACE ("ACE_Timer_List_T::~ACE_Timer_List_T"); ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_)); @@ -133,7 +133,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_List_T (void) } template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int -ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void) +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close () { ACE_TRACE ("ACE_Timer_List_T::close"); ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1)); @@ -396,7 +396,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::cancel_i (ACE_Timer_Node // Reads the first node on the list and returns it. 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 (void) +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first () { ACE_TRACE ("ACE_Timer_List_T::get_first"); return this->get_first_i(); @@ -416,7 +416,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i () const // Removes the first node on the list and returns it. 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>::remove_first (void) +ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first () { ACE_TRACE ("ACE_Timer_List_T::remove_first"); ACE_Timer_Node_T<TYPE>* first = this->get_first(); diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h index ecac32eeafa..133d48b21c6 100644 --- a/ACE/ace/Timer_List_T.h +++ b/ACE/ace/Timer_List_T.h @@ -40,19 +40,19 @@ public: ACE_Timer_List_Iterator_T (List& lst); /// Destructor. - virtual ~ACE_Timer_List_Iterator_T (void); + virtual ~ACE_Timer_List_Iterator_T (); /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (void); + virtual void first (); /// Positions the iterator at the next node in the Timer Queue - virtual void next (void); + virtual void next (); /// Returns true when there are no more nodes in the sequence virtual bool isdone () const; /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T<TYPE> *item (void); + virtual ACE_Timer_Node_T<TYPE> *item (); protected: /// Pointer to the ACE_Timer_List that we are iterating over. @@ -104,7 +104,7 @@ public: TIME_POLICY const & time_policy = TIME_POLICY()); /// Destructor - virtual ~ACE_Timer_List_T (void); + virtual ~ACE_Timer_List_T (); /// True if queue is empty, else false. virtual bool is_empty () const; @@ -147,13 +147,13 @@ public: /** * Destroy timer queue. Cancels all timers. */ - virtual int close (void); + virtual int close (); /// Returns a pointer to this ACE_Timer_Queue's iterator. - virtual ACE_Timer_Queue_Iterator_T<TYPE>& iter (void); + virtual ACE_Timer_Queue_Iterator_T<TYPE>& iter (); /// Removes the earliest node from the queue and returns it - virtual ACE_Timer_Node_T<TYPE>* remove_first (void); + virtual ACE_Timer_Node_T<TYPE>* remove_first (); /// Dump the state of an object. virtual void dump () const; @@ -163,7 +163,7 @@ public: virtual void reschedule (ACE_Timer_Node_T<TYPE> *); /// Reads the earliest node from the queue and returns it. - virtual ACE_Timer_Node_T<TYPE>* get_first (void); + virtual ACE_Timer_Node_T<TYPE>* get_first (); private: /** diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index d440e4ca2bc..d69bfd24f27 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -23,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class TQ, class TYPE> TQ & -ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::timer_queue (void) +ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::timer_queue () { return this->timer_queue_; } @@ -40,7 +40,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::cancel (long timer_id, } template <class TQ, class TYPE> int -ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::expire (void) +ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::expire () { // Block designated signals. ACE_Sig_Guard sg (&this->mask_); @@ -50,7 +50,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::expire (void) } template <class TQ, class TYPE> int -ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::schedule_ualarm (void) +ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::schedule_ualarm () { ACE_Time_Value tv = this->timer_queue_.earliest_time () - this->timer_queue_.gettimeofday (); @@ -170,7 +170,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::ACE_Thread_Timer_Queue_Adapter (ACE_Th } template<class TQ, class TYPE> -ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::~ACE_Thread_Timer_Queue_Adapter (void) +ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::~ACE_Thread_Timer_Queue_Adapter () { if (this->delete_timer_queue_) { @@ -186,7 +186,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::~ACE_Thread_Timer_Queue_Adapter (void) } template<class TQ, class TYPE> ACE_SYNCH_RECURSIVE_MUTEX & -ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::mutex (void) +ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::mutex () { return this->mutex_; } @@ -217,7 +217,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::cancel (long timer_id, } template<class TQ, class TYPE> void -ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::deactivate (void) +ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::deactivate () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_); @@ -226,7 +226,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::deactivate (void) } template<class TQ, class TYPE> int -ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void) +ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1); @@ -347,7 +347,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::enqueue_command (ACE_Command_Base *cmd // handler context. template<class TQ, class TYPE> int -ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::dispatch_commands (void) +ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::dispatch_commands () { // Serialize access to the command queue. ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->command_mutex_, -1); diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 94f41f1333c..0cd15c970c7 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -79,14 +79,14 @@ public: /// Dispatch all timers with expiry time at or before the current time. /// Returns the number of timers expired. - int expire (void); + int expire (); /// Return a reference to the underlying timer queue. - TQ &timer_queue (void); + TQ &timer_queue (); private: /// Perform the logic to compute the new ualarm(2) setting. - virtual int schedule_ualarm (void); + virtual int schedule_ualarm (); /// Called back by @c SIGALRM handler. virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); @@ -138,7 +138,7 @@ public: TQ* timer_queue = 0); /// Destructor. - virtual ~ACE_Thread_Timer_Queue_Adapter (void); + virtual ~ACE_Thread_Timer_Queue_Adapter (); /// Schedule the timer according to the semantics of the <TQ>; wakes /// up the dispatching thread. @@ -155,10 +155,10 @@ public: virtual int svc (); /// Inform the dispatching thread that it should terminate. - virtual void deactivate (void); + virtual void deactivate (); /// Access the locking mechanism, useful for iteration. - ACE_SYNCH_RECURSIVE_MUTEX &mutex (void); + ACE_SYNCH_RECURSIVE_MUTEX &mutex (); /// Set a user-specified timer queue. int timer_queue (TQ *tq); @@ -204,7 +204,7 @@ private: # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) /// Dispatches all command objects enqueued in the most /// recent event handler context. - int dispatch_commands (void); + int dispatch_commands (); /// Queue of commands for deferred execution. ACE_Unbounded_Queue<ACE_Command_Base *> command_queue_; diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index f35692e77af..d283481324b 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -164,7 +164,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::open_i /// Destructor just cleans up its memory template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Wheel_T (void) +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Wheel_T () { ACE_TRACE ("ACE_Timer_Wheel_T::~ACE_Timer_Wheel_T"); @@ -182,7 +182,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Wheel_T (voi } template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> int -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close (void) +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::close () { ACE_TRACE ("ACE_Timer_Wheel_T::close"); @@ -707,7 +707,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump () const * @return The earliest timer node. */ 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>::remove_first (void) +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first () { ACE_TRACE ("ACE_Timer_Wheel_T::remove_first"); return remove_first_expired (ACE_Time_Value::max_time); @@ -744,7 +744,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::remove_first_expired (c */ 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 (void) +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first () { ACE_TRACE ("ACE_Timer_Wheel_T::get_first"); return this->get_first_i (); @@ -767,7 +767,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::get_first_i () const */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Queue_Iterator_T<TYPE> & -ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter (void) +ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::iter () { this->iterator_->first (); return *this->iterator_; @@ -858,7 +858,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::ACE_Timer_Wheel_I * Destructor, at this level does nothing. */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> -ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::~ACE_Timer_Wheel_Iterator_T (void) +ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::~ACE_Timer_Wheel_Iterator_T () { } @@ -872,7 +872,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE,FUNCTOR,ACE_LOCK,TIME_POLICY>::~ACE_Timer_Wheel_ * current_node_ would be 0. */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void -ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void) +ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first () { this->goto_next(0); } @@ -882,7 +882,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first (void) * Positions the iterator at the next node. */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void -ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next (void) +ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next () { if (this->isdone()) return; @@ -931,7 +931,7 @@ ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () cons * is empty */ template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> * -ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item (void) +ACE_Timer_Wheel_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item () { return this->current_node_; } diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h index ccedf514bb6..5f0acf957c0 100644 --- a/ACE/ace/Timer_Wheel_T.h +++ b/ACE/ace/Timer_Wheel_T.h @@ -144,12 +144,12 @@ public: /** * Destroy timer queue. Cancels all timers. */ - virtual int close (void); + virtual int close (); /// Run the <functor> for all timers whose values are <= /// <ACE_OS::gettimeofday>. Also accounts for <timer_skew>. Returns /// the number of timers canceled. - virtual int expire (void); + virtual int expire (); // Run the <functor> for all timers whose values are <= @a current_time. // This does not account for <timer_skew>. Returns the number of diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor/TkReactor.cpp index be79fff1826..3baaa718061 100644 --- a/ACE/ace/TkReactor/TkReactor.cpp +++ b/ACE/ace/TkReactor/TkReactor.cpp @@ -32,7 +32,7 @@ ACE_TkReactor::ACE_TkReactor (size_t size, #endif /* ACE_MT_SAFE */ } -ACE_TkReactor::~ACE_TkReactor (void) +ACE_TkReactor::~ACE_TkReactor () { // Delete the remaining items in the linked list. @@ -341,7 +341,7 @@ ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles, // first timeout in the Reactor's Timer_Queue. void -ACE_TkReactor::reset_timeout (void) +ACE_TkReactor::reset_timeout () { if (this->timeout_) ::Tk_DeleteTimerHandler (this->timeout_); diff --git a/ACE/ace/TkReactor/TkReactor.h b/ACE/ace/TkReactor/TkReactor.h index 5632ba67a73..489c7a9ce08 100644 --- a/ACE/ace/TkReactor/TkReactor.h +++ b/ACE/ace/TkReactor/TkReactor.h @@ -63,7 +63,7 @@ public: bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_TkReactor (void); + virtual ~ACE_TkReactor (); // = Timer operations. virtual long schedule_timer (ACE_Event_Handler *event_handler, @@ -116,7 +116,7 @@ protected: private: /// This method ensures there's a Tk timeout for the first timeout in /// the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); // = Integrate with the X callback function mechanism. static void TimerCallbackProc (ClientData cd); diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h index 3191db3bb06..da4fbcd6ffe 100644 --- a/ACE/ace/Token.h +++ b/ACE/ace/Token.h @@ -89,12 +89,12 @@ public: ACE_Token (const ACE_TCHAR *name = 0, void * = 0); /// Destructor - virtual ~ACE_Token (void); + virtual ~ACE_Token (); // = Strategies /// Retrieve the current queueing strategy. - int queueing_strategy (void); + int queueing_strategy (); /// Set the queueing strategy. void queueing_strategy (int queueing_strategy); @@ -131,7 +131,7 @@ public: * behavior before <acquire> goes to sleep. By default, this is a * no-op... */ - virtual void sleep_hook (void); + virtual void sleep_hook (); /** * An optimized method that efficiently reacquires the token if no @@ -156,20 +156,20 @@ public: /// Become interface-compliant with other lock mechanisms (implements /// a non-blocking <acquire>). - int tryacquire (void); + int tryacquire (); /// Shuts down the ACE_Token instance. - int remove (void); + int remove (); /// Relinquish the token. If there are any waiters then the next one /// in line gets it. - int release (void); + int release (); /// Behaves like acquire() but at a lower priority. It should probably /// be called acquire_yield() since the semantics aren't really /// what's commonly expected for readers/writer locks. See the class /// documentation above for more details. - int acquire_read (void); + int acquire_read (); /// Behaves like acquire() but at a lower priority. It should probably /// be called acquire_yield() since the semantics aren't really @@ -180,7 +180,7 @@ public: ACE_Time_Value *timeout = 0); /// Calls acquire(). - int acquire_write (void); + int acquire_write (); /// Calls acquire(). int acquire_write (void (*sleep_hook)(void *), @@ -188,22 +188,22 @@ public: ACE_Time_Value *timeout = 0); /// Lower priority try_acquire(). - int tryacquire_read (void); + int tryacquire_read (); /// Just calls <tryacquire>. - int tryacquire_write (void); + int tryacquire_write (); /// Assumes the caller has acquired the token and returns 0. - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); // = Accessor methods. /// Return the number of threads that are currently waiting to get /// the token. - int waiters (void); + int waiters (); /// Return the id of the current thread that owns the token. - ACE_thread_t current_owner (void); + ACE_thread_t current_owner (); /// Dump the state of an object. void dump () const; @@ -228,7 +228,7 @@ public: int wait (ACE_Time_Value *timeout, ACE_Thread_Mutex &lock); /// Notify (unblock) the entry. - int signal (void); + int signal (); /// Pointer to next waiter. ACE_Token_Queue_Entry *next_; @@ -258,7 +258,7 @@ private: struct ACE_Token_Queue { /// Constructor - ACE_Token_Queue (void); + ACE_Token_Queue (); /// Remove a waiter from the queue. void remove_entry (ACE_Token_Queue_Entry *); @@ -281,7 +281,7 @@ private: ACE_Token_Op_Type op_type); /// Wake next in line for ownership. - void wakeup_next_waiter (void); + void wakeup_next_waiter (); /// A queue of writer threads. ACE_Token_Queue writers_; @@ -346,7 +346,7 @@ public: }; /// Get queueing strategy. - int queueing_strategy (void); + int queueing_strategy (); /// Set queueing strategy. void queueing_strategy (int queueing_strategy); diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp index 031c8ab66ef..7ab8347dd01 100644 --- a/ACE/ace/Token_Collection.cpp +++ b/ACE/ace/Token_Collection.cpp @@ -236,7 +236,7 @@ ACE_Token_Collection::release (const ACE_TCHAR *token_name, return temp->release (options); } -ACE_Token_Collection::~ACE_Token_Collection (void) +ACE_Token_Collection::~ACE_Token_Collection () { ACE_TRACE ("ACE_Token_Collection::~ACE_Token_Collection"); COLLECTION::ITERATOR iterator (collection_); diff --git a/ACE/ace/Token_Collection.h b/ACE/ace/Token_Collection.h index 83b0ecbf49d..86bd8f77db8 100644 --- a/ACE/ace/Token_Collection.h +++ b/ACE/ace/Token_Collection.h @@ -183,7 +183,7 @@ public: ACE_Synch_Options &options = ACE_Synch_Options::defaults); - ~ACE_Token_Collection (void); + ~ACE_Token_Collection (); /// Dump the state of the class. void dump () const; diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp index 9d2f1a48c91..7360a94a7db 100644 --- a/ACE/ace/Token_Invariants.cpp +++ b/ACE/ace/Token_Invariants.cpp @@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Token_Invariant_Manager *ACE_Token_Invariant_Manager::instance_ = 0; ACE_Token_Invariant_Manager * -ACE_Token_Invariant_Manager::instance (void) +ACE_Token_Invariant_Manager::instance () { ACE_TRACE ("ACE_Token_Invariant_Manager::instance"); @@ -202,7 +202,7 @@ ACE_Token_Invariant_Manager::get_rwlock (const ACE_TCHAR *token_name, } -ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager (void) +ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager () { ACE_TRACE ("ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager"); @@ -258,7 +258,7 @@ ACE_Mutex_Invariants::dump () const // ************************************************** int -ACE_RWLock_Invariants::writer_acquired (void) +ACE_RWLock_Invariants::writer_acquired () { if (readers_ > 0) { @@ -275,7 +275,7 @@ ACE_RWLock_Invariants::writer_acquired (void) } int -ACE_RWLock_Invariants::reader_acquired (void) +ACE_RWLock_Invariants::reader_acquired () { if (writers_ > 0) { @@ -290,7 +290,7 @@ ACE_RWLock_Invariants::reader_acquired (void) } void -ACE_RWLock_Invariants::releasing (void) +ACE_RWLock_Invariants::releasing () { if (writers_ == 1) writers_ = 0; diff --git a/ACE/ace/Token_Invariants.h b/ACE/ace/Token_Invariants.h index 959281cbb37..f5ec3f5e3ec 100644 --- a/ACE/ace/Token_Invariants.h +++ b/ACE/ace/Token_Invariants.h @@ -127,7 +127,7 @@ class ACE_Export ACE_Token_Invariant_Manager : public ACE_Cleanup { public: /// Singleton access point. - static ACE_Token_Invariant_Manager *instance (void); + static ACE_Token_Invariant_Manager *instance (); // = Polymorphic methods. Just pass in the proxy and the method // figures out the type of the token. @@ -166,10 +166,10 @@ public: // = The following two method should be in the protected part of the // class. Bugs with certain compilers preclude this. /// Prevent non-singleton construction. - ACE_Token_Invariant_Manager (void); + ACE_Token_Invariant_Manager (); /// Destruction. - virtual ~ACE_Token_Invariant_Manager (void); + virtual ~ACE_Token_Invariant_Manager (); protected: /// Return or create. diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp index 32ec131f4ff..052a900db0e 100644 --- a/ACE/ace/Token_Manager.cpp +++ b/ACE/ace/Token_Manager.cpp @@ -37,7 +37,7 @@ ACE_Token_Manager::~ACE_Token_Manager () } ACE_Token_Manager * -ACE_Token_Manager::instance (void) +ACE_Token_Manager::instance () { ACE_TRACE ("ACE_Token_Manager::instance"); diff --git a/ACE/ace/Token_Manager.h b/ACE/ace/Token_Manager.h index 6ce6e0913d8..c2c597e7c65 100644 --- a/ACE/ace/Token_Manager.h +++ b/ACE/ace/Token_Manager.h @@ -49,11 +49,11 @@ class ACE_Export ACE_Token_Manager : public ACE_Cleanup // derivation of ACE_Token_Manager. You will only need to // redefine make_mutex. public: - ACE_Token_Manager (void); - virtual ~ACE_Token_Manager (void); + ACE_Token_Manager (); + virtual ~ACE_Token_Manager (); /// Get the pointer to token manager singleton. - static ACE_Token_Manager *instance (void); + static ACE_Token_Manager *instance (); /// Set the pointer to token manager singleton. void instance (ACE_Token_Manager *); @@ -89,7 +89,7 @@ public: * This is necessary since safe_acquire is implemented in terms of * the Token queues. */ - ACE_TOKEN_CONST::MUTEX &mutex (void); + ACE_TOKEN_CONST::MUTEX &mutex (); /// Dump the state of the class. void dump () const; diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp index b584ad3b4d1..e7aeb291371 100644 --- a/ACE/ace/Token_Request_Reply.cpp +++ b/ACE/ace/Token_Request_Reply.cpp @@ -42,7 +42,7 @@ ACE_Token_Request::encode (void *&buf) // so that it can be used by the server. int -ACE_Token_Request::decode (void) +ACE_Token_Request::decode () { this->token_name_ = this->transfer_.data_; @@ -152,7 +152,7 @@ ACE_Token_Reply::encode (void *&buf) // so that it can be used by the client. int -ACE_Token_Reply::decode (void) +ACE_Token_Reply::decode () { return 0; } diff --git a/ACE/ace/Tokenizer_T.cpp b/ACE/ace/Tokenizer_T.cpp index 5be90545efa..8df674e3455 100644 --- a/ACE/ace/Tokenizer_T.cpp +++ b/ACE/ace/Tokenizer_T.cpp @@ -113,7 +113,7 @@ ACE_Tokenizer_T<ACE_CHAR_T>::is_preserve_designator (ACE_CHAR_T start, template <class ACE_CHAR_T> ACE_CHAR_T * -ACE_Tokenizer_T<ACE_CHAR_T>::next (void) +ACE_Tokenizer_T<ACE_CHAR_T>::next () { // Check if the previous pass was the last one in the buffer. if (index_ == -1) diff --git a/ACE/ace/Tokenizer_T.h b/ACE/ace/Tokenizer_T.h index 68600487336..6172520f4cf 100644 --- a/ACE/ace/Tokenizer_T.h +++ b/ACE/ace/Tokenizer_T.h @@ -140,7 +140,7 @@ public: int preserve_designators (ACE_CHAR_T start, ACE_CHAR_T stop, int strip=1); /// Returns the next token. - ACE_CHAR_T *next (void); + ACE_CHAR_T *next (); enum { MAX_DELIMITERS=16, diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h index 503f1ceefb0..d46d5c1e250 100644 --- a/ACE/ace/Typed_SV_Message.h +++ b/ACE/ace/Typed_SV_Message.h @@ -39,7 +39,7 @@ public: long type = 0, int length = sizeof (T), int max_size = sizeof (T)); - ~ACE_Typed_SV_Message (void); + ~ACE_Typed_SV_Message (); /// Get the type of the message. long type () const; @@ -60,7 +60,7 @@ public: void max_size (int m); /// Get a pointer to the data in the message. - T &data (void); + T &data (); /// Set a pointer to the data in the message. void data (const T &data); diff --git a/ACE/ace/Typed_SV_Message_Queue.cpp b/ACE/ace/Typed_SV_Message_Queue.cpp index 09c213dfd72..4c22a82f1be 100644 --- a/ACE/ace/Typed_SV_Message_Queue.cpp +++ b/ACE/ace/Typed_SV_Message_Queue.cpp @@ -27,7 +27,7 @@ ACE_Typed_SV_Message_Queue<T>::dump () const } template <class T> -ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue (void) +ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue () { ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue"); } @@ -44,7 +44,7 @@ ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue (key_t external_id, } template <class T> -ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue (void) +ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue () { ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::~ACE_Typed_SV_Message_Queue"); } diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h index 3fdb92bd7ef..4d83cea4e9f 100644 --- a/ACE/ace/Typed_SV_Message_Queue.h +++ b/ACE/ace/Typed_SV_Message_Queue.h @@ -38,16 +38,16 @@ public: ACE_NOWAIT = IPC_NOWAIT }; - ACE_Typed_SV_Message_Queue (void); + ACE_Typed_SV_Message_Queue (); ACE_Typed_SV_Message_Queue (key_t external_id, int create = ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); int open (key_t external_id, int create = ACE_OPEN, int perms = ACE_DEFAULT_FILE_PERMS); - int close (void); - int remove (void); - ~ACE_Typed_SV_Message_Queue (void); + int close (); + int remove (); + ~ACE_Typed_SV_Message_Queue (); /// Send method. int send (const ACE_Typed_SV_Message<T> &mb, int mflags = 0); diff --git a/ACE/ace/UPIPE_Connector.h b/ACE/ace/UPIPE_Connector.h index 85f744468aa..8af83097814 100644 --- a/ACE/ace/UPIPE_Connector.h +++ b/ACE/ace/UPIPE_Connector.h @@ -33,7 +33,7 @@ class ACE_Export ACE_UPIPE_Connector { public: /// Default constructor. - ACE_UPIPE_Connector (void); + ACE_UPIPE_Connector (); /** * Actively connect and produce a @a new_stream if things go well. diff --git a/ACE/ace/UPIPE_Stream.h b/ACE/ace/UPIPE_Stream.h index 44c9f2df1dc..5e911ca1cd4 100644 --- a/ACE/ace/UPIPE_Stream.h +++ b/ACE/ace/UPIPE_Stream.h @@ -41,12 +41,12 @@ public: typedef ACE_Stream<ACE_SYNCH> MT_Stream; - ACE_UPIPE_Stream (void); + ACE_UPIPE_Stream (); - virtual ~ACE_UPIPE_Stream (void); + virtual ~ACE_UPIPE_Stream (); /// Shut down the UPIPE and release resources. - int close (void); + int close (); /// Return the underlying I/O handle. ACE_HANDLE get_handle () const; diff --git a/ACE/ace/UTF16_Encoding_Converter.cpp b/ACE/ace/UTF16_Encoding_Converter.cpp index b1455d3b5f9..3934167a9de 100644 --- a/ACE/ace/UTF16_Encoding_Converter.cpp +++ b/ACE/ace/UTF16_Encoding_Converter.cpp @@ -79,7 +79,7 @@ ACE_UTF16_Encoding_Converter::ACE_UTF16_Encoding_Converter (bool swap) { } -ACE_UTF16_Encoding_Converter::~ACE_UTF16_Encoding_Converter (void) +ACE_UTF16_Encoding_Converter::~ACE_UTF16_Encoding_Converter () { } @@ -323,37 +323,37 @@ ACE_UTF16_Encoding_Converter::encoded (const ACE_Byte* source, } ACE_UINT32 -ACE_UTF16_Encoding_Converter::get_UNI_SUR_HIGH_START (void) +ACE_UTF16_Encoding_Converter::get_UNI_SUR_HIGH_START () { return UNI_SUR_HIGH_START; } ACE_UINT32 -ACE_UTF16_Encoding_Converter::get_UNI_SUR_LOW_END (void) +ACE_UTF16_Encoding_Converter::get_UNI_SUR_LOW_END () { return UNI_SUR_LOW_END; } ACE_UINT32 -ACE_UTF16_Encoding_Converter::get_UNI_REPLACEMENT_CHAR (void) +ACE_UTF16_Encoding_Converter::get_UNI_REPLACEMENT_CHAR () { return UNI_REPLACEMENT_CHAR; } const ACE_Byte* -ACE_UTF16_Encoding_Converter::get_first_byte_mark (void) +ACE_UTF16_Encoding_Converter::get_first_byte_mark () { return firstByteMark; } const ACE_Byte* -ACE_UTF16_Encoding_Converter::get_trailing_bytes_for_utf8 (void) +ACE_UTF16_Encoding_Converter::get_trailing_bytes_for_utf8 () { return trailingBytesForUTF8; } const ACE_UINT32* -ACE_UTF16_Encoding_Converter::get_offsets_from_utf8 (void) +ACE_UTF16_Encoding_Converter::get_offsets_from_utf8 () { return offsetsFromUTF8; } diff --git a/ACE/ace/UTF16_Encoding_Converter.h b/ACE/ace/UTF16_Encoding_Converter.h index 0097b7bb8d2..36826cd1f2f 100644 --- a/ACE/ace/UTF16_Encoding_Converter.h +++ b/ACE/ace/UTF16_Encoding_Converter.h @@ -32,7 +32,7 @@ public: ACE_UTF16_Encoding_Converter (bool swap = false); /// This is a do nothing destructor. - virtual ~ACE_UTF16_Encoding_Converter (void); + virtual ~ACE_UTF16_Encoding_Converter (); /// Convert the source from UTF-16 to UTF-8 and store it in the /// provided target buffer. @@ -61,12 +61,12 @@ protected: bool is_legal_utf8 (const ACE_Byte* source, size_t length) const; - static ACE_UINT32 get_UNI_SUR_HIGH_START (void); - static ACE_UINT32 get_UNI_SUR_LOW_END (void); - static ACE_UINT32 get_UNI_REPLACEMENT_CHAR (void); - static const ACE_Byte* get_first_byte_mark (void); - static const ACE_Byte* get_trailing_bytes_for_utf8 (void); - static const ACE_UINT32* get_offsets_from_utf8 (void); + static ACE_UINT32 get_UNI_SUR_HIGH_START (); + static ACE_UINT32 get_UNI_SUR_LOW_END (); + static ACE_UINT32 get_UNI_REPLACEMENT_CHAR (); + static const ACE_Byte* get_first_byte_mark (); + static const ACE_Byte* get_trailing_bytes_for_utf8 (); + static const ACE_UINT32* get_offsets_from_utf8 (); bool swap_; }; diff --git a/ACE/ace/UTF32_Encoding_Converter.cpp b/ACE/ace/UTF32_Encoding_Converter.cpp index 22bd9fac000..9312fbe4acb 100644 --- a/ACE/ace/UTF32_Encoding_Converter.cpp +++ b/ACE/ace/UTF32_Encoding_Converter.cpp @@ -34,7 +34,7 @@ ACE_UTF32_Encoding_Converter::ACE_UTF32_Encoding_Converter (bool swap) { } -ACE_UTF32_Encoding_Converter::~ACE_UTF32_Encoding_Converter (void) +ACE_UTF32_Encoding_Converter::~ACE_UTF32_Encoding_Converter () { } diff --git a/ACE/ace/UTF32_Encoding_Converter.h b/ACE/ace/UTF32_Encoding_Converter.h index ab7b9d14e9f..22b20cc68c6 100644 --- a/ACE/ace/UTF32_Encoding_Converter.h +++ b/ACE/ace/UTF32_Encoding_Converter.h @@ -32,7 +32,7 @@ public: ACE_UTF32_Encoding_Converter (bool swap = false); /// This is a do nothing destructor. - virtual ~ACE_UTF32_Encoding_Converter (void); + virtual ~ACE_UTF32_Encoding_Converter (); /// Convert the source from UTF-32 to UTF-8 and store it in the /// provided target buffer. diff --git a/ACE/ace/UTF8_Encoding_Converter.cpp b/ACE/ace/UTF8_Encoding_Converter.cpp index a618ba40317..f515f3f1bfd 100644 --- a/ACE/ace/UTF8_Encoding_Converter.cpp +++ b/ACE/ace/UTF8_Encoding_Converter.cpp @@ -8,7 +8,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter (void) +ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter () : native_ (0) { // Choose a converter for the ASCII or UTF-8 string to a wide character @@ -25,7 +25,7 @@ ACE_UTF8_Encoding_Converter::ACE_UTF8_Encoding_Converter (void) } } -ACE_UTF8_Encoding_Converter::~ACE_UTF8_Encoding_Converter (void) +ACE_UTF8_Encoding_Converter::~ACE_UTF8_Encoding_Converter () { delete native_; } diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 193f1a9a8f0..30f664ba6ab 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -60,7 +60,7 @@ ACE_WFMO_Reactor_Handler_Repository::open (size_t size) return 0; } -ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void) +ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository () { // Free up dynamically allocated space delete [] this->current_handles_; @@ -577,7 +577,7 @@ ACE_WFMO_Reactor_Handler_Repository::resume_handler_i (ACE_HANDLE handle, } void -ACE_WFMO_Reactor_Handler_Repository::unbind_all (void) +ACE_WFMO_Reactor_Handler_Repository::unbind_all () { { ACE_GUARD (ACE_Process_Mutex, ace_mon, this->wfmo_reactor_.lock_); @@ -666,7 +666,7 @@ ACE_WFMO_Reactor_Handler_Repository::bind_i (bool io_entry, } int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos () { // Go through the entire valid array and check for all handles that // have been schedule for deletion @@ -778,7 +778,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_current_infos (void) } int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos () { // Go through the <suspended_handle> array if (this->handles_to_be_deleted_ > 0 || this->handles_to_be_resumed_ > 0) @@ -886,7 +886,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_suspension_infos (void) } int -ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos (void) +ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos () { // Go through the <to_be_added_*> arrays for (size_t i = 0; i < this->handles_to_be_added_; ++i) @@ -1295,7 +1295,7 @@ ACE_WFMO_Reactor::timer_queue (ACE_Timer_Queue *tq) } int -ACE_WFMO_Reactor::close (void) +ACE_WFMO_Reactor::close () { // This GUARD is necessary since we are updating shared state. ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); @@ -1343,7 +1343,7 @@ ACE_WFMO_Reactor::close (void) return 0; } -ACE_WFMO_Reactor::~ACE_WFMO_Reactor (void) +ACE_WFMO_Reactor::~ACE_WFMO_Reactor () { // Assumption: No threads are left in the Reactor when this method // is called (i.e., active_threads_ == 0) @@ -2264,7 +2264,7 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler, int -ACE_WFMO_Reactor::update_state (void) +ACE_WFMO_Reactor::update_state () { // This GUARD is necessary since we are updating shared state. ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); @@ -2366,7 +2366,7 @@ ACE_WFMO_Reactor_Notify::is_dispatchable (ACE_Notification_Buffer & /*buffer*/) } ACE_HANDLE -ACE_WFMO_Reactor_Notify::notify_handle (void) +ACE_WFMO_Reactor_Notify::notify_handle () { return ACE_INVALID_HANDLE; } @@ -2385,7 +2385,7 @@ ACE_WFMO_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &) } int -ACE_WFMO_Reactor_Notify::close (void) +ACE_WFMO_Reactor_Notify::close () { return -1; } @@ -2572,7 +2572,7 @@ ACE_WFMO_Reactor_Notify::max_notify_iterations (int iterations) } int -ACE_WFMO_Reactor_Notify::max_notify_iterations (void) +ACE_WFMO_Reactor_Notify::max_notify_iterations () { ACE_TRACE ("ACE_WFMO_Reactor_Notify::max_notify_iterations"); return this->max_notify_iterations_; @@ -2702,7 +2702,7 @@ ACE_WFMO_Reactor::max_notify_iterations (int iterations) } int -ACE_WFMO_Reactor::max_notify_iterations (void) +ACE_WFMO_Reactor::max_notify_iterations () { ACE_TRACE ("ACE_WFMO_Reactor::max_notify_iterations"); ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1); @@ -2722,7 +2722,7 @@ ACE_WFMO_Reactor::purge_pending_notifications (ACE_Event_Handler *eh, } int -ACE_WFMO_Reactor::resumable_handler (void) +ACE_WFMO_Reactor::resumable_handler () { ACE_TRACE ("ACE_WFMO_Reactor::resumable_handler"); return 0; diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index 85dd128a1ab..05ebf813b9f 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -154,10 +154,10 @@ public: ACE_Reactor_Mask close_masks_; /// Constructor used for initializing the structure - Common_Info (void); + Common_Info (); /// Reset the state of the structure - void reset (void); + void reset (); /// Set the structure to these new values void set (bool io_entry, @@ -297,13 +297,13 @@ public: ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor); /// Destructor. - virtual ~ACE_WFMO_Reactor_Handler_Repository (void); + virtual ~ACE_WFMO_Reactor_Handler_Repository (); /// Initialize the repository of the appropriate @a size. int open (size_t size); /// Close down the handler repository. - int close (void); + int close (); // = Search structure operations. @@ -326,7 +326,7 @@ public: bool &changes_required); /// Remove all bindings of <ACE_HANDLE, ACE_Event_Handler> tuples. - void unbind_all (void); + void unbind_all (); // = Sanity checking. @@ -346,10 +346,10 @@ public: Current_Info *current_info () const; /// Check if changes to the handle set are required. - virtual bool changes_required (void); + virtual bool changes_required (); /// Make changes to the handle set - virtual int make_changes (void); + virtual int make_changes (); /// Check to see if @a slot has been scheduled for deletion int scheduled_for_deletion (size_t slot) const; @@ -383,14 +383,14 @@ public: bool &changes_required); /// Deletions and suspensions in current_info_ - int make_changes_in_current_infos (void); + int make_changes_in_current_infos (); /// Deletions and resumptions in current_suspended_info_ - int make_changes_in_suspension_infos (void); + int make_changes_in_suspension_infos (); /// Deletions in to_be_added_info_, or transfers to current_info_ or /// current_suspended_info_ from to_be_added_info_ - int make_changes_in_to_be_added_infos (void); + int make_changes_in_to_be_added_infos (); /// Removes the ACE_Event_Handler at @a slot from the table. int remove_handler_i (size_t slot, @@ -498,7 +498,7 @@ public: int disable_notify = 0); /// No-op. - virtual int close (void); + virtual int close (); /** * Special trick to unblock <WaitForMultipleObjects> when updates @@ -523,7 +523,7 @@ public: /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock /// the <Reactor_Impl> - virtual ACE_HANDLE notify_handle (void); + virtual ACE_HANDLE notify_handle (); /// Handle one of the notify call on the <handle>. This could be /// because of a thread trying to unblock the <Reactor_Impl> @@ -558,7 +558,7 @@ public: * notify queue before breaking out of its * ACE_Message_Queue::dequeue() loop. */ - int max_notify_iterations (void); + int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -706,10 +706,10 @@ public: virtual ACE_Timer_Queue *timer_queue () const; /// Close down the ACE_WFMO_Reactor and release all of its resources. - virtual int close (void); + virtual int close (); /// Close down the ACE_WFMO_Reactor and release all of its resources. - virtual ~ACE_WFMO_Reactor (void); + virtual ~ACE_WFMO_Reactor (); // = Event loop drivers. @@ -766,7 +766,7 @@ public: * actively handling events. If it returns non-zero, <handling_events> and * <handle_alertable_events> return -1 immediately. */ - virtual int deactivated (void); + virtual int deactivated (); /** * Control whether the Reactor will handle any more incoming events or not. @@ -909,7 +909,7 @@ public: virtual int suspend_handler (const ACE_Handle_Set &handles); /// Suspend all handles temporarily. - virtual int suspend_handlers (void); + virtual int suspend_handlers (); /// Resume @a event_handler. Use <ACE_Event_Handler::get_handle> to /// get the handle. @@ -922,13 +922,13 @@ public: virtual int resume_handler (const ACE_Handle_Set &handles); /// Resume all <handles>. - virtual int resume_handlers (void); + virtual int resume_handlers (); /// Does the reactor allow the application to resume the handle on /// its own ie. can it pass on the control of handle resumption to /// the application. A positive value indicates that the handlers /// are application resumable. A value of 0 indicates otherwise. - virtual int resumable_handler (void); + virtual int resumable_handler (); /** * Return true if we any event associations were made by the reactor @@ -936,7 +936,7 @@ public: * WFMO_Reactor does use event associations, this function always * return true. */ - virtual bool uses_event_associations (void); + virtual bool uses_event_associations (); // Timer management. @@ -1058,7 +1058,7 @@ public: * notify queue before breaking out of its * <ACE_Message_Queue::dequeue> loop. */ - virtual int max_notify_iterations (void); + virtual int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -1095,18 +1095,18 @@ public: /// Returns true if WFMO_Reactor has been successfully initialized, else /// false. - virtual bool initialized (void); + virtual bool initialized (); /// Returns the current size of the WFMO_Reactor's internal /// descriptor table. virtual size_t size () const; /// Returns a reference to the WFMO_Reactor's internal lock. - virtual ACE_Lock &lock (void); + virtual ACE_Lock &lock (); /// Wake up all threads in WaitForMultipleObjects so that they can /// reconsult the handle set - virtual void wakeup_all_threads (void); + virtual void wakeup_all_threads (); /** * Transfers ownership of the WFMO_Reactor to the @a new_owner. The @@ -1119,7 +1119,7 @@ public: virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual bool restart (void); + virtual bool restart (); /// Set a new value for restart and return the original value. virtual bool restart (bool r); @@ -1128,7 +1128,7 @@ public: virtual void requeue_position (int); /// Not implemented - virtual int requeue_position (void); + virtual int requeue_position (); // = Low-level wait_set mask manipulation methods. @@ -1185,7 +1185,7 @@ protected: int operation); /// Return the ID of the "owner" thread. Does not do any locking. - virtual ACE_thread_t owner_i (void); + virtual ACE_thread_t owner_i (); /// Wait up to @a max_wait_time until it's ok to enter /// WaitForMultipleObjects. Returns 1 (and holding lock_) if ok to wait; @@ -1202,7 +1202,7 @@ protected: /// Expire timers. Only the owner thread does useful stuff in this /// function. - virtual int expire_timers (void); + virtual int expire_timers (); /// Dispatches the timers and I/O handlers. virtual int dispatch (DWORD wait_status); @@ -1234,7 +1234,7 @@ protected: ACE_HANDLE event_handle); /// Dispatches window messages. Noop for WFMO_Reactor. - virtual int dispatch_window_messages (void); + virtual int dispatch_window_messages (); virtual ACE_Reactor_Mask upcall (ACE_Event_Handler *event_handler, ACE_HANDLE io_handle, @@ -1244,13 +1244,13 @@ protected: virtual int calculate_timeout (ACE_Time_Value *time); /// Update the state of the handler repository - virtual int update_state (void); + virtual int update_state (); /// Check to see if we have a new owner - virtual int new_owner (void); + virtual int new_owner (); /// Set owner to new owner - virtual int change_owner (void); + virtual int change_owner (); /// Handle signals without requiring global/static variables. ACE_Sig_Handler *signal_handler_; diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index 838f2196186..d445397f90e 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -103,7 +103,7 @@ ACE_WIN32_Asynch_Result::set_error (u_long errcode) this->error_ = errcode; } -ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result (void) +ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result () { } @@ -166,7 +166,7 @@ ACE_WIN32_Asynch_Operation::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Operation::cancel (void) +ACE_WIN32_Asynch_Operation::cancel () { #if defined (ACE_HAS_CANCEL_IO) // All I/O operations that are canceled will complete with the error @@ -203,7 +203,7 @@ ACE_WIN32_Asynch_Operation::ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win3 { } -ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation (void) +ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation () { } @@ -294,7 +294,7 @@ ACE_WIN32_Asynch_Read_Stream_Result::complete (size_t bytes_transferred, handler->handle_read_stream (result); } -ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result (void) +ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result () { } @@ -562,7 +562,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, #endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */ } -ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream (void) +ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream () { } @@ -632,7 +632,7 @@ ACE_WIN32_Asynch_Read_Stream::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Read_Stream::cancel (void) +ACE_WIN32_Asynch_Read_Stream::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -723,7 +723,7 @@ ACE_WIN32_Asynch_Write_Stream_Result::complete (size_t bytes_transferred, handler->handle_write_stream (result); } -ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result (void) +ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result () { } @@ -1039,7 +1039,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, #endif /* ACE_HAS_WINSOCK2 && ACE_HAS_WINSOCK2 != 0 */ } -ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream (void) +ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream () { } @@ -1060,7 +1060,7 @@ ACE_WIN32_Asynch_Write_Stream::open (const ACE_Handler::Proxy_Ptr &handler_proxy } int -ACE_WIN32_Asynch_Write_Stream::cancel (void) +ACE_WIN32_Asynch_Write_Stream::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -1147,7 +1147,7 @@ ACE_WIN32_Asynch_Read_File_Result::complete (size_t bytes_transferred, handler->handle_read_file (result); } -ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result (void) +ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result () { } @@ -1413,7 +1413,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, } -ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File (void) +ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File () { } @@ -1462,7 +1462,7 @@ ACE_WIN32_Asynch_Read_File::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Read_File::cancel (void) +ACE_WIN32_Asynch_Read_File::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -1550,7 +1550,7 @@ ACE_WIN32_Asynch_Write_File_Result::complete (size_t bytes_transferred, handler->handle_write_file (result); } -ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result (void) +ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result () { } @@ -1858,7 +1858,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, } -ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File (void) +ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File () { } @@ -1909,7 +1909,7 @@ ACE_WIN32_Asynch_Write_File::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Write_File::cancel (void) +ACE_WIN32_Asynch_Write_File::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -2000,7 +2000,7 @@ ACE_WIN32_Asynch_Accept_Result::complete (size_t bytes_transferred, handler->handle_accept (result); } -ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void) +ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result () { } @@ -2205,7 +2205,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, #endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ } -ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void) +ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept () { } @@ -2226,7 +2226,7 @@ ACE_WIN32_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Accept::cancel (void) +ACE_WIN32_Asynch_Accept::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -2288,7 +2288,7 @@ ACE_WIN32_Asynch_Connect_Result::complete (size_t bytes_transferred, handler->handle_connect (result); } -ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result (void) +ACE_WIN32_Asynch_Connect_Result::~ACE_WIN32_Asynch_Connect_Result () { } @@ -2371,7 +2371,7 @@ ACE_WIN32_Asynch_Connect::ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_p { } -ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect (void) +ACE_WIN32_Asynch_Connect::~ACE_WIN32_Asynch_Connect () { this->close (); this->reactor (0); // to avoid purge_pending_notifications @@ -2677,7 +2677,7 @@ ACE_WIN32_Asynch_Connect::cancel_uncompleted (bool flg_notify, } int -ACE_WIN32_Asynch_Connect::cancel (void) +ACE_WIN32_Asynch_Connect::cancel () { ACE_TRACE ("ACE_WIN32_Asynch_Connect::cancel"); @@ -2706,7 +2706,7 @@ ACE_WIN32_Asynch_Connect::cancel (void) } int -ACE_WIN32_Asynch_Connect::close (void) +ACE_WIN32_Asynch_Connect::close () { ACE_TRACE ("ACE_WIN32_Asynch_Connect::close"); @@ -2911,7 +2911,7 @@ ACE_WIN32_Asynch_Transmit_File_Result::complete (size_t bytes_transferred, handler->handle_transmit_file (result); } -ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result (void) +ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result () { } @@ -3086,7 +3086,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_WINSOCK2 */ } -ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void) +ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File () { } @@ -3107,7 +3107,7 @@ ACE_WIN32_Asynch_Transmit_File::open (const ACE_Handler::Proxy_Ptr &handler_prox } int -ACE_WIN32_Asynch_Transmit_File::cancel (void) +ACE_WIN32_Asynch_Transmit_File::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -3300,14 +3300,14 @@ ACE_WIN32_Asynch_Read_Dgram_Result::complete (size_t bytes_transferred, handler->handle_read_dgram (result); } -ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result (void) +ACE_WIN32_Asynch_Read_Dgram_Result::~ACE_WIN32_Asynch_Read_Dgram_Result () { delete this->remote_address_; } //*************************************************************************** -ACE_WIN32_Asynch_Read_Dgram::~ACE_WIN32_Asynch_Read_Dgram (void) +ACE_WIN32_Asynch_Read_Dgram::~ACE_WIN32_Asynch_Read_Dgram () { } @@ -3460,7 +3460,7 @@ ACE_WIN32_Asynch_Read_Dgram::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Read_Dgram::cancel (void) +ACE_WIN32_Asynch_Read_Dgram::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } @@ -3632,14 +3632,14 @@ ACE_WIN32_Asynch_Write_Dgram_Result::complete (size_t bytes_transferred, handler->handle_write_dgram (result); } -ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result (void) +ACE_WIN32_Asynch_Write_Dgram_Result::~ACE_WIN32_Asynch_Write_Dgram_Result () { } //*********************************************** -ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram (void) +ACE_WIN32_Asynch_Write_Dgram::~ACE_WIN32_Asynch_Write_Dgram () { } @@ -3785,7 +3785,7 @@ ACE_WIN32_Asynch_Write_Dgram::open (const ACE_Handler::Proxy_Ptr &handler_proxy, } int -ACE_WIN32_Asynch_Write_Dgram::cancel (void) +ACE_WIN32_Asynch_Write_Dgram::cancel () { return ACE_WIN32_Asynch_Operation::cancel (); } diff --git a/ACE/ace/WIN32_Asynch_IO.h b/ACE/ace/WIN32_Asynch_IO.h index 29871120ab0..b9607e06f4d 100644 --- a/ACE/ace/WIN32_Asynch_IO.h +++ b/ACE/ace/WIN32_Asynch_IO.h @@ -105,7 +105,7 @@ public: int post_completion (ACE_Proactor_Impl *proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Result (void); + virtual ~ACE_WIN32_Asynch_Result (); /// Simulate error value to use in the post_completion() void set_error (u_long errcode); @@ -167,7 +167,7 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); // = Access methods. @@ -179,7 +179,7 @@ protected: ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Operation (void); + virtual ~ACE_WIN32_Asynch_Operation (); /// Win32 Proactor. ACE_WIN32_Proactor *win32_proactor_; @@ -284,7 +284,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Stream_Result (void); + virtual ~ACE_WIN32_Asynch_Read_Stream_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; @@ -337,7 +337,7 @@ public: int signal_number = 0); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Stream (void); + virtual ~ACE_WIN32_Asynch_Read_Stream (); // Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -359,7 +359,7 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -460,7 +460,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Stream_Result (void); + virtual ~ACE_WIN32_Asynch_Write_Stream_Result (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -514,7 +514,7 @@ public: int signal_number = 0); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Stream (void); + virtual ~ACE_WIN32_Asynch_Write_Stream (); // = Methods belonging to <ACE_WIN32_Asynch_Operation> base class. @@ -537,7 +537,7 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -638,7 +638,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_File_Result (void); + virtual ~ACE_WIN32_Asynch_Read_File_Result (); }; /** @@ -693,7 +693,7 @@ public: /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_File (void); + virtual ~ACE_WIN32_Asynch_Read_File (); // = Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -715,7 +715,7 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -848,7 +848,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_File_Result (void); + virtual ~ACE_WIN32_Asynch_Write_File_Result (); }; /** @@ -899,7 +899,7 @@ public: int signal_number = 0); /// Destrcutor. - virtual ~ACE_WIN32_Asynch_Write_File (void); + virtual ~ACE_WIN32_Asynch_Write_File (); // = Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -921,7 +921,7 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -1043,7 +1043,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Accept_Result (void); + virtual ~ACE_WIN32_Asynch_Accept_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; @@ -1097,7 +1097,7 @@ public: int addr_family = AF_INET); /// Destructor. - ~ACE_WIN32_Asynch_Accept (void); + ~ACE_WIN32_Asynch_Accept (); // Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -1119,7 +1119,7 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -1206,7 +1206,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Connect_Result (void); + virtual ~ACE_WIN32_Asynch_Connect_Result (); /// Set the I/O handle for the new connection. void connect_handle (ACE_HANDLE handle); @@ -1228,7 +1228,7 @@ public: ACE_WIN32_Asynch_Connect (ACE_WIN32_Proactor * win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Connect (void); + virtual ~ACE_WIN32_Asynch_Connect (); /** * This open belongs to ACE_WIN32_Asynch_Operation. We forward @@ -1261,13 +1261,13 @@ public: * Cancel all pending pseudo-asynchronus requests * Behavior as usual AIO request */ - int cancel (void); + int cancel (); /** * Close performs cancellation of all pending requests * and close the connect handle */ - int close (void); + int close (); /// Virtual from ACE_Event_Handler ACE_HANDLE get_handle () const; @@ -1435,7 +1435,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Transmit_File_Result (void); + virtual ~ACE_WIN32_Asynch_Transmit_File_Result (); /// Network I/O handle. ACE_HANDLE socket_; @@ -1507,7 +1507,7 @@ public: int signal_number = 0); /// Destructor. - ~ACE_WIN32_Asynch_Transmit_File (void); + ~ACE_WIN32_Asynch_Transmit_File (); // Methods belong to ACE_WIN32_Asynch_Operation base class. These // methods are defined here to avoid VC++ warnings. They route the @@ -1529,7 +1529,7 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; @@ -1631,7 +1631,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Dgram_Result (void); + virtual ~ACE_WIN32_Asynch_Read_Dgram_Result (); /// Bytes requested when the asynchronous read was initiated. size_t bytes_to_read_; @@ -1671,7 +1671,7 @@ public: ACE_WIN32_Asynch_Read_Dgram (ACE_WIN32_Proactor *win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Read_Dgram (void); + virtual ~ACE_WIN32_Asynch_Read_Dgram (); /** This starts off an asynchronous read. Upto * <message_block->total_size()> will be read and stored in the @@ -1718,14 +1718,14 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; protected: /// Do-nothing constructor. - ACE_WIN32_Asynch_Read_Dgram (void); + ACE_WIN32_Asynch_Read_Dgram (); }; /** @@ -1818,7 +1818,7 @@ protected: u_long error); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Dgram_Result (void); + virtual ~ACE_WIN32_Asynch_Write_Dgram_Result (); /// The number of bytes which were requested at the start of the /// asynchronous write. @@ -1854,7 +1854,7 @@ public: ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor *win32_proactor); /// Destructor. - virtual ~ACE_WIN32_Asynch_Write_Dgram (void); + virtual ~ACE_WIN32_Asynch_Write_Dgram (); /** This starts off an asynchronous send. Upto * <message_block->total_length()> will be sent. @a message_block's @@ -1902,14 +1902,14 @@ public: * the calling thread. The function does not cancel asynchronous * operations issued by other threads. */ - int cancel (void); + int cancel (); /// Return the underlying proactor. ACE_Proactor* proactor () const; protected: /// Do-nothing constructor. - ACE_WIN32_Asynch_Write_Dgram (void); + ACE_WIN32_Asynch_Write_Dgram (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp index bee6b0d3a8a..f697edf8f6b 100644 --- a/ACE/ace/WIN32_Proactor.cpp +++ b/ACE/ace/WIN32_Proactor.cpp @@ -30,7 +30,7 @@ public: int signal_number = ACE_SIGRTMIN); /// Destructor. - virtual ~ACE_WIN32_Wakeup_Completion (void); + virtual ~ACE_WIN32_Wakeup_Completion (); /// This method calls the <handler>'s <handle_wakeup> method. virtual void complete (size_t bytes_transferred = 0, @@ -59,7 +59,7 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads, this->get_asynch_pseudo_task ().start (); } -ACE_WIN32_Proactor::~ACE_WIN32_Proactor (void) +ACE_WIN32_Proactor::~ACE_WIN32_Proactor () { this->get_asynch_pseudo_task ().stop (); @@ -73,7 +73,7 @@ ACE_WIN32_Proactor::get_asynch_pseudo_task () } int -ACE_WIN32_Proactor::close (void) +ACE_WIN32_Proactor::close () { // Close the completion port if (this->completion_port_ != 0) @@ -142,7 +142,7 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, } ACE_Asynch_Read_Stream_Impl * -ACE_WIN32_Proactor::create_asynch_read_stream (void) +ACE_WIN32_Proactor::create_asynch_read_stream () { ACE_Asynch_Read_Stream_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -152,7 +152,7 @@ ACE_WIN32_Proactor::create_asynch_read_stream (void) } ACE_Asynch_Write_Stream_Impl * -ACE_WIN32_Proactor::create_asynch_write_stream (void) +ACE_WIN32_Proactor::create_asynch_write_stream () { ACE_Asynch_Write_Stream_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -162,7 +162,7 @@ ACE_WIN32_Proactor::create_asynch_write_stream (void) } ACE_Asynch_Read_Dgram_Impl * -ACE_WIN32_Proactor::create_asynch_read_dgram (void) +ACE_WIN32_Proactor::create_asynch_read_dgram () { ACE_Asynch_Read_Dgram_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -172,7 +172,7 @@ ACE_WIN32_Proactor::create_asynch_read_dgram (void) } ACE_Asynch_Write_Dgram_Impl * -ACE_WIN32_Proactor::create_asynch_write_dgram (void) +ACE_WIN32_Proactor::create_asynch_write_dgram () { ACE_Asynch_Write_Dgram_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -182,7 +182,7 @@ ACE_WIN32_Proactor::create_asynch_write_dgram (void) } ACE_Asynch_Read_File_Impl * -ACE_WIN32_Proactor::create_asynch_read_file (void) +ACE_WIN32_Proactor::create_asynch_read_file () { ACE_Asynch_Read_File_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -192,7 +192,7 @@ ACE_WIN32_Proactor::create_asynch_read_file (void) } ACE_Asynch_Write_File_Impl * -ACE_WIN32_Proactor::create_asynch_write_file (void) +ACE_WIN32_Proactor::create_asynch_write_file () { ACE_Asynch_Write_File_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -202,7 +202,7 @@ ACE_WIN32_Proactor::create_asynch_write_file (void) } ACE_Asynch_Accept_Impl * -ACE_WIN32_Proactor::create_asynch_accept (void) +ACE_WIN32_Proactor::create_asynch_accept () { ACE_Asynch_Accept_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -212,7 +212,7 @@ ACE_WIN32_Proactor::create_asynch_accept (void) } ACE_Asynch_Connect_Impl * -ACE_WIN32_Proactor::create_asynch_connect (void) +ACE_WIN32_Proactor::create_asynch_connect () { ACE_Asynch_Connect_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -222,7 +222,7 @@ ACE_WIN32_Proactor::create_asynch_connect (void) } ACE_Asynch_Transmit_File_Impl * -ACE_WIN32_Proactor::create_asynch_transmit_file (void) +ACE_WIN32_Proactor::create_asynch_transmit_file () { ACE_Asynch_Transmit_File_Impl *implementation = 0; ACE_NEW_RETURN (implementation, @@ -549,7 +549,7 @@ ACE_WIN32_Proactor::handle_events (ACE_Time_Value &wait_time) } int -ACE_WIN32_Proactor::handle_events (void) +ACE_WIN32_Proactor::handle_events () { return this->handle_events (ACE_INFINITE); } @@ -721,7 +721,7 @@ ACE_WIN32_Proactor::post_wakeup_completions (int how_many) } int -ACE_WIN32_Proactor::wake_up_dispatch_threads (void) +ACE_WIN32_Proactor::wake_up_dispatch_threads () { return 0; } @@ -781,7 +781,7 @@ ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion { } -ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion (void) +ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion () { } diff --git a/ACE/ace/XML_Svc_Conf.cpp b/ACE/ace/XML_Svc_Conf.cpp index a3b08247330..3c044406957 100644 --- a/ACE/ace/XML_Svc_Conf.cpp +++ b/ACE/ace/XML_Svc_Conf.cpp @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf (void) +ACE_XML_Svc_Conf::~ACE_XML_Svc_Conf () { } diff --git a/ACE/ace/XML_Svc_Conf.h b/ACE/ace/XML_Svc_Conf.h index a45fa662aae..b27044c5a62 100644 --- a/ACE/ace/XML_Svc_Conf.h +++ b/ACE/ace/XML_Svc_Conf.h @@ -37,13 +37,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * ACE applications can link to dynamically using the ACE_DLL class. * This DLL should include an operation as follow: * - * extern "C" ACE_XML_Svc_Conf_Parser * _ACEXML_create_XML_Svc_Conf_Object (void); + * extern "C" ACE_XML_Svc_Conf_Parser * _ACEXML_create_XML_Svc_Conf_Object (); */ class ACE_Export ACE_XML_Svc_Conf { public: - typedef ACE_XML_Svc_Conf *(*Factory)(void); + typedef ACE_XML_Svc_Conf *(*Factory)(); virtual ~ACE_XML_Svc_Conf (void) = 0; diff --git a/ACE/ace/XML_Utils/XML_Schema_Resolver.h b/ACE/ace/XML_Utils/XML_Schema_Resolver.h index d073425c98a..8587494f5f9 100644 --- a/ACE/ace/XML_Utils/XML_Schema_Resolver.h +++ b/ACE/ace/XML_Utils/XML_Schema_Resolver.h @@ -48,7 +48,7 @@ namespace XML virtual InputSource * resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId); - Resolver &get_resolver (void); + Resolver &get_resolver (); private: XML_Schema_Resolver (XML_Schema_Resolver<Resolver> &); diff --git a/ACE/ace/XML_Utils/XercesString.cpp b/ACE/ace/XML_Utils/XercesString.cpp index 0aedaab1273..002368b091d 100644 --- a/ACE/ace/XML_Utils/XercesString.cpp +++ b/ACE/ace/XML_Utils/XercesString.cpp @@ -126,7 +126,7 @@ namespace XML return _wstr[i]; } - XMLCh * XStr::release (void) + XMLCh * XStr::release () { XMLCh* tmp = _wstr; this->_wstr = 0; @@ -134,7 +134,7 @@ namespace XML } void - XStr::reset (void) + XStr::reset () { if (_wstr) XMLString::release(&_wstr); diff --git a/ACE/ace/XML_Utils/XercesString.h b/ACE/ace/XML_Utils/XercesString.h index 8e7ebd84ea8..48bed5715c0 100644 --- a/ACE/ace/XML_Utils/XercesString.h +++ b/ACE/ace/XML_Utils/XercesString.h @@ -57,10 +57,10 @@ namespace XML operator const XMLCh* () const { return _wstr; }; - XMLCh * release (void); + XMLCh * release (); /// Release the held string and free its memory. - void reset (void); + void reset (); private: XMLCh* _wstr; // Internal representation }; diff --git a/ACE/ace/XTI_ATM_Mcast.cpp b/ACE/ace/XTI_ATM_Mcast.cpp index 4e1b848a102..329b0a30f6f 100644 --- a/ACE/ace/XTI_ATM_Mcast.cpp +++ b/ACE/ace/XTI_ATM_Mcast.cpp @@ -18,7 +18,7 @@ ACE_XTI_ATM_Mcast::dump () const #endif /* ACE_HAS_DUMP */ } -ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (void) +ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast () { ACE_TRACE ("ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast"); } diff --git a/ACE/ace/XTI_ATM_Mcast.h b/ACE/ace/XTI_ATM_Mcast.h index b62ba08e67d..91cfa938d88 100644 --- a/ACE/ace/XTI_ATM_Mcast.h +++ b/ACE/ace/XTI_ATM_Mcast.h @@ -36,7 +36,7 @@ class ACE_Export ACE_XTI_ATM_Mcast : public ACE_TLI_Connector { public: /// Default constructor. - ACE_XTI_ATM_Mcast (void); + ACE_XTI_ATM_Mcast (); /** * Actively connect and produce a @a new_stream if things go well. diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp index c1d690e0fe6..3be96043882 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor/XtReactor.cpp @@ -34,7 +34,7 @@ ACE_XtReactor::ACE_XtReactor (XtAppContext context, #endif /* ACE_MT_SAFE */ } -ACE_XtReactor::~ACE_XtReactor (void) +ACE_XtReactor::~ACE_XtReactor () { // Delete the remaining items in the linked list. @@ -366,7 +366,7 @@ ACE_XtReactor::compute_Xt_condition(ACE_HANDLE handle) // first timeout in the Reactor's Timer_Queue. void -ACE_XtReactor::reset_timeout (void) +ACE_XtReactor::reset_timeout () { // Make sure we have a valid context ACE_ASSERT (this->context_ != 0); diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor/XtReactor.h index af8ea2f9156..8e5d4bc3e36 100644 --- a/ACE/ace/XtReactor/XtReactor.h +++ b/ACE/ace/XtReactor/XtReactor.h @@ -59,7 +59,7 @@ public: size_t size = DEFAULT_SIZE, bool restart = false, ACE_Sig_Handler * = 0); - virtual ~ACE_XtReactor (void); + virtual ~ACE_XtReactor (); XtAppContext context () const; void context (XtAppContext); @@ -126,7 +126,7 @@ protected: private: /// This method ensures there's an Xt timeout for the first timeout /// in the Reactor's Timer_Queue. - void reset_timeout (void); + void reset_timeout (); // = Integrate with the X callback function mechanism. static void TimerCallbackProc (XtPointer closure, XtIntervalId *id); diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h index e98ef206875..6ab5f76fbe2 100644 --- a/ACE/ace/os_include/os_signal.h +++ b/ACE/ace/os_include/os_signal.h @@ -156,7 +156,7 @@ extern "C" #elif defined (ACE_HAS_SVR4_SIGNAL_T) // SVR4 Signals are inconsistent (e.g., see struct sigaction).. using ACE_SignalHandler = void (*)(int); - using ACE_SignalHandlerV = void (*)(void); + using ACE_SignalHandlerV = void (*)(); #elif defined (ACE_WIN32) using ACE_SignalHandler = void (__cdecl *)(int); using ACE_SignalHandlerV = void (__cdecl *)(int); |