Removed redundant void, use delete, layout changes

    * TAO/tao/RTScheduling/Current.cpp:
    * TAO/tao/RTScheduling/Current.h:
    * TAO/tao/RTScheduling/Distributable_Thread.h:
    * TAO/tao/RTScheduling/RTScheduler.cpp:
    * TAO/tao/RTScheduling/RTScheduler.h:
    * TAO/tao/RTScheduling/RTScheduler_Loader.h:
    * TAO/tao/RTScheduling/RTScheduler_Manager.cpp:
    * TAO/tao/RTScheduling/RTScheduler_Manager.h:

8 files changed, 50 insertions, 86 deletions

diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 4cb6456e278..2c23be762b7 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -20,12 +20,7 @@ TAO_DTId_Hash::operator () (const IdType &id) const
                         id.length ());
 }
 
-TAO_RTScheduler_Current::TAO_RTScheduler_Current (void) :
-  orb_ (0)
-{
-}
-
-TAO_RTScheduler_Current::~TAO_RTScheduler_Current (void)
+TAO_RTScheduler_Current::~TAO_RTScheduler_Current ()
 {
 }
 
@@ -52,18 +47,17 @@ TAO_RTScheduler_Current::rt_current (RTCORBA::Current_ptr rt_current)
 }
 
 TAO_ORB_Core*
-TAO_RTScheduler_Current::orb (void)
+TAO_RTScheduler_Current::orb ()
 {
   return this->orb_;
 }
 
 DT_Hash_Map*
-TAO_RTScheduler_Current::dt_hash (void)
+TAO_RTScheduler_Current::dt_hash ()
 {
   return &this->dt_hash_;
 }
 
-
 void
 TAO_RTScheduler_Current::begin_scheduling_segment (
     const char * name,
@@ -91,7 +85,6 @@ TAO_RTScheduler_Current::begin_scheduling_segment (
                                   implicit_sched_param);
 }
 
-
 void
 TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
                                                     CORBA::Policy_ptr sched_param,
@@ -137,7 +130,6 @@ TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id)
 // returns a null reference if
 // the distributable thread is
 // not known to the local scheduler
-
 RTScheduling::DistributableThread_ptr
 TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
                                 CORBA::VoidData data,
@@ -243,19 +235,19 @@ TAO_RTScheduler_Current::implementation (void)
 }
 
 TAO_ORB_Core*
-TAO_RTScheduler_Current_i::orb (void)
+TAO_RTScheduler_Current_i::orb ()
 {
   return this->orb_;
 }
 
 DT_Hash_Map*
-TAO_RTScheduler_Current_i::dt_hash (void)
+TAO_RTScheduler_Current_i::dt_hash ()
 {
   return this->dt_hash_;
 }
 
  RTScheduling::Scheduler_ptr
-TAO_RTScheduler_Current_i::scheduler (void)
+TAO_RTScheduler_Current_i::scheduler ()
 {
   return RTScheduling::Scheduler::_duplicate (this->scheduler_.in ());
 }
@@ -299,7 +291,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
   this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ());
 }
 
-TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void)
+TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i ()
 {
 }
 
@@ -447,7 +439,6 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
     }
 }
 
-
 // returns a null reference if
 // the distributable thread is
 // not known to the local scheduler
@@ -574,13 +565,13 @@ DTTask::DTTask (TAO_ORB_Core *orb,
 {
 }
 
-DTTask::~DTTask (void)
+DTTask::~DTTask ()
 {
   delete this->current_;
 }
 
 int
-DTTask::svc (void)
+DTTask::svc ()
 {
   try
     {
@@ -609,7 +600,7 @@ DTTask::svc (void)
 }
 
 RTScheduling::Current::IdType *
-TAO_RTScheduler_Current_i::id (void)
+TAO_RTScheduler_Current_i::id ()
 {
 
   RTScheduling::Current::IdType_var guid = this->guid_;
@@ -618,13 +609,13 @@ TAO_RTScheduler_Current_i::id (void)
 
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current_i::scheduling_parameter (void)
+TAO_RTScheduler_Current_i::scheduling_parameter ()
 {
   return CORBA::Policy::_duplicate (this->sched_param_.in ());
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current_i::implicit_scheduling_parameter (void)
+TAO_RTScheduler_Current_i::implicit_scheduling_parameter ()
 {
   return CORBA::Policy::_duplicate (this->implicit_sched_param_.in ());
 }
@@ -650,7 +641,7 @@ TAO_RTScheduler_Current_i::current_scheduling_segment_names (void)
 }
 
 const char*
-TAO_RTScheduler_Current_i::name (void)
+TAO_RTScheduler_Current_i::name ()
 {
   return this->name_.in ();
 }
@@ -660,7 +651,7 @@ TAO_RTScheduler_Current_i::name (void)
 #endif /* THREAD_CANCELLED */
 
 void
-TAO_RTScheduler_Current_i::cancel_thread (void)
+TAO_RTScheduler_Current_i::cancel_thread ()
 {
   size_t guid;
   ACE_OS::memcpy (&guid,
@@ -685,14 +676,14 @@ TAO_RTScheduler_Current_i::cancel_thread (void)
 }
 
 void
-TAO_RTScheduler_Current_i::cleanup_DT (void)
+TAO_RTScheduler_Current_i::cleanup_DT ()
 {
   // Remove DT from map.
   this->dt_hash_->unbind (this->guid_);
 }
 
 void
-TAO_RTScheduler_Current_i::cleanup_current (void)
+TAO_RTScheduler_Current_i::cleanup_current ()
 {
   TAO_TSS_Resources *tss =
     TAO_TSS_Resources::instance ();
@@ -704,7 +695,7 @@ TAO_RTScheduler_Current_i::cleanup_current (void)
 }
 
 void
-TAO_RTScheduler_Current_i::delete_all_currents (void)
+TAO_RTScheduler_Current_i::delete_all_currents ()
 {
   TAO_RTScheduler_Current_i* current = this;
 
@@ -734,7 +725,7 @@ TAO_RTScheduler_Current_i::name (const char * name)
 }
 
 RTScheduling::DistributableThread_ptr
-TAO_RTScheduler_Current_i::DT (void)
+TAO_RTScheduler_Current_i::DT ()
 {
   return this->dt_._retn ();
 }
@@ -763,7 +754,6 @@ TAO_RTScheduler_Current_i::implicit_scheduling_parameter (CORBA::Policy_ptr impl
 // *************************************************************
 // Operations for class TAO_RTScheduler_Current_var
 // *************************************************************
-
 TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var () // default constructor
   : ptr_ (TAO_RTScheduler_Current::_nil ())
 {}
@@ -826,13 +816,13 @@ TAO_RTScheduler_Current_var::in () const
 }
 
 TAO_RTScheduler_Current_ptr &
-TAO_RTScheduler_Current_var::inout (void)
+TAO_RTScheduler_Current_var::inout ()
 {
   return this->ptr_;
 }
 
 TAO_RTScheduler_Current_ptr &
-TAO_RTScheduler_Current_var::out (void)
+TAO_RTScheduler_Current_var::out ()
 {
   ::CORBA::release (this->ptr_);
   this->ptr_ = ::TAO_RTScheduler_Current::_nil ();
@@ -840,7 +830,7 @@ TAO_RTScheduler_Current_var::out (void)
 }
 
 TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::_retn (void)
+TAO_RTScheduler_Current_var::_retn ()
 {
   // yield ownership of managed obj reference
   ::TAO_RTScheduler_Current_ptr val = this->ptr_;
@@ -861,7 +851,7 @@ TAO_RTScheduler_Current_var::release (TAO_RTScheduler_Current_ptr p)
 }
 
 TAO_RTScheduler_Current_ptr
-TAO_RTScheduler_Current_var::nil (void)
+TAO_RTScheduler_Current_var::nil ()
 {
   return ::TAO_RTScheduler_Current::_nil ();
 }
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 3cba1c6667b..6909f5cd262 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -3,12 +3,9 @@
 //=============================================================================
 /**
  *  @file   Current.h
- *
- *  @author
  */
 //=============================================================================
 
-
 #ifndef TAO_RTSCHEDULER_CURRENT_H
 #define TAO_RTSCHEDULER_CURRENT_H
 
@@ -44,12 +41,10 @@ typedef TAO::unbounded_value_sequence<CORBA::Octet> IdType;
 class TAO_RTScheduler_Export TAO_DTId_Hash
 {
 public:
-
   /// Returns hash value.
   u_long operator () (const IdType &id) const;
 };
 
-
 typedef ACE_Hash_Map_Manager_Ex<IdType,
                                 RTScheduling::DistributableThread_var,
                                 TAO_DTId_Hash,
@@ -80,12 +75,12 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
  public:
   static std::atomic<long> guid_counter;
 
-  TAO_RTScheduler_Current (void);
-  virtual ~TAO_RTScheduler_Current (void);
+  TAO_RTScheduler_Current () = default;
+  virtual ~TAO_RTScheduler_Current ();
 
   void init (TAO_ORB_Core* orb);
 
-  virtual RTCORBA::Priority the_priority (void);
+  virtual RTCORBA::Priority the_priority ();
 
   virtual void the_priority (RTCORBA::Priority the_priority);
 
@@ -155,15 +150,12 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
   virtual const char* _interface_repository_id () const;
   //@}
 
- private:
+private:
   RTCORBA::Current_var rt_current_;
-  TAO_ORB_Core* orb_;
+  TAO_ORB_Core* orb_ {};
   DT_Hash_Map dt_hash_;
-
 };
 
-
-
 /**
  * @class TAO_RTScheduler_Current_var
  */
@@ -199,19 +191,14 @@ public:
   static CORBA::Object * upcast (void *);
 
 private:
-
   TAO_RTScheduler_Current_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  TAO_RTScheduler_Current_var (const TAO_Base_var &rhs);
-  TAO_RTScheduler_Current_var &operator= (const TAO_Base_var &rhs);
-
+  TAO_RTScheduler_Current_var (const TAO_Base_var &rhs) = delete;
+  TAO_RTScheduler_Current_var &operator= (const TAO_Base_var &rhs) = delete;
 };
 
-
 class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
 {
- public:
-
+public:
   TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
                              DT_Hash_Map* dt_hash);
 
@@ -224,7 +211,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
                              RTScheduling::DistributableThread_ptr dt,
                              TAO_RTScheduler_Current_i* prev_current);
 
-  virtual ~TAO_RTScheduler_Current_i (void);
+  virtual ~TAO_RTScheduler_Current_i ();
 
   virtual RTScheduling::DistributableThread_ptr
     spawn (RTScheduling::ThreadAction_ptr start,
@@ -283,7 +270,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
   RTScheduling::DistributableThread_ptr DT (void);
   void DT (RTScheduling::DistributableThread_ptr);
 
- private:
+private:
   RTScheduling::Scheduler_var scheduler_;
   TAO_ORB_Core* orb_;
   RTScheduling::Current::IdType guid_;
@@ -308,14 +295,14 @@ public:
           CORBA::Policy_ptr sched_param,
           CORBA::Policy_ptr implicit_sched_param);
 
-  virtual ~DTTask (void);
+  virtual ~DTTask ();
 
   int activate_task (RTCORBA::Priority base_priority,
                      CORBA::ULong stack_size);
 
   virtual int svc ();
 
- private:
+private:
   TAO_ORB_Core* orb_;
   // DT_Hash_Map* dt_hash_;
   TAO_RTScheduler_Current_i* current_;
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
index dd4b9ccab81..b980148eee7 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -12,16 +12,15 @@ class TAO_RTScheduler_Export TAO_DistributableThread:
   public RTScheduling::DistributableThread,
   public ::CORBA::LocalObject
 {
- public:
+public:
   TAO_DistributableThread () = default;
-
   ~TAO_DistributableThread () = default;
 
   void cancel () override;
 
   RTScheduling::DistributableThread::DT_State state () override;
 
- private:
+private:
   RTScheduling::DistributableThread::DT_State state_ {RTScheduling::DistributableThread::ACTIVE};
 };
 
diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp
index 938f09b7d94..8411950e393 100644
--- a/TAO/tao/RTScheduling/RTScheduler.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer (void)
+TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer ()
 {
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_RTScheduler_Loader);
 }
diff --git a/TAO/tao/RTScheduling/RTScheduler.h b/TAO/tao/RTScheduling/RTScheduler.h
index 2ac1e1cb8c2..623cdccc9ed 100644
--- a/TAO/tao/RTScheduling/RTScheduler.h
+++ b/TAO/tao/RTScheduling/RTScheduler.h
@@ -28,7 +28,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Initializer
 {
 public:
   // Constructor.
-  TAO_RTScheduler_Initializer (void);
+  TAO_RTScheduler_Initializer ();
 };
 
 static TAO_RTScheduler_Initializer TAO_RTScheduler_initializer;
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.h b/TAO/tao/RTScheduling/RTScheduler_Loader.h
index 2aabc43029e..e90fc3515b3 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.h
@@ -31,10 +31,10 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Loader : public ACE_Service_Object
 {
 public:
   /// Constructor.
-  TAO_RTScheduler_Loader (void);
+  TAO_RTScheduler_Loader ();
 
   /// Destructor.
-  virtual ~TAO_RTScheduler_Loader (void);
+  virtual ~TAO_RTScheduler_Loader ();
 
   /// Initialize the RTScheduler loader hooks.
   virtual int init (int argc, ACE_TCHAR* []);
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
index c592e98ac50..b0a9b4215b5 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
@@ -7,15 +7,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_RTScheduler_Manager::TAO_RTScheduler_Manager () :
-  orb_ (nullptr)
-{
-}
-
-TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager ()
-{
-}
-
 TAO_RTScheduler_Manager_ptr
 TAO_RTScheduler_Manager::_narrow (CORBA::Object_ptr obj)
 {
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index f3b0513c27f..d0c9ba74930 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -33,14 +33,14 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Manager :
   public virtual ::CORBA::LocalObject
 {
 public:
-  TAO_RTScheduler_Manager (void);
+  TAO_RTScheduler_Manager () = default;
 
   /// Constructor.
   TAO_RTScheduler_Manager (TAO_ORB_Core* orb);
 
   void rtscheduler (RTScheduling::Scheduler_ptr rtscheduler);
 
-  RTScheduling::Scheduler_ptr rtscheduler (void);
+  RTScheduling::Scheduler_ptr rtscheduler ();
 
 public:
   typedef TAO_RTScheduler_Manager_ptr _ptr_type;
@@ -57,16 +57,14 @@ public:
   virtual const char* _interface_repository_id () const;
 
 protected:
-
   /// Protected destructor to enforce proper memory management of this
   /// reference counted object.
-  ~TAO_RTScheduler_Manager (void);
+  ~TAO_RTScheduler_Manager () = default;
 
 private:
-
-  TAO_RTScheduler_Manager (const TAO_RTScheduler_Manager &);
-  void operator= (const TAO_RTScheduler_Manager &);
-  TAO_ORB_Core* orb_;
+  TAO_RTScheduler_Manager (const TAO_RTScheduler_Manager &) = delete;
+  void operator= (const TAO_RTScheduler_Manager &) = delete;
+  TAO_ORB_Core* orb_ {};
 
 private:
   RTScheduling::Scheduler_var rtscheduler_;
@@ -103,10 +101,9 @@ public:
   static CORBA::Object * upcast (void *);
 
 private:
-  /// Unimplemented - prevents widening assignment.
   TAO_RTScheduler_Manager_ptr ptr_;
-  TAO_RTScheduler_Manager_var (const TAO_Base_var &rhs);
-  TAO_RTScheduler_Manager_var &operator= (const TAO_Base_var &rhs);
+  TAO_RTScheduler_Manager_var (const TAO_Base_var &rhs) = delete;
+  TAO_RTScheduler_Manager_var &operator= (const TAO_Base_var &rhs) = delete;
 };
 
 class TAO_RTScheduler_Export TAO_RTScheduler_Manager_out
@@ -119,8 +116,8 @@ public:
   TAO_RTScheduler_Manager_out &operator= (const TAO_RTScheduler_Manager_var &);
   TAO_RTScheduler_Manager_out &operator= (TAO_RTScheduler_Manager_ptr);
   operator TAO_RTScheduler_Manager_ptr &();
-  TAO_RTScheduler_Manager_ptr &ptr (void);
-  TAO_RTScheduler_Manager_ptr operator-> (void);
+  TAO_RTScheduler_Manager_ptr &ptr ();
+  TAO_RTScheduler_Manager_ptr operator-> ();
 
 private:
   TAO_RTScheduler_Manager_ptr &ptr_;