diff options
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h | 32 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Security/Security_Current.h | 13 |
6 files changed, 30 insertions, 53 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.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index df49439989d..b82328f752e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -47,8 +47,6 @@ namespace TAO * * @brief SSLIOP-specific implementation of PP Framework Endpoint * interface. - * - * */ class TAO_SSLIOP_Export TAO_SSLIOP_Endpoint : public TAO_Endpoint { @@ -62,7 +60,6 @@ namespace TAO /// Destructor. virtual ~TAO_SSLIOP_Endpoint (void); - /// Need to have an assignment operator since the SSLIOP_Profile class /// may have to reorder its list of endpoints based on filtering by /// the EndpointPolicy. @@ -74,7 +71,7 @@ namespace TAO * See Endpoint.h for their documentation. */ //@{ - virtual TAO_Endpoint *next (void); + virtual TAO_Endpoint *next (); virtual int addr_to_string (char *buffer, size_t length); /// Return true if this endpoint is equivalent to @a @@ -87,7 +84,7 @@ namespace TAO /// Return a copy of the corresponding endpoints by allocating /// memory. - virtual TAO_Endpoint *duplicate (void); + virtual TAO_Endpoint *duplicate (); /// Return a hash value for this object. Note that only the IP /// address and port are used to generate the hash value. This may @@ -99,7 +96,7 @@ namespace TAO /// be used as keys in the cache manager and match other fully /// qualified endpoint. (which were used earlier to cache a /// particular transport) - virtual CORBA::ULong hash (void); + virtual CORBA::ULong hash (); //@} /** @@ -107,10 +104,10 @@ namespace TAO */ //@{ /// Return SSL component corresponding to this endpoint. - const ::SSLIOP::SSL &ssl_component (void) const; + const ::SSLIOP::SSL &ssl_component () const; /// Accessor to our IIOP counterpart. - TAO_IIOP_Endpoint *iiop_endpoint (void) const; + TAO_IIOP_Endpoint *iiop_endpoint () const; /// Mutator to our IIOP counterpart. /** @@ -122,7 +119,7 @@ namespace TAO void iiop_endpoint (TAO_IIOP_Endpoint *endpoint, bool destroy); /// Return the SSLIOP-specific ACE_INET_Addr. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Set the Quality-of-Protection, establishment of trust, and /// credentials for this endpoint. This is all done in one function @@ -132,10 +129,10 @@ namespace TAO const TAO::SSLIOP::OwnCredentials_ptr creds); /// Get the Quality-of-Protection settings for this endpoint. - ::Security::QOP qop (void) const; + ::Security::QOP qop () const; /// Get the establishment of trust settings for this endpoint. - ::Security::EstablishTrust trust (void) const; + ::Security::EstablishTrust trust () const; /// Get the credentials for this endpoint. /** @@ -145,17 +142,16 @@ namespace TAO * that no additional locks occur when checking the * transport cache. */ - TAO::SSLIOP::OwnCredentials * credentials (void) const; + TAO::SSLIOP::OwnCredentials * credentials () const; //@} - /// Credentials are not supplied by the constructor, and it is /// valid to have a nil credential, for instance if the /// SSL_use_certificate() method returns 0. Therefore it is /// necessary to have a new method to distinguish between a /// credential that is nil because it has not been set, vs one /// that was set to nil explicitly. - int credentials_set (void) const; + int credentials_set () const; protected: /// Cache the SSL tagged component in a decoded format. Notice @@ -223,11 +219,10 @@ namespace TAO TAO_SSLIOP_Synthetic_Endpoint (TAO_IIOP_Endpoint *iiop_endp); /// Destructor. - virtual ~TAO_SSLIOP_Synthetic_Endpoint (void); + virtual ~TAO_SSLIOP_Synthetic_Endpoint (); /** - * Return true if this endpoint is equivalent to @param - * other_endpoint. + * Return true if this endpoint is equivalent to @p other_endpoint. * Two synthetic endpoints are equivalent if their iiop counterparts are * equivalent, and, if both have non-zero ssl ports, their ssl * ports are the same. @@ -236,11 +231,10 @@ namespace TAO /// Return a copy of the corresponding endpoints by allocating /// memory. - virtual TAO_Endpoint *duplicate (void); + virtual TAO_Endpoint *duplicate (); private: TAO_SSLIOP_Synthetic_Endpoint (const ::SSLIOP::SSL *ssl); - }; // } // End SSLIOP namespace. // } // End TAO namespace. 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 |