diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log')
23 files changed, 114 insertions, 114 deletions
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..d2e0a1955cc 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. } @@ -45,7 +45,7 @@ TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */) CosEventChannelAdmin::EventChannel_var ec_return; - auto_ptr <TAO_CEC_EventChannel> ec (impl); + std::unique_ptr <TAO_CEC_EventChannel> ec (impl); PortableServer::ObjectId_var oid = this->poa_->activate_object (ec.get ()); @@ -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..60e527cd359 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, @@ -168,7 +168,7 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action, ), CORBA::NO_MEMORY ()); - auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl); + std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl); if (this->hash_map_.bind (id, recordstore.get ()) != 0) { @@ -205,7 +205,7 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id, ), CORBA::NO_MEMORY ()); - auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl); + std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl); if (this->hash_map_.bind (id, recordstore.get ()) != 0) { 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..3b689030332 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) { @@ -46,7 +46,7 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb, TAO_EC_Event_Channel (attr), CORBA::NO_MEMORY ()); - auto_ptr <TAO_EC_Event_Channel> ec (impl); + std::unique_ptr <TAO_EC_Event_Channel> ec (impl); impl->activate (); @@ -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(); } |