Layout changes and make use of = delete

    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl:
    * TAO/orbsvcs/orbsvcs/Security/Security_Current.h:
    * TAO/tao/CodecFactory/CDR_Encaps_Codec.h:
    * TAO/tao/CodecFactory/CodecFactory_impl.h:
    * TAO/tao/IORInterceptor/IORInfo.h:
    * TAO/tao/PI/ORBInitInfo.h:
    * TAO/tao/PI/PICurrent.h:
    * TAO/tao/PI/PICurrent_Impl.h:
    * TAO/tao/TransportCurrent/Current_Impl.h:
    * TAO/tao/TransportCurrent/IIOP_Current_Impl.h:

13 files changed, 65 insertions, 117 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 403d68751a1..590cf0ebd8c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -130,12 +130,8 @@ namespace TAO
       Current_Impl *implementation (void);
 
     private:
-      /// Prevent copying through the copy constructor and the assignment
-      /// operator.
-      //@{
-      Current (const Current &);
-      void operator= (const Current &);
-      //@}
+      Current (const Current &) = delete;
+      void operator= (const Current &) = delete;
 
     private:
       /// TSS slot assigned to this object.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 1b3a69de58a..56d69d42f8c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -44,10 +44,10 @@ namespace TAO
     {
     public:
       /// Constructor.
-      Current_Impl (void);
+      Current_Impl ();
 
       /// Destructor
-      ~Current_Impl (void);
+      ~Current_Impl ();
 
       /// Implementation of the SSLIOP-specific
       /// SecurityLevel3::client_credentials() method.
@@ -70,19 +70,15 @@ namespace TAO
       void ssl (SSL *s);
 
       /// Return pointer to the SSL session state for the current upcall.
-      SSL *ssl (void);
+      SSL *ssl ();
 
     protected:
       /// Return the unique tag that identifies the concrete subclass.
-      virtual CORBA::ULong tag (void) const;
+      virtual CORBA::ULong tag () const;
 
     private:
-      /// Prevent copying through the copy constructor and the assignment
-      /// operator.
-      //@{
-      Current_Impl (const Current_Impl &);
-      void operator= (const Current_Impl &);
-      //@}
+      Current_Impl (const Current_Impl &) = delete;
+      void operator= (const Current_Impl &) = delete;
 
     private:
       /// The SSL session state corresponding to the current upcall.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
index 6e09aa4eba8..6be0e084d90 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO::SSLIOP::Current_Impl::Current_Impl (void)
+TAO::SSLIOP::Current_Impl::Current_Impl ()
   : ssl_ (0)
 {
 }
@@ -15,7 +15,7 @@ TAO::SSLIOP::Current_Impl::ssl (SSL *s)
 }
 
 ACE_INLINE SSL *
-TAO::SSLIOP::Current_Impl::ssl (void)
+TAO::SSLIOP::Current_Impl::ssl ()
 {
   return this->ssl_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
index 05f856207cb..b796efe0e6e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
@@ -35,31 +35,31 @@ TAO_SSLIOP_Endpoint::iiop_endpoint (TAO_IIOP_Endpoint *iiop_endpoint,
 }
 
 ACE_INLINE const ::SSLIOP::SSL &
-TAO_SSLIOP_Endpoint::ssl_component (void) const
+TAO_SSLIOP_Endpoint::ssl_component (void)const
 {
   return this->ssl_component_;
 }
 
 ACE_INLINE ::Security::QOP
-TAO_SSLIOP_Endpoint::qop (void) const
+TAO_SSLIOP_Endpoint::qop () const
 {
   return this->qop_;
 }
 
 ACE_INLINE ::Security::EstablishTrust
-TAO_SSLIOP_Endpoint::trust (void) const
+TAO_SSLIOP_Endpoint::trust () const
 {
   return this->trust_;
 }
 
 ACE_INLINE TAO::SSLIOP::OwnCredentials *
-TAO_SSLIOP_Endpoint::credentials (void) const
+TAO_SSLIOP_Endpoint::credentials () const
 {
   return this->credentials_.in ();
 }
 
 ACE_INLINE int
-TAO_SSLIOP_Endpoint::credentials_set (void) const
+TAO_SSLIOP_Endpoint::credentials_set () const
 {
   return this->credentials_set_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index fd7d5569c36..848378452a3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -47,7 +47,6 @@ class TAO_Security_Export TAO_Security_Current
     public ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_Security_Current (size_t tss_slot, const char *orb_id);
 
@@ -84,7 +83,6 @@ public:
   size_t tss_slot (void) const;
 
 protected:
-
   /// Destructor
   /// Protected to force allocation on the heap.
   ~TAO_Security_Current (void);
@@ -106,16 +104,10 @@ protected:
   TAO::Security::Current_Impl *implementation (void);
 
 private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  //@{
-  TAO_Security_Current (const TAO_Security_Current &);
-  void operator= (const TAO_Security_Current &);
-  //@}
+  TAO_Security_Current (const TAO_Security_Current &) = delete;
+  void operator= (const TAO_Security_Current &) = delete;
 
 private:
-
   /// TSS slot assigned to this object.
   size_t const tss_slot_;
 
@@ -125,7 +117,6 @@ private:
   /// Pointer to the ORB Core corresponding to the ORB with which this
   /// object is registered.
   TAO_ORB_Core * orb_core_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 74a9c76c8aa..38e0722bc1c 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -88,10 +88,8 @@ protected:
   void check_type_for_encoding (const CORBA::Any & data);
 
 private:
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &);
-  void operator= (const TAO_CDR_Encaps_Codec &);
+  TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &) = delete;
+  void operator= (const TAO_CDR_Encaps_Codec &) = delete;
 
 private:
   /// The major GIOP version associated with this Codec.
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 971c637d876..120478f0b2e 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -55,10 +55,8 @@ public:
   virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc);
 
 private:
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  TAO_CodecFactory (const TAO_CodecFactory &);
-  void operator= (const TAO_CodecFactory &);
+  TAO_CodecFactory (const TAO_CodecFactory &) = delete;
+  void operator= (const TAO_CodecFactory &) = delete;
 
   IOP::Codec_ptr create_codec_i (CORBA::Octet major,
                                  CORBA::Octet minor,
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index 35d3dad6103..add90ed5270 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -113,10 +113,8 @@ protected:
   void check_validity (void);
 
 private:
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  TAO_IORInfo (const TAO_IORInfo &);
-  void operator= (const TAO_IORInfo &);
+  TAO_IORInfo (const TAO_IORInfo &) = delete;
+  void operator= (const TAO_IORInfo &) = delete;
 
 private:
   /// Pointer to POA
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 9f5f800645f..9e64004cea7 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -211,7 +211,6 @@ public:
   virtual const char* _interface_repository_id () const;
 
 protected:
-
   /// Destructor is protected to enforce proper memory management
   /// through the reference counting mechanism.
   ~TAO_ORBInitInfo ();
@@ -222,14 +221,10 @@ protected:
   void check_validity ();
 
 private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  TAO_ORBInitInfo (const TAO_ORBInitInfo &);
-  void operator= (const TAO_ORBInitInfo &);
+  TAO_ORBInitInfo (const TAO_ORBInitInfo &) = delete;
+  void operator= (const TAO_ORBInitInfo &) = delete;
 
 private:
-
   /// Reference to the ORB Core.
   TAO_ORB_Core *orb_core_;
 
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 78ae7d699ec..d832921457c 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -101,12 +101,8 @@ namespace TAO
     virtual ~PICurrent () = default;
 
   private:
-    /// Prevent copying through the copy constructor and the assignment
-    /// operator.
-    //@{
     PICurrent (const PICurrent &) = delete;
     void operator= (const PICurrent &) = delete;
-    //@}
 
   private:
     /// Reference to the orb core.
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 7819fdda9cc..cad2844f78d 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -94,12 +94,8 @@ namespace TAO
      */
     Table & current_slot_table ();
 
-    /// Prevent copying through the copy constructor and the assignment
-    /// operator.
-    //@{
     PICurrent_Impl (const PICurrent_Impl &) = delete;
     void operator= (const PICurrent_Impl &) = delete;
-    //@}
 
   private:
     /// Allow for stack of PICurrent_Impl as required.
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 60cc585f680..cbc30649131 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -38,7 +38,6 @@ namespace TAO
       , public virtual ::CORBA::LocalObject
       {
       public:
-
         /// Constructor.
         Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
 
@@ -47,32 +46,31 @@ namespace TAO
          * PortableInterceptor::Current interface.
          */
         //@{
-        virtual CORBA::Long id (void);
+        virtual CORBA::Long id ();
 
-        virtual CounterT bytes_sent (void);
+        virtual CounterT bytes_sent ();
 
-        virtual CounterT bytes_received (void);
+        virtual CounterT bytes_received ();
 
-        virtual CounterT messages_sent (void);
+        virtual CounterT messages_sent ();
 
-        virtual CounterT messages_received (void);
+        virtual CounterT messages_received ();
 
-        virtual ::TimeBase::TimeT open_since (void);
+        virtual ::TimeBase::TimeT open_since ();
         //@}
 
       protected:
-
         /**
          * Some helper methods
          */
         //@{
         /// A (strategy) method used to obtain the transport ptr
-        const TAO_Transport* transport (void) const;
+        const TAO_Transport* transport () const;
 
         /// A Stats instance. If protocol is unavailable (0) or the
         /// TAO_HAS_TRANSPORT_CURRENT macro is defined as anything but
         /// 1, a single static instance will be used.
-        const TAO::Transport::Stats* transport_stats (void) const;
+        const TAO::Transport::Stats* transport_stats () const;
         //@}
 
         /// Destructor is protected to enforce the fact this class is
@@ -82,16 +80,10 @@ namespace TAO
         virtual ~Current_Impl (void);
 
       private:
-
-        /// Prevent copying through the copy constructor and the
-        /// assignment operator.
-        //@{
-        Current_Impl (const Current_Impl &);
-        void operator= (const Current_Impl &);
-        //@}
+        Current_Impl (const Current_Impl &) = delete;
+        void operator= (const Current_Impl &) = delete;
 
       private:
-
         // The ORB (core) that owes us.
         TAO_ORB_Core* core_;
 
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index 1eec30bb5ed..3e94c9d88b9 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -44,53 +44,45 @@ namespace TAO
     class TAO_Transport_Current_Export IIOP_Current_Impl
       : public virtual IIOP::Current
       , public virtual Current_Impl
-      {
-      public:
+    {
+    public:
+      /// Constructor.
+      IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
 
-        /// Constructor.
-        IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
+      //@{
+      virtual ::CORBA::Long id ();
 
-        //@{
-        virtual ::CORBA::Long id (void);
+      virtual ::SSLIOP::Current_ptr ssliop_current ();
 
-        virtual ::SSLIOP::Current_ptr ssliop_current (void);
+      virtual ::CORBA::Long remote_port ();
 
-        virtual ::CORBA::Long remote_port (void);
+      virtual char* remote_host ();
 
-        virtual char* remote_host (void);
+      virtual ::CORBA::Long local_port ();
 
-        virtual ::CORBA::Long local_port (void);
+      virtual char* local_host ();
+      //@}
 
-        virtual char* local_host (void);
-        //@}
+    protected:
+      /// Destructor
+      /**
+        * Protected destructor to enforce the fact this class is reference
+        * counted, and should not be destroyed using delete() by anything
+        * other than the reference counting mechanism.
+        */
+      virtual ~IIOP_Current_Impl ();
 
-      protected:
-        /// Destructor
-        /**
-         * Protected destructor to enforce the fact this class is reference
-         * counted, and should not be destroyed using delete() by anything
-         * other than the reference counting mechanism.
-         */
-        virtual ~IIOP_Current_Impl (void);
+    private:
+      /// Returns the IIOP connection handler associated with the
+      /// Transport. Will throw NoContext if the (selected) transport
+      /// () == 0, or if transport->connection_handler () == 0. Will
+      /// throw NoContext, if no transport has been selected yet.
+      TAO_IIOP_Connection_Handler* handler (void);
 
-      private:
-
-        /// Returns the IIOP connection handler associated with the
-        /// Transport. Will throw NoContext if the (selected) transport
-        /// () == 0, or if transport->connection_handler () == 0. Will
-        /// throw NoContext, if no transport has been selected yet.
-        TAO_IIOP_Connection_Handler* handler (void);
-
-      private:
-
-        /// Prevent copying through the copy constructor and
-        /// assignment operator.
-        //@{
-        IIOP_Current_Impl (const IIOP_Current_Impl &);
-        void operator= (const IIOP_Current_Impl &);
-        //@}
-
-      };
+    private:
+      IIOP_Current_Impl (const IIOP_Current_Impl &) = delete;
+      void operator= (const IIOP_Current_Impl &) = delete;
+    };
   }
 }