Remove redundant void

96 files changed, 472 insertions, 472 deletions

diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h
index df4f5a6ed83..5c4c835eccd 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.h
+++ b/ACE/ace/SOCK_Dgram_Mcast.h
@@ -206,7 +206,7 @@ public:
    * done by the destructor.  If not, most systems will automatically
    * unsubscribe upon the close of the socket.
    */
-  ~ACE_SOCK_Dgram_Mcast (void);
+  ~ACE_SOCK_Dgram_Mcast ();
 
   /**
    * Explicitly open/bind the socket and define the network interface
@@ -374,7 +374,7 @@ protected:
               int reuse_addr = 1);
 
   /// Empty the dynamic subscription list.
-  int clear_subs_list (void);
+  int clear_subs_list ();
 
 private:
   /// Per-instance options..
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 296d2d2f6bd..9f2baab57a9 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -41,7 +41,7 @@ public:
   virtual void push (const RtecEventComm::EventSet& events);
 
   /// Forwards to target_.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   TARGET *target_;
@@ -64,7 +64,7 @@ public:
   ACE_PushSupplier_Adapter (TARGET *target);
 
   /// Forwards to target_.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   TARGET *target_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
index c41ef28f1a6..b7cc48b1a54 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
@@ -49,14 +49,14 @@ public:
    * Check the documentation in ace/Synch.h for details.
    */
   //@{
-  int remove (void);
-  int acquire (void);
-  int tryacquire (void);
-  int release (void);
-  int acquire_read (void);
-  int acquire_write (void);
-  int tryacquire_read (void);
-  int tryacquire_write (void);
+  int remove ();
+  int acquire ();
+  int tryacquire ();
+  int release ();
+  int acquire_read ();
+  int acquire_write ();
+  int tryacquire_read ();
+  int tryacquire_write ();
   //@}
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 0aa25211104..36578eb57e5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -36,7 +36,7 @@ class TAO_ESF_Copy_On_Read : public TAO_ESF_Proxy_Collection<PROXY>
 {
 public:
   /// Constructors
-  TAO_ESF_Copy_On_Read (void);
+  TAO_ESF_Copy_On_Read ();
   TAO_ESF_Copy_On_Read (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy_Collection methods
@@ -44,7 +44,7 @@ public:
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index 20d105bb85f..dddaf15ebc8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -25,13 +25,13 @@ template<class COLLECTION, class ITERATOR>
 class TAO_ESF_Copy_On_Write_Collection
 {
 public:
-  TAO_ESF_Copy_On_Write_Collection (void);
+  TAO_ESF_Copy_On_Write_Collection ();
 
   /// Increment the reference count
-  CORBA::ULong _incr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
 
   /// Decrement the reference count
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _decr_refcnt ();
 
   /// The actual collection
   COLLECTION collection;
@@ -62,7 +62,7 @@ public:
                                     Collection *&collection);
 
   /// Destructor
-  ~TAO_ESF_Copy_On_Write_Read_Guard (void);
+  ~TAO_ESF_Copy_On_Write_Read_Guard ();
 
   Collection *collection;
 
@@ -94,7 +94,7 @@ public:
                                      Collection*& collection);
 
   /// Destructor
-  ~TAO_ESF_Copy_On_Write_Write_Guard (void);
+  ~TAO_ESF_Copy_On_Write_Write_Guard ();
 
   Collection *copy;
 
@@ -124,17 +124,17 @@ public:
   /// Constructor
   typedef TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_SYNCH_MUTEX_T> Read_Guard;
   typedef TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE> Write_Guard;
-  TAO_ESF_Copy_On_Write (void);
+  TAO_ESF_Copy_On_Write ();
 
   /// Destructor
-  ~TAO_ESF_Copy_On_Write (void);
+  ~TAO_ESF_Copy_On_Write ();
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 5052c34c873..b1dcefda33e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    TAO_ESF_Delayed_Changes (void)
+    TAO_ESF_Delayed_Changes ()
       :  lock_ (this),
          busy_cond_ (busy_lock_),
          busy_count_ (0),
@@ -61,7 +61,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    busy (void)
+    busy ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1);
 
@@ -75,7 +75,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    idle (void)
+    idle ()
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, -1);
 
@@ -91,7 +91,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> int
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    execute_delayed_operations (void)
+    execute_delayed_operations ()
 {
   while (!this->command_queue_.is_empty ())
     {
@@ -177,7 +177,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
-TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::shutdown (void)
+TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::shutdown ()
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 31aa6471b07..c3e9f8e40d0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -86,17 +86,17 @@ template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
 class TAO_ESF_Delayed_Changes : public TAO_ESF_Proxy_Collection<PROXY>
 {
 public:
-  TAO_ESF_Delayed_Changes (void);
+  TAO_ESF_Delayed_Changes ();
   TAO_ESF_Delayed_Changes (const COLLECTION &collection);
 
-  int busy (void);
-  int idle (void);
-  int execute_delayed_operations (void);
+  int busy ();
+  int idle ();
+  int execute_delayed_operations ();
 
   void connected_i (PROXY *proxy);
   void reconnected_i (PROXY *proxy);
   void disconnected_i (PROXY *proxy);
-  void shutdown_i (void);
+  void shutdown_i ();
 
   typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
   typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
@@ -108,7 +108,7 @@ public:
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index 55fee94e3e6..0732a41bff2 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
@@ -24,7 +24,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown_i (void)
+    shutdown_i ()
 {
   this->collection_.shutdown ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index 37765884ca4..6a0a8a4c03b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class C, class ITERATOR, class ACE_LOCK>
 TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
-    TAO_ESF_Immediate_Changes (void)
+    TAO_ESF_Immediate_Changes ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index f1958c0680e..5f46da59d2a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -27,7 +27,7 @@ template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
 class TAO_ESF_Immediate_Changes : public TAO_ESF_Proxy_Collection<PROXY>
 {
 public:
-  TAO_ESF_Immediate_Changes (void);
+  TAO_ESF_Immediate_Changes ();
   TAO_ESF_Immediate_Changes (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy methods
@@ -35,7 +35,7 @@ public:
   virtual void connected (PROXY *proxy);
   virtual void reconnected (PROXY *proxy);
   virtual void disconnected (PROXY *proxy);
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index 3dc79d8bdd7..469b999f73e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
@@ -33,7 +33,7 @@ TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
-TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown (void)
+TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::shutdown ()
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 54672a13ca8..eb2b2fbc583 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -60,7 +60,7 @@ public:
   TAO_ESF_Peer_Admin (EVENT_CHANNEL *ec);
 
   /// destructor
-  virtual ~TAO_ESF_Peer_Admin (void);
+  virtual ~TAO_ESF_Peer_Admin ();
 
   /**
    * A <peer> has connected, this is invoked when the peer's client
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index 45819a38f1f..ceb4b3ab3f3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -66,7 +66,7 @@ public:
   TAO_ESF_Proxy_Admin (EVENT_CHANNEL *ec);
 
   /// Cleanup internal resources, destroy the internal collection
-  virtual ~TAO_ESF_Proxy_Admin (void);
+  virtual ~TAO_ESF_Proxy_Admin ();
 
   /// Iterate over its internal collection.
   void for_each (TAO_ESF_Worker<PROXY> *worker);
@@ -78,14 +78,14 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (void);
+      obtain ();
 
   /**
    * The Event Channel that owns this Admin object is going
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /**
    * A <proxy> has connected, this is invoked when the proxy's client
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index 3250eee56ad..b486e13f02f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -125,7 +125,7 @@ class TAO_ESF_Proxy_Collection
 {
 public:
   /// destructor
-  virtual ~TAO_ESF_Proxy_Collection (void);
+  virtual ~TAO_ESF_Proxy_Collection ();
 
   /**
    * Iterate over the collection and invoke worker->work() for each
@@ -151,7 +151,7 @@ public:
   virtual void disconnected (PROXY *proxy) = 0;
 
   /// The EC is shutting down, must release all the elements.
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index fe241694268..fbd79d670a7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -38,17 +38,17 @@ public:
   typedef ACE_Unbounded_Set_Iterator<PROXY*> Iterator;
 
   /// Constructor
-  TAO_ESF_Proxy_List (void);
+  TAO_ESF_Proxy_List ();
 
   /// Return the first element in the collection, or end() if there
   /// are none
-  ACE_Unbounded_Set_Iterator<PROXY*> begin (void);
+  ACE_Unbounded_Set_Iterator<PROXY*> begin ();
 
   /// Return one past the last element in the collection
-  ACE_Unbounded_Set_Iterator<PROXY*> end (void);
+  ACE_Unbounded_Set_Iterator<PROXY*> end ();
 
   /// Return the number of elements in the collection
-  size_t size (void) const;
+  size_t size () const;
 
   /// Insert a new element to the collection
   void connected (PROXY *);
@@ -61,7 +61,7 @@ public:
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index aa2e1c1fea7..089f7caaf71 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -37,9 +37,9 @@ public:
 
   bool operator == (const TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> &rhs) const;
   bool operator != (const TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> &rhs) const;
-  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>& operator++ (void);
+  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>& operator++ ();
   TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> operator++ (int);
-  PROXY *operator *(void);
+  PROXY *operator *();
 
 private:
   Implementation impl_;
@@ -66,17 +66,17 @@ public:
   typedef TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> Iterator;
 
   /// Constructor
-  TAO_ESF_Proxy_RB_Tree (void);
+  TAO_ESF_Proxy_RB_Tree ();
 
   /// Return the first element in the collection, or end() if there
   /// are none
-  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> begin (void);
+  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> begin ();
 
   /// Return one past the last element in the collection
-  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> end (void);
+  TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> end ();
 
   /// Return the number of elements in the collection
-  size_t size (void) const;
+  size_t size () const;
 
   /// Insert a new element to the collection
   void connected (PROXY *);
@@ -88,7 +88,7 @@ public:
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
index 68e677e3a7b..0b4607fe62b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -46,7 +46,7 @@ public:
                                 PROXY *proxy);
 
   /// Destructor
-  ~TAO_ESF_Proxy_RefCount_Guard (void);
+  ~TAO_ESF_Proxy_RefCount_Guard ();
 
 protected:
   /// The reference count, if it gets to zero then the object must be
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
index 49ae0dcf666..61873a0de55 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -41,7 +41,7 @@ public:
   TAO_ESF_RefCount_Guard (T &refcount);
 
   /// Destructor
-  ~TAO_ESF_RefCount_Guard (void);
+  ~TAO_ESF_RefCount_Guard ();
 
 protected:
   /// The reference count
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index a31b76e630f..efea73b2dcc 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -25,7 +25,7 @@ template<class PROXY>
 class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY>
 {
 public:
-  TAO_ESF_Shutdown_Proxy (void);
+  TAO_ESF_Shutdown_Proxy ();
 
   void work (PROXY *proxy);
 };
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
index 416d6e7dd6f..86e1ef6ccb0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
@@ -2,7 +2,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> ACE_INLINE
-TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy (void)
+TAO_ESF_Shutdown_Proxy<PROXY>::TAO_ESF_Shutdown_Proxy ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index e0d44d16751..fe8b04411b8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -41,7 +41,7 @@ template<class Object>
 class TAO_ESF_Worker
 {
 public:
-  virtual ~TAO_ESF_Worker (void);
+  virtual ~TAO_ESF_Worker ();
 
   /// Used by the collection to inform the worker
   /// the number of proxies in the collection.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 23fe2376590..c44cadd0a86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -42,8 +42,8 @@ public:
 
   // Define virtual destructor to make sure we can delete derived
   // objects through a pointer to TAO_ECG_Handler_Shutdown.
-  virtual ~TAO_ECG_Handler_Shutdown (void);
-  virtual int shutdown (void) = 0;
+  virtual ~TAO_ECG_Handler_Shutdown ();
+  virtual int shutdown () = 0;
 };
 
 /**
@@ -58,7 +58,7 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Dgram_Handler
 {
 public:
 
-  virtual ~TAO_ECG_Dgram_Handler (void);
+  virtual ~TAO_ECG_Dgram_Handler ();
 
   virtual int handle_input (ACE_SOCK_Dgram& dgram) = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index 2ec41e62347..199834e90fc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ECG_CDR_Processor
 {
 public:
-  virtual ~TAO_ECG_CDR_Processor (void);
+  virtual ~TAO_ECG_CDR_Processor ();
 
   /// Extracts data from @a cdr.  Returns 0 on success, -1 on error.
   virtual int decode (TAO_InputCDR &cdr) = 0;
@@ -63,7 +63,7 @@ public:
                              CORBA::ULong request_size,
                              CORBA::ULong fragment_count);
 
-  ~TAO_ECG_UDP_Request_Entry (void);
+  ~TAO_ECG_UDP_Request_Entry ();
 
   /// Validate a fragment, it should be rejected if it is invalid..
   int validate_fragment (CORBA::Boolean byte_order,
@@ -80,7 +80,7 @@ public:
   void mark_received (CORBA::ULong fragment_id);
 
   /// Is the message complete?
-  int complete (void) const;
+  int complete () const;
 
   /// Return a buffer for the fragment at offset @a fragment_offset
   char* fragment_buffer (CORBA::ULong fragment_offset);
@@ -144,7 +144,7 @@ public:
   /// Initialization and termination methods.
   //@{
   TAO_ECG_CDR_Message_Receiver (CORBA::Boolean check_crc);
-  ~TAO_ECG_CDR_Message_Receiver (void);
+  ~TAO_ECG_CDR_Message_Receiver ();
 
   /**
    * @param ignore_from Endpoint used to remove events generated by
@@ -154,7 +154,7 @@ public:
              /* , ACE_Lock *lock = 0 */);
 
   // Shutdown the component: close down the request map, etc.
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Main method: read the data from @a dgram and either pass ready data
@@ -258,8 +258,8 @@ class TAO_ECG_CDR_Message_Receiver::Requests
 {
 public:
 
-  Requests (void);
-  ~Requests (void);
+  Requests ();
+  ~Requests ();
 
   /// Allocates and initializes <fragmented_requests_>.
   int init (size_t size, size_t min_purge_count);
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index b36c12ff164..d9ce3dd8bbb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -94,7 +94,7 @@ public:
   void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   // Shutdown this component.  Frees up the endpoint.
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Setters/getters.
@@ -109,7 +109,7 @@ public:
    * header + 8 bytes must fit).
    */
   int mtu (CORBA::ULong mtu);
-  CORBA::ULong mtu (void) const;
+  CORBA::ULong mtu () const;
   //@}
 
   /// The main method - send a CDR message.
@@ -131,7 +131,7 @@ public:
 
 private:
   /// Return the datagram...
-  ACE_SOCK_Dgram& dgram (void);
+  ACE_SOCK_Dgram& dgram ();
 
   /**
    * Send one fragment, the first entry in the iovec is used to send
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index 6f90a5b6935..5bb96c44b7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -58,7 +58,7 @@ public:
          create (int is_source_mapping = 1);
 
   /// Destructor
-  virtual ~TAO_ECG_Complex_Address_Server (void);
+  virtual ~TAO_ECG_Complex_Address_Server ();
 
   /// Initializes the mapping from the @a arg string.  See class notes
   /// for the expected format.
@@ -72,7 +72,7 @@ public:
 
   /// Prints out complete content of the address server. Useful for
   /// debugging.
-  void dump_content (void);
+  void dump_content ();
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index 268c4c5c7be..70bb109851f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -44,18 +44,18 @@ class TAO_RTEvent_Serv_Export TAO_ECG_ConsumerEC_Control
 {
 public:
   /// Constructor.
-  TAO_ECG_ConsumerEC_Control (void);
+  TAO_ECG_ConsumerEC_Control ();
 
   /// Destructor.
-  virtual ~TAO_ECG_ConsumerEC_Control (void);
+  virtual ~TAO_ECG_ConsumerEC_Control ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the event channel.
-  virtual int activate (void);
+  virtual int activate ();
 
   /// Shutdown any internal threads or timers used to poll the state of
   /// the event channel.
-  virtual int shutdown (void);
+  virtual int shutdown ();
 
   /**
    * When pushing an event to the event channel a CORBA::OBJECT_NOT_EXIST
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index dbdf3beef72..8afc5439610 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -68,7 +68,7 @@ public:
                     CORBA::ULong buf_sz = 0);
 
   /// Destructor.
-  virtual ~TAO_ECG_Mcast_EH (void);
+  virtual ~TAO_ECG_Mcast_EH ();
 
   /**
    * Register for changes in the EC subscription list.
@@ -89,7 +89,7 @@ public:
    * multicast groups, close the sockets and deregister from the
    * reactor.
    */
-  virtual int shutdown (void);
+  virtual int shutdown ();
   //@}
 
   /// Reactor callback.  Notify receiver_ that a dgram corresponding
@@ -115,7 +115,7 @@ private:
 
     /// Shut down the observer: disconnect from EC and deactivate from
     /// POA.
-    void shutdown (void);
+    void shutdown ();
 
     /// Event Channel Observer methods
     //@{
@@ -201,14 +201,14 @@ private:
   class TAO_RTEvent_Serv_Export Observer_Disconnect_Command
   {
   public:
-    Observer_Disconnect_Command (void);
+    Observer_Disconnect_Command ();
     Observer_Disconnect_Command (RtecEventChannelAdmin::Observer_Handle handle,
                                  RtecEventChannelAdmin::EventChannel_ptr ec);
 
     Observer_Disconnect_Command (const Observer_Disconnect_Command &rhs);
     Observer_Disconnect_Command & operator= (const Observer_Disconnect_Command & rhs);
 
-    void execute (void);
+    void execute ();
 
   private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index 5ab71be6c18..a34a07843f8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -129,15 +129,15 @@ public:
   /// The Service_Object entry points.
   //@{
   virtual int init (int argc, ACE_TCHAR* argv[]);
-  virtual int fini (void);
+  virtual int fini ();
   //@}
 
   /// Helper function to register the Gateway into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   /// Constructor.
-  TAO_ECG_Mcast_Gateway (void);
+  TAO_ECG_Mcast_Gateway ();
 
   /// Values for some configuration parameters to init ().
   //@{
@@ -182,7 +182,7 @@ public:
    */
   struct TAO_RTEvent_Serv_Export Attributes
   {
-    Attributes (void);
+    Attributes ();
 
     Address_Server_Type address_server_type;
     Handler_Type handler_type;
@@ -227,13 +227,13 @@ private:
                     RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Verifies configuration values specified through init() make sense.
-  int validate_configuration (void);
+  int validate_configuration ();
   //@}
 
   /// Allocate and initialize appropriate objects.
   //@{
   PortableServer::ServantBase *
-        init_address_server (void);
+        init_address_server ();
 
   PortableServer::Servant_var<TAO_ECG_UDP_Sender>
         init_sender (RtecEventChannelAdmin::EventChannel_ptr ec,
@@ -245,7 +245,7 @@ private:
                        RtecUDPAdmin::AddrServer_ptr address_server,
                        TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
-  TAO_ECG_Refcounted_Endpoint init_endpoint (void);
+  TAO_ECG_Refcounted_Endpoint init_endpoint ();
 
   TAO_ECG_Refcounted_Handler
         init_handler (TAO_ECG_Dgram_Handler *recv,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index d3fe99a37b9..ed3b751b127 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -72,15 +72,15 @@ public:
                                        CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_ECG_Reactive_ConsumerEC_Control (void);
+  virtual ~TAO_ECG_Reactive_ConsumerEC_Control ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
                                  CORBA::SystemException &);
@@ -88,7 +88,7 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_eventchannel (void);
+  void query_eventchannel ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index 27c521480d4..493cd0fe01e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -77,15 +77,15 @@ public:
                                         CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_ECG_Reconnect_ConsumerEC_Control (void);
+  virtual ~TAO_ECG_Reconnect_ConsumerEC_Control ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
                                  CORBA::SystemException &);
@@ -93,13 +93,13 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_eventchannel (void);
+  void query_eventchannel ();
 
   /// Look if we can reconnect again.
-  void try_reconnect (void);
+  void try_reconnect ();
 
   /// Reconnect to the consumer ec.
-  void reconnect (void);
+  void reconnect ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index e3e27ce61f0..267cea8f0c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -32,10 +32,10 @@ public:
   /// Create a new TAO_ECG_Simple_Address_Server object.
   /// (Constructor access is restricted to insure that all
   /// TAO_ECG_Simple_Address_Server objects are heap-allocated.)
-  static PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> create (void);
+  static PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> create ();
 
   /// Destructor
-  virtual ~TAO_ECG_Simple_Address_Server (void);
+  virtual ~TAO_ECG_Simple_Address_Server ();
 
   int init (const char *arg);
 
@@ -50,7 +50,7 @@ protected:
   /// Constructor (protected).  Clients can create new
   /// TAO_ECG_Simple_Address_Server objects using the static create()
   /// method.
-  TAO_ECG_Simple_Address_Server (void);
+  TAO_ECG_Simple_Address_Server ();
 
 private:
   ACE_INET_Addr addr_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
index aa37322173f..69c5ac53150 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -50,7 +50,7 @@ public:
   TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv);
 
   /// Destructor.
-  virtual ~TAO_ECG_Simple_Mcast_EH (void);
+  virtual ~TAO_ECG_Simple_Mcast_EH ();
 
   /// Join the specified multicast group and register itself with the
   /// reactor.
@@ -62,7 +62,7 @@ public:
 
   /// TAO_ECG_Handler_Shutdown method.
   /// Unsubscribe from the reactor and close the datagram.
-  virtual int shutdown (void);
+  virtual int shutdown ();
   //@}
 
   /// Main method - reactor callback.  Notify <receiver_> that
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
index c11544fae06..0d865c992c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
@@ -55,7 +55,7 @@ public:
   TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv);
 
   /// Destructor.
-  virtual ~TAO_ECG_UDP_EH (void);
+  virtual ~TAO_ECG_UDP_EH ();
 
   /// Open the datagram and register itself with this->reactor().
   /// To insure proper resource clean up, if open () is successful,
@@ -66,7 +66,7 @@ public:
 
   /// TAO_ECG_Handler_Shutdown method.
   /// Unsubscribe from the reactor and close the datagram.
-  virtual int shutdown (void);
+  virtual int shutdown ();
   //@}
 
   /// Main method - reactor callback.  Notify <receiver_> that
@@ -78,7 +78,7 @@ public:
    * type safety", allowing the user to setup options and gain access
    * to low-level features.
    */
-  ACE_SOCK_Dgram &dgram (void);
+  ACE_SOCK_Dgram &dgram ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
index eb710628ee5..8cf05182684 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
@@ -45,10 +45,10 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Out_Endpoint
 {
 public:
   /// Constructor
-  TAO_ECG_UDP_Out_Endpoint (void);
+  TAO_ECG_UDP_Out_Endpoint ();
 
   /// Constructor
-  ~TAO_ECG_UDP_Out_Endpoint (void);
+  ~TAO_ECG_UDP_Out_Endpoint ();
 
   /// Copy Constructor
   TAO_ECG_UDP_Out_Endpoint (const TAO_ECG_UDP_Out_Endpoint& rhs);
@@ -58,10 +58,10 @@ public:
 
   /// Obtain the datagram associated with this endpoint. Clients of
   /// this class must open, and register (if necessary) this datagram.
-  ACE_SOCK_Dgram& dgram (void);
+  ACE_SOCK_Dgram& dgram ();
 
   /// Obtain the next request id.
-  CORBA::ULong next_request_id (void);
+  CORBA::ULong next_request_id ();
 
   /// The endpoint can detect if a data-gram was sent by itself, this
   /// is useful to ignore or remove messages sent by the same process.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 0d659652791..68532c6b4b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -71,7 +71,7 @@ class TAO_ECG_UDP_Out_Endpoint;
 class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver_Disconnect_Command
 {
 public:
-  TAO_ECG_UDP_Receiver_Disconnect_Command (void);
+  TAO_ECG_UDP_Receiver_Disconnect_Command ();
   TAO_ECG_UDP_Receiver_Disconnect_Command (
               RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy);
 
@@ -81,7 +81,7 @@ public:
   TAO_ECG_UDP_Receiver_Disconnect_Command &
    operator= (const TAO_ECG_UDP_Receiver_Disconnect_Command & rhs);
 
-  void execute (void);
+  void execute ();
 
 private:
 
@@ -113,7 +113,7 @@ public:
   /// TAO_ECG_UDP_Receiver objects are heap-allocated.)
   static PortableServer::Servant_var<TAO_ECG_UDP_Receiver> create (CORBA::Boolean perform_crc = 0);
 
-  ~TAO_ECG_UDP_Receiver (void);
+  ~TAO_ECG_UDP_Receiver ();
 
   /**
    * @param lcl_ec Event Channel to which we will act as a supplier of events.
@@ -157,7 +157,7 @@ public:
    * result in decrementing of the reference count (due to
    * deactivation) and deletion of the object.
    */
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Accessor.
@@ -174,7 +174,7 @@ public:
   /// The PushSupplier idl method.
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
   /// TAO_ECG_Dgram_Handler method.
   /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 1c0dab80b05..67f29c6fc14 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -70,7 +70,7 @@ class TAO_ECG_UDP_Out_Endpoint;
 class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender_Disconnect_Command
 {
 public:
-  TAO_ECG_UDP_Sender_Disconnect_Command (void);
+  TAO_ECG_UDP_Sender_Disconnect_Command ();
   TAO_ECG_UDP_Sender_Disconnect_Command (
               RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy);
 
@@ -80,7 +80,7 @@ public:
   TAO_ECG_UDP_Sender_Disconnect_Command &
    operator= (const TAO_ECG_UDP_Sender_Disconnect_Command & rhs);
 
-  void execute (void);
+  void execute ();
 
 private:
 
@@ -110,7 +110,7 @@ public:
   /// TAO_ECG_UDP_Sender objects are heap-allocated.)
   static PortableServer::Servant_var<TAO_ECG_UDP_Sender> create (CORBA::Boolean crc = 0);
 
-  ~TAO_ECG_UDP_Sender (void);
+  ~TAO_ECG_UDP_Sender ();
 
   /**
    * @param lcl_ec Event Channel to which we will act as a consumer of events.
@@ -148,7 +148,7 @@ public:
    * Calling this method may result in decrementing of the reference
    * count (due to deactivation) and deletion of the object.
    */
-  void shutdown (void);
+  void shutdown ();
   //@}
 
   /// Accessors.
@@ -160,7 +160,7 @@ public:
    * header + 8 bytes must fit).
    */
   int mtu (CORBA::ULong mtu);
-  CORBA::ULong mtu (void) const;
+  CORBA::ULong mtu () const;
 
   /// Get the local endpoint used to send the events.
   int get_local_addr (ACE_INET_Addr& addr);
@@ -170,7 +170,7 @@ public:
   //@{
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
   virtual void push (const RtecEventComm::EventSet &events);
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index a773fc8f2df..8bab675629d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -43,13 +43,13 @@ public:
                              size_t n);
 
   /// Destructor
-  virtual ~TAO_EC_And_Filter (void);
+  virtual ~TAO_EC_And_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -58,8 +58,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index e4b47f620df..79753dbcf98 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -40,10 +40,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Basic_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
-  TAO_EC_Basic_Factory (void);
+  TAO_EC_Basic_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Basic_Factory (void);
+  virtual ~TAO_EC_Basic_Factory ();
 
   // = The EC_Factory methods
   virtual TAO_EC_Dispatching*
@@ -95,9 +95,9 @@ public:
   virtual void
       destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*);
 
-  virtual ACE_Lock* create_consumer_lock (void);
+  virtual ACE_Lock* create_consumer_lock ();
   virtual void destroy_consumer_lock (ACE_Lock*);
-  virtual ACE_Lock* create_supplier_lock (void);
+  virtual ACE_Lock* create_supplier_lock ();
   virtual void destroy_supplier_lock (ACE_Lock*);
 
   virtual TAO_EC_ConsumerControl*
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 6c444ed0a34..37adc1f8432 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -45,7 +45,7 @@ public:
   TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Basic_Filter_Builder (void);
+  virtual ~TAO_EC_Basic_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index ad3bfc4eac4..8d20fef16be 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -60,13 +60,13 @@ public:
                          TAO_EC_Filter* child);
 
   /// Destructor
-  virtual ~TAO_EC_Bitmask_Filter (void);
+  virtual ~TAO_EC_Bitmask_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -75,8 +75,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index c914ef7e81f..eb7247e4f05 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -45,13 +45,13 @@ public:
                              size_t n);
 
   /// Destructor
-  virtual ~TAO_EC_Conjunction_Filter (void);
+  virtual ~TAO_EC_Conjunction_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -60,8 +60,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
@@ -70,7 +70,7 @@ public:
 
 private:
   /// Determine if all the children have received their events.
-  int all_received (void) const;
+  int all_received () const;
 
   TAO_EC_Conjunction_Filter (const TAO_EC_Conjunction_Filter&);
   TAO_EC_Conjunction_Filter& operator= (const TAO_EC_Conjunction_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 9cce398a872..86fb2957843 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -57,14 +57,14 @@ public:
   TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// Destructor...
-  virtual ~TAO_EC_ConsumerAdmin (void);
+  virtual ~TAO_EC_ConsumerAdmin ();
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (void);
+      obtain_push_supplier ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 952d5b832af..651250bfb2f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -48,15 +48,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_ConsumerControl
 {
 public:
   /// Constructor.
-  TAO_EC_ConsumerControl (void);
+  TAO_EC_ConsumerControl ();
 
   /// Destructor.
-  virtual ~TAO_EC_ConsumerControl (void);
+  virtual ~TAO_EC_ConsumerControl ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the consumers
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
 
   /**
    * When pushing an event to the consumer a CORBA::OBJECT_NOT_EXIST
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 681360dc2ed..55ad13f6b55 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -46,18 +46,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
-  TAO_EC_Default_Factory (void);
+  TAO_EC_Default_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Default_Factory (void);
+  virtual ~TAO_EC_Default_Factory ();
 
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
-  virtual int fini (void);
+  virtual int fini ();
 
   // = The EC_Factory methods
   virtual TAO_EC_Dispatching*
@@ -109,9 +109,9 @@ public:
   virtual void
       destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*);
 
-  virtual ACE_Lock* create_consumer_lock (void);
+  virtual ACE_Lock* create_consumer_lock ();
   virtual void destroy_consumer_lock (ACE_Lock*);
-  virtual ACE_Lock* create_supplier_lock (void);
+  virtual ACE_Lock* create_supplier_lock ();
   virtual void destroy_supplier_lock (ACE_Lock*);
 
   virtual TAO_EC_ConsumerControl*
@@ -124,16 +124,16 @@ public:
       destroy_supplier_control (TAO_EC_SupplierControl*);
 
   /// Accessors to consumer collection flags
-  int consumer_collection (void) const;
+  int consumer_collection () const;
 
   /// Accessors to supplier collection flags
-  int supplier_collection (void) const;
+  int supplier_collection () const;
 
   /// Accessors to supplier filtering flags
-  int supplier_filtering (void) const;
+  int supplier_filtering () const;
 
   /// Accessor to ORBid
-  const ACE_CString& orb_id (void) const;
+  const ACE_CString& orb_id () const;
 
 protected:
   /// Helper for agrument parsing.  Prints out an error message about
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 1c86883333b..4230f1a6370 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -42,7 +42,7 @@ public:
   TAO_EC_Default_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
   /// Destructor...
-  virtual ~TAO_EC_Default_ProxyPushConsumer (void);
+  virtual ~TAO_EC_Default_ProxyPushConsumer ();
 
  virtual void activate (
      RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy);
@@ -52,17 +52,17 @@ public:
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos);
   virtual void push (const RtecEventComm::EventSet& event);
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 private:
 
   virtual PortableServer::ObjectId
-         object_id (void);
+         object_id ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index 3ee6df2154e..df5589db1f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -39,7 +39,7 @@ public:
   TAO_EC_Default_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
 
   /// Destructor...
-  virtual ~TAO_EC_Default_ProxyPushSupplier (void);
+  virtual ~TAO_EC_Default_ProxyPushSupplier ();
 
   void activate (
      RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy);
@@ -48,19 +48,19 @@ public:
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
-  virtual void disconnect_push_supplier (void);
-  virtual void suspend_connection (void);
-  virtual void resume_connection (void);
+  virtual void disconnect_push_supplier ();
+  virtual void suspend_connection ();
+  virtual void resume_connection ();
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (void);
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
+  virtual PortableServer::POA_ptr _default_POA ();
+  virtual void _add_ref ();
+  virtual void _remove_ref ();
 
 private:
 
   virtual PortableServer::ObjectId
-            object_id (void);
+            object_id ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index b93ba31e605..efc1c8a4fab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -43,14 +43,14 @@ public:
                              size_t n);
 
   /// Destructor
-  virtual ~TAO_EC_Disjunction_Filter (void);
+  virtual ~TAO_EC_Disjunction_Filter ();
 
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -59,8 +59,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index b2a1830d646..60d330fc633 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -45,18 +45,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Dispatching
 {
 public:
   /// Destructor...
-  virtual ~TAO_EC_Dispatching (void);
+  virtual ~TAO_EC_Dispatching ();
 
   /// Initialize all the data structures, activate any internal threads,
   /// etc.
-  virtual void activate (void) = 0;
+  virtual void activate () = 0;
 
   /**
    * Deactivate any internal threads and cleanup internal data
    * structures, it should only return once the threads have finished
    * their jobs.
    */
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
   /**
    * The consumer represented by @a proxy should receive @a event.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index edf7d0add56..fac5d0fd162 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -59,11 +59,11 @@ public:
 
   /// Helper function to register the default action into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
-  virtual int fini (void);
+  virtual int fini ();
 
   virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
                                  TAO_EC_ProxyPushSupplier *proxy,
@@ -84,7 +84,7 @@ public:
 protected:
   // = Override the default definition in the Message_Queue, to count
   // the number of messages (and not their size).
-  virtual bool is_full_i (void);
+  virtual bool is_full_i ();
 };
 
 /**
@@ -106,7 +106,7 @@ public:
 #endif
 
   /// Process the events in the queue.
-  virtual int svc (void);
+  virtual int svc ();
 
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
@@ -138,10 +138,10 @@ public:
                            ACE_Allocator *mb_allocator = 0);
 
   /// Destructor
-  virtual ~TAO_EC_Dispatch_Command (void);
+  virtual ~TAO_EC_Dispatch_Command ();
 
   /// Command callback
-  virtual int execute (void) = 0;
+  virtual int execute () = 0;
 };
 
 // ****************************************************************
@@ -153,7 +153,7 @@ public:
   TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 };
 
 // ****************************************************************
@@ -169,10 +169,10 @@ public:
                        ACE_Allocator *mb_allocator);
 
   /// Destructor
-  virtual ~TAO_EC_Push_Command (void);
+  virtual ~TAO_EC_Push_Command ();
 
   /// Command callback
-  virtual int execute (void);
+  virtual int execute ();
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 2ca67d3e4a3..aeaf455232d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -110,15 +110,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Base
 {
 public:
   /// destructor
-  virtual ~TAO_EC_Event_Channel_Base (void);
+  virtual ~TAO_EC_Event_Channel_Base ();
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (void);
+  virtual void activate ();
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   virtual void for_each_consumer (
                     TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker);
@@ -127,31 +127,31 @@ public:
                     TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker);
 
   /// Access the dispatching module....
-  TAO_EC_Dispatching* dispatching (void) const;
+  TAO_EC_Dispatching* dispatching () const;
 
   /// Access the filter builder....
-  TAO_EC_Filter_Builder* filter_builder (void) const;
+  TAO_EC_Filter_Builder* filter_builder () const;
 
   /// Access the filter builder....
-  TAO_EC_Supplier_Filter_Builder* supplier_filter_builder (void) const;
+  TAO_EC_Supplier_Filter_Builder* supplier_filter_builder () const;
 
   /// Access the consumer admin implementation, useful for controlling
   /// the activation...
-  TAO_EC_ConsumerAdmin* consumer_admin (void) const;
+  TAO_EC_ConsumerAdmin* consumer_admin () const;
 
   /// Access the supplier admin implementation, useful for controlling
   /// the activation...
-  TAO_EC_SupplierAdmin* supplier_admin (void) const;
+  TAO_EC_SupplierAdmin* supplier_admin () const;
 
   /// Access the timer module...
-  TAO_EC_Timeout_Generator* timeout_generator (void) const;
+  TAO_EC_Timeout_Generator* timeout_generator () const;
 
   /// Access the scheduling strategy
-  TAO_EC_Scheduling_Strategy* scheduling_strategy (void) const;
+  TAO_EC_Scheduling_Strategy* scheduling_strategy () const;
 
   /// Access the client control strategies.
-  TAO_EC_ConsumerControl *consumer_control (void) const;
-  TAO_EC_SupplierControl *supplier_control (void) const;
+  TAO_EC_ConsumerControl *consumer_control () const;
+  TAO_EC_SupplierControl *supplier_control () const;
 
   // = The factory methods, they delegate on the EC_Factory.
   /// Create and destroy a ProxyPushSupplier
@@ -175,14 +175,14 @@ public:
   void destroy_proxy_collection (TAO_EC_ProxyPushConsumer_Collection*);
 
   /// Access the supplier and consumer POAs from the factory.
-  PortableServer::POA_ptr supplier_poa (void);
-  PortableServer::POA_ptr consumer_poa (void);
+  PortableServer::POA_ptr supplier_poa ();
+  PortableServer::POA_ptr consumer_poa ();
 
   /// Locking strategies for the ProxyPushConsumer and
   /// ProxyPushSupplier objects
-  ACE_Lock* create_consumer_lock (void);
+  ACE_Lock* create_consumer_lock ();
   void destroy_consumer_lock (ACE_Lock*);
-  ACE_Lock* create_supplier_lock (void);
+  ACE_Lock* create_supplier_lock ();
   void destroy_supplier_lock (ACE_Lock*);
 
   /// Used to inform the EC that a Consumer has connected or
@@ -201,31 +201,31 @@ public:
   // at construction time.
 
   /// Can the consumers reconnect to the EC?
-  int consumer_reconnect (void) const;
+  int consumer_reconnect () const;
 
   /// Can the suppliers reconnect to the EC?
-  int supplier_reconnect (void) const;
+  int supplier_reconnect () const;
 
   /// Should we send callback disconnect messages when a proxy is
   /// disconnected by the client
-  int disconnect_callbacks (void) const;
+  int disconnect_callbacks () const;
 
   /// Obtain the scheduler, the user must release
-  CORBA::Object_ptr scheduler (void);
+  CORBA::Object_ptr scheduler ();
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   /// The default implementation is:
   ///    this->consumer_admin ()->_this ();
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (void);
+      for_consumers ();
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (void);
+      for_suppliers ();
 
   /// Commit suicide.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr);
@@ -233,7 +233,7 @@ public:
       remove_observer (RtecEventChannelAdmin::Observer_Handle);
 
   /// Return 1 if the event channel is already destroyed.
-  int destroyed (void);
+  int destroyed ();
 
 protected:
   /**
@@ -249,7 +249,7 @@ protected:
   /**
    * Get the factory.
    */
-  TAO_EC_Factory * factory (void) const;
+  TAO_EC_Factory * factory () const;
 
   /**
    * Set the factory, if @a own_factory is not 0 it assumes ownership of the
@@ -261,13 +261,13 @@ protected:
   /**
    * Create all strategies
    */
-  void create_strategies (void);
+  void create_strategies ();
 
   /// Helpers.  Deactivate admins from their POAs, ignoring any CORBA
   /// exceptions.
   //@{
-  void deactivate_supplier_admin (void);
-  void deactivate_consumer_admin (void);
+  void deactivate_supplier_admin ();
+  void deactivate_consumer_admin ();
   //@}
 
   /// The POAs used to activate "supplier-side" and "consumer-side"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
index fba3bc42726..46f80d7a4b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
@@ -15,7 +15,7 @@ TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa,
 }
 
 ACE_INLINE TAO_EC_Factory*
-TAO_EC_Event_Channel_Base::factory (void) const
+TAO_EC_Event_Channel_Base::factory () const
 {
   return this->factory_;
 }
@@ -32,55 +32,55 @@ TAO_EC_Event_Channel_Base::factory (TAO_EC_Factory* factory,
 }
 
 ACE_INLINE TAO_EC_Dispatching*
-TAO_EC_Event_Channel_Base::dispatching (void) const
+TAO_EC_Event_Channel_Base::dispatching () const
 {
   return this->dispatching_;
 }
 
 ACE_INLINE TAO_EC_Filter_Builder*
-TAO_EC_Event_Channel_Base::filter_builder (void) const
+TAO_EC_Event_Channel_Base::filter_builder () const
 {
   return this->filter_builder_;
 }
 
 ACE_INLINE TAO_EC_Supplier_Filter_Builder*
-TAO_EC_Event_Channel_Base::supplier_filter_builder (void) const
+TAO_EC_Event_Channel_Base::supplier_filter_builder () const
 {
   return this->supplier_filter_builder_;
 }
 
 ACE_INLINE TAO_EC_ConsumerAdmin*
-TAO_EC_Event_Channel_Base::consumer_admin (void) const
+TAO_EC_Event_Channel_Base::consumer_admin () const
 {
   return this->consumer_admin_;
 }
 
 ACE_INLINE TAO_EC_SupplierAdmin*
-TAO_EC_Event_Channel_Base::supplier_admin (void) const
+TAO_EC_Event_Channel_Base::supplier_admin () const
 {
   return this->supplier_admin_;
 }
 
 ACE_INLINE TAO_EC_Timeout_Generator*
-TAO_EC_Event_Channel_Base::timeout_generator (void) const
+TAO_EC_Event_Channel_Base::timeout_generator () const
 {
   return this->timeout_generator_;
 }
 
 ACE_INLINE TAO_EC_Scheduling_Strategy*
-TAO_EC_Event_Channel_Base::scheduling_strategy (void) const
+TAO_EC_Event_Channel_Base::scheduling_strategy () const
 {
   return this->scheduling_strategy_;
 }
 
 ACE_INLINE TAO_EC_ConsumerControl*
-TAO_EC_Event_Channel_Base::consumer_control (void) const
+TAO_EC_Event_Channel_Base::consumer_control () const
 {
   return this->consumer_control_;
 }
 
 ACE_INLINE TAO_EC_SupplierControl*
-TAO_EC_Event_Channel_Base::supplier_control (void) const
+TAO_EC_Event_Channel_Base::supplier_control () const
 {
   return this->supplier_control_;
 }
@@ -134,19 +134,19 @@ TAO_EC_Event_Channel_Base::destroy_proxy_collection (TAO_EC_ProxyPushSupplier_Co
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel_Base::supplier_poa (void)
+TAO_EC_Event_Channel_Base::supplier_poa ()
 {
   return PortableServer::POA::_duplicate (this->supplier_poa_.in ());
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel_Base::consumer_poa (void)
+TAO_EC_Event_Channel_Base::consumer_poa ()
 {
   return PortableServer::POA::_duplicate (this->consumer_poa_.in ());
 }
 
 ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel_Base::create_consumer_lock (void)
+TAO_EC_Event_Channel_Base::create_consumer_lock ()
 {
   return this->factory_->create_consumer_lock ();
 }
@@ -158,7 +158,7 @@ TAO_EC_Event_Channel_Base::destroy_consumer_lock (ACE_Lock* x)
 }
 
 ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel_Base::create_supplier_lock (void)
+TAO_EC_Event_Channel_Base::create_supplier_lock ()
 {
   return this->factory_->create_supplier_lock ();
 }
@@ -170,31 +170,31 @@ TAO_EC_Event_Channel_Base::destroy_supplier_lock (ACE_Lock* x)
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::consumer_reconnect (void) const
+TAO_EC_Event_Channel_Base::consumer_reconnect () const
 {
   return this->consumer_reconnect_;
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::supplier_reconnect (void) const
+TAO_EC_Event_Channel_Base::supplier_reconnect () const
 {
   return this->supplier_reconnect_;
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::disconnect_callbacks (void) const
+TAO_EC_Event_Channel_Base::disconnect_callbacks () const
 {
   return this->disconnect_callbacks_;
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_EC_Event_Channel_Base::scheduler (void)
+TAO_EC_Event_Channel_Base::scheduler ()
 {
   return CORBA::Object::_duplicate (this->scheduler_.in ());
 }
 
 ACE_INLINE int
-TAO_EC_Event_Channel_Base::destroyed (void)
+TAO_EC_Event_Channel_Base::destroyed ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
   return (this->status_ == EC_S_DESTROYED);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index fcc583bfde4..8b7a66455da 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -67,8 +67,8 @@ class TAO_RTEvent_Serv_Export TAO_EC_Factory : public ACE_Service_Object
 {
 public:
   /// destructor...
-  TAO_EC_Factory (void);
-  virtual ~TAO_EC_Factory (void);
+  TAO_EC_Factory ();
+  virtual ~TAO_EC_Factory ();
 
   /// Create and destroy the dispatching module.
   virtual TAO_EC_Dispatching*
@@ -144,9 +144,9 @@ public:
 
   /// Create and destroy the locking strategies for both
   /// ProxyPushConsumers and ProxyPushSuppliers
-  virtual ACE_Lock* create_consumer_lock (void) = 0;
+  virtual ACE_Lock* create_consumer_lock () = 0;
   virtual void destroy_consumer_lock (ACE_Lock*) = 0;
-  virtual ACE_Lock* create_supplier_lock (void) = 0;
+  virtual ACE_Lock* create_supplier_lock () = 0;
   virtual void destroy_supplier_lock (ACE_Lock*) = 0;
 
   /// The ConsumerControl and SupplierControl strategies are used to
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index f64a49e72c0..88a7533d7a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -50,13 +50,13 @@ class TAO_RTEvent_Serv_Export TAO_EC_Filter
 {
 public:
   /// constructor...
-  TAO_EC_Filter (void);
+  TAO_EC_Filter ();
 
   /// destructor...
-  virtual ~TAO_EC_Filter (void);
+  virtual ~TAO_EC_Filter ();
 
   /// Obtain the parent of this filter.
-  TAO_EC_Filter* parent (void) const;
+  TAO_EC_Filter* parent () const;
 
   /// Become the parent of @a child.
   void adopt_child (TAO_EC_Filter* child);
@@ -76,9 +76,9 @@ public:
    * interface as if they all had children, but for simple filters the
    * iterators return an empty range.
    */
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
 
   /**
    * Filter this event, returns 1 if the event is accepted, 0
@@ -110,10 +110,10 @@ public:
 
   /// Clear any saved state, must reset and assume no events have been
   /// received.
-  virtual void clear (void) = 0;
+  virtual void clear () = 0;
 
   /// Returns the maximum size of the events pushed by this filter.
-  virtual CORBA::ULong max_event_size (void) const = 0;
+  virtual CORBA::ULong max_event_size () const = 0;
 
   /**
    * Returns 0 if an event with that header could never be accepted.
@@ -171,7 +171,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter : public TAO_EC_Filter
 {
 public:
   /// Constructor.
-  TAO_EC_Null_Filter (void);
+  TAO_EC_Null_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
@@ -183,8 +183,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index e3ccc9f3e73..931b66be256 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -42,7 +42,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Filter_Builder
 {
 public:
   /// destructor...
-  virtual ~TAO_EC_Filter_Builder (void);
+  virtual ~TAO_EC_Filter_Builder ();
 
   /// Create the filter, the caller must assume ownership of the filter
   /// returned.
@@ -65,10 +65,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Filter_Builder : public TAO_EC_Filter_
 {
 public:
   /// constructor.
-  TAO_EC_Null_Filter_Builder (void);
+  TAO_EC_Null_Filter_Builder ();
 
   /// destructor...
-  virtual ~TAO_EC_Null_Filter_Builder (void);
+  virtual ~TAO_EC_Null_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 453db162cb6..6705b4026ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -44,18 +44,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Gateway
 {
 public:
   /// Default constructor.
-  TAO_EC_Gateway (void);
+  TAO_EC_Gateway ();
 
   /// Destructor
-  virtual ~TAO_EC_Gateway (void);
+  virtual ~TAO_EC_Gateway ();
 
   /// The gateway must disconnect from all the relevant event channels,
   /// or any other communication media (such as multicast groups).
-  virtual void close (void) = 0;
+  virtual void close () = 0;
 
   /// Obtain and modify the observer handle.
   void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
-  RtecEventChannelAdmin::Observer_Handle observer_handle (void) const;
+  RtecEventChannelAdmin::Observer_Handle observer_handle () const;
 
 private:
   RtecEventChannelAdmin::Observer_Handle handle_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index b6fb48fe2c5..8ea47da59ff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -63,8 +63,8 @@ class TAO_EC_Gateway_IIOP_Factory;
 class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP : public TAO_EC_Gateway
 {
 public:
-  TAO_EC_Gateway_IIOP (void);
-  virtual ~TAO_EC_Gateway_IIOP (void);
+  TAO_EC_Gateway_IIOP ();
+  virtual ~TAO_EC_Gateway_IIOP ();
 
   /**
    * To do its job this class requires to know the local and remote ECs it will
@@ -75,25 +75,25 @@ public:
             RtecEventChannelAdmin::EventChannel_ptr consumer_ec);
 
   /// The channel is disconnecting.
-  void disconnect_push_supplier (void);
+  void disconnect_push_supplier ();
 
   /// The channel is disconnecting.
-  void disconnect_push_consumer (void);
+  void disconnect_push_consumer ();
 
   /// This is the consumer side behavior, it pushes the events to the
   /// local event channel.
   void push (const RtecEventComm::EventSet &events);
 
   /// Disconnect and shutdown the gateway
-  int shutdown (void);
+  int shutdown ();
 
   // The following methods are documented in the base class.
-  virtual void close (void);
+  virtual void close ();
   virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub);
   virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub);
 
   // Let the gateway reconnect itself to the consumer ec given exisiting QoS
-  void reconnect_consumer_ec(void);
+  void reconnect_consumer_ec();
 
   /// Check whether the consumer event channel is non existent or not
   CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected);
@@ -104,33 +104,33 @@ public:
    * the consumer proxy administration in case we know that the consumers
    * are all unreachable.
    */
-  void cleanup_consumer_proxies (void);
+  void cleanup_consumer_proxies ();
 
   /// Cleanup the connection to the consumer ec. Doesn't call anything on the
   /// ec again, just set the object to nil
-  int cleanup_consumer_ec (void);
+  int cleanup_consumer_ec ();
 
   /// Cleanup the connection to the supplier ec. Doesn't call anything on the
   /// ec again, just set the object to nil
-  int cleanup_supplier_ec (void);
+  int cleanup_supplier_ec ();
 
   /// Suspend the connection to the supplier ec
-  void suspend_supplier_ec (void);
+  void suspend_supplier_ec ();
 
   /// Resume the connection to the supplier ec
-  void resume_supplier_ec (void);
+  void resume_supplier_ec ();
 
 private:
-  void close_i (void);
+  void close_i ();
 
   /// Disconnect the supplier proxy
-  void disconnect_supplier_proxy_i (void);
+  void disconnect_supplier_proxy_i ();
 
   /// Disconnect all consumer proxies
-  void disconnect_consumer_proxies_i (void);
+  void disconnect_consumer_proxies_i ();
 
   /// Remove all consumer proxies without calling disconnect on them
-  void cleanup_consumer_proxies_i (void);
+  void cleanup_consumer_proxies_i ();
 
   void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
@@ -138,15 +138,15 @@ private:
   void open_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   /// Helper method to see if consumer ec is connected
-  CORBA::Boolean is_consumer_ec_connected_i (void) const;
+  CORBA::Boolean is_consumer_ec_connected_i () const;
 
   /// Push the @a event to the @a consumer.
   void push_to_consumer (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
                          const RtecEventComm::EventSet& event);
 
-  void cleanup_consumer_ec_i (void);
+  void cleanup_consumer_ec_i ();
 
-  void cleanup_supplier_ec_i (void);
+  void cleanup_supplier_ec_i ();
 
 protected:
   /// Do the real work in init()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index 50fc874fab1..dffea90381d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -40,18 +40,18 @@ class TAO_RTEvent_Serv_Export TAO_EC_Gateway_IIOP_Factory
   : public ACE_Service_Object
 {
 public:
-  TAO_EC_Gateway_IIOP_Factory (void);
-  virtual ~TAO_EC_Gateway_IIOP_Factory (void);
+  TAO_EC_Gateway_IIOP_Factory ();
+  virtual ~TAO_EC_Gateway_IIOP_Factory ();
 
   /// The Service_Object entry points.
   //@{
   virtual int init (int argc, ACE_TCHAR* argv[]);
-  virtual int fini (void);
+  virtual int fini ();
   //@}
 
   /// Helper function to register the Gateway into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   /// Create the consumer event channel control.
   TAO_ECG_ConsumerEC_Control *
@@ -61,10 +61,10 @@ public:
   void destroy_consumerec_control (TAO_ECG_ConsumerEC_Control* x);
 
   /// Accessors to use_ttl flag
-  int use_ttl (void) const;
+  int use_ttl () const;
 
   /// Accessors to use_consumer_proxy_map flag
-  int use_consumer_proxy_map (void) const;
+  int use_consumer_proxy_map () const;
 
 private:
   /// Helper for agrument parsing.  Prints out an error message about
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
index 6017143de4e..e60007ddae6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
@@ -29,7 +29,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Group_Scheduling : public TAO_EC_Scheduling
 {
 public:
   /// Constructor.
-  TAO_EC_Group_Scheduling (void);
+  TAO_EC_Group_Scheduling ();
 
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
index 8fbfc0adcf3..49a7fabbf41 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
@@ -1,5 +1,5 @@
 ACE_INLINE
-TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling (void)
+TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling ()
 {
 }
 
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
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 341e42b298b..84f18bece00 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -53,14 +53,14 @@ template <class T>
 class TAO_EC_Auto_Command
 {
 public:
-  TAO_EC_Auto_Command (void);
+  TAO_EC_Auto_Command ();
   TAO_EC_Auto_Command (const T & command);
-  ~TAO_EC_Auto_Command (void);
+  ~TAO_EC_Auto_Command ();
   void set_command (const T & command);
   void set_command (TAO_EC_Auto_Command<T> & auto_command);
-  void execute (void);
-  void allow_command (void);
-  void disallow_command (void);
+  void execute ();
+  void allow_command ();
+  void disallow_command ();
 
 private:
 
@@ -78,9 +78,9 @@ template <class T>
 class TAO_EC_Shutdown_Command
 {
 public:
-  TAO_EC_Shutdown_Command (void);
+  TAO_EC_Shutdown_Command ();
   TAO_EC_Shutdown_Command (T target);
-  void execute (void);
+  void execute ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 2492c94b2ad..8852968ebe1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -46,8 +46,8 @@ public:
                          TAO_EC_Queue_Full_Service_Object* queue_full_service_object_name);
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 3fa8dd6f094..c405c7589fb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -45,13 +45,13 @@ public:
                              CORBA::ULong type_value);
 
   /// Destructor
-  virtual ~TAO_EC_Masked_Type_Filter (void);
+  virtual ~TAO_EC_Masked_Type_Filter ();
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -60,8 +60,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index 6097f931038..69128a25af5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -42,14 +42,14 @@ public:
   TAO_EC_Negation_Filter (TAO_EC_Filter* child);
 
   /// Destructor
-  virtual ~TAO_EC_Negation_Filter (void);
+  virtual ~TAO_EC_Negation_Filter ();
 
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
+  virtual ChildrenIterator begin () const;
+  virtual ChildrenIterator end () const;
+  virtual int size () const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
@@ -58,8 +58,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index e6cdf972db1..5334fda7bca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -38,10 +38,10 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Factory : public TAO_EC_Factory
 {
 public:
   /// Constructor
-  TAO_EC_Null_Factory (void);
+  TAO_EC_Null_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_Null_Factory (void);
+  virtual ~TAO_EC_Null_Factory ();
 
   // = The EC_Factory methods
   virtual TAO_EC_Dispatching*
@@ -93,9 +93,9 @@ public:
   virtual void
       destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*);
 
-  virtual ACE_Lock* create_consumer_lock (void);
+  virtual ACE_Lock* create_consumer_lock ();
   virtual void destroy_consumer_lock (ACE_Lock*);
-  virtual ACE_Lock* create_supplier_lock (void);
+  virtual ACE_Lock* create_supplier_lock ();
   virtual void destroy_supplier_lock (ACE_Lock*);
 
   virtual TAO_EC_ConsumerControl*
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index 14892c28f7c..fc9da282605 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -32,7 +32,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_Scheduling
 {
 public:
   /// Constructor.
-  TAO_EC_Null_Scheduling (void);
+  TAO_EC_Null_Scheduling ();
 
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
index f1c2a48bd5c..63386ce9ca8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
@@ -1,5 +1,5 @@
 ACE_INLINE
-TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling (void)
+TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 15f3781eaf5..21b01e17fe0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -58,7 +58,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_ObserverStrategy
 {
 public:
   /// Destructor
-  virtual ~TAO_EC_ObserverStrategy (void);
+  virtual ~TAO_EC_ObserverStrategy ();
 
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
@@ -91,7 +91,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Null_ObserverStrategy : public TAO_EC_Obser
 {
 public:
   /// Constructor
-  TAO_EC_Null_ObserverStrategy (void);
+  TAO_EC_Null_ObserverStrategy ();
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
@@ -130,7 +130,7 @@ public:
                                  ACE_Lock* lock);
 
   /// Destructor
-  virtual ~TAO_EC_Basic_ObserverStrategy (void);
+  virtual ~TAO_EC_Basic_ObserverStrategy ();
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
@@ -156,7 +156,7 @@ public:
    */
   struct Observer_Entry
   {
-    Observer_Entry (void);
+    Observer_Entry ();
     Observer_Entry (RtecEventChannelAdmin::Observer_Handle h,
                     RtecEventChannelAdmin::Observer_ptr o);
 
@@ -241,7 +241,7 @@ public:
                                     ACE_Lock* lock);
 
   /// Destructor
-  virtual ~TAO_EC_Reactive_ObserverStrategy (void);
+  virtual ~TAO_EC_Reactive_ObserverStrategy ();
 
 protected:
   /// Helpers.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index c2a5c559043..079c334476b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -46,7 +46,7 @@ public:
   TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel_Base* ec);
 
   /// Destructor
-  virtual ~TAO_EC_Per_Supplier_Filter (void);
+  virtual ~TAO_EC_Per_Supplier_Filter ();
 
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
@@ -54,13 +54,13 @@ public:
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
                                      const TAO_EC_QOS_Info &event_info);
-  virtual CORBA::ULong _decr_refcnt (void);
-  virtual CORBA::ULong _incr_refcnt (void);
+  virtual CORBA::ULong _decr_refcnt ();
+  virtual CORBA::ULong _incr_refcnt ();
 
 private:
   /// The event channel, used to locate the set of consumers.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index 2f83bed94b7..453af2aace7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -42,7 +42,7 @@ public:
   TAO_EC_Prefix_Filter_Builder (TAO_EC_Event_Channel_Base* ec);
 
   /// destructor...
-  virtual ~TAO_EC_Prefix_Filter_Builder (void);
+  virtual ~TAO_EC_Prefix_Filter_Builder ();
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 4e02c41c415..01fb9781875 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -62,27 +62,27 @@ public:
   TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_EC_ProxyPushConsumer (void);
+  virtual ~TAO_EC_ProxyPushConsumer ();
 
   /// Activate in the POA
   virtual void activate (
           RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate (void);
+  virtual void deactivate ();
 
   /// Disconnect this from
   virtual void disconnect_push_consumer () = 0;
 
   /// Return false if no supplier is connected...
-  CORBA::Boolean is_connected (void) const;
+  CORBA::Boolean is_connected () const;
 
   /// Return the consumer object reference. It returns nil() if it has
   /// not connected yet.
-  RtecEventComm::PushSupplier_ptr supplier (void) const;
+  RtecEventComm::PushSupplier_ptr supplier () const;
 
   /// The QoS (subscription) used to connect to the EC.
-  const RtecEventChannelAdmin::SupplierQOS& publications (void) const;
+  const RtecEventChannelAdmin::SupplierQOS& publications () const;
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -104,15 +104,15 @@ public:
   virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// The QoS (subscription) used to connect to the EC, assumes the
   /// locks are held, use with care!
-  const RtecEventChannelAdmin::SupplierQOS& publications_i (void) const;
+  const RtecEventChannelAdmin::SupplierQOS& publications_i () const;
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
 
 protected:
@@ -125,13 +125,13 @@ protected:
   // The guard needs access to the following protected methods.
 
   /// The private version (without locking) of is_connected().
-  CORBA::Boolean is_connected_i (void) const;
+  CORBA::Boolean is_connected_i () const;
 
   /// Return the current filter, assumes the locks are held.
-  TAO_EC_Supplier_Filter *filter_i (void) const;
+  TAO_EC_Supplier_Filter *filter_i () const;
 
   /// Release the filter and the supplier
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// The supplier admin, used for activation and memory management.
   TAO_EC_Event_Channel_Base* event_channel_;
@@ -160,10 +160,10 @@ protected:
 
 private:
   /// Template method hooks.
-  virtual void shutdown_hook (void);
-  virtual void refcount_zero_hook (void);
+  virtual void shutdown_hook ();
+  virtual void refcount_zero_hook ();
 
-  virtual PortableServer::ObjectId object_id (void) = 0;
+  virtual PortableServer::ObjectId object_id () = 0;
 };
 
 // ****************************************************************
@@ -188,10 +188,10 @@ public:
                                   TAO_EC_ProxyPushConsumer *proxy);
 
   /// Destructor
-  ~TAO_EC_ProxyPushConsumer_Guard (void);
+  ~TAO_EC_ProxyPushConsumer_Guard ();
 
   /// Returns true if the reference count successfully acquired
-  bool locked (void) const;
+  bool locked () const;
 
   TAO_EC_Supplier_Filter *filter;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 68b378bcb3e..65e699545b2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -62,32 +62,32 @@ public:
   TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
 
   /// Destructor...
-  virtual ~TAO_EC_ProxyPushSupplier (void);
+  virtual ~TAO_EC_ProxyPushSupplier ();
 
   /// Activate in the POA
   virtual void activate (
     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate (void) throw ();
+  virtual void deactivate () throw ();
 
   /// Disconnect this from
   virtual void disconnect_push_supplier () = 0;
 
   /// Return false if no consumer is connected...
-  CORBA::Boolean is_connected (void) const;
+  CORBA::Boolean is_connected () const;
 
   /// Return true if it is suspended.
-  CORBA::Boolean is_suspended (void) const;
+  CORBA::Boolean is_suspended () const;
 
   /**
    * Return the consumer object reference. It returns nil() if it has
    * not connected yet.
    */
-  RtecEventComm::PushConsumer_ptr consumer (void) const;
+  RtecEventComm::PushConsumer_ptr consumer () const;
 
   /// The QoS (subscription) used to connect to the EC.
-  const RtecEventChannelAdmin::ConsumerQOS& subscriptions (void) const;
+  const RtecEventChannelAdmin::ConsumerQOS& subscriptions () const;
 
   /// Concrete implementations can use this methods to keep track of
   /// the suppliers that publish its events.
@@ -102,7 +102,7 @@ public:
   virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier);
 
   /// The event channel is shutting down
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Pushes to the consumer, verifies that it is connected and that it
   /// is not suspended.
@@ -124,8 +124,8 @@ public:
   CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   /// Increment and decrement the reference count.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
+  CORBA::ULong _incr_refcnt ();
+  CORBA::ULong _decr_refcnt ();
 
   // = The TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet &event,
@@ -136,8 +136,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet &event,
                             TAO_EC_QOS_Info &qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader &header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader &header,
                                 const TAO_EC_QOS_Info &qos_info);
@@ -148,16 +148,16 @@ protected:
   void consumer (RtecEventComm::PushConsumer_ptr consumer);
   void consumer_i (RtecEventComm::PushConsumer_ptr consumer);
 
-  void suspend_connection_i (void);
-  void resume_connection_i (void);
-  void suspend_connection_locked (void);
-  void resume_connection_locked (void);
+  void suspend_connection_i ();
+  void resume_connection_i ();
+  void suspend_connection_locked ();
+  void resume_connection_locked ();
 
   /// The private version (without locking) of is_connected().
-  CORBA::Boolean is_connected_i (void) const;
+  CORBA::Boolean is_connected_i () const;
 
   /// Release the child and the consumer
-  void cleanup_i (void);
+  void cleanup_i ();
 
   /// The Event Channel that owns this object.
   TAO_EC_Event_Channel_Base* event_channel_;
@@ -188,9 +188,9 @@ protected:
 private:
 
   /// Template method hooks.
-  virtual void refcount_zero_hook (void);
+  virtual void refcount_zero_hook ();
   virtual void pre_dispatch_hook (RtecEventComm::EventSet&);
-  virtual PortableServer::ObjectId object_id (void) = 0;
+  virtual PortableServer::ObjectId object_id () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 701f280f40e..97e7fef5c6d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -40,7 +40,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_QOS_Info
 {
 public:
   /// Constructor
-  TAO_EC_QOS_Info (void);
+  TAO_EC_QOS_Info ();
 
   /// Copy constructor, it does the obvious thing, but if it is not
   /// here the HP/aCC compiler breaks.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 5218d068061..3d4f9b0645a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -77,15 +77,15 @@ public:
                                    CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_EC_Reactive_ConsumerControl (void);
+  virtual ~TAO_EC_Reactive_ConsumerControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_ConsumerControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy);
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &);
@@ -93,7 +93,7 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (void);
+  void query_consumers ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index 2ede72e6740..ce9c76ad799 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -39,11 +39,11 @@ class TAO_RTEvent_Serv_Export TAO_EC_Reactive_Dispatching : public TAO_EC_Dispat
 public:
   /// The scheduler is used to find the range of priorities and similar
   /// info.
-  TAO_EC_Reactive_Dispatching (void);
+  TAO_EC_Reactive_Dispatching ();
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 949cd581af7..64ae0a9f4e7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -87,15 +87,15 @@ public:
                                    CORBA::ORB_ptr orb);
 
   /// Destructor.
-  virtual ~TAO_EC_Reactive_SupplierControl (void);
+  virtual ~TAO_EC_Reactive_SupplierControl ();
 
   /// Receive the timeout from the adapter
   void handle_timeout (const ACE_Time_Value &tv,
                        const void* arg);
 
   // = Documented in TAO_EC_SupplierControl
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
   virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy);
   virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy,
                                  CORBA::SystemException &);
@@ -103,7 +103,7 @@ public:
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (void);
+  void query_suppliers ();
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index 4e7a0a6b7d4..1076a3e41d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -42,11 +42,11 @@ public:
   TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor = 0);
 
   /// destructor
-  virtual ~TAO_EC_Reactive_Timeout_Generator (void);
+  virtual ~TAO_EC_Reactive_Timeout_Generator ();
 
   // = The TAO_EC_Timeout_Generator methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual int schedule_timer (TAO_EC_Timeout_Filter* filter,
                               const ACE_Time_Value& delta,
                               const ACE_Time_Value& interval);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index ecb4532fc30..6216f869b2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -47,7 +47,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Scheduling_Strategy
 {
 public:
   /// Destructor
-  virtual ~TAO_EC_Scheduling_Strategy (void);
+  virtual ~TAO_EC_Scheduling_Strategy ();
 
   /// Add all the dependencies between @a supplier and @a consumer
   virtual void add_proxy_supplier_dependencies (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index a6aae47eb68..d388cb29734 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -48,14 +48,14 @@ public:
   TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base* event_channel);
 
   /// destructor...
-  virtual ~TAO_EC_SupplierAdmin (void);
+  virtual ~TAO_EC_SupplierAdmin ();
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (void);
+      obtain_push_consumer ();
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual PortableServer::POA_ptr _default_POA ();
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 68a36a5ea74..99d3805f1df 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -47,15 +47,15 @@ class TAO_RTEvent_Serv_Export TAO_EC_SupplierControl
 {
 public:
   /// Constructor.
-  TAO_EC_SupplierControl (void);
+  TAO_EC_SupplierControl ();
 
   /// Destructor.
-  virtual ~TAO_EC_SupplierControl (void);
+  virtual ~TAO_EC_SupplierControl ();
 
   /// Activate any internal threads or timers used to poll the state of
   /// the suppliers
-  virtual int activate (void);
-  virtual int shutdown (void);
+  virtual int activate ();
+  virtual int shutdown ();
 
   /**
    * Invoked by helper classes when they detect that a supplier does
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 50872b9d5aa..e5f8204bbc0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -67,7 +67,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter
 {
 public:
   /// Destructor
-  virtual ~TAO_EC_Supplier_Filter (void);
+  virtual ~TAO_EC_Supplier_Filter ();
 
   /**
    * Whenever a ProxyPushConsumer is initialized it calls this method
@@ -96,7 +96,7 @@ public:
   virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier) = 0;
 
   /// The event channel is shutting down.
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
   /// The ProxyPushConsumer delegates on this class to actually send
   /// the event.
@@ -110,8 +110,8 @@ public:
 
   /// Increment and decrement the reference count, locking must be
   /// provided by the user.
-  virtual CORBA::ULong _incr_refcnt (void) = 0;
-  virtual CORBA::ULong _decr_refcnt (void) = 0;
+  virtual CORBA::ULong _incr_refcnt () = 0;
+  virtual CORBA::ULong _decr_refcnt () = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index b23635b80af..0a363d62a02 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -41,7 +41,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Supplier_Filter_Builder
 {
 public:
   /// Destructor...
-  virtual ~TAO_EC_Supplier_Filter_Builder (void);
+  virtual ~TAO_EC_Supplier_Filter_Builder ();
 
   /**
    * Create the filter. The consumer is bound to the returned
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index d5af34899bf..6715b883f17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -44,8 +44,8 @@ public:
   ~TAO_EC_TPC_Dispatching ();
 
   // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
+  virtual void activate ();
+  virtual void shutdown ();
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
index 2e5fbed19b0..e7e189cf5cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
@@ -30,14 +30,14 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_Factory : public TAO_EC_Default_Factory
 {
 public:
   /// Constructor
-  TAO_EC_TPC_Factory (void);
+  TAO_EC_TPC_Factory ();
 
   /// destructor...
-  virtual ~TAO_EC_TPC_Factory (void);
+  virtual ~TAO_EC_TPC_Factory ();
 
   /// Helper function to register the default factory into the service
   /// configurator.
-  static int init_svcs (void);
+  static int init_svcs ();
 
   // = The Service_Object entry points
   virtual int init (int argc, ACE_TCHAR* argv[]);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
index 8b617a74f95..a6077c76874 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
@@ -29,9 +29,9 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_ProxyPushConsumer :
 {
 public:
   TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec);
-  virtual ~TAO_EC_TPC_ProxyPushConsumer (void);
+  virtual ~TAO_EC_TPC_ProxyPushConsumer ();
 
-  virtual void disconnect_push_consumer (void);
+  virtual void disconnect_push_consumer ();
 
 private:
   typedef TAO_EC_Default_ProxyPushConsumer BASECLASS;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index 5fd466c2f11..c2183f1b1b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -28,7 +28,7 @@ public:
   TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
 
   /// Dtor
-  virtual ~TAO_EC_TPC_ProxyPushSupplier (void);
+  virtual ~TAO_EC_TPC_ProxyPushSupplier ();
 
   /*! These are overridden from the base class in order to maintain the
        map in the dispatcher class. */
@@ -38,7 +38,7 @@ public:
                 RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS &qos);
 
-  virtual void disconnect_push_supplier (void);
+  virtual void disconnect_push_supplier ();
 
 private:
   typedef TAO_EC_Default_ProxyPushSupplier BASECLASS;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index 333266db7d4..917b2ef4b83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -48,13 +48,13 @@ public:
                          RtecEventComm::Time period);
 
   /// Destructor.
-  virtual ~TAO_EC_Timeout_Filter (void);
+  virtual ~TAO_EC_Timeout_Filter ();
 
   /// Return the QOS_Info for this Timeout filter.
-  const TAO_EC_QOS_Info& qos_info (void) const;
+  const TAO_EC_QOS_Info& qos_info () const;
 
   /// The type of timeout event that we generate.
-  RtecEventComm::EventType type (void) const;
+  RtecEventComm::EventType type () const;
 
   /// Callback from the Timeout_Generator
   void push_to_proxy (const RtecEventComm::EventSet& event,
@@ -70,8 +70,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
index 32f0a576ed5..3ef4d586c2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -46,14 +46,14 @@ class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Generator
 {
 public:
   /// destructor
-  virtual ~TAO_EC_Timeout_Generator (void);
+  virtual ~TAO_EC_Timeout_Generator ();
 
   /// Activate any internal threads.
-  virtual void activate (void) = 0;
+  virtual void activate () = 0;
 
   /// Deactivate any internal threads, clients can destroy the object
   /// after calling this method.
-  virtual void shutdown (void) = 0;
+  virtual void shutdown () = 0;
 
   /// Add a timer at the given priority, returns the timer ID.
   virtual int schedule_timer (TAO_EC_Timeout_Filter* filter,
@@ -80,7 +80,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Timeout_Adapter : public ACE_Event_Handler
 {
 public:
   /// Default construction.
-  TAO_EC_Timeout_Adapter (void);
+  TAO_EC_Timeout_Adapter ();
 
 private:
   /// Casts @a act to EC_Filter and dispatches an event to it.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 0282d01b7c7..64994b1f55f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -54,13 +54,13 @@ public:
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
-  virtual void shutdown (void);
+  virtual void shutdown ();
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
                                      const TAO_EC_QOS_Info &event_info);
-  virtual CORBA::ULong _decr_refcnt (void);
-  virtual CORBA::ULong _incr_refcnt (void);
+  virtual CORBA::ULong _decr_refcnt ();
+  virtual CORBA::ULong _incr_refcnt ();
 
 private:
   /// The event channel, used to locate the set of consumers.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 180d39815ef..4e50f2cc5ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -48,8 +48,8 @@ public:
                      TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
+  virtual void clear ();
+  virtual CORBA::ULong max_event_size () const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index ffe71480a01..51ab32225a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -40,7 +40,7 @@ public:
   TAO_EC_Simple_AddrServer (CORBA::UShort port);
 
   /// Destructor
-  virtual ~TAO_EC_Simple_AddrServer (void);
+  virtual ~TAO_EC_Simple_AddrServer ();
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
index ce31c1afdaf..1b6671c5093 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -98,7 +98,7 @@ public:
                            CORBA::ULong qos_max_len = 0);
 
   /// Death and destruction.
-  ~ACE_ConsumerQOS_Factory (void);
+  ~ACE_ConsumerQOS_Factory ();
 
   /**
    * The Event Channel waits until all the children have accepted at
@@ -117,7 +117,7 @@ public:
 
   /// The consumer wants all the events *except* the group that
   /// follows.
-  int start_negation (void);
+  int start_negation ();
 
   /// Insert a bitmask filter, this acts as a quick rejection mechanism
   /// for the subsequent filters.
@@ -136,7 +136,7 @@ public:
                               CORBA::ULong type_value);
 
   /// Insert a node that accepts any event, useful for bitmask filters.
-  int insert_null_terminator (void);
+  int insert_null_terminator ();
 
   // = Insert operations add to the current conjunction or disjunction
   // group.  These return 0 on success, -1 on failure.  Before insert
@@ -179,10 +179,10 @@ public:
 
   /// Allows conversions to ConsumerQOS, which is expected by the
   /// PushSupplierProxy::connect_push_consumer interface.
-  const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS (void);
+  const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS ();
 
   /// Calls this->get_ConsumerQOS.
-  operator const RtecEventChannelAdmin::ConsumerQOS &(void);
+  operator const RtecEventChannelAdmin::ConsumerQOS &();
 
   static void debug (const RtecEventChannelAdmin::ConsumerQOS& qos);
 
@@ -224,10 +224,10 @@ public:
 
   /// Allows conversions to SupplierQOS, which is expected by the
   /// PushSupplierProxy::connect_push_supplier interface.
-  const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS (void);
+  const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS ();
 
   /// Calls this->get_SupplierQOS().
-  operator const RtecEventChannelAdmin::SupplierQOS &(void);
+  operator const RtecEventChannelAdmin::SupplierQOS &();
 
   static void debug (const RtecEventChannelAdmin::SupplierQOS& qos);
 
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index a33d537d286..83b5f0a45c9 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -41,7 +41,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   protected:
     S_forany x_;
@@ -60,9 +60,9 @@ namespace TAO
   {
   public:
     In_Fixed_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x);
-    virtual ~In_Fixed_Array_Clonable_Argument_T (void);
+    virtual ~In_Fixed_Array_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -86,7 +86,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     S_forany x_;
@@ -109,7 +109,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_forany x_;
@@ -127,16 +127,16 @@ namespace TAO
   class Ret_Fixed_Array_Argument_T : public RetArgument
   {
   public:
-    Ret_Fixed_Array_Argument_T (void);
+    Ret_Fixed_Array_Argument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
-    typename S_forany::_slice_type * excp (void);
-    typename S_forany::_slice_type * retn (void);
+    typename S_forany::_slice_type * excp ();
+    typename S_forany::_slice_type * retn ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index 6b29a0872b6..45c969025fb 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -36,13 +36,13 @@ namespace TAO
   class In_Fixed_Array_SArgument_T : public InArgument
   {
   public:
-    In_Fixed_Array_SArgument_T (void);
+    In_Fixed_Array_SArgument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -58,14 +58,14 @@ namespace TAO
   class Inout_Fixed_Array_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Fixed_Array_SArgument_T (void);
+    Inout_Fixed_Array_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -81,13 +81,13 @@ namespace TAO
   class Out_Fixed_Array_SArgument_T : public OutArgument
   {
   public:
-    Out_Fixed_Array_SArgument_T (void);
+    Out_Fixed_Array_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -105,13 +105,13 @@ namespace TAO
   class Ret_Fixed_Array_SArgument_T : public RetArgument
   {
   public:
-    Ret_Fixed_Array_SArgument_T (void);
+    Ret_Fixed_Array_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index 4e15f8aadf1..0242a21f24a 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -35,13 +35,13 @@ namespace TAO
   {
   public:
 
-    In_Var_Array_SArgument_T (void);
+    In_Var_Array_SArgument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   private:
     mutable typename S_forany::_array_type x_;
@@ -58,14 +58,14 @@ namespace TAO
   class Inout_Var_Array_SArgument_T : public InoutArgument
   {
   public:
-    Inout_Var_Array_SArgument_T (void);
+    Inout_Var_Array_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     typename S_forany::_array_type x_;
@@ -83,13 +83,13 @@ namespace TAO
   class Out_Var_Array_SArgument_T : public OutArgument
   {
   public:
-    Out_Var_Array_SArgument_T (void);
+    Out_Var_Array_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_var x_;
@@ -107,13 +107,13 @@ namespace TAO
   class Ret_Var_Array_SArgument_T : public RetArgument
   {
   public:
-    Ret_Var_Array_SArgument_T (void);
+    Ret_Var_Array_SArgument_T ();
 
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     S_var x_;
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 3a633f2d815..f83e7d86abb 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -40,7 +40,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type const * arg (void) const;
+    typename S_forany::_slice_type const * arg () const;
 
   protected:
     S_forany x_;
@@ -59,9 +59,9 @@ namespace TAO
   {
   public:
     In_Var_Array_Clonable_Argument_T (const typename S_forany::_slice_type * x);
-    virtual ~In_Var_Array_Clonable_Argument_T (void);
+    virtual ~In_Var_Array_Clonable_Argument_T ();
 
-    virtual Argument* clone (void);
+    virtual Argument* clone ();
 
   private:
     bool is_clone_;
@@ -85,7 +85,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type * arg (void);
+    typename S_forany::_slice_type * arg ();
 
   private:
     S_forany x_;
@@ -109,7 +109,7 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
   private:
     typename S_forany::_slice_type *& x_;
@@ -127,16 +127,16 @@ namespace TAO
   class Ret_Var_Array_Argument_T : public RetArgument
   {
   public:
-    Ret_Var_Array_Argument_T (void);
+    Ret_Var_Array_Argument_T ();
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
     virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
-    typename S_forany::_slice_type *& arg (void);
+    typename S_forany::_slice_type *& arg ();
 
-    typename S_forany::_slice_type * excp (void);
-    typename S_forany::_slice_type * retn (void);
+    typename S_forany::_slice_type * excp ();
+    typename S_forany::_slice_type * retn ();
 
   private:
     S_var x_;