1 files changed, 12 insertions, 12 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index 6fbfb3f0eaf..f95099e6ab0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -41,7 +41,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Object_Deactivator
 public:
   /// Default constructor.  Deactivation info can be supplied later
   /// through set_values ().
-  TAO_EC_Object_Deactivator (void);
+  TAO_EC_Object_Deactivator ();
 
   /// Constructor.  Set @a id which will be deactivated from @ poa in
   /// the deactivator's destructor, unless deactivate () or
@@ -52,7 +52,7 @@ public:
   /// Destructor.  Deactivates id_ from poa_ if those values have
   /// been set, and neither deactivate() nor disallow_deactivation()
   /// have been invoked.
-  ~TAO_EC_Object_Deactivator (void);
+  ~TAO_EC_Object_Deactivator ();
 
   /// Set <id> which will be deactivated from <poa> in
   /// the deactivator's destructor, unless deactivate () or
@@ -65,20 +65,20 @@ public:
 
   /// Explicitly enable deactivation to happen in destructor or when
   /// deactivate() is called.
-  void allow_deactivation (void);
+  void allow_deactivation ();
 
   /// Explicitly disable deactivation from happening in destructor or
   /// when deactivate() is called.
-  void disallow_deactivation (void);
+  void disallow_deactivation ();
 
   /// Perform deactivation now if <poa_> and <id_> values have been set, and
   /// deactivation hasn't happened yet nor has it been explicitly
   /// disallowed.  CORBA exceptions occurring during deactivation are
   /// not propagated.   Deactivation will NOT happen in the destructor.
-  void deactivate (void);
+  void deactivate ();
 
   /// Accessor for the POA used in deactivation.
-  PortableServer::POA_var poa (void) const;
+  PortableServer::POA_var poa () const;
 
 private:
 
@@ -126,8 +126,8 @@ public:
 
 protected:
 
-  TAO_EC_Deactivated_Object (void);
-  ~TAO_EC_Deactivated_Object (void);
+  TAO_EC_Deactivated_Object ();
+  ~TAO_EC_Deactivated_Object ();
 
   /// Utility for deactivating ourselves from POA.
   TAO_EC_Object_Deactivator deactivator_;
@@ -147,10 +147,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_ORB_Holder
 {
 public:
   /// Constructor. No-op.
-  TAO_EC_ORB_Holder (void);
+  TAO_EC_ORB_Holder ();
 
   /// Destructor.  If holding an ORB, destroy it.
-  ~TAO_EC_ORB_Holder (void);
+  ~TAO_EC_ORB_Holder ();
 
   /// Set the ORB to be destroyed in destructor to <orb_var>.  If
   /// TAO_EC_ORB_Holder already held an orb prior to invocation of
@@ -183,10 +183,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Holder
 {
 public:
   /// Constructor. No-op.
-  TAO_EC_Event_Channel_Holder (void);
+  TAO_EC_Event_Channel_Holder ();
 
   /// Destructor.  If holding an Event Channel, destroy it.
-  ~TAO_EC_Event_Channel_Holder (void);
+  ~TAO_EC_Event_Channel_Holder ();
 
   /// Set the Event Channel to be destroyed in destructor to @a ec_var.  If
   /// TAO_EC_Event_Channel_Holder already held an Event Channel prior