diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-09-05 08:22:58 +0200 |
---|---|---|
committer | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 13:16:58 -0500 |
commit | 61a1fbae63918fc59b7d9f2e5b6a902975877078 (patch) | |
tree | 2570a6a513c2c54b6a6b9416b7e26cfdb47569da | |
parent | 8b83b5df37a2bb8c95aa687d0ca799a345fa306e (diff) | |
download | ATCD-61a1fbae63918fc59b7d9f2e5b6a902975877078.tar.gz |
Merge pull request #1912 from knutpett/warning_extra_semi
Remove warnings -Wextra-semi
(cherry picked from commit 1bc30d9abfac4b990a8ca25f43c666f28a8d61d2)
# Conflicts:
# ACE/ace/Null_Barrier.h
# ACE/ace/Null_Condition.h
# ACE/ace/Refcounted_Auto_Ptr.h
-rw-r--r-- | ACE/ace/Asynch_IO.h | 8 | ||||
-rw-r--r-- | ACE/ace/Intrusive_Auto_Ptr.h | 2 | ||||
-rw-r--r-- | ACE/ace/Null_Barrier.h | 6 | ||||
-rw-r--r-- | ACE/ace/Null_Condition.h | 2 | ||||
-rw-r--r-- | ACE/ace/TSS_T.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Timer.h | 2 | ||||
-rw-r--r-- | TAO/tao/Transport_Selection_Guard.h | 8 |
9 files changed, 18 insertions, 20 deletions
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 78db98fcdd0..60cc3f17276 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -840,7 +840,7 @@ public: private: /// Here just to provide an dummpy implementation, since the /// one auto generated by MSVC is flagged as infinitely recursive - void operator= (Result &) {}; + void operator= (Result &) {} }; private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_File &)) @@ -1651,9 +1651,9 @@ public: class ACE_Export Proxy { public: - Proxy (ACE_Handler *handler) : handler_ (handler) {}; - void reset (void) { this->handler_ = 0; }; - ACE_Handler *handler (void) { return this->handler_; }; + Proxy (ACE_Handler *handler) : handler_ (handler) {} + void reset (void) { this->handler_ = 0; } + ACE_Handler *handler (void) { return this->handler_; } private: ACE_Handler *handler_; }; diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h index 36ff94901b8..c7425bf4e81 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.h +++ b/ACE/ace/Intrusive_Auto_Ptr.h @@ -48,7 +48,7 @@ class ACE_Intrusive_Auto_Ptr { protected: /// Used to define a proper boolean conversion for "if (sp) ..." - static void unspecified_bool(ACE_Intrusive_Auto_Ptr<X>***){}; + static void unspecified_bool(ACE_Intrusive_Auto_Ptr<X>***){} typedef void (*unspecified_bool_type)(ACE_Intrusive_Auto_Ptr<X>***); public: diff --git a/ACE/ace/Null_Barrier.h b/ACE/ace/Null_Barrier.h index 50e4e2789ea..7be1409dffa 100644 --- a/ACE/ace/Null_Barrier.h +++ b/ACE/ace/Null_Barrier.h @@ -27,17 +27,17 @@ public: /// Initialize the barrier to synchronize <count> threads. ACE_Null_Barrier (unsigned int, const char * = 0, - void * = 0) {}; + void * = 0) {} /// Default dtor. ~ACE_Null_Barrier (void) {}; /// Block the caller until all <count> threads have called <wait> and /// then allow all the caller threads to continue in parallel. - int wait (void) { return 0; }; + int wait () { return 0; } /// Dump the state of an object. - void dump (void) const {}; + void dump () const {} /// Declare the dynamic allocation hooks. //ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h index a86e0c54bec..3e6bd4d2039 100644 --- a/ACE/ace/Null_Condition.h +++ b/ACE/ace/Null_Condition.h @@ -66,7 +66,7 @@ public: /// Returns 0. int broadcast (void) {return 0;} - ACE_Null_Mutex &mutex (void) {return this->mutex_;}; + ACE_Null_Mutex &mutex () {return this->mutex_;} /// Dump the state of an object. void dump (void) const {} diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index d3097d54439..203a7ad1ded 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -237,11 +237,11 @@ public: /// TYPE conversion. Inlined here so that it should _always_ be /// inlined. - operator TYPE () const { return value_; }; + operator TYPE () const { return value_; } /// TYPE & conversion. Inlined here so that it should _always_ be /// inlined. - operator TYPE &() { return value_; }; + operator TYPE &() { return value_; } private: /// The wrapped value. diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h index 621833f7ec4..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/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 80a774bfcd4..7ee05a895c7 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(void) { destroy_interceptors(); - }; + } }; struct FTEC_Gateway_Impl @@ -264,7 +264,6 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin() RtecEventChannelAdmin::ProxyPushSupplier_ptr FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void) { - 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); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer.h b/TAO/orbsvcs/orbsvcs/Notify/Timer.h index f60d6788010..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, diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h index fbc520aea4e..4c804211cd8 100644 --- a/TAO/tao/Transport_Selection_Guard.h +++ b/TAO/tao/Transport_Selection_Guard.h @@ -70,26 +70,26 @@ namespace TAO TAO_Transport* operator-> (void) const { return this->get (); - }; + } /// getter TAO_Transport& operator* (void) const { return *this->get (); - }; + } /// Getter TAO_Transport* get (void) 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) |