5 files changed, 17 insertions, 34 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