Merge pull request #1450 from jwillemsen/jwi-doxygen3

Doxygen changes and make use of delete

1 files changed, 10 insertions, 18 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_;