4 files changed, 38 insertions, 39 deletions

diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 2a800d6cd5a..702214b989d 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -26,7 +26,7 @@ CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-CEC_Counting_Consumer::disconnect (void)
+CEC_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -79,7 +79,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&)
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (void)
+CEC_Counting_Consumer::disconnect_push_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
@@ -113,7 +113,7 @@ CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr con
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (void)
+CEC_Pull_Counting_Consumer::disconnect ()
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -131,7 +131,7 @@ CEC_Pull_Counting_Consumer::disconnect (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (void)
+CEC_Pull_Counting_Consumer::pull ()
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -180,7 +180,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer ()
 {
   this->disconnect_count++;
   this->supplier_proxy_ =
@@ -214,20 +214,20 @@ CEC_Counting_Consumer_Task::svc ()
 }
 
 void
-CEC_Counting_Consumer_Task::stop (void)
+CEC_Counting_Consumer_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-CEC_Counting_Consumer_Task::pull_count (void)
+CEC_Counting_Consumer_Task::pull_count ()
 {
   return this->pull_count_;
 }
 
 void
-CEC_Counting_Consumer_Task::run (void)
+CEC_Counting_Consumer_Task::run ()
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index 1fe0e7dbb14..7147c487958 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -36,7 +36,7 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
@@ -46,7 +46,7 @@ public:
 
   /// The skeleton methods.
   virtual void push (const CORBA::Any& events);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
@@ -79,18 +79,18 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
   void dump_results (int expected_count, int tolerance);
 
-  CORBA::Any *pull (void);
+  CORBA::Any *pull ();
   CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
   /// The skeleton methods.
-  virtual void disconnect_pull_consumer (void);
+  virtual void disconnect_pull_consumer ();
 
   /// Keep track of the number of events received.
   CORBA::ULong event_count;
@@ -116,13 +116,13 @@ public:
                               int milliseconds = 0);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong pull_count (void);
+  void stop ();
+  CORBA::ULong pull_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The consumer we are turning into an active object
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 6032d54f33a..734fae09013 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -2,8 +2,7 @@
 #include "ace/OS_NS_unistd.h"
 
 
-
-CEC_Counting_Supplier::CEC_Counting_Supplier (void)
+CEC_Counting_Supplier::CEC_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0)
 {
@@ -26,7 +25,7 @@ CEC_Counting_Supplier::connect (
 }
 
 void
-CEC_Counting_Supplier::disconnect (void)
+CEC_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -57,7 +56,7 @@ CEC_Counting_Supplier::push (const CORBA::Any&)
 }
 
 void
-CEC_Counting_Supplier::disconnect_push_supplier (void)
+CEC_Counting_Supplier::disconnect_push_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
@@ -91,20 +90,20 @@ CEC_Counting_Supplier_Task::svc ()
 }
 
 void
-CEC_Counting_Supplier_Task::stop (void)
+CEC_Counting_Supplier_Task::stop ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->stop_flag_ = 1;
 }
 
 CORBA::ULong
-CEC_Counting_Supplier_Task::push_count (void)
+CEC_Counting_Supplier_Task::push_count ()
 {
   return this->push_count_;
 }
 
 void
-CEC_Counting_Supplier_Task::run (void)
+CEC_Counting_Supplier_Task::run ()
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -134,7 +133,7 @@ CEC_Counting_Supplier_Task::run (void)
 
 // ****************************************************************
 
-CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
+CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier ()
   :  event_count (0),
      disconnect_count (0)
 {
@@ -157,7 +156,7 @@ CEC_Pull_Counting_Supplier::connect (
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect (void)
+CEC_Pull_Counting_Supplier::disconnect ()
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
@@ -175,7 +174,7 @@ CEC_Pull_Counting_Supplier::disconnect (void)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (void)
+CEC_Pull_Counting_Supplier::pull ()
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     throw CosEventComm::Disconnected ();
@@ -218,7 +217,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event)
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier ()
 {
   this->disconnect_count++;
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index f505200c8fb..73ee061f1c3 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -32,19 +32,19 @@ class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSuppl
 {
 public:
   /// Constructor
-  CEC_Counting_Supplier (void);
+  CEC_Counting_Supplier ();
 
   // = The CosEventComm::PushSupplier methods
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  void disconnect (void);
+  void disconnect ();
 
   /// Push an event.
   void push (const CORBA::Any& events);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;
@@ -65,13 +65,13 @@ public:
                               int milliseconds = 0);
 
   // = Check the ACE_Task_Base documentation.
-  int svc (void);
+  int svc ();
 
-  void stop (void);
-  CORBA::ULong push_count (void);
+  void stop ();
+  CORBA::ULong push_count ();
 
   /// Run a single iteration of the test
-  void run (void);
+  void run ();
 
 private:
   /// The supplier we are turning into an active object
@@ -103,18 +103,18 @@ class CEC_Test_Export CEC_Pull_Counting_Supplier : public POA_CosEventComm::Pull
 {
 public:
   /// Constructor
-  CEC_Pull_Counting_Supplier (void);
+  CEC_Pull_Counting_Supplier ();
 
   // = The CosEventComm::PullSupplier methods
 
   /// Simple connect/disconnect methods..
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
-  void disconnect (void);
+  void disconnect ();
 
   // The PullSupplier methods.
-  CORBA::Any* pull (void);
+  CORBA::Any* pull ();
   CORBA::Any* try_pull (CORBA::Boolean_out has_event);
-  virtual void disconnect_pull_supplier (void);
+  virtual void disconnect_pull_supplier ();
 
   /// Count the number of events sent
   CORBA::ULong event_count;