Remove redundant void argument

    * TAO/tao/DynamicAny/DynAnyFactory.cpp:
    * TAO/tao/DynamicAny/DynAnyFactory.h:
    * TAO/tao/DynamicAny/DynAny_i.cpp:
    * TAO/tao/DynamicAny/DynAny_i.h:
    * TAO/tao/DynamicAny/DynArray_i.cpp:
    * TAO/tao/DynamicAny/DynArray_i.h:
    * TAO/tao/DynamicAny/DynCommon.cpp:
    * TAO/tao/DynamicAny/DynCommon.h:
    * TAO/tao/DynamicAny/DynEnum_i.cpp:
    * TAO/tao/DynamicAny/DynEnum_i.h:
    * TAO/tao/DynamicAny/DynSequence_i.cpp:
    * TAO/tao/DynamicAny/DynSequence_i.h:
    * TAO/tao/DynamicAny/DynStruct_i.cpp:
    * TAO/tao/DynamicAny/DynStruct_i.h:
    * TAO/tao/DynamicAny/DynUnion_i.cpp:
    * TAO/tao/DynamicAny/DynUnion_i.h:
    * TAO/tao/DynamicAny/DynValueBox_i.cpp:
    * TAO/tao/DynamicAny/DynValueBox_i.h:
    * TAO/tao/DynamicAny/DynValueCommon_i.cpp:
    * TAO/tao/DynamicAny/DynValueCommon_i.h:
    * TAO/tao/DynamicAny/DynValue_i.cpp:
    * TAO/tao/DynamicAny/DynValue_i.h:
    * TAO/tao/DynamicAny/DynamicAny.cpp:
    * TAO/tao/DynamicAny/DynamicAny.h:
    * TAO/tao/Valuetype/AbstractBase.h:

25 files changed, 253 insertions, 253 deletions

diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index c741c9d4f56..eb03d1253a7 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -24,7 +24,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor from typecode
-TAO_DynAnyFactory::TAO_DynAnyFactory (void)
+TAO_DynAnyFactory::TAO_DynAnyFactory ()
 {
 }
 
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 22c902b6f5d..08864b9686e 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -39,7 +39,7 @@ class TAO_DynamicAny_Export TAO_DynAnyFactory
 {
 public:
   /// Constructor.
-  TAO_DynAnyFactory (void);
+  TAO_DynAnyFactory ();
 
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (const CORBA::Any & value);
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index bdca250de2c..3506b030283 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -20,7 +20,7 @@ TAO_DynAny_i::TAO_DynAny_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynAny_i::~TAO_DynAny_i (void)
+TAO_DynAny_i::~TAO_DynAny_i ()
 {
 }
 
@@ -165,7 +165,7 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc)
 }
 
 void
-TAO_DynAny_i::init_common (void)
+TAO_DynAny_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -236,7 +236,7 @@ TAO_DynAny_i::from_any (const CORBA::Any &any)
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::to_any (void)
+TAO_DynAny_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -794,7 +794,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynAny_i::destroy (void)
+TAO_DynAny_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -809,7 +809,7 @@ TAO_DynAny_i::destroy (void)
 
 
 DynamicAny::DynAny_ptr
-TAO_DynAny_i::current_component (void)
+TAO_DynAny_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 2488649d5b4..5530cf49d8e 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -43,7 +43,7 @@ public:
   TAO_DynAny_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynAny_i (void);
+  ~TAO_DynAny_i ();
 
   /// Initialize using just a TypeCode
   void init (CORBA::TypeCode_ptr tc);
@@ -58,13 +58,13 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Check if the typecode is acceptable.
@@ -74,7 +74,7 @@ private:
   void set_to_default_value (CORBA::TypeCode_ptr tc);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // Use copy() or assign() instead of these.
   TAO_DynAny_i (const TAO_DynAny_i &src);
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index c70f37b1763..574102cc3b2 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -16,12 +16,12 @@ TAO_DynArray_i::TAO_DynArray_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynArray_i::~TAO_DynArray_i (void)
+TAO_DynArray_i::~TAO_DynArray_i ()
 {
 }
 
 void
-TAO_DynArray_i::init_common (void)
+TAO_DynArray_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -131,7 +131,7 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc)
 }
 
 CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (void)
+TAO_DynArray_i::get_element_type ()
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
@@ -182,7 +182,7 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 DynamicAny::AnySeq *
-TAO_DynArray_i::get_elements (void)
+TAO_DynArray_i::get_elements ()
 {
   if (this->destroyed_)
     {
@@ -255,7 +255,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value)
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynArray_i::get_elements_as_dyn_any (void)
+TAO_DynArray_i::get_elements_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -401,7 +401,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any)
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::to_any (void)
+TAO_DynArray_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -501,7 +501,7 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynArray_i::destroy (void)
+TAO_DynArray_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -523,7 +523,7 @@ TAO_DynArray_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynArray_i::current_component (void)
+TAO_DynArray_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 6a512602212..01cb6eb8447 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -45,7 +45,7 @@ public:
   TAO_DynArray_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynArray_i (void);
+  ~TAO_DynArray_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -58,11 +58,11 @@ public:
 
   // = Functions specific to DynArray.
 
-  virtual DynamicAny::AnySeq * get_elements (void);
+  virtual DynamicAny::AnySeq * get_elements ();
 
   virtual void set_elements (const DynamicAny::AnySeq & value);
 
-  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (void);
+  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ();
 
   virtual void set_elements_as_dyn_any (const DynamicAny::DynAnySeq & value);
 
@@ -70,23 +70,23 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Returns the type of elements contained in the array.
-  CORBA::TypeCode_ptr get_element_type (void);
+  CORBA::TypeCode_ptr get_element_type ();
 
   /// Gets the length of the array from the typecode.
   CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // Use copy() or assign() instead of these.
   TAO_DynArray_i (const TAO_DynArray_i &src);
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 530d84b8426..d101bd51339 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -34,12 +34,12 @@ TAO_DynCommon::TAO_DynCommon (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynCommon::~TAO_DynCommon (void)
+TAO_DynCommon::~TAO_DynCommon ()
 {
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::type (void)
+TAO_DynCommon::type ()
 {
   if (this->destroyed_)
     {
@@ -395,61 +395,61 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value)
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynCommon::get_boolean (void)
+TAO_DynCommon::get_boolean ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Boolean>::get_value (this);
 }
 
 CORBA::Octet
-TAO_DynCommon::get_octet (void)
+TAO_DynCommon::get_octet ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Octet>::get_value (this);
 }
 
 CORBA::Char
-TAO_DynCommon::get_char (void)
+TAO_DynCommon::get_char ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Char>::get_value (this);
 }
 
 CORBA::Short
-TAO_DynCommon::get_short (void)
+TAO_DynCommon::get_short ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Short>::get_value (this);
 }
 
 CORBA::UShort
-TAO_DynCommon::get_ushort (void)
+TAO_DynCommon::get_ushort ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::UShort>::get_value (this);
 }
 
 CORBA::Long
-TAO_DynCommon::get_long (void)
+TAO_DynCommon::get_long ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Long>::get_value (this);
 }
 
 CORBA::ULong
-TAO_DynCommon::get_ulong (void)
+TAO_DynCommon::get_ulong ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::ULong>::get_value (this);
 }
 
 CORBA::Float
-TAO_DynCommon::get_float (void)
+TAO_DynCommon::get_float ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Float>::get_value (this);
 }
 
 CORBA::Double
-TAO_DynCommon::get_double (void)
+TAO_DynCommon::get_double ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::Double>::get_value (this);
 }
 
 char *
-TAO_DynCommon::get_string (void)
+TAO_DynCommon::get_string ()
 {
   if (this->destroyed_)
     {
@@ -493,7 +493,7 @@ TAO_DynCommon::get_string (void)
 }
 
 CORBA::Object_ptr
-TAO_DynCommon::get_reference (void)
+TAO_DynCommon::get_reference ()
 {
   if (this->destroyed_)
     {
@@ -521,7 +521,7 @@ TAO_DynCommon::get_reference (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::get_typecode (void)
+TAO_DynCommon::get_typecode ()
 {
   if (this->destroyed_)
     {
@@ -548,25 +548,25 @@ TAO_DynCommon::get_typecode (void)
 }
 
 CORBA::LongLong
-TAO_DynCommon::get_longlong (void)
+TAO_DynCommon::get_longlong ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::LongLong>::get_value (this);
 }
 
 CORBA::ULongLong
-TAO_DynCommon::get_ulonglong (void)
+TAO_DynCommon::get_ulonglong ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::ULongLong>::get_value (this);
 }
 
 CORBA::LongDouble
-TAO_DynCommon::get_longdouble (void)
+TAO_DynCommon::get_longdouble ()
 {
   return TAO::DynAnyBasicTypeUtils<CORBA::LongDouble>::get_value (this);
 }
 
 CORBA::WChar
-TAO_DynCommon::get_wchar (void)
+TAO_DynCommon::get_wchar ()
 {
   if (this->destroyed_)
     {
@@ -593,7 +593,7 @@ TAO_DynCommon::get_wchar (void)
 }
 
 CORBA::WChar *
-TAO_DynCommon::get_wstring (void)
+TAO_DynCommon::get_wstring ()
 {
   if (this->destroyed_)
     {
@@ -627,7 +627,7 @@ TAO_DynCommon::get_wstring (void)
 }
 
 CORBA::Any_ptr
-TAO_DynCommon::get_any (void)
+TAO_DynCommon::get_any ()
 {
   if (this->destroyed_)
     {
@@ -661,7 +661,7 @@ TAO_DynCommon::get_any (void)
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
 // have fewer Any/DynAny conversions than get_any, not more.
 DynamicAny::DynAny_ptr
-TAO_DynCommon::get_dyn_any (void)
+TAO_DynCommon::get_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -678,7 +678,7 @@ TAO_DynCommon::get_dyn_any (void)
 }
 
 CORBA::ValueBase *
-TAO_DynCommon::get_val (void)
+TAO_DynCommon::get_val ()
 {
   if (this->destroyed_)
     {
@@ -759,7 +759,7 @@ TAO_DynCommon::seek (CORBA::Long slot)
 }
 
 void
-TAO_DynCommon::rewind (void)
+TAO_DynCommon::rewind ()
 {
   if (this->destroyed_)
     {
@@ -770,7 +770,7 @@ TAO_DynCommon::rewind (void)
 }
 
 CORBA::Boolean
-TAO_DynCommon::next (void)
+TAO_DynCommon::next ()
 {
   if (this->destroyed_)
     {
@@ -793,7 +793,7 @@ TAO_DynCommon::next (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::copy (void)
+TAO_DynCommon::copy ()
 {
   if (this->destroyed_)
     {
@@ -812,7 +812,7 @@ TAO_DynCommon::copy (void)
 }
 
 CORBA::ULong
-TAO_DynCommon::component_count (void)
+TAO_DynCommon::component_count ()
 {
   if (this->destroyed_)
     {
@@ -898,7 +898,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value)
 }
 
 CORBA::AbstractBase_ptr
-TAO_DynCommon::get_abstract (void)
+TAO_DynCommon::get_abstract ()
 {
   if (this->destroyed_)
     {
@@ -1031,7 +1031,7 @@ TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value)
 // ****************************************************************
 
 CORBA::BooleanSeq *
-TAO_DynCommon::get_boolean_seq (void)
+TAO_DynCommon::get_boolean_seq ()
 {
   const CORBA::BooleanSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::BooleanSeq>::get_value (this);
@@ -1039,7 +1039,7 @@ TAO_DynCommon::get_boolean_seq (void)
 }
 
 CORBA::OctetSeq *
-TAO_DynCommon::get_octet_seq (void)
+TAO_DynCommon::get_octet_seq ()
 {
   const CORBA::OctetSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::OctetSeq>::get_value (this);
@@ -1047,7 +1047,7 @@ TAO_DynCommon::get_octet_seq (void)
 }
 
 CORBA::CharSeq *
-TAO_DynCommon::get_char_seq (void)
+TAO_DynCommon::get_char_seq ()
 {
   const CORBA::CharSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::CharSeq>::get_value (this);
@@ -1055,7 +1055,7 @@ TAO_DynCommon::get_char_seq (void)
 }
 
 CORBA::ShortSeq *
-TAO_DynCommon::get_short_seq (void)
+TAO_DynCommon::get_short_seq ()
 {
   const CORBA::ShortSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ShortSeq>::get_value (this);
@@ -1063,7 +1063,7 @@ TAO_DynCommon::get_short_seq (void)
 }
 
 CORBA::UShortSeq *
-TAO_DynCommon::get_ushort_seq (void)
+TAO_DynCommon::get_ushort_seq ()
 {
   const CORBA::UShortSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::UShortSeq>::get_value (this);
@@ -1071,7 +1071,7 @@ TAO_DynCommon::get_ushort_seq (void)
 }
 
 CORBA::LongSeq *
-TAO_DynCommon::get_long_seq (void)
+TAO_DynCommon::get_long_seq ()
 {
   const CORBA::LongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongSeq>::get_value (this);
@@ -1079,7 +1079,7 @@ TAO_DynCommon::get_long_seq (void)
 }
 
 CORBA::ULongSeq *
-TAO_DynCommon::get_ulong_seq (void)
+TAO_DynCommon::get_ulong_seq ()
 {
   const CORBA::ULongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ULongSeq>::get_value (this);
@@ -1087,7 +1087,7 @@ TAO_DynCommon::get_ulong_seq (void)
 }
 
 CORBA::FloatSeq *
-TAO_DynCommon::get_float_seq (void)
+TAO_DynCommon::get_float_seq ()
 {
   const CORBA::FloatSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::FloatSeq>::get_value (this);
@@ -1095,7 +1095,7 @@ TAO_DynCommon::get_float_seq (void)
 }
 
 CORBA::DoubleSeq *
-TAO_DynCommon::get_double_seq (void)
+TAO_DynCommon::get_double_seq ()
 {
   const CORBA::DoubleSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::DoubleSeq>::get_value (this);
@@ -1103,7 +1103,7 @@ TAO_DynCommon::get_double_seq (void)
 }
 
 CORBA::LongLongSeq *
-TAO_DynCommon::get_longlong_seq (void)
+TAO_DynCommon::get_longlong_seq ()
 {
   const CORBA::LongLongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongLongSeq>::get_value (this);
@@ -1111,7 +1111,7 @@ TAO_DynCommon::get_longlong_seq (void)
 }
 
 CORBA::ULongLongSeq *
-TAO_DynCommon::get_ulonglong_seq (void)
+TAO_DynCommon::get_ulonglong_seq ()
 {
   const CORBA::ULongLongSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::ULongLongSeq>::get_value (this);
@@ -1119,7 +1119,7 @@ TAO_DynCommon::get_ulonglong_seq (void)
 }
 
 CORBA::LongDoubleSeq *
-TAO_DynCommon::get_longdouble_seq (void)
+TAO_DynCommon::get_longdouble_seq ()
 {
   const CORBA::LongDoubleSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::LongDoubleSeq>::get_value (this);
@@ -1127,7 +1127,7 @@ TAO_DynCommon::get_longdouble_seq (void)
 }
 
 CORBA::WCharSeq *
-TAO_DynCommon::get_wchar_seq (void)
+TAO_DynCommon::get_wchar_seq ()
 {
   const CORBA::WCharSeq *owned =
     TAO::DynAnyBasicTypeUtils<CORBA::WCharSeq>::get_value (this);
@@ -1268,19 +1268,19 @@ TAO_DynCommon::is_basic_type_seq (CORBA::TypeCode_ptr tc)
 }
 
 CORBA::Boolean
-TAO_DynCommon::has_components (void) const
+TAO_DynCommon::has_components () const
 {
   return this->has_components_;
 }
 
 CORBA::Boolean
-TAO_DynCommon::destroyed (void) const
+TAO_DynCommon::destroyed () const
 {
   return this->destroyed_;
 }
 
 CORBA::Any &
-TAO_DynCommon::the_any (void)
+TAO_DynCommon::the_any ()
 {
   return this->any_;
 }
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 4d8da9d2790..0d11430f27c 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -35,11 +35,11 @@ public:
   TAO_DynCommon (CORBA::Boolean allow_truncation);
 
   /// Destructor.
-  virtual ~TAO_DynCommon (void);
+  virtual ~TAO_DynCommon ();
 
   // = Some functions common to all Dynamic Any types.
 
-  virtual CORBA::TypeCode_ptr type (void);
+  virtual CORBA::TypeCode_ptr type ();
 
   virtual void assign (DynamicAny::DynAny_ptr dyn_any);
 
@@ -81,59 +81,59 @@ public:
 
   virtual void insert_val (CORBA::ValueBase * value);
 
-  virtual CORBA::Boolean get_boolean (void);
+  virtual CORBA::Boolean get_boolean ();
 
-  virtual CORBA::Octet get_octet (void);
+  virtual CORBA::Octet get_octet ();
 
-  virtual CORBA::Char get_char (void);
+  virtual CORBA::Char get_char ();
 
-  virtual CORBA::Short get_short (void);
+  virtual CORBA::Short get_short ();
 
-  virtual CORBA::UShort get_ushort (void);
+  virtual CORBA::UShort get_ushort ();
 
-  virtual CORBA::Long get_long (void);
+  virtual CORBA::Long get_long ();
 
-  virtual CORBA::ULong get_ulong (void);
+  virtual CORBA::ULong get_ulong ();
 
-  virtual CORBA::Float get_float (void);
+  virtual CORBA::Float get_float ();
 
-  virtual CORBA::Double get_double (void);
+  virtual CORBA::Double get_double ();
 
-  virtual char * get_string (void);
+  virtual char * get_string ();
 
-  virtual CORBA::Object_ptr get_reference (void);
+  virtual CORBA::Object_ptr get_reference ();
 
-  virtual CORBA::TypeCode_ptr get_typecode (void);
+  virtual CORBA::TypeCode_ptr get_typecode ();
 
-  virtual CORBA::LongLong get_longlong (void);
+  virtual CORBA::LongLong get_longlong ();
 
-  virtual CORBA::ULongLong get_ulonglong (void);
+  virtual CORBA::ULongLong get_ulonglong ();
 
-  virtual CORBA::LongDouble get_longdouble (void);
+  virtual CORBA::LongDouble get_longdouble ();
 
-  virtual CORBA::WChar get_wchar (void);
+  virtual CORBA::WChar get_wchar ();
 
-  virtual CORBA::WChar * get_wstring (void);
+  virtual CORBA::WChar * get_wstring ();
 
-  virtual CORBA::Any * get_any (void);
+  virtual CORBA::Any * get_any ();
 
-  virtual DynamicAny::DynAny_ptr get_dyn_any (void);
+  virtual DynamicAny::DynAny_ptr get_dyn_any ();
 
-  virtual CORBA::ValueBase * get_val (void);
+  virtual CORBA::ValueBase * get_val ();
 
   virtual CORBA::Boolean seek (CORBA::Long index);
 
-  virtual void rewind (void);
+  virtual void rewind ();
 
-  virtual CORBA::Boolean next (void);
+  virtual CORBA::Boolean next ();
 
-  virtual DynamicAny::DynAny_ptr copy (void);
+  virtual DynamicAny::DynAny_ptr copy ();
 
-  virtual CORBA::ULong component_count (void);
+  virtual CORBA::ULong component_count ();
 
   virtual void insert_abstract (CORBA::AbstractBase_ptr value);
 
-  virtual CORBA::AbstractBase_ptr get_abstract (void);
+  virtual CORBA::AbstractBase_ptr get_abstract ();
 
   virtual void insert_boolean_seq (const CORBA::BooleanSeq & value);
 
@@ -161,31 +161,31 @@ public:
 
   virtual void insert_wchar_seq (const CORBA::WCharSeq & value);
 
-  virtual CORBA::BooleanSeq * get_boolean_seq (void);
+  virtual CORBA::BooleanSeq * get_boolean_seq ();
 
-  virtual CORBA::OctetSeq * get_octet_seq (void);
+  virtual CORBA::OctetSeq * get_octet_seq ();
 
-  virtual CORBA::CharSeq * get_char_seq (void);
+  virtual CORBA::CharSeq * get_char_seq ();
 
-  virtual CORBA::ShortSeq * get_short_seq (void);
+  virtual CORBA::ShortSeq * get_short_seq ();
 
-  virtual CORBA::UShortSeq * get_ushort_seq (void);
+  virtual CORBA::UShortSeq * get_ushort_seq ();
 
-  virtual CORBA::LongSeq * get_long_seq (void);
+  virtual CORBA::LongSeq * get_long_seq ();
 
-  virtual CORBA::ULongSeq * get_ulong_seq (void);
+  virtual CORBA::ULongSeq * get_ulong_seq ();
 
-  virtual CORBA::FloatSeq * get_float_seq (void);
+  virtual CORBA::FloatSeq * get_float_seq ();
 
-  virtual CORBA::DoubleSeq * get_double_seq (void);
+  virtual CORBA::DoubleSeq * get_double_seq ();
 
-  virtual CORBA::LongLongSeq * get_longlong_seq (void);
+  virtual CORBA::LongLongSeq * get_longlong_seq ();
 
-  virtual CORBA::ULongLongSeq * get_ulonglong_seq (void);
+  virtual CORBA::ULongLongSeq * get_ulonglong_seq ();
 
-  virtual CORBA::LongDoubleSeq * get_longdouble_seq (void);
+  virtual CORBA::LongDoubleSeq * get_longdouble_seq ();
 
-  virtual CORBA::WCharSeq * get_wchar_seq (void);
+  virtual CORBA::WCharSeq * get_wchar_seq ();
 
   /// This sets one of two flags in this base class. CORBA 2.4.2
   /// requires that destroy() do nothing if it is called on
@@ -208,9 +208,9 @@ public:
 
   // Accessors
 
-  CORBA::Boolean has_components (void) const;
-  CORBA::Boolean destroyed (void) const;
-  CORBA::Any &the_any (void);
+  CORBA::Boolean has_components () const;
+  CORBA::Boolean destroyed () const;
+  CORBA::Any &the_any ();
 
   // Mutators
 
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index bb5529b24b6..7f25e22f02d 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -16,12 +16,12 @@ TAO_DynEnum_i::TAO_DynEnum_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynEnum_i::~TAO_DynEnum_i (void)
+TAO_DynEnum_i::~TAO_DynEnum_i ()
 {
 }
 
 void
-TAO_DynEnum_i::init_common (void)
+TAO_DynEnum_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -103,7 +103,7 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 char *
-TAO_DynEnum_i::get_as_string (void)
+TAO_DynEnum_i::get_as_string ()
 {
   CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
@@ -143,7 +143,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string)
 }
 
 CORBA::ULong
-TAO_DynEnum_i::get_as_ulong (void)
+TAO_DynEnum_i::get_as_ulong ()
 {
   return this->value_;
 }
@@ -205,7 +205,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any)
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::to_any (void)
+TAO_DynEnum_i::to_any ()
 {
   TAO_OutputCDR out_cdr;
 
@@ -269,7 +269,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynEnum_i::destroy (void)
+TAO_DynEnum_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -283,7 +283,7 @@ TAO_DynEnum_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynEnum_i::current_component (void)
+TAO_DynEnum_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 471cd24ce6d..6d05d6d7fae 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -45,7 +45,7 @@ public:
   TAO_DynEnum_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynEnum_i (void);
+  ~TAO_DynEnum_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -58,11 +58,11 @@ public:
 
   // = Functions specific to DynEnum.
 
-  virtual char * get_as_string (void);
+  virtual char * get_as_string ();
 
   virtual void set_as_string (const char * value);
 
-  virtual CORBA::ULong get_as_ulong (void);
+  virtual CORBA::ULong get_as_ulong ();
 
   virtual void set_as_ulong (CORBA::ULong value);
 
@@ -70,17 +70,17 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   // Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // = Use copy() or assign() instead of these.
   TAO_DynEnum_i (const TAO_DynEnum_i &src);
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 702fb10a131..749a3b79e93 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -16,12 +16,12 @@ TAO_DynSequence_i::TAO_DynSequence_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynSequence_i::~TAO_DynSequence_i (void)
+TAO_DynSequence_i::~TAO_DynSequence_i ()
 {
 }
 
 void
-TAO_DynSequence_i::init_common (void)
+TAO_DynSequence_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -137,7 +137,7 @@ TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (void)
+TAO_DynSequence_i::get_element_type ()
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
@@ -161,7 +161,7 @@ TAO_DynSequence_i::get_element_type (void)
 // = Functions specific to DynSequence.
 
 CORBA::ULong
-TAO_DynSequence_i::get_length (void)
+TAO_DynSequence_i::get_length ()
 {
   if (this->destroyed_)
     {
@@ -247,7 +247,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length)
 }
 
 DynamicAny::AnySeq *
-TAO_DynSequence_i::get_elements (void)
+TAO_DynSequence_i::get_elements ()
 {
   if (this->destroyed_)
     {
@@ -360,7 +360,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynSequence_i::get_elements_as_dyn_any (void)
+TAO_DynSequence_i::get_elements_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -562,7 +562,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any)
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::to_any (void)
+TAO_DynSequence_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -668,7 +668,7 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynSequence_i::destroy (void)
+TAO_DynSequence_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -690,7 +690,7 @@ TAO_DynSequence_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynSequence_i::current_component (void)
+TAO_DynSequence_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index f76bc51aa9d..276a39f7022 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -44,7 +44,7 @@ public:
   TAO_DynSequence_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynSequence_i (void);
+  ~TAO_DynSequence_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -57,15 +57,15 @@ public:
 
   // = Functions specific to DynSequence.
 
-  virtual CORBA::ULong get_length (void);
+  virtual CORBA::ULong get_length ();
 
   virtual void set_length (CORBA::ULong len);
 
-  virtual DynamicAny::AnySeq * get_elements (void);
+  virtual DynamicAny::AnySeq * get_elements ();
 
   virtual void set_elements (const DynamicAny::AnySeq & value);
 
-  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (void);
+  virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ();
 
   virtual void set_elements_as_dyn_any (const DynamicAny::DynAnySeq & value);
 
@@ -74,20 +74,20 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   // Utility, turns the type of elements contained in the sequence.
-  CORBA::TypeCode_ptr get_element_type (void);
+  CORBA::TypeCode_ptr get_element_type ();
 
   // Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // = Use copy() or assign() instead of these
   TAO_DynSequence_i (const TAO_DynSequence_i &src);
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 0301858b44c..bfa40f2874e 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -16,7 +16,7 @@ TAO_DynStruct_i::TAO_DynStruct_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynStruct_i::~TAO_DynStruct_i (void)
+TAO_DynStruct_i::~TAO_DynStruct_i ()
 {
 }
 
@@ -34,7 +34,7 @@ TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc)
 }
 
 void
-TAO_DynStruct_i::init_common (void)
+TAO_DynStruct_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -179,7 +179,7 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref)
 // ****************************************************************
 
 DynamicAny::FieldName
-TAO_DynStruct_i::current_member_name (void)
+TAO_DynStruct_i::current_member_name ()
 {
   if (this->destroyed_)
     {
@@ -208,7 +208,7 @@ TAO_DynStruct_i::current_member_name (void)
 
 // Returns the unaliased TCKind.
 CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (void)
+TAO_DynStruct_i::current_member_kind ()
 {
   if (this->destroyed_)
     {
@@ -238,7 +238,7 @@ TAO_DynStruct_i::current_member_kind (void)
 }
 
 DynamicAny::NameValuePairSeq *
-TAO_DynStruct_i::get_members (void)
+TAO_DynStruct_i::get_members ()
 {
   if (this->destroyed_)
     {
@@ -334,7 +334,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values)
 }
 
 DynamicAny::NameDynAnyPairSeq *
-TAO_DynStruct_i::get_members_as_dyn_any (void)
+TAO_DynStruct_i::get_members_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -506,7 +506,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::to_any (void)
+TAO_DynStruct_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -615,7 +615,7 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynStruct_i::destroy (void)
+TAO_DynStruct_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -637,7 +637,7 @@ TAO_DynStruct_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynStruct_i::current_component (void)
+TAO_DynStruct_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index f390cda7a22..ba993d6c84c 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -44,7 +44,7 @@ public:
   TAO_DynStruct_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynStruct_i (void);
+  ~TAO_DynStruct_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -57,15 +57,15 @@ public:
 
   // = Functions specific to DynStruct.
 
-  virtual DynamicAny::FieldName current_member_name (void);
+  virtual DynamicAny::FieldName current_member_name ();
 
-  virtual CORBA::TCKind current_member_kind (void);
+  virtual CORBA::TCKind current_member_kind ();
 
-  virtual DynamicAny::NameValuePairSeq *get_members (void);
+  virtual DynamicAny::NameValuePairSeq *get_members ();
 
   virtual void set_members (const DynamicAny::NameValuePairSeq& value);
 
-  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (void);
+  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ();
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value);
@@ -74,13 +74,13 @@ public:
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Check if the typecode is acceptable.
@@ -91,7 +91,7 @@ private:
   void set_from_any (const CORBA::Any &any);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   // = Use copy() or assign() instead of these.
   TAO_DynStruct_i (const TAO_DynStruct_i &src);
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index d8e1165b480..bba6b5e1a72 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -18,12 +18,12 @@ TAO_DynUnion_i::TAO_DynUnion_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynUnion_i::~TAO_DynUnion_i (void)
+TAO_DynUnion_i::~TAO_DynUnion_i ()
 {
 }
 
 void
-TAO_DynUnion_i::init_common (void)
+TAO_DynUnion_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
@@ -283,7 +283,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
 // ****************************************************************
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::get_discriminator (void)
+TAO_DynUnion_i::get_discriminator ()
 {
   if (this->destroyed_)
     {
@@ -425,7 +425,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value)
 }
 
 void
-TAO_DynUnion_i::set_to_default_member (void)
+TAO_DynUnion_i::set_to_default_member ()
 {
   if (this->destroyed_)
     {
@@ -468,7 +468,7 @@ TAO_DynUnion_i::set_to_default_member (void)
 }
 
 void
-TAO_DynUnion_i::set_to_no_active_member (void)
+TAO_DynUnion_i::set_to_no_active_member ()
 {
   if (this->destroyed_)
     {
@@ -517,7 +517,7 @@ TAO_DynUnion_i::set_to_no_active_member (void)
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::has_no_active_member (void)
+TAO_DynUnion_i::has_no_active_member ()
 {
   if (this->destroyed_)
     {
@@ -529,7 +529,7 @@ TAO_DynUnion_i::has_no_active_member (void)
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (void)
+TAO_DynUnion_i::discriminator_kind ()
 {
   if (this->destroyed_)
     {
@@ -543,7 +543,7 @@ TAO_DynUnion_i::discriminator_kind (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::member (void)
+TAO_DynUnion_i::member ()
 {
   if (this->destroyed_)
     {
@@ -566,7 +566,7 @@ TAO_DynUnion_i::member (void)
 }
 
 char *
-TAO_DynUnion_i::member_name (void)
+TAO_DynUnion_i::member_name ()
 {
   if (this->destroyed_)
     {
@@ -587,7 +587,7 @@ TAO_DynUnion_i::member_name (void)
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::member_kind (void)
+TAO_DynUnion_i::member_kind ()
 {
   if (this->destroyed_)
     {
@@ -640,7 +640,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any)
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::to_any (void)
+TAO_DynUnion_i::to_any ()
 {
   if (this->destroyed_)
     {
@@ -770,7 +770,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynUnion_i::destroy (void)
+TAO_DynUnion_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -797,7 +797,7 @@ TAO_DynUnion_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::current_component (void)
+TAO_DynUnion_i::current_component ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index e12129861e0..27436f421af 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -43,7 +43,7 @@ public:
   TAO_DynUnion_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynUnion_i (void);
+  ~TAO_DynUnion_i ();
 
   /// Constructor taking an Any argument.
   void init (const CORBA::Any& any);
@@ -56,35 +56,35 @@ public:
 
   // = Functions specific to DynUnion.
 
-  virtual DynamicAny::DynAny_ptr get_discriminator (void);
+  virtual DynamicAny::DynAny_ptr get_discriminator ();
 
   virtual void set_discriminator (DynamicAny::DynAny_ptr d);
 
-  virtual void set_to_default_member (void);
+  virtual void set_to_default_member ();
 
-  virtual void set_to_no_active_member (void);
+  virtual void set_to_no_active_member ();
 
-  virtual CORBA::Boolean has_no_active_member (void);
+  virtual CORBA::Boolean has_no_active_member ();
 
-  virtual CORBA::TCKind discriminator_kind (void);
+  virtual CORBA::TCKind discriminator_kind ();
 
-  virtual DynamicAny::DynAny_ptr member (void);
+  virtual DynamicAny::DynAny_ptr member ();
 
-  virtual char * member_name (void);
+  virtual char * member_name ();
 
-  virtual CORBA::TCKind member_kind (void);
+  virtual CORBA::TCKind member_kind ();
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
 private:
   /// Code common to the constructor from an Any arg and the member
@@ -92,7 +92,7 @@ private:
   void set_from_any (const CORBA::Any &any);
 
   /// Called by both versions of init().
-  void init_common (void);
+  void init_common ();
 
   /// Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA::Any &my_any,
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index e4c4711cfec..4b522011808 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -18,12 +18,12 @@ TAO_DynValueBox_i::TAO_DynValueBox_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynValueBox_i::~TAO_DynValueBox_i (void)
+TAO_DynValueBox_i::~TAO_DynValueBox_i ()
 {
 }
 
 void
-TAO_DynValueBox_i::set_to_value (void)
+TAO_DynValueBox_i::set_to_value ()
 {
   if (CORBA::is_nil (this->boxed_.in ()))
     {
@@ -87,7 +87,7 @@ TAO_DynValueBox_i::_narrow (CORBA::Object_ptr _tao_objref)
 }
 
 CORBA::Any *
-TAO_DynValueBox_i::get_boxed_value (void)
+TAO_DynValueBox_i::get_boxed_value ()
 {
   if (this->destroyed_)
     {
@@ -127,7 +127,7 @@ TAO_DynValueBox_i::set_boxed_value (const CORBA::Any & boxed)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynValueBox_i::get_boxed_value_as_dyn_any (void)
+TAO_DynValueBox_i::get_boxed_value_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -216,7 +216,7 @@ TAO_DynValueBox_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynValueBox_i::destroy (void)
+TAO_DynValueBox_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -237,7 +237,7 @@ TAO_DynValueBox_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynValueBox_i::current_component (void)
+TAO_DynValueBox_i::current_component ()
 {
   if (this->destroyed_)
     {
@@ -324,7 +324,7 @@ TAO_DynValueBox_i::set_from_any (const CORBA::Any & any)
 }
 
 CORBA::Any_ptr
-TAO_DynValueBox_i::to_any (void)
+TAO_DynValueBox_i::to_any ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h
index 992fa8aedb4..3dadf64cb6c 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.h
+++ b/TAO/tao/DynamicAny/DynValueBox_i.h
@@ -39,7 +39,7 @@ public:
   TAO_DynValueBox_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynValueBox_i (void);
+  ~TAO_DynValueBox_i ();
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc);
@@ -51,27 +51,27 @@ public:
   static TAO_DynValueBox_i *_narrow (CORBA::Object_ptr obj);
 
   // = Functions specific to DynValueBox.
-  virtual CORBA::Any * get_boxed_value (void);
+  virtual CORBA::Any * get_boxed_value ();
 
   virtual void set_boxed_value (const CORBA::Any & boxed);
 
-  virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any (void);
+  virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any ();
 
   virtual void set_boxed_value_as_dyn_any (DynamicAny::DynAny_ptr boxed);
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
   // = DynValueCommon needed to be provided here
-  virtual void set_to_value (void);
+  virtual void set_to_value ();
 
 private:
   /// Check if the typecode is acceptable.
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
index 08400a45e9a..7a105953409 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
@@ -11,18 +11,18 @@ TAO_DynValueCommon_i::TAO_DynValueCommon_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynValueCommon_i::~TAO_DynValueCommon_i (void)
+TAO_DynValueCommon_i::~TAO_DynValueCommon_i ()
 {
 }
 
 CORBA::Boolean
-TAO_DynValueCommon_i::is_null (void)
+TAO_DynValueCommon_i::is_null ()
 {
   return this->is_null_;
 }
 
 void
-TAO_DynValueCommon_i::set_to_null (void)
+TAO_DynValueCommon_i::set_to_null ()
 {
   this->is_null_        = true;
   this->component_count_  = 0u;
@@ -30,7 +30,7 @@ TAO_DynValueCommon_i::set_to_null (void)
 }
 
 void
-TAO_DynValueCommon_i::init_common (void)
+TAO_DynValueCommon_i::init_common ()
 {
   this->ref_to_component_ = false;
   this->container_is_destroying_ = false;
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h
index 30cc907773d..7dbf099ecbf 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.h
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.h
@@ -39,20 +39,20 @@ public:
   TAO_DynValueCommon_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynValueCommon_i (void);
+  ~TAO_DynValueCommon_i ();
 
   // = LocalObject methods.
   static TAO_DynValueCommon_i *_narrow (CORBA::Object_ptr obj);
 
   /// Called by DynValue and DynValueBox init() functions.
-  void init_common (void);
+  void init_common ();
 
   // = Functions specific to DynValueCommon.
-  virtual CORBA::Boolean is_null (void);
+  virtual CORBA::Boolean is_null ();
 
-  virtual void set_to_null (void);
+  virtual void set_to_null ();
 
-  virtual void set_to_value (void) = 0;
+  virtual void set_to_value () = 0;
 
 private:
   // = Use copy() or assign() instead of these.
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 6f319728c3d..728b5614b1a 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -21,7 +21,7 @@ TAO_DynValue_i::TAO_DynValue_i (CORBA::Boolean allow_truncation)
 {
 }
 
-TAO_DynValue_i::~TAO_DynValue_i (void)
+TAO_DynValue_i::~TAO_DynValue_i ()
 {
 }
 
@@ -205,7 +205,7 @@ TAO_DynValue_i::get_member_name (
 }
 
 void
-TAO_DynValue_i::set_to_value (void)
+TAO_DynValue_i::set_to_value ()
 {
   this->component_count_ =
     static_cast <CORBA::ULong> (this->da_members_.size ());
@@ -234,7 +234,7 @@ TAO_DynValue_i::_narrow (CORBA::Object_ptr _tao_objref)
 }
 
 DynamicAny::FieldName
-TAO_DynValue_i::current_member_name (void)
+TAO_DynValue_i::current_member_name ()
 {
   if (this->destroyed_)
     {
@@ -253,7 +253,7 @@ TAO_DynValue_i::current_member_name (void)
 }
 
 CORBA::TCKind
-TAO_DynValue_i::current_member_kind (void)
+TAO_DynValue_i::current_member_kind ()
 {
   if (this->destroyed_)
     {
@@ -273,7 +273,7 @@ TAO_DynValue_i::current_member_kind (void)
 }
 
 DynamicAny::NameValuePairSeq *
-TAO_DynValue_i::get_members (void)
+TAO_DynValue_i::get_members ()
 {
   if (this->destroyed_)
     {
@@ -351,7 +351,7 @@ TAO_DynValue_i::set_members (
 }
 
 DynamicAny::NameDynAnyPairSeq *
-TAO_DynValue_i::get_members_as_dyn_any (void)
+TAO_DynValue_i::get_members_as_dyn_any ()
 {
   if (this->destroyed_)
     {
@@ -491,7 +491,7 @@ TAO_DynValue_i::equal (DynamicAny::DynAny_ptr rhs)
 }
 
 void
-TAO_DynValue_i::destroy (void)
+TAO_DynValue_i::destroy ()
 {
   if (this->destroyed_)
     {
@@ -519,7 +519,7 @@ TAO_DynValue_i::destroy (void)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynValue_i::current_component (void)
+TAO_DynValue_i::current_component ()
 {
   if (this->destroyed_)
     {
@@ -602,7 +602,7 @@ TAO_DynValue_i::insert_val (CORBA::ValueBase *value)
 // which then will be wrong type for the valuetype
 // output we want.
 CORBA::ValueBase *
-TAO_DynValue_i::get_val (void)
+TAO_DynValue_i::get_val ()
 {
   if (this->destroyed_)
     {
@@ -626,7 +626,7 @@ TAO_DynValue_i::get_val (void)
 }
 
 CORBA::Any_ptr
-TAO_DynValue_i::to_any (void)
+TAO_DynValue_i::to_any ()
 {
   if (this->destroyed_)
     {
diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h
index ce0194f7211..f3f8884342e 100644
--- a/TAO/tao/DynamicAny/DynValue_i.h
+++ b/TAO/tao/DynamicAny/DynValue_i.h
@@ -39,7 +39,7 @@ public:
   TAO_DynValue_i (CORBA::Boolean allow_truncation=true);
 
   /// Destructor.
-  ~TAO_DynValue_i (void);
+  ~TAO_DynValue_i ();
 
   /// Initialize using an Any.
   void init (const CORBA::Any& any);
@@ -54,15 +54,15 @@ public:
   static TAO_DynValue_i *_narrow (CORBA::Object_ptr obj);
 
   // = Functions specific to DynValue.
-  virtual DynamicAny::FieldName current_member_name (void);
+  virtual DynamicAny::FieldName current_member_name ();
 
-  virtual CORBA::TCKind current_member_kind (void);
+  virtual CORBA::TCKind current_member_kind ();
 
-  virtual DynamicAny::NameValuePairSeq * get_members (void);
+  virtual DynamicAny::NameValuePairSeq * get_members ();
 
   virtual void set_members (const DynamicAny::NameValuePairSeq & value);
 
-  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (void);
+  virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any ();
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value);
@@ -70,20 +70,20 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
   virtual void from_any (const CORBA::Any & value);
 
-  virtual CORBA::Any * to_any (void);
+  virtual CORBA::Any * to_any ();
 
   virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any);
 
-  virtual void destroy (void);
+  virtual void destroy ();
 
-  virtual DynamicAny::DynAny_ptr current_component (void);
+  virtual DynamicAny::DynAny_ptr current_component ();
 
   virtual void insert_val (CORBA::ValueBase * value);
 
-  virtual CORBA::ValueBase * get_val (void);
+  virtual CORBA::ValueBase * get_val ();
 
   // = DynValueCommon needed to be provided here
-  virtual void set_to_value (void);
+  virtual void set_to_value ();
 
 private:
   /// List of base types.
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 1b6128a6254..ccb3723a2b5 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -12,7 +12,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
+TAO_DynamicAny_Loader::TAO_DynamicAny_Loader ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
 }
 
 int
-TAO_DynamicAny_Loader::Initializer (void)
+TAO_DynamicAny_Loader::Initializer ()
 {
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader);
 }
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 6d8059ff461..6c64249fdca 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -32,7 +32,7 @@ class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader
 {
 public:
   /// Constructor
-  TAO_DynamicAny_Loader (void);
+  TAO_DynamicAny_Loader ();
 
   /// Creates a DynamicAny factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
@@ -40,7 +40,7 @@ public:
                                            ACE_TCHAR *argv []);
 
   /// Used to force the initialization of the ORB code.
-  static int Initializer (void);
+  static int Initializer ();
 };
 
 static int
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index a67601acfed..f9825071858 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -67,21 +67,21 @@ namespace CORBA
 
     static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj);
     static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
-    static CORBA::AbstractBase_ptr _nil (void);
+    static CORBA::AbstractBase_ptr _nil ();
 
     /// Used in the implementation of CORBA::Any
     static void _tao_any_destructor (void*);
 
     /// Spec required conversion operations
-    CORBA::Object_ptr _to_object (void);
-    CORBA::ValueBase *_to_value (void);
+    CORBA::Object_ptr _to_object ();
+    CORBA::ValueBase *_to_value ();
 
     virtual CORBA::Boolean _is_a (const char *type_id);
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _interface_repository_id () const;
 
     /// TAO specific operations
 
-    virtual const char* _tao_obv_repository_id (void) const;
+    virtual const char* _tao_obv_repository_id () const;
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
     virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t) const;
@@ -97,17 +97,17 @@ namespace CORBA
 #endif /* GEN_OSTREAM_OPS */
 
     /// Memory management operations
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
+    virtual void _add_ref ();
+    virtual void _remove_ref ();
 
-    CORBA::Boolean _is_objref (void) const;
+    CORBA::Boolean _is_objref () const;
 
     /// Return the stub object
-    TAO_Stub *_stubobj (void) const;
+    TAO_Stub *_stubobj () const;
 
     /// Acessors
-    CORBA::Boolean _is_collocated (void) const;
-    TAO_Abstract_ServantBase *_servant (void) const;
+    CORBA::Boolean _is_collocated () const;
+    TAO_Abstract_ServantBase *_servant () const;
 
     /// Return the equivalent object reference.
     /**
@@ -115,17 +115,17 @@ namespace CORBA
      * a var or some such thing. The memory is owned by @c this
      * object.
      */
-    CORBA::Object_ptr equivalent_objref (void);
+    CORBA::Object_ptr equivalent_objref ();
 
     /// Wrapper for _remove_ref(), naming convention for
     /// templatizing.
-    void _decr_refcount (void);
+    void _decr_refcount ();
 
   protected:
-    AbstractBase (void);
+    AbstractBase ();
     AbstractBase (const AbstractBase &);
 
-    virtual ~AbstractBase (void);
+    virtual ~AbstractBase ();
 
   protected:
 
@@ -134,7 +134,7 @@ namespace CORBA
   private:
     AbstractBase & operator= (const AbstractBase &);
 
-    virtual CORBA::ValueBase *_tao_to_value (void);
+    virtual CORBA::ValueBase *_tao_to_value ();
 
     CORBA::Object_ptr create_object (TAO_Stub *stub);