Fixed #1449

    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
    * TAO/tao/Profile_Transport_Resolver.h:

2 files changed, 17 insertions, 23 deletions

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/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 22902e6fafe..8af90de85c9 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -181,12 +181,12 @@ namespace TAO
     /**
      * If current effective policies cause the invocation to raise
      * CORBA::INV_POLICY exception, the conflicting/problematic policies
-     * are stored in this list.  This is used by \param
-     * Object::_validate_connection method to inform clients about
+     * are stored in this list.  This is used by
+     * Object::_validate_connection() method to inform clients about
      * causes of invocation failure.
      * @par
-     * Conflicting policies are only stored in this list if \param
-     * init_inconsistent_policies method has been called prior to the
+     * Conflicting policies are only stored in this list if
+     * init_inconsistent_policies() method has been called prior to the
      * beginning of invocation.  This saves extra work of conflicting
      * policies 'logging' when it's not needed.
      *