Minor layout/const/doxygen changes

    * TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp:
    * TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
    * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h:
    * TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
    * TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h:
    * TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h:
    * TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
    * TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
    * TAO/orbsvcs/orbsvcs/Trader/Interpreter.h:
    * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:

29 files changed, 17 insertions, 143 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
index 5c53112a86f..7a7e5de736d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h
@@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-
   /**
    * @class IIOP_SSL_Acceptor
    *
@@ -43,7 +42,6 @@ namespace TAO
   class IIOP_SSL_Acceptor : public TAO_IIOP_Acceptor
   {
   public:
-
     typedef ACE_Strategy_Acceptor<IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_BASE_ACCEPTOR;
     typedef TAO_Creation_Strategy<IIOP_SSL_Connection_Handler> TAO_IIOP_SSL_CREATION_STRATEGY;
     typedef TAO_Concurrency_Strategy<IIOP_SSL_Connection_Handler> TAO_IIOP_SSL_CONCURRENCY_STRATEGY;
@@ -58,7 +56,6 @@ namespace TAO
     virtual int close (void);
 
   private:
-
     /// The concrete acceptor, as a pointer to it's base class.
     TAO_IIOP_SSL_BASE_ACCEPTOR base_acceptor_;
 
@@ -72,9 +69,7 @@ namespace TAO
     TAO_IIOP_SSL_CONCURRENCY_STRATEGY *concurrency_strategy_;
     TAO_IIOP_SSL_ACCEPT_STRATEGY *accept_strategy_;
     //@}
-
   };
-
 } // End TAO namespace.
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index 932159fd9ed..4622a9ac7a8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -23,7 +23,8 @@ static const char * const TAO_IIOP_SSL_Connect_Timeprobe_Description[] =
   "IIOP_SSL_Connection_Handler::receive_request - end",
 
   "IIOP_SSL_Connection_Handler::send_request - start",
-  "IIOP_SSL_Connection_Handler::send_request - end"};
+  "IIOP_SSL_Connection_Handler::send_request - end"
+};
 
 enum
 {
@@ -35,7 +36,6 @@ enum
   TAO_IIOP_SSL_CONNECTION_HANDLER_HANDLE_LOCATE_END,
 
   TAO_IIOP_SSL_CONNECTION_HANDLER_RECEIVE_REQUEST_END
-
 };
 
 // Setup Timeprobes
@@ -58,7 +58,6 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
   ACE_ASSERT (0);
 }
 
-
 TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler (
   TAO_ORB_Core *orb_core)
   : TAO_IIOP_Connection_Handler (orb_core)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
index 7d5f1752a8d..1a31541d446 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
@@ -71,12 +71,9 @@ namespace TAO
                               ACE_Time_Value *max_wait_time = 0);
 
   protected:
-
     /// Reference to the TAO::SSLIOP::Current object.
     TAO::SSLIOP::Current_var current_;
-
   };
-
 }  // End TAO namespace.
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
index d1a43e114a0..996dc779302 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
@@ -65,7 +65,6 @@ namespace TAO
                                    ACE_SSL_SOCK_Acceptor>
     {
     public:
-
       /// Constructor.
       Accept_Strategy (TAO_ORB_Core * orb_core,
                        const ACE_Time_Value & timeout,
@@ -76,7 +75,6 @@ namespace TAO
       virtual int accept_svc_handler (handler_type * svc_handler);
 
     private:
-
       /// The accept() timeout.
       /**
        * This timeout includes the overall time to complete the SSL
@@ -84,9 +82,8 @@ namespace TAO
        * handshake.
        */
       const ACE_Time_Value timeout_;
-      bool check_host_;
+      bool const check_host_;
     };
-
   }  // End SSLIOP namespace
 }  // End TAO namespace
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index f193f4090ee..bff291674b7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -36,7 +36,6 @@ namespace TAO
 {
   namespace SSLIOP
   {
-
     /**
      * @class Acceptor
      *
@@ -46,7 +45,6 @@ namespace TAO
       : public IIOP_SSL_Acceptor
     {
     public:
-
       /// Constructor.
       Acceptor (::Security::QOP qop,
                 const ACE_Time_Value & timeout,
@@ -89,7 +87,6 @@ namespace TAO
       const ::SSLIOP::SSL &ssl_component (void) const;
 
     private:
-
       /// Implement the common part of the open*() methods.
       int ssliop_open_i (TAO_ORB_Core *orb_core,
                          const ACE_INET_Addr& addr,
@@ -117,7 +114,6 @@ namespace TAO
                                  CORBA::Short priority);
 
     private:
-
       /// The concrete acceptor, as a pointer to it's base class.
       BASE_ACCEPTOR ssl_acceptor_;
 
@@ -152,9 +148,7 @@ namespace TAO
       ACE_Time_Value const timeout_;
 
       bool check_host_;
-
     };
-
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index 0cf69379576..73fce84efc9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -32,7 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -41,17 +40,12 @@ namespace TAO
   {
     /**
      * @class ClientCredentials
-     *
-     * @brief
-     *
-     *
      */
     class ClientCredentials
       : public virtual SecurityLevel3::ClientCredentials,
         public virtual SSLIOP_Credentials
     {
     public:
-
       /// Constructor
       ClientCredentials (::X509 * cert, ::EVP_PKEY * evp, ::SSL * ssl);
 
@@ -98,7 +92,6 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
@@ -107,13 +100,10 @@ namespace TAO
       ~ClientCredentials (void);
 
     private:
-
       /// Reference to the OpenSSL @c SSL data structure associated
       /// with the current security context (e.g. SSL connection).
       TAO::SSLIOP::SSL_var ssl_;
-
     };
-
   } // End SSLIOP namespace
 }  // End TAO namespace
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 59ab1a9ff8c..5838e7579f7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -37,7 +37,6 @@ namespace TAO
 {
   namespace SSLIOP
   {
-
     /**
      * @class Connection_Handler
      *
@@ -51,7 +50,6 @@ namespace TAO
         public TAO_Connection_Handler
     {
     public:
-
       Connection_Handler (ACE_Thread_Manager* t = 0);
 
       /// Constructor.
@@ -108,7 +106,6 @@ namespace TAO
       bool check_host (void);
 
     protected:
-
       //@{
       /**
        * @name TAO_Connection Handler overloads
@@ -119,11 +116,9 @@ namespace TAO
       //@}
 
     protected:
-
       /// Reference to the SSLIOP::Current object (downcast to gain
       /// access to the low-level management methods).
       TAO::SSLIOP::Current_var current_;
-
     };
 
     // ****************************************************************
@@ -146,7 +141,6 @@ namespace TAO
     class State_Guard
     {
     public:
-
       /// Constructor that sets up the TSS SSL state.
       State_Guard (TAO::SSLIOP::Connection_Handler *handler,
                    int &result);
@@ -155,7 +149,6 @@ namespace TAO
       ~State_Guard (void);
 
     private:
-
       /// Pointer to the connection handler currently handling the
       /// request/upcall.
       Connection_Handler *handler_;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 67f8eadd7fc..c553948bbfb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -53,7 +53,6 @@ namespace TAO
     class Connector : public TAO::IIOP_SSL_Connector
     {
     public:
-
       /// Constructor.
       Connector (::Security::QOP qop, bool check_host);
 
@@ -75,7 +74,6 @@ namespace TAO
       //@}
 
     protected:
-
       /**
        * @name @c TAO_Connector Methods
        *
@@ -114,7 +112,6 @@ namespace TAO
                                                           SSL *ssl);
 
     public:
-
       typedef TAO_Connect_Concurrency_Strategy<Connection_Handler>
           CONNECT_CONCURRENCY_STRATEGY;
 
@@ -130,7 +127,6 @@ namespace TAO
           BASE_CONNECTOR;
 
     private:
-
       /// If zero, connect to IIOP over SSL port by default.
       /// Otherwise, connect to the insecure IIOP port.
       ::Security::QOP qop_;
@@ -144,9 +140,7 @@ namespace TAO
 
       /// The connector initiating connection requests for IIOP.
       BASE_CONNECTOR base_connector_;
-
     };
-
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 8ea7ad699df..8e38967aa94 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -31,12 +31,12 @@ namespace TAO
 {
   class SSLIOP_Credentials;
 
-   namespace SSLIOP
-   {
-     typedef SSLIOP_Credentials* Credentials_ptr;
-     typedef TAO_Pseudo_Var_T<SSLIOP_Credentials> Credentials_var;
-     typedef TAO_Pseudo_Out_T<SSLIOP_Credentials> Credentials_out;
-   }
+  namespace SSLIOP
+  {
+    typedef SSLIOP_Credentials* Credentials_ptr;
+    typedef TAO_Pseudo_Var_T<SSLIOP_Credentials> Credentials_var;
+    typedef TAO_Pseudo_Out_T<SSLIOP_Credentials> Credentials_out;
+  }
 
     /**
      * @class SSLIOP_Credentials
@@ -125,7 +125,6 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor.
       /**
        * Protected destructor to enforce proper memory management
@@ -134,7 +133,6 @@ namespace TAO
       ~SSLIOP_Credentials (void);
 
     protected:
-
       /// Reference to the X.509 certificate associated with this SSLIOP
       /// Credentials object.
       SSLIOP::X509_var x509_;
@@ -154,10 +152,7 @@ namespace TAO
 
       /// The validity of the Credentials.
       SecurityLevel3::CredentialsState creds_state_;
-
     };
-
-//   } // End SSLIOP namespace
 }   // End TAO namespace
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 23fb3ea2a71..0528fe63f03 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -20,7 +20,6 @@
 # define TAO_SSLIOP_PASSWORD_CALLBACK_NAME TAO_SSLIOP_password_callback
 #endif  /* TAO_HAS_VERSIONED_NAMESPACE == 1 */
 
-
 extern "C"
 int
 TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf,
@@ -31,7 +30,6 @@ TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf,
   // @@ I'm probably over complicating this implementation, but that's
   //    what you get when you try to be overly efficient.  :-)
   //        -Ossama
-
   const char * password = static_cast<char *> (userdata);
 
   int pwlen = -1;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index 1e6e1e05029..c0e216cc120 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -28,13 +28,11 @@
 
 #include <openssl/opensslconf.h>
 
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
 /// Forward declarations for OpenSSL data structures.
 extern "C"
 {
@@ -61,7 +59,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor
       CredentialsAcquirer (TAO::SL3::CredentialsCurator_ptr curator,
                            const CORBA::Any & acquisition_arguments);
@@ -91,7 +88,6 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
@@ -100,7 +96,6 @@ namespace TAO
       ~CredentialsAcquirer (void);
 
     private:
-
       /// Verify that this CredentialsAcquirer object is still valid,
       /// i.e. hasn't been destroyed.
       void check_validity (void);
@@ -112,7 +107,6 @@ namespace TAO
       static ::EVP_PKEY * make_EVP_PKEY (const ::SSLIOP::File &key);
 
     private:
-
       /// Lock used for synchronization.
       TAO_SYNCH_MUTEX lock_;
 
@@ -125,9 +119,7 @@ namespace TAO
       /// Has this CredentialsAcquirer object completed credentials
       /// acquisition or been explicitly destroyed?
       bool destroyed_;
-
     };
-
   } // End SSLIOP namespace
 }  // End TAO namespace
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
index f1a7e01e766..912e55a26ab 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
@@ -31,7 +31,6 @@ namespace TAO
 {
   namespace SSLIOP
   {
-
     /**
      * @class CredentialsAcquirerFactory
      *
@@ -44,14 +43,11 @@ namespace TAO
       : public virtual TAO::SL3::CredentialsAcquirerFactory
     {
     public:
-
       /// Create a TAO::SSLIOP::CredentialsAcquirerFactory.
       virtual SecurityLevel3::CredentialsAcquirer_ptr make (
         TAO::SL3::CredentialsCurator_ptr curator,
         const CORBA::Any & acquisition_arguments);
-
     };
-
   } // End SSLIOP namespace
 }  // End TAO namespace
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 0ab11669387..403d68751a1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -120,7 +120,6 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor
       ~Current (void);
 
@@ -131,7 +130,6 @@ namespace TAO
       Current_Impl *implementation (void);
 
     private:
-
       /// Prevent copying through the copy constructor and the assignment
       /// operator.
       //@{
@@ -140,7 +138,6 @@ namespace TAO
       //@}
 
     private:
-
       /// TSS slot assigned to this object.
       size_t tss_slot_;
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 04a7a556cf3..1b3a69de58a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -43,7 +43,6 @@ namespace TAO
     class Current_Impl : public TAO::SL3::SecurityCurrent_Impl
     {
     public:
-
       /// Constructor.
       Current_Impl (void);
 
@@ -74,12 +73,10 @@ namespace TAO
       SSL *ssl (void);
 
     protected:
-
       /// Return the unique tag that identifies the concrete subclass.
       virtual CORBA::ULong tag (void) const;
 
     private:
-
       /// Prevent copying through the copy constructor and the assignment
       /// operator.
       //@{
@@ -88,10 +85,8 @@ namespace TAO
       //@}
 
     private:
-
       /// The SSL session state corresponding to the current upcall.
       SSL *ssl_;
-
     };
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index e3bba37c5c1..df49439989d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -53,7 +53,6 @@ namespace TAO
     class TAO_SSLIOP_Export TAO_SSLIOP_Endpoint : public TAO_Endpoint
     {
     public:
-
       friend class TAO_SSLIOP_Profile;
 
       /// Constructor
@@ -159,13 +158,11 @@ namespace TAO
       int credentials_set (void) const;
 
     protected:
-
       /// Cache the SSL tagged component in a decoded format. Notice
       /// that we do not need to marshal this object!
       ::SSLIOP::SSL ssl_component_;
 
     private:
-
       /// Cached instance of ACE_INET_Addr for use in making invocations,
       /// etc.
       mutable ACE_INET_Addr object_addr_;
@@ -222,7 +219,6 @@ namespace TAO
     class TAO_SSLIOP_Export TAO_SSLIOP_Synthetic_Endpoint : public TAO_SSLIOP_Endpoint
     {
     public:
-
       /// Constructor
       TAO_SSLIOP_Synthetic_Endpoint (TAO_IIOP_Endpoint *iiop_endp);
 
@@ -246,7 +242,6 @@ namespace TAO
       TAO_SSLIOP_Synthetic_Endpoint (const ::SSLIOP::SSL *ssl);
 
     };
-
 //   }  // End SSLIOP namespace.
 // }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 5e76d3244b8..12617d2179c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -58,7 +58,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /*!
         \brief Constructor.
         \param info reference to the ORBInitInfo object so that
@@ -100,7 +99,6 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to force deallocation by the reference
@@ -109,7 +107,6 @@ namespace TAO
       ~Server_Invocation_Interceptor (void);
 
     private:
-
       /**
        * @name Copying and Assignment
        *
@@ -122,7 +119,6 @@ namespace TAO
       //@}
 
     private:
-
       /// Reference to the current SSLIOP execution context.
       ::SSLIOP::Current_var ssliop_current_;
 
@@ -139,7 +135,6 @@ namespace TAO
       SecurityLevel2::SecurityManager_var sec2manager_;
       SecurityLevel2::Current_var sec2_current_;
     };
-
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 074ab7dd4ed..c5d932c13d3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -39,7 +39,6 @@ namespace TAO
 {
   namespace SSLIOP
   {
-
     /**
      * @name ORBInitializer
      *
@@ -52,7 +51,6 @@ namespace TAO
         public virtual ::CORBA::LocalObject
     {
     public:
-
       /// Constructor.
       ORBInitializer (::Security::QOP qop);
 
@@ -61,16 +59,13 @@ namespace TAO
       virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
     private:
-
       // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object.
       size_t get_tss_slot_id (PortableInterceptor::ORBInitInfo_ptr info);
 
     private:
-
       /// The default quality-of-protection settings in use.
       ::Security::QOP qop_;
     };
-
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 25616b74df5..4b180f5f005 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -88,7 +88,6 @@ namespace TAO
       //@}
 
     protected:
-
       /// Destructor
       /**
        * Protected destructor to enforce proper memory management
@@ -96,7 +95,6 @@ namespace TAO
        */
       ~OwnCredentials (void);
     };
-
   } // End SSLIOP namespace
 }  // End TAO namespace
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 2b45409887c..92e01b78220 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -105,7 +105,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
       void remove_generic_endpoint (TAO_Endpoint *ep);
 
     protected:
-
       /// Destructor.
       /**
        * Protected destructor to enforce proper memory management
@@ -121,7 +120,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
         const TAO_Profile * other_profile);
 
     private:
-
       /**
        * Helper for @c decode.  Decodes TAO_TAG_SSL_ENDPOINTS from a
        * tagged component. Decode only if RTCORBA is enabled.
@@ -171,7 +169,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
        * attributes - port number, for instance.
        */
       int ssl_only_;
-
     };
 
 //   }  // End SSLIOP namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index 8f1494b00a9..b67de885b0c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -41,7 +41,6 @@ namespace TAO
         public virtual SSLIOP_Credentials
     {
     public:
-
       TargetCredentials (::X509 *cert, ::EVP_PKEY *evp);
 
       /**
@@ -91,7 +90,6 @@ namespace TAO
 
       virtual void release (void);
       //@}
-
     };
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 92bcc0963b6..05fd173c5cd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -33,7 +33,6 @@
 
 #include "ace/Svc_Handler.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward decls.
@@ -59,7 +58,6 @@ namespace TAO
     class TAO_SSLIOP_Export Transport : public TAO_Transport
     {
     public:
-
       /// Constructor.
       Transport (Connection_Handler *handler,
                  TAO_ORB_Core *orb_core);
@@ -110,12 +108,11 @@ namespace TAO
                                   TAO_Message_Semantics (),
                                 ACE_Time_Value *max_time_wait = 0);
 
-      /// Open teh service context list and process it.
+      /// Open the service context list and process it.
       virtual int tear_listen_point_list (TAO_InputCDR &cdr);
       //@}
 
     private:
-
       /// Set the Bidirectional context info in the service context
       /// list.
       void set_bidir_context_info (TAO_Operation_Details &opdetails);
@@ -127,12 +124,10 @@ namespace TAO
                             TAO_Acceptor *acceptor);
 
     private:
-
       /// The connection service handler used for accessing lower layer
       /// communication protocols.
       Connection_Handler *connection_handler_;
     };
-
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
index 4fe185785bb..e4b5e931552 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
@@ -24,7 +24,6 @@
 
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
@@ -41,16 +40,14 @@ namespace TAO
      *        classes in the SSLIOP pluggable protocol.
      *
      * Methods useful to many classes in the SSLIOP pluggable protocol
-     * are centrally located in this uility class.
+     * are centrally located in this utility class.
      */
     class Util
     {
     public:
       /// Access Current.
       static TAO::SSLIOP::Current_ptr current (TAO_ORB_Core *orb_core);
-
     };
-
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index f76dc516a63..2a7f45e1a0f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_TIME_SERVICE_CLERK_H
 #define TAO_TIME_SERVICE_CLERK_H
 #include /**/ "ace/pre.h"
@@ -21,7 +20,6 @@
 #include "orbsvcs/Time/Timer_Helper.h"
 #include "orbsvcs/Time/time_serv_export.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -39,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Time_Serv_Export TAO_Time_Service_Clerk : public POA_CosTime::TimeService
 {
 public:
-
   /// Helper class to help in the updation of time.
   friend class Timer_Helper;
 
@@ -97,7 +94,6 @@ public:
   CORBA::ULongLong time_;
 
 private:
-
   /// Time displacement factor in minutes.
   CORBA::Short time_displacement_factor_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index e03dc3fd380..2a7b5a0fc05 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Time_Serv_Export TAO_Time_Service_Server : public POA_CosTime::TimeService
 {
-
 public:
   /// Constructor.
   TAO_Time_Service_Server (void);
@@ -64,7 +63,6 @@ public:
   /// This creates a new TIO with the given parameters.
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
                                          TimeBase::TimeT upper);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index b971ae8b7a1..68dbfe5f082 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -20,7 +20,6 @@
 
 #include /**/ "ace/pre.h"
 
-
 #include "ace/Event_Handler.h"
 #include "ace/Containers.h"
 #include "orbsvcs/Time/time_serv_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 56d05fd59e5..521827604cc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_CONSTRAINT_INTERPRETER_H
 #define TAO_CONSTRAINT_INTERPRETER_H
 #include /**/ "ace/pre.h"
@@ -49,7 +48,7 @@ public:
 
   /**
    * This constructor builds an expression tree representing the
-   * constraint specified in <constraints>, and throws an Illegal
+   * constraint specified in @a constraints, and throws an Illegal
    * Constraint exception if the constraint given has syntax errors or
    * semantic errors, such as mismatched types.
    */
@@ -135,7 +134,6 @@ public:
   typedef ACE_Unbounded_Queue<Preference_Info> Ordered_Offers;
 
 private:
-
   /// Disallow copying.
   TAO_Preference_Interpreter (const TAO_Preference_Interpreter&);
   TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index 108b6e76a7f..3f03064bb22 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -52,7 +52,6 @@ namespace CORBA
 class TAO_Trading_Serv_Export TAO_Constraint
 {
 public:
-
   /**
    * Implementing the pattern of double dispatching, each subclass of
    * TAO_Constraint will call back on an InterpreterVisitor the
@@ -74,7 +73,6 @@ public:
 class TAO_Trading_Serv_Export TAO_Noop_Constraint : public TAO_Constraint
 {
 public:
-
   TAO_Noop_Constraint (TAO_Expression_Type type)
     : type_ (type) {}
 
@@ -84,7 +82,6 @@ public:
     { return this->type_; }
 
 private:
-
   TAO_Expression_Type type_;
 };
 
@@ -97,7 +94,6 @@ private:
 class TAO_Trading_Serv_Export TAO_Binary_Constraint : public TAO_Constraint
 {
 public:
-
   TAO_Binary_Constraint (TAO_Expression_Type op_type,
                          TAO_Constraint* left,
                          TAO_Constraint* right);
@@ -135,7 +131,6 @@ public:
   static int visit_in (TAO_Constraint_Visitor* , TAO_Binary_Constraint*);
 
 private:
-
   TAO_Binary_Constraint (const TAO_Binary_Constraint&);
   TAO_Binary_Constraint& operator= (const TAO_Binary_Constraint&);
 
@@ -156,9 +151,8 @@ private:
 class TAO_Trading_Serv_Export TAO_Unary_Constraint : public TAO_Constraint
 {
 public:
-
   TAO_Unary_Constraint (TAO_Expression_Type op_type,
-                                 TAO_Constraint* operand);
+                        TAO_Constraint* operand);
 
   virtual ~TAO_Unary_Constraint (void);
 
@@ -170,7 +164,6 @@ public:
   TAO_Constraint* operand (void);
 
 private:
-
   TAO_Unary_Constraint (const TAO_Unary_Constraint&);
   TAO_Unary_Constraint& operator= (const TAO_Unary_Constraint&);
 
@@ -190,7 +183,6 @@ private:
 class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint
 {
 public:
-
   TAO_Property_Constraint (const char* name);
 
   virtual ~TAO_Property_Constraint (void);
@@ -203,7 +195,6 @@ public:
   const char* name (void) const;
 
 private:
-
   TAO_Property_Constraint (const TAO_Property_Constraint&);
   TAO_Property_Constraint& operator= (const TAO_Property_Constraint&);
 
@@ -219,8 +210,7 @@ private:
  */
 class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 {
- public:
-
+public:
   TAO_Literal_Constraint (void);
 
   // = Constructors for each of the various types of literals.
@@ -339,7 +329,6 @@ class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint
 
   /// The actual types of the TAO_Literal_Constraint.
   TAO_Expression_Type type_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index 1a266adcb1a..f5d8691fdd6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -51,7 +51,6 @@ private:
   static TAO_SYNCH_MUTEX parserMutex__;
 };
 
-
 // Functions we need for parsing.
 extern int yyparse (void);
 extern void yyrestart (FILE*);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 5d17c007912..ed477f7326e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -57,7 +57,6 @@ class TAO_Lookup :
   public TAO_Import_Attributes<POA_CosTrading::Lookup>
 {
 public:
-
   TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
   ~TAO_Lookup (void);
@@ -153,7 +152,6 @@ public:
   // END SPEC
 
 private:
-
   /// Factory method for creating an appropriate Offer Iterator based
   /// on the presence of the Register Interface.
   TAO_Offer_Iterator* create_offer_iterator (const TAO_Property_Filter&);
@@ -268,7 +266,6 @@ class TAO_Register :
   public TAO_Support_Attributes<POA_CosTrading::Register>
 {
 public:
-
   TAO_Register (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
   virtual ~TAO_Register (void);
@@ -776,17 +773,15 @@ private:
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_;
 };
 
-  // *************************************************************
-  // TAO_Proxy
-  // *************************************************************
-
+// *************************************************************
+// TAO_Proxy
+// *************************************************************
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 class TAO_Proxy :
   public TAO_Trader_Components <POA_CosTrading::Proxy>,
   public TAO_Support_Attributes <POA_CosTrading::Proxy>
 {
 public:
-
   TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader);
 
   ~TAO_Proxy (void);
@@ -811,12 +806,10 @@ public:
                              CosTrading::OfferIdIterator_ptr &);
 
 private:
-
   // = Disallow these operations.
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Proxy (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
 
-
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_;
 };