From 023da962da06c7c6ab4e801d7a5861ef21ca9577 Mon Sep 17 00:00:00 2001 From: Knut Petter Svendsen Date: Mon, 29 Aug 2022 16:20:38 +0200 Subject: Remove warnings -Wextra-semi --- TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h | 2 +- TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Timer.h | 2 +- TAO/tao/Transport_Selection_Guard.h | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'TAO') diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h index 621833f7ec4..54e649f4067 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_FTEC_Fault_Listener { public: - virtual ~TAO_FTEC_Fault_Listener(){}; + virtual ~TAO_FTEC_Fault_Listener(){} virtual void connection_closed()=0; }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index c2d71044d19..c26c2d9f827 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -93,7 +93,7 @@ private: Interceptor_Destoryer(); inline void do_it() { destroy_interceptors(); - }; + } }; struct FTEC_Gateway_Impl diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index f60d6788010..ebeefee7e81 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h @@ -36,7 +36,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable public: typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer > Ptr; /// Destructor - virtual ~TAO_Notify_Timer (){}; + virtual ~TAO_Notify_Timer (){} /// Schedule a timer virtual long schedule_timer (ACE_Event_Handler *handler, diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h index 293182d094f..d33a8469d77 100644 --- a/TAO/tao/Transport_Selection_Guard.h +++ b/TAO/tao/Transport_Selection_Guard.h @@ -70,26 +70,26 @@ namespace TAO TAO_Transport* operator-> () const { return this->get (); - }; + } /// getter TAO_Transport& operator* () const { return *this->get (); - }; + } /// Getter TAO_Transport* get () const { return this->curr_; - }; + } /// Setter Transport_Selection_Guard& set (TAO_Transport* t) { this->curr_ = t; return *this; - }; + } Transport_Selection_Guard& operator=(const Transport_Selection_Guard& rhs) { if (this != &rhs) -- cgit v1.2.1 From 18bda4f07b8a8fde245f26afe8772a4c650d0773 Mon Sep 17 00:00:00 2001 From: Knut Petter Svendsen Date: Tue, 30 Aug 2022 10:41:19 +0200 Subject: Use default constructor --- TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Timer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'TAO') diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h index 54e649f4067..98136c537d7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_FTEC_Fault_Listener { public: - virtual ~TAO_FTEC_Fault_Listener(){} + virtual ~TAO_FTEC_Fault_Listener() = default; virtual void connection_closed()=0; }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index ebeefee7e81..afcfc6e2e7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h @@ -36,7 +36,7 @@ class TAO_Notify_Serv_Export TAO_Notify_Timer : public TAO_Notify_Refcountable public: typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Timer > Ptr; /// Destructor - virtual ~TAO_Notify_Timer (){} + virtual ~TAO_Notify_Timer () = default; /// Schedule a timer virtual long schedule_timer (ACE_Event_Handler *handler, -- cgit v1.2.1 From 56377d8db17268f480e3800b020cbd5df5c1afab Mon Sep 17 00:00:00 2001 From: Knut Petter Svendsen Date: Tue, 30 Aug 2022 10:43:31 +0200 Subject: Fix issues found by CodeFactor: blank line CodeFactor reported: Redundant blank line at the start of a code block should be deleted --- TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'TAO') diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index c26c2d9f827..a3475e27e79 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -264,7 +264,6 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin() RtecEventChannelAdmin::ProxyPushSupplier_ptr FTEC_Gateway_ConsumerAdmin::obtain_push_supplier () { - FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY()); @@ -341,7 +340,6 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos) { - FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos); -- cgit v1.2.1