Tue Aug 14 17:47:30 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

25 files changed, 208 insertions, 212 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d269c8489e7..33ea3831e63 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,32 @@
+Tue Aug 14 17:47:30 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * tao/AnyTypeCode/append.cpp:
+        * tao/CDR.cpp:
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * tao/DynamicInterface/Request.inl:
+        * tao/IFR_Client/IFR_Base.pidl:
+        * tao/IFR_Client/IFR_Basic.pidl:
+        * tao/IFR_Client/IFR_Components.pidl:
+        * tao/IFR_Client/IFR_Extended.pidl:
+        * tao/Messaging/AMH_Response_Handler.h:
+        * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
+        * tao/PI/PICurrent.h:
+        * tao/PI_Forward.pidl:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/PolicyS_T.inl:
+        * tao/PortableServer/Servant_Dispatcher.h:
+        * tao/Principal.cpp:
+        * tao/Profile.cpp:
+        * tao/RTCORBA/Linear_Priority_Mapping.h:
+        * tao/RTCORBA/Linear_Priority_Mapping.cpp:
+        * tao/RTCORBA/Multi_Priority_Mapping.cpp:
+        * tao/RTCORBA/Network_Priority_Mapping.h:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/Stub.inl:
+        * tao/TAO_Singleton_Manager.inl:
+   
+          Untabify.
+
 Tue Aug 14 16:19:35 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tao/Cache_Entries.h:
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index af885729ecb..cd4a7d18567 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -1151,7 +1151,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
           return TAO::TRAVERSE_STOP;
         }
 
-	  TAO_ORB_Core *orb_core = src->orb_core ();
+      TAO_ORB_Core *orb_core = src->orb_core ();
       if (orb_core == 0)
         {
           orb_core = TAO_ORB_Core_instance ();
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 7ef61eb4840..6b7e3f34119 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -83,8 +83,8 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size,
   // Zero out the buffer if we allocated the buffer.
   if (size == 0)
     (void) ACE_OS::memset (this->current()->wr_ptr(),
-			   0,
-			   this->current()->space());
+                           0,
+                           this->current()->space());
 #endif /* TAO_ZERO_TAO_OUTPUTCDR_ALLOCATED_BUFFERS */
 }
 
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index aea071fcfe3..0cd4b617d69 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -324,7 +324,7 @@ TAO_AMH_DSI_Response_Handler::~TAO_AMH_DSI_Response_Handler (void)
 
 void
 TAO_AMH_DSI_Response_Handler::invoke_reply (CORBA::NVList_ptr args,
-					    CORBA::NamedValue_ptr result)
+                                            CORBA::NamedValue_ptr result)
 {
   try
    {
@@ -333,13 +333,13 @@ TAO_AMH_DSI_Response_Handler::invoke_reply (CORBA::NVList_ptr args,
     // Send the return value, if any.
     if (result != 0 && result->value () != 0)
       {
-	      result->value ()->impl ()->marshal_value (this->_tao_out);
+        result->value ()->impl ()->marshal_value (this->_tao_out);
       }
 
     // Send the "inout" and "out" parameters.
     if (args != 0)
       {
-	      args->_tao_encode (this->_tao_out, CORBA::ARG_INOUT | CORBA::ARG_OUT);
+        args->_tao_encode (this->_tao_out, CORBA::ARG_INOUT | CORBA::ARG_OUT);
       }
     this->_tao_rh_send_reply ();
   }
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 2e6215e5a06..05a9ffeb62a 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -186,9 +186,9 @@ ACE_INLINE CORBA::Boolean
 CORBA::Request::response_received (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-		    ace_mon,
-		    this->lock_,
-		    false);
+                    ace_mon,
+                    this->lock_,
+                    false);
 
   return this->response_received_;
 }
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 90ca3824737..b29f21ce5b9 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -364,18 +364,16 @@ module CORBA
         in InterfaceDefSeq base_interfaces
       );
 
-    ExtValueDef create_ext_value (
-	in RepositoryId id,
-	in Identifier name,
-	in VersionSpec version,
-	in boolean is_custom,
-	in boolean is_abstract,
-	in ValueDef base_value,
-	in boolean is_truncatable,
-	in ValueDefSeq abstract_base_values,
-	in InterfaceDefSeq supported_interfaces,
-	in ExtInitializerSeq initializers
-      );
+    ExtValueDef create_ext_value ( in RepositoryId id,
+                                   in Identifier name,
+                                   in VersionSpec version,
+                                   in boolean is_custom,
+                                   in boolean is_abstract,
+                                   in ValueDef base_value,
+                                   in boolean is_truncatable,
+                                   in ValueDefSeq abstract_base_values,
+                                   in InterfaceDefSeq supported_interfaces,
+                                   in ExtInitializerSeq initializers );
   };
 
   interface IDLType : IRObject
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index eeab5b1bc63..8269d222908 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -314,9 +314,7 @@ module CORBA
   typedef sequence <AttributeDescription> AttrDescriptionSeq;
   typedef sequence <ExtAttributeDescription> ExtAttrDescriptionSeq;
 
-  interface InterfaceDef : Container,
-			   Contained,
-			   IDLType
+  interface InterfaceDef : Container, Contained, IDLType
   {
     // read/write interface
     attribute InterfaceDefSeq base_interfaces;
@@ -340,23 +338,20 @@ module CORBA
     FullInterfaceDescription describe_interface ();
 
     // write interface
-    AttributeDef create_attribute (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType type,
-        in AttributeMode mode
-      );
-    OperationDef create_operation (
-        in RepositoryId id,
-        in Identifier name,
-        in VersionSpec version,
-        in IDLType result,
-        in OperationMode mode,
-        in ParDescriptionSeq params,
-        in ExceptionDefSeq exceptions,
-        in ContextIdSeq contexts
-      );
+    AttributeDef create_attribute ( in RepositoryId id,
+                                    in Identifier name,
+                                    in VersionSpec version,
+                                    in IDLType type,
+                                    in AttributeMode mode );
+                                    
+    OperationDef create_operation ( in RepositoryId id,
+                                    in Identifier name,
+                                    in VersionSpec version,
+                                    in IDLType result,
+                                    in OperationMode mode,
+                                    in ParDescriptionSeq params,
+                                    in ExceptionDefSeq exceptions,
+                                    in ContextIdSeq contexts );
   };
 
   struct InterfaceDescription
@@ -386,19 +381,16 @@ module CORBA
     ExtFullInterfaceDescription describe_ext_interface ();
 
     // write interface
-    ExtAttributeDef create_ext_attribute (
-	in RepositoryId id,
-	in Identifier name,
-	in VersionSpec version,
-	in IDLType type,
-	in AttributeMode mode,
-	in ExceptionDefSeq get_exceptions,
-	in ExceptionDefSeq set_exceptions
-      );
+    ExtAttributeDef create_ext_attribute ( in RepositoryId id,
+                                           in Identifier name,
+                                           in VersionSpec version,
+                                           in IDLType type,
+                                           in AttributeMode mode,
+                                           in ExceptionDefSeq get_exceptions,
+                                           in ExceptionDefSeq set_exceptions );
   };
 
-  interface ExtInterfaceDef : InterfaceDef,
-			      InterfaceAttrExtension
+  interface ExtInterfaceDef : InterfaceDef, InterfaceAttrExtension
   {
   };
 
@@ -406,8 +398,8 @@ module CORBA
   {
   };
 
-  interface ExtAbstractInterfaceDef : AbstractInterfaceDef,
-				      InterfaceAttrExtension
+  interface ExtAbstractInterfaceDef : AbstractInterfaceDef, 
+                                      InterfaceAttrExtension
   {
   };
 
@@ -416,7 +408,7 @@ module CORBA
   };
 
   interface ExtLocalInterfaceDef : LocalInterfaceDef,
-				   InterfaceAttrExtension
+                                   InterfaceAttrExtension
   {
   };
 };
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 3bd9adeb3c8..7883959772f 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -68,45 +68,37 @@ module CORBA
 
     interface Container : CORBA::Container
     {
-      ComponentDef create_component (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in ComponentDef base_component,
-	  in InterfaceDefSeq supports_interfaces
-	);
-
-      HomeDef create_home (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in HomeDef base_home,
-	  in ComponentDef managed_component,
-	  in InterfaceDefSeq supports_interfaces,
-	  in ValueDef primary_key
-	);
-
-      EventDef create_event (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in boolean is_custom,
-	  in boolean is_abstract,
-	  in ValueDef base_value,
-	  in boolean is_truncatable,
-	  in ValueDefSeq abstract_base_values,
-	  in InterfaceDefSeq supported_interfaces,
-	  in ExtInitializerSeq initializers
-	);
+      ComponentDef create_component ( in RepositoryId id,
+                                      in Identifier name,
+                                      in VersionSpec version,
+                                      in ComponentDef base_component,
+                                      in InterfaceDefSeq supports_interfaces );
+
+      HomeDef create_home ( in RepositoryId id,
+                            in Identifier name,
+                            in VersionSpec version,
+                            in HomeDef base_home,
+                            in ComponentDef managed_component,
+                            in InterfaceDefSeq supports_interfaces,
+                            in ValueDef primary_key );
+
+      EventDef create_event ( in RepositoryId id,
+                              in Identifier name,
+                              in VersionSpec version,
+                              in boolean is_custom,
+                              in boolean is_abstract,
+                              in ValueDef base_value,
+                              in boolean is_truncatable,
+                              in ValueDefSeq abstract_base_values,
+                              in InterfaceDefSeq supported_interfaces,
+                              in ExtInitializerSeq initializers );
     };
 
-    interface ModuleDef : CORBA::ModuleDef,
-			  Container
+    interface ModuleDef : CORBA::ModuleDef, Container
     {
     };
 
-    interface Repository : CORBA::Repository,
-			   Container
+    interface Repository : CORBA::Repository, Container
     {
     };
 
@@ -176,41 +168,31 @@ module CORBA
       attribute InterfaceDefSeq supported_interfaces;
 
       // write interface
-      ProvidesDef create_provides (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in InterfaceDef interface_type
-	);
-
-      UsesDef create_uses (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in InterfaceDef interface_type,
-	  in boolean is_multiple
-	);
-
-      EmitsDef create_emits (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in EventDef event
-	);
-
-      PublishesDef create_publishes (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in EventDef event
-	);
-
-      ConsumesDef create_consumes (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in EventDef event
-	);
+      ProvidesDef create_provides ( in RepositoryId id,
+                                    in Identifier name,
+                                    in VersionSpec version,
+                                    in InterfaceDef interface_type );
+
+      UsesDef create_uses ( in RepositoryId id,
+                            in Identifier name,
+                            in VersionSpec version,
+                            in InterfaceDef interface_type,
+                            in boolean is_multiple );
+
+      EmitsDef create_emits ( in RepositoryId id,
+                              in Identifier name,
+                              in VersionSpec version,
+                              in EventDef event );
+
+      PublishesDef create_publishes ( in RepositoryId id,
+                                      in Identifier name,
+                                      in VersionSpec version,
+                                      in EventDef event );
+
+      ConsumesDef create_consumes ( in RepositoryId id,
+                                    in Identifier name,
+                                    in VersionSpec version,
+                                    in EventDef event );
     };
 
     typedef sequence<ProvidesDescription> ProvidesDescriptionSeq;
@@ -251,21 +233,17 @@ module CORBA
       attribute ValueDef primary_key;
 
       // write interface
-      FactoryDef create_factory (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in ParDescriptionSeq params,
-	  in ExceptionDefSeq exceptions
-	);
-
-      FinderDef create_finder (
-	  in RepositoryId id,
-	  in Identifier name,
-	  in VersionSpec version,
-	  in ParDescriptionSeq params,
-	  in ExceptionDefSeq exceptions
-	);
+      FactoryDef create_factory ( in RepositoryId id,
+                                  in Identifier name,
+                                  in VersionSpec version,
+                                  in ParDescriptionSeq params,
+                                  in ExceptionDefSeq exceptions );
+
+      FinderDef create_finder ( in RepositoryId id,
+                                in Identifier name,
+                                in VersionSpec version,
+                                in ParDescriptionSeq params,
+                                in ExceptionDefSeq exceptions );
     };
 
     struct HomeDescription
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index c45562b777f..f8bb6813244 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -97,9 +97,7 @@ module CORBA
     attribute Visibility access;
   };
 
-  interface ValueDef : Container,
-		       Contained,
-		       IDLType
+  interface ValueDef : Container, Contained, IDLType
   {
     // read/write interface
     attribute InterfaceDefSeq supported_interfaces;
@@ -203,14 +201,13 @@ module CORBA
     ExtFullValueDescription describe_ext_value ();
 
     // write interface
-    ExtAttributeDef create_ext_attribute (
-	in RepositoryId id,
-	in Identifier name,
-	in VersionSpec version,
-	in IDLType type,
-	in AttributeMode mode,
-	in ExceptionDefSeq get_exceptions,
-	in ExceptionDefSeq set_exceptions
+    ExtAttributeDef create_ext_attribute ( in RepositoryId id,
+                                           in Identifier name,
+                                           in VersionSpec version,
+                                           in IDLType type,
+                                           in AttributeMode mode,
+                                           in ExceptionDefSeq get_exceptions,
+                                           in ExceptionDefSeq set_exceptions
       );
   };
 
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index ac869cdea24..57866176f6f 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -87,7 +87,7 @@ public:
    * Stores necessary information from a TAO_Server_Request onto the heap
    */
   virtual void init (TAO_ServerRequest &server_request,
-		     TAO_AMH_BUFFER_ALLOCATOR* allocator);
+                     TAO_AMH_BUFFER_ALLOCATOR* allocator);
 
   /// @name Mutators for refcount
   //@{
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 10be1dc230e..8d1d4bf1c27 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -17,12 +17,14 @@ module PortableInterceptor
 {
   typeprefix PortableInterceptor "omg.org";
 
-  abstract valuetype ObjectReferenceFactory {
+  abstract valuetype ObjectReferenceFactory 
+  {
     Object make_object (in string repository_id,
-			in ObjectId id);
+                        in ObjectId id);
   };
 
-  abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory {
+  abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory 
+  {
     readonly attribute ServerId server_id;
     readonly attribute ORBId orb_id;
     readonly attribute AdapterName adapter_name;
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index aaa65bd96e6..2d228b38d28 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -114,7 +114,7 @@ namespace TAO
     /// Reference to the orb core.
     TAO_ORB_Core &orb_core_;
 
-   	/// TSS slot assigned to PICurrent_Impl objects in the OrbCore.
+    /// TSS slot assigned to PICurrent_Impl objects in the OrbCore.
     /// Allocated by the orb_core_.add_tss_cleanup_func() when our
     /// initialize() method is called.
     size_t tss_slot_;
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index 438a6889987..31d1b5d66d2 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -10,7 +10,7 @@
  *
  * This file is used to generate PI_Forward.{h,cpp},
  * using the following command:
-	 *
+ *
  *   tao_idl.exe
  *        -o orig -Gp -Gd -Sci
  *        -Wb,export_macro=TAO_Export
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index 4af1c0925f4..866875aca19 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -46,19 +46,19 @@ namespace TAO
   {
     Active_Policy_Strategies::Active_Policy_Strategies (void)
       : thread_strategy_ (0),
-	request_processing_strategy_ (0),
-	id_assignment_strategy_ (0),
-	lifespan_strategy_ (0),
-	id_uniqueness_strategy_ (0),
-	implicit_activation_strategy_ (0),
-	servant_retention_strategy_ (0),
-	thread_strategy_factory_ (0),
-	servant_retention_strategy_factory_ (0),
-	request_processing_strategy_factory_ (0),
-	lifespan_strategy_factory_ (0),
-	implicit_activation_strategy_factory_ (0),
-	id_uniqueness_strategy_factory_ (0),
-	id_assignment_strategy_factory_ (0)
+        request_processing_strategy_ (0),
+        id_assignment_strategy_ (0),
+        lifespan_strategy_ (0),
+        id_uniqueness_strategy_ (0),
+        implicit_activation_strategy_ (0),
+        servant_retention_strategy_ (0),
+        thread_strategy_factory_ (0),
+        servant_retention_strategy_factory_ (0),
+        request_processing_strategy_factory_ (0),
+        lifespan_strategy_factory_ (0),
+        implicit_activation_strategy_factory_ (0),
+        id_uniqueness_strategy_factory_ (0),
+        id_assignment_strategy_factory_ (0)
     {
     }
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
index 12d3f23e7cb..b72444d2753 100644
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ b/TAO/tao/PortableServer/PolicyS_T.inl
@@ -33,30 +33,30 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T> ACE_INLINE
 POA_CORBA::Policy_tie<T>::Policy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+  : ptr_ (&t),
+    poa_ (PortableServer::POA::_nil ()),
+    rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA::Policy_tie<T>::Policy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+  : ptr_ (&t),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+  : ptr_ (tp),
+    poa_ (PortableServer::POA::_nil ()),
+    rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+  : ptr_ (tp),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    rel_ (release)
 {}
 
 template <class T> ACE_INLINE
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index f2c2c0e319e..1d7a368a914 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -56,7 +56,7 @@ public:
   virtual void pre_invoke_remote_request (
       TAO_Root_POA &poa,
       CORBA::Short servant_priority,
-			TAO_ServerRequest &req,
+      TAO_ServerRequest &req,
       TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
     ) = 0;
 
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
index d513619d21c..08652b88096 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -2,7 +2,7 @@
 
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
-// ORB:		Principal identifier pseudo-objref
+// ORB: Principal identifier pseudo-objref
 
 #include "tao/Principal.h"
 #include "tao/CDR.h"
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 37037ebefe1..8af3c2010a9 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -157,8 +157,8 @@ TAO_Profile::encode (TAO_OutputCDR &stream) const
 #if defined (TAO_ZERO_TAO_OUTPUTCDR_ALLOCATED_BUFFERS)
   // Support limited oref ACE_OS::strcmp
   (void) ACE_OS::memset (encap.current()->wr_ptr (),
-			 0,
-			 encap.current()->space ());
+                         0,
+                         encap.current()->space ());
 #endif /* TAO_ZERO_TAO_OUTPUTCDR_ALLOCATED_BUFFERS */
 
   // Create the profile body
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index f6889d5a7c5..e1f5cc79678 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -64,7 +64,7 @@ TAO_Linear_Priority_Mapping::to_native (
   for (int i = 2; i <= native_priority_index; ++i)
     {
       native_priority = static_cast<RTCORBA::NativePriority> 
-	(ACE_Sched_Params::next_priority (this->policy_, native_priority));
+        (ACE_Sched_Params::next_priority (this->policy_, native_priority));
     }
   return 1;
 
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
index 349a59fb4f2..7e4b014d14c 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -53,9 +53,9 @@ public:
   virtual ~TAO_Linear_Priority_Mapping (void);
 
   virtual CORBA::Boolean to_native (RTCORBA::Priority corba_priority,
-				    RTCORBA::NativePriority &native_priority);
+                                    RTCORBA::NativePriority &native_priority);
   virtual CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority,
-				   RTCORBA::Priority &corba_priority);
+                                   RTCORBA::Priority &corba_priority);
 
 private:
   /// The scheduling policy
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index b53c0995b31..f2ccd5b42bb 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -101,12 +101,12 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
         if ( this->min_ < this->max_ )
         {
            native_priority = static_cast<RTCORBA::NativePriority> 
-	     (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_);
+             (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_);
         }
         else
         {
            native_priority = static_cast<RTCORBA::NativePriority> 
-	     (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_);
+             (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_);
         }
      }
      else
@@ -132,8 +132,8 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
         for (int current_ndx = 0; current_ndx < priority_ndx; current_ndx++)
         {
            native_priority = static_cast<RTCORBA::NativePriority> 
-	     (ACE_Sched_Params::previous_priority (this->policy_,
-	                                           last_priority,
+             (ACE_Sched_Params::previous_priority (this->policy_,
+                                                   last_priority,
                                                    ACE_SCOPE_THREAD));
         }
      }
@@ -172,12 +172,12 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
         if ( this->min_ < this->max_ )
         {
            corba_priority = static_cast<RTCORBA::Priority> 
-	     (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_);
+             (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_);
         }
         else
         {
            corba_priority = static_cast<RTCORBA::Priority> 
-	     (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_);
+             (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_);
         }
      }
      else
@@ -187,8 +187,8 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
         while (true)
         {
            int previous_priority = ACE_Sched_Params::previous_priority (this->policy_,
-                                                                    last_priority,
-                                                                    ACE_SCOPE_THREAD);
+                                                                        last_priority,
+                                                                        ACE_SCOPE_THREAD);
            last_priority = previous_priority;
 
            if (last_priority == this->min_)
@@ -231,7 +231,7 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
         }
 
         corba_priority = static_cast<RTCORBA::Priority> 
-	  (base_corba_priority_ - priority_ndx);
+          (base_corba_priority_ - priority_ndx);
      }
   }
 
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
index f9934292f8c..be4c76948ee 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
@@ -46,10 +46,10 @@ public:
 
   virtual CORBA::Boolean
     to_network (RTCORBA::Priority corba_priority,
-		RTCORBA::NetworkPriority &network_priority) = 0;
+                RTCORBA::NetworkPriority &network_priority) = 0;
   virtual CORBA::Boolean
     to_CORBA (RTCORBA::NetworkPriority network_priority,
-	      RTCORBA::Priority &corba_priority) = 0;
+              RTCORBA::Priority &corba_priority) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index f30e2dfa964..b4598124c96 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -19,13 +19,13 @@ TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void)
 
 int
 TAO_RTScheduler_Loader::init (int,
-			      ACE_TCHAR* [])
+                              ACE_TCHAR* [])
 {
   ACE_TRACE ("TAO_RTScheduler_Loader::init");
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"In RTScheduler_Loader::init\n"));
+                "In RTScheduler_Loader::init\n"));
 
   static int initialized = 0;
 
@@ -48,7 +48,7 @@ TAO_RTScheduler_Loader::init (int,
                           CORBA::SystemException::_tao_minor_code (
                           TAO::VMCID,
                           ENOMEM),
-					  CORBA::COMPLETED_NO));
+                          CORBA::COMPLETED_NO));
 
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_orb_initializer;
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index f3f3d4a07be..7042627eebb 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -87,10 +87,10 @@ TAO_Stub::next_profile_i (void)
   if (this->forward_profiles_perm_) // the permanent forward defined
                                     // at bottom of stack
                                     // forward_profiles_
-	{
+    {
       // In case of permanent forward the base_profiles are ingored.
 
-	  pfile_next = this->next_forward_profile ();
+      pfile_next = this->next_forward_profile ();
 
       if (pfile_next == 0)
         {
@@ -102,16 +102,16 @@ TAO_Stub::next_profile_i (void)
           this->forward_profiles_->rewind ();
           this->profile_success_ = false;
           this->set_profile_in_use_i (this->forward_profiles_->get_next());
-	    }
-	  else
-		  this->set_profile_in_use_i (pfile_next);
+        }
+      else
+        this->set_profile_in_use_i (pfile_next);
 
       // We may have been forwarded to / from a collocated situation
       // Check for this and apply / remove optimisation if required.
       this->orb_core_->reinitialize_object (this);
 
-	  return pfile_next;
-	}
+      return pfile_next;
+    }
   else
     {
       if (this->forward_profiles_) // Now do the common operation
diff --git a/TAO/tao/TAO_Singleton_Manager.inl b/TAO/tao/TAO_Singleton_Manager.inl
index a9c35b8fa13..b5fed6eb199 100644
--- a/TAO/tao/TAO_Singleton_Manager.inl
+++ b/TAO/tao/TAO_Singleton_Manager.inl
@@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE
 int
 TAO_Singleton_Manager::at_exit (ACE_Cleanup *object,
-				void *param)
+                                void *param)
 {
   return TAO_Singleton_Manager::instance ()->at_exit_i (
     object,
@@ -18,8 +18,8 @@ TAO_Singleton_Manager::at_exit (ACE_Cleanup *object,
 ACE_INLINE
 int
 TAO_Singleton_Manager::at_exit (void *object,
-				ACE_CLEANUP_FUNC cleanup_hook,
-				void *param)
+                                ACE_CLEANUP_FUNC cleanup_hook,
+                                void *param)
 {
   return TAO_Singleton_Manager::instance ()->at_exit_i (
     object,