Part 2: Remove obsolescent (void) in functions with no parameters

7 files changed, 28 insertions, 28 deletions

diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index 419f43b2f3b..f0a06efa705 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -89,10 +89,10 @@ class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_var
   : private TAO_Base_var
 {
 public:
-  TAO_Network_Priority_Mapping_Manager_var (void); // default constructor
+  TAO_Network_Priority_Mapping_Manager_var (); // default constructor
   TAO_Network_Priority_Mapping_Manager_var (TAO_Network_Priority_Mapping_Manager_ptr);
   TAO_Network_Priority_Mapping_Manager_var (const TAO_Network_Priority_Mapping_Manager_var &); // copy constructor
-  ~TAO_Network_Priority_Mapping_Manager_var (void); // destructor
+  ~TAO_Network_Priority_Mapping_Manager_var (); // destructor
 
   TAO_Network_Priority_Mapping_Manager_var &operator= (TAO_Network_Priority_Mapping_Manager_ptr);
   TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Network_Priority_Mapping_Manager_var &);
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
index fc1de165745..4480f599715 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // *************************************************************
 
 ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var (void) // default constructor
+TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var () // default constructor
   : ptr_ (TAO_Network_Priority_Mapping_Manager::_nil ())
 {}
 
@@ -28,7 +28,7 @@ TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_v
 {}
 
 ACE_INLINE
-TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var (void) // destructor
+TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var () // destructor
 {
   CORBA::release (this->ptr_);
 }
@@ -77,13 +77,13 @@ TAO_Network_Priority_Mapping_Manager_var::in () const
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_var::inout (void)
+TAO_Network_Priority_Mapping_Manager_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_var::out (void)
+TAO_Network_Priority_Mapping_Manager_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil ();
@@ -91,7 +91,7 @@ TAO_Network_Priority_Mapping_Manager_var::out (void)
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::_retn (void)
+TAO_Network_Priority_Mapping_Manager_var::_retn ()
 {
   // yield ownership of managed obj reference
   ::TAO_Network_Priority_Mapping_Manager_ptr val = this->ptr_;
@@ -112,7 +112,7 @@ TAO_Network_Priority_Mapping_Manager_var::release (TAO_Network_Priority_Mapping_
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_var::nil (void)
+TAO_Network_Priority_Mapping_Manager_var::nil ()
 {
   return ::TAO_Network_Priority_Mapping_Manager::_nil ();
 }
@@ -187,13 +187,13 @@ TAO_Network_Priority_Mapping_Manager_out::operator ::TAO_Network_Priority_Mappin
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr &
-TAO_Network_Priority_Mapping_Manager_out::ptr (void) // ptr
+TAO_Network_Priority_Mapping_Manager_out::ptr () // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager_out::operator-> (void)
+TAO_Network_Priority_Mapping_Manager_out::operator-> ()
 {
   return this->ptr_;
 }
@@ -206,7 +206,7 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO
 }
 
 ACE_INLINE RTCORBA::NetworkPriorityMapping *
-TAO_Network_Priority_Mapping_Manager::mapping (void)
+TAO_Network_Priority_Mapping_Manager::mapping ()
 {
   return this->mapping_;
 }
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 23d56faba1e..a0652c6cbf4 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -84,10 +84,10 @@ class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_var
   : private TAO_Base_var
 {
 public:
-  TAO_Priority_Mapping_Manager_var (void); // default constructor
+  TAO_Priority_Mapping_Manager_var (); // default constructor
   TAO_Priority_Mapping_Manager_var (TAO_Priority_Mapping_Manager_ptr);
   TAO_Priority_Mapping_Manager_var (const TAO_Priority_Mapping_Manager_var &); // copy constructor
-  ~TAO_Priority_Mapping_Manager_var (void); // destructor
+  ~TAO_Priority_Mapping_Manager_var (); // destructor
 
   TAO_Priority_Mapping_Manager_var &operator= (TAO_Priority_Mapping_Manager_ptr);
   TAO_Priority_Mapping_Manager_var &operator= (const TAO_Priority_Mapping_Manager_var &);
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
index dffaea89b8e..00c8e79465d 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // *************************************************************
 
 ACE_INLINE
-TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (void) // default constructor
+TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var () // default constructor
   : ptr_ (TAO_Priority_Mapping_Manager::_nil ())
 {}
 
@@ -28,7 +28,7 @@ TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (const ::TAO_
 {}
 
 ACE_INLINE
-TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var (void) // destructor
+TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var () // destructor
 {
   CORBA::release (this->ptr_);
 }
@@ -77,13 +77,13 @@ TAO_Priority_Mapping_Manager_var::in () const
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_var::inout (void)
+TAO_Priority_Mapping_Manager_var::inout ()
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_var::out (void)
+TAO_Priority_Mapping_Manager_var::out ()
 {
   CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil ();
@@ -91,7 +91,7 @@ TAO_Priority_Mapping_Manager_var::out (void)
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::_retn (void)
+TAO_Priority_Mapping_Manager_var::_retn ()
 {
   // yield ownership of managed obj reference
   ::TAO_Priority_Mapping_Manager_ptr val = this->ptr_;
@@ -112,7 +112,7 @@ TAO_Priority_Mapping_Manager_var::release (TAO_Priority_Mapping_Manager_ptr p)
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_var::nil (void)
+TAO_Priority_Mapping_Manager_var::nil ()
 {
   return ::TAO_Priority_Mapping_Manager::_nil ();
 }
@@ -187,13 +187,13 @@ TAO_Priority_Mapping_Manager_out::operator ::TAO_Priority_Mapping_Manager_ptr &(
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr &
-TAO_Priority_Mapping_Manager_out::ptr (void) // ptr
+TAO_Priority_Mapping_Manager_out::ptr () // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager_out::operator-> (void)
+TAO_Priority_Mapping_Manager_out::operator-> ()
 {
   return this->ptr_;
 }
@@ -206,7 +206,7 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap
 }
 
 ACE_INLINE RTCORBA::PriorityMapping *
-TAO_Priority_Mapping_Manager::mapping (void)
+TAO_Priority_Mapping_Manager::mapping ()
 {
   return this->mapping_;
 }
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
index cc67413602e..57fabb889fe 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
@@ -39,7 +39,7 @@ public:
   /// Destructor
   virtual ~TAO_RT_Transport_Descriptor_Property ();
 
-  virtual TAO_RT_Transport_Descriptor_Property *duplicate (void) = 0;
+  virtual TAO_RT_Transport_Descriptor_Property *duplicate () = 0;
 
   virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop) = 0;
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
index e2bc9763f4e..f1c575573cf 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
@@ -2,14 +2,14 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void)
+TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property ()
   : next_ (0)
 {
 }
 
 /*************************************************************************************************/
 ACE_INLINE
-TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property (void)
+TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property ()
   : object_id_ (-1)
 {
 }
@@ -29,7 +29,7 @@ TAO_RT_Transport_Descriptor_Private_Connection_Property::init (long object_id)
 /*************************************************************************************************/
 
 ACE_INLINE
-TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property (void)
+TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property ()
   : low_priority_ (-1)
   , high_priority_ (-1)
 {
diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl
index a08e0dffc39..8b37bbb0a0b 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.inl
+++ b/TAO/tao/RTCORBA/Thread_Pool.inl
@@ -52,7 +52,7 @@ TAO_Thread_Lane::dynamic_threads () const
 
 ACE_INLINE
 TAO_Thread_Lane_Resources &
-TAO_Thread_Lane::resources (void)
+TAO_Thread_Lane::resources ()
 {
   return this->resources_;
 }
@@ -129,7 +129,7 @@ TAO_Thread_Pool::max_request_buffer_size () const
 
 ACE_INLINE
 TAO_Thread_Lane **
-TAO_Thread_Pool::lanes (void)
+TAO_Thread_Pool::lanes ()
 {
   return this->lanes_;
 }