Remove redundant void arg

53 files changed, 257 insertions, 259 deletions

diff --git a/ACE/ace/Malloc.h b/ACE/ace/Malloc.h
index 3ad30ac5f08..f36be65e75c 100644
--- a/ACE/ace/Malloc.h
+++ b/ACE/ace/Malloc.h
@@ -265,7 +265,7 @@ public:
   class ACE_Export ACE_Malloc_Header
   {
   public:
-    ACE_Malloc_Header (void);
+    ACE_Malloc_Header ();
 
     /// Points to next block if on free list.
     ACE_Malloc_Header *next_block_;
@@ -284,7 +284,7 @@ public:
     char padding_[(ACE_MALLOC_PADDING_SIZE) ? ACE_MALLOC_PADDING_SIZE : ACE_MALLOC_ALIGN];
 
     /// Dump the state of the object.
-    void dump (void) const;
+    void dump () const;
   };
 
   /**
@@ -307,10 +307,10 @@ public:
                    ACE_Name_Node *head);
 
     /// Constructor.
-    ACE_Name_Node (void);
+    ACE_Name_Node ();
 
     /// Constructor.
-    ~ACE_Name_Node (void);
+    ~ACE_Name_Node ();
 
     /// Initialize a name node pointer.
     static void init_ptr (ACE_Name_Node **ptr,
@@ -318,7 +318,7 @@ public:
                           void *base_addr);
 
     /// Return a pointer to the name of this node.
-    const char *name (void) const;
+    const char *name () const;
 
     /// Name of the Node.
     char *name_;
@@ -333,14 +333,14 @@ public:
     ACE_Name_Node *prev_;
 
     /// Dump the state of the object.
-    void dump (void) const;
+    void dump () const;
   private:
     /// Copy constructor.
     ACE_Name_Node (const ACE_Name_Node &);
   };
 
   /// Print out a bunch of size info for debugging.
-  static void print_alignment_info (void);
+  static void print_alignment_info ();
 
   /// Reference counter.
   int ref_counter_;
@@ -379,7 +379,7 @@ public:
   ACE_Malloc_Header base_;
 
   /// Dump the state of the object.
-  void dump (void) const;
+  void dump () const;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Malloc.inl b/ACE/ace/Malloc.inl
index 2eb2a3a2325..691cc300af2 100644
--- a/ACE/ace/Malloc.inl
+++ b/ACE/ace/Malloc.inl
@@ -2,7 +2,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-ACE_Control_Block::ACE_Name_Node::~ACE_Name_Node (void)
+ACE_Control_Block::ACE_Name_Node::~ACE_Name_Node ()
 {
 }
 
diff --git a/ACE/ace/Value_Ptr.h b/ACE/ace/Value_Ptr.h
index 8d22e5e2bb1..f099bd6ebac 100644
--- a/ACE/ace/Value_Ptr.h
+++ b/ACE/ace/Value_Ptr.h
@@ -70,13 +70,13 @@ namespace ACE
     explicit Value_Ptr (T * p = 0) : p_ (p) { }
 
     /// Destructor.
-    ~Value_Ptr (void) { delete this->p_; }
+    ~Value_Ptr () { delete this->p_; }
 
     /// Deference operator.
-    T & operator* (void) const { return *this->p_; }
+    T & operator* () const { return *this->p_; }
 
     /// Pointer operator.
-    T * operator-> (void) const { return this->p_; }
+    T * operator-> () const { return this->p_; }
 
     /// Non-throwing swap operation used to make assignment strongly
     /// exception-safe.
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index d617283dbb0..4b525902eb6 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -66,8 +66,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:
@@ -82,10 +82,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::TypeCode_ptr content_type_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::TypeCode_ptr content_type_i () const;
 
     private:
       /// Base attributes for this @c TypeCode containing the
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index 6a89a9dcb7b..48e0a7a074e 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -57,14 +57,14 @@ TAO::TypeCode::Alias<char const *,
 void
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                     TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
+                     TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -100,7 +100,7 @@ TAO::TypeCode::Alias<char const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const
+                     TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -132,7 +132,7 @@ TAO::TypeCode::Alias<char const *,
 char const *
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::id_i (void) const
+                     TAO::Null_RefCount_Policy>::id_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -142,7 +142,7 @@ TAO::TypeCode::Alias<char const *,
 char const *
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::name_i (void) const
+                     TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -152,7 +152,7 @@ TAO::TypeCode::Alias<char const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::content_type_i (void) const
+                     TAO::Null_RefCount_Policy>::content_type_i () const
 {
   return
      CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index b74124189a3..45e7c8c7c51 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 using namespace TAO;
 
-CORBA::Any::Any (void)
+CORBA::Any::Any ()
   : impl_ (0)
 {
 }
@@ -37,7 +37,7 @@ CORBA::Any::Any (const CORBA::Any &rhs)
     }
 }
 
-CORBA::Any::~Any (void)
+CORBA::Any::~Any ()
 {
   if (this->impl_ != 0)
     {
@@ -80,7 +80,7 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl)
 }
 
 CORBA::TypeCode_ptr
-CORBA::Any::type (void) const
+CORBA::Any::type () const
 {
   if (this->impl_ != 0)
     {
@@ -91,7 +91,7 @@ CORBA::Any::type (void) const
 }
 
 CORBA::TypeCode_ptr
-CORBA::Any::_tao_get_typecode (void) const
+CORBA::Any::_tao_get_typecode () const
 {
   if (this->impl_ != 0)
     {
@@ -116,7 +116,7 @@ CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
 }
 
 int
-CORBA::Any::_tao_byte_order (void) const
+CORBA::Any::_tao_byte_order () const
 {
   if (this->impl_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
index cb8beef4ed0..7c9a1911696 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
@@ -287,7 +287,7 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const CORBA::WS
 }
 
 int
-TAO_AnyTypeCode_Adapter_Impl::Initializer (void)
+TAO_AnyTypeCode_Adapter_Impl::Initializer ()
 {
   // The TAO::Unknown_IDL_Type::lock_i () is a PRIVATE thread unsafe singleton
   // which we need to initialise before Unknown_IDL_Types are used in a
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
index ab8c7d6d3f6..566233eb0cf 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
@@ -32,7 +32,7 @@ class TAO_AnyTypeCode_Export TAO_AnyTypeCode_Adapter_Impl
 {
 public:
     // Used to force the initialization of the code.
-    static int Initializer (void);
+    static int Initializer ();
 
 #define ANYTYPECODE__EXCEPTION_LIST \
     TAO_SYSTEM_EXCEPTION (UNKNOWN) \
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index ace666a3009..4d3eb62685a 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -66,7 +66,7 @@ namespace TAO
     }
   }
 
-  Any_Basic_Impl::~Any_Basic_Impl (void)
+  Any_Basic_Impl::~Any_Basic_Impl ()
   {
   }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
index ab18778fc0f..c2796c62777 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
@@ -40,7 +40,7 @@ namespace TAO
     Any_Basic_Impl (CORBA::TypeCode_ptr,
                     void *value);
 
-    virtual ~Any_Basic_Impl (void);
+    virtual ~Any_Basic_Impl ();
 
     static void insert (CORBA::Any &,
                         CORBA::TypeCode_ptr,
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp
index 3633d68739f..b1867d468e3 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -22,7 +22,7 @@ TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
 {
 }
 
-TAO::Any_Impl::~Any_Impl (void)
+TAO::Any_Impl::~Any_Impl ()
 {
 }
 
@@ -56,20 +56,20 @@ TAO::Any_Impl::marshal (TAO_OutputCDR &cdr)
 }
 
 void
-TAO::Any_Impl::free_value (void)
+TAO::Any_Impl::free_value ()
 {
   // We always have to do this.
   ::CORBA::release (this->type_);
 }
 
 CORBA::TypeCode_ptr
-TAO::Any_Impl::type (void) const
+TAO::Any_Impl::type () const
 {
   return CORBA::TypeCode::_duplicate (this->type_);
 }
 
 CORBA::TypeCode_ptr
-TAO::Any_Impl::_tao_get_typecode (void) const
+TAO::Any_Impl::_tao_get_typecode () const
 {
   return this->type_;
 }
@@ -82,7 +82,7 @@ TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
 }
 
 int
-TAO::Any_Impl::_tao_byte_order (void) const
+TAO::Any_Impl::_tao_byte_order () const
 {
   return TAO_ENCAP_BYTE_ORDER;
 }
@@ -102,13 +102,13 @@ TAO::Any_Impl::_tao_any_wstring_destructor (void *x)
 }
 
 void
-TAO::Any_Impl::_add_ref (void)
+TAO::Any_Impl::_add_ref ()
 {
   ++this->refcount_;
 }
 
 void
-TAO::Any_Impl::_remove_ref (void)
+TAO::Any_Impl::_remove_ref ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -145,7 +145,7 @@ TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
 }
 
 bool
-TAO::Any_Impl::encoded (void) const
+TAO::Any_Impl::encoded () const
 {
   return this->encoded_;
 }
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
index 19631ca8c2d..c57d09c7a04 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -37,7 +37,7 @@ namespace TAO
                         CORBA::TypeCode_ptr,
                         T * const,
                         CORBA::ULong bound);
-    virtual ~Any_Special_Impl_T (void);
+    virtual ~Any_Special_Impl_T ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor destructor,
@@ -54,8 +54,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 ();
 
   private:
     T * value_;
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
index 2e06f71b942..056e90d9531 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -40,7 +40,7 @@ TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc)
 {
 }
 
-TAO::Any_SystemException::~Any_SystemException (void)
+TAO::Any_SystemException::~Any_SystemException ()
 {
 }
 
@@ -152,7 +152,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
 }
 
 void
-TAO::Any_SystemException::free_value (void)
+TAO::Any_SystemException::free_value ()
 {
   if (this->value_destructor_ != 0)
     {
@@ -165,7 +165,7 @@ TAO::Any_SystemException::free_value (void)
 }
 
 const void *
-TAO::Any_SystemException::value (void) const
+TAO::Any_SystemException::value () const
 {
   return this->value_;
 }
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h
index 2cb231476f4..622e5e501d4 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.h
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.h
@@ -50,7 +50,7 @@ namespace TAO
 
     Any_SystemException (CORBA::TypeCode_ptr);
 
-    virtual ~Any_SystemException (void);
+    virtual ~Any_SystemException ();
 
     static void insert (CORBA::Any &,
                         _tao_destructor,
@@ -71,8 +71,8 @@ namespace TAO
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
 
-    virtual const void *value (void) const;
-    virtual void free_value (void);
+    virtual const void *value () const;
+    virtual void free_value ();
 
   protected:
     CORBA::SystemException *value_;
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 72e818c8ca7..bacd24e67d5 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -14,7 +14,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Unknown_IDL_Type::LOCK const
-TAO::Unknown_IDL_Type::lock_i (void)
+TAO::Unknown_IDL_Type::lock_i ()
 {
   static LOCK base_lock_ (new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>());
   return base_lock_;
@@ -49,7 +49,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc)
 {
 }
 
-TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
+TAO::Unknown_IDL_Type::~Unknown_IDL_Type ()
 {
 }
 
@@ -81,25 +81,25 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR & cdr)
 }
 
 const void *
-TAO::Unknown_IDL_Type::value (void) const
+TAO::Unknown_IDL_Type::value () const
 {
   return this->cdr_.start ();
 }
 
 void
-TAO::Unknown_IDL_Type::free_value (void)
+TAO::Unknown_IDL_Type::free_value ()
 {
   ::CORBA::release (this->type_);
 }
 
 TAO_InputCDR &
-TAO::Unknown_IDL_Type::_tao_get_cdr (void)
+TAO::Unknown_IDL_Type::_tao_get_cdr ()
 {
   return this->cdr_;
 }
 
 int
-TAO::Unknown_IDL_Type::_tao_byte_order (void) const
+TAO::Unknown_IDL_Type::_tao_byte_order () const
 {
   return this->cdr_.byte_order ();
 }
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index 1cf8645c5a2..6792fb8b35f 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -16,7 +16,7 @@ TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const
 }
 
 void
-TAO::TypeCode::Empty_Param::tao_duplicate (void)
+TAO::TypeCode::Empty_Param::tao_duplicate ()
 {
   // No-op since empty parameter TypeCodes are never created
   // dynamically, meaning there is no need to implement reference
@@ -24,7 +24,7 @@ TAO::TypeCode::Empty_Param::tao_duplicate (void)
 }
 
 void
-TAO::TypeCode::Empty_Param::tao_release (void)
+TAO::TypeCode::Empty_Param::tao_release ()
 {
   // No-op since empty parameter TypeCodes are never created
   // dynamically, meaning there is no need to implement reference
@@ -58,7 +58,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const
+TAO::TypeCode::Empty_Param::get_compact_typecode_i () const
 {
   // Already compact since parameter list is empty.
 
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
index d0ef4e370c2..ba194eff926 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -60,8 +60,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:
@@ -76,7 +76,7 @@ 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 CORBA::TypeCode_ptr get_compact_typecode_i () const;
     };
 
   }  // End namespace TypeCode
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index dbd05818165..245bb43c630 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -63,8 +63,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:
@@ -78,10 +78,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;
       //@}
 
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 75fb4ee17c8..81af701debf 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -58,14 +58,14 @@ TAO::TypeCode::Enum<char const *,
 void
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                    TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_release (void)
+                    TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -124,7 +124,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
 
@@ -161,7 +161,7 @@ char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -172,7 +172,7 @@ char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::name_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -183,7 +183,7 @@ CORBA::ULong
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::member_count_i (
-  void) const
+  ) const
 {
   return this->nenumerators_;
 }
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index 56a6b685fa0..e84730b2469 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -57,8 +57,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:
@@ -73,9 +73,9 @@ 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 CORBA::UShort fixed_digits_i (void) const;
-      virtual CORBA::UShort fixed_scale_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::UShort fixed_digits_i () const;
+      virtual CORBA::UShort fixed_scale_i () const;
 
     private:
       /// The number of significant digits.
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
index ec34f735087..93a88f1bbc7 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
@@ -24,7 +24,7 @@ TAO::TypeCode::Indirected_Type::tao_marshal (TAO_OutputCDR & cdr,
 }
 
 void
-TAO::TypeCode::Indirected_Type::tao_duplicate (void)
+TAO::TypeCode::Indirected_Type::tao_duplicate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
@@ -39,7 +39,7 @@ TAO::TypeCode::Indirected_Type::tao_duplicate (void)
 }
 
 void
-TAO::TypeCode::Indirected_Type::tao_release (void)
+TAO::TypeCode::Indirected_Type::tao_release ()
 {
   unsigned long newcount;
   CORBA::TypeCode_ptr curmaster;
@@ -103,25 +103,25 @@ TAO::TypeCode::Indirected_Type::equivalent_i (
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Indirected_Type::get_compact_typecode_i (void) const
+TAO::TypeCode::Indirected_Type::get_compact_typecode_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->get_compact_typecode () : 0;
 }
 
 char const *
-TAO::TypeCode::Indirected_Type::id_i (void) const
+TAO::TypeCode::Indirected_Type::id_i () const
 {
   return this->id_.in ();
 }
 
 char const *
-TAO::TypeCode::Indirected_Type::name_i (void) const
+TAO::TypeCode::Indirected_Type::name_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->name () : 0;
 }
 
 CORBA::ULong
-TAO::TypeCode::Indirected_Type::member_count_i (void) const
+TAO::TypeCode::Indirected_Type::member_count_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->member_count () : 0;
 }
@@ -147,13 +147,13 @@ TAO::TypeCode::Indirected_Type::member_visibility_i (CORBA::ULong index) const
 }
 
 CORBA::ValueModifier
-TAO::TypeCode::Indirected_Type::type_modifier_i (void) const
+TAO::TypeCode::Indirected_Type::type_modifier_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->type_modifier () : 0;
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Indirected_Type::concrete_base_type_i (void) const
+TAO::TypeCode::Indirected_Type::concrete_base_type_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->concrete_base_type () : 0;
 }
@@ -165,13 +165,13 @@ TAO::TypeCode::Indirected_Type::member_label_i (CORBA::ULong index) const
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Indirected_Type::discriminator_type_i (void) const
+TAO::TypeCode::Indirected_Type::discriminator_type_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->discriminator_type () : 0;
 }
 
 CORBA::Long
-TAO::TypeCode::Indirected_Type::default_index_i (void) const
+TAO::TypeCode::Indirected_Type::default_index_i () const
 {
   return this->recursive_tc_ ? this->recursive_tc_->default_index () : 0;
 }
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
index b72f0d14f2e..4d810a4150a 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h
@@ -64,8 +64,8 @@ namespace TAO
       //@{
       virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
       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 ();
       //@}
 
       /// Setter for recursive reference.
@@ -83,10 +83,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;
       //@}
@@ -101,8 +101,8 @@ namespace TAO
        */
       //@{
       virtual CORBA::Any * member_label_i (CORBA::ULong index) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (void) const;
-      virtual CORBA::Long default_index_i (void) const;
+      virtual CORBA::TypeCode_ptr discriminator_type_i () const;
+      virtual CORBA::Long default_index_i () const;
       //@}
 
       /**
@@ -115,8 +115,8 @@ namespace TAO
        */
       //@{
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const;
-      virtual CORBA::ValueModifier type_modifier_i (void) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const;
+      virtual CORBA::ValueModifier type_modifier_i () const;
+      virtual CORBA::TypeCode_ptr concrete_base_type_i () const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp
index 965d22e645c..b7274bcd458 100644
--- a/TAO/tao/AnyTypeCode/Marshal.cpp
+++ b/TAO/tao/AnyTypeCode/Marshal.cpp
@@ -21,7 +21,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
+TAO_Marshal_Object::~TAO_Marshal_Object ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index 927ae22006c..61f86f31d40 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -23,13 +23,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Reference counting for DII Request object
 CORBA::ULong
-CORBA::NamedValue::_incr_refcount (void)
+CORBA::NamedValue::_incr_refcount ()
 {
   return ++this->refcount_;
 }
 
 CORBA::ULong
-CORBA::NamedValue::_decr_refcount (void)
+CORBA::NamedValue::_decr_refcount ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -39,7 +39,7 @@ CORBA::NamedValue::_decr_refcount (void)
   return new_count;
 }
 
-CORBA::NamedValue::~NamedValue (void)
+CORBA::NamedValue::~NamedValue ()
 {
   if (this->name_)
     {
@@ -52,13 +52,13 @@ CORBA::NamedValue::~NamedValue (void)
 // ****************************************************************
 
 CORBA::ULong
-CORBA::NVList::_incr_refcount (void)
+CORBA::NVList::_incr_refcount ()
 {
   return ++this->refcount_;
 }
 
 CORBA::ULong
-CORBA::NVList::_decr_refcount (void)
+CORBA::NVList::_decr_refcount ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -68,7 +68,7 @@ CORBA::NVList::_decr_refcount (void)
   return new_count;
 }
 
-CORBA::NVList::~NVList (void)
+CORBA::NVList::~NVList ()
 {
   // initialize an iterator and delete each NamedValue
   ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_);
@@ -402,7 +402,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag)
 }
 
 ptrdiff_t
-CORBA::NVList::_tao_target_alignment (void)
+CORBA::NVList::_tao_target_alignment ()
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
@@ -426,7 +426,7 @@ CORBA::NVList::_tao_target_alignment (void)
 }
 
 void
-CORBA::NVList::evaluate (void)
+CORBA::NVList::evaluate ()
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -444,7 +444,7 @@ CORBA::NVList::evaluate (void)
 }
 
 CORBA::Boolean
-CORBA::NVList::_lazy_has_arguments (void) const
+CORBA::NVList::_lazy_has_arguments () const
 {
   if (this->incoming_ != 0)
     {
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index 001a1d7691d..0516647be45 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -84,21 +84,21 @@ namespace CORBA
 
   public:
     /// optional name
-    const char * name (void) const;
+    const char * name () const;
 
     /// return the value
-    Any_ptr value (void) const;
+    Any_ptr value () const;
 
     /// return the parameter mode flag
-    Flags flags (void) const;
+    Flags flags () const;
 
     // The pseudo object static methods..
     static NamedValue * _duplicate (NamedValue *);
-    static NamedValue * _nil (void);
+    static NamedValue * _nil ();
 
     // = Reference counting.
-    ULong _incr_refcount (void);
-    ULong _decr_refcount (void);
+    ULong _incr_refcount ();
+    ULong _decr_refcount ();
 
     // Useful for template programming.
     typedef NamedValue_ptr _ptr_type;
@@ -111,12 +111,12 @@ namespace CORBA
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    ~NamedValue (void);
+    ~NamedValue ();
 
   private:
     /// private constructor. Cannot be directly instantiated other than
     /// by its friends.
-    NamedValue (void);
+    NamedValue ();
 
   private:
     /// Reference counter.
@@ -165,7 +165,7 @@ namespace CORBA
   public:
 
     /// return the current number of elements in the list
-    ULong count (void) const;
+    ULong count () const;
 
     /// add an element and just initialize the flags
     NamedValue_ptr add (Flags);
@@ -193,11 +193,11 @@ namespace CORBA
 
     // The pseudo object static methods..
     static NVList * _duplicate (NVList *);
-    static NVList * _nil (void);
+    static NVList * _nil ();
 
     // = Reference counting.
-    ULong _incr_refcount (void);
-    ULong _decr_refcount (void);
+    ULong _incr_refcount ();
+    ULong _decr_refcount ();
 
     // = TAO Extensions:
 
@@ -223,14 +223,14 @@ namespace CORBA
      * re-alignment.
      * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors.
      */
-    ptrdiff_t _tao_target_alignment (void);
+    ptrdiff_t _tao_target_alignment ();
 
     /**
      * If this list is used by a DII request, this will tell us if
      * our CDR stream contains any marshaled arguments (needed for
      * GIOP 1.2).
      */
-    Boolean _lazy_has_arguments (void) const;
+    Boolean _lazy_has_arguments () const;
 
     // Useful for template programming.
     typedef NVList_ptr _ptr_type;
@@ -243,12 +243,12 @@ namespace CORBA
      * Protected destructor to enforce proper memory management
      * through the reference counting mechanism.
      */
-    ~NVList (void);
+    ~NVList ();
 
   private:
     /// Constructor - cannot be instantiated directly other than
     /// through the CORBA::ORB::create_list method
-    NVList (void);
+    NVList ();
 
     /// Helper to increase the list size. This is used by all the add_
     /// methods of the NVList class
@@ -256,7 +256,7 @@ namespace CORBA
 
     /// Lazy evaluation routine to fill up the Anys in the NVList from
     /// the CDR stream.
-    void evaluate (void);
+    void evaluate ();
 
   private:
     /// Internal list of parameters stored as NamedValues
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index d170907e390..a9d1940a8df 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -55,7 +55,7 @@ TAO_NVList_Adapter_Impl::create_named_value (CORBA::NamedValue_ptr &nv)
 }
 
 int
-TAO_NVList_Adapter_Impl::Initializer (void)
+TAO_NVList_Adapter_Impl::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl);
 }
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
index aca4292e926..5ad1d79264e 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
@@ -36,7 +36,7 @@ public:
   virtual void create_named_value (CORBA::NamedValue_ptr &nv);
 
   /// Used to force the initialization of the NVList adapter
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int TAO_Requires_NVList_Adapter_Impl_Initializer =
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
index 59e1abf4e3c..5a43981c0f2 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -69,8 +69,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:
@@ -86,9 +86,9 @@ 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::TypeCode_ptr get_compact_typecode_i () const;
+      virtual char const * id_i () const;
+      virtual char const * name_i () const;
 
     protected:
       /// Base attributes (@c id and @c name).
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 2502e71169d..9022c9ce878 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -38,13 +38,13 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal (
 
 void
 TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                      TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
+                      TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -70,7 +70,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const
+                      TAO::Null_RefCount_Policy>::get_compact_typecode_i () const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -116,7 +116,7 @@ TAO::TypeCode::Objref<char const *,
 
 char const *
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -125,7 +125,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
 
 char const *
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index 403529e8650..d8482d33599 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -143,7 +143,7 @@ namespace TAO
       {
       public:
         Reset (CORBA::ULong & flag) : flag_ (flag) { }
-        ~Reset (void) { this->flag_ = 0; }
+        ~Reset () { this->flag_ = 0; }
       private:
         CORBA::ULong & flag_;
       };
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
index 9b621ac9bd3..154a4d41742 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -60,8 +60,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:
@@ -76,9 +76,9 @@ 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 CORBA::ULong length_i (void) const;
-      virtual CORBA::TypeCode_ptr content_type_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::ULong length_i () const;
+      virtual CORBA::TypeCode_ptr content_type_i () const;
 
     private:
       /// Element type of the sequence.
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index 99f8e26c3bf..5ef1aec82db 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -48,13 +48,13 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 
 void
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                        TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_release (void)
+                        TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -105,7 +105,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   // Already compact since tk_sequence and tk_array TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -126,7 +126,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::ULong
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::length_i (
-  void) const
+  ) const
 {
   return this->length_;
 }
@@ -134,7 +134,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::content_type_i (
-  void) const
+  ) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h
index 507ad7ba137..8ca53f95e6e 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -59,8 +59,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:
@@ -75,8 +75,8 @@ 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 CORBA::ULong length_i (void) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
+      virtual CORBA::ULong length_i () const;
 
     private:
       /// Length of the @c string.  A length of zero indicates an
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 90b9344e529..83f28c3add9 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -24,12 +24,12 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal (
 }
 
 void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void)
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
 void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void)
+TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -57,7 +57,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   // Already compact since tk_string and tk_wstring TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -71,7 +71,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
 
 CORBA::ULong
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
-  void) const
+  ) const
 {
   return this->length_;
 }
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index 3234062e624..4e5fb375edf 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -72,8 +72,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 ();
       //@}
 
       /// Accessor for fields_
@@ -91,10 +91,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/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 212bd380a39..fb6853c958e 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -83,7 +83,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                      TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
@@ -92,7 +92,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
+                      TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -181,7 +181,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   ACE_Array_Base<Struct_Field<CORBA::String_var,
                               CORBA::TypeCode_var> >
@@ -229,7 +229,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -241,7 +241,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::name_i (void) const
+                      TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -253,7 +253,7 @@ TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_count_i (void) const
+                      TAO::Null_RefCount_Policy>::member_count_i () const
 {
   return this->nfields_;
 }
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
index 3f25a04ed14..97662a84f02 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
@@ -7,7 +7,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::True_RefCount_Policy::~True_RefCount_Policy (void)
+TAO::True_RefCount_Policy::~True_RefCount_Policy ()
 {
 }
 
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
index e1198f14cbe..d21e261cf3d 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
@@ -75,7 +75,7 @@ namespace TAO
   public:
 
     /// Increase the reference count on this object.
-    void add_ref (void);
+    void add_ref ();
 
     /// Decrease the reference count on this object.
     /**
@@ -83,7 +83,7 @@ namespace TAO
      * reference count drops to zero, call @c operator @c delete()
      * on this object.
      */
-    void remove_ref (void);
+    void remove_ref ();
 
   protected:
     /// Constructor.
@@ -91,7 +91,7 @@ namespace TAO
      * @note This constructor is protected since it not meant to be
      *       instantiated/used as a standalone object.
      */
-    True_RefCount_Policy (void);
+    True_RefCount_Policy ();
 
     /// Destructor.
     /**
@@ -100,7 +100,7 @@ namespace TAO
      *       zero, i.e. when @c remove_ref() calls @c operator
      *       @c delete @c this.
      */
-    virtual ~True_RefCount_Policy (void);
+    virtual ~True_RefCount_Policy ();
 
   private:
     /// Reference counter.
diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp
index b8277a895cc..53108bd3b91 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode.cpp
@@ -13,7 +13,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::TypeCode::~TypeCode (void)
+CORBA::TypeCode::~TypeCode ()
 {
 }
 
@@ -113,19 +113,19 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc) const
 }
 
 char const *
-CORBA::TypeCode::id_i (void) const
+CORBA::TypeCode::id_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 char const *
-CORBA::TypeCode::name_i (void) const
+CORBA::TypeCode::name_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::ULong
-CORBA::TypeCode::member_count_i (void) const
+CORBA::TypeCode::member_count_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
@@ -149,37 +149,37 @@ CORBA::TypeCode::member_label_i (CORBA::ULong /* index */) const
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type_i (void) const
+CORBA::TypeCode::discriminator_type_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::Long
-CORBA::TypeCode::default_index_i (void) const
+CORBA::TypeCode::default_index_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::ULong
-CORBA::TypeCode::length_i (void) const
+CORBA::TypeCode::length_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type_i (void) const
+CORBA::TypeCode::content_type_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::UShort
-CORBA::TypeCode::fixed_digits_i (void) const
+CORBA::TypeCode::fixed_digits_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::UShort
-CORBA::TypeCode::fixed_scale_i (void) const
+CORBA::TypeCode::fixed_scale_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
@@ -191,20 +191,20 @@ CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */) const
 }
 
 CORBA::ValueModifier
-CORBA::TypeCode::type_modifier_i (void) const
+CORBA::TypeCode::type_modifier_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type_i (void) const
+CORBA::TypeCode::concrete_base_type_i () const
 {
   throw ::CORBA::TypeCode::BadKind ();
 }
 
 // ---------------------------------------------------------------
 
-CORBA::TypeCode::Bounds::Bounds (void)
+CORBA::TypeCode::Bounds::Bounds ()
   : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0",
                           "Bounds")
 {
@@ -217,7 +217,7 @@ CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex)
 }
 
 CORBA::Exception *
-CORBA::TypeCode::Bounds::_alloc (void)
+CORBA::TypeCode::Bounds::_alloc ()
 {
   CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0);
@@ -225,7 +225,7 @@ CORBA::TypeCode::Bounds::_alloc (void)
 }
 
 CORBA::Exception *
-CORBA::TypeCode::Bounds::_tao_duplicate (void) const
+CORBA::TypeCode::Bounds::_tao_duplicate () const
 {
   CORBA::Exception *result;
   ACE_NEW_RETURN (result,
@@ -235,7 +235,7 @@ CORBA::TypeCode::Bounds::_tao_duplicate (void) const
 }
 
 void
-CORBA::TypeCode::Bounds::_raise (void) const
+CORBA::TypeCode::Bounds::_raise () const
 {
   throw *this;
 }
@@ -258,7 +258,7 @@ CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &)
 
 // ****************************************************************
 
-CORBA::TypeCode::BadKind::BadKind (void)
+CORBA::TypeCode::BadKind::BadKind ()
   : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0",
                           "BadKind")
 {
@@ -271,7 +271,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
 }
 
 CORBA::Exception *
-CORBA::TypeCode::BadKind::_tao_duplicate (void) const
+CORBA::TypeCode::BadKind::_tao_duplicate () const
 {
   CORBA::Exception *result = 0;
   ACE_NEW_RETURN (result,
@@ -281,7 +281,7 @@ CORBA::TypeCode::BadKind::_tao_duplicate (void) const
 }
 
 void
-CORBA::TypeCode::BadKind::_raise (void) const
+CORBA::TypeCode::BadKind::_raise () const
 {
   throw *this;
 }
@@ -402,7 +402,7 @@ namespace TAO
   }
 
   CORBA::TypeCode_ptr
-  Objref_Traits<CORBA::TypeCode>::nil (void)
+  Objref_Traits<CORBA::TypeCode>::nil ()
   {
     return CORBA::TypeCode::_nil ();
   }
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index b3d656e61cb..e80e1c653a4 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -44,7 +44,7 @@ namespace TAO
     struct TC_Info
     {
       /// Constructor.
-      TC_Info (void) : id (0), type () {}
+      TC_Info () : id (0), type () {}
 
       /// Repository ID.
       char const * id;
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index da96f1360cd..1e420b17592 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -60,20 +60,20 @@ namespace TAO
       /**
        * Constructor used when creating dynamic @c union @c TypeCodes.
        */
-      Case (void);
+      Case ();
 
       /// Destructor.
-      virtual ~Case (void);
+      virtual ~Case ();
 
       /// Cloning/copying operation.
-      virtual Case * clone (void) const = 0;
+      virtual Case * clone () const = 0;
 
       /// Return the IDL @c union case label value embedded within a
       /// @c CORBA::Any.
-      virtual CORBA::Any * label (void) const = 0;
+      virtual CORBA::Any * label () const = 0;
 
       /// Get the name of the @c union case/member.
-      char const * name (void) const;
+      char const * name () const;
 
       /// Set the name of the @c union case/member.
       void name (char const * the_name);
@@ -83,7 +83,7 @@ namespace TAO
        * @note The reference count is not manipulated by this method,
        *       i.e., ownership is retained by this class.
        */
-      CORBA::TypeCode_ptr type (void) const;
+      CORBA::TypeCode_ptr type () const;
 
       /// Set the @c CORBA::TypeCode of the @c union case/member.
       /**
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
index de360a3cdcb..b44435db95f 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
@@ -71,8 +71,8 @@ namespace TAO
        * @see @c TAO::TypeCode::Case
        */
       //@{
-      Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (void) const;
+      Case<StringType, TypeCodeType> * clone () const;
+      virtual CORBA::Any * label () const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
                                 CORBA::TypeCode_ptr tc) const;
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index d6ab4a1ab36..973edcffb32 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -108,8 +108,8 @@ namespace TAO
        * @see @c TAO::TypeCode::Case
        */
       //@{
-      Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (void) const;
+      Case<StringType, TypeCodeType> * clone () const;
+      virtual CORBA::Any * label () const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
                                 CORBA::TypeCode_ptr tc) const;
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 31855ed90a4..99cc7cf771a 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -76,12 +76,12 @@ 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 ();
       //@}
 
       /// Accessor for cases_
-      const CaseArrayType& cases(void) const;
+      const CaseArrayType& cases() const;
 
     protected:
       /**
@@ -94,15 +94,15 @@ 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;
       virtual CORBA::Any * member_label_i (CORBA::ULong index) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (void) const;
-      virtual CORBA::Long default_index_i (void) const;
+      virtual CORBA::TypeCode_ptr discriminator_type_i () const;
+      virtual CORBA::Long default_index_i () const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index 14193893e5e..d702bec5bfc 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -78,7 +78,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                     TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
@@ -87,7 +87,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
+                     TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -198,7 +198,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
 //   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
 //                                              CORBA::TypeCode_var> > elem_type;
@@ -253,7 +253,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::id_i (
-  void) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -265,7 +265,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::name_i (void) const
+                     TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -277,7 +277,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (void) const
+                     TAO::Null_RefCount_Policy>::member_count_i () const
 {
   return this->ncases_;
 }
@@ -352,7 +352,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::discriminator_type_i (void) const
+                     TAO::Null_RefCount_Policy>::discriminator_type_i () const
 {
   return
     CORBA::TypeCode::_duplicate (
@@ -364,7 +364,7 @@ TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::default_index_i (void) const
+                     TAO::Null_RefCount_Policy>::default_index_i () const
 {
   return this->default_index_;
 }
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
index 180747f1428..e624fcbece0 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
@@ -80,8 +80,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:
@@ -95,15 +95,15 @@ 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;
       virtual CORBA::Any * member_label_i (CORBA::ULong index) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (void) const;
-      virtual CORBA::Long default_index_i (void) const;
+      virtual CORBA::TypeCode_ptr discriminator_type_i () const;
+      virtual CORBA::Long default_index_i () const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index c454d0cbe1a..836403fd08d 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -76,12 +76,12 @@ 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 ();
       //@}
 
       /// Accessor for concrete_base_
-      const TypeCodeType& concrete_base(void) const;
+      const TypeCodeType& concrete_base() const;
 
       /// Accessor for fields_
       const FieldArrayType& fields() const;
@@ -98,15 +98,15 @@ 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;
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const;
-      virtual CORBA::ValueModifier type_modifier_i (void) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const;
+      virtual CORBA::ValueModifier type_modifier_i () const;
+      virtual CORBA::TypeCode_ptr concrete_base_type_i () const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 311b8f541a8..54d40980a78 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -87,7 +87,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
+                     TAO::Null_RefCount_Policy>::tao_duplicate ()
 {
 }
 
@@ -96,7 +96,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
+                     TAO::Null_RefCount_Policy>::tao_release ()
 {
 }
 
@@ -224,7 +224,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  void) const
+  ) const
 {
   ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
     tc_fields (this->nfields_);
@@ -275,7 +275,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::id_i (void) const
+                     TAO::Null_RefCount_Policy>::id_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -287,7 +287,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::name_i (void) const
+                     TAO::Null_RefCount_Policy>::name_i () const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -299,7 +299,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (void) const
+                     TAO::Null_RefCount_Policy>::member_count_i () const
 {
   return this->nfields_;
 }
@@ -355,7 +355,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::type_modifier_i (void) const
+                     TAO::Null_RefCount_Policy>::type_modifier_i () const
 {
   return this->type_modifier_;
 }
@@ -366,7 +366,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::concrete_base_type_i (
-  void) const
+  ) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
index 2ba8a45bf58..df83f5f3124 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
@@ -241,7 +241,6 @@ public:
   // @}
 
 private:
-
   /// @name Helpers
   // @{
 
@@ -253,7 +252,6 @@ private:
   // @}
 
 private:
-
   TAO_ORB_Core &orb_core_;
 
   THREAD_POOLS thread_pools_;
diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h
index 22d33393918..7b961a81f0e 100644
--- a/TAO/tao/NVList_Adapter.h
+++ b/TAO/tao/NVList_Adapter.h
@@ -40,7 +40,7 @@ namespace CORBA
 class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_NVList_Adapter (void);
+  virtual ~TAO_NVList_Adapter ();
 
   virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0;
 
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 6091692a48b..2f065c382d6 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -64,7 +64,7 @@ namespace TAO
 class TAO_Export TAO_TypeCodeFactory_Adapter : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_TypeCodeFactory_Adapter (void);
+  virtual ~TAO_TypeCodeFactory_Adapter ();
 
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h
index db2f8c8539a..0b2dceb7b4f 100644
--- a/TAO/tao/Valuetype_Adapter.h
+++ b/TAO/tao/Valuetype_Adapter.h
@@ -51,7 +51,7 @@ class TAO_InputCDR;
 class TAO_Export TAO_Valuetype_Adapter : public ACE_Service_Object
 {
 public:
-  virtual ~TAO_Valuetype_Adapter (void);
+  virtual ~TAO_Valuetype_Adapter ();
 
   virtual CORBA::Object_ptr abstractbase_to_object (
       CORBA::AbstractBase_ptr p) = 0;
@@ -63,7 +63,7 @@ public:
       TAO_InputCDR &,
       CORBA::AbstractBase_ptr &) = 0;
 
-  virtual CORBA::Long type_info_single (void) const = 0;
+  virtual CORBA::Long type_info_single () const = 0;
 
   virtual CORBA::Boolean is_type_info_implied (CORBA::Long) const = 0;
   virtual CORBA::Boolean is_type_info_single (CORBA::Long) const = 0;
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index d0094a94f67..11ce0f2f73a 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -63,9 +63,9 @@ namespace CORBA
   {
   public:
 
-    WrongTransaction (void);
+    WrongTransaction ();
     WrongTransaction (const WrongTransaction &);
-    ~WrongTransaction (void);
+    ~WrongTransaction ();
 
     WrongTransaction &operator= (const WrongTransaction &);
 
@@ -74,11 +74,11 @@ namespace CORBA
     static WrongTransaction *_downcast (CORBA::Exception *);
     static const WrongTransaction *_downcast (CORBA::Exception const *);
 
-    static CORBA::Exception *_alloc (void);
+    static CORBA::Exception *_alloc ();
 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
+    virtual CORBA::Exception *_tao_duplicate () const;
 
-    virtual void _raise (void) const;
+    virtual void _raise () const;
 
     virtual void _tao_encode (
         TAO_OutputCDR &
@@ -91,7 +91,7 @@ namespace CORBA
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    virtual CORBA::TypeCode_ptr _tao_type () const;
   };
 
 #endif /* end #if !defined */