diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-08 08:39:49 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-08 08:39:49 +0100 |
| commit | 3a999137577b6b2ba98de04c73cf11e8b740c7cc (patch) | |
| tree | 98fa5988269740f91c82e8ad302be1388213f485 | |
| parent | 9027b24610848c0eb0d768b60b132ce9e09dee7d (diff) | |
| download | ATCD-3a999137577b6b2ba98de04c73cf11e8b740c7cc.tar.gz | |
Removed redundant void
450 files changed, 2258 insertions, 2258 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_); } diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index ea7a4029ee1..0c5f67b7260 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_Core //------------------------------------------------------------ -TAO_AV_Core::TAO_AV_Core (void) +TAO_AV_Core::TAO_AV_Core () :connector_registry_ (0), acceptor_registry_ (0) { @@ -42,7 +42,7 @@ TAO_AV_Core::TAO_AV_Core (void) ); } -TAO_AV_Core::~TAO_AV_Core (void) +TAO_AV_Core::~TAO_AV_Core () { delete this->connector_registry_; delete this->acceptor_registry_; @@ -76,7 +76,7 @@ TAO_AV_Core::~TAO_AV_Core (void) } CORBA::ORB_ptr -TAO_AV_Core::orb (void) +TAO_AV_Core::orb () { return this->orb_.in (); } @@ -88,7 +88,7 @@ TAO_AV_Core::orb (CORBA::ORB_ptr orb) } PortableServer::POA_ptr -TAO_AV_Core::poa (void) +TAO_AV_Core::poa () { return this->poa_.in (); } @@ -100,38 +100,38 @@ TAO_AV_Core::poa (PortableServer::POA_ptr poa) } TAO_AV_Connector_Registry* -TAO_AV_Core::connector_registry (void) +TAO_AV_Core::connector_registry () { return this->connector_registry_; } TAO_AV_Acceptor_Registry* -TAO_AV_Core::acceptor_registry (void) +TAO_AV_Core::acceptor_registry () { return this->acceptor_registry_; } TAO_AV_TransportFactorySet * -TAO_AV_Core::transport_factories (void) +TAO_AV_Core::transport_factories () { return &this->transport_factories_; } TAO_AV_Flow_ProtocolFactorySet* -TAO_AV_Core::flow_protocol_factories (void) +TAO_AV_Core::flow_protocol_factories () { return &this->flow_protocol_factories_; } int -TAO_AV_Core::stop_run (void) +TAO_AV_Core::stop_run () { this->stop_run_ = 1; return 0; } int -TAO_AV_Core::run (void) +TAO_AV_Core::run () { this->stop_run_ = 0; while (!this->stop_run_ && this->orb_->work_pending ()) @@ -146,7 +146,7 @@ TAO_AV_Core::reactor (ACE_Reactor *r) } ACE_Reactor * -TAO_AV_Core::reactor (void) +TAO_AV_Core::reactor () { return this->reactor_; } @@ -694,7 +694,7 @@ TAO_AV_Core::get_transport_factory(const char *transport_protocol) } int -TAO_AV_Core::load_default_transport_factories (void) +TAO_AV_Core::load_default_transport_factories () { const char *udp_factory_str = "UDP_Factory"; const char *tcp_factory_str = "TCP_Factory"; @@ -813,7 +813,7 @@ TAO_AV_Core::load_default_transport_factories (void) } int -TAO_AV_Core::init_transport_factories (void) +TAO_AV_Core::init_transport_factories () { TAO_AV_TransportFactorySetItor end = this->transport_factories_.end (); TAO_AV_TransportFactorySetItor factory = this->transport_factories_.begin (); @@ -861,7 +861,7 @@ TAO_AV_Core::init_transport_factories (void) } int -TAO_AV_Core::load_default_flow_protocol_factories (void) +TAO_AV_Core::load_default_flow_protocol_factories () { const char *udp_flow = "UDP_Flow_Factory"; const char *tcp_flow = "TCP_Flow_Factory"; @@ -1051,7 +1051,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) } int -TAO_AV_Core::init_flow_protocol_factories (void) +TAO_AV_Core::init_flow_protocol_factories () { TAO_AV_Flow_ProtocolFactorySetItor end = this->flow_protocol_factories_.end (); TAO_AV_Flow_ProtocolFactorySetItor factory = this->flow_protocol_factories_.begin (); diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 882a2d742a3..ed0f32ee71a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -22,12 +22,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------------- // Constructor -TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy (void) +TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy () { } // Destructor. -TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) +TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy () { } @@ -71,7 +71,7 @@ TAO_AV_Endpoint_Process_Strategy::TAO_AV_Endpoint_Process_Strategy (ACE_Process_ } // Destructor. -TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy (void) +TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy () { } @@ -80,7 +80,7 @@ TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy (void) // to get the object references to the various objects created in the // child int -TAO_AV_Endpoint_Process_Strategy::activate (void) +TAO_AV_Endpoint_Process_Strategy::activate () { ACE_Process process; @@ -160,7 +160,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // Get ourselves a Naming service reference int -TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void) +TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service () { try { @@ -188,7 +188,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void) // Get the VDev created in the child process from the namingservice int -TAO_AV_Endpoint_Process_Strategy::get_vdev (void) +TAO_AV_Endpoint_Process_Strategy::get_vdev () { try { @@ -240,7 +240,7 @@ TAO_AV_Endpoint_Process_Strategy_A::TAO_AV_Endpoint_Process_Strategy_A (ACE_Proc } // Destructor -TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void) +TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A () { } @@ -264,7 +264,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s // Gets the stream endpoint object reference from the naming service int -TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void) +TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint () { try { @@ -317,7 +317,7 @@ TAO_AV_Endpoint_Process_Strategy_B::TAO_AV_Endpoint_Process_Strategy_B (ACE_Proc } // Destructor -TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void) +TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B () { } @@ -353,7 +353,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s // Gets the B type stream_endpoint from the Naming service int -TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void) +TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint () { try { diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index bff251c8e52..ee6a19ed0eb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // constructor. -TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void) +TAO_FlowSpec_Entry::TAO_FlowSpec_Entry () :address_ (0), clean_up_address_ (0), control_address_ (0), @@ -137,7 +137,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname, } // Destructor. -TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void) +TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry () { if (this->delete_peer_addr_) delete this->peer_addr_; @@ -151,7 +151,7 @@ TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void) } int -TAO_FlowSpec_Entry::set_protocol (void) +TAO_FlowSpec_Entry::set_protocol () { if (!this->use_flow_protocol_) { @@ -459,7 +459,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, } char * -TAO_FlowSpec_Entry::get_local_addr_str (void) +TAO_FlowSpec_Entry::get_local_addr_str () { if (this->local_addr_ == 0) return 0; @@ -489,7 +489,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) //------------------------------------------------------------ // default constructor. -TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry (void) +TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry () { } @@ -525,7 +525,7 @@ TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry (const char *flowname, { } -TAO_Forward_FlowSpec_Entry::~TAO_Forward_FlowSpec_Entry (void) +TAO_Forward_FlowSpec_Entry::~TAO_Forward_FlowSpec_Entry () { } @@ -607,7 +607,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) } TAO_FlowSpec_Entry::Role -TAO_Forward_FlowSpec_Entry::role (void) +TAO_Forward_FlowSpec_Entry::role () { if (this->role_ != TAO_AV_INVALID_ROLE) return this->role_; @@ -626,7 +626,7 @@ TAO_Forward_FlowSpec_Entry::role (void) } const char * -TAO_Forward_FlowSpec_Entry::entry_to_string (void) +TAO_Forward_FlowSpec_Entry::entry_to_string () { if (this->flowname_.length() == 0) return ""; @@ -821,7 +821,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) //------------------------------------------------------------ //default constructor. -TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry (void) +TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry () { } @@ -857,12 +857,12 @@ TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry (const char *flowname, { } -TAO_Reverse_FlowSpec_Entry::~TAO_Reverse_FlowSpec_Entry (void) +TAO_Reverse_FlowSpec_Entry::~TAO_Reverse_FlowSpec_Entry () { } TAO_FlowSpec_Entry::Role -TAO_Reverse_FlowSpec_Entry::role (void) +TAO_Reverse_FlowSpec_Entry::role () { if (this->role_ != TAO_AV_INVALID_ROLE) return this->role_; @@ -903,7 +903,7 @@ TAO_Reverse_FlowSpec_Entry::parse (const char *flowSpec_entry) const char * -TAO_Reverse_FlowSpec_Entry::entry_to_string (void) +TAO_Reverse_FlowSpec_Entry::entry_to_string () { if (this->flowname_.length() == 0) return ""; diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 6aca9ffafce..8848fffcf47 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //TAO_AV_UDP_MCast_Flow_Handler //------------------------------------------------------------ -TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler (void) +TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler () { ACE_NEW (transport_, TAO_AV_UDP_MCast_Transport (this)); @@ -22,7 +22,7 @@ TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler (void) ACE_SOCK_Dgram_Mcast); } -TAO_AV_UDP_MCast_Flow_Handler::~TAO_AV_UDP_MCast_Flow_Handler (void) +TAO_AV_UDP_MCast_Flow_Handler::~TAO_AV_UDP_MCast_Flow_Handler () { delete this->transport_; delete this->dgram_mcast_; @@ -44,7 +44,7 @@ TAO_AV_UDP_MCast_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, } ACE_HANDLE -TAO_AV_UDP_MCast_Flow_Handler::get_handle (void) const +TAO_AV_UDP_MCast_Flow_Handler::get_handle () const { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Flow_Handler::get_handle ")); return this->get_mcast_socket ()->get_handle () ; @@ -60,7 +60,7 @@ TAO_AV_UDP_MCast_Flow_Handler::set_peer_addr (ACE_INET_Addr *peer_addr) // TAO_AV_UDP_MCast_Transport //------------------------------------------------------------ -TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport (void) +TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport () :handler_ (0) { } @@ -70,7 +70,7 @@ TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport (TAO_AV_UDP_MCast_Flow_Ha { } -TAO_AV_UDP_MCast_Transport::~TAO_AV_UDP_MCast_Transport (void) +TAO_AV_UDP_MCast_Transport::~TAO_AV_UDP_MCast_Transport () { } @@ -81,20 +81,20 @@ TAO_AV_UDP_MCast_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_UDP_MCast_Transport::close (void) +TAO_AV_UDP_MCast_Transport::close () { return 0; } ACE_Addr* -TAO_AV_UDP_MCast_Transport::get_peer_addr (void) +TAO_AV_UDP_MCast_Transport::get_peer_addr () { return &this->peer_addr_; } ACE_Addr* -TAO_AV_UDP_MCast_Transport::get_local_addr (void) +TAO_AV_UDP_MCast_Transport::get_local_addr () { this->handler_->get_mcast_socket ()->get_local_addr (this->local_addr_); return &this->local_addr_; @@ -182,7 +182,7 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov, } int -TAO_AV_UDP_MCast_Transport::mtu (void) +TAO_AV_UDP_MCast_Transport::mtu () { return ACE_MAX_DGRAM_SIZE; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index a5b375deb70..b05af920247 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -28,23 +28,23 @@ TAO_AV_Payload_Type_Policy::TAO_AV_Payload_Type_Policy (int payload_type) } // TAO_AV_RTP_Sdes_Policy -TAO_AV_RTCP_Sdes_Policy::TAO_AV_RTCP_Sdes_Policy (void) +TAO_AV_RTCP_Sdes_Policy::TAO_AV_RTCP_Sdes_Policy () :TAO_AV_Policy (TAO_AV_RTCP_SDES_POLICY) { } -TAO_AV_SFP_Credit_Policy::TAO_AV_SFP_Credit_Policy (void) +TAO_AV_SFP_Credit_Policy::TAO_AV_SFP_Credit_Policy () :TAO_AV_Policy (TAO_AV_SFP_CREDIT_POLICY) { } // TAO_AV_Callback -TAO_AV_Callback::TAO_AV_Callback (void) +TAO_AV_Callback::TAO_AV_Callback () :protocol_object_ (0) { } -TAO_AV_Callback::~TAO_AV_Callback (void) +TAO_AV_Callback::~TAO_AV_Callback () { } @@ -59,14 +59,14 @@ TAO_AV_Callback::open (TAO_AV_Protocol_Object *object, } int -TAO_AV_Callback::handle_start (void) +TAO_AV_Callback::handle_start () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_start\n")); return -1; } int -TAO_AV_Callback::handle_stop (void) +TAO_AV_Callback::handle_stop () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_stop\n")); return -1; @@ -89,7 +89,7 @@ TAO_AV_Callback::receive_control_frame (ACE_Message_Block *, } int -TAO_AV_Callback::handle_destroy (void) +TAO_AV_Callback::handle_destroy () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_end_stream\n")); return -1; @@ -111,7 +111,7 @@ TAO_AV_Callback::handle_timeout (void * /*arg*/) } TAO_AV_PolicyList -TAO_AV_Callback::get_policies (void) +TAO_AV_Callback::get_policies () { TAO_AV_PolicyList list; return list; @@ -130,7 +130,7 @@ TAO_AV_Callback::get_policies (void) // } TAO_AV_Protocol_Object* -TAO_AV_Callback::protocol_object (void) +TAO_AV_Callback::protocol_object () { return this->protocol_object_; } @@ -142,7 +142,7 @@ TAO_AV_Callback::protocol_object (void) // } int -TAO_AV_Callback::schedule_timer (void) +TAO_AV_Callback::schedule_timer () { return this->handler_->schedule_timer (); } diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 841f7fda285..17866cd0922 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -9,12 +9,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_Flow_Protocol_Factory -TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory (void) +TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory () : ref_count (0) { } -TAO_AV_Flow_Protocol_Factory::~TAO_AV_Flow_Protocol_Factory (void) +TAO_AV_Flow_Protocol_Factory::~TAO_AV_Flow_Protocol_Factory () { } @@ -41,7 +41,7 @@ TAO_AV_Flow_Protocol_Factory::make_protocol_object (TAO_FlowSpec_Entry * /* entr } const char * -TAO_AV_Flow_Protocol_Factory::control_flow_factory (void) +TAO_AV_Flow_Protocol_Factory::control_flow_factory () { return 0; } @@ -49,7 +49,7 @@ TAO_AV_Flow_Protocol_Factory::control_flow_factory (void) //---------------------------------------------------------------------- // TAO_AV_Protocol_Object //---------------------------------------------------------------------- -TAO_AV_Protocol_Object::TAO_AV_Protocol_Object (void) +TAO_AV_Protocol_Object::TAO_AV_Protocol_Object () :transport_ (0), callback_ (0) { @@ -71,18 +71,18 @@ TAO_AV_Protocol_Object::open (TAO_AV_Callback *callback, return 0; } -TAO_AV_Protocol_Object::~TAO_AV_Protocol_Object (void) +TAO_AV_Protocol_Object::~TAO_AV_Protocol_Object () { } int -TAO_AV_Protocol_Object::start (void) +TAO_AV_Protocol_Object::start () { return this->callback_->handle_start (); } int -TAO_AV_Protocol_Object::stop (void) +TAO_AV_Protocol_Object::stop () { return this->callback_->handle_stop (); } @@ -95,13 +95,13 @@ TAO_AV_Protocol_Object::set_policies (const TAO_AV_PolicyList &policy_list) } TAO_AV_PolicyList -TAO_AV_Protocol_Object::get_policies (void) +TAO_AV_Protocol_Object::get_policies () { return this->policy_list_; } TAO_AV_Transport* -TAO_AV_Protocol_Object::transport (void) +TAO_AV_Protocol_Object::transport () { return this->transport_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 084d1fc8421..feb571fe886 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -332,11 +332,11 @@ TAO_AV_RTCP::rtcp_interval (int members, // TAO_AV_RTCP_Flow_Factory -TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory (void) +TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory () { } -TAO_AV_RTCP_Flow_Factory::~TAO_AV_RTCP_Flow_Factory (void) +TAO_AV_RTCP_Flow_Factory::~TAO_AV_RTCP_Flow_Factory () { } @@ -383,7 +383,7 @@ TAO_AV_RTCP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry * /*entry*/, // TAO_AV_RTCP_Object int -TAO_AV_RTCP_Object::handle_input (void) +TAO_AV_RTCP_Object::handle_input () { size_t bufsiz = 2*this->transport_->mtu (); ACE_Message_Block data (bufsiz); @@ -440,12 +440,12 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb, } -TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object (void) +TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object () { } int -TAO_AV_RTCP_Object::destroy (void) +TAO_AV_RTCP_Object::destroy () { this->callback_->handle_destroy (); delete this; @@ -460,13 +460,13 @@ TAO_AV_RTCP_Object::set_policies (const TAO_AV_PolicyList &/*policy_list*/) } int -TAO_AV_RTCP_Object::start (void) +TAO_AV_RTCP_Object::start () { return this->callback_->handle_start (); } int -TAO_AV_RTCP_Object::stop (void) +TAO_AV_RTCP_Object::stop () { return this->callback_->handle_stop (); } @@ -496,7 +496,7 @@ TAO_AV_RTCP_Object::ts_offset (ACE_UINT32 ts_offset) } // TAO_AV_RTCP_Callback -TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback (void) +TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback () :is_initial_timeout_(1), packet_size_(0) { @@ -510,7 +510,7 @@ TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback (void) this->output_.cname(cname); } -TAO_AV_RTCP_Callback::~TAO_AV_RTCP_Callback (void) +TAO_AV_RTCP_Callback::~TAO_AV_RTCP_Callback () { } @@ -521,13 +521,13 @@ TAO_AV_RTCP_Callback::schedule (int ms) } int -TAO_AV_RTCP_Callback::handle_start (void) +TAO_AV_RTCP_Callback::handle_start () { return 0; } int -TAO_AV_RTCP_Callback::handle_stop (void) +TAO_AV_RTCP_Callback::handle_stop () { return this->send_report(1); } @@ -773,7 +773,7 @@ TAO_AV_RTCP_Callback::get_timeout (ACE_Time_Value *&tv, } int -TAO_AV_RTCP_Callback::handle_destroy (void) +TAO_AV_RTCP_Callback::handle_destroy () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 63fcc7c4899..752b1a21d6d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -29,7 +29,7 @@ RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc, this->peer_address_ = inet_addr; } -RTCP_Channel_In::~RTCP_Channel_In(void) +RTCP_Channel_In::~RTCP_Channel_In() { delete this->peer_address_; } @@ -237,7 +237,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb, RR_Block * -RTCP_Channel_In::getRRBlock(void) +RTCP_Channel_In::getRRBlock() { // If no data has been received since the last report, don't create a block. if (!this->data_since_last_report_) @@ -310,7 +310,7 @@ RTCP_Channel_In::getRRBlock(void) return local_block_ptr; } -RTCP_Channel_Out::RTCP_Channel_Out(void) +RTCP_Channel_Out::RTCP_Channel_Out() :cname_ ("cname"), active_ (0), timestamp_ (0), @@ -319,7 +319,7 @@ RTCP_Channel_Out::RTCP_Channel_Out(void) { } -RTCP_Channel_Out::~RTCP_Channel_Out(void) +RTCP_Channel_Out::~RTCP_Channel_Out() { } @@ -337,25 +337,25 @@ RTCP_Channel_Out::updateStatistics (RTP_Packet *data_packet) } ACE_UINT32 -RTCP_Channel_Out::timestamp (void) +RTCP_Channel_Out::timestamp () { return this->timestamp_; } ACE_UINT32 -RTCP_Channel_Out::packets_sent (void) +RTCP_Channel_Out::packets_sent () { return this->packets_sent_; } ACE_UINT32 -RTCP_Channel_Out::octets_sent (void) +RTCP_Channel_Out::octets_sent () { return this->octets_sent_; } char -RTCP_Channel_Out::active (void) +RTCP_Channel_Out::active () { return this->active_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 8c0be928bc6..94fa8838943 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -RTCP_Packet::RTCP_Packet(void) +RTCP_Packet::RTCP_Packet() { this->chd_.ver_ = 2; this->chd_.count_ = 0; @@ -30,7 +30,7 @@ RTCP_Packet::RTCP_Packet(char* buffer) this->packet_data_ = 0; } -RTCP_Packet::~RTCP_Packet(void) +RTCP_Packet::~RTCP_Packet() { } @@ -159,7 +159,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len) //============================================================================== -RTCP_BYE_Packet::~RTCP_BYE_Packet(void) +RTCP_BYE_Packet::~RTCP_BYE_Packet() { if (this->ssrc_list_) delete []this->ssrc_list_; @@ -170,7 +170,7 @@ RTCP_BYE_Packet::~RTCP_BYE_Packet(void) //============================================================================== unsigned int -RTCP_BYE_Packet::packet_size(void) +RTCP_BYE_Packet::packet_size() { ACE_UINT16 size = static_cast<ACE_UINT16> ((1+chd_.count_) * 4); @@ -196,7 +196,7 @@ RTCP_BYE_Packet::ssrc_list(ACE_UINT32 **ssrc_list, unsigned char &length) //============================================================================== const char * -RTCP_BYE_Packet::reason (void) +RTCP_BYE_Packet::reason () { ACE_CString reason = (const char *)this->reason_; @@ -206,7 +206,7 @@ RTCP_BYE_Packet::reason (void) //============================================================================== void -RTCP_BYE_Packet::build_packet(void) +RTCP_BYE_Packet::build_packet() { unsigned int index; unsigned int i; @@ -248,7 +248,7 @@ RTCP_BYE_Packet::build_packet(void) } void -RTCP_BYE_Packet::dump (void) +RTCP_BYE_Packet::dump () { ORBSVCS_DEBUG ((LM_DEBUG, "\nRTCP_BYE_Packet:: from ssrc(s) ")); @@ -344,7 +344,7 @@ RTCP_RR_Packet::RTCP_RR_Packet (char* buffer, //============================================================================== -RTCP_RR_Packet::~RTCP_RR_Packet(void) +RTCP_RR_Packet::~RTCP_RR_Packet() { RR_Block *prev; @@ -365,7 +365,7 @@ RTCP_RR_Packet::~RTCP_RR_Packet(void) //============================================================================== unsigned int -RTCP_RR_Packet::packet_size(void) +RTCP_RR_Packet::packet_size() { ACE_UINT16 size = static_cast<ACE_UINT16> ((2+this->chd_.count_*6) * 4); return size; @@ -374,7 +374,7 @@ RTCP_RR_Packet::packet_size(void) //============================================================================== void -RTCP_RR_Packet::build_packet(void) +RTCP_RR_Packet::build_packet() { int index; RR_Block *local_block_ptr; @@ -419,7 +419,7 @@ RTCP_RR_Packet::build_packet(void) } void -RTCP_RR_Packet::dump (void) +RTCP_RR_Packet::dump () { RR_Block *b = this->rr_; int count = 1; @@ -450,7 +450,7 @@ RTCP_RR_Packet::dump (void) } -RTCP_SDES_Packet::RTCP_SDES_Packet(void) : +RTCP_SDES_Packet::RTCP_SDES_Packet() : RTCP_Packet () { this->chd_.pt_ = RTCP_PT_SDES; @@ -563,7 +563,7 @@ RTCP_SDES_Packet::RTCP_SDES_Packet(char* buffer, int *len): //============================================================================== -RTCP_SDES_Packet::~RTCP_SDES_Packet(void) +RTCP_SDES_Packet::~RTCP_SDES_Packet() { sdesChunk_t *cp; // pointer to chunk sdesChunk_t *cpprev; @@ -778,7 +778,7 @@ RTCP_SDES_Packet::add_priv_item (ACE_UINT32 ssrc, //============================================================================== unsigned int -RTCP_SDES_Packet::packet_size(void) +RTCP_SDES_Packet::packet_size() { int size; sdesChunk_t *cp; // pointer to chunk @@ -817,7 +817,7 @@ RTCP_SDES_Packet::packet_size(void) //============================================================================== void -RTCP_SDES_Packet::build_packet(void) +RTCP_SDES_Packet::build_packet() { sdesChunk_t *cp; // pointer to chunk sdesItem_t *ip; // pointer to item @@ -900,7 +900,7 @@ RTCP_SDES_Packet::build_packet(void) } void -RTCP_SDES_Packet::dump (void) +RTCP_SDES_Packet::dump () { sdesItem_t *ip; @@ -1087,7 +1087,7 @@ RTCP_SR_Packet::RTCP_SR_Packet (char* buffer, //============================================================================== -RTCP_SR_Packet::~RTCP_SR_Packet(void) +RTCP_SR_Packet::~RTCP_SR_Packet() { RR_Block *prev; @@ -1107,7 +1107,7 @@ RTCP_SR_Packet::~RTCP_SR_Packet(void) //============================================================================== -unsigned int RTCP_SR_Packet::packet_size (void) +unsigned int RTCP_SR_Packet::packet_size () { ACE_UINT16 size = static_cast<ACE_UINT16> ((2+chd_.count_*6) * 4); // + profile specific extensions ? size += 20; // the first line is the same as RR; 20 more bytes for SR @@ -1117,7 +1117,7 @@ unsigned int RTCP_SR_Packet::packet_size (void) //============================================================================== -void RTCP_SR_Packet::build_packet(void) +void RTCP_SR_Packet::build_packet() { int index = 0; RR_Block *local_block_ptr; @@ -1171,7 +1171,7 @@ void RTCP_SR_Packet::build_packet(void) } void -RTCP_SR_Packet::dump (void) +RTCP_SR_Packet::dump () { RR_Block *b = this->rr_; int count = 1; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index a7378a76974..633b870830e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -175,78 +175,78 @@ RTP_Packet::RTP_Packet(unsigned char padding, } } -RTP_Packet::~RTP_Packet(void) +RTP_Packet::~RTP_Packet() { } ACE_UINT16 -RTP_Packet::packet_size(void) +RTP_Packet::packet_size() { return this->packet_size_; } ACE_UINT16 -RTP_Packet::payload_size(void) +RTP_Packet::payload_size() { return this->payload_size_; } unsigned int -RTP_Packet::ver (void) +RTP_Packet::ver () { return ( this->packet_[0] & 0xC0 ) >> 6; } unsigned int -RTP_Packet::pad (void) +RTP_Packet::pad () { return ( this->packet_[0] & 0x20 ) >> 5; } unsigned int -RTP_Packet::ext (void) +RTP_Packet::ext () { return ( this->packet_[0] & 0x10 ) >> 4; } unsigned int -RTP_Packet::cc (void) +RTP_Packet::cc () { return ( this->packet_[0] & 0x0F ) ; } unsigned int -RTP_Packet::mrk (void) +RTP_Packet::mrk () { return ( this->packet_[1] & 0x80 ) >> 7; } unsigned int -RTP_Packet::pt (void) +RTP_Packet::pt () { return ( this->packet_[1] & 0x7F ) ; } ACE_UINT16 -RTP_Packet::sn (void) +RTP_Packet::sn () { return ntohs(*(ACE_UINT16*)(&this->packet_[2])) ; } ACE_UINT32 -RTP_Packet::ts (void) +RTP_Packet::ts () { return ntohl(*(ACE_UINT32*)(&this->packet_[4])) ; } ACE_UINT32 -RTP_Packet::ssrc (void) +RTP_Packet::ssrc () { return ntohl(*(ACE_UINT32*)(&this->packet_[8])) ; } unsigned int -RTP_Packet::ext_bytes (void) +RTP_Packet::ext_bytes () { return this->extension_bytes_; } @@ -262,7 +262,7 @@ RTP_Packet::get_frame_info (TAO_AV_frame_info *frame_info) } int -RTP_Packet::is_valid (void) +RTP_Packet::is_valid () { // taken from RFC 1889 - Appendix A.1 @@ -315,7 +315,7 @@ RTP_Packet::get_packet_data (char **packet, ACE_UINT16 &length) // TAO_AV_RTP_Object int -TAO_AV_RTP_Object::handle_input (void) +TAO_AV_RTP_Object::handle_input () { TAO_AV_frame_info frame_info; @@ -638,12 +638,12 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback, this->frame_.size (2 * this->transport_->mtu ()); } -TAO_AV_RTP_Object::~TAO_AV_RTP_Object (void) +TAO_AV_RTP_Object::~TAO_AV_RTP_Object () { } int -TAO_AV_RTP_Object::destroy (void) +TAO_AV_RTP_Object::destroy () { if(this->control_object_) this->control_object_->destroy (); @@ -702,25 +702,25 @@ TAO_AV_RTP_Object::control_object (TAO_AV_Protocol_Object *object) } int -TAO_AV_RTP_Object::start (void) +TAO_AV_RTP_Object::start () { this->control_object_->start (); return this->callback_->handle_start (); } int -TAO_AV_RTP_Object::stop (void) +TAO_AV_RTP_Object::stop () { this->control_object_->stop (); return this->callback_->handle_stop (); } // TAO_AV_RTP_Flow_Factory -TAO_AV_RTP_Flow_Factory::TAO_AV_RTP_Flow_Factory (void) +TAO_AV_RTP_Flow_Factory::TAO_AV_RTP_Flow_Factory () { } -TAO_AV_RTP_Flow_Factory::~TAO_AV_RTP_Flow_Factory (void) +TAO_AV_RTP_Flow_Factory::~TAO_AV_RTP_Flow_Factory () { } @@ -768,7 +768,7 @@ TAO_AV_RTP_Flow_Factory::match_protocol (const char *flow_string) } const char * -TAO_AV_RTP_Flow_Factory::control_flow_factory (void) +TAO_AV_RTP_Flow_Factory::control_flow_factory () { return "RTCP"; } diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index afe9e424271..8e0291e108d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_TCP_Transport //------------------------------------------------------------ -TAO_AV_TCP_Transport::TAO_AV_TCP_Transport (void) +TAO_AV_TCP_Transport::TAO_AV_TCP_Transport () :handler_ (0) { } @@ -22,7 +22,7 @@ TAO_AV_TCP_Transport::TAO_AV_TCP_Transport (TAO_AV_TCP_Flow_Handler *handler) { } -TAO_AV_TCP_Transport::~TAO_AV_TCP_Transport (void) +TAO_AV_TCP_Transport::~TAO_AV_TCP_Transport () { } @@ -33,19 +33,19 @@ TAO_AV_TCP_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_TCP_Transport::close (void) +TAO_AV_TCP_Transport::close () { return 0; } int -TAO_AV_TCP_Transport::mtu (void) +TAO_AV_TCP_Transport::mtu () { return -1; } ACE_Addr* -TAO_AV_TCP_Transport::get_peer_addr (void) +TAO_AV_TCP_Transport::get_peer_addr () { return 0; } @@ -153,11 +153,11 @@ TAO_AV_TCP_Transport::recv (iovec *iov, // TAO_AV_TCP_Protocol_Factory //------------------------------------------------------------ -TAO_AV_TCP_Factory::TAO_AV_TCP_Factory (void) +TAO_AV_TCP_Factory::TAO_AV_TCP_Factory () { } -TAO_AV_TCP_Factory::~TAO_AV_TCP_Factory (void) +TAO_AV_TCP_Factory::~TAO_AV_TCP_Factory () { } @@ -177,7 +177,7 @@ TAO_AV_TCP_Factory::match_protocol (const char *protocol_string) } TAO_AV_Acceptor* -TAO_AV_TCP_Factory::make_acceptor (void) +TAO_AV_TCP_Factory::make_acceptor () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_acceptor ")); TAO_AV_Acceptor *acceptor = 0; @@ -188,7 +188,7 @@ TAO_AV_TCP_Factory::make_acceptor (void) } TAO_AV_Connector* -TAO_AV_TCP_Factory::make_connector (void) +TAO_AV_TCP_Factory::make_connector () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_connector ")); TAO_AV_Connector *connector = 0; @@ -203,7 +203,7 @@ TAO_AV_TCP_Factory::make_connector (void) //------------------------------------------------------------ int -TAO_AV_TCP_Object::handle_input (void) +TAO_AV_TCP_Object::handle_input () { int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); @@ -249,12 +249,12 @@ TAO_AV_TCP_Object::TAO_AV_TCP_Object (TAO_AV_Callback *callback, this->frame_.size (BUFSIZ); } -TAO_AV_TCP_Object::~TAO_AV_TCP_Object (void) +TAO_AV_TCP_Object::~TAO_AV_TCP_Object () { // No-op } int -TAO_AV_TCP_Object::destroy (void) +TAO_AV_TCP_Object::destroy () { this->callback_->handle_destroy (); delete this; @@ -264,11 +264,11 @@ TAO_AV_TCP_Object::destroy (void) //------------------------------------------------------------ // TAO_AV_TCP_Flow_Factory //------------------------------------------------------------ -TAO_AV_TCP_Flow_Factory::TAO_AV_TCP_Flow_Factory (void) +TAO_AV_TCP_Flow_Factory::TAO_AV_TCP_Flow_Factory () { } -TAO_AV_TCP_Flow_Factory::~TAO_AV_TCP_Flow_Factory (void) +TAO_AV_TCP_Flow_Factory::~TAO_AV_TCP_Flow_Factory () { } @@ -357,11 +357,11 @@ TAO_AV_TCP_Base_Connector::connector_connect (TAO_AV_TCP_Flow_Handler *&handler, //------------------------------------------------------------ // TAO_AV_TCP_Connector //------------------------------------------------------------ -TAO_AV_TCP_Connector::TAO_AV_TCP_Connector (void) +TAO_AV_TCP_Connector::TAO_AV_TCP_Connector () { } -TAO_AV_TCP_Connector::~TAO_AV_TCP_Connector (void) +TAO_AV_TCP_Connector::~TAO_AV_TCP_Connector () { } @@ -431,7 +431,7 @@ TAO_AV_TCP_Connector::connect (TAO_FlowSpec_Entry *entry, } int -TAO_AV_TCP_Connector::close (void) +TAO_AV_TCP_Connector::close () { return 0; } @@ -473,11 +473,11 @@ TAO_AV_TCP_Base_Acceptor::make_svc_handler (TAO_AV_TCP_Flow_Handler *&handler) // TAO_AV_TCP_Acceptor //------------------------------------------------------------ -TAO_AV_TCP_Acceptor::TAO_AV_TCP_Acceptor (void) +TAO_AV_TCP_Acceptor::TAO_AV_TCP_Acceptor () { } -TAO_AV_TCP_Acceptor::~TAO_AV_TCP_Acceptor (void) +TAO_AV_TCP_Acceptor::~TAO_AV_TCP_Acceptor () { } @@ -612,7 +612,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, int -TAO_AV_TCP_Acceptor::close (void) +TAO_AV_TCP_Acceptor::close () { return 0; } @@ -628,13 +628,13 @@ TAO_AV_TCP_Flow_Handler::TAO_AV_TCP_Flow_Handler (TAO_AV_Callback * /*callback*/ TAO_AV_TCP_Transport (this)); } -TAO_AV_TCP_Flow_Handler::~TAO_AV_TCP_Flow_Handler (void) +TAO_AV_TCP_Flow_Handler::~TAO_AV_TCP_Flow_Handler () { delete this->transport_; } TAO_AV_Transport * -TAO_AV_TCP_Flow_Handler::transport (void) +TAO_AV_TCP_Flow_Handler::transport () { return this->transport_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 909d9eb5657..5e5a7dd19cc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -47,7 +47,7 @@ TAO_AV_Flow_Protocol_Item::TAO_AV_Flow_Protocol_Item (const ACE_CString &name) // TAO_AV_Connector_Registry //------------------------------------------------------------ -TAO_AV_Connector_Registry::TAO_AV_Connector_Registry (void) +TAO_AV_Connector_Registry::TAO_AV_Connector_Registry () { } @@ -174,7 +174,7 @@ TAO_AV_Connector_Registry::close (TAO_AV_Connector *connector) } int -TAO_AV_Connector_Registry::close_all (void) +TAO_AV_Connector_Registry::close_all () { for (TAO_AV_ConnectorSetItor i = this->connectors_.begin (); i != this->connectors_.end (); @@ -192,7 +192,7 @@ TAO_AV_Connector_Registry::close_all (void) return 0; } -TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry (void) +TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry () { this->close_all (); } @@ -201,11 +201,11 @@ TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry (void) // TAO_AV_Acceptor_Registry //------------------------------------------------------------ -TAO_AV_Acceptor_Registry::TAO_AV_Acceptor_Registry (void) +TAO_AV_Acceptor_Registry::TAO_AV_Acceptor_Registry () { } -TAO_AV_Acceptor_Registry::~TAO_AV_Acceptor_Registry (void) +TAO_AV_Acceptor_Registry::~TAO_AV_Acceptor_Registry () { this->close_all(); } @@ -443,7 +443,7 @@ TAO_AV_Acceptor_Registry::close (TAO_AV_Acceptor *acceptor) } int -TAO_AV_Acceptor_Registry::close_all (void) +TAO_AV_Acceptor_Registry::close_all () { for (TAO_AV_AcceptorSetItor i = this->acceptors_.begin (); i != this->acceptors_.end (); @@ -465,17 +465,17 @@ TAO_AV_Acceptor_Registry::close_all (void) // TAO_AV_Transport //---------------------------------------------------------------------- -TAO_AV_Transport::TAO_AV_Transport (void) +TAO_AV_Transport::TAO_AV_Transport () { } // Virtual destructor. -TAO_AV_Transport::~TAO_AV_Transport (void) +TAO_AV_Transport::~TAO_AV_Transport () { } ACE_Addr* -TAO_AV_Transport::get_local_addr (void) +TAO_AV_Transport::get_local_addr () { return 0; } @@ -485,7 +485,7 @@ TAO_AV_Transport::get_local_addr (void) //---------------------------------------------------------------------- //TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (TAO_AV_Callback *callback) -TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (void) +TAO_AV_Flow_Handler::TAO_AV_Flow_Handler () :transport_ (0), callback_ (0), protocol_object_ (0), @@ -493,7 +493,7 @@ TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (void) { } -TAO_AV_Flow_Handler::~TAO_AV_Flow_Handler(void) +TAO_AV_Flow_Handler::~TAO_AV_Flow_Handler() { // cancel the timer (if there is one) this->cancel_timer(); @@ -524,7 +524,7 @@ TAO_AV_Flow_Handler::start (TAO_FlowSpec_Entry::Role role) } int -TAO_AV_Flow_Handler::schedule_timer (void) +TAO_AV_Flow_Handler::schedule_timer () { ACE_Event_Handler *event_handler = this->event_handler (); ACE_Time_Value *tv = 0; @@ -546,7 +546,7 @@ TAO_AV_Flow_Handler::schedule_timer (void) int -TAO_AV_Flow_Handler::cancel_timer (void) +TAO_AV_Flow_Handler::cancel_timer () { if (this->timer_id_ != -1) return TAO_AV_CORE::instance()->reactor ()->cancel_timer (this->timer_id_); @@ -605,7 +605,7 @@ TAO_AV_Flow_Handler::change_qos (AVStreams::QoS) } TAO_AV_Transport* -TAO_AV_Flow_Handler::transport (void) +TAO_AV_Flow_Handler::transport () { return this->transport_; } @@ -617,7 +617,7 @@ TAO_AV_Flow_Handler::protocol_object (TAO_AV_Protocol_Object *protocol_object) } TAO_AV_Protocol_Object* -TAO_AV_Flow_Handler::protocol_object (void) +TAO_AV_Flow_Handler::protocol_object () { return this->protocol_object_; } @@ -629,29 +629,29 @@ TAO_AV_Flow_Handler::callback (TAO_AV_Callback *callback) } // TAO_AV_Connector -TAO_AV_Connector::TAO_AV_Connector (void) +TAO_AV_Connector::TAO_AV_Connector () { } -TAO_AV_Connector::~TAO_AV_Connector (void) +TAO_AV_Connector::~TAO_AV_Connector () { } // TAO_AV_Acceptor -TAO_AV_Acceptor::TAO_AV_Acceptor (void) +TAO_AV_Acceptor::TAO_AV_Acceptor () { } -TAO_AV_Acceptor::~TAO_AV_Acceptor (void) +TAO_AV_Acceptor::~TAO_AV_Acceptor () { } -TAO_AV_Transport_Factory::TAO_AV_Transport_Factory (void) +TAO_AV_Transport_Factory::TAO_AV_Transport_Factory () : ref_count (0) { } -TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory (void) +TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory () { } @@ -669,13 +669,13 @@ TAO_AV_Transport_Factory::match_protocol (const char * /* protocol_string */) } TAO_AV_Acceptor * -TAO_AV_Transport_Factory::make_acceptor (void) +TAO_AV_Transport_Factory::make_acceptor () { return 0; } TAO_AV_Connector * -TAO_AV_Transport_Factory::make_connector (void) +TAO_AV_Transport_Factory::make_connector () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 601e173fdfc..edfa055b2a1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -17,13 +17,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_UDP_Flow_Handler //------------------------------------------------------------ -TAO_AV_UDP_Flow_Handler::TAO_AV_UDP_Flow_Handler (void) +TAO_AV_UDP_Flow_Handler::TAO_AV_UDP_Flow_Handler () { ACE_NEW (this->transport_, TAO_AV_UDP_Transport (this)); } -TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler (void) +TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler () { // remove the event handler from the reactor. TAO_AV_CORE::instance()->reactor ()->remove_handler (this->event_handler(), @@ -35,7 +35,7 @@ TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler (void) } TAO_AV_Transport * -TAO_AV_UDP_Flow_Handler::transport (void) +TAO_AV_UDP_Flow_Handler::transport () { return this->transport_; } @@ -68,7 +68,7 @@ TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address) ACE_HANDLE -TAO_AV_UDP_Flow_Handler::get_handle (void) const +TAO_AV_UDP_Flow_Handler::get_handle () const { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, @@ -155,7 +155,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) // TAO_AV_UDP_Transport //------------------------------------------------------------ -TAO_AV_UDP_Transport::TAO_AV_UDP_Transport (void) +TAO_AV_UDP_Transport::TAO_AV_UDP_Transport () :handler_ (0) { } @@ -166,7 +166,7 @@ TAO_AV_UDP_Transport::TAO_AV_UDP_Transport (TAO_AV_UDP_Flow_Handler *handler) { } -TAO_AV_UDP_Transport::~TAO_AV_UDP_Transport (void) +TAO_AV_UDP_Transport::~TAO_AV_UDP_Transport () { } @@ -184,19 +184,19 @@ TAO_AV_UDP_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_UDP_Transport::close (void) +TAO_AV_UDP_Transport::close () { return 0; } int -TAO_AV_UDP_Transport::mtu (void) +TAO_AV_UDP_Transport::mtu () { return 65535; } ACE_Addr* -TAO_AV_UDP_Transport::get_peer_addr (void) +TAO_AV_UDP_Transport::get_peer_addr () { return &this->peer_addr_; } @@ -318,13 +318,13 @@ TAO_AV_UDP_Transport::recv (iovec *iov, // TAO_AV_UDP_Acceptor //------------------------------------------------------------ -TAO_AV_UDP_Acceptor::TAO_AV_UDP_Acceptor (void) +TAO_AV_UDP_Acceptor::TAO_AV_UDP_Acceptor () : address_ (0), control_inet_address_ (0) { } -TAO_AV_UDP_Acceptor::~TAO_AV_UDP_Acceptor (void) +TAO_AV_UDP_Acceptor::~TAO_AV_UDP_Acceptor () { if (this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL) delete this->entry_->control_handler (); @@ -556,7 +556,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, } int -TAO_AV_UDP_Acceptor::close (void) +TAO_AV_UDP_Acceptor::close () { return 0; } @@ -564,12 +564,12 @@ TAO_AV_UDP_Acceptor::close (void) //------------------------------------------------------------ // TAO_AV_UDP_Connector //------------------------------------------------------------ -TAO_AV_UDP_Connector::TAO_AV_UDP_Connector (void) +TAO_AV_UDP_Connector::TAO_AV_UDP_Connector () : control_inet_address_ (0) { } -TAO_AV_UDP_Connector::~TAO_AV_UDP_Connector (void) +TAO_AV_UDP_Connector::~TAO_AV_UDP_Connector () { if (this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL) { @@ -779,7 +779,7 @@ TAO_AV_UDP_Connector::activate_svc_handler (TAO_AV_Flow_Handler *handler) } int -TAO_AV_UDP_Connector::close (void) +TAO_AV_UDP_Connector::close () { return 0; } @@ -908,11 +908,11 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, // TAO_AV_UDP_Protocol_Factory //------------------------------------------------------------ -TAO_AV_UDP_Factory::TAO_AV_UDP_Factory (void) +TAO_AV_UDP_Factory::TAO_AV_UDP_Factory () { } -TAO_AV_UDP_Factory::~TAO_AV_UDP_Factory (void) +TAO_AV_UDP_Factory::~TAO_AV_UDP_Factory () { } @@ -927,7 +927,7 @@ TAO_AV_UDP_Factory::match_protocol (const char *protocol_string) } TAO_AV_Acceptor* -TAO_AV_UDP_Factory::make_acceptor (void) +TAO_AV_UDP_Factory::make_acceptor () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_acceptor\n")); TAO_AV_Acceptor *acceptor = 0; @@ -938,7 +938,7 @@ TAO_AV_UDP_Factory::make_acceptor (void) } TAO_AV_Connector* -TAO_AV_UDP_Factory::make_connector (void) +TAO_AV_UDP_Factory::make_connector () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_connector\n")); TAO_AV_Connector *connector = 0; @@ -960,7 +960,7 @@ TAO_AV_UDP_Factory::init (int /* argc */, //------------------------------------------------------------ int -TAO_AV_UDP_Object::handle_input (void) +TAO_AV_UDP_Object::handle_input () { int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); @@ -1012,13 +1012,13 @@ TAO_AV_UDP_Object::TAO_AV_UDP_Object (TAO_AV_Callback *callback, this->frame_.size (this->transport_->mtu ()); } -TAO_AV_UDP_Object::~TAO_AV_UDP_Object (void) +TAO_AV_UDP_Object::~TAO_AV_UDP_Object () { //no-op } int -TAO_AV_UDP_Object::destroy (void) +TAO_AV_UDP_Object::destroy () { this->callback_->handle_destroy (); delete this; @@ -1030,11 +1030,11 @@ TAO_AV_UDP_Object::destroy (void) //------------------------------------------------------------ // TAO_AV_UDP_Flow_Factory //------------------------------------------------------------ -TAO_AV_UDP_Flow_Factory::TAO_AV_UDP_Flow_Factory (void) +TAO_AV_UDP_Flow_Factory::TAO_AV_UDP_Flow_Factory () { } -TAO_AV_UDP_Flow_Factory::~TAO_AV_UDP_Flow_Factory (void) +TAO_AV_UDP_Flow_Factory::~TAO_AV_UDP_Flow_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 19ec09132b9..1a20983efb2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -8,14 +8,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void) +TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory %d\n")); } -TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory (void) +TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory () { TAO_AV_TransportFactorySetItor t_end = TAO_AV_CORE::instance ()->transport_factories ()->end (); for (TAO_AV_TransportFactorySetItor tfiterator = diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index ad857ef4536..77b9e1542a7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -45,7 +45,7 @@ operator< (const TAO_SFP_Fragment_Node& left, // TAO_SFP_Base //------------------------------------------------------------ -TAO_SFP_Base::TAO_SFP_Base (void) +TAO_SFP_Base::TAO_SFP_Base () { TAO_OutputCDR output_cdr; flowProtocol::frameHeader frame_header; @@ -845,13 +845,13 @@ TAO_SFP_Object::TAO_SFP_Object (TAO_AV_Callback *callback, this->state_.static_frame_.size (2* this->transport_->mtu ()); } -TAO_SFP_Object::~TAO_SFP_Object (void) +TAO_SFP_Object::~TAO_SFP_Object () { //no-op } int -TAO_SFP_Object::destroy (void) +TAO_SFP_Object::destroy () { int result = -1; TAO_OutputCDR out_stream; @@ -1127,7 +1127,7 @@ TAO_SFP_Consumer_Object::TAO_SFP_Consumer_Object (TAO_AV_Callback *callback, } int -TAO_SFP_Consumer_Object::handle_input (void) +TAO_SFP_Consumer_Object::handle_input () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_SFP_Consumer_Object::handle_input\n")); // This is the entry point for receiving data. @@ -1177,7 +1177,7 @@ TAO_SFP_Producer_Object::TAO_SFP_Producer_Object (TAO_AV_Callback *callback, } int -TAO_SFP_Producer_Object::handle_input (void) +TAO_SFP_Producer_Object::handle_input () { // A producer can only receive credit messages. int result; @@ -1223,11 +1223,11 @@ TAO_SFP_Producer_Object::handle_input (void) } // TAO_AV_SFP_Factory -TAO_AV_SFP_Factory::TAO_AV_SFP_Factory (void) +TAO_AV_SFP_Factory::TAO_AV_SFP_Factory () { } -TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory (void) +TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory () { } @@ -1293,7 +1293,7 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, // TAO_SFP_Frame_State //------------------------------------------------------------ -TAO_SFP_Frame_State::TAO_SFP_Frame_State (void) +TAO_SFP_Frame_State::TAO_SFP_Frame_State () :cdr (new ACE_Data_Block (ACE_CDR::DEFAULT_BUFSIZE, ACE_Message_Block::MB_DATA, 0, @@ -1309,13 +1309,13 @@ TAO_SFP_Frame_State::TAO_SFP_Frame_State (void) } CORBA::Boolean -TAO_SFP_Frame_State::is_complete (void) +TAO_SFP_Frame_State::is_complete () { return (!this->more_fragments_) && (this->frame_block_); } int -TAO_SFP_Frame_State::reset (void) +TAO_SFP_Frame_State::reset () { this->frame_block_ = 0; return 0; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 997efb34aca..6b36ef5c48d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CC_Lock::CC_Lock (void) +CC_Lock::CC_Lock () : mode_ (CosConcurrencyControl::intention_read), lock_held_ (0) { @@ -32,12 +32,12 @@ CC_Lock::CC_Lock (CosConcurrencyControl::lock_mode mode) { } -CC_Lock::~CC_Lock (void) +CC_Lock::~CC_Lock () { } void -CC_Lock::lock (void) +CC_Lock::lock () { ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::lock\n")); @@ -45,7 +45,7 @@ CC_Lock::lock (void) } CORBA::Boolean -CC_Lock::try_lock (void) +CC_Lock::try_lock () { ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::try_lock. ")); @@ -79,7 +79,7 @@ CC_Lock::try_lock (void) } void -CC_Lock::unlock (void) +CC_Lock::unlock () { ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::unlock\n")); @@ -133,25 +133,25 @@ CC_Lock::Compatible (CosConcurrencyControl::lock_mode mode) } CosConcurrencyControl::lock_mode -CC_Lock::GetMode (void) +CC_Lock::GetMode () { return mode_; } int -CC_Lock::GetLocksHeld (void) +CC_Lock::GetLocksHeld () { return this->lock_held_; } void -CC_Lock::DecLocksHeld (void) +CC_Lock::DecLocksHeld () { this->lock_held_--; } void -CC_Lock::dump (void) +CC_Lock::dump () { ORBSVCS_DEBUG ((LM_DEBUG, "mode_ %i, lock_held_: %i\n", @@ -183,21 +183,21 @@ CORBA::Boolean CC_Lock::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] // CC_LockModeterator -CC_LockModeIterator::CC_LockModeIterator (void) +CC_LockModeIterator::CC_LockModeIterator () : current_ (CosConcurrencyControl::intention_read) { } -CC_LockModeIterator::~CC_LockModeIterator (void) +CC_LockModeIterator::~CC_LockModeIterator () { // Do nothing } -void CC_LockModeIterator::First (void) +void CC_LockModeIterator::First () { current_ = CosConcurrencyControl::intention_read; } -void CC_LockModeIterator::Next (void) +void CC_LockModeIterator::Next () { switch (current_) { @@ -221,7 +221,7 @@ void CC_LockModeIterator::Next (void) } CORBA::Boolean -CC_LockModeIterator::IsDone (void) +CC_LockModeIterator::IsDone () { if (current_ == CosConcurrencyControl::write) return 1; @@ -230,7 +230,7 @@ CC_LockModeIterator::IsDone (void) } CosConcurrencyControl::lock_mode -CC_LockModeIterator::GetLockMode (void) +CC_LockModeIterator::GetLockMode () { return current_; } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 8f1715e7959..99d6a1b442e 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor. -CC_LockSet::CC_LockSet (void) +CC_LockSet::CC_LockSet () { try { @@ -45,7 +45,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr ) // Initialization. void -CC_LockSet::Init (void) +CC_LockSet::Init () { // Set the mode of the statically allocated locks lock_[CC_IR] = 0; @@ -61,7 +61,7 @@ CC_LockSet::Init (void) // Destructor -CC_LockSet::~CC_LockSet (void) +CC_LockSet::~CC_LockSet () { } @@ -278,7 +278,7 @@ CC_LockSet::lock_held (CC_LockModeEnum lm) } void -CC_LockSet::dump (void) +CC_LockSet::dump () { ORBSVCS_DEBUG ((LM_DEBUG, "waiting_calls_: %i, IR: %i, R: %i, U: %i, IW: %i, W: %i\n", diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 9a78bc807ab..03a2175adb9 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -15,17 +15,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor -CC_LockSetFactory::CC_LockSetFactory (void) +CC_LockSetFactory::CC_LockSetFactory () { } // Destructor. -CC_LockSetFactory::~CC_LockSetFactory (void) +CC_LockSetFactory::~CC_LockSetFactory () { } CosConcurrencyControl::LockSet_ptr -CC_LockSetFactory::create (void) +CC_LockSetFactory::create () { CC_LockSet *ls = 0; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 0056beb1e52..74555ec8ed7 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -18,11 +18,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Concurrency_Loader::TAO_Concurrency_Loader (void) +TAO_Concurrency_Loader::TAO_Concurrency_Loader () { } -TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void) +TAO_Concurrency_Loader::~TAO_Concurrency_Loader () { } @@ -48,7 +48,7 @@ TAO_Concurrency_Loader::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Concurrency_Loader::fini (void) +TAO_Concurrency_Loader::fini () { // Remove the Concurrency Service. this->concurrency_server_.fini(); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 9ae228725bb..d0147e100f4 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor -TAO_Concurrency_Server::TAO_Concurrency_Server (void) +TAO_Concurrency_Server::TAO_Concurrency_Server () { } @@ -72,7 +72,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb, } int -TAO_Concurrency_Server::fini (void) +TAO_Concurrency_Server::fini () { try { @@ -95,12 +95,12 @@ TAO_Concurrency_Server::fini (void) } CC_LockSetFactory * -TAO_Concurrency_Server::GetLockSetFactory(void) +TAO_Concurrency_Server::GetLockSetFactory() { return &this->lock_set_factory_; } -TAO_Concurrency_Server::~TAO_Concurrency_Server (void) +TAO_Concurrency_Server::~TAO_Concurrency_Server () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index cfd92db0be4..749c421fe0c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -21,7 +21,7 @@ TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) this->event_channel_->consumer_poa (); } -TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void) +TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin () { } @@ -74,7 +74,7 @@ TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier) } void -TAO_CEC_ConsumerAdmin::shutdown (void) +TAO_CEC_ConsumerAdmin::shutdown () { this->push_admin_.shutdown (); @@ -82,19 +82,19 @@ TAO_CEC_ConsumerAdmin::shutdown (void) } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_push_supplier (void) +TAO_CEC_ConsumerAdmin::obtain_push_supplier () { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier () { return this->pull_admin_.obtain (); } PortableServer::POA_ptr -TAO_CEC_ConsumerAdmin::_default_POA (void) +TAO_CEC_ConsumerAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index cc9fab516c4..a0b70c10152 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -2,22 +2,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void) +TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl () { } -TAO_CEC_ConsumerControl::~TAO_CEC_ConsumerControl (void) +TAO_CEC_ConsumerControl::~TAO_CEC_ConsumerControl () { } int -TAO_CEC_ConsumerControl::activate (void) +TAO_CEC_ConsumerControl::activate () { return 0; } int -TAO_CEC_ConsumerControl::shutdown (void) +TAO_CEC_ConsumerControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index c8703df70c7..84026edf994 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -41,7 +41,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) +TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory () { if (orbid_dupped_ != 0) { @@ -50,7 +50,7 @@ TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) } int -TAO_CEC_Default_Factory::init_svcs (void) +TAO_CEC_Default_Factory::init_svcs () { return ACE_Service_Config::static_svcs ()->insert ( @@ -423,7 +423,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_CEC_Default_Factory::fini (void) +TAO_CEC_Default_Factory::fini () { return 0; } @@ -1233,7 +1233,7 @@ TAO_CEC_Default_Factory::destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPu } ACE_Lock* -TAO_CEC_Default_Factory::create_consumer_lock (void) +TAO_CEC_Default_Factory::create_consumer_lock () { if (this->consumer_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; @@ -1251,7 +1251,7 @@ TAO_CEC_Default_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_CEC_Default_Factory::create_supplier_lock (void) +TAO_CEC_Default_Factory::create_supplier_lock () { if (this->supplier_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index a98e625c404..192f6edc8c2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -3,23 +3,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void) +TAO_CEC_Dispatching::~TAO_CEC_Dispatching () { } // **************************************************************** -TAO_CEC_Reactive_Dispatching::TAO_CEC_Reactive_Dispatching (void) +TAO_CEC_Reactive_Dispatching::TAO_CEC_Reactive_Dispatching () { } void -TAO_CEC_Reactive_Dispatching::activate (void) +TAO_CEC_Reactive_Dispatching::activate () { } void -TAO_CEC_Reactive_Dispatching::shutdown (void) +TAO_CEC_Reactive_Dispatching::shutdown () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 4ee21c30070..af861810196 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_CEC_Dispatching_Task::svc (void) +TAO_CEC_Dispatching_Task::svc () { bool done = false; @@ -107,27 +107,27 @@ TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy, // **************************************************************** -TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void) +TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command () { } // **************************************************************** int -TAO_CEC_Shutdown_Task_Command::execute (void) +TAO_CEC_Shutdown_Task_Command::execute () { return -1; } // **************************************************************** -TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void) +TAO_CEC_Push_Command::~TAO_CEC_Push_Command () { this->proxy_->_decr_refcnt (); } int -TAO_CEC_Push_Command::execute (void) +TAO_CEC_Push_Command::execute () { this->proxy_->push_to_consumer (this->event_); return 0; @@ -136,13 +136,13 @@ TAO_CEC_Push_Command::execute (void) // **************************************************************** #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command (void) +TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command () { this->proxy_->_decr_refcnt (); } int -TAO_CEC_Invoke_Command::execute (void) +TAO_CEC_Invoke_Command::execute () { this->proxy_->invoke_to_consumer (this->typed_event_); return 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index 78ab05ce1d2..c2223a2d8ba 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Destructor -TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void) +TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer () { } @@ -69,7 +69,7 @@ TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::O } PortableServer::POA_ptr -TAO_CEC_DynamicImplementationServer::_default_POA (void) +TAO_CEC_DynamicImplementationServer::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 522f8e5506b..579cfadd83d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -47,7 +47,7 @@ TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr, this->factory_->create_supplier_control (this); } -TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) +TAO_CEC_EventChannel::~TAO_CEC_EventChannel () { this->factory_->destroy_dispatching (this->dispatching_); this->dispatching_ = 0; @@ -70,7 +70,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) } void -TAO_CEC_EventChannel::activate (void) +TAO_CEC_EventChannel::activate () { this->dispatching_->activate (); this->pulling_strategy_->activate (); @@ -79,7 +79,7 @@ TAO_CEC_EventChannel::activate (void) } void -TAO_CEC_EventChannel::shutdown (void) +TAO_CEC_EventChannel::shutdown () { this->dispatching_->shutdown (); this->pulling_strategy_->shutdown (); @@ -176,19 +176,19 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier) } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_CEC_EventChannel::for_consumers (void) +TAO_CEC_EventChannel::for_consumers () { return this->consumer_admin_->_this (); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_CEC_EventChannel::for_suppliers (void) +TAO_CEC_EventChannel::for_suppliers () { return this->supplier_admin_->_this (); } void -TAO_CEC_EventChannel::destroy (void) +TAO_CEC_EventChannel::destroy () { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index deda68038c8..7087b92301b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) : +TAO_CEC_Event_Loader::TAO_CEC_Event_Loader () : attributes_ (0) , factory_ (0) , ec_impl_ (0) @@ -41,7 +41,7 @@ TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) : // Constructor } -TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void) +TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader () { // Destructor } @@ -405,7 +405,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, } int -TAO_CEC_Event_Loader::fini (void) +TAO_CEC_Event_Loader::fini () { // + Since it was activated with _this() you have to do the // canonical: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index 6eef61ef41a..84e3bb84c64 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Factory::~TAO_CEC_Factory (void) +TAO_CEC_Factory::~TAO_CEC_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 6d80809278b..db1e6bf776d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -17,7 +17,7 @@ TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, } void -TAO_CEC_MT_Dispatching::activate (void) +TAO_CEC_MT_Dispatching::activate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -41,7 +41,7 @@ TAO_CEC_MT_Dispatching::activate (void) } void -TAO_CEC_MT_Dispatching::shutdown (void) +TAO_CEC_MT_Dispatching::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index a12bdf9b683..67ba41ddca5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -30,7 +30,7 @@ TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* ec, this->event_channel_->get_servant_retry_map ().bind (this, 0); } -TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) +TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer () { this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_consumer_lock (this->lock_); @@ -53,7 +53,7 @@ TAO_CEC_ProxyPullConsumer::activate ( } void -TAO_CEC_ProxyPullConsumer::deactivate (void) +TAO_CEC_ProxyPullConsumer::deactivate () { try { @@ -189,7 +189,7 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( } void -TAO_CEC_ProxyPullConsumer::shutdown (void) +TAO_CEC_ProxyPullConsumer::shutdown () { CosEventComm::PullSupplier_var supplier; @@ -219,21 +219,21 @@ TAO_CEC_ProxyPullConsumer::shutdown (void) } void -TAO_CEC_ProxyPullConsumer::cleanup_i (void) +TAO_CEC_ProxyPullConsumer::cleanup_i () { this->supplier_ = CosEventComm::PullSupplier::_nil (); } CORBA::ULong -TAO_CEC_ProxyPullConsumer::_incr_refcnt (void) +TAO_CEC_ProxyPullConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) +TAO_CEC_ProxyPullConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -358,19 +358,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer () } PortableServer::POA_ptr -TAO_CEC_ProxyPullConsumer::_default_POA (void) +TAO_CEC_ProxyPullConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullConsumer::_add_ref (void) +TAO_CEC_ProxyPullConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullConsumer::_remove_ref (void) +TAO_CEC_ProxyPullConsumer::_remove_ref () { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index db840f03ee5..b023d169da2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -29,7 +29,7 @@ TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier this->event_channel_->get_servant_retry_map ().bind (this, 0); } -TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) +TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier () { this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_supplier_lock (this->lock_); @@ -52,7 +52,7 @@ TAO_CEC_ProxyPullSupplier::activate ( } void -TAO_CEC_ProxyPullSupplier::deactivate (void) +TAO_CEC_ProxyPullSupplier::deactivate () { try { @@ -72,7 +72,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (void) } void -TAO_CEC_ProxyPullSupplier::shutdown (void) +TAO_CEC_ProxyPullSupplier::shutdown () { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -148,7 +148,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event) } CORBA::Any * -TAO_CEC_ProxyPullSupplier::pull (void) +TAO_CEC_ProxyPullSupplier::pull () { if (this->is_connected () == 0) throw CosEventComm::Disconnected (); @@ -190,7 +190,7 @@ TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event) } void -TAO_CEC_ProxyPullSupplier::cleanup_i (void) +TAO_CEC_ProxyPullSupplier::cleanup_i () { this->consumer_ = CosEventComm::PullConsumer::_nil (); @@ -198,14 +198,14 @@ TAO_CEC_ProxyPullSupplier::cleanup_i (void) } CORBA::ULong -TAO_CEC_ProxyPullSupplier::_incr_refcnt (void) +TAO_CEC_ProxyPullSupplier::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) +TAO_CEC_ProxyPullSupplier::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -330,19 +330,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier () } PortableServer::POA_ptr -TAO_CEC_ProxyPullSupplier::_default_POA (void) +TAO_CEC_ProxyPullSupplier::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullSupplier::_add_ref (void) +TAO_CEC_ProxyPullSupplier::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullSupplier::_remove_ref (void) +TAO_CEC_ProxyPullSupplier::_remove_ref () { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 27bf794dd05..18428148b39 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -30,7 +30,7 @@ TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* ec, this->event_channel_->get_servant_retry_map ().bind (this, 0); } -TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void) +TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer () { this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_consumer_lock (this->lock_); @@ -53,7 +53,7 @@ TAO_CEC_ProxyPushConsumer::activate ( } void -TAO_CEC_ProxyPushConsumer::deactivate (void) +TAO_CEC_ProxyPushConsumer::deactivate () { try { @@ -103,7 +103,7 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( } void -TAO_CEC_ProxyPushConsumer::shutdown (void) +TAO_CEC_ProxyPushConsumer::shutdown () { CosEventComm::PushSupplier_var supplier; @@ -134,7 +134,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (void) } void -TAO_CEC_ProxyPushConsumer::cleanup_i (void) +TAO_CEC_ProxyPushConsumer::cleanup_i () { this->supplier_ = CosEventComm::PushSupplier::_nil (); @@ -142,14 +142,14 @@ TAO_CEC_ProxyPushConsumer::cleanup_i (void) } CORBA::ULong -TAO_CEC_ProxyPushConsumer::_incr_refcnt (void) +TAO_CEC_ProxyPushConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPushConsumer::_decr_refcnt (void) +TAO_CEC_ProxyPushConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -288,19 +288,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer () } PortableServer::POA_ptr -TAO_CEC_ProxyPushConsumer::_default_POA (void) +TAO_CEC_ProxyPushConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushConsumer::_add_ref (void) +TAO_CEC_ProxyPushConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushConsumer::_remove_ref (void) +TAO_CEC_ProxyPushConsumer::_remove_ref () { this->_decr_refcnt (); } @@ -334,7 +334,7 @@ TAO_CEC_ProxyPushConsumer_Guard:: } TAO_CEC_ProxyPushConsumer_Guard:: - ~TAO_CEC_ProxyPushConsumer_Guard (void) + ~TAO_CEC_ProxyPushConsumer_Guard () { // This access is safe because guard objects are created on the // stack, only one thread has access to them diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index b1a1569031a..0e5bc198acb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -71,7 +71,7 @@ TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel* ec, } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) +TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier () { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->is_typed_ec () ) @@ -107,7 +107,7 @@ TAO_CEC_ProxyPushSupplier::activate ( } void -TAO_CEC_ProxyPushSupplier::deactivate (void) +TAO_CEC_ProxyPushSupplier::deactivate () { try { @@ -127,7 +127,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (void) } void -TAO_CEC_ProxyPushSupplier::shutdown (void) +TAO_CEC_ProxyPushSupplier::shutdown () { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->is_typed_ec () ) @@ -277,7 +277,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event) } void -TAO_CEC_ProxyPushSupplier::cleanup_i (void) +TAO_CEC_ProxyPushSupplier::cleanup_i () { this->consumer_ = CosEventComm::PushConsumer::_nil (); @@ -288,14 +288,14 @@ TAO_CEC_ProxyPushSupplier::cleanup_i (void) } CORBA::ULong -TAO_CEC_ProxyPushSupplier::_incr_refcnt (void) +TAO_CEC_ProxyPushSupplier::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) +TAO_CEC_ProxyPushSupplier::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -876,19 +876,19 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( } PortableServer::POA_ptr -TAO_CEC_ProxyPushSupplier::_default_POA (void) +TAO_CEC_ProxyPushSupplier::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushSupplier::_add_ref (void) +TAO_CEC_ProxyPushSupplier::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushSupplier::_remove_ref (void) +TAO_CEC_ProxyPushSupplier::_remove_ref () { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index 4cafb289b22..6f61ade96b6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void) +TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index d443ae002cb..ab8852c1d3c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -83,7 +83,7 @@ TAO_CEC_Reactive_ConsumerControl:: } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void) +TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl () { } @@ -232,7 +232,7 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( } int -TAO_CEC_Reactive_ConsumerControl::activate (void) +TAO_CEC_Reactive_ConsumerControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -283,7 +283,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) } int -TAO_CEC_Reactive_ConsumerControl::shutdown (void) +TAO_CEC_Reactive_ConsumerControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 1d0b3ad00cb..c17ed7364b5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -83,7 +83,7 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( } void -TAO_CEC_Reactive_Pulling_Strategy::activate (void) +TAO_CEC_Reactive_Pulling_Strategy::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 timer_id_ = this->reactor_->schedule_timer (&this->adapter_, @@ -124,7 +124,7 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) } void -TAO_CEC_Reactive_Pulling_Strategy::shutdown (void) +TAO_CEC_Reactive_Pulling_Strategy::shutdown () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 this->reactor_->cancel_timer (timer_id_); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index f92360df4c3..14adf5a5fc5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -83,7 +83,7 @@ TAO_CEC_Reactive_SupplierControl:: } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void) +TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl () { } @@ -232,7 +232,7 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( } int -TAO_CEC_Reactive_SupplierControl::activate (void) +TAO_CEC_Reactive_SupplierControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -283,7 +283,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void) } int -TAO_CEC_Reactive_SupplierControl::shutdown (void) +TAO_CEC_Reactive_SupplierControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index fadba6678b8..45685c93d41 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -19,12 +19,12 @@ TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) this->event_channel_->supplier_poa (); } -TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void) +TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin () { } PortableServer::POA_ptr -TAO_CEC_SupplierAdmin::_default_POA (void) +TAO_CEC_SupplierAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -66,7 +66,7 @@ TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer) } void -TAO_CEC_SupplierAdmin::shutdown (void) +TAO_CEC_SupplierAdmin::shutdown () { this->push_admin_.shutdown (); @@ -74,13 +74,13 @@ TAO_CEC_SupplierAdmin::shutdown (void) } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_push_consumer (void) +TAO_CEC_SupplierAdmin::obtain_push_consumer () { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_pull_consumer (void) +TAO_CEC_SupplierAdmin::obtain_pull_consumer () { return this->pull_admin_.obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index a359fd9549a..50bb6bd63ef 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -2,22 +2,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void) +TAO_CEC_SupplierControl::TAO_CEC_SupplierControl () { } -TAO_CEC_SupplierControl::~TAO_CEC_SupplierControl (void) +TAO_CEC_SupplierControl::~TAO_CEC_SupplierControl () { } int -TAO_CEC_SupplierControl::activate (void) +TAO_CEC_SupplierControl::activate () { return 0; } int -TAO_CEC_SupplierControl::shutdown (void) +TAO_CEC_SupplierControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index ca290520a07..0c57d545a0b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -18,7 +18,7 @@ TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChanne } // Implementation skeleton destructor -TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void) +TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin () { } @@ -49,7 +49,7 @@ TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier) } void -TAO_CEC_TypedConsumerAdmin::shutdown (void) +TAO_CEC_TypedConsumerAdmin::shutdown () { this->typed_push_admin_.shutdown (); } @@ -77,19 +77,19 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier ( } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void) +TAO_CEC_TypedConsumerAdmin::obtain_push_supplier () { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void) +TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier () { throw CORBA::NO_IMPLEMENT (); } PortableServer::POA_ptr -TAO_CEC_TypedConsumerAdmin::_default_POA (void) +TAO_CEC_TypedConsumerAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 76ddff0af4a..2ed8f27eb16 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -55,7 +55,7 @@ TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr, } // Implementation skeleton destructor -TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void) +TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel () { this->clear_ifr_cache (); this->interface_description_.close (); @@ -73,7 +73,7 @@ TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void) } void -TAO_CEC_TypedEventChannel::activate (void) +TAO_CEC_TypedEventChannel::activate () { this->dispatching_->activate (); this->consumer_control_->activate (); @@ -98,7 +98,7 @@ namespace } void -TAO_CEC_TypedEventChannel::shutdown (void) +TAO_CEC_TypedEventChannel::shutdown () { this->dispatching_->shutdown (); this->supplier_control_->shutdown (); @@ -213,7 +213,7 @@ TAO_CEC_TypedEventChannel::insert_into_ifr_cache (const char *operation_, // Clear the ifr cache, freeing up all its contents. int -TAO_CEC_TypedEventChannel::clear_ifr_cache (void) +TAO_CEC_TypedEventChannel::clear_ifr_cache () { for (Iterator i = this->interface_description_.begin (); i != this->interface_description_.end (); @@ -522,19 +522,19 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count, // The CosTypedEventChannelAdmin::TypedEventChannel methods... CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr -TAO_CEC_TypedEventChannel::for_consumers (void) +TAO_CEC_TypedEventChannel::for_consumers () { return this->typed_consumer_admin_->_this (); } CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr -TAO_CEC_TypedEventChannel::for_suppliers (void) +TAO_CEC_TypedEventChannel::for_suppliers () { return this->typed_supplier_admin_->_this (); } void -TAO_CEC_TypedEventChannel::destroy (void) +TAO_CEC_TypedEventChannel::destroy () { if (!destroyed_) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 93b02abfe2f..33e9199368d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -55,7 +55,7 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer } // Implementation skeleton destructor -TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void) +TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer () { try{ this->default_POA_->deactivate_object (this->oid_.in ()); @@ -86,7 +86,7 @@ TAO_CEC_TypedProxyPushConsumer::activate ( } void -TAO_CEC_TypedProxyPushConsumer::deactivate (void) +TAO_CEC_TypedProxyPushConsumer::deactivate () { try { @@ -137,7 +137,7 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent ( } void -TAO_CEC_TypedProxyPushConsumer::shutdown (void) +TAO_CEC_TypedProxyPushConsumer::shutdown () { CosEventComm::PushSupplier_var supplier; @@ -168,7 +168,7 @@ TAO_CEC_TypedProxyPushConsumer::shutdown (void) } void -TAO_CEC_TypedProxyPushConsumer::cleanup_i (void) +TAO_CEC_TypedProxyPushConsumer::cleanup_i () { this->typed_supplier_ = CosEventComm::PushSupplier::_nil (); @@ -176,14 +176,14 @@ TAO_CEC_TypedProxyPushConsumer::cleanup_i (void) } CORBA::ULong -TAO_CEC_TypedProxyPushConsumer::_incr_refcnt (void) +TAO_CEC_TypedProxyPushConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void) +TAO_CEC_TypedProxyPushConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -313,25 +313,25 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer () } PortableServer::POA_ptr -TAO_CEC_TypedProxyPushConsumer::_default_POA (void) +TAO_CEC_TypedProxyPushConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_TypedProxyPushConsumer::_add_ref (void) +TAO_CEC_TypedProxyPushConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_TypedProxyPushConsumer::_remove_ref (void) +TAO_CEC_TypedProxyPushConsumer::_remove_ref () { this->_decr_refcnt (); } CORBA::Object_ptr -TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void) +TAO_CEC_TypedProxyPushConsumer::get_typed_consumer () { CORBA::Object_var server = @@ -382,7 +382,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard:: } TAO_CEC_TypedProxyPushConsumer_Guard:: - ~TAO_CEC_TypedProxyPushConsumer_Guard (void) + ~TAO_CEC_TypedProxyPushConsumer_Guard () { // This access is safe because guard objects are created on the // stack, only one thread has access to them diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index f5dc2ce81bc..2c00bc62d84 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -17,12 +17,12 @@ TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChanne } // Implementation skeleton destructor -TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin (void) +TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin () { } PortableServer::POA_ptr -TAO_CEC_TypedSupplierAdmin::_default_POA (void) +TAO_CEC_TypedSupplierAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -46,7 +46,7 @@ TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consum } void -TAO_CEC_TypedSupplierAdmin::shutdown (void) +TAO_CEC_TypedSupplierAdmin::shutdown () { this->typed_push_admin_.shutdown (); } @@ -75,13 +75,13 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void) +TAO_CEC_TypedSupplierAdmin::obtain_push_consumer () { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void) +TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp index b52c4f60d5e..1fdf7e17b3c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp @@ -2,11 +2,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void) +TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown () { } -TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler (void) +TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 7115d407a11..8a5db1c53b8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -14,12 +14,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor (void) +TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor () { } // **************************************************************** -TAO_ECG_UDP_Request_Entry::~TAO_ECG_UDP_Request_Entry (void) +TAO_ECG_UDP_Request_Entry::~TAO_ECG_UDP_Request_Entry () { if (this->own_received_fragments_) { @@ -107,7 +107,7 @@ TAO_ECG_UDP_Request_Entry::mark_received (CORBA::ULong fragment_id) } int -TAO_ECG_UDP_Request_Entry::complete (void) const +TAO_ECG_UDP_Request_Entry::complete () const { for (CORBA::ULong i = 0; i < this->received_fragments_size_; @@ -151,7 +151,7 @@ TAO_ECG_CDR_Message_Receiver::Requests::init (size_t size, return 0; } -TAO_ECG_CDR_Message_Receiver::Requests::~Requests (void) +TAO_ECG_CDR_Message_Receiver::Requests::~Requests () { for (size_t i = 0; i < this->size_; ++i) { @@ -504,7 +504,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from) } void -TAO_ECG_CDR_Message_Receiver::shutdown (void) +TAO_ECG_CDR_Message_Receiver::shutdown () { // ACE_GUARD (ACE_Lock, guard, *this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index b4968b356b5..0d52735a8f6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -15,7 +15,7 @@ TAO_ECG_Complex_Address_Server::TAO_ECG_Complex_Address_Server ( { } -TAO_ECG_Complex_Address_Server::~TAO_ECG_Complex_Address_Server (void) +TAO_ECG_Complex_Address_Server::~TAO_ECG_Complex_Address_Server () { } @@ -188,7 +188,7 @@ TAO_ECG_Complex_Address_Server::get_address ( void -TAO_ECG_Complex_Address_Server::dump_content (void) +TAO_ECG_Complex_Address_Server::dump_content () { ORBSVCS_DEBUG ((LM_DEBUG, "Default address: %s:%d\n", this->default_addr_.get_host_addr (), diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index 47557ef714e..9c513ff2b77 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -4,22 +4,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void) +TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control () { } -TAO_ECG_ConsumerEC_Control::~TAO_ECG_ConsumerEC_Control (void) +TAO_ECG_ConsumerEC_Control::~TAO_ECG_ConsumerEC_Control () { } int -TAO_ECG_ConsumerEC_Control::activate (void) +TAO_ECG_ConsumerEC_Control::activate () { return 0; } int -TAO_ECG_ConsumerEC_Control::shutdown (void) +TAO_ECG_ConsumerEC_Control::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 970534d4332..fce5908ebc4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -29,7 +29,7 @@ TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, ACE_ASSERT (this->receiver_); } -TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) +TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH () { ACE_OS::free (this->net_if_); } @@ -78,7 +78,7 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec) } int -TAO_ECG_Mcast_EH::shutdown (void) +TAO_ECG_Mcast_EH::shutdown () { // Already shut down. if (!this->receiver_) @@ -303,7 +303,7 @@ TAO_ECG_Mcast_EH::Observer::update_supplier ( } void -TAO_ECG_Mcast_EH::Observer::shutdown (void) +TAO_ECG_Mcast_EH::Observer::shutdown () { this->eh_ = 0; this->deactivator_.deactivate (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index a679bd3b058..78d4be0b66c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -28,7 +28,7 @@ typedef TAO_EC_Shutdown_Command<PortableServer::Servant_var<TAO_ECG_UDP_Receiver UDP_Receiver_Shutdown; int -TAO_ECG_Mcast_Gateway::init_svcs (void) +TAO_ECG_Mcast_Gateway::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_ECG_Mcast_Gateway); @@ -36,7 +36,7 @@ TAO_ECG_Mcast_Gateway::init_svcs (void) int -TAO_ECG_Mcast_Gateway::fini (void) +TAO_ECG_Mcast_Gateway::fini () { return 0; } @@ -236,7 +236,7 @@ TAO_ECG_Mcast_Gateway::init ( } int -TAO_ECG_Mcast_Gateway::validate_configuration (void) +TAO_ECG_Mcast_Gateway::validate_configuration () { if ((this->handler_type_ == ECG_HANDLER_BASIC || this->handler_type_ == ECG_HANDLER_UDP) @@ -280,7 +280,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) } TAO_ECG_Refcounted_Endpoint -TAO_ECG_Mcast_Gateway::init_endpoint (void) +TAO_ECG_Mcast_Gateway::init_endpoint () { TAO_ECG_UDP_Out_Endpoint* endpoint = 0; TAO_ECG_Refcounted_Endpoint refendpoint; @@ -351,7 +351,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) } PortableServer::ServantBase * -TAO_ECG_Mcast_Gateway::init_address_server (void) +TAO_ECG_Mcast_Gateway::init_address_server () { const char * address_server_arg = (this->address_server_arg_.length ()) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index bad8ff7df7b..a72497a0d44 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -28,7 +28,7 @@ TAO_ECG_Reactive_ConsumerEC_Control:: this->orb_->orb_core ()->reactor (); } -TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control (void) +TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control () { } @@ -104,7 +104,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::handle_timeout ( } int -TAO_ECG_Reactive_ConsumerEC_Control::activate (void) +TAO_ECG_Reactive_ConsumerEC_Control::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -151,7 +151,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void) } int -TAO_ECG_Reactive_ConsumerEC_Control::shutdown (void) +TAO_ECG_Reactive_ConsumerEC_Control::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 0ca681bb896..272b215efc9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -27,7 +27,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control:: this->orb_->orb_core ()->reactor (); } -TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control (void) +TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control () { } @@ -143,7 +143,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::handle_timeout ( } int -TAO_ECG_Reconnect_ConsumerEC_Control::activate (void) +TAO_ECG_Reconnect_ConsumerEC_Control::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -190,7 +190,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void) } int -TAO_ECG_Reconnect_ConsumerEC_Control::shutdown (void) +TAO_ECG_Reconnect_ConsumerEC_Control::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp index 1d1249873ce..d1c14b7969c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp @@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server (void) +TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server () { } -TAO_ECG_Simple_Address_Server::~TAO_ECG_Simple_Address_Server (void) +TAO_ECG_Simple_Address_Server::~TAO_ECG_Simple_Address_Server () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index bce028cdd7b..b671a21d7c0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -11,7 +11,7 @@ TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv) ACE_ASSERT (this->receiver_); } -TAO_ECG_Simple_Mcast_EH::~TAO_ECG_Simple_Mcast_EH (void) +TAO_ECG_Simple_Mcast_EH::~TAO_ECG_Simple_Mcast_EH () { } @@ -59,7 +59,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, } int -TAO_ECG_Simple_Mcast_EH::shutdown (void) +TAO_ECG_Simple_Mcast_EH::shutdown () { // Already shut down. if (!this->receiver_) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index b0e6e278d68..53d96374eb8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -17,7 +17,7 @@ TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv) ACE_ASSERT (this->receiver_); } -TAO_ECG_UDP_EH::~TAO_ECG_UDP_EH (void) +TAO_ECG_UDP_EH::~TAO_ECG_UDP_EH () { } @@ -50,7 +50,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr, } int -TAO_ECG_UDP_EH::shutdown (void) +TAO_ECG_UDP_EH::shutdown () { // Already shut down. if (!this->receiver_) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 0d27483b7eb..a00410750a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void) +TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint () { this->dgram_.close (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 6ac398553b0..a0388b52b59 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void) +TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver () { this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -127,7 +127,7 @@ TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub) } void -TAO_ECG_UDP_Receiver::disconnect_push_supplier (void) +TAO_ECG_UDP_Receiver::disconnect_push_supplier () { // Prevent attempts to disconnect. this->auto_proxy_disconnect_.disallow_command (); @@ -136,7 +136,7 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (void) } void -TAO_ECG_UDP_Receiver::shutdown (void) +TAO_ECG_UDP_Receiver::shutdown () { if (this->handler_rptr_.get ()) this->handler_rptr_->shutdown (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index e742497719a..2e5c0b9d1a3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void) +TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender () { } @@ -131,7 +131,7 @@ TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub) } void -TAO_ECG_UDP_Sender::disconnect_push_consumer (void) +TAO_ECG_UDP_Sender::disconnect_push_consumer () { // Prevent attempts to disconnect. this->auto_proxy_disconnect_.disallow_command (); @@ -140,7 +140,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (void) } void -TAO_ECG_UDP_Sender::shutdown (void) +TAO_ECG_UDP_Sender::shutdown () { this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 9aeb0fd5bee..10d6b5aa22d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -16,7 +16,7 @@ TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[], } } -TAO_EC_And_Filter::~TAO_EC_And_Filter (void) +TAO_EC_And_Filter::~TAO_EC_And_Filter () { TAO_EC_Filter** end = this->children_ + this->n_; for (TAO_EC_Filter** i = this->children_; @@ -32,19 +32,19 @@ TAO_EC_And_Filter::~TAO_EC_And_Filter (void) } TAO_EC_Filter::ChildrenIterator -TAO_EC_And_Filter::begin (void) const +TAO_EC_And_Filter::begin () const { return this->children_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_And_Filter::end (void) const +TAO_EC_And_Filter::end () const { return this->children_ + this->n_; } int -TAO_EC_And_Filter::size (void) const +TAO_EC_And_Filter::size () const { return static_cast<CORBA::ULong> (this->n_); } @@ -104,7 +104,7 @@ TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&, } void -TAO_EC_And_Filter::clear (void) +TAO_EC_And_Filter::clear () { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); @@ -116,7 +116,7 @@ TAO_EC_And_Filter::clear (void) } CORBA::ULong -TAO_EC_And_Filter::max_event_size (void) const +TAO_EC_And_Filter::max_event_size () const { CORBA::ULong n = 0; ChildrenIterator end = this->end (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 8be15fbd97d..fb9914cc01f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -20,11 +20,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void) +TAO_EC_Basic_Factory::TAO_EC_Basic_Factory () { } -TAO_EC_Basic_Factory::~TAO_EC_Basic_Factory (void) +TAO_EC_Basic_Factory::~TAO_EC_Basic_Factory () { } @@ -194,7 +194,7 @@ TAO_EC_Basic_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSu } ACE_Lock* -TAO_EC_Basic_Factory::create_consumer_lock (void) +TAO_EC_Basic_Factory::create_consumer_lock () { return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); } @@ -206,7 +206,7 @@ TAO_EC_Basic_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_Basic_Factory::create_supplier_lock (void) +TAO_EC_Basic_Factory::create_supplier_lock () { return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index a108503b0e5..10b8410bc22 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void) +TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index 0db4efa2b44..4cb7ed15ba9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -12,25 +12,25 @@ TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask, this->adopt_child (this->child_); } -TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter (void) +TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter () { delete this->child_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Bitmask_Filter::begin (void) const +TAO_EC_Bitmask_Filter::begin () const { return const_cast<TAO_EC_Filter**> (&this->child_); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Bitmask_Filter::end (void) const +TAO_EC_Bitmask_Filter::end () const { return const_cast<TAO_EC_Filter**> (&this->child_) + 1; } int -TAO_EC_Bitmask_Filter::size (void) const +TAO_EC_Bitmask_Filter::size () const { return 1; } @@ -80,13 +80,13 @@ TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event, } void -TAO_EC_Bitmask_Filter::clear (void) +TAO_EC_Bitmask_Filter::clear () { this->child_->clear (); } CORBA::ULong -TAO_EC_Bitmask_Filter::max_event_size (void) const +TAO_EC_Bitmask_Filter::max_event_size () const { return this->child_->max_event_size (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index 251a43c8732..3ea1df0215e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -24,7 +24,7 @@ TAO_EC_Conjunction_Filter:: this->clear (); } -TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter (void) +TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter () { TAO_EC_Filter** end = this->children_ + this->n_; for (TAO_EC_Filter** i = this->children_; @@ -43,7 +43,7 @@ TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter (void) } int -TAO_EC_Conjunction_Filter::all_received (void) const +TAO_EC_Conjunction_Filter::all_received () const { Word* i = this->bitvec_; for (; @@ -57,19 +57,19 @@ TAO_EC_Conjunction_Filter::all_received (void) const } TAO_EC_Filter::ChildrenIterator -TAO_EC_Conjunction_Filter::begin (void) const +TAO_EC_Conjunction_Filter::begin () const { return this->children_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Conjunction_Filter::end (void) const +TAO_EC_Conjunction_Filter::end () const { return this->children_ + this->n_; } int -TAO_EC_Conjunction_Filter::size (void) const +TAO_EC_Conjunction_Filter::size () const { return static_cast<int> (this->n_); } @@ -135,7 +135,7 @@ TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Conjunction_Filter::clear (void) +TAO_EC_Conjunction_Filter::clear () { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); @@ -159,7 +159,7 @@ TAO_EC_Conjunction_Filter::clear (void) } CORBA::ULong -TAO_EC_Conjunction_Filter::max_event_size (void) const +TAO_EC_Conjunction_Filter::max_event_size () const { CORBA::ULong n = 0; ChildrenIterator end = this->end (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index da902aa0dc0..a7d2d0e4a55 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -15,18 +15,18 @@ TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) this->event_channel_->consumer_poa (); } -TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void) +TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin () { } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ConsumerAdmin::obtain_push_supplier (void) +TAO_EC_ConsumerAdmin::obtain_push_supplier () { return this->obtain (); } PortableServer::POA_ptr -TAO_EC_ConsumerAdmin::_default_POA (void) +TAO_EC_ConsumerAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 9b2e00add98..a972374918a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -2,22 +2,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void) +TAO_EC_ConsumerControl::TAO_EC_ConsumerControl () { } -TAO_EC_ConsumerControl::~TAO_EC_ConsumerControl (void) +TAO_EC_ConsumerControl::~TAO_EC_ConsumerControl () { } int -TAO_EC_ConsumerControl::activate (void) +TAO_EC_ConsumerControl::activate () { return 0; } int -TAO_EC_ConsumerControl::shutdown (void) +TAO_EC_ConsumerControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index baf9a4b7055..f9e9063c993 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -40,12 +40,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void) +TAO_EC_Default_Factory::~TAO_EC_Default_Factory () { } int -TAO_EC_Default_Factory::init_svcs (void) +TAO_EC_Default_Factory::init_svcs () { TAO_EC_Simple_Queue_Full_Action::init_svcs(); return ACE_Service_Config::static_svcs ()-> @@ -498,7 +498,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Default_Factory::fini (void) +TAO_EC_Default_Factory::fini () { return 0; } @@ -914,7 +914,7 @@ TAO_EC_Default_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPush } ACE_Lock* -TAO_EC_Default_Factory::create_consumer_lock (void) +TAO_EC_Default_Factory::create_consumer_lock () { if (this->consumer_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; @@ -932,7 +932,7 @@ TAO_EC_Default_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_Default_Factory::create_supplier_lock (void) +TAO_EC_Default_Factory::create_supplier_lock () { if (this->supplier_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index a4f22d857e1..731206ed1b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -14,7 +14,7 @@ TAO_EC_Default_ProxyPushConsumer:: { } -TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer (void) +TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer () { } @@ -133,19 +133,19 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer () } PortableServer::POA_ptr -TAO_EC_Default_ProxyPushConsumer::_default_POA (void) +TAO_EC_Default_ProxyPushConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_Default_ProxyPushConsumer::_add_ref (void) +TAO_EC_Default_ProxyPushConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_EC_Default_ProxyPushConsumer::_remove_ref (void) +TAO_EC_Default_ProxyPushConsumer::_remove_ref () { this->_decr_refcnt (); } @@ -158,7 +158,7 @@ TAO_EC_Default_ProxyPushConsumer::activate ( } PortableServer::ObjectId -TAO_EC_Default_ProxyPushConsumer::object_id (void) +TAO_EC_Default_ProxyPushConsumer::object_id () { PortableServer::ObjectId_var result = this->default_POA_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index da8a8b21e9e..ed1538aea45 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -15,7 +15,7 @@ TAO_EC_Default_ProxyPushSupplier::TAO_EC_Default_ProxyPushSupplier ( { } -TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier (void) +TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier () { } @@ -146,31 +146,31 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier () } void -TAO_EC_Default_ProxyPushSupplier::suspend_connection (void) +TAO_EC_Default_ProxyPushSupplier::suspend_connection () { this->suspend_connection_locked (); } void -TAO_EC_Default_ProxyPushSupplier::resume_connection (void) +TAO_EC_Default_ProxyPushSupplier::resume_connection () { this->resume_connection_locked (); } PortableServer::POA_ptr -TAO_EC_Default_ProxyPushSupplier::_default_POA (void) +TAO_EC_Default_ProxyPushSupplier::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_Default_ProxyPushSupplier::_add_ref (void) +TAO_EC_Default_ProxyPushSupplier::_add_ref () { this->_incr_refcnt (); } void -TAO_EC_Default_ProxyPushSupplier::_remove_ref (void) +TAO_EC_Default_ProxyPushSupplier::_remove_ref () { this->_decr_refcnt (); } @@ -183,7 +183,7 @@ TAO_EC_Default_ProxyPushSupplier::activate ( } PortableServer::ObjectId -TAO_EC_Default_ProxyPushSupplier::object_id (void) +TAO_EC_Default_ProxyPushSupplier::object_id () { PortableServer::ObjectId_var result = this->default_POA_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index ea7da34ac34..9d036908440 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -17,7 +17,7 @@ TAO_EC_Disjunction_Filter:: } } -TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter (void) +TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter () { TAO_EC_Filter** end = this->children_ + this->n_; for (TAO_EC_Filter** i = this->children_; @@ -33,19 +33,19 @@ TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter (void) } TAO_EC_Filter::ChildrenIterator -TAO_EC_Disjunction_Filter::begin (void) const +TAO_EC_Disjunction_Filter::begin () const { return this->children_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Disjunction_Filter::end (void) const +TAO_EC_Disjunction_Filter::end () const { return this->children_ + this->n_; } int -TAO_EC_Disjunction_Filter::size (void) const +TAO_EC_Disjunction_Filter::size () const { return static_cast<int> (this->n_); } @@ -99,7 +99,7 @@ TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Disjunction_Filter::clear (void) +TAO_EC_Disjunction_Filter::clear () { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); @@ -111,7 +111,7 @@ TAO_EC_Disjunction_Filter::clear (void) } CORBA::ULong -TAO_EC_Disjunction_Filter::max_event_size (void) const +TAO_EC_Disjunction_Filter::max_event_size () const { CORBA::ULong n = 0; ChildrenIterator end = this->end (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index 61e9dd657be..2361f7bf3eb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Dispatching::~TAO_EC_Dispatching (void) +TAO_EC_Dispatching::~TAO_EC_Dispatching () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 35d689302dd..3e8cd26ef17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void) +TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action () : queue_full_action_return_value_ (WAIT_TO_EMPTY) { } @@ -21,7 +21,7 @@ TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void) /// Helper function to register the default action into the service /// configurator. int -TAO_EC_Simple_Queue_Full_Action::init_svcs (void) +TAO_EC_Simple_Queue_Full_Action::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_EC_Simple_Queue_Full_Action); @@ -56,7 +56,7 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Simple_Queue_Full_Action::fini (void) +TAO_EC_Simple_Queue_Full_Action::fini () { return 0; } @@ -83,7 +83,7 @@ ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Simple_Queue_Full_Action) TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool -TAO_EC_Queue::is_full_i (void) +TAO_EC_Queue::is_full_i () { return static_cast<size_t> (this->cur_count_) > this->high_water_mark_; } @@ -91,7 +91,7 @@ TAO_EC_Queue::is_full_i (void) // **************************************************************** int -TAO_EC_Dispatching_Task::svc (void) +TAO_EC_Dispatching_Task::svc () { bool done = false; @@ -180,27 +180,27 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, // **************************************************************** -TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void) +TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command () { } // **************************************************************** int -TAO_EC_Shutdown_Task_Command::execute (void) +TAO_EC_Shutdown_Task_Command::execute () { return -1; } // **************************************************************** -TAO_EC_Push_Command::~TAO_EC_Push_Command (void) +TAO_EC_Push_Command::~TAO_EC_Push_Command () { this->proxy_->_decr_refcnt (); } int -TAO_EC_Push_Command::execute (void) +TAO_EC_Push_Command::execute () { this->proxy_->push_to_consumer (this->consumer_.in (), this->event_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index d1ccf21bc5f..c392ccf3ac7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -41,7 +41,7 @@ TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr, CORBA::Object::_duplicate (attr.scheduler); } -TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) +TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base () { // Destroy Strategies in the reverse order of creation, they // reference to each other during destruction and thus need to be @@ -78,7 +78,7 @@ TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) } void -TAO_EC_Event_Channel_Base::create_strategies (void) +TAO_EC_Event_Channel_Base::create_strategies () { this->dispatching_ = this->factory_->create_dispatching (this); @@ -105,7 +105,7 @@ TAO_EC_Event_Channel_Base::create_strategies (void) } void -TAO_EC_Event_Channel_Base::activate (void) +TAO_EC_Event_Channel_Base::activate () { { // First check if the EC is idle, if it is not then we need to @@ -129,7 +129,7 @@ TAO_EC_Event_Channel_Base::activate (void) } void -TAO_EC_Event_Channel_Base::shutdown (void) +TAO_EC_Event_Channel_Base::shutdown () { { // First check if the EC is already active, if it is not then we @@ -161,7 +161,7 @@ TAO_EC_Event_Channel_Base::shutdown (void) } void -TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void) +TAO_EC_Event_Channel_Base::deactivate_supplier_admin () { try { @@ -178,7 +178,7 @@ TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void) } void -TAO_EC_Event_Channel_Base::deactivate_consumer_admin (void) +TAO_EC_Event_Channel_Base::deactivate_consumer_admin () { try { @@ -243,19 +243,19 @@ TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier) } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_EC_Event_Channel_Base::for_consumers (void) +TAO_EC_Event_Channel_Base::for_consumers () { return this->consumer_admin_->_this (); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_EC_Event_Channel_Base::for_suppliers (void) +TAO_EC_Event_Channel_Base::for_suppliers () { return this->supplier_admin_->_this (); } void -TAO_EC_Event_Channel_Base::destroy (void) +TAO_EC_Event_Channel_Base::destroy () { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp index d4e94f46eb7..260d8784d6f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp @@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level; -TAO_EC_Factory::TAO_EC_Factory (void) +TAO_EC_Factory::TAO_EC_Factory () { TAO_EC_debug_level = 0; } -TAO_EC_Factory::~TAO_EC_Factory (void) +TAO_EC_Factory::~TAO_EC_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index f5534a16d02..4861e5e00d6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Filter::~TAO_EC_Filter (void) +TAO_EC_Filter::~TAO_EC_Filter () { } @@ -20,19 +20,19 @@ TAO_EC_Filter::adopt_child (TAO_EC_Filter* child) } TAO_EC_Filter::ChildrenIterator -TAO_EC_Filter::begin (void) const +TAO_EC_Filter::begin () const { return 0; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Filter::end (void) const +TAO_EC_Filter::end () const { return 0; } int -TAO_EC_Filter::size (void) const +TAO_EC_Filter::size () const { return 0; } @@ -83,13 +83,13 @@ TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Null_Filter::clear (void) +TAO_EC_Null_Filter::clear () { // do nothing } CORBA::ULong -TAO_EC_Null_Filter::max_event_size (void) const +TAO_EC_Null_Filter::max_event_size () const { // @@ Is there a better way to express this? return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index 3c1c2c12db8..3a1ddc40b1f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -7,13 +7,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void) +TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder () { } // **************************************************************** -TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder (void) +TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 6f9d31798ae..145e4c8f594 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -2,12 +2,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Gateway::TAO_EC_Gateway (void) +TAO_EC_Gateway::TAO_EC_Gateway () : handle_ (0) { } -TAO_EC_Gateway::~TAO_EC_Gateway (void) +TAO_EC_Gateway::~TAO_EC_Gateway () { } @@ -18,7 +18,7 @@ TAO_EC_Gateway::observer_handle (RtecEventChannelAdmin::Observer_Handle h) } RtecEventChannelAdmin::Observer_Handle -TAO_EC_Gateway::observer_handle (void) const +TAO_EC_Gateway::observer_handle () const { return this->handle_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index d8287744bc6..8e979dfbd67 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void) +TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP () : busy_count_ (0), update_posted_ (0), cleanup_posted_ (0), @@ -48,7 +48,7 @@ TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void) } } -TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void) +TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP () { delete ec_control_; ec_control_ = 0; @@ -90,7 +90,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec } void -TAO_EC_Gateway_IIOP::close (void) +TAO_EC_Gateway_IIOP::close () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -98,7 +98,7 @@ TAO_EC_Gateway_IIOP::close (void) } void -TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_proxies () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -113,7 +113,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void) } void -TAO_EC_Gateway_IIOP::close_i (void) +TAO_EC_Gateway_IIOP::close_i () { // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); this->disconnect_consumer_proxies_i (); @@ -122,7 +122,7 @@ TAO_EC_Gateway_IIOP::close_i (void) } void -TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void) +TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i () { if (this->consumer_proxy_map_.current_size () > 0) { @@ -157,7 +157,7 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void) } void -TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void) +TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i () { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -169,7 +169,7 @@ TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void) } void -TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void) +TAO_EC_Gateway_IIOP::reconnect_consumer_ec() { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -203,7 +203,7 @@ TAO_EC_Gateway_IIOP::update_consumer ( } void -TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i () { if (this->consumer_proxy_map_.current_size () > 0) { @@ -420,7 +420,7 @@ TAO_EC_Gateway_IIOP::update_supplier ( } void -TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) +TAO_EC_Gateway_IIOP::disconnect_push_consumer () { // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier-consumer received " @@ -428,7 +428,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) } void -TAO_EC_Gateway_IIOP::disconnect_push_supplier (void) +TAO_EC_Gateway_IIOP::disconnect_push_supplier () { // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " @@ -531,7 +531,7 @@ TAO_EC_Gateway_IIOP::push_to_consumer ( } int -TAO_EC_Gateway_IIOP::shutdown (void) +TAO_EC_Gateway_IIOP::shutdown () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -566,7 +566,7 @@ TAO_EC_Gateway_IIOP::shutdown (void) } int -TAO_EC_Gateway_IIOP::cleanup_consumer_ec (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_ec () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -576,7 +576,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_ec (void) } int -TAO_EC_Gateway_IIOP::cleanup_supplier_ec (void) +TAO_EC_Gateway_IIOP::cleanup_supplier_ec () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -586,21 +586,21 @@ TAO_EC_Gateway_IIOP::cleanup_supplier_ec (void) } void -TAO_EC_Gateway_IIOP::cleanup_consumer_ec_i (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_ec_i () { this->consumer_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } void -TAO_EC_Gateway_IIOP::cleanup_supplier_ec_i (void) +TAO_EC_Gateway_IIOP::cleanup_supplier_ec_i () { this->supplier_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } CORBA::Boolean -TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i (void) const +TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i () const { return !CORBA::is_nil (this->consumer_ec_.in ()); } @@ -633,7 +633,7 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent ( } void -TAO_EC_Gateway_IIOP::suspend_supplier_ec (void) +TAO_EC_Gateway_IIOP::suspend_supplier_ec () { if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 0) { @@ -644,7 +644,7 @@ TAO_EC_Gateway_IIOP::suspend_supplier_ec (void) } void -TAO_EC_Gateway_IIOP::resume_supplier_ec (void) +TAO_EC_Gateway_IIOP::resume_supplier_ec () { if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 1) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index df33e3292f6..3a6b062ce0f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -20,13 +20,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_EC_Gateway_IIOP_Factory::init_svcs (void) +TAO_EC_Gateway_IIOP_Factory::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_EC_Gateway_IIOP_Factory); } -TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory (void) +TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory () : orbid_ (TAO_ECG_DEFAULT_IIOP_ORB_ID), consumer_ec_control_ (TAO_ECG_DEFAULT_IIOP_CONSUMEREC_CONTROL), consumer_ec_control_period_ (TAO_ECG_DEFAULT_IIOP_CONSUMEREC_CONTROL_PERIOD), @@ -36,12 +36,12 @@ TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory (void) { } -TAO_EC_Gateway_IIOP_Factory::~TAO_EC_Gateway_IIOP_Factory (void) +TAO_EC_Gateway_IIOP_Factory::~TAO_EC_Gateway_IIOP_Factory () { } int -TAO_EC_Gateway_IIOP_Factory::fini (void) +TAO_EC_Gateway_IIOP_Factory::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index 428104e1233..ca0b9b11dc1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -3,12 +3,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void) +TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched () : TAO_EC_Gateway_IIOP () { } -TAO_EC_Gateway_Sched::~TAO_EC_Gateway_Sched (void) +TAO_EC_Gateway_Sched::~TAO_EC_Gateway_Sched () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 59be08f552e..d60e247ffd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -36,7 +36,7 @@ TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *e } void -TAO_EC_Kokyu_Dispatching::activate (void) +TAO_EC_Kokyu_Dispatching::activate () { if (!lanes_setup_) setup_lanes (); @@ -47,7 +47,7 @@ TAO_EC_Kokyu_Dispatching::activate (void) } void -TAO_EC_Kokyu_Dispatching::setup_lanes (void) +TAO_EC_Kokyu_Dispatching::setup_lanes () { // Query the scheduler togetConfig_Infos RtecScheduler::Config_Info_Set_var configs; @@ -96,7 +96,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void) } void -TAO_EC_Kokyu_Dispatching::shutdown (void) +TAO_EC_Kokyu_Dispatching::shutdown () { this->dispatcher_->shutdown(); } @@ -154,19 +154,19 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, // **************************************************************** -TAO_EC_Kokyu_Shutdown_Command::~TAO_EC_Kokyu_Shutdown_Command(void) +TAO_EC_Kokyu_Shutdown_Command::~TAO_EC_Kokyu_Shutdown_Command() { } int -TAO_EC_Kokyu_Shutdown_Command::execute(void) +TAO_EC_Kokyu_Shutdown_Command::execute() { return -1; } // **************************************************************** -TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command(void) +TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command() { this->proxy_->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 34adfa62c22..815c50fe3ff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -17,12 +17,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) +TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory () { } int -TAO_EC_Kokyu_Factory::init_svcs (void) +TAO_EC_Kokyu_Factory::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_EC_Kokyu_Factory); @@ -203,7 +203,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Kokyu_Factory::fini (void) +TAO_EC_Kokyu_Factory::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp index 033b9aa4a4f..37aa366a1a4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp @@ -27,25 +27,25 @@ this->rt_info_computed_ = 1; #endif } -TAO_EC_Kokyu_Filter::~TAO_EC_Kokyu_Filter (void) +TAO_EC_Kokyu_Filter::~TAO_EC_Kokyu_Filter () { delete this->body_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Kokyu_Filter::begin (void) const +TAO_EC_Kokyu_Filter::begin () const { return this->body_->begin (); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Kokyu_Filter::end (void) const +TAO_EC_Kokyu_Filter::end () const { return this->body_->end (); } int -TAO_EC_Kokyu_Filter::size (void) const +TAO_EC_Kokyu_Filter::size () const { return this->body_->size (); } @@ -117,13 +117,13 @@ TAO_EC_Kokyu_Filter::push_nocopy (RtecEventComm::EventSet &event, } void -TAO_EC_Kokyu_Filter::clear (void) +TAO_EC_Kokyu_Filter::clear () { this->body_->clear (); } CORBA::ULong -TAO_EC_Kokyu_Filter::max_event_size (void) const +TAO_EC_Kokyu_Filter::max_event_size () const { return this->body_->max_event_size (); } @@ -225,7 +225,7 @@ TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info) } void -TAO_EC_Kokyu_Filter::init_rt_info (void) +TAO_EC_Kokyu_Filter::init_rt_info () { if (this->rt_info_computed_) return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 79c76c9860c..e8d8a5997b1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -31,7 +31,7 @@ const char* designator (long dsgn) TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void) +TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp index 0e86459dc4c..9263064b6af 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void) +TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index e75e12bb54e..e112189d97c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -22,7 +22,7 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, } void -TAO_EC_MT_Dispatching::activate (void) +TAO_EC_MT_Dispatching::activate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -49,7 +49,7 @@ TAO_EC_MT_Dispatching::activate (void) } void -TAO_EC_MT_Dispatching::shutdown (void) +TAO_EC_MT_Dispatching::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index dc550ba2fda..8b0c0053fd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -16,24 +16,24 @@ TAO_EC_Masked_Type_Filter:: { } -TAO_EC_Masked_Type_Filter::~TAO_EC_Masked_Type_Filter (void) +TAO_EC_Masked_Type_Filter::~TAO_EC_Masked_Type_Filter () { } TAO_EC_Filter::ChildrenIterator -TAO_EC_Masked_Type_Filter::begin (void) const +TAO_EC_Masked_Type_Filter::begin () const { return 0; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Masked_Type_Filter::end (void) const +TAO_EC_Masked_Type_Filter::end () const { return 0; } int -TAO_EC_Masked_Type_Filter::size (void) const +TAO_EC_Masked_Type_Filter::size () const { return 0; } @@ -87,12 +87,12 @@ TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &, } void -TAO_EC_Masked_Type_Filter::clear (void) +TAO_EC_Masked_Type_Filter::clear () { } CORBA::ULong -TAO_EC_Masked_Type_Filter::max_event_size (void) const +TAO_EC_Masked_Type_Filter::max_event_size () const { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index 41ce09ab69b..6e93808d5e5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -10,25 +10,25 @@ TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child) this->adopt_child (this->child_); } -TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter (void) +TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter () { delete this->child_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Negation_Filter::begin (void) const +TAO_EC_Negation_Filter::begin () const { return const_cast<TAO_EC_Filter**> (&this->child_); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Negation_Filter::end (void) const +TAO_EC_Negation_Filter::end () const { return const_cast<TAO_EC_Filter**> (&this->child_) + 1; } int -TAO_EC_Negation_Filter::size (void) const +TAO_EC_Negation_Filter::size () const { return 1; } @@ -74,13 +74,13 @@ TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&, } void -TAO_EC_Negation_Filter::clear (void) +TAO_EC_Negation_Filter::clear () { this->child_->clear (); } CORBA::ULong -TAO_EC_Negation_Filter::max_event_size (void) const +TAO_EC_Negation_Filter::max_event_size () const { return this->child_->max_event_size (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 71411aa2818..3ec46436444 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -21,11 +21,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Null_Factory::TAO_EC_Null_Factory (void) +TAO_EC_Null_Factory::TAO_EC_Null_Factory () { } -TAO_EC_Null_Factory::~TAO_EC_Null_Factory (void) +TAO_EC_Null_Factory::~TAO_EC_Null_Factory () { } @@ -189,7 +189,7 @@ TAO_EC_Null_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSup } ACE_Lock* -TAO_EC_Null_Factory::create_consumer_lock (void) +TAO_EC_Null_Factory::create_consumer_lock () { return new ACE_Lock_Adapter<ACE_Null_Mutex> (); } @@ -201,7 +201,7 @@ TAO_EC_Null_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_Null_Factory::create_supplier_lock (void) +TAO_EC_Null_Factory::create_supplier_lock () { return new ACE_Lock_Adapter<ACE_Null_Mutex> (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 973ecaf9ba7..33e4df630d4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) +TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy () { } @@ -57,7 +57,7 @@ TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*) // **************************************************************** -TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) +TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy () { delete this->lock_; this->lock_ = 0; @@ -262,7 +262,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( // **************************************************************** -TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy (void) +TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index bc9d38bc388..aeecbe8e85c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -26,7 +26,7 @@ TAO_EC_Per_Supplier_Filter:: this->event_channel_->create_proxy_collection (this->collection_); } -TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void) +TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter () { this->event_channel_->destroy_proxy_collection (this->collection_); this->collection_ = 0; @@ -135,7 +135,7 @@ TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier) } void -TAO_EC_Per_Supplier_Filter::shutdown (void) +TAO_EC_Per_Supplier_Filter::shutdown () { this->collection_->shutdown (); } @@ -160,7 +160,7 @@ TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event } CORBA::ULong -TAO_EC_Per_Supplier_Filter::_incr_refcnt (void) +TAO_EC_Per_Supplier_Filter::_incr_refcnt () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -169,7 +169,7 @@ TAO_EC_Per_Supplier_Filter::_incr_refcnt (void) } CORBA::ULong -TAO_EC_Per_Supplier_Filter::_decr_refcnt (void) +TAO_EC_Per_Supplier_Filter::_decr_refcnt () { { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 855a58e620a..90af063fa1b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void) +TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 5f5eb1383f6..1908203fd0b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -22,7 +22,7 @@ TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_B } void -TAO_EC_Priority_Dispatching::activate (void) +TAO_EC_Priority_Dispatching::activate () { if (this->tasks_ != 0) return; @@ -83,7 +83,7 @@ TAO_EC_Priority_Dispatching::activate (void) } void -TAO_EC_Priority_Dispatching::shutdown (void) +TAO_EC_Priority_Dispatching::shutdown () { if (this->tasks_ == 0) return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 750d6dd82dd..7f8bae66487 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void) +TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 9ca4c7a410a..51ffb0ffd78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -29,7 +29,7 @@ TAO_EC_ProxyPushConsumer:: this->qos_.is_gateway = false; } -TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void) +TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer () { this->event_channel_->destroy_consumer_lock (this->lock_); this->cleanup_i (); @@ -121,12 +121,12 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*) } void -TAO_EC_ProxyPushConsumer::shutdown_hook (void) +TAO_EC_ProxyPushConsumer::shutdown_hook () { } void -TAO_EC_ProxyPushConsumer::shutdown (void) +TAO_EC_ProxyPushConsumer::shutdown () { RtecEventComm::PushSupplier_var supplier; @@ -165,7 +165,7 @@ TAO_EC_ProxyPushConsumer::shutdown (void) } void -TAO_EC_ProxyPushConsumer::cleanup_i (void) +TAO_EC_ProxyPushConsumer::cleanup_i () { this->supplier_ = RtecEventComm::PushSupplier::_nil (); @@ -180,7 +180,7 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void) } void -TAO_EC_ProxyPushConsumer::deactivate (void) +TAO_EC_ProxyPushConsumer::deactivate () { try { @@ -198,21 +198,21 @@ TAO_EC_ProxyPushConsumer::deactivate (void) } CORBA::ULong -TAO_EC_ProxyPushConsumer::_incr_refcnt (void) +TAO_EC_ProxyPushConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->ec_refcount_++; } void -TAO_EC_ProxyPushConsumer::refcount_zero_hook (void) +TAO_EC_ProxyPushConsumer::refcount_zero_hook () { // Use the event channel this->event_channel_->destroy_proxy (this); } CORBA::ULong -TAO_EC_ProxyPushConsumer::_decr_refcnt (void) +TAO_EC_ProxyPushConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -257,7 +257,7 @@ TAO_EC_ProxyPushConsumer_Guard:: } TAO_EC_ProxyPushConsumer_Guard:: - ~TAO_EC_ProxyPushConsumer_Guard (void) + ~TAO_EC_ProxyPushConsumer_Guard () { // This access is safe because guard objects are created on the // stack, only one thread has access to them diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 23d9a366eb9..5521a7b996e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -35,7 +35,7 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* e this->qos_.is_gateway = false; } -TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void) +TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier () { this->event_channel_->destroy_supplier_lock (this->lock_); this->cleanup_i (); @@ -80,7 +80,7 @@ TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*) } void -TAO_EC_ProxyPushSupplier::shutdown (void) +TAO_EC_ProxyPushSupplier::shutdown () { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -116,7 +116,7 @@ TAO_EC_ProxyPushSupplier::shutdown (void) } void -TAO_EC_ProxyPushSupplier::cleanup_i (void) +TAO_EC_ProxyPushSupplier::cleanup_i () { this->consumer_ = RtecEventComm::PushConsumer::_nil (); @@ -128,7 +128,7 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void) } void -TAO_EC_ProxyPushSupplier::deactivate (void) throw () +TAO_EC_ProxyPushSupplier::deactivate () throw () { try { @@ -145,21 +145,21 @@ TAO_EC_ProxyPushSupplier::deactivate (void) throw () } CORBA::ULong -TAO_EC_ProxyPushSupplier::_incr_refcnt (void) +TAO_EC_ProxyPushSupplier::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } void -TAO_EC_ProxyPushSupplier::refcount_zero_hook (void) +TAO_EC_ProxyPushSupplier::refcount_zero_hook () { // Use the event channel this->event_channel_->destroy_proxy (this); } CORBA::ULong -TAO_EC_ProxyPushSupplier::_decr_refcnt (void) +TAO_EC_ProxyPushSupplier::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -430,7 +430,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent ( } void -TAO_EC_ProxyPushSupplier::clear (void) +TAO_EC_ProxyPushSupplier::clear () { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); @@ -438,7 +438,7 @@ TAO_EC_ProxyPushSupplier::clear (void) } CORBA::ULong -TAO_EC_ProxyPushSupplier::max_event_size (void) const +TAO_EC_ProxyPushSupplier::max_event_size () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index cb057292fc2..07ecf59d97c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -19,13 +19,13 @@ TAO_EC_RTCORBA_Dispatching:: this->tasks_[i].thr_mgr (&this->thread_manager_); } -TAO_EC_RTCORBA_Dispatching::~TAO_EC_RTCORBA_Dispatching (void) +TAO_EC_RTCORBA_Dispatching::~TAO_EC_RTCORBA_Dispatching () { delete[] this->tasks_; } void -TAO_EC_RTCORBA_Dispatching::activate (void) +TAO_EC_RTCORBA_Dispatching::activate () { for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i) { @@ -48,7 +48,7 @@ TAO_EC_RTCORBA_Dispatching::activate (void) } void -TAO_EC_RTCORBA_Dispatching::shutdown (void) +TAO_EC_RTCORBA_Dispatching::shutdown () { for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 01d6063199d..8c0d8d3723a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -15,7 +15,7 @@ TAO_EC_RTCORBA_Factory:: { } -TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void) +TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory () { } @@ -27,7 +27,7 @@ TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_RTCORBA_Factory::fini (void) +TAO_EC_RTCORBA_Factory::fini () { return this->body_->fini (); } @@ -212,7 +212,7 @@ TAO_EC_RTCORBA_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPush } ACE_Lock* -TAO_EC_RTCORBA_Factory::create_consumer_lock (void) +TAO_EC_RTCORBA_Factory::create_consumer_lock () { return this->body_->create_consumer_lock (); } @@ -224,7 +224,7 @@ TAO_EC_RTCORBA_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_RTCORBA_Factory::create_supplier_lock (void) +TAO_EC_RTCORBA_Factory::create_supplier_lock () { return this->body_->create_supplier_lock (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index e23bf2bc0fa..165818a0cc0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -35,7 +35,7 @@ TAO_EC_Reactive_ConsumerControl:: this->orb_->orb_core ()->reactor (); } -TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void) +TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl () { } @@ -88,7 +88,7 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout ( } int -TAO_EC_Reactive_ConsumerControl::activate (void) +TAO_EC_Reactive_ConsumerControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -134,7 +134,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void) } int -TAO_EC_Reactive_ConsumerControl::shutdown (void) +TAO_EC_Reactive_ConsumerControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index f9011dc1df8..1a2dee5f5d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -5,18 +5,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void) +TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching () : TAO_EC_Dispatching () { } void -TAO_EC_Reactive_Dispatching::activate (void) +TAO_EC_Reactive_Dispatching::activate () { } void -TAO_EC_Reactive_Dispatching::shutdown (void) +TAO_EC_Reactive_Dispatching::shutdown () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 070edd73045..0e05a2902ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -35,7 +35,7 @@ TAO_EC_Reactive_SupplierControl:: this->orb_->orb_core ()->reactor (); } -TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void) +TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl () { } @@ -80,7 +80,7 @@ TAO_EC_Reactive_SupplierControl::handle_timeout ( } int -TAO_EC_Reactive_SupplierControl::activate (void) +TAO_EC_Reactive_SupplierControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -127,7 +127,7 @@ TAO_EC_Reactive_SupplierControl::activate (void) } int -TAO_EC_Reactive_SupplierControl::shutdown (void) +TAO_EC_Reactive_SupplierControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index 19acc6826e1..9fcc4d159ba 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -9,17 +9,17 @@ TAO_EC_Reactive_Timeout_Generator:: { } -TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator (void) +TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator () { } void -TAO_EC_Reactive_Timeout_Generator::activate (void) +TAO_EC_Reactive_Timeout_Generator::activate () { } void -TAO_EC_Reactive_Timeout_Generator::shutdown (void) +TAO_EC_Reactive_Timeout_Generator::shutdown () { this->reactor_->cancel_timer (&this->event_handler_); this->event_handler_.reactor (0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 56c9af969ee..edc5a380c27 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void) +TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory () { } @@ -162,7 +162,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Sched_Factory::fini (void) +TAO_EC_Sched_Factory::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index d85da896b8f..99a0693f1f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -27,25 +27,25 @@ TAO_EC_Sched_Filter:: this->adopt_child (this->body_); } -TAO_EC_Sched_Filter::~TAO_EC_Sched_Filter (void) +TAO_EC_Sched_Filter::~TAO_EC_Sched_Filter () { delete this->body_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Sched_Filter::begin (void) const +TAO_EC_Sched_Filter::begin () const { return this->body_->begin (); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Sched_Filter::end (void) const +TAO_EC_Sched_Filter::end () const { return this->body_->end (); } int -TAO_EC_Sched_Filter::size (void) const +TAO_EC_Sched_Filter::size () const { return this->body_->size (); } @@ -117,13 +117,13 @@ TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event, } void -TAO_EC_Sched_Filter::clear (void) +TAO_EC_Sched_Filter::clear () { this->body_->clear (); } CORBA::ULong -TAO_EC_Sched_Filter::max_event_size (void) const +TAO_EC_Sched_Filter::max_event_size () const { return this->body_->max_event_size (); } @@ -172,7 +172,7 @@ TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info) } void -TAO_EC_Sched_Filter::init_rt_info (void) +TAO_EC_Sched_Filter::init_rt_info () { if (this->rt_info_computed_) return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 6db96184ed2..3df2fa9f386 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void) +TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index 88ca6abf682..ea13e8047b4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void) +TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 7ed8c79aad1..e31589276a4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -17,18 +17,18 @@ TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec) this->event_channel_->supplier_poa (); } -TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void) +TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin () { } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_SupplierAdmin::obtain_push_consumer (void) +TAO_EC_SupplierAdmin::obtain_push_consumer () { return this->obtain (); } PortableServer::POA_ptr -TAO_EC_SupplierAdmin::_default_POA (void) +TAO_EC_SupplierAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index a24ce675bb2..5519b5b9022 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -4,22 +4,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_SupplierControl::TAO_EC_SupplierControl (void) +TAO_EC_SupplierControl::TAO_EC_SupplierControl () { } -TAO_EC_SupplierControl::~TAO_EC_SupplierControl (void) +TAO_EC_SupplierControl::~TAO_EC_SupplierControl () { } int -TAO_EC_SupplierControl::activate (void) +TAO_EC_SupplierControl::activate () { return 0; } int -TAO_EC_SupplierControl::shutdown (void) +TAO_EC_SupplierControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 3534ca66a7c..46ea1b4e70e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) +TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index 02b830ff850..446058b3f45 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void) +TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index d932bb3c9ac..6d0ab6519a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -119,12 +119,12 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume } void -TAO_EC_TPC_Dispatching::activate (void) +TAO_EC_TPC_Dispatching::activate () { } void -TAO_EC_TPC_Dispatching::shutdown (void) +TAO_EC_TPC_Dispatching::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index d4904b5a195..52af0795fc3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -17,17 +17,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL unsigned long TAO_EC_TPC_debug_level; -TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void) +TAO_EC_TPC_Factory::TAO_EC_TPC_Factory () { TAO_EC_TPC_debug_level = 0; } -TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory (void) +TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory () { } int -TAO_EC_TPC_Factory::init_svcs (void) +TAO_EC_TPC_Factory::init_svcs () { TAO_EC_Simple_Queue_Full_Action::init_svcs(); return ACE_Service_Config::static_svcs ()-> diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index 0b60d49d1cf..d781c1702e2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -13,7 +13,7 @@ TAO_EC_TPC_ProxyPushConsumer::TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel } TAO_EC_TPC_Dispatching* -TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching (void) +TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching () { TAO_EC_Dispatching* dispatcher = this->event_channel_->dispatching (); TAO_EC_TPC_Dispatching* tpcdispatcher = @@ -21,7 +21,7 @@ TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching (void) return tpcdispatcher; } -TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void) +TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer () { // @@@ Do I need to call the logic to remove the consumer from the // dispatch map in here? I'm not sure... But, if I do, then I need @@ -32,7 +32,7 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void) } void -TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (void) +TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer () { RtecEventComm::PushConsumer_var emulated_exceptions_suck = this->_this (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index a45da4bd065..6438de63fbf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -12,12 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL extern unsigned long TAO_EC_TPC_debug_level; -TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void) +TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier () { } void -TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) +TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier () { if (TAO_EC_TPC_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): consumer=%@\n", diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index dde8279502e..15cca030176 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -55,7 +55,7 @@ TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( // this->id_)); } -TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void) +TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter () { this->event_channel_->timeout_generator ()->cancel_timer (this->qos_info_, this->id_); @@ -111,7 +111,7 @@ TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&, } void -TAO_EC_Timeout_Filter::clear (void) +TAO_EC_Timeout_Filter::clear () { if (this->type_ == ACE_ES_EVENT_DEADLINE_TIMEOUT) { @@ -133,7 +133,7 @@ TAO_EC_Timeout_Filter::clear (void) } CORBA::ULong -TAO_EC_Timeout_Filter::max_event_size (void) const +TAO_EC_Timeout_Filter::max_event_size () const { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 60278f39599..e315214c6d1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void) +TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 7dea70568b6..1ec13c1e230 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -44,7 +44,7 @@ TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*) } void -TAO_EC_Trivial_Supplier_Filter::shutdown (void) +TAO_EC_Trivial_Supplier_Filter::shutdown () { } @@ -68,13 +68,13 @@ TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &e } CORBA::ULong -TAO_EC_Trivial_Supplier_Filter::_incr_refcnt (void) +TAO_EC_Trivial_Supplier_Filter::_incr_refcnt () { return 1; } CORBA::ULong -TAO_EC_Trivial_Supplier_Filter::_decr_refcnt (void) +TAO_EC_Trivial_Supplier_Filter::_decr_refcnt () { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 77bcb2af011..66ff295aa4f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -56,12 +56,12 @@ TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Type_Filter::clear (void) +TAO_EC_Type_Filter::clear () { } CORBA::ULong -TAO_EC_Type_Filter::max_event_size (void) const +TAO_EC_Type_Filter::max_event_size () const { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 5068fd0edfc..553fdfb6c63 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -8,7 +8,7 @@ TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port) { } -TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void) +TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer () { } diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index aaee3390c4a..3768edc213e 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -25,7 +25,7 @@ ACE_ConsumerQOS_Factory:: qos_.dependencies.length (0); } -ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void) +ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory () { } @@ -72,7 +72,7 @@ ACE_ConsumerQOS_Factory::start_logical_and_group (int nchildren) } int -ACE_ConsumerQOS_Factory::start_negation (void) +ACE_ConsumerQOS_Factory::start_negation () { int l = qos_.dependencies.length (); qos_.dependencies.length (l + 1); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index c0e3ab94736..f3203343855 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -15,13 +15,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TimeBase::TimeT -TAO_FT_Request_Duration_Policy::request_duration_policy_value (void) +TAO_FT_Request_Duration_Policy::request_duration_policy_value () { return this->request_duration_; } CORBA::PolicyType -TAO_FT_Request_Duration_Policy::policy_type (void) +TAO_FT_Request_Duration_Policy::policy_type () { return FT::REQUEST_DURATION_POLICY; } @@ -43,7 +43,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val) } TAO_FT_Request_Duration_Policy * -TAO_FT_Request_Duration_Policy::clone (void) const +TAO_FT_Request_Duration_Policy::clone () const { TAO_FT_Request_Duration_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -53,7 +53,7 @@ TAO_FT_Request_Duration_Policy::clone (void) const } CORBA::Policy_ptr -TAO_FT_Request_Duration_Policy::copy (void) +TAO_FT_Request_Duration_Policy::copy () { TAO_FT_Request_Duration_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), @@ -64,7 +64,7 @@ TAO_FT_Request_Duration_Policy::copy (void) } void -TAO_FT_Request_Duration_Policy::destroy (void) +TAO_FT_Request_Duration_Policy::destroy () { } @@ -89,7 +89,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) /*****************************************************************/ FT::HeartbeatPolicyValue -TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void) +TAO_FT_Heart_Beat_Policy::heartbeat_policy_value () { FT::HeartbeatPolicyValue val; val.heartbeat = this->heartbeat_; @@ -120,14 +120,14 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val) CORBA::PolicyType -TAO_FT_Heart_Beat_Policy::policy_type (void) +TAO_FT_Heart_Beat_Policy::policy_type () { return FT::HEARTBEAT_POLICY; } CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::copy (void) +TAO_FT_Heart_Beat_Policy::copy () { TAO_FT_Heart_Beat_Policy * tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), @@ -138,7 +138,7 @@ TAO_FT_Heart_Beat_Policy::copy (void) } TAO_FT_Heart_Beat_Policy * -TAO_FT_Heart_Beat_Policy::clone (void) const +TAO_FT_Heart_Beat_Policy::clone () const { TAO_FT_Heart_Beat_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -148,7 +148,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const } void -TAO_FT_Heart_Beat_Policy::destroy (void) +TAO_FT_Heart_Beat_Policy::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index dda812b88b0..51faf3010a7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void) + FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor () : name_ ("TAO_FT_ClientRequest_Interceptor") , uuid_ (0) , lock_ (0) @@ -36,20 +36,20 @@ namespace TAO } - FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor (void) + FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor () { delete this->uuid_; delete this->lock_; } char * - FT_ClientRequest_Interceptor::name (void) + FT_ClientRequest_Interceptor::name () { return CORBA::string_dup (this->name_); } void - FT_ClientRequest_Interceptor::destroy (void) + FT_ClientRequest_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index 11844309254..51ec9ccd7ea 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -10,11 +10,11 @@ static bool initialized = false; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate (void) +TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate () { } -TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate (void) +TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate () { } @@ -35,7 +35,7 @@ TAO_FT_ClientService_Activate::activate_services (TAO_ORB_Core *orb_core) int -TAO_FT_ClientService_Activate::Initializer (void) +TAO_FT_ClientService_Activate::Initializer () { if (initialized == false) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index 10f9aa9c141..dc4a86e8883 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void) +TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory () : ft_endpoint_selector_ (0) { } -TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void) +TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory () { delete this->ft_endpoint_selector_; } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 638686d0048..9bd5d50ffe9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -12,12 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void) +TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector () : TAO_Default_Endpoint_Selector () { } -TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void) +TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 75e3b09891d..195f5c2bdce 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -38,14 +38,14 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val) } CORBA::PolicyType -TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void) +TAO_FT_Heart_Beat_Enabled_Policy::policy_type () { return FT::HEARTBEAT_ENABLED_POLICY; } CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::copy (void) +TAO_FT_Heart_Beat_Enabled_Policy::copy () { TAO_FT_Heart_Beat_Enabled_Policy * tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this), @@ -56,7 +56,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (void) } TAO_FT_Heart_Beat_Enabled_Policy * -TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const +TAO_FT_Heart_Beat_Enabled_Policy::clone () const { TAO_FT_Heart_Beat_Enabled_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -66,7 +66,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const } void -TAO_FT_Heart_Beat_Enabled_Policy::destroy (void) +TAO_FT_Heart_Beat_Enabled_Policy::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 85e8eabfff0..4b62b30cb21 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void) + FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor () : object_group_ref_version_ (0) , is_primary_ (false) , iogr_ (0) @@ -20,18 +20,18 @@ namespace TAO { } - FT_ServerRequest_Interceptor::~FT_ServerRequest_Interceptor (void) + FT_ServerRequest_Interceptor::~FT_ServerRequest_Interceptor () { } char * - FT_ServerRequest_Interceptor::name (void) + FT_ServerRequest_Interceptor::name () { return CORBA::string_dup ("TAO_FT_ServerRequest_Interceptor"); } void - FT_ServerRequest_Interceptor::destroy (void) + FT_ServerRequest_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index e48abf59844..06b3cd218b0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp @@ -9,16 +9,16 @@ static bool initialized = false; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate (void) +TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate () { } -TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void) +TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate () { } int -TAO_FT_ServerService_Activate::Initializer (void) +TAO_FT_ServerService_Activate::Initializer () { if (initialized == false) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index e4ab0334684..2e87871cfb0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -19,7 +19,7 @@ TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *) { } -TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void) +TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks () { } @@ -325,7 +325,7 @@ TAO_FT_Service_Callbacks::restart_policy_check ( } TimeBase::TimeT -TAO_FT_Service_Callbacks::now (void) +TAO_FT_Service_Callbacks::now () { // Grab the localtime on the machine where this is running ACE_Time_Value time_val = ACE_OS::gettimeofday (); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 2437068b3eb..0049477f82a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -18,18 +18,18 @@ FTRT_ClientORB_Interceptor (CORBA::Long transaction_depth) { } -FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void) +FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor () { } char * -FTRT_ClientORB_Interceptor::name (void) +FTRT_ClientORB_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -FTRT_ClientORB_Interceptor::destroy (void) +FTRT_ClientORB_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index 0e9e8568433..19d68d23691 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -10,11 +10,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRT { - FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void) + FTRT_ClientORB_Loader::FTRT_ClientORB_Loader () { } - FTRT_ClientORB_Loader::~FTRT_ClientORB_Loader (void) + FTRT_ClientORB_Loader::~FTRT_ClientORB_Loader () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 80a00b4b270..9d2b52cebc4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -24,17 +24,17 @@ AMI_Primary_Replication_Strategy::~AMI_Primary_Replication_Strategy() this->wait(); } -int AMI_Primary_Replication_Strategy::acquire_read (void) +int AMI_Primary_Replication_Strategy::acquire_read () { return mutex_ ? mutex_->acquire_read() : 0; } -int AMI_Primary_Replication_Strategy::acquire_write (void) +int AMI_Primary_Replication_Strategy::acquire_write () { return mutex_ ? mutex_->acquire_write() : 0; } -int AMI_Primary_Replication_Strategy::release (void) +int AMI_Primary_Replication_Strategy::release () { return mutex_ ? mutex_->release() : 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp index 8a8416ab398..3f2876fd821 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -44,17 +44,17 @@ AMI_Replication_Strategy::make_primary_strategy() return 0; } -int AMI_Replication_Strategy::acquire_read (void) +int AMI_Replication_Strategy::acquire_read () { return 0; } -int AMI_Replication_Strategy::acquire_write (void) +int AMI_Replication_Strategy::acquire_write () { return 0; } -int AMI_Replication_Strategy::release (void) +int AMI_Replication_Strategy::release () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 4c9a470ec4c..7c8551d649b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -21,7 +21,7 @@ Basic_Replication_Strategy::~Basic_Replication_Strategy() } void -Basic_Replication_Strategy::check_validity(void) +Basic_Replication_Strategy::check_validity() { FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(); @@ -118,17 +118,17 @@ Basic_Replication_Strategy::add_member(const FTRT::ManagerInfo & info, } while (!finished); } -int Basic_Replication_Strategy::acquire_read (void) +int Basic_Replication_Strategy::acquire_read () { return mutex_ ? mutex_->acquire_read() : 0; } -int Basic_Replication_Strategy::acquire_write (void) +int Basic_Replication_Strategy::acquire_write () { return mutex_ ? mutex_->acquire_write() : 0; } -int Basic_Replication_Strategy::release (void) +int Basic_Replication_Strategy::release () { return mutex_ ? mutex_->release() : 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index 2fe7edd1eaa..d41ed665aed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -17,12 +17,12 @@ TAO_FTEC_ConsumerAdmin::TAO_FTEC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) { } -TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void) +TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin () { } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void) +TAO_FTEC_ConsumerAdmin::obtain_push_supplier () { ORBSVCS_DEBUG((LM_DEBUG,"obtain_push_supplier\n" )); return obtain_proxy(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 3ed1b7628f0..a0d88dd93f7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -148,13 +148,13 @@ void TAO_FTEC_Event_Channel::oneway_set_update ( RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_FTEC_Event_Channel::for_consumers (void) +TAO_FTEC_Event_Channel::for_consumers () { return ec_impl_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_FTEC_Event_Channel::for_suppliers (void) +TAO_FTEC_Event_Channel::for_suppliers () { return ec_impl_->for_suppliers(); } @@ -168,7 +168,7 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s) } void -TAO_FTEC_Event_Channel::destroy (void) +TAO_FTEC_Event_Channel::destroy () { if (Fault_Detector::instance()) Fault_Detector::instance()->stop(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 66f7793c896..1a346c32385 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -226,7 +226,7 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( /// The default implementation is: /// this->consumer_admin ()->_this (); RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_FTEC_Event_Channel_Impl::for_consumers (void) +TAO_FTEC_Event_Channel_Impl::for_consumers () { CORBA::Object_var obj = consumer_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -237,7 +237,7 @@ TAO_FTEC_Event_Channel_Impl::for_consumers (void) /// The default implementation is: /// this->supplier_admin ()->_this (); RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_FTEC_Event_Channel_Impl::for_suppliers (void) +TAO_FTEC_Event_Channel_Impl::for_suppliers () { CORBA::Object_var obj = supplier_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -419,14 +419,14 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s) } -TAO_FTEC_ConsumerAdmin* TAO_FTEC_Event_Channel_Impl::consumer_admin (void) const +TAO_FTEC_ConsumerAdmin* TAO_FTEC_Event_Channel_Impl::consumer_admin () const { return static_cast<TAO_FTEC_ConsumerAdmin*> (TAO_EC_Event_Channel_Base::consumer_admin()); } /// Access the supplier admin implementation, useful for controlling /// the activation... -TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin (void) const +TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin () const { return static_cast<TAO_FTEC_SupplierAdmin*> (TAO_EC_Event_Channel_Base::supplier_admin()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index 6056a120fe9..90d4d1f2071 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void) +TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 6701e3ad7cd..62577d767b0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -68,7 +68,7 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( } } -void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void) +void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer () { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index 34b5848c15b..c962ed0542a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -70,7 +70,7 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( } -void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) +void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier () { if (Request_Context_Repository().is_executed_request()) return; @@ -88,7 +88,7 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) } -void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) +void TAO_FTEC_ProxyPushSupplier::suspend_connection () { if (Request_Context_Repository().is_executed_request()) return; @@ -113,7 +113,7 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) } } -void TAO_FTEC_ProxyPushSupplier::resume_connection (void) +void TAO_FTEC_ProxyPushSupplier::resume_connection () { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index 0240e85014c..f8a274de7fb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -21,7 +21,7 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin() RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_FTEC_SupplierAdmin::obtain_push_consumer (void) +TAO_FTEC_SupplierAdmin::obtain_push_consumer () { return obtain_proxy(); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index e8f4ae86d5f..5ee21412e22 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -26,14 +26,14 @@ FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid) const FtRtecEventComm::ObjectId& -FT_ProxyAdmin_Base::object_id(void) const +FT_ProxyAdmin_Base::object_id() const { return object_id_; } CORBA::Object_var -FT_ProxyAdmin_Base::reference(void) const +FT_ProxyAdmin_Base::reference() const { return poa_->servant_to_reference(servant_); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index 8f04f5d83be..909cc006159 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -11,7 +11,7 @@ Fault_Detector::ReactorTask::ReactorTask() } int -Fault_Detector::ReactorTask::svc (void) +Fault_Detector::ReactorTask::svc () { this->reactor_.owner(ACE_OS::thr_self()); this->reactor_.run_reactor_event_loop(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp index 7485754612d..8cddd9bcb50 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -18,11 +18,11 @@ namespace FTRTEC { ACE_SOCK_Connector, ConnectionDetectHandler<ACE_SOCK_STREAM> > TCP_Fault_Detector; - Fault_Detector_Loader::Fault_Detector_Loader (void) + Fault_Detector_Loader::Fault_Detector_Loader () { } - Fault_Detector_Loader::~Fault_Detector_Loader (void) + Fault_Detector_Loader::~Fault_Detector_Loader () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 788a65217af..7a7ea02de09 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -67,12 +67,12 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor() { } -char * ForwardCtrlServerInterceptor::name (void) +char * ForwardCtrlServerInterceptor::name () { return CORBA::string_dup("ForwardCtrlServerInterceptor"); } -void ForwardCtrlServerInterceptor::destroy (void) +void ForwardCtrlServerInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 8796c03aca0..aa5763720eb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -180,13 +180,13 @@ FtEventServiceInterceptor::instance() } char * -FtEventServiceInterceptor::name (void) +FtEventServiceInterceptor::name () { return CORBA::string_dup ("FtEventServiceInterceptor"); } void -FtEventServiceInterceptor::destroy (void) +FtEventServiceInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index 97c83c66083..715f06ede3b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -21,7 +21,7 @@ ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *) { } -void ObjectGroupManagerHandler::create_group (void) +void ObjectGroupManagerHandler::create_group () { } @@ -32,7 +32,7 @@ ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *) } void -ObjectGroupManagerHandler::add_member (void) +ObjectGroupManagerHandler::add_member () { if (--num_backups_ ==0) evt_.signal(); @@ -45,7 +45,7 @@ ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *) } void -ObjectGroupManagerHandler::set_state (void) +ObjectGroupManagerHandler::set_state () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 9f43f278154..a48415d4563 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -108,7 +108,7 @@ namespace FTRTEC } } - void Replication_Service::check_validity(void) + void Replication_Service::check_validity() { replication_strategy->check_validity(); } @@ -152,21 +152,21 @@ namespace FTRTEC replication_strategy->add_member(info, object_group_ref_version); } - int Replication_Service::acquire_read (void) + int Replication_Service::acquire_read () { int r = replication_strategy->acquire_read(); TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r); return r; } - int Replication_Service::acquire_write (void) + int Replication_Service::acquire_write () { int r= replication_strategy->acquire_write(); TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r); return r; } - int Replication_Service::release (void) + int Replication_Service::release () { int r= replication_strategy->release(); TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index f6c0611358a..c6879652d91 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -14,7 +14,7 @@ Replication_Strategy::~Replication_Strategy() void -Replication_Strategy::check_validity(void) +Replication_Strategy::check_validity() { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index 29abc223232..f146aa999f0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -80,7 +80,7 @@ get_object_id(CORBA::Any_var a) FtRtecEventChannelAdmin::ObjectId_var -Request_Context_Repository::get_object_id(void) +Request_Context_Repository::get_object_id() { /* PortableInterceptor::Current_var pic = @@ -117,7 +117,7 @@ Request_Context_Repository::set_cached_result( } CORBA::Any_ptr -Request_Context_Repository::get_cached_result(void) +Request_Context_Repository::get_cached_result() { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent"); @@ -167,7 +167,7 @@ Request_Context_Repository::set_sequence_number( FTRT::SequenceNumber -Request_Context_Repository::get_sequence_number(void) +Request_Context_Repository::get_sequence_number() { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent"); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 908c7de402c..9866af127a9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -12,18 +12,18 @@ TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor () { } -TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void) +TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor () { } char * -TAO_Set_Update_Interceptor::name (void) +TAO_Set_Update_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -TAO_Set_Update_Interceptor::destroy (void) +TAO_Set_Update_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 80a774bfcd4..c2d71044d19 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -21,7 +21,7 @@ public: ~FTEC_Gateway_ConsumerAdmin(); // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void); + obtain_push_supplier (); FTEC_Gateway_Impl* impl_; }; @@ -33,7 +33,7 @@ public: ~FTEC_Gateway_SupplierAdmin(); // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void); + obtain_push_consumer (); FTEC_Gateway_Impl* impl_; }; @@ -47,9 +47,9 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos); - virtual void disconnect_push_supplier (void); - virtual void suspend_connection (void); - virtual void resume_connection (void); + virtual void disconnect_push_supplier (); + virtual void suspend_connection (); + virtual void resume_connection (); FTEC_Gateway_Impl* impl_; }; @@ -65,7 +65,7 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); FTEC_Gateway_Impl* impl_; }; @@ -75,7 +75,7 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler public: PushConsumerHandler(); ~PushConsumerHandler(); - virtual void push (void); + virtual void push (); virtual void push_excep (::Messaging::ExceptionHolder * excep_holder); }; @@ -91,7 +91,7 @@ public: } private: Interceptor_Destoryer(); - inline void do_it(void) { + inline void do_it() { destroy_interceptors(); }; }; @@ -210,19 +210,19 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa) //= The RtecEventChannelAdmin::EventChannel methods RtecEventChannelAdmin::ConsumerAdmin_ptr -FTEC_Gateway::for_consumers (void) +FTEC_Gateway::for_consumers () { return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in()); } RtecEventChannelAdmin::SupplierAdmin_ptr -FTEC_Gateway::for_suppliers (void) +FTEC_Gateway::for_suppliers () { ORBSVCS_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n")); return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in()); } -void FTEC_Gateway::destroy (void) +void FTEC_Gateway::destroy () { impl_->ftec->destroy(); } @@ -262,7 +262,7 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin() } RtecEventChannelAdmin::ProxyPushSupplier_ptr -FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void) +FTEC_Gateway_ConsumerAdmin::obtain_push_supplier () { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; @@ -292,7 +292,7 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin() // = The RtecEventChannelAdmin::SupplierAdmin methods... RtecEventChannelAdmin::ProxyPushConsumer_ptr -FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void) +FTEC_Gateway_SupplierAdmin::obtain_push_consumer () { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY()); @@ -347,7 +347,7 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos); } -void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) +void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_supplier(**oid_ptr); @@ -355,13 +355,13 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) delete oid_ptr; } -void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void) +void FTEC_Gateway_ProxyPushSupplier::suspend_connection () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->suspend_push_supplier(**oid_ptr); } -void FTEC_Gateway_ProxyPushSupplier::resume_connection (void) +void FTEC_Gateway_ProxyPushSupplier::resume_connection () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->resume_push_supplier(**oid_ptr); @@ -405,7 +405,7 @@ void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier ( *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos); } -void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void) +void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_consumer(**oid_ptr); @@ -421,7 +421,7 @@ PushConsumerHandler::~PushConsumerHandler() { } -void PushConsumerHandler::push (void) +void PushConsumerHandler::push () { } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index bf379827c0a..278cae08786 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -40,7 +40,7 @@ TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env, { } -TAO::HTIOP::Acceptor::~Acceptor (void) +TAO::HTIOP::Acceptor::~Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -246,7 +246,7 @@ TAO::HTIOP::Acceptor::is_collocated (const TAO_Endpoint *endpoint) } int -TAO::HTIOP::Acceptor::close (void) +TAO::HTIOP::Acceptor::close () { return this->base_acceptor_.close (); } @@ -743,7 +743,7 @@ TAO::HTIOP::Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) } CORBA::ULong -TAO::HTIOP::Acceptor::endpoint_count (void) +TAO::HTIOP::Acceptor::endpoint_count () { return this->endpoint_count_; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index ff8a07a0be6..b5e35eedf77 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -44,7 +44,7 @@ TAO::HTIOP::Completion_Handler::Completion_Handler (TAO_ORB_Core *orb_core, } -TAO::HTIOP::Completion_Handler::~Completion_Handler (void) +TAO::HTIOP::Completion_Handler::~Completion_Handler () { delete this->creation_strategy_; delete this->concurrency_strategy_; @@ -66,7 +66,7 @@ TAO::HTIOP::Completion_Handler::open (void*) } int -TAO::HTIOP::Completion_Handler::resume_handler (void) +TAO::HTIOP::Completion_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 1917da10b24..de51d760b7e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -47,7 +47,7 @@ TAO::HTIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core) this->transport (specific_transport); } -TAO::HTIOP::Connection_Handler::~Connection_Handler (void) +TAO::HTIOP::Connection_Handler::~Connection_Handler () { delete this->transport (); int const result = @@ -141,13 +141,13 @@ TAO::HTIOP::Connection_Handler::open (void*) } int -TAO::HTIOP::Connection_Handler::resume_handler (void) +TAO::HTIOP::Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO::HTIOP::Connection_Handler::close_connection (void) +TAO::HTIOP::Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -208,14 +208,14 @@ TAO::HTIOP::Connection_Handler::close (u_long) } int -TAO::HTIOP::Connection_Handler::release_os_resources (void) +TAO::HTIOP::Connection_Handler::release_os_resources () { int result = this->peer().close (); return result; } int -TAO::HTIOP::Connection_Handler::add_transport_to_cache (void) +TAO::HTIOP::Connection_Handler::add_transport_to_cache () { ACE::HTBP::Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index e513b06caea..abe63a47620 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -29,7 +29,7 @@ TAO::HTIOP::Connector::Connector (ACE::HTBP::Environment *ht_env) { } -TAO::HTIOP::Connector::~Connector (void) +TAO::HTIOP::Connector::~Connector () { } @@ -59,7 +59,7 @@ TAO::HTIOP::Connector::open (TAO_ORB_Core *orb_core) } int -TAO::HTIOP::Connector::close (void) +TAO::HTIOP::Connector::close () { delete this->concurrency_strategy_; delete this->connect_creation_strategy_; @@ -341,7 +341,7 @@ TAO::HTIOP::Connector::create_profile (TAO_InputCDR& cdr) * @brief Create a profile with a given endpoint. */ TAO_Profile * -TAO::HTIOP::Connector::make_profile (void) +TAO::HTIOP::Connector::make_profile () { // The endpoint should be of the form: // N.n@host:port/object_key @@ -385,7 +385,7 @@ TAO::HTIOP::Connector::check_prefix (const char *endpoint) } char -TAO::HTIOP::Connector::object_key_delimiter (void) const +TAO::HTIOP::Connector::object_key_delimiter () const { return TAO::HTIOP::Profile::object_key_delimiter_; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index f54168e2603..88b96524ac9 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -44,7 +44,7 @@ TAO::HTIOP::Endpoint::Endpoint (const char *host, this->htid_ = htid; } -TAO::HTIOP::Endpoint::Endpoint (void) +TAO::HTIOP::Endpoint::Endpoint () : TAO_Endpoint (OCI_TAG_HTIOP_PROFILE), host_ (), port_ (0), @@ -72,7 +72,7 @@ TAO::HTIOP::Endpoint::Endpoint (const char *host, this->htid_ = htid; } -TAO::HTIOP::Endpoint::~Endpoint (void) +TAO::HTIOP::Endpoint::~Endpoint () { } @@ -150,7 +150,7 @@ TAO::HTIOP::Endpoint::htid (const char *h) } void -TAO::HTIOP::Endpoint::reset_hint (void) +TAO::HTIOP::Endpoint::reset_hint () { // Commented out for the time being.... /* if (this->hint_) @@ -158,13 +158,13 @@ TAO::HTIOP::Endpoint::reset_hint (void) } TAO_Endpoint * -TAO::HTIOP::Endpoint::next (void) +TAO::HTIOP::Endpoint::next () { return this->next_; } TAO_Endpoint * -TAO::HTIOP::Endpoint::duplicate (void) +TAO::HTIOP::Endpoint::duplicate () { // @@ Bala, we probably need to make sure that the duplicate has the // same priority as the original. Although it does not matter in @@ -204,7 +204,7 @@ TAO::HTIOP::Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) } CORBA::ULong -TAO::HTIOP::Endpoint::hash (void) +TAO::HTIOP::Endpoint::hash () { if (this->htid_.in() && ACE_OS::strlen (this->htid_.in())) return ACE::hash_pjw(this->htid_.in()); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index 443def1b352..b929bcc2a9b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -12,14 +12,14 @@ static const char the_prefix[] = "htiop"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::HTIOP::Protocol_Factory::Protocol_Factory (void) +TAO::HTIOP::Protocol_Factory::Protocol_Factory () : TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE), ht_env_ (0), inside_ (-1) { } -TAO::HTIOP::Protocol_Factory::~Protocol_Factory (void) +TAO::HTIOP::Protocol_Factory::~Protocol_Factory () { delete this->ht_env_; } @@ -32,13 +32,13 @@ TAO::HTIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO::HTIOP::Protocol_Factory::prefix (void) const +TAO::HTIOP::Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO::HTIOP::Protocol_Factory::options_delimiter (void) const +TAO::HTIOP::Protocol_Factory::options_delimiter () const { return '/'; } @@ -111,7 +111,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc, } TAO_Acceptor * -TAO::HTIOP::Protocol_Factory::make_acceptor (void) +TAO::HTIOP::Protocol_Factory::make_acceptor () { TAO_Acceptor *acceptor = 0; @@ -123,7 +123,7 @@ TAO::HTIOP::Protocol_Factory::make_acceptor (void) } TAO_Connector * -TAO::HTIOP::Protocol_Factory::make_connector (void) +TAO::HTIOP::Protocol_Factory::make_connector () { TAO_Connector *connector = 0; ACE_NEW_RETURN (connector, @@ -133,7 +133,7 @@ TAO::HTIOP::Protocol_Factory::make_connector (void) } int -TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint (void) const +TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint () const { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index ab4e94d9819..5d17a0de8d2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO::HTIOP::Profile::object_key_delimiter_ = '/'; char -TAO::HTIOP::Profile::object_key_delimiter (void) const +TAO::HTIOP::Profile::object_key_delimiter () const { return TAO::HTIOP::Profile::object_key_delimiter_; } @@ -63,7 +63,7 @@ TAO::HTIOP::Profile::Profile (TAO_ORB_Core *orb_core) { } -TAO::HTIOP::Profile::~Profile (void) +TAO::HTIOP::Profile::~Profile () { // Clean up the list of endpoints since we own it. // Skip the head, since it is not dynamically allocated. @@ -258,13 +258,13 @@ TAO::HTIOP::Profile::hash (CORBA::ULong max) } TAO_Endpoint* -TAO::HTIOP::Profile::endpoint (void) +TAO::HTIOP::Profile::endpoint () { return &this->endpoint_; } CORBA::ULong -TAO::HTIOP::Profile::endpoint_count (void) const +TAO::HTIOP::Profile::endpoint_count () const { return this->count_; } @@ -279,7 +279,7 @@ TAO::HTIOP::Profile::add_endpoint (TAO::HTIOP::Endpoint *endp) } char * -TAO::HTIOP::Profile::to_string (void) const +TAO::HTIOP::Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), @@ -319,7 +319,7 @@ TAO::HTIOP::Profile::to_string (void) const const char * -TAO::HTIOP::Profile::prefix (void) +TAO::HTIOP::Profile::prefix () { return ::the_prefix; } @@ -413,7 +413,7 @@ TAO::HTIOP::Profile::encode_endpoints () } int -TAO::HTIOP::Profile::decode_endpoints (void) +TAO::HTIOP::Profile::decode_endpoints () { IOP::TaggedComponent tagged_component; tagged_component.tag = TAO_TAG_ENDPOINTS; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 1f0ec2faa71..296db0bad23 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -30,18 +30,18 @@ TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h, { } -TAO::HTIOP::Transport::~Transport (void) +TAO::HTIOP::Transport::~Transport () { } ACE_Event_Handler * -TAO::HTIOP::Transport::event_handler_i (void) +TAO::HTIOP::Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO::HTIOP::Transport::connection_handler_i (void) +TAO::HTIOP::Transport::connection_handler_i () { return this->connection_handler_; } @@ -106,7 +106,7 @@ TAO::HTIOP::Transport::recv (char *buf, } int -TAO::HTIOP::Transport::register_handler (void) +TAO::HTIOP::Transport::register_handler () { if (TAO_debug_level > 4) { @@ -355,7 +355,7 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list, TAO_Connection_Handler * -TAO::HTIOP::Transport::invalidate_event_handler_i (void) +TAO::HTIOP::Transport::invalidate_event_handler_i () { TAO_Connection_Handler * eh = this->connection_handler_; this->connection_handler_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index c08eb8ef809..0ed392a3d0b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -12,12 +12,12 @@ TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void) +TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i () { } CORBA::DefinitionKind -TAO_AbstractInterfaceDef_i::def_kind (void) +TAO_AbstractInterfaceDef_i::def_kind () { return CORBA::dk_AbstractInterface; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 9a581fe1c5a..283253def36 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -14,18 +14,18 @@ TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo) { } -TAO_AliasDef_i::~TAO_AliasDef_i (void) +TAO_AliasDef_i::~TAO_AliasDef_i () { } CORBA::DefinitionKind -TAO_AliasDef_i::def_kind (void) +TAO_AliasDef_i::def_kind () { return CORBA::dk_Alias; } CORBA::TypeCode_ptr -TAO_AliasDef_i::type (void) +TAO_AliasDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -35,7 +35,7 @@ TAO_AliasDef_i::type (void) } CORBA::TypeCode_ptr -TAO_AliasDef_i::type_i (void) +TAO_AliasDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -68,7 +68,7 @@ TAO_AliasDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_AliasDef_i::original_type_def (void) +TAO_AliasDef_i::original_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -78,7 +78,7 @@ TAO_AliasDef_i::original_type_def (void) } CORBA::IDLType_ptr -TAO_AliasDef_i::original_type_def_i (void) +TAO_AliasDef_i::original_type_def_i () { ACE_TString original_type; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 7c685d9fc06..c31a73f0ba7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -12,18 +12,18 @@ TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo) { } -TAO_ArrayDef_i::~TAO_ArrayDef_i (void) +TAO_ArrayDef_i::~TAO_ArrayDef_i () { } CORBA::DefinitionKind -TAO_ArrayDef_i::def_kind (void) +TAO_ArrayDef_i::def_kind () { return CORBA::dk_Array; } void -TAO_ArrayDef_i::destroy (void) +TAO_ArrayDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -33,7 +33,7 @@ TAO_ArrayDef_i::destroy (void) } void -TAO_ArrayDef_i::destroy_i (void) +TAO_ArrayDef_i::destroy_i () { // Only if it is (w)string, fixed, array or sequence. this->destroy_element_type (); @@ -49,7 +49,7 @@ TAO_ArrayDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type (void) +TAO_ArrayDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -59,7 +59,7 @@ TAO_ArrayDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type_i (void) +TAO_ArrayDef_i::type_i () { // Store the current array's section key. ACE_Configuration_Section_Key @@ -83,7 +83,7 @@ TAO_ArrayDef_i::type_i (void) } CORBA::ULong -TAO_ArrayDef_i::length (void) +TAO_ArrayDef_i::length () { TAO_IFR_READ_GUARD_RETURN (0); @@ -93,7 +93,7 @@ TAO_ArrayDef_i::length (void) } CORBA::ULong -TAO_ArrayDef_i::length_i (void) +TAO_ArrayDef_i::length_i () { u_int length = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -122,7 +122,7 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type (void) +TAO_ArrayDef_i::element_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -132,7 +132,7 @@ TAO_ArrayDef_i::element_type (void) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type_i (void) +TAO_ArrayDef_i::element_type_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -146,7 +146,7 @@ TAO_ArrayDef_i::element_type_i (void) } CORBA::IDLType_ptr -TAO_ArrayDef_i::element_type_def (void) +TAO_ArrayDef_i::element_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -156,7 +156,7 @@ TAO_ArrayDef_i::element_type_def (void) } CORBA::IDLType_ptr -TAO_ArrayDef_i::element_type_def_i (void) +TAO_ArrayDef_i::element_type_def_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 6f56fed7bc1..dbddc089e7d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -14,18 +14,18 @@ TAO_AttributeDef_i::TAO_AttributeDef_i (TAO_Repository_i *repo) { } -TAO_AttributeDef_i::~TAO_AttributeDef_i (void) +TAO_AttributeDef_i::~TAO_AttributeDef_i () { } CORBA::DefinitionKind -TAO_AttributeDef_i::def_kind (void) +TAO_AttributeDef_i::def_kind () { return CORBA::dk_Attribute; } CORBA::Contained::Description * -TAO_AttributeDef_i::describe (void) +TAO_AttributeDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -35,7 +35,7 @@ TAO_AttributeDef_i::describe (void) } CORBA::Contained::Description * -TAO_AttributeDef_i::describe_i (void) +TAO_AttributeDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -58,7 +58,7 @@ TAO_AttributeDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type (void) +TAO_AttributeDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -68,7 +68,7 @@ TAO_AttributeDef_i::type (void) } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type_i (void) +TAO_AttributeDef_i::type_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -83,7 +83,7 @@ TAO_AttributeDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_AttributeDef_i::type_def (void) +TAO_AttributeDef_i::type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -93,7 +93,7 @@ TAO_AttributeDef_i::type_def (void) } CORBA::IDLType_ptr -TAO_AttributeDef_i::type_def_i (void) +TAO_AttributeDef_i::type_def_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -131,7 +131,7 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def) } CORBA::AttributeMode -TAO_AttributeDef_i::mode (void) +TAO_AttributeDef_i::mode () { TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL); @@ -141,7 +141,7 @@ TAO_AttributeDef_i::mode (void) } CORBA::AttributeMode -TAO_AttributeDef_i::mode_i (void) +TAO_AttributeDef_i::mode_i () { u_int mode = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -192,7 +192,7 @@ TAO_AttributeDef_i::make_description ( } CORBA::ExceptionDefSeq * -TAO_AttributeDef_i::get_exceptions (void) +TAO_AttributeDef_i::get_exceptions () { ACE_Unbounded_Queue<ACE_TString> path_queue; int index = 0; @@ -263,7 +263,7 @@ TAO_AttributeDef_i::get_exceptions (void) } CORBA::ExceptionDefSeq * -TAO_AttributeDef_i::put_exceptions (void) +TAO_AttributeDef_i::put_exceptions () { ACE_Unbounded_Queue<ACE_TString> path_queue; int index = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index fb5870084af..196bacc8492 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -17,7 +17,7 @@ TAO_ComponentContainer_i::TAO_ComponentContainer_i (TAO_Repository_i *repo) { } -TAO_ComponentContainer_i::~TAO_ComponentContainer_i (void) +TAO_ComponentContainer_i::~TAO_ComponentContainer_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index 783a6093cab..6f41666db3f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -69,18 +69,18 @@ TAO_ComponentDef_i::TAO_ComponentDef_i (TAO_Repository_i *repo) { } -TAO_ComponentDef_i::~TAO_ComponentDef_i (void) +TAO_ComponentDef_i::~TAO_ComponentDef_i () { } CORBA::DefinitionKind -TAO_ComponentDef_i::def_kind (void) +TAO_ComponentDef_i::def_kind () { return CORBA::dk_Component; } void -TAO_ComponentDef_i::destroy (void) +TAO_ComponentDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -90,7 +90,7 @@ TAO_ComponentDef_i::destroy (void) } void -TAO_ComponentDef_i::destroy_i (void) +TAO_ComponentDef_i::destroy_i () { // Destroy our special subsections first, then call destroy_i // on our base class. @@ -129,7 +129,7 @@ TAO_ComponentDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ComponentDef_i::describe (void) +TAO_ComponentDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -139,7 +139,7 @@ TAO_ComponentDef_i::describe (void) } CORBA::Contained::Description * -TAO_ComponentDef_i::describe_i (void) +TAO_ComponentDef_i::describe_i () { CORBA::ComponentIR::ComponentDescription cd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::ComponentDescription, @@ -278,7 +278,7 @@ TAO_ComponentDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type (void) +TAO_ComponentDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -288,7 +288,7 @@ TAO_ComponentDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type_i (void) +TAO_ComponentDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -307,7 +307,7 @@ TAO_ComponentDef_i::type_i (void) } CORBA::InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces (void) +TAO_ComponentDef_i::supported_interfaces () { TAO_IFR_READ_GUARD_RETURN (0); @@ -317,7 +317,7 @@ TAO_ComponentDef_i::supported_interfaces (void) } CORBA::InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces_i (void) +TAO_ComponentDef_i::supported_interfaces_i () { CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_RETURN (seq, @@ -421,7 +421,7 @@ TAO_ComponentDef_i::supported_interfaces_i ( } CORBA::ComponentIR::ComponentDef_ptr -TAO_ComponentDef_i::base_component (void) +TAO_ComponentDef_i::base_component () { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); @@ -431,7 +431,7 @@ TAO_ComponentDef_i::base_component (void) } CORBA::ComponentIR::ComponentDef_ptr -TAO_ComponentDef_i::base_component_i (void) +TAO_ComponentDef_i::base_component_i () { ACE_TString base_path; int status = diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp index 63c10e9dc3e..2e7937885b0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp @@ -9,7 +9,7 @@ TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo) { } -TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i (void) +TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index 7e6bd0996b3..c980d2b422e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -27,7 +27,7 @@ TAO_ComponentRepository_i::TAO_ComponentRepository_i ( { } -TAO_ComponentRepository_i::~TAO_ComponentRepository_i (void) +TAO_ComponentRepository_i::~TAO_ComponentRepository_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index f91f727f4ba..168af593a08 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -16,18 +16,18 @@ TAO_ConstantDef_i::TAO_ConstantDef_i (TAO_Repository_i *repo) { } -TAO_ConstantDef_i::~TAO_ConstantDef_i (void) +TAO_ConstantDef_i::~TAO_ConstantDef_i () { } CORBA::DefinitionKind -TAO_ConstantDef_i::def_kind (void) +TAO_ConstantDef_i::def_kind () { return CORBA::dk_Constant; } CORBA::Contained::Description * -TAO_ConstantDef_i::describe (void) +TAO_ConstantDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -37,7 +37,7 @@ TAO_ConstantDef_i::describe (void) } CORBA::Contained::Description * -TAO_ConstantDef_i::describe_i (void) +TAO_ConstantDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -73,7 +73,7 @@ TAO_ConstantDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type (void) +TAO_ConstantDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -83,7 +83,7 @@ TAO_ConstantDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type_i (void) +TAO_ConstantDef_i::type_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -97,7 +97,7 @@ TAO_ConstantDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_ConstantDef_i::type_def (void) +TAO_ConstantDef_i::type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -107,7 +107,7 @@ TAO_ConstantDef_i::type_def (void) } CORBA::IDLType_ptr -TAO_ConstantDef_i::type_def_i (void) +TAO_ConstantDef_i::type_def_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -142,7 +142,7 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def) } CORBA::Any * -TAO_ConstantDef_i::value (void) +TAO_ConstantDef_i::value () { TAO_IFR_READ_GUARD_RETURN (0); @@ -152,7 +152,7 @@ TAO_ConstantDef_i::value (void) } CORBA::Any * -TAO_ConstantDef_i::value_i (void) +TAO_ConstantDef_i::value_i () { CORBA::TypeCode_var tc = this->type_i (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index d991b8009bc..e2ea5176907 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -13,12 +13,12 @@ TAO_ConsumesDef_i::TAO_ConsumesDef_i ( { } -TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void) +TAO_ConsumesDef_i::~TAO_ConsumesDef_i () { } CORBA::DefinitionKind -TAO_ConsumesDef_i::def_kind (void) +TAO_ConsumesDef_i::def_kind () { return CORBA::dk_Consumes; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 975ade416ab..dc711338a09 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -15,12 +15,12 @@ TAO_Contained_i::TAO_Contained_i ( { } -TAO_Contained_i::~TAO_Contained_i (void) +TAO_Contained_i::~TAO_Contained_i () { } void -TAO_Contained_i::destroy (void) +TAO_Contained_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -30,7 +30,7 @@ TAO_Contained_i::destroy (void) } void -TAO_Contained_i::destroy_i (void) +TAO_Contained_i::destroy_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -85,7 +85,7 @@ TAO_Contained_i::destroy_i (void) } char * -TAO_Contained_i::id (void) +TAO_Contained_i::id () { TAO_IFR_READ_GUARD_RETURN (0); @@ -95,7 +95,7 @@ TAO_Contained_i::id (void) } char * -TAO_Contained_i::id_i (void) +TAO_Contained_i::id_i () { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -157,7 +157,7 @@ TAO_Contained_i::id_i (const char *id) } char * -TAO_Contained_i::name (void) +TAO_Contained_i::name () { TAO_IFR_READ_GUARD_RETURN (0); @@ -167,7 +167,7 @@ TAO_Contained_i::name (void) } char * -TAO_Contained_i::name_i (void) +TAO_Contained_i::name_i () { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -178,7 +178,7 @@ TAO_Contained_i::name_i (void) } char * -TAO_Contained_i::version (void) +TAO_Contained_i::version () { TAO_IFR_READ_GUARD_RETURN (0); @@ -188,7 +188,7 @@ TAO_Contained_i::version (void) } char * -TAO_Contained_i::version_i (void) +TAO_Contained_i::version_i () { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -260,7 +260,7 @@ TAO_Contained_i::version_i (const char *version) } CORBA::Container_ptr -TAO_Contained_i::defined_in (void) +TAO_Contained_i::defined_in () { TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ()); @@ -270,7 +270,7 @@ TAO_Contained_i::defined_in (void) } CORBA::Container_ptr -TAO_Contained_i::defined_in_i (void) +TAO_Contained_i::defined_in_i () { ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, @@ -298,7 +298,7 @@ TAO_Contained_i::defined_in_i (void) } char * -TAO_Contained_i::absolute_name (void) +TAO_Contained_i::absolute_name () { TAO_IFR_READ_GUARD_RETURN (0); @@ -308,7 +308,7 @@ TAO_Contained_i::absolute_name (void) } char * -TAO_Contained_i::absolute_name_i (void) +TAO_Contained_i::absolute_name_i () { ACE_TString absolute_name; this->repo_->config ()->get_string_value (this->section_key_, @@ -319,7 +319,7 @@ TAO_Contained_i::absolute_name_i (void) } CORBA::Repository_ptr -TAO_Contained_i::containing_repository (void) +TAO_Contained_i::containing_repository () { return this->repo_->repo_objref (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index 9dad1c8b29b..94b7fb91931 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -21,12 +21,12 @@ TAO_Container_i::TAO_Container_i (TAO_Repository_i *repo) { } -TAO_Container_i::~TAO_Container_i (void) +TAO_Container_i::~TAO_Container_i () { } void -TAO_Container_i::destroy (void) +TAO_Container_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -36,14 +36,14 @@ TAO_Container_i::destroy (void) } void -TAO_Container_i::destroy_i (void) +TAO_Container_i::destroy_i () { this->destroy_references_i(); this->destroy_definitions_i(); } void -TAO_Container_i::destroy_references_i (void) +TAO_Container_i::destroy_references_i () { int index = 0; int status; @@ -119,7 +119,7 @@ TAO_Container_i::destroy_references_i (void) } void -TAO_Container_i::destroy_definitions_i (void) +TAO_Container_i::destroy_definitions_i () { int index = 0; int status; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 424f8674e3c..86170850374 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -10,12 +10,12 @@ TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo) { } -TAO_EmitsDef_i::~TAO_EmitsDef_i (void) +TAO_EmitsDef_i::~TAO_EmitsDef_i () { } CORBA::DefinitionKind -TAO_EmitsDef_i::def_kind (void) +TAO_EmitsDef_i::def_kind () { return CORBA::dk_Emits; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index 9c6c11fa9ae..1bff5c0cbd0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -14,18 +14,18 @@ TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo) { } -TAO_EnumDef_i::~TAO_EnumDef_i (void) +TAO_EnumDef_i::~TAO_EnumDef_i () { } CORBA::DefinitionKind -TAO_EnumDef_i::def_kind (void) +TAO_EnumDef_i::def_kind () { return CORBA::dk_Enum; } CORBA::TypeCode_ptr -TAO_EnumDef_i::type (void) +TAO_EnumDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -35,7 +35,7 @@ TAO_EnumDef_i::type (void) } CORBA::TypeCode_ptr -TAO_EnumDef_i::type_i (void) +TAO_EnumDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -55,7 +55,7 @@ TAO_EnumDef_i::type_i (void) } CORBA::EnumMemberSeq * -TAO_EnumDef_i::members (void) +TAO_EnumDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -65,7 +65,7 @@ TAO_EnumDef_i::members (void) } CORBA::EnumMemberSeq * -TAO_EnumDef_i::members_i (void) +TAO_EnumDef_i::members_i () { u_int count = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index 94a36220fe5..cd612feea46 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -13,18 +13,18 @@ TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo) { } -TAO_EventDef_i::~TAO_EventDef_i (void) +TAO_EventDef_i::~TAO_EventDef_i () { } CORBA::DefinitionKind -TAO_EventDef_i::def_kind (void) +TAO_EventDef_i::def_kind () { return CORBA::dk_Event; } void -TAO_EventDef_i::destroy (void) +TAO_EventDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -34,14 +34,14 @@ TAO_EventDef_i::destroy (void) } void -TAO_EventDef_i::destroy_i (void) +TAO_EventDef_i::destroy_i () { // An event type is a restriction of a value type, not an extension. this->TAO_ExtValueDef_i::destroy_i (); } CORBA::Contained::Description * -TAO_EventDef_i::describe (void) +TAO_EventDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -51,7 +51,7 @@ TAO_EventDef_i::describe (void) } CORBA::Contained::Description * -TAO_EventDef_i::describe_i (void) +TAO_EventDef_i::describe_i () { return this->TAO_ValueDef_i::describe_i (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index bf67c03d0c8..5e5186a678d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -14,7 +14,7 @@ TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo) { } -TAO_EventPortDef_i::~TAO_EventPortDef_i (void) +TAO_EventPortDef_i::~TAO_EventPortDef_i () { } @@ -121,7 +121,7 @@ TAO_EventPortDef_i::is_a_i ( } CORBA::Contained::Description * -TAO_EventPortDef_i::describe (void) +TAO_EventPortDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -131,7 +131,7 @@ TAO_EventPortDef_i::describe (void) } CORBA::Contained::Description * -TAO_EventPortDef_i::describe_i (void) +TAO_EventPortDef_i::describe_i () { CORBA::ComponentIR::EventPortDescription epd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::EventPortDescription, @@ -158,7 +158,7 @@ TAO_EventPortDef_i::describe_i (void) } CORBA::DefinitionKind -TAO_EventPortDef_i::def_kind (void) +TAO_EventPortDef_i::def_kind () { return CORBA::dk_none; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 54a720bc9df..83aca20e401 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -14,18 +14,18 @@ TAO_ExceptionDef_i::TAO_ExceptionDef_i (TAO_Repository_i *repo) { } -TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void) +TAO_ExceptionDef_i::~TAO_ExceptionDef_i () { } CORBA::DefinitionKind -TAO_ExceptionDef_i::def_kind (void) +TAO_ExceptionDef_i::def_kind () { return CORBA::dk_Exception; } void -TAO_ExceptionDef_i::destroy (void) +TAO_ExceptionDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -35,7 +35,7 @@ TAO_ExceptionDef_i::destroy (void) } void -TAO_ExceptionDef_i::destroy_i (void) +TAO_ExceptionDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -45,7 +45,7 @@ TAO_ExceptionDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ExceptionDef_i::describe (void) +TAO_ExceptionDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -55,7 +55,7 @@ TAO_ExceptionDef_i::describe (void) } CORBA::Contained::Description * -TAO_ExceptionDef_i::describe_i (void) +TAO_ExceptionDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -90,7 +90,7 @@ TAO_ExceptionDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type (void) +TAO_ExceptionDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -100,7 +100,7 @@ TAO_ExceptionDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type_i (void) +TAO_ExceptionDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -123,7 +123,7 @@ TAO_ExceptionDef_i::type_i (void) } CORBA::StructMemberSeq * -TAO_ExceptionDef_i::members (void) +TAO_ExceptionDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -133,7 +133,7 @@ TAO_ExceptionDef_i::members (void) } CORBA::StructMemberSeq * -TAO_ExceptionDef_i::members_i (void) +TAO_ExceptionDef_i::members_i () { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 649c86a069e..72da496bbcb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -15,14 +15,14 @@ TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i ( { } -TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void) +TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i () { } // Just call the base class version, this is here only to // disambiguate multiple inheritance. void -TAO_ExtAbstractInterfaceDef_i::destroy (void) +TAO_ExtAbstractInterfaceDef_i::destroy () { TAO_IFR_WRITE_GUARD; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index 4c532eab20f..e18697e9ad6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -14,7 +14,7 @@ TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo) { } -TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i (void) +TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp index 55c6413a73a..0e3166e25d4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp @@ -13,7 +13,7 @@ TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i (void) +TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index 0d7c2d6fbdd..c9c27dbe34c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -14,14 +14,14 @@ TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void) +TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i () { } // Just call the base class version, this is here only to // disambiguate multiple inheritance. void -TAO_ExtLocalInterfaceDef_i::destroy (void) +TAO_ExtLocalInterfaceDef_i::destroy () { TAO_IFR_WRITE_GUARD; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index e2386bbf087..842fe5d72c9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -17,7 +17,7 @@ TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo) { } -TAO_ExtValueDef_i::~TAO_ExtValueDef_i (void) +TAO_ExtValueDef_i::~TAO_ExtValueDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index 4ad931fe56a..d96e0eb2a06 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -10,12 +10,12 @@ TAO_FactoryDef_i::TAO_FactoryDef_i (TAO_Repository_i *repo) { } -TAO_FactoryDef_i::~TAO_FactoryDef_i (void) +TAO_FactoryDef_i::~TAO_FactoryDef_i () { } CORBA::DefinitionKind -TAO_FactoryDef_i::def_kind (void) +TAO_FactoryDef_i::def_kind () { return CORBA::dk_Factory; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index 8a7abfb8312..408c047eb9e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -10,12 +10,12 @@ TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo) { } -TAO_FinderDef_i::~TAO_FinderDef_i (void) +TAO_FinderDef_i::~TAO_FinderDef_i () { } CORBA::DefinitionKind -TAO_FinderDef_i::def_kind (void) +TAO_FinderDef_i::def_kind () { return CORBA::dk_Finder; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index 50a59fe7ca6..866f767ca5f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -9,18 +9,18 @@ TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo) { } -TAO_FixedDef_i::~TAO_FixedDef_i (void) +TAO_FixedDef_i::~TAO_FixedDef_i () { } CORBA::DefinitionKind -TAO_FixedDef_i::def_kind (void) +TAO_FixedDef_i::def_kind () { return CORBA::dk_Fixed; } void -TAO_FixedDef_i::destroy (void) +TAO_FixedDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -30,13 +30,13 @@ TAO_FixedDef_i::destroy (void) } void -TAO_FixedDef_i::destroy_i (void) +TAO_FixedDef_i::destroy_i () { // TODO } CORBA::TypeCode_ptr -TAO_FixedDef_i::type (void) +TAO_FixedDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -46,14 +46,14 @@ TAO_FixedDef_i::type (void) } CORBA::TypeCode_ptr -TAO_FixedDef_i::type_i (void) +TAO_FixedDef_i::type_i () { // TODO return CORBA::TypeCode::_nil (); } CORBA::UShort -TAO_FixedDef_i::digits (void) +TAO_FixedDef_i::digits () { TAO_IFR_READ_GUARD_RETURN (0); @@ -63,7 +63,7 @@ TAO_FixedDef_i::digits (void) } CORBA::UShort -TAO_FixedDef_i::digits_i (void) +TAO_FixedDef_i::digits_i () { // TODO return 0; @@ -87,7 +87,7 @@ TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */ } CORBA::Short -TAO_FixedDef_i::scale (void) +TAO_FixedDef_i::scale () { TAO_IFR_READ_GUARD_RETURN (0); @@ -97,7 +97,7 @@ TAO_FixedDef_i::scale (void) } CORBA::Short -TAO_FixedDef_i::scale_i (void) +TAO_FixedDef_i::scale_i () { // TODO return 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index 97d7bc8c76f..c83e120a01b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -23,18 +23,18 @@ TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo) { } -TAO_HomeDef_i::~TAO_HomeDef_i (void) +TAO_HomeDef_i::~TAO_HomeDef_i () { } CORBA::DefinitionKind -TAO_HomeDef_i::def_kind (void) +TAO_HomeDef_i::def_kind () { return CORBA::dk_Home; } void -TAO_HomeDef_i::destroy (void) +TAO_HomeDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -44,7 +44,7 @@ TAO_HomeDef_i::destroy (void) } void -TAO_HomeDef_i::destroy_i (void) +TAO_HomeDef_i::destroy_i () { // Destroy our special subsections first, then call destroy_i // on our base class. @@ -65,7 +65,7 @@ TAO_HomeDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_HomeDef_i::describe (void) +TAO_HomeDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -75,7 +75,7 @@ TAO_HomeDef_i::describe (void) } CORBA::Contained::Description * -TAO_HomeDef_i::describe_i (void) +TAO_HomeDef_i::describe_i () { CORBA::ComponentIR::HomeDescription home_desc; @@ -150,7 +150,7 @@ TAO_HomeDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_HomeDef_i::type (void) +TAO_HomeDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -160,7 +160,7 @@ TAO_HomeDef_i::type (void) } CORBA::TypeCode_ptr -TAO_HomeDef_i::type_i (void) +TAO_HomeDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -177,7 +177,7 @@ TAO_HomeDef_i::type_i (void) } CORBA::ComponentIR::HomeDef_ptr -TAO_HomeDef_i::base_home (void) +TAO_HomeDef_i::base_home () { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ()); @@ -187,7 +187,7 @@ TAO_HomeDef_i::base_home (void) } CORBA::ComponentIR::HomeDef_ptr -TAO_HomeDef_i::base_home_i (void) +TAO_HomeDef_i::base_home_i () { ACE_TString path; int status = @@ -336,7 +336,7 @@ TAO_HomeDef_i::supported_interfaces_i ( } CORBA::ComponentIR::ComponentDef_ptr -TAO_HomeDef_i::managed_component (void) +TAO_HomeDef_i::managed_component () { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); @@ -346,7 +346,7 @@ TAO_HomeDef_i::managed_component (void) } CORBA::ComponentIR::ComponentDef_ptr -TAO_HomeDef_i::managed_component_i (void) +TAO_HomeDef_i::managed_component_i () { ACE_TString path; this->repo_->config ()->get_string_value (this->section_key_, @@ -383,7 +383,7 @@ TAO_HomeDef_i::managed_component_i ( } CORBA::ValueDef_ptr -TAO_HomeDef_i::primary_key (void) +TAO_HomeDef_i::primary_key () { TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); @@ -393,7 +393,7 @@ TAO_HomeDef_i::primary_key (void) } CORBA::ValueDef_ptr -TAO_HomeDef_i::primary_key_i (void) +TAO_HomeDef_i::primary_key_i () { ACE_TString path; int status = diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp index 78c10859022..522df7a364b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp @@ -7,7 +7,7 @@ TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo) { } -TAO_IDLType_i::~TAO_IDLType_i (void) +TAO_IDLType_i::~TAO_IDLType_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index fa7b25f8c37..7b661d821bf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -14,12 +14,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void) +TAO_IFR_Service_Loader::TAO_IFR_Service_Loader () { // Constructor } -TAO_IFR_Service_Loader::~TAO_IFR_Service_Loader (void) +TAO_IFR_Service_Loader::~TAO_IFR_Service_Loader () { // Destructor } @@ -50,7 +50,7 @@ TAO_IFR_Service_Loader::init (int argc, } int -TAO_IFR_Service_Loader::fini (void) +TAO_IFR_Service_Loader::fini () { // Remove the IFR_Service Service. return this->ifr_server_.fini (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 09f75725f10..60de524af8d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -22,13 +22,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0; -TAO_IFR_Server::TAO_IFR_Server (void) +TAO_IFR_Server::TAO_IFR_Server () : ior_multicast_ (0), config_ (0) { } -TAO_IFR_Server::~TAO_IFR_Server (void) +TAO_IFR_Server::~TAO_IFR_Server () { // Get reactor instance from TAO. ACE_Reactor *reactor = this->orb_->orb_core ()->reactor (); @@ -148,7 +148,7 @@ TAO_IFR_Server::init_with_poa (int argc, } int -TAO_IFR_Server::fini (void) +TAO_IFR_Server::fini () { try { @@ -164,7 +164,7 @@ TAO_IFR_Server::fini (void) } int -TAO_IFR_Server::create_poa (void) +TAO_IFR_Server::create_poa () { PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); @@ -211,7 +211,7 @@ TAO_IFR_Server::create_poa (void) } int -TAO_IFR_Server::open_config (void) +TAO_IFR_Server::open_config () { if (OPTIONS::instance ()->using_registry ()) { @@ -266,7 +266,7 @@ TAO_IFR_Server::open_config (void) } int -TAO_IFR_Server::create_repository (void) +TAO_IFR_Server::create_repository () { TAO_ComponentRepository_i *impl = 0; ACE_NEW_THROW_EX ( @@ -371,7 +371,7 @@ TAO_IFR_Server::create_repository (void) // Install ior multicast handler. int -TAO_IFR_Server::init_multicast_server (void) +TAO_IFR_Server::init_multicast_server () { #if defined (ACE_HAS_IP_MULTICAST) // Get reactor instance from TAO. @@ -463,11 +463,11 @@ TAO_IFR_Server::init_multicast_server (void) return 0; } -TAO_IFR_Service_Utils::TAO_IFR_Service_Utils (void) +TAO_IFR_Service_Utils::TAO_IFR_Service_Utils () { } -TAO_IFR_Service_Utils::~TAO_IFR_Service_Utils (void) +TAO_IFR_Service_Utils::~TAO_IFR_Service_Utils () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 4b4bf77db08..a93bfc97e9a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -17,7 +17,7 @@ TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo) { } -TAO_IRObject_i::~TAO_IRObject_i (void) +TAO_IRObject_i::~TAO_IRObject_i () { } @@ -36,7 +36,7 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key) } void -TAO_IRObject_i::update_key (void) +TAO_IRObject_i::update_key () { TAO::Portable_Server::POA_Current_Impl *pc_impl = static_cast <TAO::Portable_Server::POA_Current_Impl *> diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index 50f496b0dba..6ca2337f6b4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -18,7 +18,7 @@ TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i ( { } -TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void) +TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 1baecb43533..d2f73c4d659 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -17,18 +17,18 @@ TAO_InterfaceDef_i::TAO_InterfaceDef_i (TAO_Repository_i *repo) { } -TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void) +TAO_InterfaceDef_i::~TAO_InterfaceDef_i () { } CORBA::DefinitionKind -TAO_InterfaceDef_i::def_kind (void) +TAO_InterfaceDef_i::def_kind () { return CORBA::dk_Interface; } void -TAO_InterfaceDef_i::destroy (void) +TAO_InterfaceDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -38,7 +38,7 @@ TAO_InterfaceDef_i::destroy (void) } void -TAO_InterfaceDef_i::destroy_i (void) +TAO_InterfaceDef_i::destroy_i () { // Destroy our members. this->TAO_Container_i::destroy_i (); @@ -64,7 +64,7 @@ TAO_InterfaceDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_InterfaceDef_i::describe (void) +TAO_InterfaceDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -74,7 +74,7 @@ TAO_InterfaceDef_i::describe (void) } CORBA::Contained::Description * -TAO_InterfaceDef_i::describe_i (void) +TAO_InterfaceDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -137,7 +137,7 @@ TAO_InterfaceDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type (void) +TAO_InterfaceDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -147,7 +147,7 @@ TAO_InterfaceDef_i::type (void) } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type_i (void) +TAO_InterfaceDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -166,7 +166,7 @@ TAO_InterfaceDef_i::type_i (void) } CORBA::InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces (void) +TAO_InterfaceDef_i::base_interfaces () { TAO_IFR_READ_GUARD_RETURN (0); @@ -176,7 +176,7 @@ TAO_InterfaceDef_i::base_interfaces (void) } CORBA::InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces_i (void) +TAO_InterfaceDef_i::base_interfaces_i () { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -355,7 +355,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id) } CORBA::InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface (void) +TAO_InterfaceDef_i::describe_interface () { TAO_IFR_READ_GUARD_RETURN (0); @@ -365,7 +365,7 @@ TAO_InterfaceDef_i::describe_interface (void) } CORBA::InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface_i (void) +TAO_InterfaceDef_i::describe_interface_i () { CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0; ACE_NEW_RETURN (fifd, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index d078ec7ca7f..3ddbc46afed 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -12,12 +12,12 @@ TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void) +TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i () { } CORBA::DefinitionKind -TAO_LocalInterfaceDef_i::def_kind (void) +TAO_LocalInterfaceDef_i::def_kind () { return CORBA::dk_LocalInterface; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index 9f5b20010d0..ba036951827 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -14,18 +14,18 @@ TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo) { } -TAO_ModuleDef_i::~TAO_ModuleDef_i (void) +TAO_ModuleDef_i::~TAO_ModuleDef_i () { } CORBA::DefinitionKind -TAO_ModuleDef_i::def_kind (void) +TAO_ModuleDef_i::def_kind () { return CORBA::dk_Module; } void -TAO_ModuleDef_i::destroy (void) +TAO_ModuleDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -35,7 +35,7 @@ TAO_ModuleDef_i::destroy (void) } void -TAO_ModuleDef_i::destroy_i (void) +TAO_ModuleDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -45,7 +45,7 @@ TAO_ModuleDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ModuleDef_i::describe (void) +TAO_ModuleDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -55,7 +55,7 @@ TAO_ModuleDef_i::describe (void) } CORBA::Contained::Description * -TAO_ModuleDef_i::describe_i (void) +TAO_ModuleDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index d3bdb5e3192..4894451318a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -13,18 +13,18 @@ TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo) { } -TAO_NativeDef_i::~TAO_NativeDef_i (void) +TAO_NativeDef_i::~TAO_NativeDef_i () { } CORBA::DefinitionKind -TAO_NativeDef_i::def_kind (void) +TAO_NativeDef_i::def_kind () { return CORBA::dk_Native; } CORBA::TypeCode_ptr -TAO_NativeDef_i::type (void) +TAO_NativeDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -34,7 +34,7 @@ TAO_NativeDef_i::type (void) } CORBA::TypeCode_ptr -TAO_NativeDef_i::type_i (void) +TAO_NativeDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 73c79b50ff2..e4981989d82 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -19,12 +19,12 @@ TAO_OperationDef_i::TAO_OperationDef_i ( { } -TAO_OperationDef_i::~TAO_OperationDef_i (void) +TAO_OperationDef_i::~TAO_OperationDef_i () { } CORBA::DefinitionKind -TAO_OperationDef_i::def_kind (void) +TAO_OperationDef_i::def_kind () { return CORBA::dk_Operation; } @@ -60,7 +60,7 @@ TAO_OperationDef_i::describe_i ( ) } CORBA::TypeCode_ptr -TAO_OperationDef_i::result (void) +TAO_OperationDef_i::result () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -70,7 +70,7 @@ TAO_OperationDef_i::result (void) } CORBA::TypeCode_ptr -TAO_OperationDef_i::result_i (void) +TAO_OperationDef_i::result_i () { ACE_TString result_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -86,7 +86,7 @@ TAO_OperationDef_i::result_i (void) } CORBA::IDLType_ptr -TAO_OperationDef_i::result_def (void) +TAO_OperationDef_i::result_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -96,7 +96,7 @@ TAO_OperationDef_i::result_def (void) } CORBA::IDLType_ptr -TAO_OperationDef_i::result_def_i (void) +TAO_OperationDef_i::result_def_i () { ACE_TString result_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -132,7 +132,7 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def) } CORBA::ParDescriptionSeq * -TAO_OperationDef_i::params (void) +TAO_OperationDef_i::params () { TAO_IFR_READ_GUARD_RETURN (0); @@ -142,7 +142,7 @@ TAO_OperationDef_i::params (void) } CORBA::ParDescriptionSeq * -TAO_OperationDef_i::params_i (void) +TAO_OperationDef_i::params_i () { CORBA::ULong i = 0; ACE_Configuration_Section_Key params_key; @@ -307,7 +307,7 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq ¶ms) } CORBA::OperationMode -TAO_OperationDef_i::mode (void) +TAO_OperationDef_i::mode () { TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL); @@ -317,7 +317,7 @@ TAO_OperationDef_i::mode (void) } CORBA::OperationMode -TAO_OperationDef_i::mode_i (void) +TAO_OperationDef_i::mode_i () { u_int mode; this->repo_->config ()->get_integer_value (this->section_key_, @@ -346,7 +346,7 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode) } CORBA::ContextIdSeq * -TAO_OperationDef_i::contexts (void) +TAO_OperationDef_i::contexts () { TAO_IFR_READ_GUARD_RETURN (0); @@ -356,7 +356,7 @@ TAO_OperationDef_i::contexts (void) } CORBA::ContextIdSeq * -TAO_OperationDef_i::contexts_i (void) +TAO_OperationDef_i::contexts_i () { ACE_Configuration_Section_Key contexts_key; int status = @@ -665,7 +665,7 @@ TAO_OperationDef_i::make_description ( } CORBA::TypeCode_ptr -TAO_OperationDef_i::type_i (void) +TAO_OperationDef_i::type_i () { return this->result_i (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index dd6ba317df2..2c545920ee0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -90,37 +90,37 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } const char * -Options::ior_output_file (void) const +Options::ior_output_file () const { return this->ior_output_file_; } int -Options::persistent (void) const +Options::persistent () const { return this->persistent_; } const char * -Options::persistent_file (void) const +Options::persistent_file () const { return this->persistent_file_; } int -Options::using_registry (void) const +Options::using_registry () const { return this->using_registry_; } int -Options::enable_locking (void) const +Options::enable_locking () const { return this->enable_locking_; } int -Options::support_multicast_discovery (void) const +Options::support_multicast_discovery () const { return this->support_multicast_; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 44af15021ad..b0435b983fc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -9,30 +9,30 @@ TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (TAO_Repository_i *repo) { } -TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void) +TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i () { } CORBA::DefinitionKind -TAO_PrimitiveDef_i::def_kind (void) +TAO_PrimitiveDef_i::def_kind () { return CORBA::dk_Primitive; } void -TAO_PrimitiveDef_i::destroy (void) +TAO_PrimitiveDef_i::destroy () { this->destroy_i (); } void -TAO_PrimitiveDef_i::destroy_i (void) +TAO_PrimitiveDef_i::destroy_i () { throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type (void) +TAO_PrimitiveDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -42,7 +42,7 @@ TAO_PrimitiveDef_i::type (void) } CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type_i (void) +TAO_PrimitiveDef_i::type_i () { u_int pkind = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -101,7 +101,7 @@ TAO_PrimitiveDef_i::type_i (void) } CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind (void) +TAO_PrimitiveDef_i::kind () { TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null); @@ -111,7 +111,7 @@ TAO_PrimitiveDef_i::kind (void) } CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind_i (void) +TAO_PrimitiveDef_i::kind_i () { u_int pkind = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index 796f36acfb2..55edddb4cc4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -12,18 +12,18 @@ TAO_ProvidesDef_i::TAO_ProvidesDef_i (TAO_Repository_i *repo) { } -TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void) +TAO_ProvidesDef_i::~TAO_ProvidesDef_i () { } CORBA::DefinitionKind -TAO_ProvidesDef_i::def_kind (void) +TAO_ProvidesDef_i::def_kind () { return CORBA::dk_Provides; } CORBA::Contained::Description * -TAO_ProvidesDef_i::describe (void) +TAO_ProvidesDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -33,7 +33,7 @@ TAO_ProvidesDef_i::describe (void) } CORBA::Contained::Description * -TAO_ProvidesDef_i::describe_i (void) +TAO_ProvidesDef_i::describe_i () { CORBA::ComponentIR::ProvidesDescription pd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::ProvidesDescription, @@ -60,7 +60,7 @@ TAO_ProvidesDef_i::describe_i (void) } CORBA::InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type (void) +TAO_ProvidesDef_i::interface_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); @@ -70,7 +70,7 @@ TAO_ProvidesDef_i::interface_type (void) } CORBA::InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type_i (void) +TAO_ProvidesDef_i::interface_type_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index 40f64d82e02..c9531a80fb3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -9,12 +9,12 @@ TAO_PublishesDef_i::TAO_PublishesDef_i (TAO_Repository_i *repo) { } -TAO_PublishesDef_i::~TAO_PublishesDef_i (void) +TAO_PublishesDef_i::~TAO_PublishesDef_i () { } CORBA::DefinitionKind -TAO_PublishesDef_i::def_kind (void) +TAO_PublishesDef_i::def_kind () { return CORBA::dk_Publishes; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 3711e269ef8..54778f26be8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -28,19 +28,19 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, { } -TAO_Repository_i::~TAO_Repository_i (void) +TAO_Repository_i::~TAO_Repository_i () { delete this->lock_; } CORBA::DefinitionKind -TAO_Repository_i::def_kind (void) +TAO_Repository_i::def_kind () { return CORBA::dk_Repository; } void -TAO_Repository_i::destroy (void) +TAO_Repository_i::destroy () { throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } @@ -549,7 +549,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref, } int -TAO_Repository_i::create_sections (void) +TAO_Repository_i::create_sections () { this->config_->open_section (config_->root_section (), "root", @@ -680,7 +680,7 @@ TAO_Repository_i::create_sections (void) } int -TAO_Repository_i::create_servants_and_poas (void) +TAO_Repository_i::create_servants_and_poas () { CORBA::PolicyList policies (5); policies.length (5); @@ -913,25 +913,25 @@ TAO_Repository_i::select_poa (CORBA::DefinitionKind def_kind) const } PortableServer::Current_ptr -TAO_Repository_i::poa_current (void) const +TAO_Repository_i::poa_current () const { return this->poa_current_.in (); } ACE_Configuration * -TAO_Repository_i::config (void) const +TAO_Repository_i::config () const { return this->config_; } CORBA::TypeCodeFactory_ptr -TAO_Repository_i::tc_factory (void) const +TAO_Repository_i::tc_factory () const { return this->tc_factory_.in (); } CORBA::Repository_ptr -TAO_Repository_i::repo_objref (void) const +TAO_Repository_i::repo_objref () const { return CORBA::Repository::_duplicate (this->repo_objref_.in ()); } @@ -943,61 +943,61 @@ TAO_Repository_i::repo_objref (CORBA::Repository_ptr objref) } ACE_Configuration_Section_Key -TAO_Repository_i::root_key (void) const +TAO_Repository_i::root_key () const { return this->root_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::repo_ids_key (void) const +TAO_Repository_i::repo_ids_key () const { return this->repo_ids_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::pkinds_key (void) const +TAO_Repository_i::pkinds_key () const { return this->pkinds_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::strings_key (void) const +TAO_Repository_i::strings_key () const { return this->strings_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::wstrings_key (void) const +TAO_Repository_i::wstrings_key () const { return this->wstrings_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::fixeds_key (void) const +TAO_Repository_i::fixeds_key () const { return this->fixeds_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::arrays_key (void) const +TAO_Repository_i::arrays_key () const { return this->arrays_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::sequences_key (void) const +TAO_Repository_i::sequences_key () const { return this->sequences_key_; } const char * -TAO_Repository_i::extension (void) const +TAO_Repository_i::extension () const { return this->extension_.in (); } ACE_Lock & -TAO_Repository_i::lock (void) const +TAO_Repository_i::lock () const { return *this->lock_; } @@ -1035,14 +1035,14 @@ TAO_Repository_i::pkind_to_string (CORBA::PrimitiveKind pkind) const } u_int -TAO_Repository_i::num_pkinds (void) const +TAO_Repository_i::num_pkinds () const { return sizeof (TAO_Repository_i::TAO_IFR_primitive_kinds) / sizeof (char*); } // For debugging use only. void -TAO_Repository_i::shutdown (void) +TAO_Repository_i::shutdown () { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index 3badf1b343e..d537a2c5d90 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -13,18 +13,18 @@ TAO_SequenceDef_i::TAO_SequenceDef_i (TAO_Repository_i *repo) { } -TAO_SequenceDef_i::~TAO_SequenceDef_i (void) +TAO_SequenceDef_i::~TAO_SequenceDef_i () { } CORBA::DefinitionKind -TAO_SequenceDef_i::def_kind (void) +TAO_SequenceDef_i::def_kind () { return CORBA::dk_Sequence; } void -TAO_SequenceDef_i::destroy (void) +TAO_SequenceDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -34,7 +34,7 @@ TAO_SequenceDef_i::destroy (void) } void -TAO_SequenceDef_i::destroy_i (void) +TAO_SequenceDef_i::destroy_i () { // Only if it is (w)string, fixed, array or sequence. this->destroy_element_type (); @@ -50,7 +50,7 @@ TAO_SequenceDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type (void) +TAO_SequenceDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -60,7 +60,7 @@ TAO_SequenceDef_i::type (void) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type_i (void) +TAO_SequenceDef_i::type_i () { CORBA::TypeCode_var element_typecode = this->element_type_i (); @@ -74,7 +74,7 @@ TAO_SequenceDef_i::type_i (void) } CORBA::ULong -TAO_SequenceDef_i::bound (void) +TAO_SequenceDef_i::bound () { TAO_IFR_READ_GUARD_RETURN (0); @@ -84,7 +84,7 @@ TAO_SequenceDef_i::bound (void) } CORBA::ULong -TAO_SequenceDef_i::bound_i (void) +TAO_SequenceDef_i::bound_i () { u_int bound = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -111,7 +111,7 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type (void) +TAO_SequenceDef_i::element_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -121,7 +121,7 @@ TAO_SequenceDef_i::element_type (void) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type_i (void) +TAO_SequenceDef_i::element_type_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -136,7 +136,7 @@ TAO_SequenceDef_i::element_type_i (void) } CORBA::IDLType_ptr -TAO_SequenceDef_i::element_type_def (void) +TAO_SequenceDef_i::element_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -146,7 +146,7 @@ TAO_SequenceDef_i::element_type_def (void) } CORBA::IDLType_ptr -TAO_SequenceDef_i::element_type_def_i (void) +TAO_SequenceDef_i::element_type_def_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index d065fb17b9f..b316c778ed6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -11,18 +11,18 @@ TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo) { } -TAO_StringDef_i::~TAO_StringDef_i (void) +TAO_StringDef_i::~TAO_StringDef_i () { } CORBA::DefinitionKind -TAO_StringDef_i::def_kind (void) +TAO_StringDef_i::def_kind () { return CORBA::dk_String; } void -TAO_StringDef_i::destroy (void) +TAO_StringDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -32,7 +32,7 @@ TAO_StringDef_i::destroy (void) } void -TAO_StringDef_i::destroy_i (void) +TAO_StringDef_i::destroy_i () { ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, @@ -45,7 +45,7 @@ TAO_StringDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_StringDef_i::type (void) +TAO_StringDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -55,7 +55,7 @@ TAO_StringDef_i::type (void) } CORBA::TypeCode_ptr -TAO_StringDef_i::type_i (void) +TAO_StringDef_i::type_i () { CORBA::ULong bound = this->bound_i (); @@ -65,7 +65,7 @@ TAO_StringDef_i::type_i (void) } CORBA::ULong -TAO_StringDef_i::bound (void) +TAO_StringDef_i::bound () { TAO_IFR_READ_GUARD_RETURN (0); @@ -75,7 +75,7 @@ TAO_StringDef_i::bound (void) } CORBA::ULong -TAO_StringDef_i::bound_i (void) +TAO_StringDef_i::bound_i () { u_int retval = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index a5586fd2f8b..b085d10321a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -17,18 +17,18 @@ TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo) { } -TAO_StructDef_i::~TAO_StructDef_i (void) +TAO_StructDef_i::~TAO_StructDef_i () { } CORBA::DefinitionKind -TAO_StructDef_i::def_kind (void) +TAO_StructDef_i::def_kind () { return CORBA::dk_Struct; } void -TAO_StructDef_i::destroy (void) +TAO_StructDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -38,7 +38,7 @@ TAO_StructDef_i::destroy (void) } void -TAO_StructDef_i::destroy_i (void) +TAO_StructDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -48,7 +48,7 @@ TAO_StructDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_StructDef_i::type (void) +TAO_StructDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -58,7 +58,7 @@ TAO_StructDef_i::type (void) } CORBA::TypeCode_ptr -TAO_StructDef_i::type_i (void) +TAO_StructDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -97,7 +97,7 @@ TAO_StructDef_i::type_i (void) } CORBA::StructMemberSeq * -TAO_StructDef_i::members (void) +TAO_StructDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -107,7 +107,7 @@ TAO_StructDef_i::members (void) } CORBA::StructMemberSeq * -TAO_StructDef_i::members_i (void) +TAO_StructDef_i::members_i () { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index 486c5fd408b..27aff95a6a3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -12,12 +12,12 @@ TAO_TypedefDef_i::TAO_TypedefDef_i (TAO_Repository_i *repo) { } -TAO_TypedefDef_i::~TAO_TypedefDef_i (void) +TAO_TypedefDef_i::~TAO_TypedefDef_i () { } CORBA::Contained::Description * -TAO_TypedefDef_i::describe (void) +TAO_TypedefDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -27,7 +27,7 @@ TAO_TypedefDef_i::describe (void) } CORBA::Contained::Description * -TAO_TypedefDef_i::describe_i (void) +TAO_TypedefDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index e77bcc3742a..99eac21a96a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -20,18 +20,18 @@ TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo) { } -TAO_UnionDef_i::~TAO_UnionDef_i (void) +TAO_UnionDef_i::~TAO_UnionDef_i () { } CORBA::DefinitionKind -TAO_UnionDef_i::def_kind (void) +TAO_UnionDef_i::def_kind () { return CORBA::dk_Union; } void -TAO_UnionDef_i::destroy (void) +TAO_UnionDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -41,7 +41,7 @@ TAO_UnionDef_i::destroy (void) } void -TAO_UnionDef_i::destroy_i (void) +TAO_UnionDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -51,7 +51,7 @@ TAO_UnionDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::type (void) +TAO_UnionDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -61,7 +61,7 @@ TAO_UnionDef_i::type (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::type_i (void) +TAO_UnionDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -103,7 +103,7 @@ TAO_UnionDef_i::type_i (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type (void) +TAO_UnionDef_i::discriminator_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -113,7 +113,7 @@ TAO_UnionDef_i::discriminator_type (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type_i (void) +TAO_UnionDef_i::discriminator_type_i () { ACE_TString disc_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -132,7 +132,7 @@ TAO_UnionDef_i::discriminator_type_i (void) } CORBA::IDLType_ptr -TAO_UnionDef_i::discriminator_type_def (void) +TAO_UnionDef_i::discriminator_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -142,7 +142,7 @@ TAO_UnionDef_i::discriminator_type_def (void) } CORBA::IDLType_ptr -TAO_UnionDef_i::discriminator_type_def_i (void) +TAO_UnionDef_i::discriminator_type_def_i () { ACE_TString disc_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -182,7 +182,7 @@ TAO_UnionDef_i::discriminator_type_def_i ( } CORBA::UnionMemberSeq * -TAO_UnionDef_i::members (void) +TAO_UnionDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -192,7 +192,7 @@ TAO_UnionDef_i::members (void) } CORBA::UnionMemberSeq * -TAO_UnionDef_i::members_i (void) +TAO_UnionDef_i::members_i () { ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 7c8b1435634..a872766822f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -13,18 +13,18 @@ TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo) { } -TAO_UsesDef_i::~TAO_UsesDef_i (void) +TAO_UsesDef_i::~TAO_UsesDef_i () { } CORBA::DefinitionKind -TAO_UsesDef_i::def_kind (void) +TAO_UsesDef_i::def_kind () { return CORBA::dk_Uses; } CORBA::Contained::Description * -TAO_UsesDef_i::describe (void) +TAO_UsesDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -34,7 +34,7 @@ TAO_UsesDef_i::describe (void) } CORBA::Contained::Description * -TAO_UsesDef_i::describe_i (void) +TAO_UsesDef_i::describe_i () { CORBA::ComponentIR::UsesDescription ud; TAO_IFR_Desc_Utils<CORBA::ComponentIR::UsesDescription, @@ -62,7 +62,7 @@ TAO_UsesDef_i::describe_i (void) } CORBA::InterfaceDef_ptr -TAO_UsesDef_i::interface_type (void) +TAO_UsesDef_i::interface_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); @@ -72,7 +72,7 @@ TAO_UsesDef_i::interface_type (void) } CORBA::InterfaceDef_ptr -TAO_UsesDef_i::interface_type_i (void) +TAO_UsesDef_i::interface_type_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -135,7 +135,7 @@ TAO_UsesDef_i::interface_type_i ( } CORBA::Boolean -TAO_UsesDef_i::is_multiple (void) +TAO_UsesDef_i::is_multiple () { TAO_IFR_READ_GUARD_RETURN (0); @@ -145,7 +145,7 @@ TAO_UsesDef_i::is_multiple (void) } CORBA::Boolean -TAO_UsesDef_i::is_multiple_i (void) +TAO_UsesDef_i::is_multiple_i () { CORBA::ULong val = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index 178c524cd76..496a915607b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -17,18 +17,18 @@ TAO_ValueBoxDef_i::TAO_ValueBoxDef_i ( { } -TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void) +TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i () { } CORBA::DefinitionKind -TAO_ValueBoxDef_i::def_kind (void) +TAO_ValueBoxDef_i::def_kind () { return CORBA::dk_ValueBox; } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type (void) +TAO_ValueBoxDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -38,7 +38,7 @@ TAO_ValueBoxDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type_i (void) +TAO_ValueBoxDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -67,7 +67,7 @@ TAO_ValueBoxDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_ValueBoxDef_i::original_type_def (void) +TAO_ValueBoxDef_i::original_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -77,7 +77,7 @@ TAO_ValueBoxDef_i::original_type_def (void) } CORBA::IDLType_ptr -TAO_ValueBoxDef_i::original_type_def_i (void) +TAO_ValueBoxDef_i::original_type_def_i () { ACE_TString boxed_type_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index b79502df952..304a998ca67 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -17,18 +17,18 @@ TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo) { } -TAO_ValueDef_i::~TAO_ValueDef_i (void) +TAO_ValueDef_i::~TAO_ValueDef_i () { } CORBA::DefinitionKind -TAO_ValueDef_i::def_kind (void) +TAO_ValueDef_i::def_kind () { return CORBA::dk_Value; } void -TAO_ValueDef_i::destroy (void) +TAO_ValueDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -38,7 +38,7 @@ TAO_ValueDef_i::destroy (void) } void -TAO_ValueDef_i::destroy_i (void) +TAO_ValueDef_i::destroy_i () { this->TAO_Container_i::destroy_i (); @@ -60,7 +60,7 @@ TAO_ValueDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ValueDef_i::describe (void) +TAO_ValueDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -70,7 +70,7 @@ TAO_ValueDef_i::describe (void) } CORBA::Contained::Description * -TAO_ValueDef_i::describe_i (void) +TAO_ValueDef_i::describe_i () { CORBA::ValueDescription *vd = 0; ACE_NEW_RETURN (vd, @@ -91,7 +91,7 @@ TAO_ValueDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ValueDef_i::type (void) +TAO_ValueDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -101,7 +101,7 @@ TAO_ValueDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ValueDef_i::type_i (void) +TAO_ValueDef_i::type_i () { /// Since valuetype type codes may encapsultate the type code of a /// base class, this call could be recursive, with the @@ -113,7 +113,7 @@ TAO_ValueDef_i::type_i (void) } CORBA::InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces (void) +TAO_ValueDef_i::supported_interfaces () { TAO_IFR_READ_GUARD_RETURN (0); @@ -123,7 +123,7 @@ TAO_ValueDef_i::supported_interfaces (void) } CORBA::InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces_i (void) +TAO_ValueDef_i::supported_interfaces_i () { CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_RETURN (seq, @@ -257,7 +257,7 @@ TAO_ValueDef_i::supported_interfaces_i ( } CORBA::InitializerSeq * -TAO_ValueDef_i::initializers (void) +TAO_ValueDef_i::initializers () { TAO_IFR_READ_GUARD_RETURN (0); @@ -267,7 +267,7 @@ TAO_ValueDef_i::initializers (void) } CORBA::InitializerSeq * -TAO_ValueDef_i::initializers_i (void) +TAO_ValueDef_i::initializers_i () { CORBA::InitializerSeq *iseq = 0; ACE_NEW_RETURN (iseq, @@ -383,7 +383,7 @@ TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers) } CORBA::ValueDef_ptr -TAO_ValueDef_i::base_value (void) +TAO_ValueDef_i::base_value () { TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); @@ -393,7 +393,7 @@ TAO_ValueDef_i::base_value (void) } CORBA::ValueDef_ptr -TAO_ValueDef_i::base_value_i (void) +TAO_ValueDef_i::base_value_i () { ACE_TString base_path; int status = @@ -458,7 +458,7 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value) } CORBA::ValueDefSeq * -TAO_ValueDef_i::abstract_base_values (void) +TAO_ValueDef_i::abstract_base_values () { TAO_IFR_READ_GUARD_RETURN (0); @@ -468,7 +468,7 @@ TAO_ValueDef_i::abstract_base_values (void) } CORBA::ValueDefSeq * -TAO_ValueDef_i::abstract_base_values_i (void) +TAO_ValueDef_i::abstract_base_values_i () { CORBA::ValueDefSeq *vd_seq = 0; ACE_NEW_RETURN (vd_seq, @@ -585,7 +585,7 @@ TAO_ValueDef_i::abstract_base_values_i ( } CORBA::Boolean -TAO_ValueDef_i::is_abstract (void) +TAO_ValueDef_i::is_abstract () { TAO_IFR_READ_GUARD_RETURN (0); @@ -595,7 +595,7 @@ TAO_ValueDef_i::is_abstract (void) } CORBA::Boolean -TAO_ValueDef_i::is_abstract_i (void) +TAO_ValueDef_i::is_abstract_i () { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -624,7 +624,7 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract) } CORBA::Boolean -TAO_ValueDef_i::is_custom (void) +TAO_ValueDef_i::is_custom () { TAO_IFR_READ_GUARD_RETURN (0); @@ -634,7 +634,7 @@ TAO_ValueDef_i::is_custom (void) } CORBA::Boolean -TAO_ValueDef_i::is_custom_i (void) +TAO_ValueDef_i::is_custom_i () { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -663,7 +663,7 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom) } CORBA::Boolean -TAO_ValueDef_i::is_truncatable (void) +TAO_ValueDef_i::is_truncatable () { TAO_IFR_READ_GUARD_RETURN (0); @@ -673,7 +673,7 @@ TAO_ValueDef_i::is_truncatable (void) } CORBA::Boolean -TAO_ValueDef_i::is_truncatable_i (void) +TAO_ValueDef_i::is_truncatable_i () { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -800,7 +800,7 @@ TAO_ValueDef_i::is_a_i (const char *id) } CORBA::ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value (void) +TAO_ValueDef_i::describe_value () { TAO_IFR_READ_GUARD_RETURN (0); @@ -810,7 +810,7 @@ TAO_ValueDef_i::describe_value (void) } CORBA::ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value_i (void) +TAO_ValueDef_i::describe_value_i () { CORBA::ValueDef::FullValueDescription *fv_desc = 0; ACE_NEW_RETURN (fv_desc, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index d446026e696..332b6004b6c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -14,18 +14,18 @@ TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (TAO_Repository_i *repo) { } -TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void) +TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i () { } CORBA::DefinitionKind -TAO_ValueMemberDef_i::def_kind (void) +TAO_ValueMemberDef_i::def_kind () { return CORBA::dk_ValueMember; } CORBA::Contained::Description * -TAO_ValueMemberDef_i::describe (void) +TAO_ValueMemberDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -35,7 +35,7 @@ TAO_ValueMemberDef_i::describe (void) } CORBA::Contained::Description * -TAO_ValueMemberDef_i::describe_i (void) +TAO_ValueMemberDef_i::describe_i () { CORBA::ValueMember vm; TAO_IFR_Desc_Utils<CORBA::ValueMember, @@ -74,7 +74,7 @@ TAO_ValueMemberDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type (void) +TAO_ValueMemberDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -84,7 +84,7 @@ TAO_ValueMemberDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type_i (void) +TAO_ValueMemberDef_i::type_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -97,7 +97,7 @@ TAO_ValueMemberDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_ValueMemberDef_i::type_def (void) +TAO_ValueMemberDef_i::type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -107,7 +107,7 @@ TAO_ValueMemberDef_i::type_def (void) } CORBA::IDLType_ptr -TAO_ValueMemberDef_i::type_def_i (void) +TAO_ValueMemberDef_i::type_def_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -140,7 +140,7 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def) } CORBA::Visibility -TAO_ValueMemberDef_i::access (void) +TAO_ValueMemberDef_i::access () { TAO_IFR_READ_GUARD_RETURN (0); @@ -150,7 +150,7 @@ TAO_ValueMemberDef_i::access (void) } CORBA::Visibility -TAO_ValueMemberDef_i::access_i (void) +TAO_ValueMemberDef_i::access_i () { CORBA::ULong val = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 5c1227b73f8..20c871b11fa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -11,18 +11,18 @@ TAO_WstringDef_i::TAO_WstringDef_i (TAO_Repository_i *repo) { } -TAO_WstringDef_i::~TAO_WstringDef_i (void) +TAO_WstringDef_i::~TAO_WstringDef_i () { } CORBA::DefinitionKind -TAO_WstringDef_i::def_kind (void) +TAO_WstringDef_i::def_kind () { return CORBA::dk_Wstring; } void -TAO_WstringDef_i::destroy (void) +TAO_WstringDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -32,7 +32,7 @@ TAO_WstringDef_i::destroy (void) } void -TAO_WstringDef_i::destroy_i (void) +TAO_WstringDef_i::destroy_i () { ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, @@ -45,7 +45,7 @@ TAO_WstringDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_WstringDef_i::type (void) +TAO_WstringDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -55,14 +55,14 @@ TAO_WstringDef_i::type (void) } CORBA::TypeCode_ptr -TAO_WstringDef_i::type_i (void) +TAO_WstringDef_i::type_i () { CORBA::ULong bound = this->bound_i (); return this->repo_->tc_factory ()->create_wstring_tc (bound); } CORBA::ULong -TAO_WstringDef_i::bound (void) +TAO_WstringDef_i::bound () { TAO_IFR_READ_GUARD_RETURN (0); @@ -73,7 +73,7 @@ TAO_WstringDef_i::bound (void) CORBA::ULong -TAO_WstringDef_i::bound_i (void) +TAO_WstringDef_i::bound_i () { u_int retval = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 8d99f155162..67d80c65ad3 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_HANDLE -TAO_IOR_Multicast::get_handle (void) const +TAO_IOR_Multicast::get_handle () const { return this->mcast_dgram_.get_handle (); } -TAO_IOR_Multicast::TAO_IOR_Multicast (void) +TAO_IOR_Multicast::TAO_IOR_Multicast () : service_id_ ((TAO_Service_ID) 0) { } @@ -32,7 +32,7 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior, ACE_TEXT ("TAO_IOR_Multicast"))); } -TAO_IOR_Multicast::~TAO_IOR_Multicast (void) +TAO_IOR_Multicast::~TAO_IOR_Multicast () { if (ior_.length() > 0 && this->mcast_dgram_.leave (this->mcast_addr_) == -1) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index cae9a5df6bf..184f5c13129 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -51,12 +51,12 @@ TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor ( } } -TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void) +TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor () { } CosLoadBalancing::Location * -TAO_LB_CPU_Load_Average_Monitor::the_location (void) +TAO_LB_CPU_Load_Average_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -71,7 +71,7 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void) } CosLoadBalancing::LoadList * -TAO_LB_CPU_Load_Average_Monitor::loads (void) +TAO_LB_CPU_Load_Average_Monitor::loads () { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 18568bc60e9..140d1fd5f2d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -double calc_cpu_loading (void) +double calc_cpu_loading () { static char buf[1024]; static unsigned long prev_idle = 0; @@ -100,12 +100,12 @@ TAO_LB_CPU_Utilization_Monitor::TAO_LB_CPU_Utilization_Monitor (const char * loc } } -TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void) +TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor () { } CosLoadBalancing::Location * -TAO_LB_CPU_Utilization_Monitor::the_location (void) +TAO_LB_CPU_Utilization_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -120,7 +120,7 @@ TAO_LB_CPU_Utilization_Monitor::the_location (void) } CosLoadBalancing::LoadList * -TAO_LB_CPU_Utilization_Monitor::loads (void) +TAO_LB_CPU_Utilization_Monitor::loads () { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index e8b7ed58bdd..434337ec336 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -13,13 +13,13 @@ TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[]) } int -TAO_LB_ClientComponent::fini (void) +TAO_LB_ClientComponent::fini () { return 0; } int -TAO_LB_ClientComponent::register_orb_initializer (void) +TAO_LB_ClientComponent::register_orb_initializer () { try { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index f0db0d42c80..60aff63da0d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -10,7 +10,7 @@ TAO_LB_ClientRequestInterceptor::name () } void -TAO_LB_ClientRequestInterceptor::destroy (void) +TAO_LB_ClientRequestInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 0094a7f89cb..7346bc1e73e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -84,7 +84,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) } int -TAO_LB_Component::fini (void) +TAO_LB_Component::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index cd1014d001f..daf9dfa2485 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -26,13 +26,13 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor ( } char * -TAO_LB_IORInterceptor::name (void) +TAO_LB_IORInterceptor::name () { return CORBA::string_dup ("TAO_LB_IORInterceptor"); } void -TAO_LB_IORInterceptor::destroy (void) +TAO_LB_IORInterceptor::destroy () { // Force the LoadManager reference to be released since the ORB's // lifetime is tied to object reference lifetimes. @@ -101,7 +101,7 @@ TAO_LB_IORInterceptor::adapter_state_changed ( } void -TAO_LB_IORInterceptor::register_load_alert (void) +TAO_LB_IORInterceptor::register_load_alert () { { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 7768d687e3f..91e605558eb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -41,20 +41,20 @@ TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void) +TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LeastLoaded::name (void) +TAO_LB_LeastLoaded::name () { return CORBA::string_dup ("LeastLoaded"); } CosLoadBalancing::Properties * -TAO_LB_LeastLoaded::get_properties (void) +TAO_LB_LeastLoaded::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -293,7 +293,7 @@ TAO_LB_LeastLoaded::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LeastLoaded::_default_POA (void) +TAO_LB_LeastLoaded::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index dab05290bac..a1fccfa31cd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -6,18 +6,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlert::TAO_LB_LoadAlert (void) +TAO_LB_LoadAlert::TAO_LB_LoadAlert () : alerted_ (0), lock_ () { } -TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) +TAO_LB_LoadAlert::~TAO_LB_LoadAlert () { } void -TAO_LB_LoadAlert::enable_alert (void) +TAO_LB_LoadAlert::enable_alert () { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -25,7 +25,7 @@ TAO_LB_LoadAlert::enable_alert (void) } void -TAO_LB_LoadAlert::disable_alert (void) +TAO_LB_LoadAlert::disable_alert () { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index fbba4fb425c..d19c4b29ddf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void) +TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo () : load_alert (), alerted (0) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index 0492f39e912..7a55a8bf123 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void) +TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler () { } void -TAO_LB_LoadAlert_Handler::enable_alert (void) +TAO_LB_LoadAlert_Handler::enable_alert () { } @@ -24,7 +24,7 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep ( } void -TAO_LB_LoadAlert_Handler::disable_alert (void) +TAO_LB_LoadAlert_Handler::disable_alert () { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 506b720ddb1..65b656bdee4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -39,20 +39,20 @@ TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void) +TAO_LB_LoadAverage::~TAO_LB_LoadAverage () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LoadAverage::name (void) +TAO_LB_LoadAverage::name () { return CORBA::string_dup ("LoadAverage"); } CosLoadBalancing::Properties * -TAO_LB_LoadAverage::get_properties (void) +TAO_LB_LoadAverage::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -320,7 +320,7 @@ TAO_LB_LoadAverage::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LoadAverage::_default_POA (void) +TAO_LB_LoadAverage::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 93b1d34637b..b5fb4e0a12f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -66,7 +66,7 @@ TAO_LB_LoadManager::TAO_LB_LoadManager (int ping_timeout, // by whatever code instantiates this LoadManager. } -TAO_LB_LoadManager::~TAO_LB_LoadManager (void) +TAO_LB_LoadManager::~TAO_LB_LoadManager () { this->shutdown_ = true; this->validate_condition_.signal (); @@ -1162,7 +1162,7 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) int -TAO_LB_LoadManager::svc (void) +TAO_LB_LoadManager::svc () { while (! this->shutdown_) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 506deccc859..3f09e937742 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -40,20 +40,20 @@ TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void) +TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LoadMinimum::name (void) +TAO_LB_LoadMinimum::name () { return CORBA::string_dup ("LoadMinimum"); } CosLoadBalancing::Properties * -TAO_LB_LoadMinimum::get_properties (void) +TAO_LB_LoadMinimum::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -357,7 +357,7 @@ TAO_LB_LoadMinimum::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LoadMinimum::_default_POA (void) +TAO_LB_LoadMinimum::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 90fda5e5db8..31b974fd655 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -47,14 +47,14 @@ TAO_LB_ObjectReferenceFactory::TAO_LB_ObjectReferenceFactory ( } ::CORBA::ValueBase * -TAO_LB_ObjectReferenceFactory::_copy_value (void) +TAO_LB_ObjectReferenceFactory::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented return ret_val; } -TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void) +TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory () { // No need to call CORBA::remove_ref() on this->old_orf_. It is a // "_var" object, meaning that will be done automatically. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index a84d6345130..6e44f3ce5d6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void) +TAO_LB_Pull_Handler::TAO_LB_Pull_Handler () : monitor_map_ (0), load_manager_ (0) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 96dcc7c5f31..12dc31cc68b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -23,13 +23,13 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa) } char * -TAO_LB_Random::name (void) +TAO_LB_Random::name () { return CORBA::string_dup ("Random"); } CosLoadBalancing::Properties * -TAO_LB_Random::get_properties (void) +TAO_LB_Random::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -85,7 +85,7 @@ TAO_LB_Random::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_Random::_default_POA (void) +TAO_LB_Random::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -133,7 +133,7 @@ TAO_LB_Random::_tao_next_member ( } void -TAO_LB_Random::init (void) +TAO_LB_Random::init () { #ifdef ACE_HAS_PTHREADS (void) ::pthread_once (&::tao_lb_once_control, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index cfddac5559a..23ab22f39c7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -15,18 +15,18 @@ TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa) { } -TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void) +TAO_LB_RoundRobin::~TAO_LB_RoundRobin () { } char * -TAO_LB_RoundRobin::name (void) +TAO_LB_RoundRobin::name () { return CORBA::string_dup ("RoundRobin"); } CosLoadBalancing::Properties * -TAO_LB_RoundRobin::get_properties (void) +TAO_LB_RoundRobin::get_properties () { // There are no RoundRobin properties. Return an empty property // list. @@ -182,7 +182,7 @@ TAO_LB_RoundRobin::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_RoundRobin::_default_POA (void) +TAO_LB_RoundRobin::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index 45b0749eb7e..b3a8dfa4f56 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -12,18 +12,18 @@ TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor ( { } -TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void) +TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor () { } char * -TAO_LB_ServerRequestInterceptor::name (void) +TAO_LB_ServerRequestInterceptor::name () { return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor"); } void -TAO_LB_ServerRequestInterceptor::destroy (void) +TAO_LB_ServerRequestInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 27860277a4f..a7295c933e3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -3,11 +3,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void) +TAO_BasicLogFactory_i::TAO_BasicLogFactory_i () { } -TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i (void) +TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index d55c9656420..b0b30c1bf4b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -15,7 +15,7 @@ TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb, // No-Op. } -TAO_BasicLog_i::~TAO_BasicLog_i (void) +TAO_BasicLog_i::~TAO_BasicLog_i () { // No-Op. } @@ -54,7 +54,7 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) } void -TAO_BasicLog_i::destroy (void) +TAO_BasicLog_i::destroy () { // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index abc0f9e0718..52752db1dff 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -9,7 +9,7 @@ TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log) { } -TAO_Event_LogConsumer::~TAO_Event_LogConsumer (void) +TAO_Event_LogConsumer::~TAO_Event_LogConsumer () { } @@ -79,7 +79,7 @@ TAO_Event_LogConsumer::push (const CORBA::Any& data) } void -TAO_Event_LogConsumer::disconnect_push_consumer (void) +TAO_Event_LogConsumer::disconnect_push_consumer () { this->supplier_proxy_->disconnect_push_supplier (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index bad86505f10..e16461a4c62 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) : +TAO_EventLogFactory_i::TAO_EventLogFactory_i () : impl (0), notifier_ (0) { @@ -33,7 +33,7 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) : } } -TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void) +TAO_EventLogFactory_i::~TAO_EventLogFactory_i () { // No-Op. } @@ -186,13 +186,13 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id) } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EventLogFactory_i::obtain_push_supplier (void) +TAO_EventLogFactory_i::obtain_push_supplier () { return consumer_admin_->obtain_push_supplier (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_EventLogFactory_i::obtain_pull_supplier (void) +TAO_EventLogFactory_i::obtain_pull_supplier () { return consumer_admin_->obtain_pull_supplier (); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 16e8d79994b..624b26e8946 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -11,13 +11,13 @@ TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventC obtain_proxy_consumer (); } -TAO_EventLogNotification::~TAO_EventLogNotification (void) +TAO_EventLogNotification::~TAO_EventLogNotification () { // No-Op. } void -TAO_EventLogNotification::disconnect_push_supplier (void) +TAO_EventLogNotification::disconnect_push_supplier () { this->consumer_->disconnect_push_consumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 90bb1ee624d..6ede219f2e6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -69,7 +69,7 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id) void -TAO_EventLog_i::destroy (void) +TAO_EventLog_i::destroy () { // Send event to indicate the log has been deleted. notifier_->object_deletion (logid_); @@ -85,7 +85,7 @@ TAO_EventLog_i::destroy (void) } void -TAO_EventLog_i::activate (void) +TAO_EventLog_i::activate () { CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = this->event_channel_->for_consumers (); @@ -97,13 +97,13 @@ TAO_EventLog_i::activate (void) CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_EventLog_i::for_consumers (void) +TAO_EventLog_i::for_consumers () { return this->event_channel_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_EventLog_i::for_suppliers (void) +TAO_EventLog_i::for_suppliers () { return this->event_channel_->for_suppliers (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index 6ad7296b210..25e6b7d1017 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -25,7 +25,7 @@ TAO_Hash_Iterator_i::TAO_Hash_Iterator_i ( } -TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i (void) +TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 961c2839023..93c5607b08d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -72,44 +72,44 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore ( log_poa->create_POA(buf, poa_manager.in(), policies); } -TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore (void) +TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore () { this->iterator_poa_->destroy (1, 0); } int -TAO_Hash_LogRecordStore::open (void) +TAO_Hash_LogRecordStore::open () { return rec_map_.open (); } int -TAO_Hash_LogRecordStore::close (void) +TAO_Hash_LogRecordStore::close () { // Close the hash return rec_map_.close (); } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_current_size (void) +TAO_Hash_LogRecordStore::get_current_size () { return this->current_size_; } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_n_records (void) +TAO_Hash_LogRecordStore::get_n_records () { return this->num_records_; } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_gauge (void) +TAO_Hash_LogRecordStore::get_gauge () { return this->gauge_; } void -TAO_Hash_LogRecordStore::reset_gauge (void) +TAO_Hash_LogRecordStore::reset_gauge () { this->gauge_ = 0; } @@ -209,7 +209,7 @@ TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter) } int -TAO_Hash_LogRecordStore::purge_old_records (void) +TAO_Hash_LogRecordStore::purge_old_records () { CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U; @@ -315,7 +315,7 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id) int -TAO_Hash_LogRecordStore::flush (void) +TAO_Hash_LogRecordStore::flush () { return 0; } @@ -543,7 +543,7 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i } CORBA::ULong -TAO_Hash_LogRecordStore::remove_old_records (void) +TAO_Hash_LogRecordStore::remove_old_records () { if (this->max_record_life_ == 0) { return 0; @@ -597,7 +597,7 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar) DsLogAdmin::AdministrativeState -TAO_Hash_LogRecordStore::get_administrative_state (void) const +TAO_Hash_LogRecordStore::get_administrative_state () const { return this->admin_state_; } @@ -610,7 +610,7 @@ TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeSta DsLogAdmin::CapacityAlarmThresholdList* -TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (void) const +TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds () const { DsLogAdmin::CapacityAlarmThresholdList* ret_val; ACE_NEW_THROW_EX (ret_val, @@ -629,7 +629,7 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci DsLogAdmin::ForwardingState -TAO_Hash_LogRecordStore::get_forwarding_state (void) const +TAO_Hash_LogRecordStore::get_forwarding_state () const { return this->forward_state_; } @@ -641,7 +641,7 @@ TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state } DsLogAdmin::TimeInterval -TAO_Hash_LogRecordStore::get_interval (void) const +TAO_Hash_LogRecordStore::get_interval () const { return this->interval_; } @@ -654,7 +654,7 @@ TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval) DsLogAdmin::LogFullActionType -TAO_Hash_LogRecordStore::get_log_full_action (void) const +TAO_Hash_LogRecordStore::get_log_full_action () const { return this->log_full_action_; } @@ -666,7 +666,7 @@ TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType acti } DsLogAdmin::QoSList * -TAO_Hash_LogRecordStore::get_log_qos (void) const +TAO_Hash_LogRecordStore::get_log_qos () const { DsLogAdmin::QoSList* ret_val = 0; ACE_NEW_THROW_EX (ret_val, @@ -683,7 +683,7 @@ TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos) } CORBA::ULong -TAO_Hash_LogRecordStore::get_max_record_life (void) const +TAO_Hash_LogRecordStore::get_max_record_life () const { return this->max_record_life_; } @@ -695,7 +695,7 @@ TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life) } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_max_size (void) const +TAO_Hash_LogRecordStore::get_max_size () const { return this->max_size_; } @@ -707,7 +707,7 @@ TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size) } DsLogAdmin::WeekMask* -TAO_Hash_LogRecordStore::get_week_mask (void) +TAO_Hash_LogRecordStore::get_week_mask () { DsLogAdmin::WeekMask* ret_val = 0; ACE_NEW_THROW_EX (ret_val, diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index 1cbfed1dc8c..1e539215ca0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -18,7 +18,7 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore() DsLogAdmin::LogList* -TAO_Hash_LogStore::list_logs (void) +TAO_Hash_LogStore::list_logs () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -54,7 +54,7 @@ TAO_Hash_LogStore::list_logs (void) } DsLogAdmin::LogIdList* -TAO_Hash_LogStore::list_logs_by_id (void) +TAO_Hash_LogStore::list_logs_by_id () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 751c18bdf8c..ae82ec30f30 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -19,7 +19,7 @@ TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa, } -TAO_Iterator_i::~TAO_Iterator_i (void) +TAO_Iterator_i::~TAO_Iterator_i () { // cancel timer if (this->timer_id_ != -1) @@ -30,7 +30,7 @@ TAO_Iterator_i::~TAO_Iterator_i (void) void -TAO_Iterator_i::destroy (void) +TAO_Iterator_i::destroy () { PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index f9db2b037ca..7c5977d684d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -146,14 +146,14 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id) } DsLogAdmin::LogList* -TAO_LogMgr_i::list_logs (void) +TAO_LogMgr_i::list_logs () { return this->logstore_->list_logs (); } DsLogAdmin::LogIdList* -TAO_LogMgr_i::list_logs_by_id (void) +TAO_LogMgr_i::list_logs_by_id () { return this->logstore_->list_logs_by_id (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 0e49232f712..44054f36974 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LogNotification::TAO_LogNotification (void) +TAO_LogNotification::TAO_LogNotification () { } -TAO_LogNotification::~TAO_LogNotification (void) +TAO_LogNotification::~TAO_LogNotification () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index dd2b50b8f31..cefd5f77fa7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -2,11 +2,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LogRecordStore::TAO_LogRecordStore (void) +TAO_LogRecordStore::TAO_LogRecordStore () { } -TAO_LogRecordStore::~TAO_LogRecordStore (void) +TAO_LogRecordStore::~TAO_LogRecordStore () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index c6799199f43..2aec6a518ba 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -24,7 +24,7 @@ TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter ( } } -TAO_Log_Constraint_Interpreter::~TAO_Log_Constraint_Interpreter (void) +TAO_Log_Constraint_Interpreter::~TAO_Log_Constraint_Interpreter () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index d3c65eac212..ce5d326a07d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -40,7 +40,7 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb, } void -TAO_Log_i::init (void) +TAO_Log_i::init () { this->log_ = logmgr_i_.create_log_reference (this->logid_); @@ -89,24 +89,24 @@ TAO_Log_i::init (void) this->op_state_ = DsLogAdmin::enabled; } -TAO_Log_i::~TAO_Log_i (void) +TAO_Log_i::~TAO_Log_i () { } DsLogAdmin::LogMgr_ptr -TAO_Log_i::my_factory (void) +TAO_Log_i::my_factory () { return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ()); } DsLogAdmin::LogId -TAO_Log_i::id (void) +TAO_Log_i::id () { return logid_; } DsLogAdmin::QoSList* -TAO_Log_i::get_log_qos (void) +TAO_Log_i::get_log_qos () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -172,7 +172,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos) } CORBA::ULong -TAO_Log_i::get_max_record_life (void) +TAO_Log_i::get_max_record_life () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -222,7 +222,7 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life) } CORBA::ULongLong -TAO_Log_i::get_max_size (void) +TAO_Log_i::get_max_size () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -293,7 +293,7 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size) } CORBA::ULongLong -TAO_Log_i::get_current_size (void) +TAO_Log_i::get_current_size () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -304,7 +304,7 @@ TAO_Log_i::get_current_size (void) } CORBA::ULongLong -TAO_Log_i::get_n_records (void) +TAO_Log_i::get_n_records () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -315,7 +315,7 @@ TAO_Log_i::get_n_records (void) } DsLogAdmin::LogFullActionType -TAO_Log_i::get_log_full_action (void) +TAO_Log_i::get_log_full_action () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -379,7 +379,7 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action) } DsLogAdmin::AdministrativeState -TAO_Log_i::get_administrative_state (void) +TAO_Log_i::get_administrative_state () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -422,7 +422,7 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state) } DsLogAdmin::ForwardingState -TAO_Log_i::get_forwarding_state (void) +TAO_Log_i::get_forwarding_state () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -466,7 +466,7 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state) } DsLogAdmin::OperationalState -TAO_Log_i::get_operational_state (void) +TAO_Log_i::get_operational_state () { // No locks are necessary, since op_state_ is set in ::init() and // never changed. @@ -474,7 +474,7 @@ TAO_Log_i::get_operational_state (void) } DsLogAdmin::TimeInterval -TAO_Log_i::get_interval (void) +TAO_Log_i::get_interval () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -536,7 +536,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval) } DsLogAdmin::AvailabilityStatus -TAO_Log_i::get_availability_status (void) +TAO_Log_i::get_availability_status () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -547,7 +547,7 @@ TAO_Log_i::get_availability_status (void) } DsLogAdmin::AvailabilityStatus -TAO_Log_i::get_availability_status_i (void) +TAO_Log_i::get_availability_status_i () { // The log is considered "on duty" if all the following are true: // * operational state is enabled @@ -575,7 +575,7 @@ TAO_Log_i::get_availability_status_i (void) } DsLogAdmin::CapacityAlarmThresholdList* -TAO_Log_i::get_capacity_alarm_thresholds (void) +TAO_Log_i::get_capacity_alarm_thresholds () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -645,7 +645,7 @@ TAO_Log_i::set_capacity_alarm_thresholds (const } DsLogAdmin::WeekMask* -TAO_Log_i::get_week_mask (void) +TAO_Log_i::get_week_mask () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -942,14 +942,14 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id) } void -TAO_Log_i::flush (void) +TAO_Log_i::flush () { /// XXX locks? this->recordstore_->flush (); } CORBA::Boolean -TAO_Log_i::scheduled (void) +TAO_Log_i::scheduled () { DsLogAdmin::TimeInterval interval = this->recordstore_->get_interval (); @@ -1043,7 +1043,7 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log) } void -TAO_Log_i::remove_old_records (void) +TAO_Log_i::remove_old_records () { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -1074,7 +1074,7 @@ TAO_Log_i::remove_old_records (void) } void -TAO_Log_i::check_capacity_alarm_threshold (void) +TAO_Log_i::check_capacity_alarm_threshold () { const CORBA::ULongLong max_size = this->recordstore_->get_max_size (); @@ -1135,7 +1135,7 @@ TAO_Log_i::check_capacity_alarm_threshold (void) } void -TAO_Log_i::reset_capacity_alarm_threshold (void) +TAO_Log_i::reset_capacity_alarm_threshold () { const CORBA::ULongLong max_size = this->recordstore_->get_max_size (); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index b9d834eafad..9d46942ca69 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -9,7 +9,7 @@ TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log) { } -TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void) +TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer () { } @@ -38,7 +38,7 @@ TAO_Notify_LogConsumer::connect ( } void -TAO_Notify_LogConsumer::disconnect (void) +TAO_Notify_LogConsumer::disconnect () { this->proxy_supplier_-> disconnect_push_supplier(); @@ -111,7 +111,7 @@ TAO_Notify_LogConsumer::push void TAO_Notify_LogConsumer::disconnect_push_consumer - (void) + () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index ab114d23ada..2b444c1a68b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void) +TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i () { } @@ -172,25 +172,25 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id) } CosNotifyChannelAdmin::AdminID -TAO_NotifyLogFactory_i::MyID (void) +TAO_NotifyLogFactory_i::MyID () { return consumer_admin_->MyID (); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_NotifyLogFactory_i::MyChannel (void) +TAO_NotifyLogFactory_i::MyChannel () { throw CORBA::NO_IMPLEMENT(); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_NotifyLogFactory_i::MyOperator (void) +TAO_NotifyLogFactory_i::MyOperator () { return consumer_admin_->MyOperator (); } CosNotifyFilter::MappingFilter_ptr -TAO_NotifyLogFactory_i::priority_filter (void) +TAO_NotifyLogFactory_i::priority_filter () { return consumer_admin_->priority_filter (); } @@ -202,7 +202,7 @@ TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filt } CosNotifyFilter::MappingFilter_ptr -TAO_NotifyLogFactory_i::lifetime_filter (void) +TAO_NotifyLogFactory_i::lifetime_filter () { return consumer_admin_->lifetime_filter (); } @@ -214,13 +214,13 @@ TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filt } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_NotifyLogFactory_i::pull_suppliers (void) +TAO_NotifyLogFactory_i::pull_suppliers () { return consumer_admin_->pull_suppliers (); } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_NotifyLogFactory_i::push_suppliers (void) +TAO_NotifyLogFactory_i::push_suppliers () { return consumer_admin_->push_suppliers (); } @@ -266,7 +266,7 @@ TAO_NotifyLogFactory_i::obtain_pull_supplier ( } void -TAO_NotifyLogFactory_i::destroy (void) +TAO_NotifyLogFactory_i::destroy () { // No-Op. } @@ -280,7 +280,7 @@ TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq } CosNotification::QoSProperties* -TAO_NotifyLogFactory_i::get_qos (void) +TAO_NotifyLogFactory_i::get_qos () { return consumer_admin_->get_qos (); } @@ -317,13 +317,13 @@ TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id) } CosNotifyFilter::FilterIDSeq* -TAO_NotifyLogFactory_i::get_all_filters (void) +TAO_NotifyLogFactory_i::get_all_filters () { return consumer_admin_->get_all_filters (); } void -TAO_NotifyLogFactory_i::remove_all_filters (void) +TAO_NotifyLogFactory_i::remove_all_filters () { consumer_admin_->remove_all_filters (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 3ebc0c046a5..725c4952af7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -35,7 +35,7 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification ( proxy_consumer_->connect_any_push_supplier (objref.in ()); } -TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void) +TAO_NotifyLogNotification::~TAO_NotifyLogNotification () { // No-Op. } @@ -55,7 +55,7 @@ TAO_NotifyLogNotification::subscription_change } void -TAO_NotifyLogNotification::disconnect_push_supplier (void) +TAO_NotifyLogNotification::disconnect_push_supplier () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index db2aaaf9226..3cf48ab0234 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -75,7 +75,7 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id) void -TAO_NotifyLog_i::destroy (void) +TAO_NotifyLog_i::destroy () { notifier_->object_deletion (logid_); @@ -90,7 +90,7 @@ TAO_NotifyLog_i::destroy (void) } void -TAO_NotifyLog_i::activate (void) +TAO_NotifyLog_i::activate () { CosNotifyChannelAdmin::AdminID adminid = 0; @@ -122,7 +122,7 @@ TAO_NotifyLog_i::activate (void) //IDL to C++ CosNotifyFilter::Filter_ptr -TAO_NotifyLog_i::get_filter (void) +TAO_NotifyLog_i::get_filter () { //TODO: need to add impl throw CORBA::NO_IMPLEMENT (); @@ -137,26 +137,26 @@ TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */) } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_NotifyLog_i::MyFactory (void) +TAO_NotifyLog_i::MyFactory () { //TODO: need to add impl throw CORBA::NO_IMPLEMENT (); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_NotifyLog_i::default_consumer_admin (void) +TAO_NotifyLog_i::default_consumer_admin () { return this->event_channel_->default_consumer_admin (); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_NotifyLog_i::default_supplier_admin (void) +TAO_NotifyLog_i::default_supplier_admin () { return this->event_channel_->default_supplier_admin (); } CosNotifyFilter::FilterFactory_ptr -TAO_NotifyLog_i::default_filter_factory (void) +TAO_NotifyLog_i::default_filter_factory () { return this->event_channel_->default_filter_factory (); } @@ -188,19 +188,19 @@ TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id) } CosNotifyChannelAdmin::AdminIDSeq* -TAO_NotifyLog_i::get_all_consumeradmins (void) +TAO_NotifyLog_i::get_all_consumeradmins () { return this->event_channel_->get_all_consumeradmins (); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_NotifyLog_i::get_all_supplieradmins (void) +TAO_NotifyLog_i::get_all_supplieradmins () { return this->event_channel_->get_all_supplieradmins (); } CosNotification::AdminProperties* -TAO_NotifyLog_i::get_admin (void) +TAO_NotifyLog_i::get_admin () { return this->event_channel_->get_admin (); } @@ -212,7 +212,7 @@ TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin) } CosNotification::QoSProperties* -TAO_NotifyLog_i::get_qos (void) +TAO_NotifyLog_i::get_qos () { //need to add merging of QoS from Log_i and EventChannel_i throw CORBA::NO_IMPLEMENT (); @@ -236,7 +236,7 @@ TAO_NotifyLog_i::validate_qos ( } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_NotifyLog_i::for_consumers (void) +TAO_NotifyLog_i::for_consumers () { return this->event_channel_->for_consumers(); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 1e26e39f1fa..a20179e0a89 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -20,7 +20,7 @@ TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log) { } -TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer (void) +TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer () { } @@ -52,7 +52,7 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events) } void -TAO_Rtec_LogConsumer::disconnect_push_consumer (void) +TAO_Rtec_LogConsumer::disconnect_push_consumer () { this->supplier_proxy_->disconnect_push_supplier (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index ffe4ebc38af..e2fdc603251 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void) : +TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i () : impl (0), notifier_ (0) { @@ -69,7 +69,7 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb, } RTEventLogAdmin::EventLogFactory_ptr -TAO_RTEventLogFactory_i::activate (void) +TAO_RTEventLogFactory_i::activate () { RTEventLogAdmin::EventLogFactory_var v_return; diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index 27929151778..bbcc5c060af 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -29,19 +29,19 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification ( obtainProxyConsumer (); } -TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void) +TAO_RTEventLogNotification::~TAO_RTEventLogNotification () { // No-Op. } void -TAO_RTEventLogNotification::disconnect_push_supplier (void) +TAO_RTEventLogNotification::disconnect_push_supplier () { // No-Op. } void -TAO_RTEventLogNotification::obtainProxyConsumer (void) +TAO_RTEventLogNotification::obtainProxyConsumer () { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = event_channel_->for_suppliers(); diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 08f783e807c..c63d99d4e41 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -74,7 +74,7 @@ TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id) } void -TAO_RTEventLog_i::destroy (void) +TAO_RTEventLog_i::destroy () { notifier_->object_deletion (logid_); @@ -88,7 +88,7 @@ TAO_RTEventLog_i::destroy (void) } void -TAO_RTEventLog_i::activate (void) +TAO_RTEventLog_i::activate () { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = this->event_channel_->for_consumers (); @@ -98,13 +98,13 @@ TAO_RTEventLog_i::activate (void) } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_RTEventLog_i::for_consumers (void) +TAO_RTEventLog_i::for_consumers () { return this->event_channel_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_RTEventLog_i::for_suppliers (void) +TAO_RTEventLog_i::for_suppliers () { return this->event_channel_->for_suppliers(); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp index dfabfd4984b..32020a57daa 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IntId::TAO_IntId (void) +TAO_IntId::TAO_IntId () : type_ (CosNaming::nobject) { ref_ = CORBA::Object::_nil (); @@ -29,7 +29,7 @@ TAO_IntId::TAO_IntId (const TAO_IntId &rhs) ref_ = CORBA::Object::_duplicate (rhs.ref_); } -TAO_IntId::~TAO_IntId (void) +TAO_IntId::~TAO_IntId () { CORBA::release (ref_); } @@ -47,7 +47,7 @@ TAO_IntId::operator= (const TAO_IntId &rhs) ref_ = CORBA::Object::_duplicate (rhs.ref_); } -TAO_ExtId::TAO_ExtId (void) +TAO_ExtId::TAO_ExtId () : kind_ (), id_ () { @@ -66,18 +66,18 @@ TAO_ExtId::TAO_ExtId (const TAO_ExtId &rhs) kind_ = rhs.kind_; } -TAO_ExtId::~TAO_ExtId (void) +TAO_ExtId::~TAO_ExtId () { } const char * -TAO_ExtId::id (void) +TAO_ExtId::id () { return id_.fast_rep (); } const char * -TAO_ExtId::kind (void) +TAO_ExtId::kind () { return kind_.fast_rep (); } @@ -106,7 +106,7 @@ TAO_ExtId::operator!= (const TAO_ExtId &rhs) const } u_long -TAO_ExtId::hash (void) const +TAO_ExtId::hash () const { ACE_CString temp (id_); temp += kind_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index 4178727920b..4a3c0bafc58 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -60,7 +60,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Naming_Manager::TAO_FT_Naming_Manager (void) +TAO_FT_Naming_Manager::TAO_FT_Naming_Manager () : factory_registry_ ("NamingManager::FactoryRegistry"), group_factory_ (), use_global_ (false), @@ -79,7 +79,7 @@ TAO_FT_Naming_Manager::TAO_FT_Naming_Manager (void) ::FT_Naming::TAO_FT_OBJECT_GROUP_NAME; } -TAO_FT_Naming_Manager::~TAO_FT_Naming_Manager (void) +TAO_FT_Naming_Manager::~TAO_FT_Naming_Manager () { this->object_group_property_name_.length (0); this->built_in_balancing_strategy_name_.length (0); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp index ae540b2cd65..ae18aa384f8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -87,12 +87,12 @@ TAO_FT_Naming_Replication_Manager::TAO_FT_Naming_Replication_Manager (TAO_FT_Nam { } -TAO_FT_Naming_Replication_Manager::~TAO_FT_Naming_Replication_Manager(void) +TAO_FT_Naming_Replication_Manager::~TAO_FT_Naming_Replication_Manager() { } void -TAO_FT_Naming_Replication_Manager::init_orb (void) +TAO_FT_Naming_Replication_Manager::init_orb () { int argc = 8; ACE_TCHAR *argv[11]; @@ -132,19 +132,19 @@ TAO_FT_Naming_Replication_Manager::init_orb (void) } char * -TAO_FT_Naming_Replication_Manager::ior (void) +TAO_FT_Naming_Replication_Manager::ior () { return this->orb_->object_to_string (this->me_.in ()); } bool -TAO_FT_Naming_Replication_Manager::peer_available (void) +TAO_FT_Naming_Replication_Manager::peer_available () { return !CORBA::is_nil (this->peer_.in ()); } void -TAO_FT_Naming_Replication_Manager::stop (void) +TAO_FT_Naming_Replication_Manager::stop () { if (this->reactor_ == 0) { @@ -155,7 +155,7 @@ TAO_FT_Naming_Replication_Manager::stop (void) } int -TAO_FT_Naming_Replication_Manager::svc (void) +TAO_FT_Naming_Replication_Manager::svc () { if (this->reactor_ == 0) { @@ -371,7 +371,7 @@ TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs) } bool -TAO_FT_Naming_Replication_Manager::peer_init_i (void) +TAO_FT_Naming_Replication_Manager::peer_init_i () { CORBA::Object_var obj = this->orb_->string_to_object (replica_ior_.c_str()); bool non_exist = true; @@ -421,7 +421,7 @@ TAO_FT_Naming_Replication_Manager::peer_init_i (void) } bool -TAO_FT_Naming_Replication_Manager::update_peer_registration (void) +TAO_FT_Naming_Replication_Manager::update_peer_registration () { FT_Naming::ReplicaInfo info; info.combined = this->send_combos_; @@ -450,7 +450,7 @@ TAO_FT_Naming_Replication_Manager::update_peer_registration (void) bool -TAO_FT_Naming_Replication_Manager::init_peer (void) +TAO_FT_Naming_Replication_Manager::init_peer () { ACE_TString replica_ior_file = this->server_.replica_ior_filename (true); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index 7d05f927ad1..28445381a2f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -74,7 +74,7 @@ TAO_FTNS_Notifier::handle_exception (ACE_HANDLE ) } /// Default Constructor. -TAO_FT_Naming_Server::TAO_FT_Naming_Server (void) +TAO_FT_Naming_Server::TAO_FT_Naming_Server () : TAO_Naming_Server (IOR_ARRAY_SIZE), naming_manager_ (), replicator_ (0), @@ -94,7 +94,7 @@ TAO_FT_Naming_Server::TAO_FT_Naming_Server (void) } void -TAO_FT_Naming_Server::update_info_i (void) +TAO_FT_Naming_Server::update_info_i () { while (true) { @@ -140,7 +140,7 @@ TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos) } void -TAO_FT_Naming_Server::update_iors_i (void) +TAO_FT_Naming_Server::update_iors_i () { while (true) { @@ -344,7 +344,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int, ACE_TCHAR *[], CORBA::O } int -TAO_FT_Naming_Server::init_replicator (void) +TAO_FT_Naming_Server::init_replicator () { if (this->server_role_ == STANDALONE ) return 0; @@ -393,7 +393,7 @@ TAO_FT_Naming_Server::replica_ior_filename (bool peer_ior_file) const } void -TAO_FT_Naming_Server::init_replication_pairing (void) +TAO_FT_Naming_Server::init_replication_pairing () { if (this->server_role_ == STANDALONE) { @@ -620,7 +620,7 @@ TAO_FT_Naming_Server::parse_args (int argc, } int -TAO_FT_Naming_Server::fini (void) +TAO_FT_Naming_Server::fini () { if (this->replicator_ != 0) { @@ -697,7 +697,7 @@ TAO_FT_Naming_Server::storable_naming_context_factory (size_t context_size) } TAO_Persistent_Naming_Context_Factory * -TAO_FT_Naming_Server::persistent_naming_context_factory (void) +TAO_FT_Naming_Server::persistent_naming_context_factory () { #if defined (ACE_HAS_NEW_NOTHROW) return new (ACE_nothrow) TAO_FT_Persistent_Naming_Context_Factory; @@ -708,14 +708,14 @@ TAO_FT_Naming_Server::persistent_naming_context_factory (void) /// Return the IOR for the registered replication manager char* -TAO_FT_Naming_Server::replicator_ior (void) +TAO_FT_Naming_Server::replicator_ior () { return CORBA::string_dup (this->iors_[REPLICATOR].ior_.c_str()); } /// Return the IOR for the registered object group manager char* -TAO_FT_Naming_Server::naming_manager_ior (void) +TAO_FT_Naming_Server::naming_manager_ior () { return CORBA::string_dup (this->iors_[GROUP].ior_.c_str()); } @@ -812,14 +812,14 @@ TAO_FT_Naming_Server::update_naming_context ( } /// Destructor. -TAO_FT_Naming_Server::~TAO_FT_Naming_Server (void) +TAO_FT_Naming_Server::~TAO_FT_Naming_Server () { // Clear out the static naming manager from the persistent naming context TAO_FT_Persistent_Naming_Context::set_naming_manager_impl (0); } CosNaming::NamingContext_ptr -TAO_FT_Naming_Server::my_root_context (void) const +TAO_FT_Naming_Server::my_root_context () const { if (CORBA::is_nil (this->iors_[ROOT].ref_.in())) { @@ -834,7 +834,7 @@ TAO_FT_Naming_Server::my_root_context (void) const } FT_Naming::NamingManager_ptr -TAO_FT_Naming_Server::my_naming_manager (void) const +TAO_FT_Naming_Server::my_naming_manager () const { if (CORBA::is_nil (this->iors_[GROUP].ref_)) { @@ -850,7 +850,7 @@ TAO_FT_Naming_Server::my_naming_manager (void) const } CosNaming::NamingContext_ptr -TAO_FT_Naming_Server::ft_root_context (void) const +TAO_FT_Naming_Server::ft_root_context () const { if (CORBA::is_nil (this->iors_[FT_ROOT].ref_)) { @@ -865,7 +865,7 @@ TAO_FT_Naming_Server::ft_root_context (void) const } FT_Naming::NamingManager_ptr -TAO_FT_Naming_Server::ft_naming_manager (void) const +TAO_FT_Naming_Server::ft_naming_manager () const { if (CORBA::is_nil (this->iors_[FT_GROUP].ref_)) { @@ -881,13 +881,13 @@ TAO_FT_Naming_Server::ft_naming_manager (void) const } const ACE_CString & -TAO_FT_Naming_Server::ft_endpoint (void) +TAO_FT_Naming_Server::ft_endpoint () { return this->ft_endpoint_; } const ACE_Time_Value & -TAO_FT_Naming_Server::ft_update_delay (void) +TAO_FT_Naming_Server::ft_update_delay () { return this->ft_update_delay_; } @@ -955,7 +955,7 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt } int -TAO_FT_Naming_Server::recover_iors (void) +TAO_FT_Naming_Server::recover_iors () { if (this->registered_) { diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp index 6f05c3decc5..97a7f9cf109 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp @@ -52,7 +52,7 @@ TAO::FT_PG_Object_Group_Storable::FT_PG_Object_Group_Storable { } -TAO::FT_PG_Object_Group_Storable::~FT_PG_Object_Group_Storable (void) +TAO::FT_PG_Object_Group_Storable::~FT_PG_Object_Group_Storable () { } @@ -79,7 +79,7 @@ TAO::FT_PG_Object_Group_Storable::propagate_update_notification } void -TAO::FT_PG_Object_Group_Storable::state_written (void) +TAO::FT_PG_Object_Group_Storable::state_written () { FT_Naming::ChangeType change_type; if (!this->file_created_) diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp index 6e1601e8070..5ef67c277eb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -31,7 +31,7 @@ TAO_FT_Persistent_Naming_Context::TAO_FT_Persistent_Naming_Context ( } -TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context (void) +TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context () { // Perform appropriate cleanup based on the destruction level specified. } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp index e2c7b9f0a93..5d0fda3837f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. -TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory (void) +TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory () : TAO_Persistent_Naming_Context_Factory () { @@ -12,7 +12,7 @@ TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Facto /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_FT_Persistent_Naming_Context_Factory::~TAO_FT_Persistent_Naming_Context_Factory (void) +TAO_FT_Persistent_Naming_Context_Factory::~TAO_FT_Persistent_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp index 4ebab318def..7c2cf1a2134 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp @@ -9,11 +9,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Random::TAO_FT_Random (void) +TAO_FT_Random::TAO_FT_Random () { } -TAO_FT_Random::~TAO_FT_Random (void) +TAO_FT_Random::~TAO_FT_Random () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp index ecfae28389a..d4246736ab0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp @@ -9,13 +9,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Round_Robin::TAO_FT_Round_Robin (void) +TAO_FT_Round_Robin::TAO_FT_Round_Robin () : lock_ (), location_index_map_ (TAO_PG_MAX_OBJECT_GROUPS) { } -TAO_FT_Round_Robin::~TAO_FT_Round_Robin (void) +TAO_FT_Round_Robin::~TAO_FT_Round_Robin () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index 823990864b3..aaba0319349 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -35,7 +35,7 @@ TAO_FT_Storable_Naming_Context::TAO_FT_Storable_Naming_Context (CORBA::ORB_ptr o } -TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context (void) +TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context () { // Perform appropriate cleanup based on the destruction level specified. } @@ -124,14 +124,14 @@ TAO_FT_Storable_Naming_Context::stale (bool is_stale) bool -TAO_FT_Storable_Naming_Context::stale (void) +TAO_FT_Storable_Naming_Context::stale () { return stale_; } void -TAO_FT_Storable_Naming_Context::context_written (void) +TAO_FT_Storable_Naming_Context::context_written () { FT_Naming::ChangeType change_type; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp index 65a0e759562..648ec3a7654 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp @@ -24,7 +24,7 @@ TAO_FT_Storable_Naming_Context_Factory (size_t hash_table_size, /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory (void) +TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index 450be60c4c5..4af5d580395 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -389,7 +389,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) * Displays all object groups that currently exist in the naming service. */ int -NS_group_svc::group_list (void) +NS_group_svc::group_list () { // KCS: The group list is independent of locations. I created a new operation in the diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 3a7f45ccf79..16ebeaa7b85 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Bindings_Map::~TAO_Bindings_Map (void) +TAO_Bindings_Map::~TAO_Bindings_Map () { } @@ -33,19 +33,19 @@ TAO_Hash_Naming_Context::interface (TAO_Naming_Context *i) this->interface_ = i; } -TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context (void) +TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context () { delete context_; } TAO_SYNCH_RW_MUTEX& -TAO_Hash_Naming_Context::lock (void) +TAO_Hash_Naming_Context::lock () { return this->lock_; } PortableServer::POA_ptr -TAO_Hash_Naming_Context::_default_POA (void) +TAO_Hash_Naming_Context::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -546,7 +546,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n) } void -TAO_Hash_Naming_Context::destroy (void) +TAO_Hash_Naming_Context::destroy () { // Check to make sure this object didn't have <destroy> method // invoked on it. @@ -579,20 +579,20 @@ TAO_Hash_Naming_Context::destroy (void) } int -TAO_Hash_Naming_Context::root (void) +TAO_Hash_Naming_Context::root () { return (ACE_OS::strcmp (this->poa_id_.fast_rep (), TAO_ROOT_NAMING_CONTEXT) == 0); } int -TAO_Hash_Naming_Context::destroyed (void) +TAO_Hash_Naming_Context::destroyed () { return this->destroyed_; } TAO_Naming_Context * -TAO_Hash_Naming_Context::interface (void) +TAO_Hash_Naming_Context::interface () { return this->interface_; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index 92255b51454..c16509e5e0b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp @@ -5,13 +5,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CosNaming::NamingContext_ptr -TAO_Naming_Client::operator -> (void) const +TAO_Naming_Client::operator -> () const { return this->naming_context_.ptr (); } CosNaming::NamingContext_ptr -TAO_Naming_Client::get_context (void) const +TAO_Naming_Client::get_context () const { // Must duplicate this pointer so it can be stored in a _var. return CosNaming::NamingContext::_duplicate (this->naming_context_.in ()); @@ -41,12 +41,12 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) return 0; } -TAO_Naming_Client::TAO_Naming_Client (void) +TAO_Naming_Client::TAO_Naming_Client () { // Do nothing } -TAO_Naming_Client::~TAO_Naming_Client (void) +TAO_Naming_Client::~TAO_Naming_Client () { // Do nothing } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 4bb6e7c4a8d..11858f0ece8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -18,7 +18,7 @@ TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl) { } -TAO_Naming_Context::~TAO_Naming_Context (void) +TAO_Naming_Context::~TAO_Naming_Context () { delete impl_; } @@ -68,7 +68,7 @@ TAO_Naming_Context::unbind (const CosNaming::Name &n) } CosNaming::NamingContext_ptr -TAO_Naming_Context::new_context (void) +TAO_Naming_Context::new_context () { return impl_->new_context (); } @@ -80,7 +80,7 @@ TAO_Naming_Context::bind_new_context (const CosNaming::Name &n) } void -TAO_Naming_Context::destroy (void) +TAO_Naming_Context::destroy () { impl_->destroy (); } @@ -463,7 +463,7 @@ TAO_Naming_Context::stale (bool value) this->impl_->stale (value); } -TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void) +TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl () { } @@ -475,7 +475,7 @@ TAO_Naming_Context_Impl::stale (bool value) } bool -TAO_Naming_Context_Impl::stale (void) +TAO_Naming_Context_Impl::stale () { // Default implementation is to reply false return false; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index b1b7a9da824..31cf92cecab 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -31,7 +31,7 @@ TAO_Naming_Loader::TAO_Naming_Loader (TAO_Naming_Server *server) ACE_NEW (naming_server_, TAO_Naming_Server); } -TAO_Naming_Loader::~TAO_Naming_Loader (void) +TAO_Naming_Loader::~TAO_Naming_Loader () { // Destroy the naming server that was created delete naming_server_; @@ -65,7 +65,7 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Naming_Loader::fini (void) +TAO_Naming_Loader::fini () { // Remove the Naming Service. if (this->naming_server_ == 0) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index a0931cb7edc..2d9b6fa4280 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -770,7 +770,7 @@ TAO_Naming_Server::storable_naming_context_factory (size_t context_size) } TAO_Persistent_Naming_Context_Factory * -TAO_Naming_Server::persistent_naming_context_factory (void) +TAO_Naming_Server::persistent_naming_context_factory () { #if defined (ACE_HAS_NEW_NOTHROW) return new (ACE_nothrow) TAO_Persistent_Naming_Context_Factory; @@ -780,7 +780,7 @@ TAO_Naming_Server::persistent_naming_context_factory (void) } int -TAO_Naming_Server::fini (void) +TAO_Naming_Server::fini () { // First get rid of the multi cast handler if (this->ior_multicast_) @@ -852,13 +852,13 @@ TAO_Naming_Server::fini (void) } char* -TAO_Naming_Server::naming_service_ior (void) +TAO_Naming_Server::naming_service_ior () { return CORBA::string_dup (this->iors_[ROOT].ior_.c_str()); } CosNaming::NamingContext_ptr -TAO_Naming_Server::operator-> (void) const +TAO_Naming_Server::operator-> () const { if (CORBA::is_nil (this->iors_[ROOT].ref_)) { @@ -872,7 +872,7 @@ TAO_Naming_Server::operator-> (void) const } -TAO_Naming_Server::~TAO_Naming_Server (void) +TAO_Naming_Server::~TAO_Naming_Server () { delete [] this->iors_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index ad4a4f071ab..896f31bc96f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -92,7 +92,7 @@ TAO_Persistent_Context_Index::TAO_Persistent_Context_Index { } -TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void) +TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index () { delete allocator_; delete context_impl_factory_; @@ -100,19 +100,19 @@ TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void) } ACE_Allocator* -TAO_Persistent_Context_Index::allocator (void) +TAO_Persistent_Context_Index::allocator () { return allocator_; } CosNaming::NamingContext_ptr -TAO_Persistent_Context_Index::root_context (void) +TAO_Persistent_Context_Index::root_context () { return CosNaming::NamingContext::_duplicate (root_context_.in ()); } CORBA::ORB_ptr -TAO_Persistent_Context_Index::orb (void) +TAO_Persistent_Context_Index::orb () { return orb_.in (); } @@ -160,7 +160,7 @@ TAO_Persistent_Context_Index::init (size_t context_size) } int -TAO_Persistent_Context_Index::recreate_all (void) +TAO_Persistent_Context_Index::recreate_all () { CONTEXT_INDEX::ITERATOR *index_iter = 0; @@ -239,7 +239,7 @@ TAO_Persistent_Context_Index::create_naming_context_impl ( } int -TAO_Persistent_Context_Index::create_index (void) +TAO_Persistent_Context_Index::create_index () { // Make sure that the file name is of the legal length. if (ACE_OS::strlen (index_file_) >= MAXNAMELEN + MAXPATHLEN) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp index ae98a0f2d29..1946a0e3035 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Persistent_IntId::TAO_Persistent_IntId (void) +TAO_Persistent_IntId::TAO_Persistent_IntId () : ref_ (0), type_ (CosNaming::nobject) { @@ -30,7 +30,7 @@ TAO_Persistent_IntId::TAO_Persistent_IntId (const TAO_Persistent_IntId &rhs) type_ = rhs.type_; } -TAO_Persistent_IntId::~TAO_Persistent_IntId (void) +TAO_Persistent_IntId::~TAO_Persistent_IntId () { } @@ -45,7 +45,7 @@ TAO_Persistent_IntId::operator= (const TAO_Persistent_IntId &rhs) ref_ = rhs.ref_; } -TAO_Persistent_ExtId::TAO_Persistent_ExtId (void) +TAO_Persistent_ExtId::TAO_Persistent_ExtId () : id_ (0), kind_ (0) { @@ -65,7 +65,7 @@ TAO_Persistent_ExtId::TAO_Persistent_ExtId (const TAO_Persistent_ExtId &rhs) kind_ = rhs.kind_; } -TAO_Persistent_ExtId::~TAO_Persistent_ExtId (void) +TAO_Persistent_ExtId::~TAO_Persistent_ExtId () { } @@ -95,7 +95,7 @@ TAO_Persistent_ExtId::operator!= (const TAO_Persistent_ExtId &rhs) const } u_long -TAO_Persistent_ExtId::hash (void) const +TAO_Persistent_ExtId::hash () const { ACE_CString temp (id_); temp += kind_; @@ -104,18 +104,18 @@ TAO_Persistent_ExtId::hash (void) const } const char * -TAO_Persistent_ExtId::id (void) +TAO_Persistent_ExtId::id () { return id_; } const char * -TAO_Persistent_ExtId::kind (void) +TAO_Persistent_ExtId::kind () { return kind_; } -TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (void) +TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId () : counter_ (0), hash_map_ (0) { @@ -135,7 +135,7 @@ TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (const TAO_Persistent_Ind hash_map_ = rhs.hash_map_; } -TAO_Persistent_Index_IntId::~TAO_Persistent_Index_IntId (void) +TAO_Persistent_Index_IntId::~TAO_Persistent_Index_IntId () { } @@ -150,7 +150,7 @@ TAO_Persistent_Index_IntId::operator= (const TAO_Persistent_Index_IntId &rhs) hash_map_ = rhs.hash_map_; } -TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (void) +TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId () : poa_id_ (0) { } @@ -165,7 +165,7 @@ TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (const TAO_Persistent_Ind poa_id_ = rhs.poa_id_; } -TAO_Persistent_Index_ExtId::~TAO_Persistent_Index_ExtId (void) +TAO_Persistent_Index_ExtId::~TAO_Persistent_Index_ExtId () { } @@ -192,7 +192,7 @@ TAO_Persistent_Index_ExtId::operator!= (const TAO_Persistent_Index_ExtId &rhs) c } u_long -TAO_Persistent_Index_ExtId::hash (void) const +TAO_Persistent_Index_ExtId::hash () const { ACE_CString temp (poa_id_); return temp.hash (); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 8fdbbec5cd4..3dc96efb69f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -70,31 +70,31 @@ TAO_Persistent_Bindings_Map::TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb) { } -TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map (void) +TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map () { } void -TAO_Persistent_Bindings_Map::destroy (void) +TAO_Persistent_Bindings_Map::destroy () { this->map_->ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>::~ACE_Hash_Map_With_Allocator (); this->allocator_->free (map_); } TAO_Persistent_Bindings_Map::HASH_MAP * -TAO_Persistent_Bindings_Map::map (void) +TAO_Persistent_Bindings_Map::map () { return this->map_; } size_t -TAO_Persistent_Bindings_Map::total_size (void) +TAO_Persistent_Bindings_Map::total_size () { return this->map_->total_size (); } size_t -TAO_Persistent_Bindings_Map::current_size (void) +TAO_Persistent_Bindings_Map::current_size () { return map_->current_size (); } @@ -260,7 +260,7 @@ TAO_Persistent_Naming_Context::init (size_t hash_table_size) return persistent_context_->open (hash_table_size, index_->allocator ()); } -TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context (void) +TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context () { // Perform appropriate cleanup based on the destruction level specified. @@ -349,7 +349,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, } CosNaming::NamingContext_ptr -TAO_Persistent_Naming_Context::new_context (void) +TAO_Persistent_Naming_Context::new_context () { // Check to make sure this object didn't have <destroy> method // invoked on it. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp index 994acadbd16..8d98362f74f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp @@ -4,14 +4,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. -TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory (void) +TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory () { } /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_Persistent_Naming_Context_Factory::~TAO_Persistent_Naming_Context_Factory (void) +TAO_Persistent_Naming_Context_Factory::~TAO_Persistent_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 10f8347bf49..9b113af9710 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -19,7 +19,7 @@ ACE_UINT32 TAO_Storable_Naming_Context::gcounter_; ACE_Auto_Ptr<TAO::Storable_Base> TAO_Storable_Naming_Context::gfl_; int TAO_Storable_Naming_Context::redundant_; -TAO_Storable_IntId::TAO_Storable_IntId (void) +TAO_Storable_IntId::TAO_Storable_IntId () : ref_ (CORBA::string_dup ("")), type_ (CosNaming::nobject) { @@ -38,7 +38,7 @@ TAO_Storable_IntId::TAO_Storable_IntId (const TAO_Storable_IntId &rhs) type_ = rhs.type_; } -TAO_Storable_IntId::~TAO_Storable_IntId (void) +TAO_Storable_IntId::~TAO_Storable_IntId () { } @@ -53,7 +53,7 @@ TAO_Storable_IntId::operator= (const TAO_Storable_IntId &rhs) ref_ = rhs.ref_; } -TAO_Storable_ExtId::TAO_Storable_ExtId (void) +TAO_Storable_ExtId::TAO_Storable_ExtId () : id_ (CORBA::string_dup ("")), kind_ (CORBA::string_dup ("")) { @@ -71,7 +71,7 @@ TAO_Storable_ExtId::TAO_Storable_ExtId (const TAO_Storable_ExtId &rhs) kind_ = rhs.kind_; } -TAO_Storable_ExtId::~TAO_Storable_ExtId (void) +TAO_Storable_ExtId::~TAO_Storable_ExtId () { } @@ -101,7 +101,7 @@ TAO_Storable_ExtId::operator!= (const TAO_Storable_ExtId &rhs) const } u_long -TAO_Storable_ExtId::hash (void) const +TAO_Storable_ExtId::hash () const { // @CJC I wager this could be optimized a bit better, but I'm not // sure how much it's called. At the very least, we could allocate @@ -114,13 +114,13 @@ TAO_Storable_ExtId::hash (void) const } const char * -TAO_Storable_ExtId::id (void) +TAO_Storable_ExtId::id () { return id_.in(); } const char * -TAO_Storable_ExtId::kind (void) +TAO_Storable_ExtId::kind () { return kind_.in(); } @@ -184,27 +184,27 @@ TAO_Storable_Bindings_Map::TAO_Storable_Bindings_Map (size_t hash_table_size, ACE_TRACE("TAO_Storable_Bindings_Map"); } -TAO_Storable_Bindings_Map::~TAO_Storable_Bindings_Map (void) +TAO_Storable_Bindings_Map::~TAO_Storable_Bindings_Map () { ACE_TRACE("~TAO_Storable_Bindings_Map"); } TAO_Storable_Bindings_Map::HASH_MAP & -TAO_Storable_Bindings_Map::map (void) +TAO_Storable_Bindings_Map::map () { ACE_TRACE("map"); return map_; } size_t -TAO_Storable_Bindings_Map::current_size (void) +TAO_Storable_Bindings_Map::current_size () { ACE_TRACE("current_size"); return map_.current_size (); } size_t -TAO_Storable_Bindings_Map::total_size (void) +TAO_Storable_Bindings_Map::total_size () { ACE_TRACE("total_size"); return map_.total_size (); @@ -305,7 +305,7 @@ File_Open_Lock_and_Check::~File_Open_Lock_and_Check () bool TAO_Storable_Naming_Context:: -File_Open_Lock_and_Check::object_obsolete (void) +File_Open_Lock_and_Check::object_obsolete () { // Query the underlying context if it is obsolete with respect @@ -315,7 +315,7 @@ File_Open_Lock_and_Check::object_obsolete (void) void TAO_Storable_Naming_Context:: -File_Open_Lock_and_Check::mark_object_current (void) +File_Open_Lock_and_Check::mark_object_current () { // Reset the stale flag context_->stale (false); @@ -402,7 +402,7 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context ( ACE_TRACE("TAO_Storable_Naming_Context"); } -TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void) +TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context () { ACE_TRACE("~TAO_Storable_Naming_Context"); @@ -430,7 +430,7 @@ TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void) } void -TAO_Storable_Naming_Context::context_written (void) +TAO_Storable_Naming_Context::context_written () { // No-op. Overridden by derived class. } @@ -445,7 +445,7 @@ TAO_Storable_Naming_Context::is_obsolete (time_t stored_time) } void -TAO_Storable_Naming_Context::verify_not_destroyed (void) +TAO_Storable_Naming_Context::verify_not_destroyed () { File_Open_Lock_and_Check flck (this, SFG::ACCESSOR, false); if (this->destroyed_) @@ -539,7 +539,7 @@ TAO_Storable_Naming_Context::make_new_context ( } CosNaming::NamingContext_ptr -TAO_Storable_Naming_Context::new_context (void) +TAO_Storable_Naming_Context::new_context () { ACE_TRACE ("new_context"); @@ -836,7 +836,7 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n, } void -TAO_Storable_Naming_Context::destroy (void) +TAO_Storable_Naming_Context::destroy () { ACE_TRACE("TAO_Storable_Naming_Context::destroy"); ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp index e86e2dc1ac3..573f1dc6676 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp @@ -14,7 +14,7 @@ TAO_Storable_Naming_Context_Factory::TAO_Storable_Naming_Context_Factory ( /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_Storable_Naming_Context_Factory::~TAO_Storable_Naming_Context_Factory (void) +TAO_Storable_Naming_Context_Factory::~TAO_Storable_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 0e56e61a49b..0836bd43139 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -65,24 +65,24 @@ TAO_Transient_Bindings_Map::TAO_Transient_Bindings_Map (size_t hash_table_size) { } -TAO_Transient_Bindings_Map::~TAO_Transient_Bindings_Map (void) +TAO_Transient_Bindings_Map::~TAO_Transient_Bindings_Map () { } TAO_Transient_Bindings_Map::HASH_MAP & -TAO_Transient_Bindings_Map::map (void) +TAO_Transient_Bindings_Map::map () { return map_; } size_t -TAO_Transient_Bindings_Map::current_size (void) +TAO_Transient_Bindings_Map::current_size () { return map_.current_size (); } size_t -TAO_Transient_Bindings_Map::total_size (void) +TAO_Transient_Bindings_Map::total_size () { return map_.total_size (); } @@ -130,7 +130,7 @@ TAO_Transient_Naming_Context::TAO_Transient_Naming_Context (PortableServer::POA_ context_ = transient_context_; } -TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void) +TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context () { } @@ -181,7 +181,7 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, } CosNaming::NamingContext_ptr -TAO_Transient_Naming_Context::new_context (void) +TAO_Transient_Naming_Context::new_context () { // Generate a POA id for the new context. char poa_id[BUFSIZ]; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 3dc8a3af5fe..0ad5f026dc3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -99,7 +99,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types) } int -TAO_Notify_Admin::shutdown (void) +TAO_Notify_Admin::shutdown () { if (TAO_Notify_Object::shutdown () == 1) return 1; @@ -209,7 +209,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, } void -TAO_Notify_Admin::reconnect (void) +TAO_Notify_Admin::reconnect () { TAO_Notify::Reconnect_Worker<TAO_Notify_Proxy> wrk; this->proxy_container().collection()->for_each(&wrk); diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 542749dcc13..9580d6f82e2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) +TAO_Notify_AdminProperties::TAO_Notify_AdminProperties () : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) , max_consumers_ (CosNotification::MaxConsumers, 0) , max_suppliers_ (CosNotification::MaxSuppliers, 0) @@ -72,7 +72,7 @@ TAO_Notify_AdminProperties::init () } CORBA::Boolean -TAO_Notify_AdminProperties::queue_full (void) +TAO_Notify_AdminProperties::queue_full () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, 1); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index 28871268029..598d4616b86 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -23,7 +23,7 @@ TAO_Notify_AnyEvent_No_Copy::~TAO_Notify_AnyEvent_No_Copy () } const TAO_Notify_EventType& -TAO_Notify_AnyEvent_No_Copy::type (void) const +TAO_Notify_AnyEvent_No_Copy::type () const { return this->event_type_; } @@ -108,7 +108,7 @@ TAO_Notify_AnyEvent_No_Copy::unmarshal (TAO_InputCDR & cdr) } TAO_Notify_Event * -TAO_Notify_AnyEvent_No_Copy::copy (void) const +TAO_Notify_AnyEvent_No_Copy::copy () const { TAO_Notify_Event * new_event; ACE_NEW_THROW_EX (new_event, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 7f7780af34e..31fb4f2be48 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void) +TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer () { } @@ -18,7 +18,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::~TAO_Notify_CosEC_ProxyPushConsumer () } void -TAO_Notify_CosEC_ProxyPushConsumer::release (void) +TAO_Notify_CosEC_ProxyPushConsumer::release () { delete this; //@@ inform factory @@ -59,14 +59,14 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup } void -TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (void) +TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer () { TAO_Notify_CosEC_ProxyPushConsumer::Ptr guard( this ); this->destroy (); } const char * -TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name () const { return "ec_proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index d911c4b2b2d..31456ab5d13 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void) +TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier () { } @@ -14,7 +14,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier () } void -TAO_Notify_CosEC_ProxyPushSupplier::release (void) +TAO_Notify_CosEC_ProxyPushSupplier::release () { delete this; @@ -36,14 +36,14 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon } void -TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (void) +TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier () { TAO_Notify_CosEC_ProxyPushSupplier::Ptr guard( this ); this->destroy (); } const char * -TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name () const { return "ec_proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index e0ff8ad2b3f..613c87a9f18 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void) +TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer () { } @@ -17,14 +17,14 @@ TAO_Notify_ProxyPushConsumer::~TAO_Notify_ProxyPushConsumer () } void -TAO_Notify_ProxyPushConsumer::release (void) +TAO_Notify_ProxyPushConsumer::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_ProxyPushConsumer::MyType (void) +TAO_Notify_ProxyPushConsumer::MyType () { return CosNotifyChannelAdmin::PUSH_ANY; } @@ -61,7 +61,7 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl this->self_change (); } -void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void) +void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer () { TAO_Notify_ProxyPushConsumer::Ptr guard( this ); this->destroy (); @@ -69,7 +69,7 @@ void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void) } const char * -TAO_Notify_ProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_ProxyPushConsumer::get_proxy_type_name () const { return "proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index f30948eae05..a20b22359f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void) +TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier () { } @@ -15,7 +15,7 @@ TAO_Notify_ProxyPushSupplier::~TAO_Notify_ProxyPushSupplier () } void -TAO_Notify_ProxyPushSupplier::release (void) +TAO_Notify_ProxyPushSupplier::release () { delete this; //@@ inform factory @@ -37,7 +37,7 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu } void -TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void) +TAO_Notify_ProxyPushSupplier::disconnect_push_supplier () { TAO_Notify_ProxyPushSupplier::Ptr guard( this ); this->destroy (); @@ -45,13 +45,13 @@ TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void) } CosNotifyChannelAdmin::ProxyType -TAO_Notify_ProxyPushSupplier::MyType (void) +TAO_Notify_ProxyPushSupplier::MyType () { return CosNotifyChannelAdmin::PUSH_ANY; } const char * -TAO_Notify_ProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_ProxyPushSupplier::get_proxy_type_name () const { return "proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index d130e72d1e3..2f144d30e1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -88,7 +88,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer) } void -TAO_Notify_PushConsumer::release (void) +TAO_Notify_PushConsumer::release () { delete this; //@@ inform factory @@ -129,7 +129,7 @@ TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event) } ACE_CString -TAO_Notify_PushConsumer::get_ior (void) const +TAO_Notify_PushConsumer::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -156,7 +156,7 @@ TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consu } CORBA::Object_ptr -TAO_Notify_PushConsumer::get_consumer (void) +TAO_Notify_PushConsumer::get_consumer () { return CosEventComm::PushConsumer::_duplicate (this->push_consumer_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp index 69db801841f..b2edf829cb4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp @@ -30,14 +30,14 @@ TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier) } void -TAO_Notify_PushSupplier::release (void) +TAO_Notify_PushSupplier::release () { delete this; //@@ inform factory } ACE_CString -TAO_Notify_PushSupplier::get_ior (void) const +TAO_Notify_PushSupplier::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -54,7 +54,7 @@ TAO_Notify_PushSupplier::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_PushSupplier::get_supplier (void) +TAO_Notify_PushSupplier::get_supplier () { return CosEventComm::PushSupplier::_duplicate (this->push_supplier_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 130e2fe785c..8721836d7e6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -50,7 +50,7 @@ TAO_Notify_Buffering_Strategy::update_qos_properties } void -TAO_Notify_Buffering_Strategy::shutdown (void) +TAO_Notify_Buffering_Strategy::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_); @@ -67,7 +67,7 @@ TAO_Notify_Buffering_Strategy::shutdown (void) } ACE_Time_Value -TAO_Notify_Buffering_Strategy::oldest_event (void) +TAO_Notify_Buffering_Strategy::oldest_event () { ACE_Time_Value tv (ACE_Time_Value::max_time); ACE_Message_Block* mb = 0; @@ -91,13 +91,13 @@ TAO_Notify_Buffering_Strategy::oldest_event (void) } -TAO_Notify_Buffering_Strategy::Tracker::Tracker (void) +TAO_Notify_Buffering_Strategy::Tracker::Tracker () : child_ (0) { } -TAO_Notify_Buffering_Strategy::Tracker::~Tracker (void) +TAO_Notify_Buffering_Strategy::Tracker::~Tracker () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index d789e146bbb..4ba1ea9207d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -151,7 +151,7 @@ typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_CosEC_ProxyPushSupplier , TAO_Notify_ConsumerAdmin> TAO_Notify_CosEC_ProxyPushSupplier_Builder; -TAO_Notify_Builder::TAO_Notify_Builder (void) +TAO_Notify_Builder::TAO_Notify_Builder () { // Init the static members. TAO_Notify_AnyEvent::event_type_ = TAO_Notify_EventType::special (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index c3bf761f86a..ae7f7f43f71 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -58,19 +58,19 @@ TAO_Notify_Consumer::~TAO_Notify_Consumer () } CORBA::ULong -TAO_Notify_Consumer::_incr_refcnt (void) +TAO_Notify_Consumer::_incr_refcnt () { return this->add_reference(); } CORBA::ULong -TAO_Notify_Consumer::_decr_refcnt (void) +TAO_Notify_Consumer::_decr_refcnt () { return this->remove_reference(); } TAO_Notify_Proxy* -TAO_Notify_Consumer::proxy (void) +TAO_Notify_Consumer::proxy () { return this->proxy_supplier (); } @@ -82,7 +82,7 @@ TAO_Notify_Consumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties } void -TAO_Notify_Consumer::resume (void) +TAO_Notify_Consumer::resume () { this->is_suspended_ = 0; @@ -468,7 +468,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) } void -TAO_Notify_Consumer::dispatch_pending (void) +TAO_Notify_Consumer::dispatch_pending () { if (DEBUG_LEVEL > 5) ORBSVCS_DEBUG ((LM_DEBUG, @@ -642,7 +642,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) } void -TAO_Notify_Consumer::cancel_timer (void) +TAO_Notify_Consumer::cancel_timer () { if (this->timer_.isSet() && this->timer_id_ != -1) { @@ -677,7 +677,7 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*) } void -TAO_Notify_Consumer::shutdown (void) +TAO_Notify_Consumer::shutdown () { this->suspend(); if (this->timer_.isSet ()) @@ -701,13 +701,13 @@ TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& ad } TAO_SYNCH_MUTEX* -TAO_Notify_Consumer::proxy_lock (void) +TAO_Notify_Consumer::proxy_lock () { return &this->proxy_->lock_; } TAO_Notify_ProxySupplier* -TAO_Notify_Consumer::proxy_supplier (void) +TAO_Notify_Consumer::proxy_supplier () { return this->proxy_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 28e42513918..56b93b5206f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -31,7 +31,7 @@ TAO_Notify_ProxySupplier_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker; -TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin (void) +TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin () : TAO_Notify_Admin () { } @@ -60,26 +60,26 @@ TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec) } void -TAO_Notify_ConsumerAdmin::_add_ref (void) +TAO_Notify_ConsumerAdmin::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_ConsumerAdmin::_remove_ref (void) +TAO_Notify_ConsumerAdmin::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_ConsumerAdmin::release (void) +TAO_Notify_ConsumerAdmin::release () { delete this; //@@ inform factory } void -TAO_Notify_ConsumerAdmin::destroy (void) +TAO_Notify_ConsumerAdmin::destroy () { this->shutdown (); this->ec_->remove (this); @@ -179,7 +179,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_Notify_ConsumerAdmin::obtain_push_supplier (void) +TAO_Notify_ConsumerAdmin::obtain_push_supplier () { CosEventChannelAdmin::ProxyPushSupplier_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this); @@ -188,25 +188,25 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (void) } CosNotifyChannelAdmin::AdminID -TAO_Notify_ConsumerAdmin::MyID (void) +TAO_Notify_ConsumerAdmin::MyID () { return this->id (); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_ConsumerAdmin::MyChannel (void) +TAO_Notify_ConsumerAdmin::MyChannel () { return this->ec_->_this (); } ::CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_ConsumerAdmin::MyOperator (void) +TAO_Notify_ConsumerAdmin::MyOperator () { return this->filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin::push_suppliers (void) +TAO_Notify_ConsumerAdmin::push_suppliers () { TAO_Notify_Proxy_Seq_Worker seq_worker; @@ -228,7 +228,7 @@ void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & q CosNotification::QoSProperties* -TAO_Notify_ConsumerAdmin::get_qos (void) +TAO_Notify_ConsumerAdmin::get_qos () { return this->TAO_Notify_Object::get_qos (); } @@ -275,13 +275,13 @@ TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter) } ::CosNotifyFilter::FilterIDSeq* -TAO_Notify_ConsumerAdmin::get_all_filters (void) +TAO_Notify_ConsumerAdmin::get_all_filters () { return this->filter_admin_.get_all_filters (); } void -TAO_Notify_ConsumerAdmin::remove_all_filters (void) +TAO_Notify_ConsumerAdmin::remove_all_filters () { this->filter_admin_.remove_all_filters (); } @@ -289,7 +289,7 @@ TAO_Notify_ConsumerAdmin::remove_all_filters (void) /************ UNIMPLMENTED METHODS *************************/ CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin::priority_filter (void) +TAO_Notify_ConsumerAdmin::priority_filter () { throw CORBA::NO_IMPLEMENT (); } @@ -302,7 +302,7 @@ TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /* } CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin::lifetime_filter (void) +TAO_Notify_ConsumerAdmin::lifetime_filter () { throw CORBA::NO_IMPLEMENT (); @@ -315,7 +315,7 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /* } ::CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin::pull_suppliers (void) +TAO_Notify_ConsumerAdmin::pull_suppliers () { throw CORBA::NO_IMPLEMENT (); } @@ -336,7 +336,7 @@ TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & / } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void) +TAO_Notify_ConsumerAdmin::obtain_pull_supplier () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp index 1b1abd51aa4..9b1f56e9c96 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer (void) +TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer () { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_CosNotify_Service); ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD); diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 6f79de052cf..f5e9f05863e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -13,11 +13,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CosNotify_Service::TAO_CosNotify_Service (void) +TAO_CosNotify_Service::TAO_CosNotify_Service () { } -TAO_CosNotify_Service::~TAO_CosNotify_Service (void) +TAO_CosNotify_Service::~TAO_CosNotify_Service () { } @@ -292,7 +292,7 @@ TAO_CosNotify_Service::set_threads (CosNotification::QoSProperties &qos, int thr } int -TAO_CosNotify_Service::fini (void) +TAO_CosNotify_Service::fini () { if (TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb()) { @@ -449,7 +449,7 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o } TAO_Notify_Factory* -TAO_CosNotify_Service::create_factory (void) +TAO_CosNotify_Service::create_factory () { TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory"); if (factory == 0) @@ -462,7 +462,7 @@ TAO_CosNotify_Service::create_factory (void) } TAO_Notify_Builder* -TAO_CosNotify_Service::create_builder (void) +TAO_CosNotify_Service::create_builder () { TAO_Notify_Builder* builder = 0; ACE_NEW_THROW_EX (builder, @@ -486,14 +486,14 @@ TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/) } TAO_Notify_Factory& -TAO_CosNotify_Service::factory (void) +TAO_CosNotify_Service::factory () { ACE_ASSERT( this->factory_.get() != 0 ); return *this->factory_; } TAO_Notify_Builder& -TAO_CosNotify_Service::builder (void) +TAO_CosNotify_Service::builder () { ACE_ASSERT( this->builder_.get() != 0 ); return *this->builder_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index a17a30f6aae..e594cef4ae0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -37,7 +37,7 @@ public: } }; -TAO_Notify_Default_Factory::TAO_Notify_Default_Factory (void) +TAO_Notify_Default_Factory::TAO_Notify_Default_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index b9a8c147a14..64752b39a91 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Constraint_Expr::TAO_Notify_Constraint_Expr (void) +TAO_Notify_Constraint_Expr::TAO_Notify_Constraint_Expr () { } @@ -86,7 +86,7 @@ TAO_Notify_Constraint_Expr::load_child ( void -TAO_Notify_Constraint_Expr::release (void) +TAO_Notify_Constraint_Expr::release () { delete this; //@@ inform factory @@ -124,7 +124,7 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter () } char* -TAO_Notify_ETCL_Filter::constraint_grammar (void) +TAO_Notify_ETCL_Filter::constraint_grammar () { return CORBA::string_dup (this->grammar_.c_str ()); } @@ -364,7 +364,7 @@ TAO_Notify_ETCL_Filter::get_constraints ( } CosNotifyFilter::ConstraintInfoSeq * -TAO_Notify_ETCL_Filter::get_all_constraints (void) +TAO_Notify_ETCL_Filter::get_all_constraints () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -404,7 +404,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (void) } void -TAO_Notify_ETCL_Filter::remove_all_constraints (void) +TAO_Notify_ETCL_Filter::remove_all_constraints () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -413,7 +413,7 @@ TAO_Notify_ETCL_Filter::remove_all_constraints (void) } void -TAO_Notify_ETCL_Filter::remove_all_constraints_i (void) +TAO_Notify_ETCL_Filter::remove_all_constraints_i () { CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_); CONSTRAINT_EXPR_LIST::ENTRY *entry; @@ -431,7 +431,7 @@ TAO_Notify_ETCL_Filter::remove_all_constraints_i (void) } void -TAO_Notify_ETCL_Filter::destroy (void) +TAO_Notify_ETCL_Filter::destroy () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -507,7 +507,7 @@ TAO_Notify_ETCL_Filter::detach_callback ( } CosNotifyFilter::CallbackIDSeq * -TAO_Notify_ETCL_Filter::get_callbacks (void) +TAO_Notify_ETCL_Filter::get_callbacks () { throw CORBA::NO_IMPLEMENT (); } @@ -548,7 +548,7 @@ TAO_Notify_ETCL_Filter::save_persistent (TAO_Notify::Topology_Saver& saver) void -TAO_Notify_ETCL_Filter::release (void) +TAO_Notify_ETCL_Filter::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 83223cc25c0..a5daa3611b9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) : +TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory () : filter_poa_ (PortableServer::POA::_nil ()) { } @@ -59,7 +59,7 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_ptr filter_poa) } void -TAO_Notify_ETCL_FilterFactory::destroy (void) +TAO_Notify_ETCL_FilterFactory::destroy () { if (CORBA::is_nil(this->filter_poa_.in ())) return; @@ -241,7 +241,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type, void -TAO_Notify_ETCL_FilterFactory::release (void) +TAO_Notify_ETCL_FilterFactory::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 0b75982cd13..d3f7ff5c047 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Event::TAO_Notify_Event (void) +TAO_Notify_Event::TAO_Notify_Event () : priority_ (CosNotification::Priority, CosNotification::DefaultPriority) , timeout_ (CosNotification::Timeout) , reliable_ (CosNotification::EventReliability, true) @@ -32,7 +32,7 @@ TAO_Notify_Event::~TAO_Notify_Event () // ORBSVCS_DEBUG ((LM_DEBUG,"event:%x destroyed\n", this )); } void -TAO_Notify_Event::release (void) +TAO_Notify_Event::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index c0e30c6fe10..35445ee3fcf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -40,7 +40,7 @@ TAO_Notify_SupplierAdmin_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Seq_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_SupplierAdmin> TAO_Notify_SupplierAdmin_Seq_Worker; -TAO_Notify_EventChannel::TAO_Notify_EventChannel (void) +TAO_Notify_EventChannel::TAO_Notify_EventChannel () : ecf_ (0) , ca_container_ (0) , sa_container_ (0) @@ -179,19 +179,19 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent) void -TAO_Notify_EventChannel::_add_ref (void) +TAO_Notify_EventChannel::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_EventChannel::_remove_ref (void) +TAO_Notify_EventChannel::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_EventChannel::release (void) +TAO_Notify_EventChannel::release () { delete this; //@@ inform factory @@ -204,7 +204,7 @@ TAO_Notify_EventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID, } int -TAO_Notify_EventChannel::shutdown (void) +TAO_Notify_EventChannel::shutdown () { int sd_ret = TAO_Notify_Object::shutdown (); @@ -221,7 +221,7 @@ TAO_Notify_EventChannel::shutdown (void) } void -TAO_Notify_EventChannel::destroy (void) +TAO_Notify_EventChannel::destroy () { TAO_Notify_EventChannel::Ptr guard( this ); @@ -260,19 +260,19 @@ TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos) } CosNotification::QoSProperties* -TAO_Notify_EventChannel::get_qos (void) +TAO_Notify_EventChannel::get_qos () { return this->TAO_Notify_Object::get_qos (); } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannel::MyFactory (void) +TAO_Notify_EventChannel::MyFactory () { return this->ecf_->_this (); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel::default_consumer_admin (void) +TAO_Notify_EventChannel::default_consumer_admin () { if (CORBA::is_nil (default_consumer_admin_.in ())) { @@ -299,7 +299,7 @@ TAO_Notify_EventChannel::default_consumer_admin (void) } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel::default_supplier_admin (void) +TAO_Notify_EventChannel::default_supplier_admin () { if (CORBA::is_nil (default_supplier_admin_.in ())) { @@ -324,7 +324,7 @@ TAO_Notify_EventChannel::default_supplier_admin (void) } ::CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannel::default_filter_factory (void) +TAO_Notify_EventChannel::default_filter_factory () { return CosNotifyFilter::FilterFactory::_duplicate (this->default_filter_factory_.in ()); } @@ -384,7 +384,7 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id) } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel::get_all_consumeradmins (void) +TAO_Notify_EventChannel::get_all_consumeradmins () { TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker; @@ -392,7 +392,7 @@ TAO_Notify_EventChannel::get_all_consumeradmins (void) } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel::get_all_supplieradmins (void) +TAO_Notify_EventChannel::get_all_supplieradmins () { TAO_Notify_SupplierAdmin_Seq_Worker seq_worker; @@ -406,7 +406,7 @@ TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & adm } CosNotification::AdminProperties* -TAO_Notify_EventChannel::get_admin (void) +TAO_Notify_EventChannel::get_admin () { CosNotification::AdminProperties_var properties; @@ -420,13 +420,13 @@ TAO_Notify_EventChannel::get_admin (void) } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel::for_consumers (void) +TAO_Notify_EventChannel::for_consumers () { return this->default_consumer_admin(); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel::for_suppliers (void) +TAO_Notify_EventChannel::for_suppliers () { return this->default_supplier_admin (); } @@ -592,7 +592,7 @@ TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_ void -TAO_Notify_EventChannel::reconnect (void) +TAO_Notify_EventChannel::reconnect () { TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin> ca_wrk; this->ca_container().collection()->for_each(&ca_wrk); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index a51e3da7ba7..b8b8fe50472 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -45,7 +45,7 @@ TAO_Notify_EventChannel_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Seq_Worker; -TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void) +TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory () : topology_save_seq_ (0) , topology_factory_(0) , reconnect_registry_(*this) @@ -58,7 +58,7 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory () } void -TAO_Notify_EventChannelFactory::destroy (void) +TAO_Notify_EventChannelFactory::destroy () { if (this->shutdown () == 1) return; @@ -128,19 +128,19 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa) } void -TAO_Notify_EventChannelFactory::_add_ref (void) +TAO_Notify_EventChannelFactory::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_EventChannelFactory::_remove_ref (void) +TAO_Notify_EventChannelFactory::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_EventChannelFactory::release (void) +TAO_Notify_EventChannelFactory::release () { delete this; //@@ inform factory @@ -154,7 +154,7 @@ TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel) } int -TAO_Notify_EventChannelFactory::shutdown (void) +TAO_Notify_EventChannelFactory::shutdown () { this->stop_validator(); @@ -194,7 +194,7 @@ TAO_Notify_EventChannelFactory::create_named_channel ( } CosNotifyChannelAdmin::ChannelIDSeq* -TAO_Notify_EventChannelFactory::get_all_channels (void) +TAO_Notify_EventChannelFactory::get_all_channels () { TAO_Notify_EventChannel_Seq_Worker seq_worker; @@ -222,7 +222,7 @@ TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factor } void -TAO_Notify_EventChannelFactory::load_topology (void) +TAO_Notify_EventChannelFactory::load_topology () { this->loading_topology_ = true; if (this->topology_factory_ != 0) @@ -292,7 +292,7 @@ TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& sav } void -TAO_Notify_EventChannelFactory::load_event_persistence (void) +TAO_Notify_EventChannelFactory::load_event_persistence () { TAO_Notify::Event_Persistence_Strategy * strategy = ACE_Dynamic_Service <TAO_Notify::Event_Persistence_Strategy>::instance ("Event_Persistence"); @@ -334,7 +334,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) } bool -TAO_Notify_EventChannelFactory::change_to_parent (void) +TAO_Notify_EventChannelFactory::change_to_parent () { bool saving = false; if (! this->loading_topology_) @@ -396,7 +396,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type, } void -TAO_Notify_EventChannelFactory::reconnect (void) +TAO_Notify_EventChannelFactory::reconnect () { // Reconnect all children first TAO_Notify::Reconnect_Worker<TAO_Notify_EventChannel> wrk; @@ -434,13 +434,13 @@ TAO_Notify_EventChannelFactory::unregister_callback ( } CORBA::Boolean -TAO_Notify_EventChannelFactory::is_alive (void) +TAO_Notify_EventChannelFactory::is_alive () { return CORBA::Boolean (1); } void -TAO_Notify_EventChannelFactory::save_topology (void) +TAO_Notify_EventChannelFactory::save_topology () { this->self_change (); } @@ -497,7 +497,7 @@ TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannelFactory::activate_self (void) +TAO_Notify_EventChannelFactory::activate_self () { CORBA::Object_var obj = this->activate (this); this->channel_factory_ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index 7ee8a94b6b3..cb8d189001d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -13,12 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Notify_EventType -TAO_Notify_EventType::special (void) +TAO_Notify_EventType::special () { return TAO_Notify_EventType ("*", "%ALL"); } -TAO_Notify_EventType::TAO_Notify_EventType (void) +TAO_Notify_EventType::TAO_Notify_EventType () { } @@ -55,7 +55,7 @@ TAO_Notify_EventType::~TAO_Notify_EventType () } void -TAO_Notify_EventType::recompute_hash (void) +TAO_Notify_EventType::recompute_hash () { // @@ Pradeep: this code is bound to crash someday if the strings // are too long.... See if the hash_pjw () function can be modified @@ -112,14 +112,14 @@ TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const } CORBA::Boolean -TAO_Notify_EventType::is_special (void) const +TAO_Notify_EventType::is_special () const { return (this->domain_is_wildcard (this->event_type_.domain_name) && this->type_is_wildcard (this->event_type_.type_name)); } void -TAO_Notify_EventType::dump (void) const +TAO_Notify_EventType::dump () const { ORBSVCS_DEBUG ((LM_DEBUG, "(%s,%s)", diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 906e103d2cd..cd98e86503a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void) +TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq () { } @@ -243,7 +243,7 @@ TAO_Notify_EventTypeSeq::intersection (const TAO_Notify_EventTypeSeq& rhs, const } void -TAO_Notify_EventTypeSeq::dump (void) const +TAO_Notify_EventTypeSeq::dump () const { TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (*this); @@ -303,7 +303,7 @@ TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id, } void -TAO_Notify_EventTypeSeq::release (void) +TAO_Notify_EventTypeSeq::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index 3f279e612ea..0ad3ff2ca33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -55,7 +55,7 @@ protected: /********************************************************************************/ -TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (void) +TAO_Notify_Event_Manager::TAO_Notify_Event_Manager () { } @@ -74,7 +74,7 @@ void TAO_Notify_Event_Manager::release() } void -TAO_Notify_Event_Manager::init (void) +TAO_Notify_Event_Manager::init () { ACE_ASSERT (this->consumer_map_.get() == 0); @@ -96,7 +96,7 @@ TAO_Notify_Event_Manager::init (void) } void -TAO_Notify_Event_Manager::shutdown (void) +TAO_Notify_Event_Manager::shutdown () { } @@ -231,27 +231,27 @@ TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, } TAO_Notify_Consumer_Map& -TAO_Notify_Event_Manager::consumer_map (void) +TAO_Notify_Event_Manager::consumer_map () { ACE_ASSERT( this->consumer_map_.get() != 0 ); return *this->consumer_map_; } TAO_Notify_Supplier_Map& -TAO_Notify_Event_Manager::supplier_map (void) +TAO_Notify_Event_Manager::supplier_map () { ACE_ASSERT( this->supplier_map_.get() != 0 ); return *this->supplier_map_; } const TAO_Notify_EventTypeSeq& -TAO_Notify_Event_Manager::offered_types (void) const +TAO_Notify_Event_Manager::offered_types () const { return this->supplier_map_->event_types (); } const TAO_Notify_EventTypeSeq& -TAO_Notify_Event_Manager::subscription_types (void) const +TAO_Notify_Event_Manager::subscription_types () const { return this->consumer_map_->event_types (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp index 0bfdbf409ec..3876f8b7463 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory (void) +TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 441b3d556d0..64d570166d9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -15,13 +15,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Implementation skeleton constructor -TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void) +TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin () { } // Implementation skeleton destructor -TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void) +TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin () { } @@ -71,7 +71,7 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id) } CosNotifyFilter::FilterIDSeq* -TAO_Notify_FilterAdmin::get_all_filters (void) +TAO_Notify_FilterAdmin::get_all_filters () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -104,7 +104,7 @@ TAO_Notify_FilterAdmin::get_all_filters (void) } void -TAO_Notify_FilterAdmin::remove_all_filters (void) +TAO_Notify_FilterAdmin::remove_all_filters () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -174,7 +174,7 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id, } void -TAO_Notify_FilterAdmin::release (void) +TAO_Notify_FilterAdmin::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp index eca1d32f6f3..b6c6ca41364 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void) +TAO_Notify_ID_Factory::TAO_Notify_ID_Factory () : seed_ (0) { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp index e43bf8d3057..fdcd1075447 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp @@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void) +TAO_Notify_Method_Request::~TAO_Notify_Method_Request () { } TAO_Notify_Method_Request_Queueable * -TAO_Notify_Method_Request_Queueable::copy (void) +TAO_Notify_Method_Request_Queueable::copy () { return this; } @@ -57,7 +57,7 @@ TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event* event) } const ACE_Time_Value& -TAO_Notify_Method_Request_Queueable::creation_time (void) const +TAO_Notify_Method_Request_Queueable::creation_time () const { return this->time_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index 3a420766747..f584e725bef 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -57,7 +57,7 @@ TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch () { } -int TAO_Notify_Method_Request_Dispatch::execute_i (void) +int TAO_Notify_Method_Request_Dispatch::execute_i () { if (this->proxy_supplier_->has_shutdown ()) return 0; // If we were shutdown while waiting in the queue, return with no action. @@ -210,7 +210,7 @@ TAO_Notify_Method_Request_Dispatch_Queueable::~TAO_Notify_Method_Request_Dispatc } int -TAO_Notify_Method_Request_Dispatch_Queueable::execute (void) +TAO_Notify_Method_Request_Dispatch_Queueable::execute () { return this->execute_i (); } @@ -231,13 +231,13 @@ TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch } int -TAO_Notify_Method_Request_Dispatch_No_Copy::execute (void) +TAO_Notify_Method_Request_Dispatch_No_Copy::execute () { return this->execute_i (); } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Dispatch_No_Copy::copy (void) +TAO_Notify_Method_Request_Dispatch_No_Copy::copy () { TAO_Notify_Method_Request_Queueable* request = 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp index 519b1ff0a47..590bbba4ffe 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp @@ -83,7 +83,7 @@ TAO_Notify_Method_Request_Event_Queueable::~TAO_Notify_Method_Request_Event_Queu } int -TAO_Notify_Method_Request_Event_Queueable::execute (void) +TAO_Notify_Method_Request_Event_Queueable::execute () { ACE_ASSERT (false); return -1; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 2a3cf610e46..264f4ede97c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -54,7 +54,7 @@ TAO_Notify_Method_Request_Lookup::work ( } } -int TAO_Notify_Method_Request_Lookup::execute_i (void) +int TAO_Notify_Method_Request_Lookup::execute_i () { if (this->proxy_consumer_->has_shutdown ()) return 0; // If we were shutdown while waiting in the queue, return with no action. @@ -187,7 +187,7 @@ TAO_Notify_Method_Request_Lookup_Queueable::~TAO_Notify_Method_Request_Lookup_Qu } int -TAO_Notify_Method_Request_Lookup_Queueable::execute (void) +TAO_Notify_Method_Request_Lookup_Queueable::execute () { return this->execute_i (); } @@ -206,13 +206,13 @@ TAO_Notify_Method_Request_Lookup_No_Copy::~TAO_Notify_Method_Request_Lookup_No_C } int -TAO_Notify_Method_Request_Lookup_No_Copy::execute (void) +TAO_Notify_Method_Request_Lookup_No_Copy::execute () { return this->execute_i (); } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Lookup_No_Copy::copy (void) +TAO_Notify_Method_Request_Lookup_No_Copy::copy () { TAO_Notify_Method_Request_Queueable* request; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp index 5a25e497aae..847a70616aa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp @@ -13,13 +13,13 @@ TAO_Notify_Method_Request_Shutdown::~TAO_Notify_Method_Request_Shutdown () } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Shutdown::copy (void) +TAO_Notify_Method_Request_Shutdown::copy () { return new TAO_Notify_Method_Request_Shutdown (this->task_); } int -TAO_Notify_Method_Request_Shutdown::execute (void) +TAO_Notify_Method_Request_Shutdown::execute () { // Shut down the scheduler by deactivating the activation queue's // underlying message queue - should pop all worker threads off their diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp index 14f93d48e73..3b4eee8bb9f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp @@ -15,7 +15,7 @@ TAO_Notify_Method_Request_Updates::~TAO_Notify_Method_Request_Updates () } int -TAO_Notify_Method_Request_Updates::execute (void) +TAO_Notify_Method_Request_Updates::execute () { return this->execute_i (); } @@ -33,7 +33,7 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Updates_No_Copy::copy (void) +TAO_Notify_Method_Request_Updates_No_Copy::copy () { TAO_Notify_Method_Request_Queueable* request = 0; @@ -45,7 +45,7 @@ TAO_Notify_Method_Request_Updates_No_Copy::copy (void) } int -TAO_Notify_Method_Request_Updates_No_Copy::execute (void) +TAO_Notify_Method_Request_Updates_No_Copy::execute () { return this->execute_i (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp index 73e63738be3..7ff8ac5455d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_NS_Control::~TAO_NS_Control (void) +TAO_NS_Control::~TAO_NS_Control () { } @@ -12,7 +12,7 @@ TAO_NS_Control::TAO_NS_Control (const char* name) } const ACE_CString& -TAO_NS_Control::name (void) const +TAO_NS_Control::name () const { return this->name_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp index 2dce7e4ea36..6b767080a8d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp @@ -3,12 +3,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Control_Registry* -TAO_Control_Registry::instance (void) +TAO_Control_Registry::instance () { return TAO_Singleton<TAO_Control_Registry, TAO_SYNCH_MUTEX>::instance (); } -TAO_Control_Registry::~TAO_Control_Registry (void) +TAO_Control_Registry::~TAO_Control_Registry () { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->mutex_); @@ -67,7 +67,7 @@ TAO_Control_Registry::remove (const ACE_CString& name) } const TAO_Control_Registry::NameList& -TAO_Control_Registry::names (void) +TAO_Control_Registry::names () { if (this->name_cache_.length () == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index cdee710b3d7..0c9a43b1f82 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MonitorManager::TAO_MonitorManager (void) +TAO_MonitorManager::TAO_MonitorManager () : run_ (false) , initialized_ (false) { @@ -93,7 +93,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) } int -TAO_MonitorManager::fini (void) +TAO_MonitorManager::fini () { if (!CORBA::is_nil (this->task_.orb_.in ())) { @@ -110,7 +110,7 @@ TAO_MonitorManager::fini (void) } int -TAO_MonitorManager::run (void) +TAO_MonitorManager::run () { bool activate = false; @@ -152,13 +152,13 @@ TAO_MonitorManager::run (void) } int -TAO_MonitorManager::resume (void) +TAO_MonitorManager::resume () { return this->run (); } void -TAO_MonitorManager::shutdown (void) +TAO_MonitorManager::shutdown () { TAO_MonitorManager* monitor = ACE_Dynamic_Service<TAO_MonitorManager>::instance ( @@ -170,7 +170,7 @@ TAO_MonitorManager::shutdown (void) } } -TAO_MonitorManager::ORBTask::ORBTask (void) +TAO_MonitorManager::ORBTask::ORBTask () : use_name_svc_ (true) , startup_barrier_ (2) // synch the parent with the single child thread , mc_orb_name_ (ACE_TEXT("TAO_MonitorAndControl")) @@ -178,7 +178,7 @@ TAO_MonitorManager::ORBTask::ORBTask (void) } int -TAO_MonitorManager::ORBTask::svc (void) +TAO_MonitorManager::ORBTask::svc () { try { diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp index 03cbde82aab..e5ca866f620 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp @@ -21,7 +21,7 @@ NotificationServiceMonitor_i::NotificationServiceMonitor_i (CORBA::ORB_ptr orb) } Monitor::NameList* -NotificationServiceMonitor_i::get_statistic_names (void) +NotificationServiceMonitor_i::get_statistic_names () { Monitor_Control_Types::NameList name_list = Monitor_Point_Registry::instance ()->names (); @@ -208,7 +208,7 @@ NotificationServiceMonitor_i::send_control_command (const char* name, } void -NotificationServiceMonitor_i::shutdown (void) +NotificationServiceMonitor_i::shutdown () { if (!CORBA::is_nil (this->orb_.in ())) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp index 72063c91920..8994a77cfc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp @@ -13,12 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MC_Notify_Service::~TAO_MC_Notify_Service (void) +TAO_MC_Notify_Service::~TAO_MC_Notify_Service () { } TAO_Notify_Factory* -TAO_MC_Notify_Service::create_factory (void) +TAO_MC_Notify_Service::create_factory () { TAO_MC_Default_Factory* factory = 0; ACE_NEW_THROW_EX (factory, diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index 6847580b12d..5d9275a1412 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -51,7 +51,7 @@ private: CosNotifyChannelAdmin::AdminID id_; }; -TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin (void) +TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin () : stat_name_ (), control_name_ (), queue_size_ (0), @@ -59,7 +59,7 @@ TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin (void) { } -TAO_MonitorConsumerAdmin::~TAO_MonitorConsumerAdmin (void) +TAO_MonitorConsumerAdmin::~TAO_MonitorConsumerAdmin () { this->remove (); // The registry also manages this refcount. The pointer itself @@ -205,7 +205,7 @@ TAO_MonitorConsumerAdmin::count_queue_overflow ( } TAO_MonitorEventChannel * -TAO_MonitorConsumerAdmin::get_ec (void) const +TAO_MonitorConsumerAdmin::get_ec () const { TAO_MonitorEventChannel* ec = dynamic_cast<TAO_MonitorEventChannel*> (this->ec_.get ()); if (ec == 0) @@ -214,21 +214,21 @@ TAO_MonitorConsumerAdmin::get_ec (void) const } const ACE_CString & -TAO_MonitorConsumerAdmin::stat_name (void)const +TAO_MonitorConsumerAdmin::stat_name ()const { return stat_name_; } void -TAO_MonitorConsumerAdmin::destroy (void) +TAO_MonitorConsumerAdmin::destroy () { this->remove (); this->TAO_Notify_ConsumerAdmin::destroy (); } void -TAO_MonitorConsumerAdmin::remove (void) +TAO_MonitorConsumerAdmin::remove () { // First, make sure we can get down to the real ec type TAO_MonitorEventChannel* ec = diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp index 5b9b6f9470b..92e23ce07d6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -39,7 +39,7 @@ public: { } - virtual void update (void) { + virtual void update () { if (this->type () == Monitor_Control_Types::MC_LIST) { Monitor_Control_Types::NameList list; @@ -75,7 +75,7 @@ public: { } - virtual void update (void) { + virtual void update () { Monitor_Control_Types::NameList list; this->interf_->get_timedout_consumers (&list); this->receive (list); @@ -97,7 +97,7 @@ public: { } - virtual void update (void) + virtual void update () { if (this->type () == Monitor_Control_Types::MC_LIST) { @@ -146,7 +146,7 @@ public: { } - virtual void update (void) + virtual void update () { this->receive (this->interf_->calculate_queue_size (this->count_)); } @@ -168,7 +168,7 @@ public: { } - virtual void update (void) + virtual void update () { this->receive (this->interf_->get_oldest_event ()); } @@ -187,7 +187,7 @@ public: { } - virtual void update (void) + virtual void update () { Monitor_Control_Types::NameList list; this->interf_->determine_slowest_consumer (&list); @@ -296,7 +296,7 @@ TAO_MonitorEventChannel::TAO_MonitorEventChannel (const char* name) this->add_stats (); } -TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void) +TAO_MonitorEventChannel::~TAO_MonitorEventChannel () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_); @@ -318,7 +318,7 @@ TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void) } const ACE_CString& -TAO_MonitorEventChannel::name (void) const +TAO_MonitorEventChannel::name () const { return this->name_; } @@ -1288,7 +1288,7 @@ TAO_MonitorEventChannel::determine_slowest_consumer ( } double -TAO_MonitorEventChannel::get_oldest_event (void) +TAO_MonitorEventChannel::get_oldest_event () { CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids = this->get_all_consumeradmins (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp index d3de46ab273..753ace26855 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp @@ -30,7 +30,7 @@ public: { } - virtual void update (void) + virtual void update () { if (this->type () == Monitor_Control_Types::MC_LIST) { @@ -151,7 +151,7 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory ( } } -TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory (void) +TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory () { Monitor_Point_Registry* instance = Monitor_Point_Registry::instance (); size_t size = this->stat_names_.size (); @@ -418,7 +418,7 @@ TAO_MonitorEventChannelFactory::Unbinder::Unbinder ( { } -TAO_MonitorEventChannelFactory::Unbinder::~Unbinder (void) +TAO_MonitorEventChannelFactory::Unbinder::~Unbinder () { if (!this->released_) { @@ -427,7 +427,7 @@ TAO_MonitorEventChannelFactory::Unbinder::~Unbinder (void) } void -TAO_MonitorEventChannelFactory::Unbinder::release (void) +TAO_MonitorEventChannelFactory::Unbinder::release () { this->released_ = true; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp index b1e55e19a79..ffa6e2bb0e1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp @@ -41,11 +41,11 @@ private: CosNotifyChannelAdmin::AdminID id_; }; -TAO_MonitorSupplierAdmin::TAO_MonitorSupplierAdmin (void) +TAO_MonitorSupplierAdmin::TAO_MonitorSupplierAdmin () { } -TAO_MonitorSupplierAdmin::~TAO_MonitorSupplierAdmin (void) +TAO_MonitorSupplierAdmin::~TAO_MonitorSupplierAdmin () { // First, make sure we can get down to the real ec type TAO_MonitorEventChannel* ec = diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index e0f0a0a8b38..c255704f3df 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void) +TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter () { } -TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void) +TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index eb1e3c4e429..f26b3719927 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void) +TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor () : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY), implicit_ids_(implicit_ids_size_), filterable_data_(filterable_data_size_), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index f0af71d982c..f9ca1b251e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_CO_Factory::init_svc (void) +TAO_Notify_Default_CO_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index 21421e091e7..cf3fdb6e5d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_Collection_Factory::init_svc (void) +TAO_Notify_Default_Collection_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 44687d95c71..f8020100558 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_EMO_Factory::init_svc (void) +TAO_Notify_Default_EMO_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp index 6648d5e5ffd..c80e8358626 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_POA_Factory::init_svc (void) +TAO_Notify_Default_POA_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index adb740a2803..3fe20a72ab3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Object::TAO_Notify_Object (void) +TAO_Notify_Object::TAO_Notify_Object () : poa_ (0) , proxy_poa_ (0) , own_proxy_poa_ (false) @@ -82,7 +82,7 @@ TAO_Notify_Object::activate ( void -TAO_Notify_Object::deactivate (void) +TAO_Notify_Object::deactivate () { try { @@ -100,7 +100,7 @@ TAO_Notify_Object::deactivate (void) } int -TAO_Notify_Object::shutdown (void) +TAO_Notify_Object::shutdown () { { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1); @@ -119,13 +119,13 @@ TAO_Notify_Object::shutdown (void) } CORBA::Object_ptr -TAO_Notify_Object::ref (void) +TAO_Notify_Object::ref () { return this->poa_->id_to_reference (this->id_); } void -TAO_Notify_Object::shutdown_worker_task (void) +TAO_Notify_Object::shutdown_worker_task () { // Only do this if we are the owner. TAO_Notify_Worker_Task::Ptr task( this->worker_task_ ); @@ -140,7 +140,7 @@ TAO_Notify_Object::shutdown_worker_task (void) } void -TAO_Notify_Object::destroy_proxy_poa (void) +TAO_Notify_Object::destroy_proxy_poa () { if (this->proxy_poa_ != 0) { @@ -166,7 +166,7 @@ TAO_Notify_Object::destroy_proxy_poa (void) } void -TAO_Notify_Object::destroy_object_poa (void) +TAO_Notify_Object::destroy_object_poa () { if (this->object_poa_ != 0) { @@ -192,7 +192,7 @@ TAO_Notify_Object::destroy_object_poa (void) } /// Shutdown the current poa. -void TAO_Notify_Object::destroy_poa (void) +void TAO_Notify_Object::destroy_poa () { this->poa_ = 0; } @@ -280,7 +280,7 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos) } CosNotification::QoSProperties* -TAO_Notify_Object::get_qos (void) +TAO_Notify_Object::get_qos () { CosNotification::QoSProperties_var properties; @@ -311,7 +311,7 @@ TAO_Notify_Object::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties } TAO_Notify_Timer* -TAO_Notify_Object::timer (void) +TAO_Notify_Object::timer () { ACE_ASSERT (worker_task_.get() != 0); return this->worker_task_->timer (); @@ -355,7 +355,7 @@ TAO_Notify_Object::load_attrs(const TAO_Notify::NVPList& attrs) } TAO_Notify_Worker_Task* -TAO_Notify_Object::get_worker_task (void) +TAO_Notify_Object::get_worker_task () { return this->worker_task_.get (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index b81da9bd7dc..ddf7d362ecc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -13,16 +13,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void) +TAO_Notify_POA_Helper::TAO_Notify_POA_Helper () { } -TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper (void) +TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper () { } ACE_CString -TAO_Notify_POA_Helper::get_unique_id (void) +TAO_Notify_POA_Helper::get_unique_id () { /// Factory for generating unique ids for the POAs. static TAO_Notify_ID_Factory poa_id_factory; @@ -234,7 +234,7 @@ TAO_Notify_POA_Helper::servant_to_reference ( void -TAO_Notify_POA_Helper::destroy (void) +TAO_Notify_POA_Helper::destroy () { poa_->destroy (true, false); // The <wait_for_completion> flag = 0 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp index d76ad81625d..894e03dc65a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Peer::TAO_Notify_Peer (void) +TAO_Notify_Peer::TAO_Notify_Peer () { } @@ -19,13 +19,13 @@ TAO_Notify_Peer::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/ } void -TAO_Notify_Peer::shutdown (void) +TAO_Notify_Peer::shutdown () { // NOP. } void -TAO_Notify_Peer::handle_dispatch_exception (void) +TAO_Notify_Peer::handle_dispatch_exception () { // Sever all association when a remote client misbehaves. Other strategies like reties are possible but not implemented. this->proxy ()->destroy (); @@ -100,13 +100,13 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const } CORBA::ULong -TAO_Notify_Peer::_incr_refcnt (void) +TAO_Notify_Peer::_incr_refcnt () { return this->proxy ()->_incr_refcnt (); } CORBA::ULong -TAO_Notify_Peer::_decr_refcnt (void) +TAO_Notify_Peer::_decr_refcnt () { return this->proxy ()->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 73262ca1adc..fd1938022b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Properties::TAO_Notify_Properties (void) +TAO_Notify_Properties::TAO_Notify_Properties () : factory_ (0) , builder_ (0) , orb_(0) @@ -39,14 +39,14 @@ TAO_Notify_Properties::~TAO_Notify_Properties () } TAO_Notify_Properties * -TAO_Notify_Properties::instance (void) +TAO_Notify_Properties::instance () { return ACE_Unmanaged_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>::instance (); } void -TAO_Notify_Properties::close (void) +TAO_Notify_Properties::close () { ACE_Unmanaged_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>::close (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp index 27d5d57ae16..77d76160bad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void) +TAO_Notify_PropertySeq::TAO_Notify_PropertySeq () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp index a82555e7620..ca6b2956649 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Proxy::TAO_Notify_Proxy (void) +TAO_Notify_Proxy::TAO_Notify_Proxy () : updates_off_ (0) { } @@ -41,7 +41,7 @@ TAO_Notify_Proxy::activate (PortableServer::Servant servant, } void -TAO_Notify_Proxy::deactivate (void) +TAO_Notify_Proxy::deactivate () { ACE_ASSERT (this->proxy_poa() != 0 ); this->proxy_poa()->deactivate (this->id()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 483546e7e7e..533dcced502 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -26,7 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void) +TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer () : supplier_admin_ (0) { } @@ -36,7 +36,7 @@ TAO_Notify_ProxyConsumer::~TAO_Notify_ProxyConsumer () } TAO_Notify_Peer* -TAO_Notify_ProxyConsumer::peer (void) +TAO_Notify_ProxyConsumer::peer () { return this->supplier (); } @@ -145,7 +145,7 @@ TAO_Notify_ProxyConsumer::supports_reliable_events () const } void -TAO_Notify_ProxyConsumer::disconnect (void) +TAO_Notify_ProxyConsumer::disconnect () { TAO_Notify_EventTypeSeq added; @@ -158,7 +158,7 @@ TAO_Notify_ProxyConsumer::disconnect (void) } int -TAO_Notify_ProxyConsumer::shutdown (void) +TAO_Notify_ProxyConsumer::shutdown () { if (this->TAO_Notify_Object::shutdown () == 1) return 1; @@ -174,7 +174,7 @@ TAO_Notify_ProxyConsumer::shutdown (void) } void -TAO_Notify_ProxyConsumer::destroy (void) +TAO_Notify_ProxyConsumer::destroy () { this->shutdown (); this->supplier_admin_->cleanup_proxy (this, false, false); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index 46b2740b2e3..f655b71fada 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void) +TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier () : consumer_admin_ (0) { } @@ -47,7 +47,7 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin) } TAO_Notify_Peer* -TAO_Notify_ProxySupplier:: peer (void) +TAO_Notify_ProxySupplier:: peer () { return this->consumer (); } @@ -99,7 +99,7 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer) } void -TAO_Notify_ProxySupplier::disconnect (void) +TAO_Notify_ProxySupplier::disconnect () { TAO_Notify_EventTypeSeq added; @@ -112,7 +112,7 @@ TAO_Notify_ProxySupplier::disconnect (void) } int -TAO_Notify_ProxySupplier::shutdown (void) +TAO_Notify_ProxySupplier::shutdown () { if (this->TAO_Notify_Object::shutdown () == 1) return 1; @@ -128,7 +128,7 @@ TAO_Notify_ProxySupplier::shutdown (void) } void -TAO_Notify_ProxySupplier::destroy (void) +TAO_Notify_ProxySupplier::destroy () { this->destroy (false); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp index 4a5e67a70c4..959ce7bd878 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void) +TAO_Notify_QoSProperties::TAO_Notify_QoSProperties () : event_reliability_(CosNotification::EventReliability) , connection_reliability_(CosNotification::ConnectionReliability) , priority_ (CosNotification::Priority) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 4437626e758..b9efd07001e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void) +TAO_Notify_RT_Builder::TAO_Notify_RT_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp index 70a45839531..bb30c4bd9e9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void) +TAO_Notify_RT_Factory::TAO_Notify_RT_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp index 575205e48a4..17d3befb962 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RT_Notify_Service::TAO_RT_Notify_Service (void) +TAO_RT_Notify_Service::TAO_RT_Notify_Service () { } @@ -53,7 +53,7 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb) } TAO_Notify_Factory* -TAO_RT_Notify_Service::create_factory (void) +TAO_RT_Notify_Service::create_factory () { TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory"); @@ -68,7 +68,7 @@ TAO_RT_Notify_Service::create_factory (void) } TAO_Notify_Builder* -TAO_RT_Notify_Service::create_builder (void) +TAO_RT_Notify_Service::create_builder () { TAO_Notify_Builder* builder = 0; ACE_NEW_THROW_EX (builder, diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp index 8967dd68fa3..3f718315949 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void) +TAO_Notify_RT_Properties::TAO_Notify_RT_Properties () { } @@ -16,7 +16,7 @@ TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties () } TAO_Notify_RT_Properties * -TAO_Notify_RT_Properties::instance (void) +TAO_Notify_RT_Properties::instance () { // Hide the template instantiation to prevent multiple instances // from being created. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp index c23841d19cd..29217f504e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void) +TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task () :timer_ (0) { } @@ -18,7 +18,7 @@ TAO_Notify_Reactive_Task::~TAO_Notify_Reactive_Task () } void -TAO_Notify_Reactive_Task::init (void) +TAO_Notify_Reactive_Task::init () { ACE_ASSERT (this->timer_.get() == 0); @@ -30,13 +30,13 @@ TAO_Notify_Reactive_Task::init (void) } void -TAO_Notify_Reactive_Task::release (void) +TAO_Notify_Reactive_Task::release () { delete this; //TODO: Release via factory. } void -TAO_Notify_Reactive_Task::shutdown (void) +TAO_Notify_Reactive_Task::shutdown () { } @@ -47,7 +47,7 @@ TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request) } TAO_Notify_Timer* -TAO_Notify_Reactive_Task::timer (void) +TAO_Notify_Reactive_Task::timer () { return this->timer_.get(); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index f1ffc62b480..6a8f3972cb4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -87,7 +87,7 @@ namespace TAO_Notify } CORBA::Boolean - Reconnection_Registry::is_alive (void) + Reconnection_Registry::is_alive () { return CORBA::Boolean(1); } @@ -231,7 +231,7 @@ namespace TAO_Notify } void - Reconnection_Registry::release (void) + Reconnection_Registry::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index d0d55f7050e..a57cd230a60 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -62,7 +62,7 @@ TAO_Notify_Refcountable::diagnostic_dump( const char* title ) #endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */ -TAO_Notify_Refcountable::TAO_Notify_Refcountable (void) +TAO_Notify_Refcountable::TAO_Notify_Refcountable () { } @@ -90,7 +90,7 @@ TAO_Notify_Refcountable::~TAO_Notify_Refcountable () CORBA::ULong -TAO_Notify_Refcountable::_incr_refcnt (void) +TAO_Notify_Refcountable::_incr_refcnt () { CORBA::Long refcount = ++this->refcount_; if (TAO_debug_level > 1 ) @@ -110,7 +110,7 @@ TAO_Notify_Refcountable::_incr_refcnt (void) } CORBA::ULong -TAO_Notify_Refcountable::_decr_refcnt (void) +TAO_Notify_Refcountable::_decr_refcnt () { CORBA::Long refcount = --this->refcount_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index 86134043cd8..b6e665a3f91 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -902,7 +902,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr } void -Routing_Slip::reconnect (void) +Routing_Slip::reconnect () { Routing_Slip_Guard guard (this->internals_); enter_state_saved (guard); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 820ba315d17..7d76533d46b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -277,7 +277,7 @@ Routing_Slip_Persistence_Manager::Block_Header::Block_Header(Header_Type type) , data_size(0) { } -Routing_Slip_Persistence_Manager::Block_Header::~Block_Header (void) +Routing_Slip_Persistence_Manager::Block_Header::~Block_Header () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index b5e9fc336b3..74076bc8ecf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void) +TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer () :pacing_interval_ (CosNotification::PacingInterval) { } @@ -18,14 +18,14 @@ TAO_Notify_SequenceProxyPushConsumer::~TAO_Notify_SequenceProxyPushConsumer () } void -TAO_Notify_SequenceProxyPushConsumer::release (void) +TAO_Notify_SequenceProxyPushConsumer::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_SequenceProxyPushConsumer::MyType (void) +TAO_Notify_SequenceProxyPushConsumer::MyType () { return CosNotifyChannelAdmin::PUSH_SEQUENCE; } @@ -67,7 +67,7 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat } void -TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void) +TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer () { TAO_Notify_SequenceProxyPushConsumer::Ptr guard( this ); this->destroy (); @@ -75,7 +75,7 @@ TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void) } const char * -TAO_Notify_SequenceProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_SequenceProxyPushConsumer::get_proxy_type_name () const { return "sequence_proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index faf990d3aca..14db624738b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void) +TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier () { } @@ -15,7 +15,7 @@ TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier () } void -TAO_Notify_SequenceProxyPushSupplier::release (void) +TAO_Notify_SequenceProxyPushSupplier::release () { delete this; //@@ inform factory @@ -37,7 +37,7 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC } void -TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void) +TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier () { TAO_Notify_SequenceProxyPushSupplier::Ptr guard( this ); @@ -46,13 +46,13 @@ TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void) } CosNotifyChannelAdmin::ProxyType -TAO_Notify_SequenceProxyPushSupplier::MyType (void) +TAO_Notify_SequenceProxyPushSupplier::MyType () { return CosNotifyChannelAdmin::PUSH_SEQUENCE; } const char * -TAO_Notify_SequenceProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_SequenceProxyPushSupplier::get_proxy_type_name () const { return "sequence_proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index 00a8f1805d0..212e85435c1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -86,7 +86,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p } void -TAO_Notify_SequencePushConsumer::release (void) +TAO_Notify_SequencePushConsumer::release () { delete this; //@@ inform factory @@ -309,7 +309,7 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_ } ACE_CString -TAO_Notify_SequencePushConsumer::get_ior (void) const +TAO_Notify_SequencePushConsumer::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb (); @@ -335,7 +335,7 @@ TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* o } CORBA::Object_ptr -TAO_Notify_SequencePushConsumer::get_consumer (void) +TAO_Notify_SequencePushConsumer::get_consumer () { return CosNotifyComm::SequencePushConsumer::_duplicate (this->push_consumer_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp index 227d634859e..ef090ec4db5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp @@ -22,14 +22,14 @@ TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr p } void -TAO_Notify_SequencePushSupplier::release (void) +TAO_Notify_SequencePushSupplier::release () { delete this; //@@ inform factory } ACE_CString -TAO_Notify_SequencePushSupplier::get_ior (void) const +TAO_Notify_SequencePushSupplier::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -46,7 +46,7 @@ TAO_Notify_SequencePushSupplier::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_SequencePushSupplier::get_supplier (void) +TAO_Notify_SequencePushSupplier::get_supplier () { return CosNotifyComm::SequencePushSupplier::_duplicate (this->push_supplier_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp index 42288ac9f09..04276d9b291 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp @@ -3,12 +3,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Service::~TAO_Notify_Service (void) +TAO_Notify_Service::~TAO_Notify_Service () { } TAO_Notify_Service* -TAO_Notify_Service::load_default (void) +TAO_Notify_Service::load_default () { static const char* services[] = { TAO_MC_NOTIFICATION_SERVICE_NAME, TAO_NOTIFICATION_SERVICE_NAME, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp index ea0aa2940e0..31230f40288 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void) +TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index c321d27da66..e882ee26710 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -22,7 +22,7 @@ TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const Co } const TAO_Notify_EventType& -TAO_Notify_StructuredEvent_No_Copy::type (void) const +TAO_Notify_StructuredEvent_No_Copy::type () const { return this->type_; } @@ -53,7 +53,7 @@ TAO_Notify_StructuredEvent_No_Copy::unmarshal (TAO_InputCDR & cdr) } TAO_Notify_Event * -TAO_Notify_StructuredEvent_No_Copy::copy (void) const +TAO_Notify_StructuredEvent_No_Copy::copy () const { TAO_Notify_Event * new_event; ACE_NEW_THROW_EX (new_event, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index dbfe3ba3127..8836af68ee3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void) +TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer () { } @@ -19,14 +19,14 @@ TAO_Notify_StructuredProxyPushConsumer::~TAO_Notify_StructuredProxyPushConsumer } void -TAO_Notify_StructuredProxyPushConsumer::release (void) +TAO_Notify_StructuredProxyPushConsumer::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_StructuredProxyPushConsumer::MyType (void) +TAO_Notify_StructuredProxyPushConsumer::MyType () { return CosNotifyChannelAdmin::PUSH_STRUCTURED; } @@ -63,7 +63,7 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica } void -TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void) +TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer () { TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this ); this->destroy (); @@ -71,7 +71,7 @@ TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (voi } const char * -TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name () const { return "structured_proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 4cf50ad0d2f..367c25f3ae5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void) +TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier () { } @@ -18,14 +18,14 @@ TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier } void -TAO_Notify_StructuredProxyPushSupplier::release (void) +TAO_Notify_StructuredProxyPushSupplier::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_StructuredProxyPushSupplier::MyType (void) +TAO_Notify_StructuredProxyPushSupplier::MyType () { return CosNotifyChannelAdmin::PUSH_STRUCTURED; } @@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot } void -TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void) +TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier () { TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this ); @@ -55,7 +55,7 @@ TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (voi } const char * -TAO_Notify_StructuredProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_StructuredProxyPushSupplier::get_proxy_type_name () const { return "structured_proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 69d2a6334a3..cfd6d7b1246 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -73,7 +73,7 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p } void -TAO_Notify_StructuredPushConsumer::release (void) +TAO_Notify_StructuredPushConsumer::release () { delete this; //@@ inform factory @@ -161,7 +161,7 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* } ACE_CString -TAO_Notify_StructuredPushConsumer::get_ior (void) const +TAO_Notify_StructuredPushConsumer::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -178,7 +178,7 @@ TAO_Notify_StructuredPushConsumer::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_StructuredPushConsumer::get_consumer (void) +TAO_Notify_StructuredPushConsumer::get_consumer () { return CosNotifyComm::StructuredPushConsumer::_duplicate (this->push_consumer_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp index 92ab7846873..4eba099e25b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp @@ -22,14 +22,14 @@ TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_p } void -TAO_Notify_StructuredPushSupplier::release (void) +TAO_Notify_StructuredPushSupplier::release () { delete this; //@@ inform factory } ACE_CString -TAO_Notify_StructuredPushSupplier::get_ior (void) const +TAO_Notify_StructuredPushSupplier::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -46,7 +46,7 @@ TAO_Notify_StructuredPushSupplier::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_StructuredPushSupplier::get_supplier (void) +TAO_Notify_StructuredPushSupplier::get_supplier () { return CosNotifyComm::StructuredPushSupplier::_duplicate (this->push_supplier_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp index 98d4536a3ea..dca10de0f28 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp @@ -28,7 +28,7 @@ TAO_Notify_Supplier::~TAO_Notify_Supplier () } TAO_Notify_Proxy* -TAO_Notify_Supplier::proxy (void) +TAO_Notify_Supplier::proxy () { return this->proxy_consumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 30406d7453a..cb20f513368 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -27,7 +27,7 @@ TAO_Notify_ProxyConsumer_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker; -TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin (void) +TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin () : TAO_Notify_Admin () { } @@ -54,26 +54,26 @@ TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec) } void -TAO_Notify_SupplierAdmin::_add_ref (void) +TAO_Notify_SupplierAdmin::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_SupplierAdmin::_remove_ref (void) +TAO_Notify_SupplierAdmin::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_SupplierAdmin::release (void) +TAO_Notify_SupplierAdmin::release () { delete this; //@@ inform factory } void -TAO_Notify_SupplierAdmin::destroy (void) +TAO_Notify_SupplierAdmin::destroy () { this->shutdown (); this->ec_->remove (this); @@ -140,7 +140,7 @@ TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos) } CosNotification::QoSProperties* -TAO_Notify_SupplierAdmin::get_qos (void) +TAO_Notify_SupplierAdmin::get_qos () { return this->TAO_Notify_Object::get_qos (); } @@ -177,7 +177,7 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_Notify_SupplierAdmin::obtain_push_consumer (void) +TAO_Notify_SupplierAdmin::obtain_push_consumer () { CosEventChannelAdmin::ProxyPushConsumer_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this); @@ -186,25 +186,25 @@ TAO_Notify_SupplierAdmin::obtain_push_consumer (void) } CosNotifyChannelAdmin::AdminID -TAO_Notify_SupplierAdmin::MyID (void) +TAO_Notify_SupplierAdmin::MyID () { return this->id (); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_SupplierAdmin::MyChannel (void) +TAO_Notify_SupplierAdmin::MyChannel () { return this->ec_->_this (); } ::CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_SupplierAdmin::MyOperator (void) +TAO_Notify_SupplierAdmin::MyOperator () { return this->filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin::push_consumers (void) +TAO_Notify_SupplierAdmin::push_consumers () { TAO_Notify_Proxy_Seq_Worker seq_worker; @@ -261,13 +261,13 @@ TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter) } ::CosNotifyFilter::FilterIDSeq* -TAO_Notify_SupplierAdmin::get_all_filters (void) +TAO_Notify_SupplierAdmin::get_all_filters () { return this->filter_admin_.get_all_filters (); } void -TAO_Notify_SupplierAdmin::remove_all_filters (void) +TAO_Notify_SupplierAdmin::remove_all_filters () { this->filter_admin_.remove_all_filters (); } @@ -291,13 +291,13 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer ( /************** UNIMPLEMENTED METHODS ***************/ CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_Notify_SupplierAdmin::obtain_pull_consumer (void) +TAO_Notify_SupplierAdmin::obtain_pull_consumer () { throw CORBA::NO_IMPLEMENT (); } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin::pull_consumers (void) +TAO_Notify_SupplierAdmin::pull_consumers () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index eebc10e0b92..7af192a0761 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void) +TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task () : shutdown_ (false) { } @@ -27,13 +27,13 @@ TAO_Notify_ThreadPool_Task::init (int argc, ACE_TCHAR **argv) } TAO_Notify_Timer* -TAO_Notify_ThreadPool_Task::timer (void) +TAO_Notify_ThreadPool_Task::timer () { return this->timer_.get(); } TAO_Notify_Buffering_Strategy* -TAO_Notify_ThreadPool_Task::buffering_strategy (void) +TAO_Notify_ThreadPool_Task::buffering_strategy () { return this->buffering_strategy_.get (); } @@ -116,7 +116,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request) } int -TAO_Notify_ThreadPool_Task::svc (void) +TAO_Notify_ThreadPool_Task::svc () { TAO_Notify_Method_Request_Queueable* method_request = 0; @@ -163,7 +163,7 @@ TAO_Notify_ThreadPool_Task::svc (void) } void -TAO_Notify_ThreadPool_Task::shutdown (void) +TAO_Notify_ThreadPool_Task::shutdown () { if (this->shutdown_) { @@ -176,7 +176,7 @@ TAO_Notify_ThreadPool_Task::shutdown (void) } void -TAO_Notify_ThreadPool_Task::release (void) +TAO_Notify_ThreadPool_Task::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp index ed37ea1caca..a31eefeea3b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void) +TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue () { } @@ -11,7 +11,7 @@ TAO_Notify_Timer_Queue::~TAO_Notify_Timer_Queue () } void -TAO_Notify_Timer_Queue::release (void) +TAO_Notify_Timer_Queue::release () { delete this; //@@ inform factory @@ -36,7 +36,7 @@ TAO_Notify_Timer_Queue::cancel_timer (long timer_id) } ACE_Timer_Queue& -TAO_Notify_Timer_Queue::impl (void) +TAO_Notify_Timer_Queue::impl () { return this->timer_queue_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp index ef42a417287..ad7e3990a49 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor (void) +TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor () :reactor_ (0) { // Get the ORB @@ -20,7 +20,7 @@ TAO_Notify_Timer_Reactor::~TAO_Notify_Timer_Reactor () } void -TAO_Notify_Timer_Reactor::release (void) +TAO_Notify_Timer_Reactor::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp index d061c815db5..66433ff114b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp @@ -11,7 +11,7 @@ TAO_Notify::Topology_Loader::~Topology_Loader () } void -TAO_Notify::Topology_Loader::close (void) +TAO_Notify::Topology_Loader::close () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index ec88590b269..a330f413c38 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -15,12 +15,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Topology_Savable::~Topology_Savable (void) + Topology_Savable::~Topology_Savable () { } void - Topology_Savable::reconnect (void) + Topology_Savable::reconnect () { } @@ -76,14 +76,14 @@ namespace TAO_Notify } bool - Topology_Object::self_change (void) + Topology_Object::self_change () { this->self_changed_ = true; return send_change (); } bool - Topology_Object::send_change (void) + Topology_Object::send_change () { bool saving = false; if (is_persistent ()) @@ -107,7 +107,7 @@ namespace TAO_Notify } bool - Topology_Object::send_deletion_change (void) + Topology_Object::send_deletion_change () { bool saving = false; if (is_persistent ()) @@ -120,7 +120,7 @@ namespace TAO_Notify } bool - Topology_Object::change_to_parent (void) + Topology_Object::change_to_parent () { bool result = false; Topology_Parent * parent = this->topology_parent(); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp index f8ba3dd7751..fc251d262a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp @@ -7,7 +7,7 @@ TAO_Notify::Topology_Saver::~Topology_Saver () } void -TAO_Notify::Topology_Saver::close (void) +TAO_Notify::Topology_Saver::close () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp index 861ebfd7ef5..9a448d90ba1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp @@ -27,13 +27,13 @@ TAO_Notify_validate_client_Task:: } -TAO_Notify_validate_client_Task::~TAO_Notify_validate_client_Task (void) +TAO_Notify_validate_client_Task::~TAO_Notify_validate_client_Task () { } int -TAO_Notify_validate_client_Task::svc (void) +TAO_Notify_validate_client_Task::svc () { ACE_Time_Value due = ACE_OS::gettimeofday () + this->delay_; while (! this->shutdown_) @@ -74,7 +74,7 @@ TAO_Notify_validate_client_Task::svc (void) void -TAO_Notify_validate_client_Task::shutdown (void) +TAO_Notify_validate_client_Task::shutdown () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *(this->condition_.mutex())); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp index c9fdfc61130..2042dc05389 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void) +TAO_Notify_Worker_Task::TAO_Notify_Worker_Task () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index 4f7207d4118..881c2be3515 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -41,7 +41,7 @@ namespace TAO_Notify } void - XML_Saver::close (void) + XML_Saver::close () { if (this->close_out_ && this->output_ != 0) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp index 456032c58ab..56258982147 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp @@ -70,7 +70,7 @@ namespace namespace TAO_PG { - Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy (void) + Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 22845604ce4..a409ee0873c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -82,7 +82,7 @@ TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name, { } -TAO_GOA::~TAO_GOA (void) +TAO_GOA::~TAO_GOA () { } @@ -211,7 +211,7 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli #endif /* TAO_HAS_MINIMUM_POA == 0 */ char * -TAO_GOA::the_name (void) +TAO_GOA::the_name () { char * name = this->TAO_Regular_POA::the_name (); @@ -219,7 +219,7 @@ TAO_GOA::the_name (void) } PortableServer::POA_ptr -TAO_GOA::the_parent (void) +TAO_GOA::the_parent () { PortableServer::POA_ptr parent = this->TAO_Regular_POA::the_parent (); @@ -227,7 +227,7 @@ TAO_GOA::the_parent (void) } PortableServer::POAList * -TAO_GOA::the_children (void) +TAO_GOA::the_children () { PortableServer::POAList *children = this->TAO_Regular_POA::the_children (); @@ -235,7 +235,7 @@ TAO_GOA::the_children (void) } PortableServer::POAManager_ptr -TAO_GOA::the_POAManager (void) +TAO_GOA::the_POAManager () { PortableServer::POAManager_ptr poa_manager = this->TAO_Regular_POA::the_POAManager (); @@ -246,7 +246,7 @@ TAO_GOA::the_POAManager (void) #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::AdapterActivator_ptr -TAO_GOA::the_activator (void) +TAO_GOA::the_activator () { PortableServer::AdapterActivator_ptr activator = this->TAO_Regular_POA::the_activator (); @@ -260,7 +260,7 @@ TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator) } PortableServer::ServantManager_ptr -TAO_GOA::get_servant_manager (void) +TAO_GOA::get_servant_manager () { PortableServer::ServantManager_ptr servant_manager = this->TAO_Regular_POA::get_servant_manager (); @@ -274,7 +274,7 @@ TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr) } PortableServer::Servant -TAO_GOA::get_servant (void) +TAO_GOA::get_servant () { PortableServer::Servant servant = this->TAO_Regular_POA::get_servant (); @@ -378,7 +378,7 @@ TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid) } CORBA::OctetSeq * -TAO_GOA::id (void) +TAO_GOA::id () { return this->TAO_Regular_POA::id (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp index 444629713cc..3522317ef20 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { /*static*/ int - MIOP_Loader::Initializer (void) + MIOP_Loader::Initializer () { ACE_Service_Config::process_directive ( ace_svc_desc_TAO_PortableGroup_Loader); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index d5d09e51d8e..92743a6b5b8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void) +TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator () : membership_ (1), factories_ (1) { @@ -14,7 +14,7 @@ TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void) this->factories_[0].id = CORBA::string_dup ("org.omg.PortableGroup.Factories"); } -TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void) +TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 87f2526b88c..4c7ff5670d1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -56,7 +56,7 @@ TAO::PG_FactoryRegistry::PG_FactoryRegistry (const char * name) { } -TAO::PG_FactoryRegistry::~PG_FactoryRegistry (void) +TAO::PG_FactoryRegistry::~PG_FactoryRegistry () { } @@ -111,7 +111,7 @@ const char * TAO::PG_FactoryRegistry::identity () const return this->identity_.c_str(); } -void TAO::PG_FactoryRegistry::_remove_ref (void) +void TAO::PG_FactoryRegistry::_remove_ref () { this->quit_state_ = GONE; } @@ -135,7 +135,7 @@ int TAO::PG_FactoryRegistry::idle (int & result) } -int TAO::PG_FactoryRegistry::fini (void) +int TAO::PG_FactoryRegistry::fini () { if (this->ior_output_file_ != 0) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index d4f2fdc2541..78225419532 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -24,7 +24,7 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory ( this->object_group_manager_.generic_factory (this); } -TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void) +TAO_PG_GenericFactory::~TAO_PG_GenericFactory () { TAO_PG_Factory_Map::iterator end = this->factory_map_.end (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 4d5b68919d8..7d9d138d90e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -59,7 +59,7 @@ TAO::PG_Group_Factory::PG_Group_Factory () { } -TAO::PG_Group_Factory::~PG_Group_Factory (void) +TAO::PG_Group_Factory::~PG_Group_Factory () { for (Group_Map_Iterator it = this->group_map_.begin (); it != this->group_map_.end (); @@ -325,7 +325,7 @@ TAO::PG_Group_Factory::groups_at_location ( } PortableGroup::ObjectGroups * -TAO::PG_Group_Factory::all_groups (void) +TAO::PG_Group_Factory::all_groups () { Group_Map & group_map = this->get_group_map (); CORBA::ULong const upper_limit = static_cast<CORBA::ULong> (group_map.current_size ()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp index 9ec99126a3c..66d40b0fe15 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp @@ -19,7 +19,7 @@ TAO_PG_Group_Guard::TAO_PG_Group_Guard ( { } -TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void) +TAO_PG_Group_Guard::~TAO_PG_Group_Guard () { if (!this->released_) { @@ -41,7 +41,7 @@ TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void) } void -TAO_PG_Group_Guard::release (void) +TAO_PG_Group_Guard::release () { this->released_ = true; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index b1705e94a87..374213e37b7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void) +TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager () : poa_ (), object_group_map_ (TAO_PG_MAX_OBJECT_GROUPS), location_map_ (TAO_PG_MAX_LOCATIONS), @@ -21,7 +21,7 @@ TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void) { } -TAO_PG_ObjectGroupManager::~TAO_PG_ObjectGroupManager (void) +TAO_PG_ObjectGroupManager::~TAO_PG_ObjectGroupManager () { for (TAO_PG_Location_Map::iterator i = this->location_map_.begin (); i != this->location_map_.end (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp index 4586255f5d4..3e660dde88e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void) +TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 3b2a7dfc988..802d3f6f1f9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -41,7 +41,7 @@ TAO::PG_Object_Group::MemberInfo::MemberInfo ( { } -TAO::PG_Object_Group::MemberInfo::~MemberInfo (void) +TAO::PG_Object_Group::MemberInfo::~MemberInfo () { if( ! CORBA::is_nil (this->factory_.in())) { @@ -103,7 +103,7 @@ TAO::PG_Object_Group::PG_Object_Group ( { } -TAO::PG_Object_Group::~PG_Object_Group (void) +TAO::PG_Object_Group::~PG_Object_Group () { if (TAO_debug_level > 3) ORBSVCS_DEBUG ((LM_DEBUG, @@ -134,7 +134,7 @@ dump_ior (const char * base, #endif // may want this again someday PortableGroup::ObjectGroup_ptr -TAO::PG_Object_Group::reference (void) const +TAO::PG_Object_Group::reference () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -155,7 +155,7 @@ TAO::PG_Object_Group::get_group_specific_factories ( } const PortableGroup::Location & -TAO::PG_Object_Group::get_primary_location (void) +TAO::PG_Object_Group::get_primary_location () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -450,7 +450,7 @@ TAO::PG_Object_Group::remove_member ( PortableGroup::ObjectGroupId -TAO::PG_Object_Group::get_object_group_id (void) const +TAO::PG_Object_Group::get_object_group_id () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -480,7 +480,7 @@ TAO::PG_Object_Group::get_properties ( PortableGroup::TypeId -TAO::PG_Object_Group::get_type_id (void) const +TAO::PG_Object_Group::get_type_id () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -494,7 +494,7 @@ TAO::PG_Object_Group::get_type_id (void) const // Internal method int -TAO::PG_Object_Group::increment_version (void) +TAO::PG_Object_Group::increment_version () { // assume internals is locked int result = 0; @@ -520,7 +520,7 @@ TAO::PG_Object_Group::increment_version (void) ////////////////// // Internal method void -TAO::PG_Object_Group::distribute_iogr (void) +TAO::PG_Object_Group::distribute_iogr () { // Check if the object group is configured to distribute if (!this->distribute_) @@ -584,7 +584,7 @@ TAO::PG_Object_Group::distribute_iogr (void) } PortableGroup::Locations * -TAO::PG_Object_Group::locations_of_members (void) +TAO::PG_Object_Group::locations_of_members () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -640,7 +640,7 @@ TAO::PG_Object_Group::get_member_reference ( PortableGroup::MembershipStyleValue -TAO::PG_Object_Group::get_membership_style (void) const +TAO::PG_Object_Group::get_membership_style () const { PortableGroup::MembershipStyleValue membership_style = 0; if (!TAO::find (properties_, @@ -654,7 +654,7 @@ TAO::PG_Object_Group::get_membership_style (void) const PortableGroup::MinimumNumberMembersValue -TAO::PG_Object_Group::get_minimum_number_members (void) const +TAO::PG_Object_Group::get_minimum_number_members () const { PortableGroup::MinimumNumberMembersValue minimum_number_members = 0; if (!TAO::find (properties_, @@ -667,7 +667,7 @@ TAO::PG_Object_Group::get_minimum_number_members (void) const } PortableGroup::InitialNumberMembersValue -TAO::PG_Object_Group::get_initial_number_members (void) const +TAO::PG_Object_Group::get_initial_number_members () const { PortableGroup::InitialNumberMembersValue initial_number_members = 0; if (!TAO::find (properties_, @@ -859,7 +859,7 @@ TAO::PG_Object_Group::create_members (size_t count) } void -TAO::PG_Object_Group::initial_populate (void) +TAO::PG_Object_Group::initial_populate () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -876,7 +876,7 @@ TAO::PG_Object_Group::initial_populate (void) } void -TAO::PG_Object_Group::minimum_populate (void) +TAO::PG_Object_Group::minimum_populate () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -913,13 +913,13 @@ TAO::PG_Object_Group::set_name (const char* group_name) } const char* -TAO::PG_Object_Group::get_name (void) +TAO::PG_Object_Group::get_name () { return group_name_; } void -TAO::PG_Object_Group::clear_members_map (void) +TAO::PG_Object_Group::clear_members_map () { for (MemberMap_Iterator it = this->members_.begin(); it != this->members_.end(); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index e27cc9adfbb..a1822362dce 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -307,7 +307,7 @@ TAO::PG_Object_Group_Storable::PG_Object_Group_Storable ( } } -TAO::PG_Object_Group_Storable::~PG_Object_Group_Storable (void) +TAO::PG_Object_Group_Storable::~PG_Object_Group_Storable () { if (destroyed_) { @@ -330,7 +330,7 @@ TAO::PG_Object_Group_Storable::set_destroyed (bool destroyed) } const PortableGroup::Location & -TAO::PG_Object_Group_Storable::get_primary_location (void) +TAO::PG_Object_Group_Storable::get_primary_location () { Object_Group_File_Guard fg (*this, SFG::ACCESSOR); return TAO::PG_Object_Group::get_primary_location (); @@ -369,7 +369,7 @@ TAO::PG_Object_Group_Storable::remove_member ( PortableGroup::Locations * -TAO::PG_Object_Group_Storable::locations_of_members (void) +TAO::PG_Object_Group_Storable::locations_of_members () { Object_Group_File_Guard fg (*this, SFG::ACCESSOR); return PG_Object_Group::locations_of_members (); @@ -397,14 +397,14 @@ TAO::PG_Object_Group_Storable::set_name (const char* group_name) } const char* -TAO::PG_Object_Group_Storable::get_name (void) +TAO::PG_Object_Group_Storable::get_name () { Object_Group_File_Guard fg (*this, SFG::ACCESSOR); return PG_Object_Group::get_name (); } void -TAO::PG_Object_Group_Storable::initial_populate (void) +TAO::PG_Object_Group_Storable::initial_populate () { Object_Group_File_Guard fg (*this, SFG::MUTATOR); PG_Object_Group::initial_populate (); @@ -412,7 +412,7 @@ TAO::PG_Object_Group_Storable::initial_populate (void) } void -TAO::PG_Object_Group_Storable::minimum_populate (void) +TAO::PG_Object_Group_Storable::minimum_populate () { Object_Group_File_Guard fg (*this, SFG::MUTATOR); PG_Object_Group::minimum_populate (); @@ -650,7 +650,7 @@ TAO::PG_Object_Group_Storable::stale () } void -TAO::PG_Object_Group_Storable::state_written (void) +TAO::PG_Object_Group_Storable::state_written () { // No-op. Overridden by derived class. } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp index 4e73825d981..80a0e8106a7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void) +TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index e3555148867..8b73a3b75d4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -12,11 +12,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void) +TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry () { } -TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void) +TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry () { // Free the memory for the endpoints. Entry *entry; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 4fd1aabc5d6..94e4938aae6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void) +TAO_PortableGroup_Loader::TAO_PortableGroup_Loader () { } @@ -47,7 +47,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/, } int -TAO_PortableGroup_Loader::Initializer (void) +TAO_PortableGroup_Loader::Initializer () { ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader); ACE_Service_Config::process_directive (ace_svc_desc_TAO_MIOP_Resource_Factory); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index ed7036f2259..4e2c4c5dfe6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void) +PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 225346a2fa5..8d40234ec16 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -11,7 +11,7 @@ TAO_Portable_Group_Map::TAO_Portable_Group_Map () } /// Destructor. -TAO_Portable_Group_Map::~TAO_Portable_Group_Map (void) +TAO_Portable_Group_Map::~TAO_Portable_Group_Map () { for (Iterator i = this->map_.begin (); i != this->map_.end (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index 451189b1a2c..914c86dad84 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -28,7 +28,7 @@ TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor ( { } -TAO_UIPMC_Acceptor::~TAO_UIPMC_Acceptor (void) +TAO_UIPMC_Acceptor::~TAO_UIPMC_Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -70,7 +70,7 @@ TAO_UIPMC_Acceptor::is_collocated (const TAO_Endpoint *) } int -TAO_UIPMC_Acceptor::close (void) +TAO_UIPMC_Acceptor::close () { return 0; } @@ -363,7 +363,7 @@ TAO_UIPMC_Acceptor::dotted_decimal_address ( } CORBA::ULong -TAO_UIPMC_Acceptor::endpoint_count (void) +TAO_UIPMC_Acceptor::endpoint_count () { return this->endpoint_count_; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index 8a4113bcbdd..600caa4254e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -46,7 +46,7 @@ TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (TAO_ORB_Core *orb_co this->transport (specific_transport); } -TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler (void) +TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler () { delete this->transport (); int const result = @@ -62,7 +62,7 @@ TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler (void) } const ACE_INET_Addr & -TAO_UIPMC_Connection_Handler::addr (void) const +TAO_UIPMC_Connection_Handler::addr () const { return this->addr_; } @@ -74,7 +74,7 @@ TAO_UIPMC_Connection_Handler::addr (const ACE_INET_Addr &addr) } const ACE_INET_Addr & -TAO_UIPMC_Connection_Handler::local_addr (void) const +TAO_UIPMC_Connection_Handler::local_addr () const { return this->local_addr_; } @@ -86,7 +86,7 @@ TAO_UIPMC_Connection_Handler::local_addr (const ACE_INET_Addr &addr) } u_long -TAO_UIPMC_Connection_Handler::send_hi_water_mark (void) const +TAO_UIPMC_Connection_Handler::send_hi_water_mark () const { return this->send_hi_water_mark_; } @@ -321,13 +321,13 @@ TAO_UIPMC_Connection_Handler::open (void*) } int -TAO_UIPMC_Connection_Handler::resume_handler (void) +TAO_UIPMC_Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO_UIPMC_Connection_Handler::close_connection (void) +TAO_UIPMC_Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -395,13 +395,13 @@ TAO_UIPMC_Connection_Handler::close (u_long flags) } int -TAO_UIPMC_Connection_Handler::release_os_resources (void) +TAO_UIPMC_Connection_Handler::release_os_resources () { return this->peer ().close (); } int -TAO_UIPMC_Connection_Handler::add_transport_to_cache (void) +TAO_UIPMC_Connection_Handler::add_transport_to_cache () { ACE_INET_Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 0f810879769..7dfe87e1e95 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -16,12 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_UIPMC_Connector::TAO_UIPMC_Connector (void) +TAO_UIPMC_Connector::TAO_UIPMC_Connector () : TAO_Connector (IOP::TAG_UIPMC) { } -TAO_UIPMC_Connector::~TAO_UIPMC_Connector (void) +TAO_UIPMC_Connector::~TAO_UIPMC_Connector () { } @@ -38,7 +38,7 @@ TAO_UIPMC_Connector::open (TAO_ORB_Core *orb_core) } int -TAO_UIPMC_Connector::close (void) +TAO_UIPMC_Connector::close () { return 0; } @@ -293,7 +293,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_UIPMC_Connector::make_profile (void) +TAO_UIPMC_Connector::make_profile () { // The endpoint should be of the form: // N.n@host:port/object_key @@ -336,7 +336,7 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint) } char -TAO_UIPMC_Connector::object_key_delimiter (void) const +TAO_UIPMC_Connector::object_key_delimiter () const { return TAO_UIPMC_Profile::object_key_delimiter_; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index a2eeaa473e3..24d0573bb7d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (void) +TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint () : TAO_Endpoint (IOP::TAG_UIPMC), host_ (), port_ (0), @@ -55,7 +55,7 @@ TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (const CORBA::Octet class_d_address[4], this->update_object_addr (); } -TAO_UIPMC_Endpoint::~TAO_UIPMC_Endpoint (void) +TAO_UIPMC_Endpoint::~TAO_UIPMC_Endpoint () { delete this->next_; } @@ -72,7 +72,7 @@ TAO_UIPMC_Endpoint::object_addr (const ACE_INET_Addr &addr) } const char * -TAO_UIPMC_Endpoint::host (void) const +TAO_UIPMC_Endpoint::host () const { return this->host_.in (); } @@ -112,13 +112,13 @@ TAO_UIPMC_Endpoint::addr_to_string (char *buffer, size_t length) } TAO_Endpoint * -TAO_UIPMC_Endpoint::next (void) +TAO_UIPMC_Endpoint::next () { return this->next_; } TAO_Endpoint * -TAO_UIPMC_Endpoint::duplicate (void) +TAO_UIPMC_Endpoint::duplicate () { TAO_UIPMC_Endpoint *endpoint = 0; @@ -144,7 +144,7 @@ TAO_UIPMC_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) } CORBA::ULong -TAO_UIPMC_Endpoint::hash (void) +TAO_UIPMC_Endpoint::hash () { if (this->hash_val_ != 0) return this->hash_val_; @@ -239,14 +239,14 @@ TAO_UIPMC_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) } bool -TAO_UIPMC_Endpoint::is_preferred_network (void) const +TAO_UIPMC_Endpoint::is_preferred_network () const { return (this->preferred_path_.host.in () != 0 && this->preferred_path_.host.in ()[0] != 0); } const char * -TAO_UIPMC_Endpoint::preferred_network (void) const +TAO_UIPMC_Endpoint::preferred_network () const { return this->preferred_path_.host.in (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index 465b82b3e27..a520483be08 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -12,7 +12,7 @@ static const char the_prefix[] = "uipmc"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void) +TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory () : TAO_Protocol_Factory (IOP::TAG_UIPMC), // major_ (TAO_DEF_GIOP_MAJOR), // minor_ (TAO_DEF_GIOP_MINOR), @@ -21,7 +21,7 @@ TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void) { } -TAO_UIPMC_Protocol_Factory::~TAO_UIPMC_Protocol_Factory (void) +TAO_UIPMC_Protocol_Factory::~TAO_UIPMC_Protocol_Factory () { } @@ -33,19 +33,19 @@ TAO_UIPMC_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_UIPMC_Protocol_Factory::prefix (void) const +TAO_UIPMC_Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO_UIPMC_Protocol_Factory::options_delimiter (void) const +TAO_UIPMC_Protocol_Factory::options_delimiter () const { return '/'; } TAO_Acceptor * -TAO_UIPMC_Protocol_Factory::make_acceptor (void) +TAO_UIPMC_Protocol_Factory::make_acceptor () { TAO_Acceptor *acceptor = 0; ACE_NEW_RETURN (acceptor, @@ -127,7 +127,7 @@ TAO_UIPMC_Protocol_Factory::init (int argc, } TAO_Connector * -TAO_UIPMC_Protocol_Factory::make_connector (void) +TAO_UIPMC_Protocol_Factory::make_connector () { // This is done only once when the library is loaded and // only on the client side. @@ -141,7 +141,7 @@ TAO_UIPMC_Protocol_Factory::make_connector (void) } int -TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint () const { // A multicast endpoint can't be picked automatically in the // pluggable protocol framework. It must be determined from diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp index ada29cd487f..23535a98d17 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -56,7 +56,7 @@ TAO_UIPMC_Mcast_Connection_Handler::TAO_UIPMC_Mcast_Connection_Handler ( this->transport (specific_transport); } -TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler (void) +TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler () { delete this->transport (); int const result = @@ -72,7 +72,7 @@ TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler (void) } const ACE_INET_Addr & -TAO_UIPMC_Mcast_Connection_Handler::addr (void) const +TAO_UIPMC_Mcast_Connection_Handler::addr () const { return this->addr_; } @@ -84,7 +84,7 @@ TAO_UIPMC_Mcast_Connection_Handler::addr (const ACE_INET_Addr &addr) } const ACE_INET_Addr & -TAO_UIPMC_Mcast_Connection_Handler::local_addr (void) const +TAO_UIPMC_Mcast_Connection_Handler::local_addr () const { return this->local_addr_; } @@ -239,13 +239,13 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) } int -TAO_UIPMC_Mcast_Connection_Handler::resume_handler (void) +TAO_UIPMC_Mcast_Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO_UIPMC_Mcast_Connection_Handler::close_connection (void) +TAO_UIPMC_Mcast_Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -314,13 +314,13 @@ TAO_UIPMC_Mcast_Connection_Handler::close (u_long flags) } int -TAO_UIPMC_Mcast_Connection_Handler::release_os_resources (void) +TAO_UIPMC_Mcast_Connection_Handler::release_os_resources () { return this->peer ().close (); } int -TAO_UIPMC_Mcast_Connection_Handler::add_transport_to_cache (void) +TAO_UIPMC_Mcast_Connection_Handler::add_transport_to_cache () { ACE_INET_Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp index 71de66ca660..942408b46c3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp @@ -29,7 +29,7 @@ TAO_UIPMC_Mcast_Transport::TAO_UIPMC_Mcast_Transport ( TAO_UIPMC_Wait_Never (this)); } -TAO_UIPMC_Mcast_Transport::~TAO_UIPMC_Mcast_Transport (void) +TAO_UIPMC_Mcast_Transport::~TAO_UIPMC_Mcast_Transport () { // Cleanup all packets. this->cleanup_packets (false); @@ -88,13 +88,13 @@ TAO_UIPMC_Mcast_Transport::cleanup_packets (bool expired_only) } ACE_Event_Handler * -TAO_UIPMC_Mcast_Transport::event_handler_i (void) +TAO_UIPMC_Mcast_Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO_UIPMC_Mcast_Transport::connection_handler_i (void) +TAO_UIPMC_Mcast_Transport::connection_handler_i () { return this->connection_handler_; } @@ -605,7 +605,7 @@ TAO_UIPMC_Mcast_Transport::handle_input ( } int -TAO_UIPMC_Mcast_Transport::register_handler (void) +TAO_UIPMC_Mcast_Transport::register_handler () { // We never register the handler with the reactor // as we never need to be informed about any incoming data, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 5090520c7c5..3724b0ab006 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_UIPMC_Profile::object_key_delimiter_ = '/'; char -TAO_UIPMC_Profile::object_key_delimiter (void) const +TAO_UIPMC_Profile::object_key_delimiter () const { return TAO_UIPMC_Profile::object_key_delimiter_; } @@ -85,7 +85,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4], this->addressing_mode_ = default_addressing_mode_; } -TAO_UIPMC_Profile::~TAO_UIPMC_Profile (void) +TAO_UIPMC_Profile::~TAO_UIPMC_Profile () { } @@ -157,7 +157,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) } int -TAO_UIPMC_Profile::decode_endpoints (void) +TAO_UIPMC_Profile::decode_endpoints () { ACE_NOTSUP_RETURN (-1); } @@ -528,25 +528,25 @@ TAO_UIPMC_Profile::hash (CORBA::ULong max) } TAO_Endpoint* -TAO_UIPMC_Profile::endpoint (void) +TAO_UIPMC_Profile::endpoint () { return &this->endpoint_; } int -TAO_UIPMC_Profile::encode_endpoints (void) +TAO_UIPMC_Profile::encode_endpoints () { return 1; } CORBA::ULong -TAO_UIPMC_Profile::endpoint_count (void) const +TAO_UIPMC_Profile::endpoint_count () const { return 1; } char * -TAO_UIPMC_Profile::to_string (void) const +TAO_UIPMC_Profile::to_string () const { // corbaloc:miop:1.0@1.0-group_id-1-1/host:port @@ -617,13 +617,13 @@ TAO_UIPMC_Profile::to_string (void) const } const char * -TAO_UIPMC_Profile::prefix (void) +TAO_UIPMC_Profile::prefix () { return ::the_prefix; } IOP::TaggedProfile & -TAO_UIPMC_Profile::create_tagged_profile (void) +TAO_UIPMC_Profile::create_tagged_profile () { // Check whether we have already created the TaggedProfile if (this->tagged_profile_.profile_data.length () == 0) @@ -695,7 +695,7 @@ TAO_UIPMC_Profile::set_group_info ( } void -TAO_UIPMC_Profile::update_cached_group_component (void) +TAO_UIPMC_Profile::update_cached_group_component () { PortableGroup::TagGroupTaggedComponent group; @@ -770,7 +770,7 @@ TAO_UIPMC_Profile::request_target_specifier ( } int -TAO_UIPMC_Profile::supports_multicast (void) const +TAO_UIPMC_Profile::supports_multicast () const { // Yes! We support multicast! return 1; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index e156ec4c373..d7a8006d3df 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -35,18 +35,18 @@ TAO_UIPMC_Transport::TAO_UIPMC_Transport ( this->uuid_hash_ = uuid.to_string ()->hash (); } -TAO_UIPMC_Transport::~TAO_UIPMC_Transport (void) +TAO_UIPMC_Transport::~TAO_UIPMC_Transport () { } ACE_Event_Handler * -TAO_UIPMC_Transport::event_handler_i (void) +TAO_UIPMC_Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO_UIPMC_Transport::connection_handler_i (void) +TAO_UIPMC_Transport::connection_handler_i () { return this->connection_handler_; } @@ -421,7 +421,7 @@ TAO_UIPMC_Transport::recv ( } int -TAO_UIPMC_Transport::register_handler (void) +TAO_UIPMC_Transport::register_handler () { // We never register the handler with the reactor // as we never need to be informed about any incoming data, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp index c72f45795f1..c0d9b19aa45 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp @@ -16,20 +16,20 @@ namespace TAO_PG { } - UIPMC_Recv_Packet_Cleanup_Guard::~UIPMC_Recv_Packet_Cleanup_Guard (void) + UIPMC_Recv_Packet_Cleanup_Guard::~UIPMC_Recv_Packet_Cleanup_Guard () { // Cleanup only expired packets. this->transport_->cleanup_packets (true); } - UIPMC_Recv_Packet::UIPMC_Recv_Packet (void) + UIPMC_Recv_Packet::UIPMC_Recv_Packet () : last_fragment_id_ (0) , data_length_ (0) , started_ (ACE_OS::gettimeofday ()) { } - UIPMC_Recv_Packet::~UIPMC_Recv_Packet (void) + UIPMC_Recv_Packet::~UIPMC_Recv_Packet () { for (Fragments_Map::iterator iter = this->fragments_.begin (); iter != this->fragments_.end (); @@ -100,13 +100,13 @@ namespace TAO_PG } ACE_Time_Value const & - UIPMC_Recv_Packet::started (void) const + UIPMC_Recv_Packet::started () const { return this->started_; } CORBA::ULong - UIPMC_Recv_Packet::data_length (void) const + UIPMC_Recv_Packet::data_length () const { return this->data_length_; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp index a539bfecc1d..1c6f19f8f98 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp @@ -10,24 +10,24 @@ TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport) { } -TAO_UIPMC_Wait_Never::~TAO_UIPMC_Wait_Never (void) +TAO_UIPMC_Wait_Never::~TAO_UIPMC_Wait_Never () { } int -TAO_UIPMC_Wait_Never::register_handler (void) +TAO_UIPMC_Wait_Never::register_handler () { return -1; } bool -TAO_UIPMC_Wait_Never::non_blocking (void) const +TAO_UIPMC_Wait_Never::non_blocking () const { return true; } bool -TAO_UIPMC_Wait_Never::can_process_upcalls (void) const +TAO_UIPMC_Wait_Never::can_process_upcalls () const { return true; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp index c9ae98313b7..7cf473067bf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory (void) +TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory () : fragments_cleanup_strategy_type_ (TAO_MIOP_CLEANUP_TIME_BOUND) , fragments_cleanup_bound_ (-1) , fragments_cleanup_strategy_ (0) @@ -24,7 +24,7 @@ TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory (void) { } -TAO_MIOP_Resource_Factory::~TAO_MIOP_Resource_Factory (void) +TAO_MIOP_Resource_Factory::~TAO_MIOP_Resource_Factory () { delete this->fragments_cleanup_strategy_; } @@ -284,7 +284,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) } TAO_PG::Fragments_Cleanup_Strategy * -TAO_MIOP_Resource_Factory::fragments_cleanup_strategy (void) const +TAO_MIOP_Resource_Factory::fragments_cleanup_strategy () const { if (this->fragments_cleanup_strategy_ == 0) { @@ -330,19 +330,19 @@ TAO_MIOP_Resource_Factory::fragments_cleanup_strategy (void) const } u_long -TAO_MIOP_Resource_Factory::max_fragment_size (void) const +TAO_MIOP_Resource_Factory::max_fragment_size () const { return this->max_fragment_size_; } u_long -TAO_MIOP_Resource_Factory::max_fragments (void) const +TAO_MIOP_Resource_Factory::max_fragments () const { return this->max_fragments_; } u_long -TAO_MIOP_Resource_Factory::max_fragment_rate (void) const +TAO_MIOP_Resource_Factory::max_fragment_rate () const { // If "max_fragment_rate_" is not specified (i.e. zero) // use the same value as "max_fragment_size_". @@ -352,31 +352,31 @@ TAO_MIOP_Resource_Factory::max_fragment_rate (void) const } u_long -TAO_MIOP_Resource_Factory::send_hi_water_mark (void) const +TAO_MIOP_Resource_Factory::send_hi_water_mark () const { return this->send_hi_water_mark_; } u_long -TAO_MIOP_Resource_Factory::send_buffer_size (void) const +TAO_MIOP_Resource_Factory::send_buffer_size () const { return send_buffer_size_; } u_long -TAO_MIOP_Resource_Factory::receive_buffer_size (void) const +TAO_MIOP_Resource_Factory::receive_buffer_size () const { return receive_buffer_size_; } bool -TAO_MIOP_Resource_Factory::enable_throttling (void) const +TAO_MIOP_Resource_Factory::enable_throttling () const { return enable_throttling_; } bool -TAO_MIOP_Resource_Factory::enable_eager_dequeue (void) const +TAO_MIOP_Resource_Factory::enable_eager_dequeue () const { return enable_eager_dequeue_; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 2cba0dcae08..6a639dd6394 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // = Methods to deal with ACE_Hash_Map_Manager. -CosProperty_Hash_Key::CosProperty_Hash_Key (void) +CosProperty_Hash_Key::CosProperty_Hash_Key () { } @@ -47,20 +47,20 @@ CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const } u_long -CosProperty_Hash_Key::hash (void) const +CosProperty_Hash_Key::hash () const { u_long ret = ACE::hash_pjw (this->pname_); return ret; } -CosProperty_Hash_Key::~CosProperty_Hash_Key (void) +CosProperty_Hash_Key::~CosProperty_Hash_Key () { } //====================================================================== -CosProperty_Hash_Value::CosProperty_Hash_Value (void) +CosProperty_Hash_Value::CosProperty_Hash_Value () { } @@ -77,19 +77,19 @@ CosProperty_Hash_Value::CosProperty_Hash_Value (const CosProperty_Hash_Value &sr { } -CosProperty_Hash_Value::~CosProperty_Hash_Value (void) +CosProperty_Hash_Value::~CosProperty_Hash_Value () { } //====================================================================== // Constructor. -TAO_PropertySetFactory::TAO_PropertySetFactory (void) +TAO_PropertySetFactory::TAO_PropertySetFactory () { } // Destructor. -TAO_PropertySetFactory::~TAO_PropertySetFactory (void) +TAO_PropertySetFactory::~TAO_PropertySetFactory () { } @@ -99,7 +99,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void) // things. CosPropertyService::PropertySet_ptr -TAO_PropertySetFactory::create_propertyset (void) +TAO_PropertySetFactory::create_propertyset () { // New a TAO_PropertySet. TAO_PropertySet *new_set; @@ -201,7 +201,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr } // Destructor. -TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void) +TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory () { // Release all the new'ed products. for (CORBA::ULong pi = 0; @@ -213,7 +213,7 @@ TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void) //====================================================================== // Constrctor. -TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void) +TAO_PropertySetDefFactory::TAO_PropertySetDefFactory () { } @@ -223,7 +223,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void) // delete all these New'ed things. CosPropertyService::PropertySetDef_ptr -TAO_PropertySetDefFactory::create_propertysetdef (void) +TAO_PropertySetDefFactory::create_propertysetdef () { // New a TAO_PropertySetDef. TAO_PropertySetDef *new_set; @@ -330,7 +330,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi // Makes default sized hash_table_. All the sequences are set the max // length as 0. -TAO_PropertySet::TAO_PropertySet (void) +TAO_PropertySet::TAO_PropertySet () { } @@ -397,7 +397,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_p // Destructor. All sequences will be deleted. -TAO_PropertySet::~TAO_PropertySet (void) +TAO_PropertySet::~TAO_PropertySet () { } @@ -625,7 +625,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope CORBA::ULong -TAO_PropertySet::get_number_of_properties (void) +TAO_PropertySet::get_number_of_properties () { return static_cast<CORBA::ULong> (this->hash_table_.current_size ()); } @@ -990,7 +990,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro CORBA::Boolean -TAO_PropertySet::delete_all_properties (void) +TAO_PropertySet::delete_all_properties () { // Get all the property names in a names' sequence. CosPropertyService::PropertyNames *names_ptr = 0; @@ -1043,7 +1043,7 @@ TAO_PropertySet::operator= (const TAO_PropertySet &) // Makes default sized hash_table_. -TAO_PropertySetDef::TAO_PropertySetDef (void) +TAO_PropertySetDef::TAO_PropertySetDef () { } @@ -1082,7 +1082,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs i // Destructor. -TAO_PropertySetDef::~TAO_PropertySetDef (void) +TAO_PropertySetDef::~TAO_PropertySetDef () { } @@ -1521,7 +1521,7 @@ TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet &property_ // Destructor. -TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void) +TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator () { } @@ -1529,7 +1529,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void) // one exists. void -TAO_PropertyNamesIterator::reset (void) +TAO_PropertyNamesIterator::reset () { this->iterator_ = this->iterator_.map ().begin (); } @@ -1589,7 +1589,7 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertyNamesIterator::destroy (void) +TAO_PropertyNamesIterator::destroy () { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests @@ -1609,12 +1609,12 @@ TAO_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet &property_set) { } -TAO_PropertiesIterator::~TAO_PropertiesIterator (void) +TAO_PropertiesIterator::~TAO_PropertiesIterator () { } void -TAO_PropertiesIterator::reset (void) +TAO_PropertiesIterator::reset () { this->iterator_ = this->iterator_.map ().begin (); } @@ -1681,7 +1681,7 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertiesIterator::destroy (void) +TAO_PropertiesIterator::destroy () { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index f90a7ee5404..5538284fe7f 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -422,7 +422,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit // to the number returned, inclusive. RtecScheduler::Preemption_Priority_t -ACE_Runtime_Scheduler::last_scheduled_priority (void) +ACE_Runtime_Scheduler::last_scheduled_priority () { // throw an exception if a valid schedule has not been loaded if (config_count_ <= 0) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp index a22952b17a2..4ab2c1e9f72 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void) +TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor () : TAO_IIOP_Acceptor (), base_acceptor_ (), creation_strategy_ (0), @@ -13,7 +13,7 @@ TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void) { } -TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor (void) +TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -25,7 +25,7 @@ TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor (void) } int -TAO::IIOP_SSL_Acceptor::close (void) +TAO::IIOP_SSL_Acceptor::close () { return this->base_acceptor_.close (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index 4622a9ac7a8..0b01d3824f8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -74,7 +74,7 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( this->transport (specific_transport); } -TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler (void) +TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 3029c05c3e5..d2023356c48 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -15,14 +15,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (void) +TAO::IIOP_SSL_Connector::IIOP_SSL_Connector () : TAO_IIOP_Connector (), connect_strategy_ (), base_connector_ (0) { } -TAO::IIOP_SSL_Connector::~IIOP_SSL_Connector (void) +TAO::IIOP_SSL_Connector::~IIOP_SSL_Connector () { } @@ -58,7 +58,7 @@ TAO::IIOP_SSL_Connector::open (TAO_ORB_Core *orb_core) } int -TAO::IIOP_SSL_Connector::close (void) +TAO::IIOP_SSL_Connector::close () { delete this->base_connector_.creation_strategy (); delete this->base_connector_.concurrency_strategy (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp index 353c0b82c9d..2e2c03fbe04 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp @@ -18,7 +18,7 @@ TAO::IIOP_SSL_Transport::IIOP_SSL_Transport ( TAO::SSLIOP::Util::current (orb_core); } -TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport (void) +TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index f4eee04b4de..c89130859f2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -82,7 +82,7 @@ TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop, CSIIOP::NoProtection); } -TAO::SSLIOP::Acceptor::~Acceptor (void) +TAO::SSLIOP::Acceptor::~Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -351,7 +351,7 @@ TAO::SSLIOP::Acceptor::is_collocated (const TAO_Endpoint *endpoint) } int -TAO::SSLIOP::Acceptor::close (void) +TAO::SSLIOP::Acceptor::close () { int r = this->ssl_acceptor_.close (); if (this->IIOP_SSL_Acceptor::close () != 0) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp index e8842aa4a16..1486707d257 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp @@ -12,24 +12,24 @@ TAO::SSLIOP::ClientCredentials::ClientCredentials ( { } -TAO::SSLIOP::ClientCredentials::~ClientCredentials (void) +TAO::SSLIOP::ClientCredentials::~ClientCredentials () { } SecurityLevel3::CredentialsType -TAO::SSLIOP::ClientCredentials::creds_type (void) +TAO::SSLIOP::ClientCredentials::creds_type () { return SecurityLevel3::CT_ClientCredentials; } char * -TAO::SSLIOP::ClientCredentials::context_id (void) +TAO::SSLIOP::ClientCredentials::context_id () { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * -TAO::SSLIOP::ClientCredentials::client_principal (void) +TAO::SSLIOP::ClientCredentials::client_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -47,7 +47,7 @@ TAO::SSLIOP::ClientCredentials::client_restricted_resources () } SecurityLevel3::Principal * -TAO::SSLIOP::ClientCredentials::target_principal (void) +TAO::SSLIOP::ClientCredentials::target_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -65,7 +65,7 @@ TAO::SSLIOP::ClientCredentials::target_restricted_resources () } SecurityLevel3::OwnCredentials_ptr -TAO::SSLIOP::ClientCredentials::parent_credentials (void) +TAO::SSLIOP::ClientCredentials::parent_credentials () { SecurityLevel3::OwnCredentials_ptr creds = SecurityLevel3::OwnCredentials::_nil (); @@ -92,19 +92,19 @@ TAO::SSLIOP::ClientCredentials::client_authentication () } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::target_authentication (void) +TAO::SSLIOP::ClientCredentials::target_authentication () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::confidentiality (void) +TAO::SSLIOP::ClientCredentials::confidentiality () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::integrity (void) +TAO::SSLIOP::ClientCredentials::integrity () { // TAO's SSLIOP pluggable transport always provides integrity. Note // that if we diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index f37b77c9682..2244fb35e51 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -51,7 +51,7 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core) this->transport (specific_transport); } -TAO::SSLIOP::Connection_Handler::~Connection_Handler (void) +TAO::SSLIOP::Connection_Handler::~Connection_Handler () { delete this->transport (); int const result = @@ -245,13 +245,13 @@ TAO::SSLIOP::Connection_Handler::open (void *) } int -TAO::SSLIOP::Connection_Handler::resume_handler (void) +TAO::SSLIOP::Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO::SSLIOP::Connection_Handler::close_connection (void) +TAO::SSLIOP::Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -313,7 +313,7 @@ TAO::SSLIOP::Connection_Handler::close (u_long flags) } int -TAO::SSLIOP::Connection_Handler::release_os_resources (void) +TAO::SSLIOP::Connection_Handler::release_os_resources () { return this->peer().close (); } @@ -326,7 +326,7 @@ TAO::SSLIOP::Connection_Handler::pos_io_hook (int & return_value) } int -TAO::SSLIOP::Connection_Handler::add_transport_to_cache (void) +TAO::SSLIOP::Connection_Handler::add_transport_to_cache () { ACE_INET_Addr addr; @@ -459,7 +459,7 @@ TAO::SSLIOP::Connection_Handler::handle_write_ready (const ACE_Time_Value *t) } bool -TAO::SSLIOP::Connection_Handler::check_host (void) +TAO::SSLIOP::Connection_Handler::check_host () { ACE_SSL_Context *ssl_ctx = ACE_SSL_Context::instance (); ACE_INET_Addr remote_addr; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 6aebd8005d2..458198a14c7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -70,7 +70,7 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core) } int -TAO::SSLIOP::Connector::close (void) +TAO::SSLIOP::Connector::close () { (void) this->TAO::IIOP_SSL_Connector::close (); @@ -214,7 +214,7 @@ TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO::SSLIOP::Connector::make_profile (void) +TAO::SSLIOP::Connector::make_profile () { // The endpoint should be of the form: // N.n@host:port/object_key @@ -236,7 +236,7 @@ TAO::SSLIOP::Connector::make_profile (void) TAO_Profile * -TAO::SSLIOP::Connector::make_secure_profile (void) +TAO::SSLIOP::Connector::make_secure_profile () { // The endpoint should be of the form: // N.n@host:port/object_key diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index ea8462ccf68..20e4069f82a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -70,30 +70,30 @@ TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp) } } -TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void) +TAO::SSLIOP_Credentials::~SSLIOP_Credentials () { } char * -TAO::SSLIOP_Credentials::creds_id (void) +TAO::SSLIOP_Credentials::creds_id () { return CORBA::string_dup (this->id_.in ()); } SecurityLevel3::CredentialsUsage -TAO::SSLIOP_Credentials::creds_usage (void) +TAO::SSLIOP_Credentials::creds_usage () { return SecurityLevel3::CU_Indefinite; } TimeBase::UtcT -TAO::SSLIOP_Credentials::expiry_time (void) +TAO::SSLIOP_Credentials::expiry_time () { return this->expiry_time_; } SecurityLevel3::CredentialsState -TAO::SSLIOP_Credentials::creds_state (void) +TAO::SSLIOP_Credentials::creds_state () { const ::X509 *x = this->x509_.in (); @@ -181,7 +181,7 @@ TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs) } CORBA::ULong -TAO::SSLIOP_Credentials::hash (void) const +TAO::SSLIOP_Credentials::hash () const { ::X509 * x509 = this->x509_.in (); @@ -219,7 +219,7 @@ tao_TAO_SSLIOP_Credentials_release (TAO::SSLIOP::Credentials_ptr p) } TAO::SSLIOP::Credentials_ptr -tao_TAO_SSLIOP_Credentials_nil (void) +tao_TAO_SSLIOP_Credentials_nil () { return TAO::SSLIOP_Credentials::_nil (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 0528fe63f03..e9821f0c25a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -76,12 +76,12 @@ TAO::SSLIOP::CredentialsAcquirer::CredentialsAcquirer ( { } -TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void) +TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer () { } char * -TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void) +TAO::SSLIOP::CredentialsAcquirer::acquisition_method () { this->check_validity (); @@ -89,7 +89,7 @@ TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void) } SecurityLevel3::AcquisitionStatus -TAO::SSLIOP::CredentialsAcquirer::current_status (void) +TAO::SSLIOP::CredentialsAcquirer::current_status () { this->check_validity (); @@ -97,7 +97,7 @@ TAO::SSLIOP::CredentialsAcquirer::current_status (void) } CORBA::ULong -TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void) +TAO::SSLIOP::CredentialsAcquirer::nth_iteration () { this->check_validity (); @@ -170,7 +170,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list) } void -TAO::SSLIOP::CredentialsAcquirer::destroy (void) +TAO::SSLIOP::CredentialsAcquirer::destroy () { this->check_validity (); @@ -188,7 +188,7 @@ TAO::SSLIOP::CredentialsAcquirer::destroy (void) } void -TAO::SSLIOP::CredentialsAcquirer::check_validity (void) +TAO::SSLIOP::CredentialsAcquirer::check_validity () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index c0141239c3f..32e419fd1ce 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -13,7 +13,7 @@ TAO::SSLIOP::Current::Current (TAO_ORB_Core *orb_core) { } -TAO::SSLIOP::Current::~Current (void) +TAO::SSLIOP::Current::~Current () { } @@ -78,7 +78,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain () } CORBA::Boolean -TAO::SSLIOP::Current::no_context (void) +TAO::SSLIOP::Current::no_context () { return (this->implementation () == 0 ? true : false); } @@ -127,7 +127,7 @@ TAO::SSLIOP::Current::_duplicate (TAO::SSLIOP::Current_ptr obj) } const char * -TAO::SSLIOP::Current::_interface_repository_id (void) const +TAO::SSLIOP::Current::_interface_repository_id () const { return "IDL:TAO/SSLIOP/Current:1.0"; } @@ -147,7 +147,7 @@ tao_TAO_SSLIOP_Current_release (TAO::SSLIOP::Current_ptr p) } TAO::SSLIOP::Current_ptr -tao_TAO_SSLIOP_Current_nil (void) +tao_TAO_SSLIOP_Current_nil () { return TAO::SSLIOP::Current::_nil (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 00a811a558b..672bc44fcd5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::SSLIOP::Current_Impl::~Current_Impl (void) +TAO::SSLIOP::Current_Impl::~Current_Impl () { } @@ -43,7 +43,7 @@ TAO::SSLIOP::Current_Impl::client_credentials () } CORBA::Boolean -TAO::SSLIOP::Current_Impl::request_is_local (void) +TAO::SSLIOP::Current_Impl::request_is_local () { throw CORBA::NO_IMPLEMENT (); } @@ -115,7 +115,7 @@ TAO::SSLIOP::Current_Impl::get_peer_certificate_chain ( } CORBA::ULong -TAO::SSLIOP::Current_Impl::tag (void) const +TAO::SSLIOP::Current_Impl::tag () const { return ::SSLIOP::TAG_SSL_SEC_TRANS; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 077725fc096..ac09e5b1cab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -97,7 +97,7 @@ TAO_SSLIOP_Endpoint::operator= (const TAO_SSLIOP_Endpoint &other) return *this; } -TAO_SSLIOP_Endpoint::~TAO_SSLIOP_Endpoint (void) +TAO_SSLIOP_Endpoint::~TAO_SSLIOP_Endpoint () { if (this->destroy_iiop_endpoint_) delete this->iiop_endpoint_; @@ -125,7 +125,7 @@ TAO_SSLIOP_Endpoint::addr_to_string (char *buffer, size_t length) TAO_Endpoint * -TAO_SSLIOP_Endpoint::next (void) +TAO_SSLIOP_Endpoint::next () { return this->next_; } @@ -170,7 +170,7 @@ TAO_SSLIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) } TAO_Endpoint * -TAO_SSLIOP_Endpoint::duplicate (void) +TAO_SSLIOP_Endpoint::duplicate () { TAO_SSLIOP_Endpoint *endpoint = 0; @@ -190,7 +190,7 @@ TAO_SSLIOP_Endpoint::duplicate (void) } CORBA::ULong -TAO_SSLIOP_Endpoint::hash (void) +TAO_SSLIOP_Endpoint::hash () { // there is actually the potential for a race of the inverse case, // since setting the security attributes will reset the hash_val_, @@ -230,7 +230,7 @@ TAO_SSLIOP_Endpoint::hash (void) const ACE_INET_Addr & -TAO_SSLIOP_Endpoint::object_addr (void) const +TAO_SSLIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -345,7 +345,7 @@ TAO_SSLIOP_Synthetic_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint } TAO_Endpoint * -TAO_SSLIOP_Synthetic_Endpoint::duplicate (void) +TAO_SSLIOP_Synthetic_Endpoint::duplicate () { TAO_SSLIOP_Synthetic_Endpoint *endpoint = 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 907e7246983..9f42eb0efb2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -230,7 +230,7 @@ TAO::SSLIOP::Protocol_Factory::pem_passwd_cb (char *buf, int size, int , void *t return len; } -TAO::SSLIOP::Protocol_Factory::Protocol_Factory (void) +TAO::SSLIOP::Protocol_Factory::Protocol_Factory () : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP), qop_ (::Security::SecQOPIntegrityAndConfidentiality), timeout_ (TAO::SSLIOP::ACCEPT_TIMEOUT), @@ -238,7 +238,7 @@ TAO::SSLIOP::Protocol_Factory::Protocol_Factory (void) { } -TAO::SSLIOP::Protocol_Factory::~Protocol_Factory (void) +TAO::SSLIOP::Protocol_Factory::~Protocol_Factory () { } @@ -251,7 +251,7 @@ TAO::SSLIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO::SSLIOP::Protocol_Factory::prefix (void) const +TAO::SSLIOP::Protocol_Factory::prefix () const { // Note: This method doesn't seem to be used anywhere. Moreover, // keeping it may make things more confusing - a Factory can @@ -261,13 +261,13 @@ TAO::SSLIOP::Protocol_Factory::prefix (void) const } char -TAO::SSLIOP::Protocol_Factory::options_delimiter (void) const +TAO::SSLIOP::Protocol_Factory::options_delimiter () const { return '/'; } TAO_Acceptor * -TAO::SSLIOP::Protocol_Factory::make_acceptor (void) +TAO::SSLIOP::Protocol_Factory::make_acceptor () { TAO_Acceptor *acceptor = 0; @@ -797,7 +797,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO::SSLIOP::Protocol_Factory::register_orb_initializer (void) +TAO::SSLIOP::Protocol_Factory::register_orb_initializer () { try { @@ -853,7 +853,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (void) TAO_Connector * -TAO::SSLIOP::Protocol_Factory::make_connector (void) +TAO::SSLIOP::Protocol_Factory::make_connector () { TAO::SSLIOP::Connector *connector = 0; @@ -864,7 +864,7 @@ TAO::SSLIOP::Protocol_Factory::make_connector (void) } int -TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const +TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint () const { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index 4e0324ffd9a..12496c1adf8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -47,7 +47,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor ( this->sec2manager_ = SecurityLevel2::SecurityManager::_narrow (obj.in ()); } -TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor (void) +TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index 8604d6ba2cb..be7540ea0a6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -7,7 +7,7 @@ TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp) { } -TAO::SSLIOP::OwnCredentials::~OwnCredentials (void) +TAO::SSLIOP::OwnCredentials::~OwnCredentials () { } @@ -28,26 +28,26 @@ TAO::SSLIOP::OwnCredentials::_narrow (CORBA::Object_ptr obj) } TAO::SSLIOP::OwnCredentials_ptr -TAO::SSLIOP::OwnCredentials::_nil (void) +TAO::SSLIOP::OwnCredentials::_nil () { return (OwnCredentials *) 0; } SecurityLevel3::CredentialsType -TAO::SSLIOP::OwnCredentials::creds_type (void) +TAO::SSLIOP::OwnCredentials::creds_type () { return SecurityLevel3::CT_OwnCredentials; } SecurityLevel3::CredsInitiator_ptr -TAO::SSLIOP::OwnCredentials::creds_initiator (void) +TAO::SSLIOP::OwnCredentials::creds_initiator () { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::CredsAcceptor_ptr -TAO::SSLIOP::OwnCredentials::creds_acceptor (void) +TAO::SSLIOP::OwnCredentials::creds_acceptor () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index dcca6d01808..91ebb0db443 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -56,7 +56,7 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core, int ssl_only) this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true); } -TAO_SSLIOP_Profile::~TAO_SSLIOP_Profile (void) +TAO_SSLIOP_Profile::~TAO_SSLIOP_Profile () { // Clean up the list of endpoints since we own it. // Skip the head, since it is not dynamically allocated. @@ -190,7 +190,7 @@ TAO_SSLIOP_Profile::do_is_equivalent (const TAO_Profile * other_profile) } TAO_Endpoint* -TAO_SSLIOP_Profile::endpoint (void) +TAO_SSLIOP_Profile::endpoint () { return &this->ssl_endpoint_; } @@ -209,7 +209,7 @@ TAO_SSLIOP_Profile::add_endpoint (TAO_SSLIOP_Endpoint * endp) } int -TAO_SSLIOP_Profile::encode_endpoints (void) +TAO_SSLIOP_Profile::encode_endpoints () { // If we have more than one endpoint, we encode info about others // into a tagged component for wire transfer. @@ -266,7 +266,7 @@ TAO_SSLIOP_Profile::encode_endpoints (void) } int -TAO_SSLIOP_Profile::decode_tagged_endpoints (void) +TAO_SSLIOP_Profile::decode_tagged_endpoints () { IOP::TaggedComponent tagged_component; tagged_component.tag = TAO::TAG_SSL_ENDPOINTS; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index fff54f524b9..c203fdc7d5e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -10,19 +10,19 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert, SecurityLevel3::CredentialsType -TAO::SSLIOP::TargetCredentials::creds_type (void) +TAO::SSLIOP::TargetCredentials::creds_type () { return SecurityLevel3::CT_TargetCredentials; } char * -TAO::SSLIOP::TargetCredentials::context_id (void) +TAO::SSLIOP::TargetCredentials::context_id () { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * -TAO::SSLIOP::TargetCredentials::client_principal (void) +TAO::SSLIOP::TargetCredentials::client_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -40,7 +40,7 @@ TAO::SSLIOP::TargetCredentials::client_restricted_resources () } SecurityLevel3::Principal * -TAO::SSLIOP::TargetCredentials::target_principal (void) +TAO::SSLIOP::TargetCredentials::target_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -58,49 +58,49 @@ TAO::SSLIOP::TargetCredentials::target_restricted_resources () } SecurityLevel3::OwnCredentials_ptr -TAO::SSLIOP::TargetCredentials::parent_credentials (void) +TAO::SSLIOP::TargetCredentials::parent_credentials () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::client_authentication (void) +TAO::SSLIOP::TargetCredentials::client_authentication () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::target_authentication (void) +TAO::SSLIOP::TargetCredentials::target_authentication () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::confidentiality (void) +TAO::SSLIOP::TargetCredentials::confidentiality () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::integrity (void) +TAO::SSLIOP::TargetCredentials::integrity () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::target_embodied (void) +TAO::SSLIOP::TargetCredentials::target_embodied () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::target_endorsed (void) +TAO::SSLIOP::TargetCredentials::target_endorsed () { throw CORBA::NO_IMPLEMENT (); } void -TAO::SSLIOP::TargetCredentials::release (void) +TAO::SSLIOP::TargetCredentials::release () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index 3a123c382f7..e9df6979bb0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -27,18 +27,18 @@ TAO::SSLIOP::Transport::Transport ( { } -TAO::SSLIOP::Transport::~Transport (void) +TAO::SSLIOP::Transport::~Transport () { } ACE_Event_Handler * -TAO::SSLIOP::Transport::event_handler_i (void) +TAO::SSLIOP::Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO::SSLIOP::Transport::connection_handler_i (void) +TAO::SSLIOP::Transport::connection_handler_i () { return this->connection_handler_; } diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index da9d83b8e5d..f80cd66be75 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Config_Scheduler::ACE_Config_Scheduler (void) +ACE_Config_Scheduler::ACE_Config_Scheduler () #if defined (TAO_USES_STRATEGY_SCHEDULER) : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t> (TAO_MIN_CRITICAL_PRIORITY)) , impl (new ACE_Strategy_Scheduler (scheduler_strategy_)) @@ -22,7 +22,7 @@ ACE_Config_Scheduler::ACE_Config_Scheduler (void) // impl->output_level (10); } -ACE_Config_Scheduler::~ACE_Config_Scheduler (void) +ACE_Config_Scheduler::~ACE_Config_Scheduler () { delete impl; } @@ -438,7 +438,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t -ACE_Config_Scheduler::last_scheduled_priority (void) +ACE_Config_Scheduler::last_scheduled_priority () { RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 3cdc82216da..f1844bed135 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -1237,7 +1237,7 @@ ACE_DynScheduler::propagate_dispatches ( ACE_DynScheduler::status_t -ACE_DynScheduler::calculate_utilization_params (void) +ACE_DynScheduler::calculate_utilization_params () { critical_set_frame_size_ = 0; utilization_ = 0.0; @@ -1307,7 +1307,7 @@ ACE_DynScheduler::update_priority_level_params () } ACE_DynScheduler::status_t -ACE_DynScheduler::setup_task_entries (void) +ACE_DynScheduler::setup_task_entries () { // store number of tasks, based on registrations tasks (static_cast<u_int> (rt_info_entries_.size ())); @@ -1384,7 +1384,7 @@ ACE_DynScheduler::setup_task_entries (void) } ACE_DynScheduler::status_t -ACE_DynScheduler::relate_task_entries (void) +ACE_DynScheduler::relate_task_entries () { status_t status = SUCCEEDED; @@ -1584,7 +1584,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, } ACE_DynScheduler::status_t -ACE_DynScheduler::check_dependency_cycles (void) +ACE_DynScheduler::check_dependency_cycles () { status_t return_status = SUCCEEDED; @@ -1748,7 +1748,7 @@ ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduli // calls internal dispatch scheduling method. ACE_DynScheduler::status_t -ACE_DynScheduler::store_assigned_info (void) +ACE_DynScheduler::store_assigned_info () { for (u_int i = 0; i < dispatch_entry_count_; ++i) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index 4bf6aede47c..b50d9381218 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -705,7 +705,7 @@ effective_exec_multiplier (CORBA::Long l) /////////////////////////// -TAO_Reconfig_Sched_Entry_Visitor::~TAO_Reconfig_Sched_Entry_Visitor (void) +TAO_Reconfig_Sched_Entry_Visitor::~TAO_Reconfig_Sched_Entry_Visitor () { } @@ -910,7 +910,7 @@ enabled_state (RtecScheduler::RT_Info_Enabled_Type_t et) //////////////////////////////////////////// -TAO_RT_Info_Tuple_Visitor::~TAO_RT_Info_Tuple_Visitor (void) +TAO_RT_Info_Tuple_Visitor::~TAO_RT_Info_Tuple_Visitor () { } diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index 8f851f9b415..9cfb8e0b5da 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Task_Entry::Task_Entry (void) +Task_Entry::Task_Entry () : rt_info_ (0), effective_period_(0), dfs_status_ (NOT_VISITED), @@ -35,7 +35,7 @@ Task_Entry::Task_Entry (void) { } -Task_Entry::~Task_Entry (void) +Task_Entry::~Task_Entry () { // Zero out the task entry ACT in the corresponding rt_info rt_info_->volatile_token = 0; @@ -758,7 +758,7 @@ Dispatch_Proxy_Iterator::first (u_int sub_frame) // and -1 if an error occurred. int -Dispatch_Proxy_Iterator::last (void) +Dispatch_Proxy_Iterator::last () { // use the last call current_call_ = number_of_calls_ - 1; @@ -775,7 +775,7 @@ Dispatch_Proxy_Iterator::last (void) // and -1 if an error occurred. int -Dispatch_Proxy_Iterator::advance (void) +Dispatch_Proxy_Iterator::advance () { int result = 1; @@ -814,7 +814,7 @@ Dispatch_Proxy_Iterator::advance (void) // and -1 if an error occurred. int -Dispatch_Proxy_Iterator::retreat (void) +Dispatch_Proxy_Iterator::retreat () { int result = 1; @@ -851,7 +851,7 @@ Dispatch_Proxy_Iterator::retreat (void) // returns the adjusted arrival time of the virtual entry RtecScheduler::Time -Dispatch_Proxy_Iterator::arrival (void) const +Dispatch_Proxy_Iterator::arrival () const { Dispatch_Entry_Link *link; if (iter_.done () @@ -868,7 +868,7 @@ Dispatch_Proxy_Iterator::arrival (void) const // returns the adjusted deadline time of the virtual entry RtecScheduler::Time -Dispatch_Proxy_Iterator::deadline (void) const +Dispatch_Proxy_Iterator::deadline () const { Dispatch_Entry_Link *link; if (iter_.done () @@ -885,7 +885,7 @@ Dispatch_Proxy_Iterator::deadline (void) const // returns the scheduler priority of the virtual entry Dispatch_Proxy_Iterator::Preemption_Priority -Dispatch_Proxy_Iterator::priority (void) const +Dispatch_Proxy_Iterator::priority () const { Dispatch_Entry_Link *link; @@ -900,7 +900,7 @@ Dispatch_Proxy_Iterator::priority (void) const // returns the OS priority of the virtual entry Dispatch_Proxy_Iterator::OS_Priority -Dispatch_Proxy_Iterator::OS_priority (void) const +Dispatch_Proxy_Iterator::OS_priority () const { Dispatch_Entry_Link *link; if (iter_.done () diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index d301b963454..c1bb16f71c5 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -613,7 +613,7 @@ ACE_Scheduler_Strategy::ACE_Scheduler_Strategy ( { } -ACE_Scheduler_Strategy::~ACE_Scheduler_Strategy (void) +ACE_Scheduler_Strategy::~ACE_Scheduler_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 1190037fc93..8d1618b975b 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -105,7 +105,7 @@ struct ACE_Scheduler_Factory_Data // applications; must be set by either the application or Event // Channel. - ACE_Scheduler_Factory_Data (void) + ACE_Scheduler_Factory_Data () : scheduler_ (TAO_SF_config_count, TAO_SF_config_info, TAO_SF_entry_count, @@ -140,7 +140,7 @@ int ACE_Scheduler_Factory::use_runtime (int cc, } static RtecScheduler::Scheduler_ptr -static_server (void) +static_server () { RtecScheduler::Scheduler_ptr server_ = 0; @@ -221,7 +221,7 @@ ACE_Scheduler_Factory::server (RtecScheduler::Scheduler_ptr sptr) } RtecScheduler::Scheduler_ptr -ACE_Scheduler_Factory::server (void) +ACE_Scheduler_Factory::server () { if (server_ == 0 && TAO_SF_entry_count != -1) server_ = static_server (); @@ -730,7 +730,7 @@ ACE_Scheduler_Factory::log_scheduling_tuples( #endif /* HPUX && !g++ */ RtecScheduler::Preemption_Priority_t -ACE_Scheduler_Factory::preemption_priority (void) +ACE_Scheduler_Factory::preemption_priority () { // Return whatever we've got. The application or Event Channel is // responsible for making sure that it was set. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index 99e681eb61a..09273977362 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -10,7 +10,7 @@ TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy ( { } -TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void) +TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy () { } @@ -21,7 +21,7 @@ TAO::Security::EstablishTrustPolicy::policy_type () } CORBA::Policy_ptr -TAO::Security::EstablishTrustPolicy::copy (void) +TAO::Security::EstablishTrustPolicy::copy () { TAO::Security::EstablishTrustPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -36,12 +36,12 @@ TAO::Security::EstablishTrustPolicy::copy (void) } void -TAO::Security::EstablishTrustPolicy::destroy (void) +TAO::Security::EstablishTrustPolicy::destroy () { } ::Security::EstablishTrust -TAO::Security::EstablishTrustPolicy::trust (void) +TAO::Security::EstablishTrustPolicy::trust () { return this->trust_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index 9d41415ebd2..6fac5016428 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -9,18 +9,18 @@ TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop) { } -TAO::Security::QOPPolicy::~QOPPolicy (void) +TAO::Security::QOPPolicy::~QOPPolicy () { } CORBA::PolicyType -TAO::Security::QOPPolicy::policy_type (void) +TAO::Security::QOPPolicy::policy_type () { return ::Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO::Security::QOPPolicy::copy (void) +TAO::Security::QOPPolicy::copy () { TAO::Security::QOPPolicy * policy = 0; ACE_NEW_THROW_EX (policy, @@ -35,12 +35,12 @@ TAO::Security::QOPPolicy::copy (void) } void -TAO::Security::QOPPolicy::destroy (void) +TAO::Security::QOPPolicy::destroy () { } Security::QOP -TAO::Security::QOPPolicy::qop (void) +TAO::Security::QOPPolicy::qop () { return this->qop_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 0dfb18dcc59..6590858dfe5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -27,7 +27,7 @@ TAO::Security::SecurityManager::SecurityManager (/* unknown */) this->access_decision_ = ad; } -TAO::Security::SecurityManager::~SecurityManager (void) +TAO::Security::SecurityManager::~SecurityManager () { } @@ -315,7 +315,7 @@ TAO::Security::AccessDecision::remove_object } CORBA::Boolean -TAO::Security::AccessDecision::default_decision (void) +TAO::Security::AccessDecision::default_decision () { return this->default_allowance_decision_; } @@ -327,7 +327,7 @@ TAO::Security::AccessDecision::default_decision (CORBA::Boolean d) } CORBA::Boolean -TAO::Security::AccessDecision::default_collocated_decision (void) +TAO::Security::AccessDecision::default_collocated_decision () { return this->default_collocated_decision_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index 525dcf71228..9f1af843b94 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -18,7 +18,7 @@ TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy ( { } -TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void) +TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy () { } @@ -29,7 +29,7 @@ TAO::SL3::ContextEstablishmentPolicy::creds_directive () } SecurityLevel3::OwnCredentialsList * -TAO::SL3::ContextEstablishmentPolicy::creds_list (void) +TAO::SL3::ContextEstablishmentPolicy::creds_list () { SecurityLevel3::OwnCredentialsList * creds = 0; @@ -71,7 +71,7 @@ TAO::SL3::ContextEstablishmentPolicy::policy_type () } CORBA::Policy_ptr -TAO::SL3::ContextEstablishmentPolicy::copy (void) +TAO::SL3::ContextEstablishmentPolicy::copy () { CORBA::Policy_ptr p = CORBA::Policy_ptr (); ACE_NEW_THROW_EX (p, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp index 3cd971c403d..37104fb3940 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory (void) +TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory () { } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index 82d65bfe788..a1f9556ebb6 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -11,14 +11,14 @@ namespace TAO } } -TAO::SL3::CredentialsCurator::CredentialsCurator (void) +TAO::SL3::CredentialsCurator::CredentialsCurator () : lock_ (), acquirer_factories_ (), credentials_table_ (TAO::SL3::CREDENTIALS_TABLE_SIZE) { } -TAO::SL3::CredentialsCurator::~CredentialsCurator (void) +TAO::SL3::CredentialsCurator::~CredentialsCurator () { const Factory_Iterator fend = this->acquirer_factories_.end (); for (Factory_Iterator i = this->acquirer_factories_.begin (); @@ -62,13 +62,13 @@ TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj) } TAO::SL3::CredentialsCurator_ptr -TAO::SL3::CredentialsCurator::_nil (void) +TAO::SL3::CredentialsCurator::_nil () { return (CredentialsCurator *) 0; } SecurityLevel3::AcquisitionMethodList * -TAO::SL3::CredentialsCurator::supported_methods (void) +TAO::SL3::CredentialsCurator::supported_methods () { SecurityLevel3::AcquisitionMethodList * list; ACE_NEW_THROW_EX (list, @@ -115,7 +115,7 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( } SecurityLevel3::OwnCredentialsList * -TAO::SL3::CredentialsCurator::default_creds_list (void) +TAO::SL3::CredentialsCurator::default_creds_list () { SecurityLevel3::OwnCredentialsList * list; ACE_NEW_THROW_EX (list, @@ -146,7 +146,7 @@ TAO::SL3::CredentialsCurator::default_creds_list (void) } SecurityLevel3::CredentialsIdList * -TAO::SL3::CredentialsCurator::default_creds_ids (void) +TAO::SL3::CredentialsCurator::default_creds_ids () { SecurityLevel3::CredentialsIdList * list; ACE_NEW_THROW_EX (list, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index f8f99982eff..ddda19ce6e9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -8,12 +8,12 @@ TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy ( { } -TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void) +TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy () { } SecurityLevel3::OwnCredentialsList * -TAO::SL3::ObjectCredentialsPolicy::creds_list (void) +TAO::SL3::ObjectCredentialsPolicy::creds_list () { SecurityLevel3::OwnCredentialsList * creds = 0; @@ -31,7 +31,7 @@ TAO::SL3::ObjectCredentialsPolicy::policy_type () } CORBA::Policy_ptr -TAO::SL3::ObjectCredentialsPolicy::copy (void) +TAO::SL3::ObjectCredentialsPolicy::copy () { CORBA::Policy_ptr p = CORBA::Policy_ptr (); ACE_NEW_THROW_EX (p, @@ -42,7 +42,7 @@ TAO::SL3::ObjectCredentialsPolicy::copy (void) } void -TAO::SL3::ObjectCredentialsPolicy::destroy (void) +TAO::SL3::ObjectCredentialsPolicy::destroy () { this->creds_list_.length (0); } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp index 582564c8aee..95bc274c937 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp @@ -14,12 +14,12 @@ TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot, } -TAO::SL3::SecurityCurrent::~SecurityCurrent (void) +TAO::SL3::SecurityCurrent::~SecurityCurrent () { } SecurityLevel3::ClientCredentials_ptr -TAO::SL3::SecurityCurrent::client_credentials (void) +TAO::SL3::SecurityCurrent::client_credentials () { TAO::SL3::SecurityCurrent_Impl * impl = this->implementation (); @@ -33,7 +33,7 @@ TAO::SL3::SecurityCurrent::client_credentials (void) } CORBA::Boolean -TAO::SL3::SecurityCurrent::request_is_local (void) +TAO::SL3::SecurityCurrent::request_is_local () { TAO::SL3::SecurityCurrent_Impl * impl = this->implementation (); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp index 2dfaeb1645f..e9518af55ba 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void) +TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl () { } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index a0cc037bf31..9e1e1850e0a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -10,7 +10,7 @@ TAO::SL3::SecurityManager::SecurityManager ( { } -TAO::SL3::SecurityManager::~SecurityManager (void) +TAO::SL3::SecurityManager::~SecurityManager () { } diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 8ea7bb61737..2cde77f2465 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -16,7 +16,7 @@ TAO_Security_Current::TAO_Security_Current (size_t tss_slot, { } -TAO_Security_Current::~TAO_Security_Current (void) +TAO_Security_Current::~TAO_Security_Current () { } @@ -50,7 +50,7 @@ TAO_Security_Current::received_credentials () } int -TAO_Security_Current::init (void) +TAO_Security_Current::init () { int result = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp index 0a6350f675f..75c6442c097 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Security::Current_Impl::~Current_Impl (void) +TAO::Security::Current_Impl::~Current_Impl () { } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 6336278865f..aeb74e75716 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -11,14 +11,14 @@ TAO_TIO::TAO_TIO (TimeBase::TimeT lower, } // Destructor. -TAO_TIO::~TAO_TIO (void) +TAO_TIO::~TAO_TIO () { } // This is the get method for the attribute time interval. TimeBase::IntervalT -TAO_TIO::time_interval (void) +TAO_TIO::time_interval () { return attr_time_interval; } @@ -234,7 +234,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, } CosTime::UTO_ptr -TAO_TIO::time (void) +TAO_TIO::time () { TAO_UTO *uto = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index a87bc724459..ee81b1d322f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -32,7 +32,7 @@ TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value, // Destructor. -TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void) +TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk () { } @@ -40,7 +40,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void) // in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Clerk::universal_time (void) +TAO_Time_Service_Clerk::universal_time () { TAO_UTO *uto = 0; @@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (void) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Clerk::secure_universal_time (void) +TAO_Time_Service_Clerk::secure_universal_time () { throw CORBA::NO_IMPLEMENT (); } @@ -120,7 +120,7 @@ TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower, } CORBA::ULongLong -TAO_Time_Service_Clerk::get_time (void) +TAO_Time_Service_Clerk::get_time () { // Globally sync. time is the latest global time plus the time // elapsed since last updation was done. @@ -137,7 +137,7 @@ TAO_Time_Service_Clerk::get_time (void) // Returns the time displacement factor in minutes. // This is displacement from the GMT. CORBA::Short -TAO_Time_Service_Clerk::time_displacement_factor (void) +TAO_Time_Service_Clerk::time_displacement_factor () { return time_displacement_factor_; } @@ -151,7 +151,7 @@ TAO_Time_Service_Clerk::time_displacement_factor (CORBA::Short tdf) // GET method for inaccuracy. TimeBase::InaccuracyT -TAO_Time_Service_Clerk::inaccuracy (void) +TAO_Time_Service_Clerk::inaccuracy () { return this->inaccuracy_; } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index d9fdf300e57..1433cac6262 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -11,12 +11,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. -TAO_Time_Service_Server::TAO_Time_Service_Server (void) +TAO_Time_Service_Server::TAO_Time_Service_Server () { } // Destructor. -TAO_Time_Service_Server::~TAO_Time_Service_Server (void) +TAO_Time_Service_Server::~TAO_Time_Service_Server () { } @@ -24,7 +24,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void) // inaccuracy in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Server::universal_time (void) +TAO_Time_Service_Server::universal_time () { TAO_UTO *uto = 0; @@ -51,7 +51,7 @@ TAO_Time_Service_Server::universal_time (void) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Server::secure_universal_time (void) +TAO_Time_Service_Server::secure_universal_time () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 11461266cf6..73007d9845b 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -24,14 +24,14 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time, // Destructor. -TAO_UTO::~TAO_UTO (void) +TAO_UTO::~TAO_UTO () { } // Get Method for the readonly attribute time. TimeBase::TimeT -TAO_UTO::time (void) +TAO_UTO::time () { return attr_utc_time_.time; } @@ -39,7 +39,7 @@ TAO_UTO::time (void) // Get method for the readonly attribute inaccuracy. TimeBase::InaccuracyT -TAO_UTO::inaccuracy (void) +TAO_UTO::inaccuracy () { // Construct the Inaccuracy from the // inacchi and inacclo. @@ -53,7 +53,7 @@ TAO_UTO::inaccuracy (void) // Get method for the readonly attribute tdf. TimeBase::TdfT -TAO_UTO::tdf (void) +TAO_UTO::tdf () { return attr_utc_time_.tdf; } @@ -61,7 +61,7 @@ TAO_UTO::tdf (void) // Get method for the readonly attribute utc_time. TimeBase::UtcT -TAO_UTO::utc_time (void) +TAO_UTO::utc_time () { return attr_utc_time_; } @@ -70,7 +70,7 @@ TAO_UTO::utc_time (void) // the Base Time, UTC and Distributed Time Sync. Algos. [3]. CosTime::UTO_ptr -TAO_UTO::absolute_time (void) +TAO_UTO::absolute_time () { return CosTime::UTO::_nil (); } @@ -176,7 +176,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) // time value in the UTO. CosTime::TIO_ptr -TAO_UTO::interval (void) +TAO_UTO::interval () { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 3264a707ddd..2dfdaaf37df 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Timer_Helper::Timer_Helper (void) +Timer_Helper::Timer_Helper () : clerk_ (0) { } @@ -21,7 +21,7 @@ Timer_Helper::Timer_Helper (TAO_Time_Service_Clerk *clerk) } -Timer_Helper::~Timer_Helper (void) +Timer_Helper::~Timer_Helper () { } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 5205633818b..b48aa8e55f7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -51,7 +51,7 @@ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, } } -TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter (void) +TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter () { } @@ -225,7 +225,7 @@ remove_offer (CosTrading::Offer*& offer) size_t -TAO_Preference_Interpreter::num_offers (void) +TAO_Preference_Interpreter::num_offers () { return this->offers_.size (); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index 8ea8c4946c2..3d20afdd2bd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -37,7 +37,7 @@ TAO_Binary_Constraint (TAO_Expression_Type op_type, { } -TAO_Binary_Constraint::~TAO_Binary_Constraint (void) +TAO_Binary_Constraint::~TAO_Binary_Constraint () { delete left_; delete right_; @@ -194,13 +194,13 @@ visit_in (TAO_Constraint_Visitor* visitor, TAO_Constraint* -TAO_Binary_Constraint::left_operand (void) const +TAO_Binary_Constraint::left_operand () const { return this->left_; } TAO_Constraint* -TAO_Binary_Constraint::right_operand (void) const +TAO_Binary_Constraint::right_operand () const { return this->right_; } @@ -213,7 +213,7 @@ TAO_Unary_Constraint (TAO_Expression_Type op_type, { } -TAO_Unary_Constraint::~TAO_Unary_Constraint (void) +TAO_Unary_Constraint::~TAO_Unary_Constraint () { delete operand_; } @@ -254,7 +254,7 @@ TAO_Unary_Constraint::accept (TAO_Constraint_Visitor* visitor) } TAO_Constraint* -TAO_Unary_Constraint::operand (void) +TAO_Unary_Constraint::operand () { return this->operand_; } @@ -265,7 +265,7 @@ TAO_Property_Constraint (const char* name) { } -TAO_Property_Constraint::~TAO_Property_Constraint (void) +TAO_Property_Constraint::~TAO_Property_Constraint () { CORBA::string_free (this->name_); } @@ -277,18 +277,18 @@ TAO_Property_Constraint::accept (TAO_Constraint_Visitor* visitor) } TAO_Expression_Type -TAO_Property_Constraint::expr_type (void) const +TAO_Property_Constraint::expr_type () const { return TAO_IDENT; } const char* -TAO_Property_Constraint::name (void) const +TAO_Property_Constraint::name () const { return name_; } -TAO_Literal_Constraint::TAO_Literal_Constraint (void) +TAO_Literal_Constraint::TAO_Literal_Constraint () : type_ (TAO_UNKNOWN) { } @@ -415,7 +415,7 @@ TAO_Literal_Constraint::TAO_Literal_Constraint (const char* str) this->op_.str_ = CORBA::string_dup (str); } -TAO_Literal_Constraint::~TAO_Literal_Constraint (void) +TAO_Literal_Constraint::~TAO_Literal_Constraint () { if (this->type_ == TAO_STRING) CORBA::string_free (this->op_.str_); @@ -433,12 +433,12 @@ TAO_Literal_Constraint::operator= (const TAO_Literal_Constraint& co) this->copy (co); } -TAO_Literal_Constraint::operator CORBA::Boolean (void) const +TAO_Literal_Constraint::operator CORBA::Boolean () const { return (this->type_ == TAO_BOOLEAN) ? this->op_.bool_ : 0; } -TAO_Literal_Constraint::operator CORBA::ULongLong (void) const +TAO_Literal_Constraint::operator CORBA::ULongLong () const { CORBA::ULongLong return_value = 0; @@ -458,7 +458,7 @@ TAO_Literal_Constraint::operator CORBA::ULongLong (void) const return return_value; } -TAO_Literal_Constraint::operator CORBA::LongLong (void) const +TAO_Literal_Constraint::operator CORBA::LongLong () const { CORBA::LongLong return_value = 0; @@ -481,7 +481,7 @@ TAO_Literal_Constraint::operator CORBA::LongLong (void) const return return_value; } -TAO_Literal_Constraint::operator CORBA::Double (void) const +TAO_Literal_Constraint::operator CORBA::Double () const { CORBA::Double return_value = 0.0; @@ -495,12 +495,12 @@ TAO_Literal_Constraint::operator CORBA::Double (void) const return return_value; } -TAO_Literal_Constraint::operator const char* (void) const +TAO_Literal_Constraint::operator const char* () const { return (this->type_ == TAO_STRING) ? this->op_.str_ : 0; } -TAO_Literal_Constraint::operator const CORBA::Any* (void) const +TAO_Literal_Constraint::operator const CORBA::Any* () const { return (this->type_ == TAO_SEQUENCE) ? this->op_.any_ : 0; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 8772fbd39d4..a066079520c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -9,12 +9,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void) +TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue () { } TAO_Literal_Constraint& -TAO_Constraint_Evaluator::Operand_Queue::get_left_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::get_left_operand () { TAO_Literal_Constraint* left_operand = 0; this->get (left_operand, 1); @@ -22,7 +22,7 @@ TAO_Constraint_Evaluator::Operand_Queue::get_left_operand (void) } TAO_Literal_Constraint& -TAO_Constraint_Evaluator::Operand_Queue::get_right_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::get_right_operand () { TAO_Literal_Constraint* right_operand = 0; this->get (right_operand); @@ -30,7 +30,7 @@ TAO_Constraint_Evaluator::Operand_Queue::get_right_operand (void) } TAO_Literal_Constraint& -TAO_Constraint_Evaluator::Operand_Queue::get_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::get_operand () { TAO_Literal_Constraint* operand = 0; this->get (operand); @@ -38,13 +38,13 @@ TAO_Constraint_Evaluator::Operand_Queue::get_operand (void) } void -TAO_Constraint_Evaluator::Operand_Queue::dequeue_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::dequeue_operand () { TAO_Literal_Constraint operand; this->dequeue_head (operand); } -TAO_Constraint_Evaluator::TAO_Constraint_Evaluator (void) +TAO_Constraint_Evaluator::TAO_Constraint_Evaluator () { // No-Op. } @@ -759,12 +759,12 @@ operator () (TAO_DynSequence_i& dyn_any, } TAO_Constraint_Validator:: -TAO_Constraint_Validator (void) +TAO_Constraint_Validator () { // No-Op. } -TAO_Constraint_Validator::~TAO_Constraint_Validator (void) +TAO_Constraint_Validator::~TAO_Constraint_Validator () { for (TAO_Typecode_Table::iterator type_iter (this->type_map_); ! type_iter.done (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index fc4038822dd..9d0429b6b46 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -373,11 +373,11 @@ YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); void yy_delete_buffer ( YY_BUFFER_STATE b ); void yy_flush_buffer ( YY_BUFFER_STATE b ); void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state ( void ); +void yypop_buffer_state ( ); -static void yyensure_buffer_stack ( void ); -static void yy_load_buffer_state ( void ); +static void yyensure_buffer_stack ( ); +static void yy_load_buffer_state ( ); static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); #define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) @@ -435,9 +435,9 @@ extern char *yytext; -static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_get_previous_state ( ); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); -static int yy_get_next_buffer ( void ); +static int yy_get_next_buffer ( ); static void yynoreturn yy_fatal_error ( const char* msg ); @@ -651,18 +651,18 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base); -static int yy_init_globals ( void ); +static int yy_init_globals ( ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy ( void ); +int yylex_destroy ( ); -int yyget_debug ( void ); +int yyget_debug ( ); @@ -670,7 +670,7 @@ void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra ( void ); +YY_EXTRA_TYPE yyget_extra ( ); @@ -678,7 +678,7 @@ void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in ( void ); +FILE *yyget_in ( ); @@ -686,7 +686,7 @@ void yyset_in ( FILE * _in_str ); -FILE *yyget_out ( void ); +FILE *yyget_out ( ); @@ -694,15 +694,15 @@ void yyset_out ( FILE * _out_str ); - int yyget_leng ( void ); + int yyget_leng ( ); -char *yyget_text ( void ); +char *yyget_text ( ); -int yyget_lineno ( void ); +int yyget_lineno ( ); @@ -856,7 +856,7 @@ static int input ( void ); -extern int yylex (void); +extern int yylex (); #define YY_DECL int yylex (void) #endif /* !YY_DECL */ @@ -1298,7 +1298,7 @@ case YY_STATE_EOF(INITIAL): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ -static int yy_get_next_buffer (void) +static int yy_get_next_buffer () { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = (yytext_ptr); @@ -1437,7 +1437,7 @@ static int yy_get_next_buffer (void) /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) + static yy_state_type yy_get_previous_state () { yy_state_type yy_current_state; char *yy_cp; @@ -1667,7 +1667,7 @@ static int yy_get_next_buffer (void) } -static void yy_load_buffer_state (void) +static void yy_load_buffer_state () { (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; @@ -1821,7 +1821,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) * The next element becomes the new top. * */ -void yypop_buffer_state (void) +void yypop_buffer_state () { if (!YY_CURRENT_BUFFER) return; @@ -1841,7 +1841,7 @@ void yypop_buffer_state (void) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void yyensure_buffer_stack (void) +static void yyensure_buffer_stack () { yy_size_t num_to_alloc; @@ -2027,7 +2027,7 @@ static void yynoreturn yy_fatal_error (const char* msg ) /** Get the current line number. * */ -int yyget_lineno (void) +int yyget_lineno () { @@ -2041,7 +2041,7 @@ int yyget_lineno (void) /** Get the input stream. * */ -FILE *yyget_in (void) +FILE *yyget_in () { return yyin; } @@ -2051,7 +2051,7 @@ FILE *yyget_in (void) /** Get the output stream. * */ -FILE *yyget_out (void) +FILE *yyget_out () { return yyout; } @@ -2061,7 +2061,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -int yyget_leng (void) +int yyget_leng () { return yyleng; } @@ -2071,7 +2071,7 @@ int yyget_leng (void) * */ -char *yyget_text (void) +char *yyget_text () { return yytext; } @@ -2116,7 +2116,7 @@ void yyset_out (FILE * _out_str ) -int yyget_debug (void) +int yyget_debug () { return yy_flex_debug; } @@ -2130,7 +2130,7 @@ void yyset_debug (int _bdebug ) -static int yy_init_globals (void) +static int yy_init_globals () { /* Initialization is the same as for the non-reentrant scanner. * This function is called from yylex_destroy(), so don't allocate here. @@ -2167,7 +2167,7 @@ static int yy_init_globals (void) /* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) +int yylex_destroy () { /* Pop the buffer stack, destroying each element. */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp index fb982f6a424..2c4cb219d93 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp @@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__; -TAO_Interpreter::TAO_Interpreter (void) +TAO_Interpreter::TAO_Interpreter () : root_ (0) { } -TAO_Interpreter::~TAO_Interpreter (void) +TAO_Interpreter::~TAO_Interpreter () { delete root_; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index 9e1246a55a1..576b8544083 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class LOCK_TYPE> -TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database (void) +TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database () { } template <class LOCK_TYPE> -TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database (void) +TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database () { ACE_WRITE_GUARD (LOCK_TYPE, ace_mon, this->db_lock_); @@ -220,7 +220,7 @@ lookup_offer (const char* type, CORBA::ULong id) } template <class LOCK_TYPE> TAO_Offer_Id_Iterator* -TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void) +TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids () { ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0); @@ -328,7 +328,7 @@ TAO_Service_Offer_Iterator (const char* type, } template <class LOCK_TYPE> -TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator () { this->stm_.db_lock_.release (); @@ -340,7 +340,7 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator (void) } template <class LOCK_TYPE> CosTrading::OfferId -TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id () { return (this->offer_iter_ != 0) ? TAO_Offer_Database<LOCK_TYPE>::generate_offer_id (this->type_, (**this->offer_iter_).ext_id_) @@ -348,20 +348,20 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id (void) } template <class LOCK_TYPE> int -TAO_Service_Offer_Iterator<LOCK_TYPE>::has_more_offers (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::has_more_offers () { return (this->offer_iter_ != 0) ? ! this->offer_iter_->done () : 0; } template <class LOCK_TYPE> CosTrading::Offer* -TAO_Service_Offer_Iterator<LOCK_TYPE>::get_offer (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::get_offer () { return (this->offer_iter_ != 0) ? (**this->offer_iter_).int_id_ : 0; } template <class LOCK_TYPE> void -TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer () { if (this->offer_iter_ != 0) this->offer_iter_->advance (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 465445a518b..e79269ae7b3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -7,12 +7,12 @@ TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter) { } -TAO_Offer_Iterator::~TAO_Offer_Iterator (void) +TAO_Offer_Iterator::~TAO_Offer_Iterator () { } void -TAO_Offer_Iterator::destroy (void) +TAO_Offer_Iterator::destroy () { // Remove self from POA @@ -31,7 +31,7 @@ TAO_Query_Only_Offer_Iterator(const TAO_Property_Filter& pfilter) { } -TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator(void) +TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator() { } @@ -44,7 +44,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id, } CORBA::ULong -TAO_Query_Only_Offer_Iterator::max_left (void) +TAO_Query_Only_Offer_Iterator::max_left () { return static_cast<CORBA::ULong> (this->offers_.size ()); } @@ -71,11 +71,11 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, return offers_in_sequence != 0; } -TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection (void) +TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection () { } -TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void) +TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection () { while (! this->iters_.is_empty ()) { @@ -157,7 +157,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, } void -TAO_Offer_Iterator_Collection::destroy (void) +TAO_Offer_Iterator_Collection::destroy () { // Destroy all iterators in the collection. for (Offer_Iters::ITERATOR iters_iter (this->iters_); @@ -182,16 +182,16 @@ TAO_Offer_Iterator_Collection::destroy (void) } CORBA::ULong -TAO_Offer_Iterator_Collection::max_left (void) +TAO_Offer_Iterator_Collection::max_left () { throw CosTrading::UnknownMaxLeft(); } -TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator (void) +TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator () { } -TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void) +TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator () { int return_value = 0; @@ -207,13 +207,13 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void) } CORBA::ULong -TAO_Offer_Id_Iterator::max_left (void) +TAO_Offer_Id_Iterator::max_left () { return static_cast<CORBA::ULong> (this->ids_.size ()); } void -TAO_Offer_Id_Iterator::destroy (void) +TAO_Offer_Id_Iterator::destroy () { // Remove self from POA diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index 6e6c27cfb33..c64338e52ed 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -16,7 +16,7 @@ TAO_Service_Type_Repository::TAO_Service_Type_Repository (ACE_Lock* lock) ACE_Lock_Adapter<ACE_Null_Mutex>); } -TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) +TAO_Service_Type_Repository::~TAO_Service_Type_Repository () { { // Make sure not to throw exceptions in destructors... @@ -35,7 +35,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) } CosTradingRepos::ServiceTypeRepository::IncarnationNumber -TAO_Service_Type_Repository::incarnation (void) +TAO_Service_Type_Repository::incarnation () { CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 3d36b2862af..5ca9f7b1236 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Trader_Base::TAO_Trader_Base (void) +TAO_Trader_Base::TAO_Trader_Base () : trading_components_ (*this), import_attributes_ (*this), support_attributes_ (*this), @@ -19,54 +19,54 @@ TAO_Trader_Base::TAO_Trader_Base (void) { } -TAO_Trader_Base::~TAO_Trader_Base (void) +TAO_Trader_Base::~TAO_Trader_Base () { } TAO_Import_Attributes_i & -TAO_Trader_Base::import_attributes (void) +TAO_Trader_Base::import_attributes () { return this->import_attributes_; } const TAO_Import_Attributes_i & -TAO_Trader_Base::import_attributes (void) const +TAO_Trader_Base::import_attributes () const { return this->import_attributes_; } TAO_Support_Attributes_i & -TAO_Trader_Base::support_attributes (void) +TAO_Trader_Base::support_attributes () { return this->support_attributes_; } const TAO_Support_Attributes_i & -TAO_Trader_Base::support_attributes (void) const +TAO_Trader_Base::support_attributes () const { return this->support_attributes_; } TAO_Link_Attributes_i & -TAO_Trader_Base::link_attributes (void) +TAO_Trader_Base::link_attributes () { return this->link_attributes_; } const TAO_Link_Attributes_i & -TAO_Trader_Base::link_attributes (void) const +TAO_Trader_Base::link_attributes () const { return this->link_attributes_; } TAO_Trading_Components_i & -TAO_Trader_Base::trading_components (void) +TAO_Trader_Base::trading_components () { return this->trading_components_; } const TAO_Trading_Components_i & -TAO_Trader_Base::trading_components (void) const +TAO_Trader_Base::trading_components () const { return this->trading_components_; } @@ -157,7 +157,7 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident) return return_value; } -TAO_Lockable::~TAO_Lockable (void) +TAO_Lockable::~TAO_Lockable () { } @@ -172,12 +172,12 @@ TAO_Support_Attributes_i (TAO_Lockable &locker) { } -TAO_Support_Attributes_i::~TAO_Support_Attributes_i (void) +TAO_Support_Attributes_i::~TAO_Support_Attributes_i () { } CORBA::Boolean -TAO_Support_Attributes_i::supports_modifiable_properties (void) const +TAO_Support_Attributes_i::supports_modifiable_properties () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); @@ -193,7 +193,7 @@ supports_modifiable_properties (CORBA::Boolean new_value) } CORBA::Boolean -TAO_Support_Attributes_i::supports_dynamic_properties (void) const +TAO_Support_Attributes_i::supports_dynamic_properties () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); @@ -210,7 +210,7 @@ supports_dynamic_properties (CORBA::Boolean new_value) } CORBA::Boolean -TAO_Support_Attributes_i::supports_proxy_offers (void) const +TAO_Support_Attributes_i::supports_proxy_offers () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); @@ -227,7 +227,7 @@ supports_proxy_offers (CORBA::Boolean new_value) } CosTrading::TypeRepository_ptr -TAO_Support_Attributes_i::type_repos (void) const +TAO_Support_Attributes_i::type_repos () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::TypeRepository::_nil ()); @@ -248,7 +248,7 @@ type_repos (CosTrading::TypeRepository_ptr new_value) } CosTradingRepos::ServiceTypeRepository_ptr -TAO_Support_Attributes_i::service_type_repos (void) const +TAO_Support_Attributes_i::service_type_repos () const { return this->service_type_repos_.ptr (); } @@ -272,12 +272,12 @@ TAO_Import_Attributes_i (TAO_Lockable &locker) } -TAO_Import_Attributes_i::~TAO_Import_Attributes_i (void) +TAO_Import_Attributes_i::~TAO_Import_Attributes_i () { } CORBA::ULong -TAO_Import_Attributes_i::def_search_card (void) const +TAO_Import_Attributes_i::def_search_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->def_search_card_; @@ -295,7 +295,7 @@ TAO_Import_Attributes_i::def_search_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_search_card (void) const +TAO_Import_Attributes_i::max_search_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->max_search_card_; @@ -313,7 +313,7 @@ TAO_Import_Attributes_i::max_search_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::def_match_card (void) const +TAO_Import_Attributes_i::def_match_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->def_match_card_; @@ -331,7 +331,7 @@ TAO_Import_Attributes_i::def_match_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_match_card (void) const +TAO_Import_Attributes_i::max_match_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->max_match_card_; @@ -348,7 +348,7 @@ TAO_Import_Attributes_i::max_match_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::def_return_card (void) const +TAO_Import_Attributes_i::def_return_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->def_return_card_; @@ -366,7 +366,7 @@ TAO_Import_Attributes_i::def_return_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_return_card (void) const +TAO_Import_Attributes_i::max_return_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->max_return_card_; @@ -383,7 +383,7 @@ TAO_Import_Attributes_i::max_return_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_list (void) const +TAO_Import_Attributes_i::max_list () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); return this->max_list_; @@ -397,7 +397,7 @@ TAO_Import_Attributes_i::max_list (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::def_hop_count (void) const +TAO_Import_Attributes_i::def_hop_count () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); return this->def_hop_count_; @@ -415,7 +415,7 @@ TAO_Import_Attributes_i::def_hop_count (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_hop_count (void) const +TAO_Import_Attributes_i::max_hop_count () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); return this->max_hop_count_; @@ -432,7 +432,7 @@ TAO_Import_Attributes_i::max_hop_count (CORBA::ULong new_value) } CosTrading::FollowOption -TAO_Import_Attributes_i::def_follow_policy (void) const +TAO_Import_Attributes_i::def_follow_policy () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); return this->def_follow_policy_; @@ -450,7 +450,7 @@ TAO_Import_Attributes_i::def_follow_policy (CosTrading::FollowOption new_value) } CosTrading::FollowOption -TAO_Import_Attributes_i::max_follow_policy (void) const +TAO_Import_Attributes_i::max_follow_policy () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); return this->max_follow_policy_; @@ -477,12 +477,12 @@ TAO_Trading_Components_i::TAO_Trading_Components_i (TAO_Lockable &locker) { } -TAO_Trading_Components_i::~TAO_Trading_Components_i (void) +TAO_Trading_Components_i::~TAO_Trading_Components_i () { } CosTrading::Lookup_ptr -TAO_Trading_Components_i::lookup_if (void) const +TAO_Trading_Components_i::lookup_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Lookup::_nil ()); @@ -497,7 +497,7 @@ TAO_Trading_Components_i::lookup_if (CosTrading::Lookup_ptr new_value) } CosTrading::Register_ptr -TAO_Trading_Components_i::register_if (void) const +TAO_Trading_Components_i::register_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Register::_nil ()); @@ -512,7 +512,7 @@ TAO_Trading_Components_i::register_if (CosTrading::Register_ptr new_value) } CosTrading::Link_ptr -TAO_Trading_Components_i::link_if (void) const +TAO_Trading_Components_i::link_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Link::_nil ()); @@ -527,7 +527,7 @@ TAO_Trading_Components_i::link_if (CosTrading::Link_ptr new_value) } CosTrading::Proxy_ptr -TAO_Trading_Components_i::proxy_if (void) const +TAO_Trading_Components_i::proxy_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Proxy::_nil ()); @@ -542,7 +542,7 @@ TAO_Trading_Components_i::proxy_if (CosTrading::Proxy_ptr new_value) } CosTrading::Admin_ptr -TAO_Trading_Components_i::admin_if (void) const +TAO_Trading_Components_i::admin_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Admin::_nil ()); @@ -563,12 +563,12 @@ TAO_Link_Attributes_i::TAO_Link_Attributes_i (TAO_Lockable &locker) { } -TAO_Link_Attributes_i::~TAO_Link_Attributes_i (void) +TAO_Link_Attributes_i::~TAO_Link_Attributes_i () { } CosTrading::FollowOption -TAO_Link_Attributes_i::max_link_follow_policy (void) const +TAO_Link_Attributes_i::max_link_follow_policy () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); @@ -661,7 +661,7 @@ TAO_Trader_Factory::TAO_Trader_Factory (int& argc, ACE_TCHAR** argv) } TAO_Trader_Factory::TAO_TRADER * -TAO_Trader_Factory::manufacture_trader (void) +TAO_Trader_Factory::manufacture_trader () { typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex> TRADER; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 7a676905862..67941639ea2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -22,7 +22,7 @@ TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Lookup (void) +TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Lookup () { ACE_GUARD (TRADER_LOCK_TYPE, trader_mon, this->lock_); for (Request_Ids::ITERATOR riter (this->request_ids_); @@ -790,7 +790,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Register (TAO_Trader<TRADER_LO } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Register (void) +TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Register () { } @@ -1162,13 +1162,13 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void) +TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin () { } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Admin::OctetSeq * -TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (void) +TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem () { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0); @@ -1454,7 +1454,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Link (TAO_Trader<TRADER_LOCK_TYPE, } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Link (void) +TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Link () { } @@ -1564,7 +1564,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::LinkNameSeq* -TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (void) +TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links () { // Allocate space for the link names. size_t size = this->links_.current_size (); @@ -1632,7 +1632,7 @@ TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Proxy (void) +TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Proxy () { } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 0221981bceb..f252f630e24 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -117,13 +117,13 @@ TAO_Policy_Creator::request_id (const CosTrading::Admin::OctetSeq& request_id) policy.value <<= request_id; } -TAO_Policy_Creator::operator const CosTrading::PolicySeq& (void) const +TAO_Policy_Creator::operator const CosTrading::PolicySeq& () const { return this->policies_; } const CosTrading::PolicySeq& -TAO_Policy_Creator::policy_seq (void) const +TAO_Policy_Creator::policy_seq () const { return this->policies_; } @@ -214,7 +214,7 @@ TAO_Property_Evaluator(CosTrading::Offer& offer, this->dp_cache_[i] = 0; } -TAO_Property_Evaluator::~TAO_Property_Evaluator (void) +TAO_Property_Evaluator::~TAO_Property_Evaluator () { // Clean up the results of any dynamic properties. for (CORBA::ULong i = 0; i < this->props_.length (); i++) @@ -424,7 +424,7 @@ TAO_Property_Evaluator_By_Name::get_property (const char* property_name) return property; } -TAO_Dynamic_Property::~TAO_Dynamic_Property (void) +TAO_Dynamic_Property::~TAO_Dynamic_Property () { } @@ -462,7 +462,7 @@ construct_dynamic_prop (const char* name, } void -TAO_Dynamic_Property::destroy (void) +TAO_Dynamic_Property::destroy () { if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ()) { @@ -553,7 +553,7 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader, } } -TAO_Policies::~TAO_Policies (void) +TAO_Policies::~TAO_Policies () { } @@ -610,19 +610,19 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol) const } CORBA::ULong -TAO_Policies::search_card (void) const +TAO_Policies::search_card () const { return this->ulong_prop (SEARCH_CARD); } CORBA::ULong -TAO_Policies::match_card (void) const +TAO_Policies::match_card () const { return this->ulong_prop (MATCH_CARD); } CORBA::ULong -TAO_Policies::return_card (void) const +TAO_Policies::return_card () const { return this->ulong_prop (RETURN_CARD); } @@ -679,32 +679,32 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol) const CORBA::Boolean -TAO_Policies::use_modifiable_properties (void) const +TAO_Policies::use_modifiable_properties () const { return this->boolean_prop (USE_MODIFIABLE_PROPERTIES); } CORBA::Boolean -TAO_Policies::use_dynamic_properties (void) const +TAO_Policies::use_dynamic_properties () const { return this->boolean_prop (USE_DYNAMIC_PROPERTIES); } CORBA::Boolean -TAO_Policies::use_proxy_offers (void) const +TAO_Policies::use_proxy_offers () const { return this->boolean_prop (USE_PROXY_OFFERS); } CORBA::Boolean -TAO_Policies::exact_type_match (void) const +TAO_Policies::exact_type_match () const { return this->boolean_prop (EXACT_TYPE_MATCH); } const CosTrading::TraderName* -TAO_Policies::starting_trader (void) const +TAO_Policies::starting_trader () const { const CosTrading::TraderName* trader_name = 0; @@ -731,7 +731,7 @@ TAO_Policies::starting_trader (void) const } CosTrading::FollowOption -TAO_Policies::link_follow_rule (void) const +TAO_Policies::link_follow_rule () const { CosTrading::FollowOption return_value = this->trader_.import_attributes ().def_follow_policy (); @@ -783,13 +783,13 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) con } CORBA::ULong -TAO_Policies::hop_count (void) const +TAO_Policies::hop_count () const { return this->ulong_prop (HOP_COUNT); } const CosTrading::Admin::OctetSeq* -TAO_Policies::request_id (void) const +TAO_Policies::request_id () const { const CosTrading::Admin::OctetSeq* request_id = 0; @@ -1023,7 +1023,7 @@ TAO_Offer_Modifier (const char* type_name, } } -TAO_Offer_Modifier::~TAO_Offer_Modifier (void) +TAO_Offer_Modifier::~TAO_Offer_Modifier () { for (TAO_Typecode_Table::iterator type_iter (this->prop_types_); ! type_iter.done (); @@ -1296,13 +1296,13 @@ TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer) } CORBA::Boolean -TAO_Offer_Filter::ok_to_consider_more (void) +TAO_Offer_Filter::ok_to_consider_more () { return this->search_card_ > 0 && this->match_card_ > 0; } void -TAO_Offer_Filter::matched_offer (void) +TAO_Offer_Filter::matched_offer () { this->match_card_--; this->return_card_--; @@ -1323,19 +1323,19 @@ TAO_Offer_Filter::matched_offer (void) } CORBA::ULong -TAO_Offer_Filter::search_card_remaining (void) const +TAO_Offer_Filter::search_card_remaining () const { return this->search_card_; } CORBA::ULong -TAO_Offer_Filter::match_card_remaining (void) const +TAO_Offer_Filter::match_card_remaining () const { return this->match_card_; } CosTrading::PolicyNameSeq* -TAO_Offer_Filter::limits_applied (void) +TAO_Offer_Filter::limits_applied () { int i = 0; CORBA::ULong size = static_cast<CORBA::ULong> (this->limits_.size ()); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index c321b73ab89..04db9e0e871 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -30,7 +30,7 @@ -TAO_Trading_Loader::TAO_Trading_Loader (void) +TAO_Trading_Loader::TAO_Trading_Loader () : federate_ (0), ior_output_file_ (0), bootstrapper_ (0) @@ -74,7 +74,7 @@ TAO_Trading_Loader::TAO_Trading_Loader (void) } } -TAO_Trading_Loader::~TAO_Trading_Loader (void) +TAO_Trading_Loader::~TAO_Trading_Loader () { // Destructor } @@ -112,7 +112,7 @@ TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Trading_Loader::fini (void) +TAO_Trading_Loader::fini () { try { @@ -178,7 +178,7 @@ TAO_Trading_Loader::fini (void) } int -TAO_Trading_Loader::run (void) +TAO_Trading_Loader::run () { int return_value = this->orb_manager_.run (); @@ -266,7 +266,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, } int -TAO_Trading_Loader::bootstrap_to_federation (void) +TAO_Trading_Loader::bootstrap_to_federation () { // If all traders follow this strategy, it creates a complete graph // of all known traders on a multicast network. @@ -364,7 +364,7 @@ TAO_Trading_Loader::bootstrap_to_federation (void) } int -TAO_Trading_Loader::init_multicast_server (void) +TAO_Trading_Loader::init_multicast_server () { #if defined (ACE_HAS_IP_MULTICAST) // Get reactor instance from TAO. |