Remove redundant void arg

38 files changed, 245 insertions, 245 deletions

diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
index 4d35f4add89..dd627266355 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
@@ -45,7 +45,7 @@ namespace TAO
                      CORBA::TypeCode_ptr,
                      const T &);
     Any_Dual_Impl_T (CORBA::TypeCode_ptr);
-    virtual ~Any_Dual_Impl_T (void);
+    virtual ~Any_Dual_Impl_T ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor,
@@ -64,8 +64,8 @@ namespace TAO
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
     virtual void _tao_decode (TAO_InputCDR &);
 
-    virtual const void *value (void) const;
-    virtual void free_value (void);
+    virtual const void *value () const;
+    virtual void free_value ();
 
   protected:
     void value (const T &);
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
index aa800a6b537..06bbd178928 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -78,8 +78,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal (TAO_OutputCDR & cdr,
                                 CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
+      virtual void tao_duplicate ();
+      virtual void tao_release ();
       //@}
 
     protected:
@@ -94,10 +94,10 @@ namespace TAO
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
-      virtual char const * id_i (void) const;
-      virtual char const * name_i (void) const;
-      virtual CORBA::ULong member_count_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
+      virtual CORBA::ULong member_count_i () const;
       virtual char const * member_name_i (CORBA::ULong index) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const;
       //@}
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index 3ada82f83da..67f3e884033 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -63,7 +63,7 @@ namespace TAO
     : public RequestInterceptor_Adapter
   {
   public:
-    virtual ~ClientRequestInterceptor_Adapter (void);
+    virtual ~ClientRequestInterceptor_Adapter ();
 
     /**
      * @name PortableInterceptor Client Side Interception Points
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
index 0ca15b73e70..0f514b2e3d1 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
@@ -40,9 +40,9 @@ class TAO_Export TAO_ClientRequestInterceptor_Adapter_Factory
   : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (void);
+  virtual ~TAO_ClientRequestInterceptor_Adapter_Factory ();
 
-  virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0;
+  virtual TAO::ClientRequestInterceptor_Adapter *create () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h
index e10b104bf0c..071d6cfd8dc 100644
--- a/TAO/tao/Exception_Data.h
+++ b/TAO/tao/Exception_Data.h
@@ -35,7 +35,7 @@ namespace TAO
   // Function pointer returning a pointer to CORBA::Exception. This is used to
   // describe the allocator for user-defined exceptions that are used internally
   // by the interpreter.
-  typedef CORBA::Exception* (*TAO_Exception_Alloc) (void);
+  typedef CORBA::Exception* (*TAO_Exception_Alloc) ();
 
   /**
    * @struct Exception_Data
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 91e2c97e768..c44772a678d 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -57,11 +57,11 @@ namespace TAO
   class TAO_Export Invocation_Base
   {
   public:
-    virtual ~Invocation_Base (void);
+    virtual ~Invocation_Base ();
 
     /// Accessor and mutator methods
     //@{
-    TAO_Stub *stub (void) const;
+    TAO_Stub *stub () const;
 
     /// Accessor and mutator methods for forwarded object
     /// locations.
@@ -69,7 +69,7 @@ namespace TAO
      * These access methods have to be public so that the
      * PortableInterceptor can use them
      */
-    CORBA::Object_ptr forwarded_reference (void);
+    CORBA::Object_ptr forwarded_reference ();
     void forwarded_reference (CORBA::Object_ptr o);
 
     /// Accessors for the service context list.
@@ -78,33 +78,33 @@ namespace TAO
      * elsewhere. Providing this accessor helps the PI to access this
      * list in both remote and collocated mode.
      */
-    TAO_Service_Context &request_service_context (void);
-    TAO_Service_Context &reply_service_context (void);
+    TAO_Service_Context &request_service_context ();
+    TAO_Service_Context &reply_service_context ();
 
     /// Return the forwarded object location by loosing ownership.
-    CORBA::Object_ptr steal_forwarded_reference (void);
+    CORBA::Object_ptr steal_forwarded_reference ();
 
     /// Return the effective target of the invocation.
     /**
      * Please see the PortableInterceptor specification in the CORBA
      * spec to understand what effective target means.
      */
-    CORBA::Object_ptr effective_target (void) const;
+    CORBA::Object_ptr effective_target () const;
 
     /// Return the target object
-    CORBA::Object_ptr target (void) const;
+    CORBA::Object_ptr target () const;
 
     /// Does this invocation return a response?
-    CORBA::Boolean response_expected (void) const;
+    CORBA::Boolean response_expected () const;
 
     /// Accessor of reply_status of the invocation.
-    GIOP::ReplyStatusType reply_status (void) const;
+    GIOP::ReplyStatusType reply_status () const;
 
     /// Mutator of reply_status of the invocation.
     void reply_status (GIOP::ReplyStatusType s);
 
     /// The operaton details of the invocation
-    TAO_Operation_Details &operation_details (void);
+    TAO_Operation_Details &operation_details ();
     //@}
 
   protected:
@@ -174,19 +174,19 @@ namespace TAO
      *       code must be able to modify this value and use that value
      *       at a later time without being forced to use TSS.
      */
-    size_t &stack_size (void);
+    size_t &stack_size ();
 
-    CORBA::Exception *caught_exception (void);
+    CORBA::Exception *caught_exception ();
 
     /// Change the exception status.
     void exception (CORBA::Exception *exception);
 
     /// Invocation status.
-    TAO::Invocation_Status invoke_status (void) const;
+    TAO::Invocation_Status invoke_status () const;
     /// Mutator to set the invocation status.
     void invoke_status (Invocation_Status s);
 
-    PortableInterceptor::ReplyStatus pi_reply_status (void) const;
+    PortableInterceptor::ReplyStatus pi_reply_status () const;
 
     /// Accessor used to determine if the current invocation is part
     /// of a remote request, and if not, it will be considered to be
@@ -196,22 +196,22 @@ namespace TAO
   protected:
     /// Helper method to invoke send_request interception call to all
     /// the registered interceptors.
-    Invocation_Status send_request_interception (void);
+    Invocation_Status send_request_interception ();
 
     /// Helper method to invoke receive_reply interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_reply_interception (void);
+    Invocation_Status receive_reply_interception ();
 
     /// Helper method to invoke receive_other interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_other_interception (void);
+    Invocation_Status receive_other_interception ();
 
     /// Helper methods to handle interception calls when exceptions
     /// are thrown by the PortableInterceptor.
     PortableInterceptor::ReplyStatus
         handle_any_exception (CORBA::Exception * e);
 
-    PortableInterceptor::ReplyStatus handle_all_exception (void);
+    PortableInterceptor::ReplyStatus handle_all_exception ();
 
   protected:
     /// The client requestor adapter
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 7d3aa640e01..d00ce8384b7 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -69,7 +69,7 @@ public:
 
   /// Destructor: decrements reference count on all references
   /// profiles!
-  ~TAO_MProfile (void);
+  ~TAO_MProfile ();
 
   /// Inits MProfile to hold sz TAO_Profiles.
   /// NOT THREAD SAFE
@@ -88,20 +88,20 @@ public:
   int grow (CORBA::ULong sz);
 
   /// Treat as a circular list.
-  TAO_Profile *get_cnext (void);
+  TAO_Profile *get_cnext ();
 
   /// Get next profile in list, return 0 at end of list.
-  TAO_Profile *get_next (void);
+  TAO_Profile *get_next ();
 
   /// Assume a circular list of profiles.
-  TAO_Profile *get_cprev (void);
+  TAO_Profile *get_cprev ();
 
   /// Get previous profile, stop at beginning of list and return 0.
-  TAO_Profile *get_prev (void);
+  TAO_Profile *get_prev ();
 
   /// Return a pointer to the current profile, will not increment
   /// reference pointer.
-  TAO_Profile *get_current_profile (void);
+  TAO_Profile *get_current_profile ();
 
   /// Return a pointer to the profile referenced by handle void.
   TAO_Profile *get_profile (TAO_PHandle handle);
@@ -109,24 +109,24 @@ public:
   // rem_profile (TAO_PHandle handle); let's wait.
 
   /// Returns the index for the current profile.
-  TAO_PHandle get_current_handle (void);
+  TAO_PHandle get_current_handle ();
 
   /// Returns the index for the current profile.
-  TAO_PHandle get_current_handle (void) const;
+  TAO_PHandle get_current_handle () const;
 
   /// Returns the number of profiles stored in the list (last_+1).
-  CORBA::ULong profile_count (void) const;
+  CORBA::ULong profile_count () const;
 
   /// return the maximum number of profiles that can be stored in this
   /// container, (size_+1)
-  CORBA::ULong size (void) const;
+  CORBA::ULong size () const;
 
   /// Return the profile at position <slot>.  If <slot> is out of range
   /// it returns 0.
   const TAO_Profile* get_profile (CORBA::ULong slot) const;
 
   /// Sets the current slot back to 0.
-  void rewind (void);
+  void rewind ();
 
   /// Return the index of this entry or -1 if it can not be added.
   /// reference count on profile in incremented!
@@ -151,7 +151,7 @@ public:
   void forward_from (TAO_MProfile *mprofiles);
 
   /// Returns a pointer to the profile which was forwarded.
-  TAO_MProfile *forward_from (void);
+  TAO_MProfile *forward_from ();
 
   /**
    * Returns true of there is at least one profile in first which
@@ -171,7 +171,7 @@ public:
 protected:
   /// This method handle the dynamic allocation of the data member
   /// <policy_list_>.
- void create_policy_list (void);
+ void create_policy_list ();
 
 public:
   /// Sets the policies list associated with the profiles
@@ -180,11 +180,11 @@ public:
 
   /// Gets the policies list associated with the profiles
   /// owned by the TAO_MProfile.
-  CORBA::PolicyList *policy_list (void);
+  CORBA::PolicyList *policy_list ();
 
 protected:
   /// Initialize the policy list, demarsharling the policy.
-  void init_policy_list (void);
+  void init_policy_list ();
 
 protected:
   /// Stores the policy list for the profile of this MProfile.
@@ -200,12 +200,12 @@ protected:
 protected:
   /// Return the complete list of profiles, this object retains
   /// ownership!
-  TAO_Profile **pfiles (void) const;
+  TAO_Profile **pfiles () const;
 
 
 private:
   /// Helper method to implement the destructor
-  void cleanup (void);
+  void cleanup ();
 
   /// A helper to give_profile to be used when share is true. This
   /// method is used primarily to help the corbaloc parser create a
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h
index 69b2f23f059..7c973c2b44f 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -46,7 +46,7 @@ namespace TAO
     : public ACE_Service_Object
   {
     public:
-      virtual ~ORBInitializer_Registry_Adapter (void);
+      virtual ~ORBInitializer_Registry_Adapter ();
 
       /// Register an ORBInitializer with the underlying ORBInitializer
       /// array.
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h
index ec7eb332909..0b7a3f6f6a3 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ b/TAO/tao/ORB_Core_Auto_Ptr.h
@@ -45,7 +45,7 @@ public:
   explicit TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0);
   TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap);
   TAO_ORB_Core_Auto_Ptr &operator= (TAO_ORB_Core_Auto_Ptr &rhs);
-  ~TAO_ORB_Core_Auto_Ptr (void);
+  ~TAO_ORB_Core_Auto_Ptr ();
   //@}
 
   /**
@@ -53,8 +53,8 @@ public:
    */
   //@{
   TAO_ORB_Core &operator *() const;
-  TAO_ORB_Core *get (void) const;
-  TAO_ORB_Core *release (void);
+  TAO_ORB_Core *get () const;
+  TAO_ORB_Core *release ();
   void reset (TAO_ORB_Core *p = 0);
   TAO_ORB_Core *operator-> () const;
   //@}
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index fc7a4980394..d2b95eb562e 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -31,7 +31,7 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv)
 }
 
 void
-TAO_ClientRequestInfo::setup_picurrent (void)
+TAO_ClientRequestInfo::setup_picurrent ()
 {
   // Retrieve the thread scope current (no TSS access incurred yet).
   CORBA::Object_ptr pi_current_obj =
@@ -75,7 +75,7 @@ TAO_ClientRequestInfo::get_service_context_i (
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::target (void)
+TAO_ClientRequestInfo::target ()
 {
   this->check_validity ();
 
@@ -83,7 +83,7 @@ TAO_ClientRequestInfo::target (void)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (void)
+TAO_ClientRequestInfo::effective_target ()
 {
   this->check_validity ();
 
@@ -91,7 +91,7 @@ TAO_ClientRequestInfo::effective_target (void)
 }
 
 IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (void)
+TAO_ClientRequestInfo::effective_profile ()
 {
   this->check_validity ();
 
@@ -128,7 +128,7 @@ TAO_ClientRequestInfo::effective_profile (void)
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ClientRequestInfo::received_exception (void)
+TAO_ClientRequestInfo::received_exception ()
 {
   this->check_validity ();
 
@@ -163,7 +163,7 @@ TAO_ClientRequestInfo::received_exception (void)
 }
 
 char *
-TAO_ClientRequestInfo::received_exception_id (void)
+TAO_ClientRequestInfo::received_exception_id ()
 {
   this->check_validity ();
 
@@ -309,7 +309,7 @@ TAO_ClientRequestInfo::add_request_service_context (
 }
 
 CORBA::ULong
-TAO_ClientRequestInfo::request_id (void)
+TAO_ClientRequestInfo::request_id ()
 {
   this->check_validity ();
 
@@ -393,7 +393,7 @@ TAO_ClientRequestInfo::request_id (void)
 }
 
 char *
-TAO_ClientRequestInfo::operation (void)
+TAO_ClientRequestInfo::operation ()
 {
   this->check_validity ();
 
@@ -401,7 +401,7 @@ TAO_ClientRequestInfo::operation (void)
 }
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (void)
+TAO_ClientRequestInfo::arguments ()
 {
   this->check_validity ();
 
@@ -443,7 +443,7 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList &param_list)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (void)
+TAO_ClientRequestInfo::exceptions ()
 {
   this->check_validity ();
 
@@ -481,7 +481,7 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
 }
 
 Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (void)
+TAO_ClientRequestInfo::contexts ()
 {
   this->check_validity ();
 
@@ -489,7 +489,7 @@ TAO_ClientRequestInfo::contexts (void)
 }
 
 Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (void)
+TAO_ClientRequestInfo::operation_context ()
 {
   this->check_validity ();
 
@@ -497,7 +497,7 @@ TAO_ClientRequestInfo::operation_context (void)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::result (void)
+TAO_ClientRequestInfo::result ()
 {
   this->check_validity ();
 
@@ -526,7 +526,7 @@ TAO_ClientRequestInfo::result (CORBA::Any *any)
 }
 
 CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (void)
+TAO_ClientRequestInfo::response_expected ()
 {
   this->check_validity ();
 
@@ -534,7 +534,7 @@ TAO_ClientRequestInfo::response_expected (void)
 }
 
 Messaging::SyncScope
-TAO_ClientRequestInfo::sync_scope (void)
+TAO_ClientRequestInfo::sync_scope ()
 {
   this->check_validity ();
 
@@ -542,7 +542,7 @@ TAO_ClientRequestInfo::sync_scope (void)
 }
 
 PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (void)
+TAO_ClientRequestInfo::reply_status ()
 {
   this->check_validity ();
 
@@ -558,7 +558,7 @@ TAO_ClientRequestInfo::reply_status (void)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (void)
+TAO_ClientRequestInfo::forward_reference ()
 {
   this->check_validity ();
 
@@ -606,7 +606,7 @@ TAO_ClientRequestInfo::get_reply_service_context (IOP::ServiceId id)
 }
 
 void
-TAO_ClientRequestInfo::check_validity (void)
+TAO_ClientRequestInfo::check_validity ()
 {
   if (this->invocation_ == 0)
     throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
@@ -619,7 +619,7 @@ TAO_ClientRequestInfo::tao_ft_expiration_time (TimeBase::TimeT time)
 }
 
 TimeBase::TimeT
-TAO_ClientRequestInfo::tao_ft_expiration_time (void) const
+TAO_ClientRequestInfo::tao_ft_expiration_time () const
 {
   return this->invocation_->operation_details ().ft_expiration_time ();
 }
@@ -631,7 +631,7 @@ TAO_ClientRequestInfo::tao_ft_retention_id (CORBA::Long request_id)
 }
 
 CORBA::Long
-TAO_ClientRequestInfo::tao_ft_retention_id (void) const
+TAO_ClientRequestInfo::tao_ft_retention_id () const
 {
   return this->invocation_->operation_details ().ft_retention_id ();
 }
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index a6e1175950e..fe41ecb1f83 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -75,34 +75,34 @@ public:
 
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
-  virtual CORBA::ULong request_id (void);
+  virtual CORBA::ULong request_id ();
 
   /// Return the operation name for the current request.
-  virtual char * operation (void);
+  virtual char * operation ();
 
   /// Return the list of arguments passed to the current operation.
-  virtual Dynamic::ParameterList * arguments (void);
+  virtual Dynamic::ParameterList * arguments ();
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
-  virtual Dynamic::ExceptionList * exceptions (void);
+  virtual Dynamic::ExceptionList * exceptions ();
 
-  virtual Dynamic::ContextList * contexts (void);
+  virtual Dynamic::ContextList * contexts ();
 
-  virtual Dynamic::RequestContext * operation_context (void);
+  virtual Dynamic::RequestContext * operation_context ();
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
-  virtual CORBA::Any * result (void);
+  virtual CORBA::Any * result ();
 
   /// Returns true for a two-way operation, and false otherwise.
-  virtual CORBA::Boolean response_expected (void);
+  virtual CORBA::Boolean response_expected ();
 
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
-  virtual Messaging::SyncScope sync_scope (void);
+  virtual Messaging::SyncScope sync_scope ();
 
   /// Return the reply status for the current request.
   /**
@@ -110,11 +110,11 @@ public:
    * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
    * TRANSPORT_RETRY, UNKNOWN.
    */
-  virtual PortableInterceptor::ReplyStatus reply_status (void);
+  virtual PortableInterceptor::ReplyStatus reply_status ();
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// return the object reference to which the request was forwarded.
-  virtual CORBA::Object_ptr forward_reference (void);
+  virtual CORBA::Object_ptr forward_reference ();
 
   virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id);
 
@@ -129,23 +129,23 @@ public:
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
-  virtual CORBA::Object_ptr target (void);
+  virtual CORBA::Object_ptr target ();
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
-  virtual CORBA::Object_ptr effective_target (void);
+  virtual CORBA::Object_ptr effective_target ();
 
-  virtual IOP::TaggedProfile * effective_profile (void);
+  virtual IOP::TaggedProfile * effective_profile ();
 
   /// Return an Any containing the received exception, if any.
   /// Otherwise, throw a CORBA::BAD_INV_ORDER exception.
   /**
    * @note There is no trivial way to extract the exception from an Any.
    */
-  virtual CORBA::Any * received_exception (void);
+  virtual CORBA::Any * received_exception ();
 
   /// Return the repository ID for the received exception.
-  virtual char * received_exception_id (void);
+  virtual char * received_exception_id ();
 
   /// Return the first IOP::TaggedComponent that matches the given
   /// IOP::ComponentId in the object reference for the current
@@ -176,13 +176,13 @@ public:
   void tao_ft_expiration_time (TimeBase::TimeT time);
 
   /// Get the absolute FT expiration time for this request
-  TimeBase::TimeT tao_ft_expiration_time (void) const;
+  TimeBase::TimeT tao_ft_expiration_time () const;
 
   /// Set the FT request retention ID for this request.
   void tao_ft_retention_id (CORBA::Long request_id);
 
   /// Get the FT request retention ID for this request.
-  CORBA::Long tao_ft_retention_id (void) const;
+  CORBA::Long tao_ft_retention_id () const;
 
   /*
   * End proprietary FT methods.
@@ -197,11 +197,11 @@ private:
 
   /// Check if this ClientRequestInfo object is called within the
   /// context of a request.
-  void check_validity (void);
+  void check_validity ();
 
   /// Setup thread scope and request scope
   /// PortableInterceptor::Current objects.
-  void setup_picurrent (void);
+  void setup_picurrent ();
 
   /// Helper method to get the request and response service contexts.
   IOP::ServiceContext *get_service_context_i (
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 6d746b2ea5a..2c4a2db3e32 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -255,7 +255,7 @@ namespace TAO
   }
 
   void
-  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
+  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors ()
   {
     this->interceptor_list_.destroy_interceptors ();
   }
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index de01f6487f1..3f1c10c7af9 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -64,7 +64,7 @@ namespace TAO
     , public TAO_RequestInterceptor_Adapter_Impl
   {
   public:
-    ClientRequestInterceptor_Adapter_Impl (void);
+    ClientRequestInterceptor_Adapter_Impl ();
 
     /**
      * @name PortableInterceptor Client Side Interception Points
@@ -101,7 +101,7 @@ namespace TAO
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies);
 
-    virtual void destroy_interceptors (void);
+    virtual void destroy_interceptors ();
 
     virtual PortableInterceptor::ReplyStatus pi_reply_status (
       TAO::Invocation_Base const &invocation_base);
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
index 2b85812b366..10260d213a7 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
@@ -20,7 +20,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::ClientRequestInterceptor_Adapter*
-TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void)
+TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create ()
 {
   TAO::ClientRequestInterceptor_Adapter_Impl* obj = 0;
   ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
index 75b079061b3..2166b6491a8 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
@@ -38,7 +38,7 @@ class TAO_PI_Export TAO_ClientRequestInterceptor_Adapter_Factory_Impl
   : public TAO_ClientRequestInterceptor_Adapter_Factory
 {
 public:
-  virtual TAO::ClientRequestInterceptor_Adapter *create (void);
+  virtual TAO::ClientRequestInterceptor_Adapter *create ();
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl)
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 1006abbccec..aba8e1fb7b8 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -35,7 +35,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (TAO_ORBInitInfo_ptr p)
 }
 
 TAO_ORBInitInfo_ptr
-TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void)
+TAO::Objref_Traits<TAO_ORBInitInfo>::nil ()
 {
   return TAO_ORBInitInfo::_nil ();
 }
@@ -61,12 +61,12 @@ TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core,
 {
 }
 
-TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
+TAO_ORBInitInfo::~TAO_ORBInitInfo ()
 {
 }
 
 CORBA::StringSeq *
-TAO_ORBInitInfo::arguments (void)
+TAO_ORBInitInfo::arguments ()
 {
   this->check_validity ();
 
@@ -94,7 +94,7 @@ TAO_ORBInitInfo::arguments (void)
 }
 
 char *
-TAO_ORBInitInfo::orb_id (void)
+TAO_ORBInitInfo::orb_id ()
 {
   this->check_validity ();
 
@@ -104,7 +104,7 @@ TAO_ORBInitInfo::orb_id (void)
 }
 
 IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (void)
+TAO_ORBInitInfo::codec_factory ()
 {
   if (CORBA::is_nil (this->codec_factory_.in ()))
     {
@@ -277,7 +277,7 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy (
 }
 
 PortableInterceptor::SlotId
-TAO_ORBInitInfo::allocate_slot_id (void)
+TAO_ORBInitInfo::allocate_slot_id ()
 {
   this->check_validity ();
 
@@ -333,7 +333,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup)
 }
 
 void
-TAO_ORBInitInfo::check_validity (void)
+TAO_ORBInitInfo::check_validity ()
 {
   if (this->orb_core_ == 0)
     {
@@ -348,7 +348,7 @@ TAO_ORBInitInfo::check_validity (void)
 }
 
 CORBA::ORB_ptr
-TAO_ORBInitInfo::_get_orb (void)
+TAO_ORBInitInfo::_get_orb ()
 {
   this->check_validity ();
 
@@ -379,7 +379,7 @@ TAO_ORBInitInfo::_duplicate (TAO_ORBInitInfo_ptr obj)
   return obj;
 }
 
-const char* TAO_ORBInitInfo::_interface_repository_id (void) const
+const char* TAO_ORBInitInfo::_interface_repository_id () const
 {
   return "IDL:TAO_ORBInitInfo:1.0";
 }
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index c74c4f5e385..f21bc49245c 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -16,7 +16,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
+TAO::ORBInitializer_Registry::ORBInitializer_Registry ()
   : lock_ (),
     initializers_ ()
 {
@@ -66,7 +66,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
 }
 
 int
-TAO::ORBInitializer_Registry::fini (void)
+TAO::ORBInitializer_Registry::fini ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 27a64f9c5dc..40156abfe85 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -43,7 +43,7 @@ namespace TAO
     : public ORBInitializer_Registry_Adapter
   {
   public:
-    ORBInitializer_Registry (void);
+    ORBInitializer_Registry ();
 
     /// Added to provide registration for the several static service
     /// objects, brought in with this ORBInitializer_Registry
@@ -57,7 +57,7 @@ namespace TAO
 
     /// Service config fini method, release all ORBInitializers at this
     /// moment
-    virtual int fini (void);
+    virtual int fini ();
 
     /// Register an ORBInitializer with the underlying ORBInitializer
     /// array.
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 4a8dde4d7a1..319c44c812a 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // This one is used during static initialization while the other is used
 // when PI is a shared library.
 int
-TAO_PI_Init::Initializer (void)
+TAO_PI_Init::Initializer ()
 {
 #if TAO_HAS_INTERCEPTORS == 1
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_ClientRequestInterceptor_Adapter_Factory_Impl);
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 2c46b826a30..86bb1f2c632 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -46,7 +46,7 @@ namespace
 }
 
 TAO::PICurrent_Impl *
-TAO::PICurrent::tsc (void)
+TAO::PICurrent::tsc ()
 {
   TAO::PICurrent_Impl *impl =
     static_cast<TAO::PICurrent_Impl *> (
@@ -85,7 +85,7 @@ TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier)
 }
 
 CORBA::ORB_ptr
-TAO::PICurrent::_get_orb (void)
+TAO::PICurrent::_get_orb ()
 {
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index 3c3ae41dd95..9f8ccaba8f8 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -171,7 +171,7 @@ TAO::PICurrent_Impl::~PICurrent_Impl ()
 }
 
 void
-TAO::PICurrent_Impl::push (void)
+TAO::PICurrent_Impl::push ()
 {
   if (this->orb_core_) // We have a stack to adjust
     {
@@ -197,7 +197,7 @@ TAO::PICurrent_Impl::push (void)
 }
 
 void
-TAO::PICurrent_Impl::pop (void)
+TAO::PICurrent_Impl::pop ()
 {
   if (this->orb_core_) // We have a stack to adjust
     {
diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index cf36dafbbb1..eb614ce9dbb 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release (
 }
 
 PortableInterceptor::PolicyFactory_ptr
-TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void)
+TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil ()
 {
   return PortableInterceptor::PolicyFactory::_nil ();
 }
@@ -77,10 +77,10 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal (
   return ::CORBA::Object::marshal (p, cdr);
 }
 
-PortableInterceptor::PolicyFactory::PolicyFactory (void)
+PortableInterceptor::PolicyFactory::PolicyFactory ()
 {}
 
-PortableInterceptor::PolicyFactory::~PolicyFactory (void)
+PortableInterceptor::PolicyFactory::~PolicyFactory ()
 {}
 
 PortableInterceptor::PolicyFactory_ptr
@@ -146,7 +146,7 @@ PortableInterceptor::PolicyFactory::_is_a (const char *value)
     }
 }
 
-const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const
+const char* PortableInterceptor::PolicyFactory::_interface_repository_id () const
 {
   return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0";
 }
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index c1d03d3031f..f97f52df981 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -179,7 +179,7 @@ namespace TAO
     static void release (
         ::PortableInterceptor::PolicyFactory_ptr
       );
-    static ::PortableInterceptor::PolicyFactory_ptr nil (void);
+    static ::PortableInterceptor::PolicyFactory_ptr nil ();
     static ::CORBA::Boolean marshal (
         ::PortableInterceptor::PolicyFactory_ptr p,
         TAO_OutputCDR & cdr
diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp
index 81cd0387879..252e0f9f1cf 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.cpp
+++ b/TAO/tao/PI/PolicyFactory_Loader.cpp
@@ -17,7 +17,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PolicyFactory_Registry_Adapter*
-TAO_PolicyFactory_Loader::create (void)
+TAO_PolicyFactory_Loader::create ()
 {
   TAO::PolicyFactory_Registry_Adapter* obj = 0;
   ACE_NEW_RETURN (obj,
@@ -27,7 +27,7 @@ TAO_PolicyFactory_Loader::create (void)
 }
 
 int
-TAO_PolicyFactory_Loader::Initializer (void)
+TAO_PolicyFactory_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader);
 }
diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h
index d96c7d39abd..98ad244420f 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.h
+++ b/TAO/tao/PI/PolicyFactory_Loader.h
@@ -31,10 +31,10 @@ class TAO_PI_Export TAO_PolicyFactory_Loader
 {
 public:
   /// Creates a Codec factory and returns it.
-  virtual TAO::PolicyFactory_Registry_Adapter* create (void);
+  virtual TAO::PolicyFactory_Registry_Adapter* create ();
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index 0ff905feef5..fc8d396aece 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -6,12 +6,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
+TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry ()
   : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
 {
 }
 
-TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void)
+TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry ()
 {
   const TABLE::iterator end (this->factories_.end ());
 
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index 942851d3e97..9ea5fb17330 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -54,10 +54,10 @@ public:
 
 public:
   /// Constructor
-  TAO_PolicyFactory_Registry (void);
+  TAO_PolicyFactory_Registry ();
 
   /// Destructor.  Releases duplicated PolicyFactory references.
-  ~TAO_PolicyFactory_Registry (void);
+  ~TAO_PolicyFactory_Registry ();
 
   /// Register a PolicyFactory with the underlying PolicyFactory
   /// sequence.  This method should only be called during ORB
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 60906fdddf0..85938fec13d 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -17,7 +17,7 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
 }
 
 CORBA::Policy_ptr
-TAO_ProcessingModePolicy::copy (void)
+TAO_ProcessingModePolicy::copy ()
 {
   TAO_ProcessingModePolicy *copy {};
   ACE_NEW_THROW_EX (copy,
@@ -28,18 +28,18 @@ TAO_ProcessingModePolicy::copy (void)
 }
 
 void
-TAO_ProcessingModePolicy::destroy (void)
+TAO_ProcessingModePolicy::destroy ()
 {
 }
 
 PortableInterceptor::ProcessingMode
-TAO_ProcessingModePolicy::processing_mode (void)
+TAO_ProcessingModePolicy::processing_mode ()
 {
   return processing_mode_;
 }
 
 CORBA::PolicyType
-TAO_ProcessingModePolicy::policy_type (void)
+TAO_ProcessingModePolicy::policy_type ()
 {
   return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE;
 }
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index ce6d12690db..ecc270c8e3d 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -44,13 +44,13 @@ public:
   /// Constructor.
   TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode);
 
-  virtual PortableInterceptor::ProcessingMode processing_mode (void);
+  virtual PortableInterceptor::ProcessingMode processing_mode ();
 
-  virtual CORBA::PolicyType policy_type (void);
+  virtual CORBA::PolicyType policy_type ();
 
-  virtual CORBA::Policy_ptr copy (void);
+  virtual CORBA::Policy_ptr copy ();
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
 private:
   /// The attribute
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 29ec2f53511..adb2c7c0597 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -13,7 +13,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
-TAO_RequestInfo_Util::make_parameter_list (void)
+TAO_RequestInfo_Util::make_parameter_list ()
 {
   Dynamic::ParameterList *parameter_list = 0;
   ACE_NEW_THROW_EX (parameter_list,
@@ -30,7 +30,7 @@ TAO_RequestInfo_Util::make_parameter_list (void)
 }
 
 Dynamic::ExceptionList *
-TAO_RequestInfo_Util::make_exception_list (void)
+TAO_RequestInfo_Util::make_exception_list ()
 {
   Dynamic::ExceptionList *exception_list = 0;
   ACE_NEW_THROW_EX (exception_list,
@@ -47,7 +47,7 @@ TAO_RequestInfo_Util::make_exception_list (void)
 }
 
 Dynamic::ContextList *
-TAO_RequestInfo_Util::make_context_list (void)
+TAO_RequestInfo_Util::make_context_list ()
 {
   Dynamic::ContextList *context_list = 0;
   ACE_NEW_THROW_EX (context_list,
@@ -64,7 +64,7 @@ TAO_RequestInfo_Util::make_context_list (void)
 }
 
 Dynamic::RequestContext *
-TAO_RequestInfo_Util::make_request_context (void)
+TAO_RequestInfo_Util::make_request_context ()
 {
   Dynamic::RequestContext *request_context = 0;
   ACE_NEW_THROW_EX (request_context,
diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
index ce14ce596b4..b9c074cd79e 100644
--- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp
@@ -20,7 +20,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl (void)
+TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl ()
 {
 }
 
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h
index 275a419cbc2..e359b804871 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.h
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.h
@@ -53,7 +53,7 @@ namespace TAO
   class TAO_Export PolicyFactory_Registry_Adapter
   {
   public:
-    virtual ~PolicyFactory_Registry_Adapter (void);
+    virtual ~PolicyFactory_Registry_Adapter ();
 
     /// Register a PolicyFactory with the underlying PolicyFactory
     /// sequence.  This method should only be called during ORB
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h
index bc214fe55ba..19b6e383f72 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.h
+++ b/TAO/tao/PolicyFactory_Registry_Factory.h
@@ -34,9 +34,9 @@ class TAO_Export TAO_PolicyFactory_Registry_Factory :
   public ACE_Service_Object
 {
 public:
-  virtual ~TAO_PolicyFactory_Registry_Factory (void);
+  virtual ~TAO_PolicyFactory_Registry_Factory ();
 
-  virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0;
+  virtual TAO::PolicyFactory_Registry_Adapter* create () = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index c1d2f4ed21a..fc2eee3bee7 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -66,32 +66,32 @@ public:
   */
   //@{
   /// The tag, each concrete class will have a specific tag value.
-  CORBA::ULong tag (void) const;
+  CORBA::ULong tag () const;
 
   /// Return a pointer to this profile's version.  This object
   /// maintains ownership.
-  const TAO_GIOP_Message_Version &version (void) const;
+  const TAO_GIOP_Message_Version &version () const;
 
   /// Get a pointer to the TAO_ORB_Core.
-  TAO_ORB_Core *orb_core (void) const;
+  TAO_ORB_Core *orb_core () const;
 
   /// Increase the reference count by one on this object.
-  unsigned long _incr_refcnt (void);
+  unsigned long _incr_refcnt ();
 
   /// Decrement the object's reference count.  When this count goes to
   /// 0 this object will be deleted.
-  unsigned long _decr_refcnt (void);
+  unsigned long _decr_refcnt ();
 
   /// Keep a pointer to the forwarded profile
   void forward_to (TAO_MProfile *mprofiles);
 
   /// MProfile accessor
-  TAO_MProfile* forward_to (void);
+  TAO_MProfile* forward_to ();
 
   /// Access the tagged components, notice that they they could be
   /// empty (or ignored) for non-GIOP protocols (and even for GIOP-1.0)
-  const TAO_Tagged_Components& tagged_components (void) const;
-  TAO_Tagged_Components& tagged_components (void);
+  const TAO_Tagged_Components& tagged_components () const;
+  TAO_Tagged_Components& tagged_components ();
 
   /// Add the given tagged component to the profile.
   void add_tagged_component (const IOP::TaggedComponent &component);
@@ -100,14 +100,14 @@ public:
    * Return the current addressing mode for this profile.
    * In almost all cases, this is TAO_Target_Specification::Key_Addr.
    */
-  CORBA::Short addressing_mode (void) const;
+  CORBA::Short addressing_mode () const;
 
   /// @deprecated Return a reference to the Object Key.
-  const TAO::ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key () const;
 
   /// Obtain the object key, return 0 if the profile cannot be parsed.
   /// The memory is owned by the caller!
-  TAO::ObjectKey *_key (void) const;
+  TAO::ObjectKey *_key () const;
   //@}
 
   /**
@@ -130,7 +130,7 @@ public:
    * return the reference to that. This method is necessary for GIOP
    * 1.2.
    */
-  IOP::TaggedProfile *create_tagged_profile (void);
+  IOP::TaggedProfile *create_tagged_profile ();
 
   /// This method sets the client exposed policies, i.e., the ones
   /// propagated in the IOR, for this profile.
@@ -140,10 +140,10 @@ public:
   virtual void  get_policies (CORBA::PolicyList &policy_list);
 
   /// Returns true if this profile can specify multicast endpoints.
-  virtual int supports_multicast (void) const;
+  virtual int supports_multicast () const;
 
   /// Returns true if this profile supports non blocking oneways
-  virtual bool supports_non_blocking_oneways (void) const;
+  virtual bool supports_non_blocking_oneways () const;
 
   /**
    * Set the addressing mode if a remote servant replies with
@@ -175,7 +175,7 @@ public:
   virtual void addressing_mode (CORBA::Short addr_mode);
 
   /// The object key delimiter.
-  virtual char object_key_delimiter (void) const = 0;
+  virtual char object_key_delimiter () const = 0;
 
   /// Initialize this object using the given input string.
   /// Supports URL style of object references
@@ -184,14 +184,14 @@ public:
   /// Return a string representation for this profile.  Client must
   /// deallocate memory. Only one endpoint is included into the
   /// string.
-  virtual char* to_string (void) const = 0;
+  virtual char* to_string () const = 0;
 
   /**
    * Encodes this profile's endpoints into a tagged component.
    * This is done only if RTCORBA is enabled, since currently this is
    * the only case when we have more than one endpoint per profile.
    */
-  virtual int encode_endpoints (void) = 0;
+  virtual int encode_endpoints () = 0;
 
   /**
    * Encodes this profile's endpoints into protocol specific tagged
@@ -199,14 +199,14 @@ public:
    * endpoints on profiles. The only known implementation is IIOP, using
    * TAG_ALTERNATE_IIOP_ADDRESS components.
    */
-  virtual int encode_alternate_endpoints (void);
+  virtual int encode_alternate_endpoints ();
 
   /**
    * Return a pointer to this profile's endpoint.  If the profile
    * contains more than one endpoint, i.e., a list, the method returns
    * the head of the list.
    */
-  virtual TAO_Endpoint *endpoint (void) = 0;
+  virtual TAO_Endpoint *endpoint () = 0;
 
 
   /**
@@ -219,17 +219,17 @@ public:
    * to facilitate the Endpoint Policy's filtering function.
    * The default implementation of base_endpoint simply returns endpoint.
    */
-  virtual TAO_Endpoint *base_endpoint (void);
+  virtual TAO_Endpoint *base_endpoint ();
 
   /// Return how many endpoints this profile contains.
-  virtual CORBA::ULong endpoint_count (void) const = 0;
+  virtual CORBA::ULong endpoint_count () const = 0;
 
   /**
    * Return the first endpoint in the list that matches some filtering
    * constraint, such as IPv6 compatibility for IIOP endpoints. This
    * method is implemented in terms of TAO_Endpoint::next_filtered().
    */
-  TAO_Endpoint *first_filtered_endpoint (void);
+  TAO_Endpoint *first_filtered_endpoint ();
 
   /// Return the next filtered endpoint in the list after the one
   /// passed in. This method is implemented in terms of
@@ -275,7 +275,7 @@ public:
 
 protected:
   /// If you have a virtual method you need a virtual dtor.
-  virtual ~TAO_Profile (void);
+  virtual ~TAO_Profile ();
 
   /**
    * @name Protected template methods.
@@ -294,7 +294,7 @@ protected:
    * version of TAO or some other ORB.  This is not an error, and we
    * must proceed.  Return 0 on success and -1 on failure.
    */
-  virtual int decode_endpoints (void) = 0;
+  virtual int decode_endpoints () = 0;
 
   /// Protocol specific implementation of parse_string ()
   virtual void parse_string_i (const char *string) = 0;
@@ -331,15 +331,15 @@ protected:
 private:
 
   /// This object keeps ownership of this object
-  TAO_MProfile *forward_to_i (void);
+  TAO_MProfile *forward_to_i ();
 
   /// Verify that the current ORB's configuration supports tagged
   /// components in IORs.
-  void verify_orb_configuration (void);
+  void verify_orb_configuration ();
 
   /// Verify that the given profile supports tagged components,
   /// i.e. is not a GIOP 1.0 profile.
-  void verify_profile_version (void);
+  void verify_profile_version ();
 
   // Profiles should not be copied or assigned!
   TAO_Profile (const TAO_Profile&);
@@ -425,19 +425,19 @@ public:
 
   // = The TAO_Profile methods look above
   virtual void parse_string (const char *string);
-  virtual char object_key_delimiter (void) const;
-  virtual char* to_string (void) const;
+  virtual char object_key_delimiter () const;
+  virtual char* to_string () const;
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
-  virtual int encode_endpoints (void);
+  virtual int encode_endpoints ();
 
-  virtual TAO::ObjectKey *_key (void) const;
-  virtual TAO_Endpoint *endpoint (void);
-  virtual CORBA::ULong endpoint_count (void) const;
+  virtual TAO::ObjectKey *_key () const;
+  virtual TAO_Endpoint *endpoint ();
+  virtual CORBA::ULong endpoint_count () const;
   virtual CORBA::ULong hash (CORBA::ULong max);
 
   virtual int decode_profile (TAO_InputCDR &cdr);
-  virtual int decode_endpoints (void);
+  virtual int decode_endpoints ();
 
 protected:
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile);
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index a2b56708493..9f31b1b878c 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -89,7 +89,7 @@ public:
 
   /// Return the queueing strategy to be used in by the transport.
   /// Selection will be based on the SyncScope policies.
-  TAO::Transport_Queueing_Strategy *transport_queueing_strategy (void);
+  TAO::Transport_Queueing_Strategy *transport_queueing_strategy ();
 
   /// All objref representations carry around a type ID.
   CORBA::String_var type_id;
@@ -114,39 +114,39 @@ public:
             TAO_ORB_Core *orb_core);
 
   // = Memory management.
-  void _incr_refcnt (void);
-  void _decr_refcnt (void);
+  void _incr_refcnt ();
+  void _decr_refcnt ();
 
   /// Return the Profile lock. This lock can be used at places where
   /// profiles need to be edited.
-  const TAO_SYNCH_MUTEX& profile_lock (void) const;
+  const TAO_SYNCH_MUTEX& profile_lock () const;
 
   /// Manage the base (non-forwarded) profiles.
   /// Returns a pointer to the profile_in_use object.  This object
   /// retains ownership of this profile.
-  TAO_Profile *profile_in_use (void);
+  TAO_Profile *profile_in_use ();
 
   /// Return the ObjectKey
-  const TAO::ObjectKey &object_key (void) const;
+  const TAO::ObjectKey &object_key () const;
 
   /**
    * Copy of the profile list, user must free memory when done.
    * although the user can call make_profiles() then reorder
    * the list and give it back to TAO_Stub.
    */
-  TAO_MProfile *make_profiles (void);
+  TAO_MProfile *make_profiles ();
 
   /// Obtain a reference to the basic profile set.
-  const TAO_MProfile& base_profiles (void) const;
+  const TAO_MProfile& base_profiles () const;
 
   /// Obtain a reference to the basic profile set.
-  TAO_MProfile& base_profiles (void);
+  TAO_MProfile& base_profiles ();
 
   /// Obtain a pointer to the forwarded profile set
-  const TAO_MProfile *forward_profiles (void) const;
+  const TAO_MProfile *forward_profiles () const;
 
   /// Obtain a pointer to the forwarded profile set
-  TAO_MProfile *forward_profiles (void);
+  TAO_MProfile *forward_profiles ();
 
   /// True if permanent location forward occurred, in this case the lock must be set and the
 
@@ -159,7 +159,7 @@ public:
    * profile_in_use_ is set to the first profile in the base_profiles
    * list.
    */
-  TAO_Profile *next_profile (void);
+  TAO_Profile *next_profile ();
 
   /**
    * THREAD SAFE
@@ -167,23 +167,23 @@ public:
    * profile and if there are anmy existing forward profiles they are
    * reset.
    */
-  void reset_profiles (void);
+  void reset_profiles ();
 
   /// Returns true if the profile in use is
   /// the same as the profile in use after
   /// reset_profiles() is called.
-  CORBA::Boolean at_starting_profile (void) const;
+  CORBA::Boolean at_starting_profile () const;
 
   /// Returns true if a forward profile has successfully been used.
   /// profile_success_ && forward_profiles_
-  CORBA::Boolean valid_forward_profile (void);
+  CORBA::Boolean valid_forward_profile ();
 
   /// NON-THREAD-SAFE.  Will set profile_success_ to true.
-  void set_valid_profile (void);
+  void set_valid_profile ();
 
   /// Returns true if a connection was successful with at least
   /// one profile.
-  CORBA::Boolean valid_profile (void) const;
+  CORBA::Boolean valid_profile () const;
 
   /// Initialize the base_profiles_ and set profile_in_use_ to
   /// reference the first profile.
@@ -207,22 +207,22 @@ public:
    * Used to get the next profile after the one being used has
    * failed during the initial connect or send of the message!
    */
-  CORBA::Boolean next_profile_retry (void);
+  CORBA::Boolean next_profile_retry ();
 
   /// Accessor.
-  TAO_ORB_Core* orb_core (void) const;
+  TAO_ORB_Core* orb_core () const;
 
   /// Is this stub collocated with the servant?
-  CORBA::Boolean is_collocated (void) const;
+  CORBA::Boolean is_collocated () const;
 
   /// Mutator to mark this stub as being collocated with the servant.
   void is_collocated (CORBA::Boolean);
 
   /// This returns a duplicated ORB pointer.
-  CORBA::ORB_ptr servant_orb_ptr (void);
+  CORBA::ORB_ptr servant_orb_ptr ();
 
   /// This returns the ORB var itself (generally for temporary use).
-  CORBA::ORB_var &servant_orb_var (void);
+  CORBA::ORB_var &servant_orb_var ();
 
   /**
    * Accesor and mutator for the servant ORB.  Notice that the mutator
@@ -236,7 +236,7 @@ public:
   void collocated_servant (TAO_Abstract_ServantBase* servant);
 
   /// Accessor for the servant reference in collocated cases.
-  TAO_Abstract_ServantBase* collocated_servant (void) const;
+  TAO_Abstract_ServantBase* collocated_servant () const;
 
   /// Mutator for setting the object proxy broker pointer.
   /// CORBA::Objects using this stub will use this for standard calls
@@ -246,7 +246,7 @@ public:
   /// Accessor for getting the object proxy broker pointer.
   /// CORBA::Objects using this stub use this for standard calls
   /// like is_a; get_interface; etc...
-  TAO::Object_Proxy_Broker *object_proxy_broker (void) const;
+  TAO::Object_Proxy_Broker *object_proxy_broker () const;
 
   /**
    * Create the IOP::IOR info. We will create the info at most once.
@@ -259,14 +259,14 @@ public:
    * This method is intended to be used only by the CORBA::Object
    * class.
    */
-  void destroy (void);
+  void destroy ();
 
   /// Return the cached value from the ORB_Core.
   /**
    * This flag indicates whether the stub code should make use of the
    * collocation opportunities that are available to the ORB.
    */
-  CORBA::Boolean optimize_collocation_objects (void) const;
+  CORBA::Boolean optimize_collocation_objects () const;
 
   /// Needed to avoid copying forward_profiles for thread safety
   CORBA::Boolean marshal (TAO_OutputCDR&);
@@ -278,13 +278,13 @@ protected:
 
   /// Destructor is to be called only through _decr_refcnt() to
   /// enforce proper reference counting.
-  virtual ~TAO_Stub (void);
+  virtual ~TAO_Stub ();
 
   /// NON-THREAD SAFE version of reset_profiles (void);
-  void reset_profiles_i (void);
+  void reset_profiles_i ();
 
   /// NON-THREAD SAFE version of next_profile (void)
-  TAO_Profile *next_profile_i (void);
+  TAO_Profile *next_profile_i ();
 
 private:
   /// Makes a copy of the profile and frees the existing profile_in_use.
@@ -297,14 +297,14 @@ private:
 
   /// NON-THREAD-SAFE.  Utility method which unrolls (removes or pops)
   /// the top most forwarding profile list.
-  void forward_back_one (void);
+  void forward_back_one ();
 
    /// NOT THREAD-SAFE.  Utility method which pops all forward profile
    /// lists and resets the forward_profiles_ pointer.
   void reset_forward ();
 
   /// NON-THREAD-SAFE.  utility method for next_profile.
-  TAO_Profile *next_forward_profile (void);
+  TAO_Profile *next_forward_profile ();
 
   /// THREAD-SAFE Create the IOR info
   int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info);
@@ -434,12 +434,12 @@ public:
   explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = 0);
   TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap);
   TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs);
-  ~TAO_Stub_Auto_Ptr (void);
+  ~TAO_Stub_Auto_Ptr ();
 
   // = Accessor methods.
   TAO_Stub &operator *() const;
-  TAO_Stub *get (void) const;
-  TAO_Stub *release (void);
+  TAO_Stub *get () const;
+  TAO_Stub *release ();
   void reset (TAO_Stub *p = 0);
   TAO_Stub *operator-> () const;
 
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
index aab03fea27d..89c4e2ac87d 100644
--- a/TAO/tao/Tagged_Components.h
+++ b/TAO/tao/Tagged_Components.h
@@ -56,7 +56,7 @@ class TAO_Export TAO_Tagged_Components
 {
 public:
   /// Constructor
-  TAO_Tagged_Components (void);
+  TAO_Tagged_Components ();
 
   // = Standard OMG that require fast access.
   /// The the IOP::TAG_ORB_TYPE component value
@@ -113,7 +113,7 @@ public:
    * MutipleComponentProfile. Added by request from Chris Hafey
    * <chris@stentorsoft.com>
    */
-  IOP::MultipleComponentProfile &components (void);
+  IOP::MultipleComponentProfile &components ();
 
 private:
   /// Helper method to implement set_code_sets()
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index d42e66213d8..9d85feb2355 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -78,46 +78,46 @@ public:
                          const CORBA::ULong ex_count = 0);
 
   /// Operation name
-  const char* opname (void) const;
+  const char* opname () const;
 
   /// Length of the operation name
-  CORBA::ULong opname_len (void) const;
+  CORBA::ULong opname_len () const;
 
   /// Return the flag that indicates whether the operation has any
   /// arguments
-  CORBA::Boolean argument_flag (void) const;
-  CORBA::Boolean in_argument_flag (void) const;
+  CORBA::Boolean argument_flag () const;
+  CORBA::Boolean in_argument_flag () const;
 
   /// Set the response flags
   void response_flags (CORBA::Octet flags);
 
   /// Get the response flags
-  CORBA::Octet response_flags (void) const;
+  CORBA::Octet response_flags () const;
 
   /// Accessors for the service context list
-  IOP::ServiceContextList &request_service_info (void);
-  const IOP::ServiceContextList &request_service_info (void) const;
-  IOP::ServiceContextList &reply_service_info (void);
-  const IOP::ServiceContextList &reply_service_info (void) const;
+  IOP::ServiceContextList &request_service_info ();
+  const IOP::ServiceContextList &request_service_info () const;
+  IOP::ServiceContextList &reply_service_info ();
+  const IOP::ServiceContextList &reply_service_info () const;
 
   /// Access the TAO_Service_Context
-  TAO_Service_Context &request_service_context (void);
-  const TAO_Service_Context &request_service_context (void) const;
-  TAO_Service_Context &reply_service_context (void);
-  const TAO_Service_Context &reply_service_context (void) const;
+  TAO_Service_Context &request_service_context ();
+  const TAO_Service_Context &request_service_context () const;
+  TAO_Service_Context &reply_service_context ();
+  const TAO_Service_Context &reply_service_context () const;
 
   /// Reset the contents of the service context lists that we hold.
-  void reset_request_service_info (void);
-  void reset_reply_service_info (void);
+  void reset_request_service_info ();
+  void reset_reply_service_info ();
 
   /// Cache the request id.
   void request_id (CORBA::ULong id);
 
   /// Return the request ID associated with the operation
-  CORBA::ULong request_id (void) const;
+  CORBA::ULong request_id () const;
 
   /// Accessor method for the addressing mode
-  TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const;
+  TAO_Target_Specification::TAO_Target_Address addressing_mode () const;
 
   /// Set method for the addressing mode
   void addressing_mode (CORBA::Short addr);
@@ -148,30 +148,30 @@ public:
   bool demarshal_args (TAO_InputCDR &cdr);
 
   /// Accessors for the argument list
-  TAO::Argument ** args (void) const;
-  CORBA::ULong args_num (void) const ;
+  TAO::Argument ** args () const;
+  CORBA::ULong args_num () const ;
 
   /// Exception count
-  CORBA::ULong ex_count (void) const;
+  CORBA::ULong ex_count () const;
 
-  TAO::Exception_Data const * ex_data (void) const;
+  TAO::Exception_Data const * ex_data () const;
 
-  CORBA::Boolean use_stub_args (void) const;
+  CORBA::Boolean use_stub_args () const;
   void use_stub_args (CORBA::Boolean use_stub_arguments);
 
 #if TAO_HAS_INTERCEPTORS == 1
   void ft_expiration_time (TimeBase::TimeT time);
-  TimeBase::TimeT ft_expiration_time (void) const;
+  TimeBase::TimeT ft_expiration_time () const;
 
   void ft_retention_id (CORBA::Long request_id);
-  CORBA::Long ft_retention_id (void) const;
+  CORBA::Long ft_retention_id () const;
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
   /// Accessor for cac_ pointer.
-  TAO::Collocated_Arguments_Converter *cac (void) const;
+  TAO::Collocated_Arguments_Converter *cac () const;
   void cac (TAO::Collocated_Arguments_Converter *cac);
 
-  TAO_Reply_Dispatcher *reply_dispatcher (void) const;
+  TAO_Reply_Dispatcher *reply_dispatcher () const;
   void reply_dispatcher (TAO_Reply_Dispatcher *rd);
 
 private:
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index f8f816ec7fd..b4dc72e825b 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -56,7 +56,7 @@ class TAO_Export TAO_Target_Specification
 public:
 
   /// Ctor
-  TAO_Target_Specification (void);
+  TAO_Target_Specification ();
   enum TAO_Target_Address
   {
     // Note that this could be extended for other protocols
@@ -86,14 +86,14 @@ public:
    * the stored specifier is not of the right type then this would
    * return a NULL
    */
-  const TAO::ObjectKey* object_key (void);
+  const TAO::ObjectKey* object_key ();
 
   /**
    * Returns the IOP::TaggedProfile after a check of the stored specifier. If
    * the stored specifier is not of the right type then this would
    * return a NULL
    */
-  const IOP::TaggedProfile *profile (void);
+  const IOP::TaggedProfile *profile ();
 
   /**
    * Returns a  pointer to IOP::IOR through the parameters and the
@@ -104,7 +104,7 @@ public:
   CORBA::ULong iop_ior (IOP::IOR *&ior);
 
   /// Access the TArget_Address specifier
-  TAO_Target_Address specifier (void);
+  TAO_Target_Address specifier ();
 
 private:
   /// The union of all the possibilities