Merge branch 'master' into format-security

19 files changed, 93 insertions, 93 deletions

diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp
index 1b59432e963..9c5ebf23b8d 100644
--- a/ACE/examples/ASX/CCM_App/CCM_App.cpp
+++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp
@@ -20,8 +20,8 @@ public:
 
   virtual int init (int, ACE_TCHAR *[]);
   virtual int fini ();
-  virtual int suspend (void);
-  virtual int resume (void);
+  virtual int suspend ();
+  virtual int resume ();
 };
 
 int
@@ -43,7 +43,7 @@ Test_Task::close (u_long)
 }
 
 int
-Test_Task::suspend (void)
+Test_Task::suspend ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("suspending in %s\n"),
@@ -52,7 +52,7 @@ Test_Task::suspend (void)
 }
 
 int
-Test_Task::resume (void)
+Test_Task::resume ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("resuming in %s\n"),
@@ -71,7 +71,7 @@ Test_Task::init (int, ACE_TCHAR *[])
 }
 
 int
-Test_Task::fini (void)
+Test_Task::fini ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("finalizing %s (%@)\n"),
@@ -87,33 +87,33 @@ ACE_SVC_FACTORY_DEFINE (Test_Task)
 
 // Dynamically linked functions used to control configuration.
 
-extern "C" ACE_Svc_Export MT_Stream *make_stream (void);
-extern "C" ACE_Svc_Export MT_Module *make_da (void);
-extern "C" ACE_Svc_Export MT_Module *make_ea (void);
-extern "C" ACE_Svc_Export MT_Module *make_mr (void);
+extern "C" ACE_Svc_Export MT_Stream *make_stream ();
+extern "C" ACE_Svc_Export MT_Module *make_da ();
+extern "C" ACE_Svc_Export MT_Module *make_ea ();
+extern "C" ACE_Svc_Export MT_Module *make_mr ();
 
 MT_Stream *
-make_stream (void)
+make_stream ()
 {
   return new MT_Stream;
 }
 
 MT_Module *
-make_da (void)
+make_da ()
 {
   return new MT_Module (ACE_TEXT ("Device_Adapter"),
                         new Test_Task, new Test_Task);
 }
 
 MT_Module *
-make_ea (void)
+make_ea ()
 {
   return new MT_Module (ACE_TEXT ("Event_Analyzer"),
                         new Test_Task, new Test_Task);
 }
 
 MT_Module *
-make_mr (void)
+make_mr ()
 {
   return new MT_Module (ACE_TEXT ("Multicast_Router"),
                         new Test_Task, new Test_Task);
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
index 287fefcf1fc..defe6108f7e 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
@@ -58,7 +58,7 @@ Consumer_Router::close (u_long)
 // Handle incoming messages in a separate thread.
 
 int
-Consumer_Router::svc (void)
+Consumer_Router::svc ()
 {
   assert (this->is_writer ());
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
index d97f61f976c..862b7a78f20 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
@@ -59,7 +59,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[])
 }
 
 int
-Event_Analyzer::fini (void)
+Event_Analyzer::fini ()
 {
   // No-op for now.
   return 0;
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
index d8ee1bddc3d..0aaff77865f 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -13,7 +13,7 @@
 Options *Options::instance_ = 0;
 
 Options *
-Options::instance (void)
+Options::instance ()
 {
   if (Options::instance_ == 0)
     Options::instance_ = new Options;
@@ -21,7 +21,7 @@ Options::instance (void)
   return Options::instance_;
 }
 
-Options::Options (void)
+Options::Options ()
   : thr_count_ (4),
     t_flags_ (0),
     high_water_mark_ (8 * 1024),
@@ -36,11 +36,11 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
-void Options::print_results (void)
+void Options::print_results ()
 {
 #if !defined (ACE_WIN32)
   ACE_Profile_Timer::ACE_Elapsed_Time et;
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.h b/ACE/examples/ASX/Event_Server/Event_Server/Options.h
index 5d125cb16ee..d9408f42aa8 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.h
@@ -15,65 +15,65 @@ class Options
   // = TITLE
   //     Option Singleton for Event Server.
 public:
-  static Options *instance (void);
+  static Options *instance ();
   // Singleton access point.
 
   void parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments and set the options.
 
   // = Timer management.
-  void stop_timer (void);
-  void start_timer (void);
+  void stop_timer ();
+  void start_timer ();
 
   // = Set/get the number of threads.
   void thr_count (size_t count);
-  size_t thr_count (void);
+  size_t thr_count ();
 
   // = Set/get the size of the queue.
   void initial_queue_length (size_t length);
-  size_t initial_queue_length (void);
+  size_t initial_queue_length ();
 
   // = Set/get the high water mark.
   void high_water_mark (size_t size);
-  size_t high_water_mark (void);
+  size_t high_water_mark ();
 
   // = Set/get the high water mark.
   void low_water_mark (size_t size);
-  size_t low_water_mark (void);
+  size_t low_water_mark ();
 
   // = Set/get the size of a message.
   void message_size (size_t size);
-  size_t message_size (void);
+  size_t message_size ();
 
   // = Set/get the number of iterations.
   void iterations (size_t n);
-  size_t iterations (void);
+  size_t iterations ();
 
   // Set/get threading flags.
   void t_flags (long flag);
-  long t_flags (void);
+  long t_flags ();
 
   // Set/get supplier port number.
   void supplier_port (u_short port);
-  u_short supplier_port (void);
+  u_short supplier_port ();
 
   // Set/get consumer port number.
   void consumer_port (u_short port);
-  u_short consumer_port (void);
+  u_short consumer_port ();
 
   // Enabled if we're in debugging mode.
-  int debug (void);
+  int debug ();
 
   // Enabled if we're in verbose mode.
-  int verbose (void);
+  int verbose ();
 
   // Print the results to the STDERR.
-  void print_results (void);
+  void print_results ();
 
 private:
   // = Ensure we're a Singleton.
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
 
   ACE_Profile_Timer itimer_;
   // Time the process.
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index c9b98e55bac..61027fd6943 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -67,13 +67,13 @@ Peer_Router_Context::bind_peer (ROUTING_KEY key,
 }
 
 void
-Peer_Router_Context::duplicate (void)
+Peer_Router_Context::duplicate ()
 {
   this->reference_count_++;
 }
 
 void
-Peer_Router_Context::release (void)
+Peer_Router_Context::release ()
 {
   ACE_ASSERT (this->reference_count_ > 0);
   this->reference_count_--;
@@ -116,7 +116,7 @@ Peer_Router_Context::Peer_Router_Context (u_short port)
     }
 }
 
-Peer_Router_Context::~Peer_Router_Context (void)
+Peer_Router_Context::~Peer_Router_Context ()
 {
   // Free up the handle and close down the listening socket.
   ACE_DEBUG ((LM_DEBUG,
@@ -151,7 +151,7 @@ Peer_Router_Context::~Peer_Router_Context (void)
 }
 
 Peer_Router *
-Peer_Router_Context::peer_router (void)
+Peer_Router_Context::peer_router ()
 {
   return this->peer_router_;
 }
@@ -376,7 +376,7 @@ Peer_Router::control (ACE_Message_Block *mb)
 // Supplier_Router level in order to get the right level of control
 // for input and output.
 
-Peer_Handler::svc (void)
+Peer_Handler::svc ()
 {
   ACE_Message_Block *db, *hb;
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h
index 1e28194917a..f6a18497525 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h
@@ -82,13 +82,13 @@ public:
   // <ACE_Acceptor>.
 
   // = Set/Get Router Task.
-  Peer_Router *peer_router (void);
+  Peer_Router *peer_router ();
   void peer_router (Peer_Router *);
 
-  void release (void);
+  void release ();
   // Decrement the reference count and delete <this> when count == 0;
 
-  void duplicate (void);
+  void duplicate ();
   // Increment the reference count.
 
 private:
@@ -109,7 +109,7 @@ private:
   int reference_count_;
   // Keep track of when we can delete ourselves.
 
-  ~Peer_Router_Context (void);
+  ~Peer_Router_Context ();
   // Private to ensure dynamic allocation.
 
   friend class Friend_Of_Peer_Router_Context;
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
index edea2f8968d..2f9184f12b2 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
@@ -9,7 +9,7 @@
 // Handle outgoing messages in a separate thread.
 
 int
-Supplier_Router::svc (void)
+Supplier_Router::svc ()
 {
   assert (this->is_writer ());
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp
index 52c090e6800..0480f360987 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp
@@ -34,10 +34,10 @@ class Event_Server : public ACE_Sig_Adapter
   //     shutdown the <ACE_Reactor> cleanly when a SIGINT is
   //     generated.
 public:
-  Event_Server (void);
+  Event_Server ();
   // Constructor.
 
-  int svc (void);
+  int svc ();
   // Run the event-loop for the event server.
 
 private:
@@ -45,13 +45,13 @@ private:
   // Hook method called back when a user types something into the
   // STDIN in order to shut down the program.
 
-  int configure_stream (void);
+  int configure_stream ();
   // Setup the plumbing in the stream.
 
-  int set_watermarks (void);
+  int set_watermarks ();
   // Set the high and low queue watermarks.
 
-  int run_event_loop (void);
+  int run_event_loop ();
   // Run the event-loop for the <Event_Server>.
 
   MT_Stream event_server_;
@@ -59,7 +59,7 @@ private:
   // <Modules>.
 };
 
-Event_Server::Event_Server (void)
+Event_Server::Event_Server ()
   : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
   // Shutdown the <ACE_Reactor>'s event loop when a SIGINT is
   // received.
@@ -106,7 +106,7 @@ Event_Server::handle_input (ACE_HANDLE)
 }
 
 int
-Event_Server::configure_stream (void)
+Event_Server::configure_stream ()
 {
   Peer_Router_Context *src;
   // Create the <Supplier_Router>'s routing context.  This contains a
@@ -172,7 +172,7 @@ Event_Server::configure_stream (void)
 }
 
 int
-Event_Server::set_watermarks (void)
+Event_Server::set_watermarks ()
 {
   // Set the high and low water marks appropriately.  The water marks
   // control how much data can be buffered before the queues are
@@ -195,7 +195,7 @@ Event_Server::set_watermarks (void)
 }
 
 int
-Event_Server::run_event_loop (void)
+Event_Server::run_event_loop ()
 {
   // Begin the timer.
   Options::instance ()->start_timer ();
@@ -215,7 +215,7 @@ Event_Server::run_event_loop (void)
 }
 
 int
-Event_Server::svc (void)
+Event_Server::svc ()
 {
   if (this->configure_stream () == -1)
     return -1;
diff --git a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 2e9f25bf598..a4c4173f562 100644
--- a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -74,7 +74,7 @@ Event_Transceiver::handle_signal (int, siginfo_t *, ucontext_t *)
   return 0;
 }
 
-Event_Transceiver::Event_Transceiver (void)
+Event_Transceiver::Event_Transceiver ()
 {
 }
 
@@ -159,7 +159,7 @@ Event_Transceiver::handle_input (ACE_HANDLE handle)
 }
 
 int
-Event_Transceiver::transmitter (void)
+Event_Transceiver::transmitter ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) entering %s transmitter\n"),
@@ -179,7 +179,7 @@ Event_Transceiver::transmitter (void)
 }
 
 int
-Event_Transceiver::receiver (void)
+Event_Transceiver::receiver ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) entering %s receiver\n"),
diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
index e8f60673ba1..a6ef0d47449 100644
--- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -119,7 +119,7 @@ Common_Task::close (u_long exit_status)
 // know when to exit.
 
 int
-Producer::svc (void)
+Producer::svc ()
 {
   // Keep reading stdin, until we reach EOF.
 
@@ -180,7 +180,7 @@ Consumer::put (ACE_Message_Block *mb, ACE_Time_Value *tv)
 // reading and exit.
 
 int
-Consumer::svc (void)
+Consumer::svc ()
 {
   int result = 0;
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index 9f756808704..14f92f99282 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -65,7 +65,7 @@ Consumer_Router::close (u_long)
 // Handle incoming messages in a separate thread..
 
 int
-Consumer_Router::svc (void)
+Consumer_Router::svc ()
 {
   ACE_Message_Block *mb = 0;
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
index 511ef3e899b..e6364af591b 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
@@ -51,7 +51,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[])
 }
 
 int
-Event_Analyzer::fini (void)
+Event_Analyzer::fini ()
 {
   return 0;
 }
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
index 80084147d6e..a12e7ffb415 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
@@ -11,7 +11,7 @@
 
 #if defined (ACE_HAS_THREADS)
 
-Options::Options (void)
+Options::Options ()
     : thr_count_ (4),
       t_flags_ (THR_DETACHED),
       high_water_mark_ (8 * 1024),
@@ -28,11 +28,11 @@ Options::Options (void)
 {
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
 }
 
-void Options::print_results (void)
+void Options::print_results ()
 {
   ACE_Profile_Timer::ACE_Elapsed_Time et;
   this->itimer_.elapsed_time (et);
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.h b/ACE/examples/ASX/UPIPE_Event_Server/Options.h
index a835bbf93a9..ac228624f05 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Options.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.h
@@ -17,50 +17,50 @@
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
   void parse_args (int argc, ACE_TCHAR *argv[]);
 
-  void   stop_timer (void);
-  void   start_timer (void);
+  void   stop_timer ();
+  void   start_timer ();
 
   void   thr_count (size_t count);
-  size_t thr_count (void);
+  size_t thr_count ();
 
   void   initial_queue_length (size_t length);
-  size_t initial_queue_length (void);
+  size_t initial_queue_length ();
 
   void   high_water_mark (size_t size);
-  size_t high_water_mark (void);
+  size_t high_water_mark ();
 
   void   low_water_mark (size_t size);
-  size_t low_water_mark (void);
+  size_t low_water_mark ();
 
   void   message_size (size_t size);
-  size_t message_size (void);
+  size_t message_size ();
 
   void   iterations (size_t n);
-  size_t iterations (void);
+  size_t iterations ();
 
   void   t_flags (long flag);
-  long   t_flags (void);
+  long   t_flags ();
 
   void   supplier_port (const ACE_TCHAR *port);
-  const ACE_TCHAR  *supplier_port (void);
+  const ACE_TCHAR  *supplier_port ();
 
   void   consumer_port (const ACE_TCHAR *port);
-  const ACE_TCHAR  *consumer_port (void);
+  const ACE_TCHAR  *consumer_port ();
 
   void   supplier_file (const ACE_TCHAR *file);
-  const ACE_TCHAR  *supplier_file (void);
+  const ACE_TCHAR  *supplier_file ();
 
   void   consumer_file (const ACE_TCHAR *file);
-  const ACE_TCHAR  *consumer_file (void);
+  const ACE_TCHAR  *consumer_file ();
 
-  int    debug (void);
-  int    verbose (void);
+  int    debug ();
+  int    verbose ();
 
-  void   print_results (void);
+  void   print_results ();
 
 private:
   ACE_Profile_Timer itimer_;            // Time the process.
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
index 7e8797e5102..4014c96c53d 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
@@ -50,7 +50,7 @@ Acceptor_Factory<PH, PK>::Acceptor_Factory (Peer_Router<PH, PK> *pr)
 }
 
 template <class PH, class PK> Peer_Router<PH, PK> *
-Acceptor_Factory<PH, PK>::router (void)
+Acceptor_Factory<PH, PK>::router ()
 {
   return this->pr_;
 }
@@ -62,7 +62,7 @@ Peer_Handler<ROUTER, KEY>::Peer_Handler (ACE_Thread_Manager *tm)
 }
 
 template <class ROUTER, class KEY> int
-Peer_Handler<ROUTER, KEY>::svc (void)
+Peer_Handler<ROUTER, KEY>::svc ()
 {
   // Just a try !!  we're just reading from our ACE_Message_Queue.
   ACE_Message_Block *db, *hb;
@@ -203,12 +203,12 @@ Peer_Router<PH, PK>::send_peers (ACE_Message_Block *mb)
 }
 
 template <class PH, class PK>
-Peer_Router<PH, PK>::~Peer_Router (void)
+Peer_Router<PH, PK>::~Peer_Router ()
 {
 }
 
 template <class PH, class PK> int
-Peer_Router<PH, PK>::fini (void)
+Peer_Router<PH, PK>::fini ()
 {
   delete this->acceptor_;
   return 0;
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
index adac931146a..17ae8c06a62 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
@@ -29,7 +29,7 @@ class Acceptor_Factory : public ACE_Acceptor<PEER_HANDLER, ACE_UPIPE_ACCEPTOR>
 {
 public:
   Acceptor_Factory (Peer_Router<PEER_HANDLER, KEY> *pr);
-  Peer_Router<PEER_HANDLER, KEY> *router (void);
+  Peer_Router<PEER_HANDLER, KEY> *router ();
 
   int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the acceptor when it's linked dynamically.
@@ -74,7 +74,7 @@ class Peer_Router : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   Peer_Router (ACE_Thread_Manager * = 0);
-  ~Peer_Router (void);
+  ~Peer_Router ();
 
   typedef Peer_Handler<Peer_Router<PEER_HANDLER, PEER_KEY>, PEER_KEY> HANDLER;
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index 17cf3dd51f2..24b880893ae 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -32,7 +32,7 @@ Supplier_Router::Supplier_Router (ACE_Thread_Manager *tm)
 // Handle incoming messages in a separate thread..
 
 int
-Supplier_Router::svc (void)
+Supplier_Router::svc ()
 {
   ACE_ASSERT (this->is_writer ());
 
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
index 06319b23c7e..4f3d42bbe87 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -27,11 +27,11 @@ typedef ACE_Module<ACE_MT_SYNCH> MT_Module;
 class Quit_Handler : public ACE_Sig_Adapter
 {
 public:
-  Quit_Handler (void);
+  Quit_Handler ();
   virtual int handle_input (ACE_HANDLE fd);
 };
 
-Quit_Handler::Quit_Handler (void)
+Quit_Handler::Quit_Handler ()
   : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {
   // Register to trap input from the user.