Thu Nov 1 10:49:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

30 files changed, 129 insertions, 79 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 438ee2254a4..59cfdea097b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,56 @@
+Thu Nov  1 10:49:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI.mpc:
+          Added include guard so that we prevent users from including any
+          generated file, they need to include PI.h
+
+        * tao/PI/ClientRequestDetails.h:
+        * tao/PI/ClientRequestInfo.h:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+        * tao/PI/Interceptor_List_T.cpp:
+        * tao/PI/ORBInitInfo.h:
+        * tao/PI/PI.h:
+        * tao/PI/PI_ORBInitializer.h:
+        * tao/PI/PI_PolicyFactory.h:
+        * tao/PI/PICurrent.h:
+        * tao/PI/PICurrent_Impl.h:
+        * tao/PI/ProcessingModePolicy.h:
+          Updated includes to use PI_includeC.h
+
+        * tao/PI_Server.mpc:
+          Added include guard so that we prevent users from including any
+          generated file, they need to include PI_Server.h
+
+        * tao/PI_Server/PI_Server.cpp:
+          Layout change
+
+        * tao/PI_Server/PortableServer_ORBInitializer.h:
+        * tao/PI_Server/ServerInterceptorAdapter.h:
+        * tao/PI_Server/ServerRequestDetails.h:
+        * tao/PI_Server/ServerRequestInfo.h:
+          Updated includes to use PI_Server_includeC.h
+
+        * tao/PI_Server/ServerRequestInfo.pidl:
+        * tao/PI_Server/ServerRequestInterceptor.pidl:
+          Include PI_include.pidl
+
+        * tao/PI_Server/ServerRequestInterceptorC.h:
+          Updated
+
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/RTScheduling/RTScheduler_Manager.h:
+          Layout change
+
+        * tao/RTScheduling/Request_Interceptor.h:
+        * tao/RTScheduling/RTScheduler_Initializer.cpp:
+        * tao/RTScheduling/RTScheduler_Initializer.h:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/RTScheduling/RTScheduler_Loader.h:
+          Updated includes
+
+        * tao/Transport_Cache_Manager.cpp:
+          Layout and const changes
+
 Thu Nov  1 10:24:15 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Hello/Hello.mpc:
diff --git a/TAO/tao/PI.mpc b/TAO/tao/PI.mpc
index 18e633b83cb..9474f20a310 100644
--- a/TAO/tao/PI.mpc
+++ b/TAO/tao/PI.mpc
@@ -2,6 +2,10 @@
 project : taolib, codecfactory, install, tao_versioning_idl_defaults {
   sharedname   = TAO_PI
   dynamicflags = TAO_PI_BUILD_DLL
+  idlflags += -SS -Sci -Gp -Gd \
+              -Wb,export_macro=TAO_PI_Export \
+              -Wb,export_include=tao/PI/pi_export.h \
+              -o PI
 
   Source_Files {
     PI
@@ -28,23 +32,26 @@ project : taolib, codecfactory, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -Gp -Gd -Sorb -Sal -GX \
-                -Wb,export_macro=TAO_PI_Export \
-                -Wb,export_include=tao/PI/pi_export.h \
-                -o PI
+    idlflags += -Sorb -GX \
+                -Wb,unique_include=tao/PI/PI.h
+    PI/PI_include.pidl
+  }
+
+  IDL_Files {
+    idlflags += -Sorb -Sal -GX \
+                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
+                -Wb,safe_include=tao/PI/PI.h
     idlflags -= -Sa -St
     PI/ORBInitInfo.pidl
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
-                -Wb,export_macro=TAO_PI_Export \
-                -Wb,export_include=tao/PI/pi_export.h \
-                -o PI
+    idlflags += -GA -Sorb -Sal \
+                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
+                -Wb,safe_include=tao/PI/PI.h
     idlflags -= -Sa -St
     PI/ORBInitializer.pidl
     PI/ClientRequestInterceptor.pidl
-    PI/Interceptor.pidl
     PI/ClientRequestInfo.pidl
     PI/RequestInfo.pidl
     PI/PIForwardRequest.pidl
@@ -53,10 +60,15 @@ project : taolib, codecfactory, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sal \
-                -Wb,export_macro=TAO_PI_Export \
-                -Wb,export_include=tao/PI/pi_export.h \
-                -o PI
+    idlflags += -GA -Sorb -Sal
+    idlflags -= -Sa -St
+    PI/Interceptor.pidl
+  }
+
+  IDL_Files {
+    idlflags += -GA -Sal \
+                -Wb,include_guard=TAO_PI_SAFE_INCLUDE \
+                -Wb,safe_include=tao/PI/PI.h
     idlflags -= -Sa -St
     PI/InvalidSlot.pidl
   }
diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index 349f5e9768d..82d6e6e787f 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -30,7 +30,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/ProcessingModePolicyC.h"
+#include "tao/PI/PI_includeC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 2ed39cac06e..5c20fb78627 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -32,8 +32,7 @@
 #endif /* _MSC_VER */
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "tao/PI/ClientRequestInfoC.h"
-#include "tao/PI/PIForwardRequestC.h"
+#include "tao/PI/PI_includeC.h"
 #include "tao/PI/PICurrent_Impl.h"
 #include "tao/CORBA_methods.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index 288881e8d51..3c700cfe66e 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -31,7 +31,7 @@
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "tao/PI/Interceptor_List_T.h"
-#include "tao/PI/ClientRequestInterceptorC.h"
+#include "tao/PI/PI_includeC.h"
 #include "tao/PI/ClientRequestDetails.h"
 #include "tao/ClientRequestInterceptor_Adapter.h"
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 2ecbc63a348..a94957a33d0 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
-#include "tao/PI/ORBInitInfoC.h"
-#include "tao/PI/InterceptorC.h"
+#include "tao/PI/PI_includeC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/debug.h"
 
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index dd1ec663ffa..7f242cc78ec 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/ORBInitInfoC.h"
+#include "tao/PI/PI_includeC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index 077cc2bc9a1..ba8e58aab5d 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -57,6 +57,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #include "tao/PI/ClientRequestInfoC.h"
 #include "tao/PI/ClientRequestInterceptorC.h"
 #include "tao/PI/PICurrentC.h"
+#include "tao/PI/ProcessingModePolicyC.h"
 #undef TAO_PI_SAFE_INCLUDE
 
 #endif  /* TAO_PI_H */
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 2d228b38d28..c96f4d754f1 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -25,7 +25,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/PICurrentC.h"
+#include "tao/PI/PI_includeC.h"
 
 #include "tao/LocalObject.h"
 #include "ace/Array_Base.h"
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 34c3f315bde..ce83b786ecc 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -25,7 +25,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/PICurrentC.h"
+#include "tao/PI/PI_includeC.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Array_Base.h"
 
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index aa24c63d127..6f2e120fe0a 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -26,8 +26,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "tao/PI/ORBInitializerC.h"
-#include "tao/PI/PolicyFactoryC.h"
+#include "tao/PI/PI_includeC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index 8800ecbb14d..9e3d8c9699b 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -26,7 +26,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "tao/PI/PolicyFactoryC.h"
+#include "tao/PI/PI_includeC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index eb500462474..eaed641b54a 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -25,7 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "tao/PI/ProcessingModePolicyC.h"
+#include "tao/PI/PI_includeC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server.mpc
index c0538d7df1b..1cf004d4f98 100644
--- a/TAO/tao/PI_Server.mpc
+++ b/TAO/tao/PI_Server.mpc
@@ -3,6 +3,11 @@ project : taolib, pi, portableserver, install, tao_versioning_idl_defaults {
   sharedname   = TAO_PI_Server
   dynamicflags = TAO_PI_SERVER_BUILD_DLL
 
+  idlflags += \
+              -Wb,export_macro=TAO_PI_Server_Export \
+              -Wb,export_include=tao/PI_Server/pi_server_export.h \
+              -o PI_Server
+
   specific(borland, bmake) {
     compile_flags += -Q
   }
@@ -32,20 +37,16 @@ project : taolib, pi, portableserver, install, tao_versioning_idl_defaults {
   }
 
   IDL_Files {
-    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal \
-                -Wb,export_macro=TAO_PI_Server_Export \
-                -Wb,export_include=tao/PI_Server/pi_server_export.h \
-                -o PI_Server
+    idlflags += -Sci -SS -GA -Gp -Gd -Sorb -Sal
+//                -Wb,include_guard=TAO_PI_SERVER_SAFE_INCLUDE \
+//                -Wb,safe_include=tao/PI_Server/PI_Server.h
     idlflags -= -Sa -St
     PI_Server/ServerRequestInfo.pidl
   }
 
   IDL_Files {
     idlflags += -SS -Sorb -GX -Sci \
-                -Wb,export_macro=TAO_PI_Server_Export \
-                -Wb,export_include=tao/PI_Server/pi_server_export.h \
-                -Wb,unique_include=tao/PI_Server/ServerRequestInterceptorC.h \
-                -o PI_Server
+                -Wb,unique_include=tao/PI_Server/PI_Server.h
     PI_Server/PI_Server_include.pidl
   }
 
diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp
index 1511cfb1472..357d1cfee66 100644
--- a/TAO/tao/PI_Server/PI_Server.cpp
+++ b/TAO/tao/PI_Server/PI_Server.cpp
@@ -6,7 +6,6 @@ ACE_RCSID (PI_Server,
            PI_Server,
            "$Id$")
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index cdbcce827cc..a3bf56b7cde 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -23,7 +23,6 @@
 
 #include "tao/LocalObject.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// PortableServer ORB initializer.
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index 47f296a1504..4ba1df547cd 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -29,7 +29,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI_Server/ServerRequestInterceptorC.h"
+#include "tao/PI_Server/PI_Server_includeC.h"
 
 #include "tao/PI/Interceptor_List_T.h"
 #include "tao/ServerRequestInterceptor_Adapter.h"
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
index 0ec3b31de8a..d7c5b426018 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ b/TAO/tao/PI_Server/ServerRequestDetails.h
@@ -30,7 +30,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/ProcessingModePolicyC.h"
+#include "tao/PI/PI_includeC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index d2be9d8e200..4d092c13069 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -28,8 +28,8 @@
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "tao/PI_Server/ServerRequestInfoC.h"
-#include "tao/PI/PIForwardRequestC.h"
+#include "tao/PI_Server/PI_Server_includeC.h"
+#include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
 #include "tao/OctetSeqC.h"
 #include "tao/TAO_Server_Request.h"
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl
index 0f4228caa93..505c714c50d 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl
@@ -22,7 +22,7 @@
 #ifndef _SERVER_REQUESTINFO_PIDL_
 #define _SERVER_REQUESTINFO_PIDL_
 
-#include "tao/PI/RequestInfo.pidl"
+#include "tao/PI/PI_include.pidl"
 #include "tao/orb_types.pidl"
 #include "tao/Policy_Forward.pidl"
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
index 4278a387a2e..d660db2e46c 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
@@ -27,7 +27,7 @@
 #define _SERVER_REQUEST_INTERCEPTOR_IDL_
 
 #include "tao/PI/Interceptor.pidl"
-#include "tao/PI/PIForwardRequest.pidl"
+#include "tao/PI/PI_include.pidl"
 #include "tao/OctetSeq.pidl"
 
 module PortableInterceptor {
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index bea14050e88..be193508c93 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -46,8 +46,10 @@
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
+#define TAO_PI_SAFE_INCLUDE
 #include "tao/PI/InterceptorC.h"
 #include "tao/PI/PIForwardRequestC.h"
+#undef TAO_PI_SAFE_INCLUDE
 #include "tao/OctetSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index ff4e9bdde6e..22ef8f19b7d 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -162,8 +162,7 @@ TAO_ServantBase::_create_stub (void)
         poa_current_impl->poa ()->key_to_stub (
             poa_current_impl->object_key (),
             this->_interface_repository_id (),
-            poa_current_impl->priority ()
-          );
+            poa_current_impl->priority ());
     }
   else
     {
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index 10045313725..e58f66befa8 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -11,9 +11,12 @@ ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$")
 #include "tao/RTScheduling/Current.h"
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 
+#include "tao/PI_Server/PI_Server.h"
+
+#include "tao/PI/ORBInitInfo.h"
+
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
-#include "tao/PI/ORBInitInfo.h"
 #include "tao/debug.h"
 #include "ace/Service_Repository.h"
 #include "ace/Svc_Conf.h"
@@ -66,8 +69,7 @@ void
 
   this->current_->init (tao_info->orb_core ());
 
-  CORBA::Object_var current_obj = RTScheduling::Current::_narrow (this->current_
-                                                                 );
+  CORBA::Object_var current_obj = RTScheduling::Current::_narrow (this->current_);
 
   info->register_initial_reference ("RTScheduler_Current", current_obj.in ());
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
index 47c5ab040f3..a2b6c0c30a1 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/PI.h"
+#include "tao/PI_Server/PI_Server.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index b4598124c96..1cebbe4d38e 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -18,8 +18,7 @@ TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void)
 }
 
 int
-TAO_RTScheduler_Loader::init (int,
-                              ACE_TCHAR* [])
+TAO_RTScheduler_Loader::init (int, ACE_TCHAR* [])
 {
   ACE_TRACE ("TAO_RTScheduler_Loader::init");
 
@@ -27,13 +26,13 @@ TAO_RTScheduler_Loader::init (int,
     ACE_DEBUG ((LM_DEBUG,
                 "In RTScheduler_Loader::init\n"));
 
-  static int initialized = 0;
+  static bool initialized = false;
 
   // Only allow initialization once.
   if (initialized)
     return 0;
 
-  initialized = 1;
+  initialized = true;
 
   // Register the ORB initializer.
   try
@@ -53,8 +52,7 @@ TAO_RTScheduler_Loader::init (int,
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                    );
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
   catch (const ::CORBA::Exception& ex)
     {
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.h b/TAO/tao/RTScheduling/RTScheduler_Loader.h
index 750f8eeddb3..cb0f3e4d2d8 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.h
@@ -23,7 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/PI.h"
 #include "tao/Versioned_Namespace.h"
 
 #include "ace/Service_Object.h"
@@ -34,13 +33,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTScheduler_Export TAO_RTScheduler_Loader : public ACE_Service_Object
 {
 public:
-
   /// Destructor.
   virtual ~TAO_RTScheduler_Loader (void);
 
   /// Initialize the RTScheduler loader hooks.
-  virtual int init (int argc,
-                    ACE_TCHAR* []);
+  virtual int init (int argc, ACE_TCHAR* []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index b4981756215..7da2428ccdf 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -51,10 +51,7 @@ public:
 
   // the static operations
   static TAO_RTScheduler_Manager_ptr _duplicate (TAO_RTScheduler_Manager_ptr obj);
-  static TAO_RTScheduler_Manager_ptr _narrow (
-      CORBA::Object_ptr obj
-      );
-
+  static TAO_RTScheduler_Manager_ptr _narrow (CORBA::Object_ptr obj);
   static TAO_RTScheduler_Manager_ptr _nil (void)
     {
       return (TAO_RTScheduler_Manager_ptr)0;
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index bc476915dd2..85e4bc3cd19 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -11,7 +11,6 @@
 #include "tao/RTScheduling/Current.h"
 #include "tao/LocalObject.h"
 
-#include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,14 +24,11 @@ class TAO_RTScheduler_Export Client_Interceptor:
 public:
 
   //  Client_Interceptor (RTScheduling::Current_ptr current);
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             );
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-                          );
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              );
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index aff951b95de..f521e10b3d2 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -91,8 +91,8 @@ namespace TAO
     if (TAO_debug_level > 0)
        {
          ACE_DEBUG ((LM_INFO,
-            ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager::bind_i: ")
-            ACE_TEXT ("Transport[%d] ;hash %d\n"),
+            ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager::bind_i, ")
+            ACE_TEXT ("Transport[%d]; hash %d\n"),
             int_id.transport ()->id (),
             ext_id.hash ()
             ));
@@ -212,8 +212,7 @@ namespace TAO
                                *this->cache_lock_,
                                -1));
 
-    int const status =  this->find_i (key,
-                                      value);
+    int const status =  this->find_i (key, value);
 
     if (status == 0)
       {
@@ -243,14 +242,12 @@ namespace TAO
         this->wait_for_connection (tmp_key);
 
         // Look for an entry in the map
-        retval = this->cache_map_.find (tmp_key,
-                                        entry);
+        retval = this->cache_map_.find (tmp_key, entry);
 
         // We have an entry in the map, check whether it is idle.
         if (entry)
           {
-            CORBA::Boolean idle =
-              this->is_entry_idle (entry);
+            CORBA::Boolean const idle = this->is_entry_idle (entry);
 
             if (idle)
               {
@@ -328,7 +325,7 @@ namespace TAO
 
     ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
                               guard,
-                            *this->cache_lock_, -1));
+                              *this->cache_lock_, -1));
 
     if (entry == 0)
       return -1;
@@ -376,7 +373,7 @@ namespace TAO
       {
         // Get the transport to fill its associated connection's
         // handler.
-        bool retval =
+        bool const retval =
           (*iter).int_id_.transport ()->provide_blockable_handler (h);
 
         // Do not mark the entry as closed if we don't have a