1 files changed, 48 insertions, 48 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 1fad41a8e47..baafac90542 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // TAO_AV_Qos
 //------------------------------------------------------------
 
-TAO_AV_QoS::TAO_AV_QoS (void)
+TAO_AV_QoS::TAO_AV_QoS ()
 {
 }
 
@@ -48,11 +48,11 @@ TAO_AV_QoS::convert (AVStreams::streamQoS &/*network_qos*/)
 // ----------------------------------------------------------------------
 // AV_Null_MediaCtrl
 // ----------------------------------------------------------------------
-AV_Null_MediaCtrl::AV_Null_MediaCtrl (void)
+AV_Null_MediaCtrl::AV_Null_MediaCtrl ()
 {
 }
 
-AV_Null_MediaCtrl::~AV_Null_MediaCtrl (void)
+AV_Null_MediaCtrl::~AV_Null_MediaCtrl ()
 {
 }
 
@@ -62,7 +62,7 @@ AV_Null_MediaCtrl::~AV_Null_MediaCtrl (void)
 // ----------------------------------------------------------------------
 
 // Constructor
-TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
+TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl ()
   :flow_count_ (0)
 {
 }
@@ -288,7 +288,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
   }
 }
 
-TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
+TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl ()
 {
 }
 
@@ -312,7 +312,7 @@ TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
 const int MMDevice_Map_Hash_Key::hash_maximum_ = 10000;
 
 //default constructor.
-MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key (void)
+MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key ()
 {
   this->mmdevice_ = AVStreams::MMDevice::_nil ();
 }
@@ -330,7 +330,7 @@ MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key (const MMDevice_Map_Hash_Key& hash_
 }
 
 // destructor.
-MMDevice_Map_Hash_Key::~MMDevice_Map_Hash_Key (void)
+MMDevice_Map_Hash_Key::~MMDevice_Map_Hash_Key ()
 {
   CORBA::release (this->mmdevice_);
 }
@@ -380,7 +380,7 @@ operator < (const MMDevice_Map_Hash_Key &left,
 }
 
 u_long
-MMDevice_Map_Hash_Key::hash (void)  const
+MMDevice_Map_Hash_Key::hash ()  const
 {
   u_long result = 0;
   try
@@ -399,7 +399,7 @@ MMDevice_Map_Hash_Key::hash (void)  const
 // TAO_StreamCtrl
 // ----------------------------------------------------------------------
 
-TAO_StreamCtrl::TAO_StreamCtrl (void)
+TAO_StreamCtrl::TAO_StreamCtrl ()
   :mcastconfigif_ (0)
 {
   try
@@ -418,7 +418,7 @@ TAO_StreamCtrl::TAO_StreamCtrl (void)
     }
 }
 
-TAO_StreamCtrl::~TAO_StreamCtrl (void)
+TAO_StreamCtrl::~TAO_StreamCtrl ()
 {
   delete this->mcastconfigif_;
 }
@@ -1146,7 +1146,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
 }
 
 void
-TAO_StreamCtrl::unbind (void)
+TAO_StreamCtrl::unbind ()
 {
   try
     {
@@ -1296,12 +1296,12 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
 // TAO_MCastConfigIf
 // ----------------------------------------------------------------------
 
-TAO_MCastConfigIf::TAO_MCastConfigIf (void)
+TAO_MCastConfigIf::TAO_MCastConfigIf ()
   :peer_list_iterator_ (peer_list_)
 {
 }
 
-TAO_MCastConfigIf::~TAO_MCastConfigIf (void)
+TAO_MCastConfigIf::~TAO_MCastConfigIf ()
 {
   //no-op
 }
@@ -1428,17 +1428,17 @@ TAO_MCastConfigIf::in_flowSpec (const AVStreams::flowSpec& flow_spec, const char
 // TAO_Base_StreamEndPoint
 // ----------------------------------------------------------------------
 
-TAO_Base_StreamEndPoint::TAO_Base_StreamEndPoint (void)
+TAO_Base_StreamEndPoint::TAO_Base_StreamEndPoint ()
   : protocol_object_set_ (0)
 {
 }
 
-TAO_Base_StreamEndPoint::~TAO_Base_StreamEndPoint (void)
+TAO_Base_StreamEndPoint::~TAO_Base_StreamEndPoint ()
 {
 }
 
 int
-TAO_Base_StreamEndPoint::handle_close (void)
+TAO_Base_StreamEndPoint::handle_close ()
 {
   // This method should not be defined, but EGCS complains endlessly
   // about it.
@@ -1446,7 +1446,7 @@ TAO_Base_StreamEndPoint::handle_close (void)
 }
 
 int
-TAO_Base_StreamEndPoint::handle_open (void)
+TAO_Base_StreamEndPoint::handle_open ()
 {
   return 0;
 }
@@ -1501,14 +1501,14 @@ TAO_Base_StreamEndPoint::set_protocol_object (const char * /*flowname*/,
 }
 
 void
-TAO_Base_StreamEndPoint::protocol_object_set (void)
+TAO_Base_StreamEndPoint::protocol_object_set ()
 {
   this->protocol_object_set_ = 1;
 }
 
 
 int
-TAO_Base_StreamEndPoint::is_protocol_object_set (void)
+TAO_Base_StreamEndPoint::is_protocol_object_set ()
 {
   return this->protocol_object_set_;
 }
@@ -1557,7 +1557,7 @@ TAO_Base_StreamEndPoint::set_control_flow_handler (const char *flowname,
 
 // constructor.
 
-TAO_StreamEndPoint::TAO_StreamEndPoint (void)
+TAO_StreamEndPoint::TAO_StreamEndPoint ()
   :flow_count_ (0),
    flow_num_ (0),
    mcast_port_ (ACE_DEFAULT_MULTICAST_PORT+1)
@@ -2381,7 +2381,7 @@ TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
   return 0;
 }
 
-TAO_StreamEndPoint::~TAO_StreamEndPoint (void)
+TAO_StreamEndPoint::~TAO_StreamEndPoint ()
 {
   //this->handle_close ();
   TAO_AV_FlowSpecSetItor begin = this->forward_flow_spec_set.begin ();
@@ -2416,7 +2416,7 @@ TAO_StreamEndPoint::~TAO_StreamEndPoint (void)
 // TAO_StreamEndPoint_A
 // ----------------------------------------------------------------------
 
-TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
+TAO_StreamEndPoint_A::TAO_StreamEndPoint_A ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamEndPoint_A::TAO_StreamEndPoint_A: created\n"));
 }
@@ -2613,7 +2613,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep
 
 }
 
-TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void)
+TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A ()
 {
 }
 
@@ -2621,7 +2621,7 @@ TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void)
 // TAO_StreamEndPoint_B
 // ----------------------------------------------------------------------
 
-TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
+TAO_StreamEndPoint_B::TAO_StreamEndPoint_B ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,
                                        "\n(%P|%t) TAO_StreamEndPoint_B::TAO_StreamEndPoint_B: created"));
@@ -2743,7 +2743,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
   return 1;
 }
 
-TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B (void)
+TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B ()
 {
 }
 
@@ -2751,7 +2751,7 @@ TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B (void)
 // TAO_VDev
 // ----------------------------------------------------------------------
 
-TAO_VDev::TAO_VDev (void)
+TAO_VDev::TAO_VDev ()
 {
   if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,
               "(%P|%t) TAO_VDev::TAO_VDev: created\n"));
@@ -2919,7 +2919,7 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
   return 1;
 }
 
-TAO_VDev::~TAO_VDev (void)
+TAO_VDev::~TAO_VDev ()
 {
 }
 
@@ -3341,7 +3341,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name)
 }
 
 // destructor.
-TAO_MMDevice::~TAO_MMDevice (void)
+TAO_MMDevice::~TAO_MMDevice ()
 {
   delete this->stream_ctrl_;
 }
@@ -3351,7 +3351,7 @@ TAO_MMDevice::~TAO_MMDevice (void)
 //------------------------------------------------------------------
 
 // default constructor.
-TAO_FlowConnection::TAO_FlowConnection (void)
+TAO_FlowConnection::TAO_FlowConnection ()
   :fp_name_ (CORBA::string_dup ("")),
    ip_multicast_ (0)
 {
@@ -3381,7 +3381,7 @@ TAO_FlowConnection::set_protocol (const char *protocol)
 
 // stop this flow.
 void
-TAO_FlowConnection::stop (void)
+TAO_FlowConnection::stop ()
 {
   try
     {
@@ -3419,7 +3419,7 @@ TAO_FlowConnection::stop (void)
 
 // start this flow.
 void
-TAO_FlowConnection::start (void)
+TAO_FlowConnection::start ()
 {
   try
     {
@@ -3457,7 +3457,7 @@ TAO_FlowConnection::start (void)
 
 // destroy this flow.
 void
-TAO_FlowConnection::destroy (void)
+TAO_FlowConnection::destroy ()
 {
   try
     {
@@ -3627,7 +3627,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
 
 
 CORBA::Boolean
-TAO_FlowConnection::disconnect (void)
+TAO_FlowConnection::disconnect ()
 {
   return  0;
 }
@@ -3820,7 +3820,7 @@ TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target)
 // -----------------------------------------------------------------
 
 //default constructor.
-TAO_FlowEndPoint::TAO_FlowEndPoint (void)
+TAO_FlowEndPoint::TAO_FlowEndPoint ()
   :lock_ (0)
 {
 }
@@ -3889,7 +3889,7 @@ TAO_FlowEndPoint::set_flowname (const char *flowname)
 // used by one flowconnection so that multiple connections cant use
 // the same flowendpoint.
 CORBA::Boolean
-TAO_FlowEndPoint::lock (void)
+TAO_FlowEndPoint::lock ()
 {
   // lock the current flowendpoint
 
@@ -3901,14 +3901,14 @@ TAO_FlowEndPoint::lock (void)
 
 // unlocks the flowendpoint , becomes free to be used in another flow.
 void
-TAO_FlowEndPoint::unlock (void)
+TAO_FlowEndPoint::unlock ()
 {
   this->lock_ = 0;
 }
 
 
 void
-TAO_FlowEndPoint::destroy (void)
+TAO_FlowEndPoint::destroy ()
 {
   int result = TAO_AV_Core::deactivate_servant (this);
   if (result < 0)
@@ -3920,7 +3920,7 @@ TAO_FlowEndPoint::destroy (void)
 }
 
 AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (void)
+TAO_FlowEndPoint::related_sep ()
 {
 
   return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ());
@@ -3933,7 +3933,7 @@ TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep)
 }
 
 AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (void)
+TAO_FlowEndPoint::related_flow_connection ()
 {
   return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
 }
@@ -3946,7 +3946,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
 
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
-TAO_FlowEndPoint::get_connected_fep (void)
+TAO_FlowEndPoint::get_connected_fep ()
 {
   return AVStreams::FlowEndPoint::_duplicate (this->peer_fep_.in ());
 }
@@ -4274,7 +4274,7 @@ TAO_FlowEndPoint::set_protocol_object (const char * /*flowname*/,
 // ------------------------------------------------------------
 
 //default constructor
-TAO_FlowProducer::TAO_FlowProducer (void)
+TAO_FlowProducer::TAO_FlowProducer ()
 {
 }
 
@@ -4294,7 +4294,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/)
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowProducer::stop (void)
+TAO_FlowProducer::stop ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4306,7 +4306,7 @@ TAO_FlowProducer::stop (void)
 }
 
 void
-TAO_FlowProducer::start (void)
+TAO_FlowProducer::start ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4418,7 +4418,7 @@ TAO_FlowProducer::set_source_id (CORBA::Long source_id)
 
 
 // default constructor.
-TAO_FlowConsumer::TAO_FlowConsumer (void)
+TAO_FlowConsumer::TAO_FlowConsumer ()
 {
 }
 
@@ -4431,7 +4431,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowConsumer::stop (void)
+TAO_FlowConsumer::stop ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4440,7 +4440,7 @@ TAO_FlowConsumer::stop (void)
 }
 
 void
-TAO_FlowConsumer::start (void)
+TAO_FlowConsumer::start ()
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
   for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin ();
@@ -4551,7 +4551,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter)
 }
 
 char*
-TAO_Tokenizer::token (void)
+TAO_Tokenizer::token ()
 {
   if (count_ < num_tokens_)
     return CORBA::string_dup (this->token_array_[this->count_++]);
@@ -4560,7 +4560,7 @@ TAO_Tokenizer::token (void)
 }
 
 int
-TAO_Tokenizer::num_tokens (void)
+TAO_Tokenizer::num_tokens ()
 {
   return static_cast<int> (this->num_tokens_);
 }