Skip to content

Commit

Permalink
Layout changes, use default for empty destructors
Browse files Browse the repository at this point in the history 
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h:
    * TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp:
    * TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h:
    * TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
  • Loading branch information
@jwillemsen
jwillemsen committed Jan 27, 2025
1 parent fd8a756 commit 1ce080f
Show file tree
Hide file tree
Showing 29 changed files with 28 additions and 95 deletions.
7 changes: 1 addition & 6 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@ TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec)
push_admin_ (ec),
pull_admin_ (ec)
{
this->default_POA_ =
this->event_channel_->consumer_poa ();
}

TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin ()
{
this->default_POA_ = this->event_channel_->consumer_poa ();
}

void
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin
TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel);

/// Destructor...
virtual ~TAO_CEC_ConsumerAdmin ();
virtual ~TAO_CEC_ConsumerAdmin () = default;

/// For each elements call <worker->work()>.
void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerControl
TAO_CEC_ConsumerControl ();

/// Destructor
virtual ~TAO_CEC_ConsumerControl ();
virtual ~TAO_CEC_ConsumerControl () = default;

/// Activate any internal threads or timers used to poll the state of
/// the consumers
Expand Down
8 changes: 4 additions & 4 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL

TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory ()
{
if (orbid_dupped_ != 0)
{
ACE_OS::free (orbid_);
}
if (orbid_dupped_ != 0)
{
ACE_OS::free (orbid_);
}
}

int
Expand Down
5 changes: 0 additions & 5 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@

TAO_BEGIN_VERSIONED_NAMESPACE_DECL

// Destructor
TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer ()
{
}

// The DSI invoke request
void
TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request)
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation
TAO_CEC_TypedEventChannel *typed_event_channel);

/// Destructor
virtual ~TAO_CEC_DynamicImplementationServer ();
virtual ~TAO_CEC_DynamicImplementationServer () = default;

// = The DynamicImplementation methods.
virtual void invoke (CORBA::ServerRequest_ptr request);
Expand Down
5 changes: 0 additions & 5 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ TAO_CEC_Event_Loader::TAO_CEC_Event_Loader () :
// Constructor
}

TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader ()
{
// Destructor
}

int
TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[])
{
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class TAO_Event_Serv_Export TAO_CEC_Event_Loader : public TAO_Object_Loader
TAO_CEC_Event_Loader ();

/// Destructor
~TAO_CEC_Event_Loader ();
~TAO_CEC_Event_Loader () = default;

//@{
/**
Expand Down
3 changes: 1 addition & 2 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* ec,
this->lock_ =
this->event_channel_->create_consumer_lock ();

this->default_POA_ =
this->event_channel_->consumer_poa ();
this->default_POA_ = this->event_channel_->consumer_poa ();

this->event_channel_->get_servant_retry_map ().bind (this, 0);
}
Expand Down
3 changes: 1 addition & 2 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier
this->lock_ =
this->event_channel_->create_supplier_lock ();

this->default_POA_ =
this->event_channel_->supplier_poa ();
this->default_POA_ = this->event_channel_->supplier_poa ();

this->event_channel_->get_servant_retry_map ().bind (this, 0);
}
Expand Down
3 changes: 1 addition & 2 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* ec,
this->lock_ =
this->event_channel_->create_consumer_lock ();

this->default_POA_ =
this->event_channel_->consumer_poa ();
this->default_POA_ = this->event_channel_->consumer_poa ();

this->event_channel_->get_servant_retry_map ().bind (this, 0);
}
Expand Down
4 changes: 0 additions & 4 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ TAO_CEC_Reactive_ConsumerControl::
}
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */

TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl ()
{
}

void
TAO_CEC_Reactive_ConsumerControl::query_consumers ()
{
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */

/// destructor...
virtual ~TAO_CEC_Reactive_ConsumerControl ();
virtual ~TAO_CEC_Reactive_ConsumerControl () = default;

/// Receive the timeout from the adapter
void handle_timeout (const ACE_Time_Value &tv,
Expand Down
4 changes: 0 additions & 4 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ TAO_CEC_Reactive_SupplierControl::
}
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */

TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl ()
{
}

void
TAO_CEC_Reactive_SupplierControl::query_suppliers ()
{
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */

/// destructor...
virtual ~TAO_CEC_Reactive_SupplierControl ();
virtual ~TAO_CEC_Reactive_SupplierControl () = default;

/// Receive the timeout from the adapter
void handle_timeout (const ACE_Time_Value &tv,
Expand Down
7 changes: 1 addition & 6 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
push_admin_ (ec),
pull_admin_ (ec)
{
this->default_POA_ =
this->event_channel_->supplier_poa ();
}

TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin ()
{
this->default_POA_ = this->event_channel_->supplier_poa ();
}

PortableServer::POA_ptr
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin
TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel* event_channel);

/// destructor...
virtual ~TAO_CEC_SupplierAdmin ();
virtual ~TAO_CEC_SupplierAdmin () = default;

/// For each elements call <worker->work()>.
void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker);
Expand Down
8 changes: 0 additions & 8 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

TAO_BEGIN_VERSIONED_NAMESPACE_DECL

TAO_CEC_SupplierControl::TAO_CEC_SupplierControl ()
{
}

TAO_CEC_SupplierControl::~TAO_CEC_SupplierControl ()
{
}

int
TAO_CEC_SupplierControl::activate ()
{
Expand Down
4 changes: 2 additions & 2 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ class TAO_Event_Serv_Export TAO_CEC_SupplierControl
{
public:
/// Constructor
TAO_CEC_SupplierControl ();
TAO_CEC_SupplierControl () = default;

/// destructor...
virtual ~TAO_CEC_SupplierControl ();
virtual ~TAO_CEC_SupplierControl () = default;

/// Activate any internal threads or timers used to poll the state of
/// the suppliers
Expand Down
8 changes: 1 addition & 7 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@ TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChanne
: typed_event_channel_ (ec),
typed_push_admin_ (ec)
{
this->default_POA_ =
this->typed_event_channel_->typed_consumer_poa ();
}

// Implementation skeleton destructor
TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin ()
{
this->default_POA_ = this->typed_event_channel_->typed_consumer_poa ();
}

void
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin
TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel* typed_event_channel);

// Destructor
virtual ~TAO_CEC_TypedConsumerAdmin ();
virtual ~TAO_CEC_TypedConsumerAdmin () = default;

/// For each elements call <worker->work()>.
void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
Expand Down
4 changes: 2 additions & 2 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,10 @@ class TAO_Event_Serv_Export TAO_CEC_Param
{
public:
/// Constructor
TAO_CEC_Param ();
TAO_CEC_Param () = default;

/// Destructor
~TAO_CEC_Param ();
~TAO_CEC_Param () = default;

private:
/// Only the TypedEventChannel can read the private fields.
Expand Down
10 changes: 0 additions & 10 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,6 @@ TAO_CEC_TypedEventChannel::get_servant_retry_map ()
return this->retry_map_;
}

ACE_INLINE
TAO_CEC_Param::TAO_CEC_Param ()
{
}

ACE_INLINE
TAO_CEC_Param::~TAO_CEC_Param ()
{
}

ACE_INLINE
TAO_CEC_Operation_Params::TAO_CEC_Operation_Params (CORBA::ULong num_params)
: num_params_ (num_params)
Expand Down
6 changes: 2 additions & 4 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer
refcount_ (1),
connected_ (0)
{
this->lock_ =
this->typed_event_channel_->create_consumer_lock ();
this->lock_ = this->typed_event_channel_->create_consumer_lock ();

this->default_POA_ =
this->typed_event_channel_->typed_consumer_poa ();
this->default_POA_ = this->typed_event_channel_->typed_consumer_poa ();

this->typed_event_channel_->get_servant_retry_map ().bind (this, 0);

Expand Down
8 changes: 1 addition & 7 deletions TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChanne
: typed_event_channel_ (ec),
typed_push_admin_ (ec)
{
this->default_POA_ =
this->typed_event_channel_->typed_supplier_poa ();
}

// Implementation skeleton destructor
TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin ()
{
this->default_POA_ = this->typed_event_channel_->typed_supplier_poa ();
}

PortableServer::POA_ptr
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class TAO_Event_Serv_Export TAO_CEC_TypedSupplierAdmin
TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChannel* event_channel);

/// Destructor
virtual ~TAO_CEC_TypedSupplierAdmin ();
virtual ~TAO_CEC_TypedSupplierAdmin () = default;

/// For each elements call <worker->work()>.
void for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker);
Expand Down
4 changes: 0 additions & 4 deletions TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ TAO_EC_Default_ProxyPushConsumer::
{
}

TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer ()
{
}

void
TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
RtecEventComm::PushSupplier_ptr push_supplier,
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushConsumer :
TAO_EC_Default_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);

/// Destructor...
virtual ~TAO_EC_Default_ProxyPushConsumer ();
virtual ~TAO_EC_Default_ProxyPushConsumer () = default;

virtual void activate (
RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy);
Expand Down
2 changes: 1 addition & 1 deletion TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel :
* the Factory, if not found it uses TAO_EC_Default_Factory
*/
TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attributes,
TAO_EC_Factory* factory = 0,
TAO_EC_Factory* factory = nullptr,
int own_factory = 0);
};

Expand Down

0 comments on commit 1ce080f

Please sign in to comment.