Layout changes

    * TAO/tao/PI/ClientRequestDetails.h:
    * TAO/tao/PI/ClientRequestInfo.h:
    * TAO/tao/PI/DLL_Resident_ORB_Initializer.h:
    * TAO/tao/PI/ORBInitializer_Registry_Impl.h:
    * TAO/tao/PI/PICurrent.cpp:
    * TAO/tao/PI/PICurrent.h:
    * TAO/tao/PI/PICurrent_Impl.h:
    * TAO/tao/PI/PI_ORBInitializer.cpp:
    * TAO/tao/PI/PI_ORBInitializer.h:
    * TAO/tao/PI/PI_PolicyFactory.h:
    * TAO/tao/PI/PolicyFactory_Registry.h:
    * TAO/tao/PI/ProcessingModePolicy.cpp:

12 files changed, 13 insertions, 34 deletions

diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index 20bea1628e7..9907aa92961 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -49,7 +49,6 @@ namespace TAO
   class ClientRequestDetails
   {
   public:
-
     ClientRequestDetails ();
 
     void apply_policies (const CORBA::PolicyList& policies);
@@ -61,7 +60,6 @@ namespace TAO
     bool should_be_processed (bool is_remote_request) const;
 
   private:
-
     /// The ProcessingMode setting that can be adjusted via the
     /// PortableInterceptor::ProcessingModePolicy.
     PortableInterceptor::ProcessingMode processing_mode_;
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 00f692f7ffc..a6e1175950e 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -189,7 +189,6 @@ public:
   */
 
 private:
-
   bool parameter_list (Dynamic::ParameterList &param_list);
 
   bool exception_list (Dynamic::ExceptionList &exception_list);
diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
index 338bfbf4f58..306e088b265 100644
--- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
+++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h
@@ -51,13 +51,9 @@ namespace PortableInterceptor
         const ACE_TCHAR * dll_name);
       virtual ~DLL_Resident_ORB_Initializer ();
 
-      virtual void pre_init (
-        ::PortableInterceptor::ORBInitInfo_ptr info
-      );
+      virtual void pre_init (::PortableInterceptor::ORBInitInfo_ptr info);
 
-    virtual void post_init (
-        ::PortableInterceptor::ORBInitInfo_ptr info
-      );
+    virtual void post_init (::PortableInterceptor::ORBInitInfo_ptr info);
 
   private:
     PortableInterceptor::ORBInitializer_var initializer_;
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index f6c9de7cd2c..27a64f9c5dc 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -81,8 +81,8 @@ namespace TAO
 
   private:
     // Prevent copying
-    ORBInitializer_Registry (const ORBInitializer_Registry &);
-    void operator= (const ORBInitializer_Registry &);
+    ORBInitializer_Registry (const ORBInitializer_Registry &) = delete;
+    void operator= (const ORBInitializer_Registry &) = delete;
 
   private:
     TAO_SYNCH_RECURSIVE_MUTEX lock_;
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 2a673e1eb3f..2c46b826a30 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -20,10 +20,6 @@ TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core)
 {
 }
 
-TAO::PICurrent::~PICurrent (void)
-{
-}
-
 CORBA::Any *
 TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier)
 {
@@ -57,7 +53,7 @@ TAO::PICurrent::tsc (void)
       this->orb_core_.get_tss_resource (this->tss_slot_));
 
   // If this TSS has not yet been set-up, give it it's own PICurrent_Impl.
-  if (0 == impl)
+  if (!impl)
   {
     ACE_NEW_THROW_EX (impl,
                       TAO::PICurrent_Impl (&this->orb_core_, this->tss_slot_),
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index ec3098c6615..78ae7d699ec 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -98,14 +98,14 @@ namespace TAO
      * counted, and should not be destroyed using delete() by anything
      * other than the reference counting mechanism.
      */
-    virtual ~PICurrent ();
+    virtual ~PICurrent () = default;
 
   private:
     /// Prevent copying through the copy constructor and the assignment
     /// operator.
     //@{
-    PICurrent (const PICurrent &);
-    void operator= (const PICurrent &);
+    PICurrent (const PICurrent &) = delete;
+    void operator= (const PICurrent &) = delete;
     //@}
 
   private:
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 785f7575416..7819fdda9cc 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -97,8 +97,8 @@ namespace TAO
     /// Prevent copying through the copy constructor and the assignment
     /// operator.
     //@{
-    PICurrent_Impl (const PICurrent_Impl &);
-    void operator= (const PICurrent_Impl &);
+    PICurrent_Impl (const PICurrent_Impl &) = delete;
+    void operator= (const PICurrent_Impl &) = delete;
     //@}
 
   private:
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
index 5aa02eea3a9..123d4f54ea8 100644
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ b/TAO/tao/PI/PI_ORBInitializer.cpp
@@ -16,7 +16,6 @@ TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
 {
 }
 
-
 void
 TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
 {
@@ -39,7 +38,6 @@ TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   this->register_policy_factories (info);
 }
 
-
 void
 TAO_PI_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info)
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index 082f9a3fdc5..8a7af55048d 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -37,7 +37,6 @@ class TAO_PI_Export TAO_PI_ORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name PortableInterceptor::ORBInitializer methods
    *
@@ -51,7 +50,6 @@ public:
   //@}
 
 private:
-
   /// Register PortableInterceptor policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index fac7f3071af..85236c1f2cf 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -34,8 +34,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory
     public virtual ::CORBA::LocalObject
 {
 public:
-  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value);
+  CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index ddd26b87151..942851d3e97 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -39,7 +39,6 @@ class TAO_PolicyFactory_Registry
   : public TAO::PolicyFactory_Registry_Adapter
 {
 public:
-
   /**
    * The type of table that maps policy type to policy factory.
    *
@@ -51,11 +50,9 @@ public:
    */
   typedef ACE_Map_Manager<CORBA::PolicyType,
                           PortableInterceptor::PolicyFactory_ptr,
-                          ACE_Null_Mutex>
-    TABLE;
+                          ACE_Null_Mutex> TABLE;
 
 public:
-
   /// Constructor
   TAO_PolicyFactory_Registry (void);
 
@@ -83,10 +80,8 @@ public:
   bool factory_exists (CORBA::PolicyType & type) const;
 
 private:
-
   /// The table that maps policy type to policy factory.
   TABLE factories_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 046e5014ac4..60906fdddf0 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -19,7 +19,7 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
 CORBA::Policy_ptr
 TAO_ProcessingModePolicy::copy (void)
 {
-  TAO_ProcessingModePolicy *copy = 0;
+  TAO_ProcessingModePolicy *copy {};
   ACE_NEW_THROW_EX (copy,
                     TAO_ProcessingModePolicy (this->processing_mode_),
                     CORBA::NO_MEMORY ());