Remove obsolescent (void) in functions with no parameters

23 files changed, 66 insertions, 66 deletions

diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
index b39b6976fab..b7c6ca1caab 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -95,7 +95,7 @@ ACE::HTBP::Channel::Channel (ACE_HANDLE h)
 }
 
 /// Destructor.
-ACE::HTBP::Channel::~Channel (void)
+ACE::HTBP::Channel::~Channel ()
 {
   delete this->notifier_;
   delete this->filter_;
@@ -108,7 +108,7 @@ ACE::HTBP::Channel::dump () const
 }
 
 unsigned long
-ACE::HTBP::Channel::request_count (void)
+ACE::HTBP::Channel::request_count ()
 {
   return this->request_count_++;
 }
@@ -135,7 +135,7 @@ ACE::HTBP::Channel::register_notifier (ACE_Reactor *r)
 }
 
 ACE::HTBP::Notifier *
-ACE::HTBP::Channel::notifier (void)
+ACE::HTBP::Channel::notifier ()
 {
   return this->notifier_;
 }
@@ -158,7 +158,7 @@ ACE::HTBP::Channel::data_consumed (size_t n)
 }
 
 int
-ACE::HTBP::Channel::load_buffer (void)
+ACE::HTBP::Channel::load_buffer ()
 {
   this->leftovers_.crunch();
   if (this->state() == Detached ||
@@ -203,7 +203,7 @@ ACE::HTBP::Channel::load_buffer (void)
 }
 
 int
-ACE::HTBP::Channel::flush_buffer (void)
+ACE::HTBP::Channel::flush_buffer ()
 {
   if (this->session_)
     return this->session_->flush_outbound_queue();
@@ -211,13 +211,13 @@ ACE::HTBP::Channel::flush_buffer (void)
 }
 
 int
-ACE::HTBP::Channel::send_ack (void)
+ACE::HTBP::Channel::send_ack ()
 {
   return this->filter_->send_ack(this);
 }
 
 int
-ACE::HTBP::Channel::recv_ack (void)
+ACE::HTBP::Channel::recv_ack ()
 {
   if (load_buffer() == -1)
     return -1;
@@ -236,7 +236,7 @@ ACE::HTBP::Channel::state (ACE::HTBP::Channel::State s)
 }
 
 int
-ACE::HTBP::Channel::consume_error (void)
+ACE::HTBP::Channel::consume_error ()
 {
   if (error_buffer_ == 0)
     {
@@ -293,7 +293,7 @@ ACE::HTBP::Channel::consume_error (void)
 /// one direction on one stream.
 
 int
-ACE::HTBP::Channel::pre_recv(void)
+ACE::HTBP::Channel::pre_recv()
 {
   if (ACE::debug())
     ACE_DEBUG ((LM_DEBUG,
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h
index b1b59f0b295..790f104c039 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h
@@ -86,7 +86,7 @@ namespace ACE
       Channel (ACE_HANDLE h);
 
       /// Destructor.
-      ~Channel (void);
+      ~Channel ();
 
       enum State {
         Init,
@@ -158,17 +158,17 @@ namespace ACE
 
       // = Selectively close endpoints.
       /// Close down the reader.
-      int close_reader (void);
+      int close_reader ();
 
       /// Close down the writer.
-      int close_writer (void);
+      int close_writer ();
 
       /**
        * Close down the socket (we need this to make things work correctly
        * on Win32, which requires use to do a <close_writer> before doing
        * the close to avoid losing data).
        */
-      int close (void);
+      int close ();
 
       // = Meta-type info
       typedef ACE_INET_Addr PEER_ADDR;
@@ -183,14 +183,14 @@ namespace ACE
       Session *session () const;
       void session (Session *);
 
-      Notifier *notifier (void);
+      Notifier *notifier ();
 
       void register_notifier (ACE_Reactor *r);
 
       ACE_HANDLE get_handle () const;
 
       const ACE_SOCK_Stream &ace_stream () const;
-      ACE_SOCK_Stream &ace_stream (void);
+      ACE_SOCK_Stream &ace_stream ();
 
       ///@notes Added the following methods to continue with
       /// current compilation of HTIOP. Might not be needed in
@@ -214,22 +214,22 @@ namespace ACE
       //@}
 
       // buffer related methods.
-      ACE_Message_Block &leftovers (void);
+      ACE_Message_Block &leftovers ();
       size_t data_len () const;
       void data_len (size_t n);
       size_t data_consumed () const;
       void data_consumed (size_t n);
-      int load_buffer (void);
-      int flush_buffer (void);
-      int recv_ack (void);
-      int send_ack (void);
+      int load_buffer ();
+      int flush_buffer ();
+      int recv_ack ();
+      int send_ack ();
       unsigned long request_count();
       Filter *filter () const;
       void filter (Filter *);
       State state () const;
       void state (Channel::State s);
-      int pre_recv(void);
-      int consume_error (void);
+      int pre_recv();
+      int consume_error ();
 
     private:
       /// The filter_ is a pluggable component used to manage the
diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.h b/ACE/protocols/ace/HTBP/HTBP_Environment.h
index 8e8d88691bf..37e0ccd9910 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Environment.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Environment.h
@@ -39,7 +39,7 @@ namespace ACE
       ~Environment ();
 
       /// removes all htbp related values from the configuration
-      void clear (void);
+      void clear ();
 
       /// Accessors to HTID URL
       /// Returns 0 on success
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
index b63151e30f1..c4add8cb672 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp
@@ -9,7 +9,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE::HTBP::Filter::Filter (void)
+ACE::HTBP::Filter::Filter ()
   :http_code_ (0)
 {
 }
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Filter.h
index 2e2b458ded6..537514c5f38 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.h
@@ -47,7 +47,7 @@ namespace ACE
     class HTBP_Export Filter
     {
     public:
-      Filter (void);
+      Filter ();
 
       virtual ~Filter (void) = default;
 
@@ -75,10 +75,10 @@ namespace ACE
       virtual ssize_t recv_data_trailer(Channel *ch);
 
       /// reset the http_code_ in anticipation of a new message.
-      void reset_http_code (void);
+      void reset_http_code ();
 
       /// get the value of the most recent http result code
-      int http_code (void);
+      int http_code ();
 
     protected:
       char *header_complete (Channel *ch);
diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
index 08915e26f5a..a6da5c0fbb5 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
@@ -44,7 +44,7 @@ namespace ACE
     {
     public:
       /// Destructor.
-      virtual ~Inside_Squid_Filter (void);
+      virtual ~Inside_Squid_Filter ();
 
       /// Inside and outside Send filters need to supply a data header
       /// that sets the stage before sending the data body, and then
diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
index eda0a2b6ca2..8aaff832e57 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp
@@ -72,7 +72,7 @@ ACE::HTBP::Notifier::handle_output (ACE_HANDLE )
 }
 
 void
-ACE::HTBP::Notifier::unregister (void)
+ACE::HTBP::Notifier::unregister ()
 {
   if (this->reactor())
     this->reactor()->remove_handler(this,
diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.h b/ACE/protocols/ace/HTBP/HTBP_Notifier.h
index ef17804fdcb..1670b23a61f 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Notifier.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.h
@@ -36,7 +36,7 @@ namespace ACE
       int handle_input(ACE_HANDLE );
       int handle_output(ACE_HANDLE );
 
-      void unregister (void);
+      void unregister ();
 
       ACE_HANDLE get_handle () const;
 
diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
index 95dfe9d8f38..15a557bdd24 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
@@ -45,7 +45,7 @@ namespace ACE
     {
     public:
       /// Destructor.
-      virtual ~Outside_Squid_Filter (void);
+      virtual ~Outside_Squid_Filter ();
 
       /// Outside and outside Send filters need to supply a data header that
       /// sets the stage before sending the data body, and then (maybe) send a
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
index 7f13e9ef770..8a20862d479 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
@@ -56,7 +56,7 @@ ACE::HTBP::Session::find_session (const ACE::HTBP::Session_Id_t &sid, ACE::HTBP:
 }
 
 //----------------------------------------------------------------------------
-ACE::HTBP::Session::Session (void)
+ACE::HTBP::Session::Session ()
   : proxy_addr_ (0),
     destroy_proxy_addr_ (0),
     inbound_ (0),
@@ -133,7 +133,7 @@ ACE::HTBP::Session::operator= (const ACE::HTBP::Session &)
   return *this;
 }
 
-ACE::HTBP::Session::~Session (void)
+ACE::HTBP::Session::~Session ()
 {
   if (destroy_proxy_addr_)
     delete proxy_addr_;
@@ -143,7 +143,7 @@ ACE::HTBP::Session::~Session (void)
 }
 
 int
-ACE::HTBP::Session::close (void)
+ACE::HTBP::Session::close ()
 {
   if (this->inbound_)
     this->inbound_->close();
@@ -198,7 +198,7 @@ ACE::HTBP::Session::reconnect_i (ACE::HTBP::Channel *s) const
 }
 
 ACE_Event_Handler *
-ACE::HTBP::Session::handler (void)
+ACE::HTBP::Session::handler ()
 {
   return this->handler_;
 }
@@ -238,7 +238,7 @@ ACE::HTBP::Session::enqueue (ACE_Message_Block *msg)
 }
 
 int
-ACE::HTBP::Session::flush_outbound_queue (void)
+ACE::HTBP::Session::flush_outbound_queue ()
 {
   int result = 0;
   if (this->outbound_queue_.message_count() > 0)
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.h b/ACE/protocols/ace/HTBP/HTBP_Session.h
index 0632dd74483..37e9bb78d24 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.h
@@ -72,7 +72,7 @@ namespace ACE
     public:
       // Initialization and termination methods.
       /// Constructor.
-      Session (void);
+      Session ();
 
       /// Constructor (sets the underlying session id with <sid>).
       Session (const Addr& peer,
@@ -88,7 +88,7 @@ namespace ACE
       Session& operator= (const Session &other);
 
       /// Destructor.
-      ~Session (void);
+      ~Session ();
 
       /// The following methods are specific to the Session
       static ACE_UINT32 next_session_id ();
@@ -102,7 +102,7 @@ namespace ACE
       void stream (Stream *);
 
       int enqueue (ACE_Message_Block *msg);
-      int flush_outbound_queue (void);
+      int flush_outbound_queue ();
 
       int close_inbound () const;
       int close_outbound () const;
@@ -137,9 +137,9 @@ namespace ACE
       void local_addr (const Addr &);
 
       /// invoke close on both streams, then remove self from session map
-      int close (void);
+      int close ();
 
-      ACE_Event_Handler *handler (void);
+      ACE_Event_Handler *handler ();
       void handler (ACE_Event_Handler *);
       void reactor (ACE_Reactor *);
       void detach (Channel *);
diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
index 0479a0040e0..75da921bbda 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp
@@ -28,7 +28,7 @@ ACE::HTBP::Stream::Stream (ACE::HTBP::Session *s)
 }
 
 /// Destructor.
-ACE::HTBP::Stream::~Stream (void)
+ACE::HTBP::Stream::~Stream ()
 {
 }
 
@@ -284,19 +284,19 @@ ACE::HTBP::Stream::sendv_n (const iovec [],
 }
 
 int
-ACE::HTBP::Stream::close_reader (void)
+ACE::HTBP::Stream::close_reader ()
 {
   return this->session_->close_inbound();
 }
 
 int
-ACE::HTBP::Stream::close_writer (void)
+ACE::HTBP::Stream::close_writer ()
 {
   return this->session_->close_outbound();
 }
 
 int
-ACE::HTBP::Stream::close (void)
+ACE::HTBP::Stream::close ()
 {
   return this->session_->close();
 }
diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.h b/ACE/protocols/ace/HTBP/HTBP_Stream.h
index 50630da7720..4ec5198baef 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.h
@@ -90,7 +90,7 @@ namespace ACE
       Stream (Session *s = 0);
 
       /// Destructor.
-      ~Stream (void);
+      ~Stream ();
 
       // = I/O functions.
 
@@ -211,17 +211,17 @@ namespace ACE
                        size_t *bytes_transferred = 0) const;
 
       // = 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 Addr PEER_ADDR;
diff --git a/ACE/protocols/ace/INet/HTTPS_Context.h b/ACE/protocols/ace/INet/HTTPS_Context.h
index 41e46cde316..f0e533c09c6 100644
--- a/ACE/protocols/ace/INet/HTTPS_Context.h
+++ b/ACE/protocols/ace/INet/HTTPS_Context.h
@@ -52,7 +52,7 @@ namespace ACE
 
               bool operator ! () const;
 
-              ACE_SSL_Context& ssl_context (void);
+              ACE_SSL_Context& ssl_context ();
 
               const ACE_SSL_Context& ssl_context () const;
 
diff --git a/ACE/protocols/ace/INet/INet_Log.cpp b/ACE/protocols/ace/INet/INet_Log.cpp
index e52a835986e..11cc0af024b 100644
--- a/ACE/protocols/ace/INet/INet_Log.cpp
+++ b/ACE/protocols/ace/INet/INet_Log.cpp
@@ -10,7 +10,7 @@ namespace ACE
   {
     unsigned int INet_Log::debug_level_ = INet_Log::Initializer ();
 
-    unsigned int INet_Log::Initializer(void)
+    unsigned int INet_Log::Initializer()
       {
         unsigned int debug_level = 0;
         bool trace = false;
diff --git a/ACE/protocols/ace/INet/INet_Log.h b/ACE/protocols/ace/INet/INet_Log.h
index 5ee5c160a33..ce5b18d5c22 100644
--- a/ACE/protocols/ace/INet/INet_Log.h
+++ b/ACE/protocols/ace/INet/INet_Log.h
@@ -25,7 +25,7 @@ namespace ACE
 
         static unsigned int debug_level_;
 
-        static unsigned int Initializer (void);
+        static unsigned int Initializer ();
     };
   }
 
diff --git a/ACE/protocols/ace/INet/SSL_CertificateCallback.h b/ACE/protocols/ace/INet/SSL_CertificateCallback.h
index 1dc8ba499d0..f6f49912f53 100644
--- a/ACE/protocols/ace/INet/SSL_CertificateCallback.h
+++ b/ACE/protocols/ace/INet/SSL_CertificateCallback.h
@@ -36,7 +36,7 @@ namespace ACE
 
               const ACE_SSL_Context& context () const;
 
-              SSL_X509Cert& certificate (void);
+              SSL_X509Cert& certificate ();
 
               int error_depth () const;
 
diff --git a/ACE/protocols/ace/INet/SSL_X509Cert.h b/ACE/protocols/ace/INet/SSL_X509Cert.h
index db032cea7b3..d030af4b9ce 100644
--- a/ACE/protocols/ace/INet/SSL_X509Cert.h
+++ b/ACE/protocols/ace/INet/SSL_X509Cert.h
@@ -37,7 +37,7 @@ namespace ACE
               SSL_X509Cert& operator= (::X509* ssl_cert);
               SSL_X509Cert& operator= (const SSL_X509Cert& ssl_cert);
 
-              ::X509* operator & (void);
+              ::X509* operator & ();
 
             private:
               ::X509* ssl_cert_;
diff --git a/ACE/protocols/ace/INet/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h
index 9e080a744da..e71cda5c94f 100644
--- a/ACE/protocols/ace/INet/StreamInterceptor.h
+++ b/ACE/protocols/ace/INet/StreamInterceptor.h
@@ -50,7 +50,7 @@ namespace ACE
               virtual void before_read (std::streamsize length_to_read);
               virtual void after_read (const char_type* buffer,
                                        int length_read);
-              virtual void on_eof (void);
+              virtual void on_eof ();
           };
 
         typedef StreamInterceptorBase<char> StreamInterceptor;
diff --git a/ACE/protocols/examples/INet/FTP_Simple_exec.cpp b/ACE/protocols/examples/INet/FTP_Simple_exec.cpp
index 9350edb99c0..b2db0f45abf 100644
--- a/ACE/protocols/examples/INet/FTP_Simple_exec.cpp
+++ b/ACE/protocols/examples/INet/FTP_Simple_exec.cpp
@@ -13,7 +13,7 @@ ACE_CString password;
 bool do_active = false;
 
 void
-usage (void)
+usage ()
 {
   std::cout << "usage: ftp_simple_wget [options] <url>\n";
   std::cout << "Executes an FTP download request and sends the result to STDOUT or file\n";
diff --git a/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp b/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp
index 0c4f2e24754..35abddb6b89 100644
--- a/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp
+++ b/ACE/protocols/examples/INet/HTTP_Simple_exec.cpp
@@ -25,7 +25,7 @@ ACE_CString ca_location;
 #endif
 
 void
-usage (void)
+usage ()
 {
   std::cout << "usage: http_simple_wget [options] <url>\n";
   std::cout << "Executes an HTTP GET request and sends the result to STDOUT or file\n";
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
index d2bc3bb661a..5f46b6f30bc 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
@@ -54,7 +54,7 @@ class Accept_Handler : public ACE_Event_Handler
 {
 public:
   Accept_Handler (ACE_SOCK_Acceptor& a);
-  virtual ~Accept_Handler (void);
+  virtual ~Accept_Handler ();
   virtual int handle_input (ACE_HANDLE );
 private:
   ACE_SOCK_Acceptor& acceptor_;
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
index 67e46f054e8..6f3c476fb71 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h
@@ -153,17 +153,17 @@ const size_t ACE_MAX_THREADS = 4;
 class ACE_Test_Output
 {
 public:
-  ACE_Test_Output (void);
-  ~ACE_Test_Output (void);
+  ACE_Test_Output ();
+  ~ACE_Test_Output ();
   int set_output (const ACE_TCHAR *filename, int append = 0);
-  OFSTREAM *output_file (void);
-  void close (void);
+  OFSTREAM *output_file ();
+  void close ();
 
 private:
   OFSTREAM *output_file_;
 };
 
-inline ACE_Test_Output::ACE_Test_Output (void)
+inline ACE_Test_Output::ACE_Test_Output ()
   : output_file_ (0)
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -171,7 +171,7 @@ inline ACE_Test_Output::ACE_Test_Output (void)
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
-inline ACE_Test_Output::~ACE_Test_Output (void)
+inline ACE_Test_Output::~ACE_Test_Output ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   ACE_LOG_MSG->msg_ostream (&cerr);
@@ -186,7 +186,7 @@ inline ACE_Test_Output::~ACE_Test_Output (void)
 }
 
 inline OFSTREAM *
-ACE_Test_Output::output_file (void)
+ACE_Test_Output::output_file ()
 {
   return this->output_file_;
 }
@@ -268,7 +268,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 }
 
 inline void
-ACE_Test_Output::close (void)
+ACE_Test_Output::close ()
 {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_->flush ();