Layout and docu changes

34 files changed, 43 insertions, 127 deletions

diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.h b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
index 056bb8eed41..cb4e34f81d1 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
@@ -36,7 +36,6 @@
 class TAO_LB_Push_Handler : public ACE_Event_Handler
 {
 public:
-
   /// Constructor
   TAO_LB_Push_Handler (CosLoadBalancing::LoadMonitor_ptr monitor,
                        const PortableGroup::Location & location,
@@ -47,7 +46,6 @@ public:
                               const void *arg);
 
 private:
-
   /// Reference to the LoadMonitor.
   CosLoadBalancing::LoadMonitor_var monitor_;
 
@@ -56,7 +54,6 @@ private:
 
   /// Reference to the LoadManager.
   CosLoadBalancing::LoadManager_var manager_;
-
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/LoadBalancer/README b/TAO/orbsvcs/LoadBalancer/README
index d854a2ccf8e..ec94ce5359d 100644
--- a/TAO/orbsvcs/LoadBalancer/README
+++ b/TAO/orbsvcs/LoadBalancer/README
@@ -1,5 +1,3 @@
-
-
 This directory contains the sources for two binaries:
 
   1) LoadManager
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
index a79d1cde06c..ffdd776b6b7 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
@@ -42,7 +42,6 @@
 class TAO_LB_Signal_Handler : public ACE_Task_Base
 {
 public:
-
   /// Constructor.
   TAO_LB_Signal_Handler (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa);
@@ -72,12 +71,10 @@ public:
   virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
 
 protected:
-
   /// Template method that initiates the cleanup process.
   virtual int perform_cleanup (int signum);
 
 private:
-
 #ifdef ACE_HAS_THREADS
   /// Block all signals before spawning the threads.  Then, unblock
   /// these signals when this handler is destroyed.
@@ -93,7 +90,6 @@ private:
   /// Reference to the POA within which the LoadManager servant is
   /// registered.
   PortableServer::POA_var poa_;
-
 };
 
 #endif  /* TAO_LB_SIGNAL_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 359b4d493df..e21f4aa30cc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -40,7 +40,6 @@ class TAO_LoadBalancing_Export TAO_LB_ClientComponent
   : public ACE_Service_Object
 {
 public:
-
   /// Initializes object when dynamic linking occurs.
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
@@ -48,10 +47,8 @@ public:
   virtual int fini (void);
 
 protected:
-
   /// Register the LB_ClientComponent's ORBInitializer.
   int register_orb_initializer (void);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index 0d26d87475c..9ce2a887ac8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -46,7 +46,6 @@ class TAO_LB_ClientORBInitializer
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /**
    * @name PortableInterceptor::ORBInitializer Methods
    *
@@ -58,7 +57,6 @@ public:
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index fe81e8323e5..a82d675db16 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -51,7 +51,6 @@ class TAO_LB_IORInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_LB_IORInterceptor (const CORBA::StringSeq & object_groups,
                          const CORBA::StringSeq & repository_ids,
@@ -92,12 +91,10 @@ public:
   //@}
 
 private:
-
   /// Create and register the LoadAlert object with the LoadManager.
   void register_load_alert (void);
 
 private:
-
   /// List of stringified object group references.
   const CORBA::StringSeq object_groups_;
 
@@ -122,7 +119,6 @@ private:
 
   /// Synchronize access to the class state.
   TAO_SYNCH_MUTEX lock_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index cfac64f7c8f..9dd963d8549 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -75,7 +75,6 @@ class TAO_LB_LeastLoaded
   : public virtual POA_CosLoadBalancing::Strategy
 {
 public:
-
   /// Constructor.
   TAO_LB_LeastLoaded (PortableServer::POA_ptr poa);
 
@@ -107,14 +106,12 @@ public:
   //@}
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Initialize the LeastLoaded instance with the given properties.
   void init (const PortableGroup::Properties & props);
 
 protected:
-
   /// Destructor.
   ~TAO_LB_LeastLoaded (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index a0c270e0946..035fdf21aeb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -28,7 +28,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert
   : public virtual POA_CosLoadBalancing::LoadAlert
 {
 public:
-
   /// Constructor.
   TAO_LB_LoadAlert (void);
 
@@ -62,14 +61,12 @@ public:
   virtual ~TAO_LB_LoadAlert (void);
 
 private:
-
   /// Has this LoadAlert servant been alerted of a high load condition
   /// by the LoadManager?
   CORBA::Boolean alerted_;
 
   /// Lock used to synchronized access to the LoadAlert state.
   mutable TAO_SYNCH_MUTEX lock_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 0aa3cb0004e..4dec5ef7044 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -42,7 +42,6 @@ struct TAO_LB_LoadAlertInfo
   /// True if the LoadAlert object has been alerted about a given load
   /// condition.  False otherwise.
   CORBA::Boolean alerted;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 07ca4cfd154..a35561a416b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -40,23 +40,18 @@ class TAO_LB_LoadAlert_Handler
   : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler
 {
 public:
-
   virtual void enable_alert (void);
 
-  virtual void enable_alert_excep (
-      ::Messaging::ExceptionHolder *);
+  virtual void enable_alert_excep (::Messaging::ExceptionHolder *);
 
   virtual void disable_alert (void);
 
-  virtual void disable_alert_excep (
-      ::Messaging::ExceptionHolder *);
+  virtual void disable_alert_excep (::Messaging::ExceptionHolder *);
 
 protected:
-
   /// Protected destructor to enforce propery memory management
   /// through reference counting.
   ~TAO_LB_LoadAlert_Handler (void);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index 16f8052feaa..a95028fa71e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -76,7 +76,6 @@ class TAO_LB_LoadMinimum
   : public virtual POA_CosLoadBalancing::Strategy
 {
 public:
-
   /// Constructor.
   TAO_LB_LoadMinimum (PortableServer::POA_ptr poa);
 
@@ -108,14 +107,12 @@ public:
   //@}
 
   /// Returns the default POA for this servant.
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA ();
 
   /// Initialize the LoadMinimum instance with the given properties.
   void init (const PortableGroup::Properties & props);
 
 protected:
-
   /// Destructor.
   ~TAO_LB_LoadMinimum (void);
 
@@ -142,7 +139,6 @@ protected:
                                CORBA::Float & value);
 
 private:
-
   /// This servant's default POA.
   PortableServer::POA_var poa_;
 
@@ -173,7 +169,6 @@ private:
   CORBA::Float per_balance_load_;
 
   //@}
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index bccb7ac7c05..45b0749eb7e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -125,7 +125,6 @@ TAO_LB_ServerRequestInterceptor::send_exception (
     {
       // A CORBA::TRANSIENT is thrown when the LoadManager informs the
       // LoadAlert object that its member is overloaded, for example.
-
       ORBSVCS_DEBUG ((LM_INFO,
                   ACE_TEXT ("TAO_LB_ServerRequestInterceptor -- ")
                   ACE_TEXT ("Exception thrown.\n")));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index cb95039e570..a3ad143d70b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -49,7 +49,6 @@ class TAO_LoadBalancing_Export TAO_LB_ServerRequestInterceptor
     public virtual ::CORBA::LocalObject
 {
 public:
-
   /// Constructor.
   TAO_LB_ServerRequestInterceptor (TAO_LB_LoadAlert & load_alert);
 
@@ -82,7 +81,6 @@ public:
   //@}
 
 protected:
-
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
@@ -91,9 +89,7 @@ protected:
   ~TAO_LB_ServerRequestInterceptor (void);
 
 private:
-
   TAO_LB_LoadAlert & load_alert_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/README b/TAO/orbsvcs/orbsvcs/LoadBalancing/README
index 84bf1466c3e..175e8e074fd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/README
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/README
@@ -1,5 +1,3 @@
-
-
 This directory contains the implementations of the TAO Load Balancing
 service, which is called as Cygnus.
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 0f55940911a..f383c79659d 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -30,8 +30,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
   // Check case TypeCodes.
   CORBA::TypeCode_ptr const lhs_tc = this->type ();
   CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                    );
+    tc->member_type (index);
 
   CORBA::Boolean const equal_members =
     lhs_tc->equal (rhs_tc.in ());
@@ -54,8 +53,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
   // Check case TypeCodes.
   CORBA::TypeCode_ptr const lhs_tc = this->type ();
   CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                    );
+    tc->member_type (index);
 
   CORBA::Boolean const equivalent_members =
     lhs_tc->equivalent (rhs_tc.in ());
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index 2caccfeab7d..69d88d32aba 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -1185,8 +1185,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
         {
           retval = this->append (param.in (),
                                  src,
-                                 dest
-                                );
+                                 dest);
         }
 
       if (retval == TAO::TRAVERSE_CONTINUE)
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index c687786d48b..213f37cb44e 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -20,8 +20,7 @@ Zlib_CompressorFactory::get_compressor (
     // Ensure Compression range 0-9 and will also convert -1(default) to 9(max).
     compression_level = ace_range(  ::Compression::CompressionLevel(Z_NO_COMPRESSION),   // Min value
                                     ::Compression::CompressionLevel(Z_BEST_COMPRESSION), // Max value
-                                    compression_level   // Argument value
-                                  );
+                                    compression_level); // Argument value
 
     ::Compression::Compressor_ptr compressor = 0;
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp
index e587d7eb746..5dac916eede 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp
@@ -153,8 +153,7 @@ TAO_DTP_Task::open (void* /* args */)
                     this->max_pool_threads_,
                     this->max_request_queue_depth_,
                     this->thread_stack_size_,
-                    this->thread_idle_time_.sec ())
-                   );
+                    this->thread_idle_time_.sec ()));
     }
 
   // We can't activate 0 threads.  Make sure this isn't the case.
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 84a1be86263..3e20fd0b4e5 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -171,8 +171,7 @@ namespace CORBA
      *     ACE_NEW_RETURN (
      *         result,
      *         SomeException (*this),
-     *         0
-     *       );
+     *         0);
      *     return result;
      *   }
      * };
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 9c72d78a0c7..a3c45dc3fca 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -131,8 +131,7 @@ protected:
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
   virtual int decode_endpoints (void);
-  virtual void parse_string_i (const char *string
-                              );
+  virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 6c86e8fbea0..37b5284328f 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -165,8 +165,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
-                                          Diff_Profiles
-                                         );
+                                          Diff_Profiles);
 
   // Make the stub memory allocation exception safe for the duration
   // of this method.
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index cfadbaed48d..d0d59889b7a 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -305,8 +305,7 @@ TAO_MProfile::create_policy_list (void)
   ACE_NEW_THROW_EX (this->policy_list_,
                     CORBA::PolicyList,
                     CORBA::NO_MEMORY (0,
-                                      CORBA::COMPLETED_NO)
-                    );
+                                      CORBA::COMPLETED_NO));
 }
 
 void
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 2aeede4233d..ccaf4269378 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -396,8 +396,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
                        result,
                        0,
                        request,
-                       req_flags
-                     );
+                       req_flags);
 }
 #endif
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 8e9cdd52325..249b6bc2a84 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -180,8 +180,7 @@ namespace TAO
                     0,
                     EINVAL
                   ),
-                CORBA::COMPLETED_NO
-            );
+                CORBA::COMPLETED_NO);
       }
   }
 
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index d0cf73ac879..b2863450ee9 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -229,8 +229,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
   size_t nargs,
   TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
-  CORBA::ULong nexceptions
-  )
+  CORBA::ULong nexceptions)
 {
   // This method implements an "intermediate" server side interception
   // point.  Interceptors are invoked in the same order they were
@@ -258,7 +257,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
 
   try
     {
-      bool is_remote_request = !server_request.collocated ();
+      bool const is_remote_request = !server_request.collocated ();
 
       for (size_t i = 0; i < server_request.interceptor_count (); ++i)
         {
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index fd983213528..2e38ebd132e 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -53,8 +53,7 @@ namespace TAO
       Active_Policy_Strategies (void);
 
       void update (Cached_Policies &policies,
-                   TAO_Root_POA* poa
-                  );
+                   TAO_Root_POA* poa);
 
       void cleanup (void);
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index c20461a0a74..2ccf947ccf9 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -66,8 +66,7 @@ namespace TAO
           // The user specified that the ImR should be used.
           ImR_Client_Adapter *adapter =
             ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-              TAO_Root_POA::imr_client_adapter_name ()
-            );
+              TAO_Root_POA::imr_client_adapter_name ());
 
 #if !defined (TAO_AS_STATIC_LIBS)
           // In case we build shared, try to load the ImR Client library, in a
@@ -109,8 +108,7 @@ namespace TAO
     {
       ImR_Client_Adapter *adapter =
         ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-          TAO_Root_POA::imr_client_adapter_name ()
-        );
+          TAO_Root_POA::imr_client_adapter_name ());
 
       if (adapter != 0)
         {
@@ -154,8 +152,7 @@ namespace TAO
       // The user specified that the ImR should be used.
       ImR_Client_Adapter *adapter =
         ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
-          TAO_Root_POA::imr_client_adapter_name ()
-        );
+          TAO_Root_POA::imr_client_adapter_name ());
       if (adapter == 0)
         {
           // couldn't load adapter, already reported error
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 75454d77935..781a60c24b4 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -786,8 +786,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                        0,  // nargs
                                        0,  // servant_upcall
                                        0,  // exceptions
-                                       0   // nexceptions
-                                      );
+                                       0); // nexceptions
             }
         }
     }
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 93e502abd84..af484d586d1 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -60,8 +60,7 @@ namespace TAO
       ~Cached_Policies (void);
 
       /// Update the cached policy values.
-      void update (TAO_POA_Policy_Set &policy_set
-                  );
+      void update (TAO_POA_Policy_Set &policy_set);
 
       /**
        * @name Accessor methods to cached values.
@@ -116,8 +115,7 @@ namespace TAO
     protected:
 
       /// Helper method to update a particular policy.
-      void update_policy (const CORBA::Policy_ptr policy
-                         );
+      void update_policy (const CORBA::Policy_ptr policy);
 
       ::PortableServer::ThreadPolicyValue thread_;
 
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index fff8a5119b9..7bb648c4e7f 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -285,8 +285,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                                                       type_id,
                                                       client_exposed_policies._retn (),
                                                       &filter,
-                                                      lanes[i]->resources ().acceptor_registry ()
-                                                     );
+                                                      lanes[i]->resources ().acceptor_registry ());
         }
 
       ACE_ASSERT (0);
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 0635fcc691b..53ea0dd8886 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -88,16 +88,14 @@ TAO_RTScheduler_Current::begin_scheduling_segment (
 
   impl->begin_scheduling_segment (name,
                                   sched_param,
-                                  implicit_sched_param
-                                 );
+                                  implicit_sched_param);
 }
 
 
 void
 TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
                                                     CORBA::Policy_ptr sched_param,
-                                                    CORBA::Policy_ptr implicit_sched_param
-                                                    )
+                                                    CORBA::Policy_ptr implicit_sched_param)
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
@@ -106,8 +104,7 @@ TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
 
   impl->update_scheduling_segment (name,
                                    sched_param,
-                                   implicit_sched_param
-                                  );
+                                   implicit_sched_param);
 }
 
 void
@@ -123,8 +120,7 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name)
       return;
     }
 
-  impl->end_scheduling_segment (name
-                               );
+  impl->end_scheduling_segment (name);
 }
 
 RTScheduling::DistributableThread_ptr
@@ -162,8 +158,7 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
                       sched_param,
                       implicit_sched_param,
                       stack_size,
-                      base_priority
-                     );
+                      base_priority);
 }
 
 RTScheduling::Current::IdType *
@@ -301,8 +296,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
     orb->object_ref_table ().resolve_initial_reference (
       "RTScheduler");
 
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()
-                                                      );
+  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ());
 }
 
 TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void)
@@ -335,8 +329,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
       this->scheduler_->begin_new_scheduling_segment (this->guid_,
                                                       name,
                                                       sched_param,
-                                                      implicit_sched_param
-                                                     );
+                                                      implicit_sched_param);
 
       if (CORBA::is_nil (this->dt_.in ()))
         //Create new DT.
@@ -371,8 +364,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
         (this->guid_,
          name,
          sched_param,
-         implicit_sched_param
-        );
+         implicit_sched_param);
 
       TAO_TSS_Resources *tss =
         TAO_TSS_Resources::instance ();
@@ -413,8 +405,7 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
   this->scheduler_->update_scheduling_segment (this->guid_,
                                                name,
                                                sched_param,
-                                               implicit_sched_param
-                                              );
+                                               implicit_sched_param);
 
   // Remember the new values.
   this->name_ = CORBA::string_dup (name);
@@ -435,9 +426,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
     {
       // Let the scheduler know that the DT is
       // terminating.
-      this->scheduler_->end_scheduling_segment(this->guid_,
-                                               name
-                                              );
+      this->scheduler_->end_scheduling_segment(this->guid_, name);
 
       // Cleanup DT.
       this->cleanup_DT ();
@@ -452,8 +441,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
       // scheduling segment.
       this->scheduler_->end_nested_scheduling_segment (this->guid_,
                                                        name,
-                                                       this->previous_current_->sched_param_.in ()
-                                                      );
+                                                       this->previous_current_->sched_param_.in ());
 
       // Cleanup current.
       this->cleanup_current ();
@@ -540,8 +528,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority,
     TAO_OBJID_PRIORITYMAPPINGMANAGER);
 
   RTCORBA::PriorityMappingManager_var mapping_manager =
-    RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                             );
+    RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
   RTCORBA::PriorityMapping *pm =
     mapping_manager->mapping ();
@@ -608,15 +595,12 @@ DTTask::svc (void)
 
       this->current_->begin_scheduling_segment (this->name_.in (),
                                                 this->sched_param_.in (),
-                                                this->implicit_sched_param_.in ()
-                                               );
+                                                this->implicit_sched_param_.in ());
 
       // Invoke entry point into new DT.
-      this->start_->_cxx_do (this->data_
-                            );
+      this->start_->_cxx_do (this->data_);
 
-      this->current_->end_scheduling_segment (this->name_.in ()
-                                            );
+      this->current_->end_scheduling_segment (this->name_.in ());
     }
   catch (const ::CORBA::Exception& ex)
     {
@@ -692,8 +676,7 @@ TAO_RTScheduler_Current_i::cancel_thread (void)
 
   // Let the scheduler know that the thread has
   // been cancelled.
-  this->scheduler_->cancel (this->guid_
-                           );
+  this->scheduler_->cancel (this->guid_);
 
   this->cleanup_DT ();
 
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 5eaffea8a89..48bfe663054 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -20,7 +20,6 @@ class TAO_RTScheduler_Export Client_Interceptor:
   public ::CORBA::LocalObject
 {
 public:
-
   //  Client_Interceptor (RTScheduling::Current_ptr current);
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
@@ -37,14 +36,12 @@ public:
   virtual void destroy (void);
 
   static const IOP::ServiceId SchedulingInfo;
-
 };
 
 class TAO_RTScheduler_Export Server_Interceptor :
   public PortableInterceptor::ServerRequestInterceptor,
   public ::CORBA::LocalObject
 {
-
 public:
   Server_Interceptor (TAO_RTScheduler_Current_ptr current);
 
@@ -66,7 +63,6 @@ public:
 
  private:
   TAO_RTScheduler_Current_var current_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 8377f130a47..9c2c354d595 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -91,7 +91,7 @@ namespace TAO
 
     /// This method implements the "intermediate" server side
     /// interception point if the above #ifdef is set to 1 and a
-    /// starting intercetion point if it is not set to 1.
+    /// starting interception point if it is not set to 1.
     ///
     /// @note This method should have been the "starting" interception
     ///       point according to the interceptor spec. This will be
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 822dcde97a4..ee4e1641e7e 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -1209,8 +1209,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
       CORBA::TypeCode_ptr const member_tc = members[index].type.in ();
 
       CORBA::Boolean const valid_member =
-        this->valid_content_type (member_tc
-                                 );
+        this->valid_content_type (member_tc);
 
       if (!valid_member)
         {