Merge pull request #1912 from knutpett/warning_extra_semi

Remove warnings -Wextra-semi

4 files changed, 7 insertions, 9 deletions

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 c2d71044d19..a3475e27e79 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
@@ -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);
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 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)