2 files changed, 40 insertions, 56 deletions

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;
+    };
   }
 }