Thu Apr 24 18:33:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

99 files changed, 253 insertions, 208 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 86799a0b491..b032640d309 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,111 @@
+Thu Apr 24 18:33:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDir_GIOP/BiDir_ORBInitializer.h
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.h
+        * tao/CodecFactory/CDR_Encaps_Codec.h
+        * tao/CodecFactory/CodecFactory_impl.h
+        * tao/Codeset/Codeset_Manager_i.cpp
+        * tao/Compression/Base_Compressor.h
+        * tao/Compression/Compression_Manager.h
+        * tao/Compression/Compressor_Factory.h
+        * tao/Configurable_Refcount.h
+        * tao/CSD_Framework/CSD_ORBInitializer.h
+        * tao/CSD_Framework/CSD_Strategy_Base.h
+        * tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+        * tao/DiffServPolicy/Client_Network_Priority_Policy.h
+        * tao/DiffServPolicy/DiffServPolicy_Factory.h
+        * tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
+        * tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+        * tao/DiffServPolicy/Server_Network_Priority_Policy.h
+        * tao/DynamicAny/DynAny_i.h
+        * tao/DynamicAny/DynAnyFactory.h
+        * tao/DynamicAny/DynArray_i.h
+        * tao/DynamicAny/DynEnum_i.h
+        * tao/DynamicAny/DynSequence_i.h
+        * tao/DynamicAny/DynStruct_i.h
+        * tao/DynamicAny/DynUnion_i.h
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+        * tao/DynamicInterface/AMH_DSI_Response_Handler.h
+        * tao/DynamicInterface/DII_Reply_Handler.h
+        * tao/EndpointPolicy/EndpointPolicy_Factory.h
+        * tao/EndpointPolicy/EndpointPolicy_i.cpp
+        * tao/EndpointPolicy/EndpointPolicy_i.h
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
+        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+        * tao/EndpointPolicy/IIOPEndpointValue_i.h
+        * tao/IORInterceptor/IORInfo.h
+        * tao/IORManipulation/IORManipulation.h
+        * tao/IORTable/IOR_Table_Impl.h
+        * tao/Messaging/AMH_Response_Handler.h
+        * tao/Messaging/Buffering_Constraint_Policy.cpp
+        * tao/Messaging/Buffering_Constraint_Policy.h
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp
+        * tao/Messaging/Connection_Timeout_Policy_i.h
+        * tao/Messaging/Messaging_ORBInitializer.h
+        * tao/Messaging/Messaging_Policy_i.cpp
+        * tao/Messaging/Messaging_Policy_i.h
+        * tao/Messaging/Messaging_PolicyFactory.h
+        * tao/MProfile.inl
+        * tao/ORB_Core.cpp
+        * tao/PI/ClientRequestInfo.h
+        * tao/PI/ORBInitInfo.h
+        * tao/PI/PI_ORBInitializer.h
+        * tao/PI/PI_PolicyFactory.h
+        * tao/PI/PICurrent.h
+        * tao/PI/ProcessingModePolicy.h
+        * tao/PI_Server/PortableServer_ORBInitializer.h
+        * tao/PI_Server/PortableServer_PolicyFactory.h
+        * tao/PI_Server/ServerRequestInfo.h
+        * tao/Policy_Current.h
+        * tao/Policy_Manager.h
+        * tao/PortableServer/IdAssignmentPolicy.h
+        * tao/PortableServer/IdUniquenessPolicy.h
+        * tao/PortableServer/ImplicitActivationPolicy.h
+        * tao/PortableServer/LifespanPolicy.h
+        * tao/PortableServer/POA_Current.h
+        * tao/PortableServer/POAManager.h
+        * tao/PortableServer/POAManagerFactory.h
+        * tao/PortableServer/RequestProcessingPolicy.h
+        * tao/PortableServer/Root_POA.cpp
+        * tao/PortableServer/Root_POA.h
+        * tao/PortableServer/Servant_Base.cpp
+        * tao/PortableServer/ServantRetentionPolicy.h
+        * tao/PortableServer/ThreadPolicy.h
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.h
+        * tao/RTCORBA/Priority_Mapping_Manager.h
+        * tao/RTCORBA/RT_Current.h
+        * tao/RTCORBA/RT_Mutex.h
+        * tao/RTCORBA/RT_ORB.h
+        * tao/RTCORBA/RT_ORBInitializer.h
+        * tao/RTCORBA/RT_Policy_i.cpp
+        * tao/RTCORBA/RT_Policy_i.h
+        * tao/RTCORBA/RT_PolicyFactory.h
+        * tao/RTCORBA/RT_Transport_Descriptor.h
+        * tao/RTCORBA/RT_Transport_Descriptor_Property.h
+        * tao/RTScheduling/Current.h
+        * tao/RTScheduling/Distributable_Thread.h
+        * tao/RTScheduling/Request_Interceptor.h
+        * tao/RTScheduling/RTScheduler_Initializer.h
+        * tao/RTScheduling/RTScheduler_Manager.h
+        * tao/RTScheduling/ThreadAction.h
+        * tao/SmartProxies/Smart_Proxies.h
+        * tao/Strategies/Strategies_ORBInitializer.h
+        * tao/Stub.inl
+        * tao/target_specification.h
+        * tao/Thread_Lane_Resources_Manager.h
+        * tao/TransportCurrent/Current_Impl.h
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h
+        * tao/TypeCodeFactory/TypeCodeFactory_i.h
+          Use CORBA::LocalObject instead of TAO_Local_RefCounted_Object
+
+        * tao/Object.cpp
+        * tao/Object.h
+          Added _refcount_value as mentioned in the C++ mapping
+
+        * tao/Profile.cpp
+        * tao/Profile.inl
+          Moved refcount methods inline
+
 Thu Apr 24 14:08:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/LocalObject.{h,inl}:
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
index 8a6ca7ecb98..3a19b66129d 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Messaging ORB initializer.
 class TAO_BiDir_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
index 251b618ee23..eac523c3d62 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
@@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all Messaging related policies.
 class TAO_BiDir_PolicyFactory
   : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
index 7b85d86fe57..1b8570ca311 100644
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
+++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CSD_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
index 8e6cc8daa0a..85dfd7d7556 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
@@ -55,7 +55,7 @@ namespace TAO
     */
     class TAO_CSD_FW_Export Strategy_Base
       : public CSD_Framework::Strategy,
-        public TAO_Local_RefCounted_Object
+        public ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index d65cebb3340..7fb3827ee41 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -45,7 +45,7 @@ class TAO_Codeset_Translator_Base;
  */
 class TAO_CDR_Encaps_Codec
   : public virtual IOP::Codec,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 28096592063..fd5b14978bd 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -44,7 +44,7 @@ class TAO_Codeset_Translator_Base;
  */
 class TAO_CodecFactory
   : public virtual IOP::CodecFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 5246f2abac4..012c101dea4 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -301,7 +301,7 @@ TAO_Codeset_Manager_i::isCompatible(CONV_FRAME::CodeSetId cs1,
 /// returns the TCS for Char / Wchar
 CONV_FRAME::CodeSetId
 TAO_Codeset_Manager_i::computeTCS (CONV_FRAME::CodeSetComponent &remote,
-                                   CONV_FRAME::CodeSetComponent &local )
+                                   CONV_FRAME::CodeSetComponent &local)
 {
   if (remote.native_code_set == local.native_code_set)
     {
@@ -419,7 +419,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd,
     {
       tlist->translator_factory_ =
         ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>::instance
-        (ACE_TEXT_ALWAYS_CHAR (tlist->name_));
+        (tlist->name_);
 
       if (tlist->translator_factory_ == 0)
         {
diff --git a/TAO/tao/Compression/Base_Compressor.h b/TAO/tao/Compression/Base_Compressor.h
index 11b4a59c680..d8e113a57a2 100644
--- a/TAO/tao/Compression/Base_Compressor.h
+++ b/TAO/tao/Compression/Base_Compressor.h
@@ -33,7 +33,7 @@ namespace TAO
    */
   class TAO_Compression_Export BaseCompressor :
     public virtual ::Compression::Compressor,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
   {
   public:
     BaseCompressor (::Compression::CompressionLevel compression_level,
diff --git a/TAO/tao/Compression/Compression_Manager.h b/TAO/tao/Compression/Compression_Manager.h
index 0bd7071a362..c59b6e0d653 100644
--- a/TAO/tao/Compression/Compression_Manager.h
+++ b/TAO/tao/Compression/Compression_Manager.h
@@ -30,7 +30,7 @@ namespace TAO
 {
   class TAO_Compression_Export CompressionManager :
     public virtual ::Compression::CompressionManager,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
   {
     virtual void register_factory (::Compression::CompressorFactory_ptr
                                    compressor_factory);
diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h
index 99bfdb7c034..173cf67a681 100644
--- a/TAO/tao/Compression/Compressor_Factory.h
+++ b/TAO/tao/Compression/Compressor_Factory.h
@@ -30,7 +30,7 @@ namespace TAO
 {
   class TAO_Compression_Export CompressorFactory :
     public virtual ::Compression::CompressorFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
   {
   public:
     CompressorFactory (::Compression::CompressorId compressor_id);
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 2ada8f3f1c0..a7b0944ba5b 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -15,7 +15,6 @@ TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (void)
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::NetworkPriorityPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , request_diffserv_codepoint_ (0)
   , reply_diffserv_codepoint_ (0)
   , network_priority_model_ (TAO::NO_NETWORK_PRIORITY)
@@ -30,7 +29,6 @@ TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::NetworkPriorityPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , request_diffserv_codepoint_ (request_diffserv_codepoint)
   , reply_diffserv_codepoint_ (reply_diffserv_codepoint)
   , network_priority_model_ (network_priority_model)
@@ -43,7 +41,6 @@ TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::NetworkPriorityPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , request_diffserv_codepoint_ (rhs.request_diffserv_codepoint_)
   , reply_diffserv_codepoint_ (rhs.reply_diffserv_codepoint_)
   , network_priority_model_ (rhs.network_priority_model_)
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
index 44803a0056e..6751f70a21d 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
@@ -45,7 +45,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_DiffServPolicy_Export TAO_Client_Network_Priority_Policy
   : public TAO::NetworkPriorityPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
index 9c58492b252..0f7119b1a5f 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
@@ -39,7 +39,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all DiffServ related policies.
 class TAO_DiffServPolicy_Export TAO_DiffServ_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
index 74b3295c32c..1e708d124f1 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// DiffServ Policy ORB initializer.
 class TAO_DiffServPolicy_Export TAO_DiffServPolicy_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index 5884dc4eb30..b5ede662135 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -16,7 +16,6 @@ TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (void)
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::NetworkPriorityPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , request_diffserv_codepoint_ (0)
   , reply_diffserv_codepoint_ (0)
   , network_priority_model_ (TAO::NO_NETWORK_PRIORITY)
@@ -35,7 +34,6 @@ TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::NetworkPriorityPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , request_diffserv_codepoint_ (request_diffserv_codepoint)
   , reply_diffserv_codepoint_ (reply_diffserv_codepoint)
   , network_priority_model_ (network_priority_model)
@@ -48,7 +46,6 @@ TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::NetworkPriorityPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , request_diffserv_codepoint_ (rhs.request_diffserv_codepoint_)
   , reply_diffserv_codepoint_ (rhs.reply_diffserv_codepoint_)
   , network_priority_model_ (rhs.network_priority_model_)
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
index cc092c6c6a6..3424e27efe4 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
@@ -45,7 +45,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_DiffServPolicy_Export TAO_Server_Network_Priority_Policy
   : public TAO::NetworkPriorityPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index f1298913e23..b3352768202 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -40,7 +40,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_DynamicAny_Export TAO_DynAnyFactory
   : public virtual DynamicAny::DynAnyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 8fb87212a98..19f8a31566e 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -41,7 +41,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_DynamicAny_Export TAO_DynAny_i
   : public virtual DynamicAny::DynAny,
     public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index ed2f039bc24..fbaf71a7a5c 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_DynamicAny_Export TAO_DynArray_i
   : public virtual DynamicAny::DynArray,
     public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 8f78e4b0e10..c2734f02c09 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_DynamicAny_Export TAO_DynEnum_i
   : public virtual DynamicAny::DynEnum,
     public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index b0216f315aa..4089347a8ef 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_DynamicAny_Export TAO_DynSequence_i
   : public virtual DynamicAny::DynSequence,
     public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 49922c737bc..4c459fb7cdc 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_DynamicAny_Export TAO_DynStruct_i
   : public virtual DynamicAny::DynStruct,
     public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index e6b58d6b10a..b24eb486ebb 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -41,7 +41,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_DynamicAny_Export TAO_DynUnion_i
   : public virtual DynamicAny::DynUnion,
     public virtual TAO_DynCommon,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 9116a9bd62d..c66188f0f49 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -115,8 +115,7 @@ TAO_AMH_DSI_Exception_Holder_var::operator const TAO_AMH_DSI_Exception_Holder* (
   return this->ptr_;
 }
 
-TAO_AMH_DSI_Exception_Holder_var::operator TAO_AMH_DSI_Exception_Holder*& (
-    ) // cast
+TAO_AMH_DSI_Exception_Holder_var::operator TAO_AMH_DSI_Exception_Holder*& ()
 {
   return this->ptr_;
 }
@@ -157,17 +156,14 @@ TAO_AMH_DSI_Exception_Holder_var::_retn (void)
 }
 
 void
-TAO_AMH_DSI_Exception_Holder_var::tao_add_ref (
-    TAO_AMH_DSI_Exception_Holder *p
-  )
+TAO_AMH_DSI_Exception_Holder_var::tao_add_ref (TAO_AMH_DSI_Exception_Holder *p)
 {
   CORBA::add_ref (p);
 }
 
 void
 TAO_AMH_DSI_Exception_Holder_var::tao_remove_ref (
-    TAO_AMH_DSI_Exception_Holder *p
-  )
+    TAO_AMH_DSI_Exception_Holder *p)
 {
   CORBA::remove_ref (p);
 }
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
index f4ac7ded2c9..3bfd2888893 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
@@ -83,14 +83,11 @@ class TAO_DynamicInterface_Export TAO_AMH_DSI_Exception_Holder_var
 public:
   TAO_AMH_DSI_Exception_Holder_var (void);
   TAO_AMH_DSI_Exception_Holder_var (TAO_AMH_DSI_Exception_Holder*);
-  TAO_AMH_DSI_Exception_Holder_var (
-      const TAO_AMH_DSI_Exception_Holder*);
-  TAO_AMH_DSI_Exception_Holder_var (
-      const TAO_AMH_DSI_Exception_Holder_var &);
+  TAO_AMH_DSI_Exception_Holder_var (const TAO_AMH_DSI_Exception_Holder*);
+  TAO_AMH_DSI_Exception_Holder_var (const TAO_AMH_DSI_Exception_Holder_var &);
   ~TAO_AMH_DSI_Exception_Holder_var (void);
 
-  TAO_AMH_DSI_Exception_Holder_var &operator= (
-      TAO_AMH_DSI_Exception_Holder*);
+  TAO_AMH_DSI_Exception_Holder_var &operator= (TAO_AMH_DSI_Exception_Holder*);
   TAO_AMH_DSI_Exception_Holder_var &operator= (
       const TAO_AMH_DSI_Exception_Holder_var &);
   TAO_AMH_DSI_Exception_Holder* operator-> (void) const;
@@ -124,8 +121,7 @@ class TAO_DynamicInterface_Export TAO_AMH_DSI_Exception_Holder_out
 public:
   TAO_AMH_DSI_Exception_Holder_out (TAO_AMH_DSI_Exception_Holder* &);
   TAO_AMH_DSI_Exception_Holder_out (TAO_AMH_DSI_Exception_Holder_var &);
-  TAO_AMH_DSI_Exception_Holder_out (
-      const TAO_AMH_DSI_Exception_Holder_out &);
+  TAO_AMH_DSI_Exception_Holder_out (const TAO_AMH_DSI_Exception_Holder_out &);
   TAO_AMH_DSI_Exception_Holder_out &operator= (
       const TAO_AMH_DSI_Exception_Holder_out &);
   TAO_AMH_DSI_Exception_Holder_out &operator= (
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
index e70d4d642dd..e9e5f2a6aa4 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
@@ -71,7 +71,7 @@ private:
  * use in the Dynamic Invocation Interface.
  */
 class TAO_DynamicInterface_Export TAO_DII_Reply_Handler
-  : public virtual TAO_Local_RefCounted_Object
+  : public virtual ::CORBA::LocalObject
 {
 public:
   TAO_DII_Reply_Handler ();
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
index b4aa4f331ee..eceaf5df9bb 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
@@ -40,15 +40,14 @@ class TAO_ORB_Core;
 /// Policy factory for the endpoint policies.
 class TAO_EndpointPolicy_Export TAO_EndpointPolicy_Factory
   : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
   TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core);
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value
-                                           );
+                                           const CORBA::Any & value);
 private:
 
   TAO_ORB_Core * orb_core_;
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
index 04bb65e447a..2fb715963e1 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
@@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// EndpointPolicy ORB initializer.
 class TAO_EndpointPolicy_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
@@ -48,22 +48,15 @@ public:
    * PortableInterceptor::ORBInitializer interface.
    */
   //@{
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         );
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          );
-
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 private:
 
   /// Register Endpoint policy factories.
-  void register_policy_factories (
-    PortableInterceptor::ORBInitInfo_ptr info
-   );
-
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index 335a5dd7c11..9c0b57706e8 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -19,7 +19,6 @@ TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const TAO_EndpointPolicy_i &rhs)
   , ::CORBA::Policy ()
   , ::EndpointPolicy::Policy ()
   , ::CORBA::LocalObject ()
-  , TAO_Local_RefCounted_Object ()
   , value_ (rhs.value_)
 {
 }
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
index 66cee376baa..f517ee50e38 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
@@ -43,7 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_EndpointPolicy_Export TAO_EndpointPolicy_i
   : public virtual EndpointPolicy::Policy,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -54,7 +54,6 @@ public:
 
   virtual ~TAO_EndpointPolicy_i ();
 
-
   /// Returns a copy of <this>.
   virtual TAO_EndpointPolicy_i *clone (void) const;
 
@@ -69,9 +68,7 @@ public:
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
 
-  virtual EndpointPolicy::EndpointList * value (
-    void
-  );
+  virtual EndpointPolicy::EndpointList * value (void);
 
 private:
   /// The attribute
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index 6537e8b3780..b6add80bc7c 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -20,8 +20,7 @@ IIOPEndpointValue_i::IIOPEndpointValue_i ()
 {
 }
 
-IIOPEndpointValue_i::IIOPEndpointValue_i (const char *host,
-                                          CORBA::UShort port)
+IIOPEndpointValue_i::IIOPEndpointValue_i (const char *host, CORBA::UShort port)
   :host_(host),
    port_(port)
 {
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
index 01162dba46d..649cdbf0f3f 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
@@ -57,7 +57,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_EndpointPolicy_Export  IIOPEndpointValue_i :
   public virtual EndpointPolicy::IIOPEndpointValue,
   public virtual TAO_Endpoint_Value_Impl,
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index 73073366b37..6619db3bc12 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -44,7 +44,7 @@ class TAO_Root_POA;
  */
 class TAO_IORInfo
   : public virtual PortableInterceptor::IORInfo,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index d7b51fcf0d8..16b0e04bacb 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IOR_Manipulation_impl
   : public TAO_IOP::TAO_IOR_Manipulation,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index 08d7eeb1b0d..275a4dd3eea 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -42,7 +42,7 @@ typedef TAO_Objref_Out_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out;
 
 class TAO_IOR_Table_Impl
   : public virtual IORTable::Table,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   static TAO_IOR_Table_Impl_ptr
diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl
index 2a2d95f46d5..2a999b71b60 100644
--- a/TAO/tao/MProfile.inl
+++ b/TAO/tao/MProfile.inl
@@ -141,6 +141,7 @@ TAO_MProfile::rewind (void)
 {
   current_ = 0;
 }
+
 ACE_INLINE int
 TAO_MProfile::give_profile (TAO_Profile *pfile, int share)
 {
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 74b4d136156..416ab8f0962 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -71,7 +71,7 @@ class TAO_Messaging_Export TAO_AMH_Response_Handler
 //    isn't consistent with the specified semantics detailed in the
 //    CCM spec.  Please remove this and place it where appropriate in
 //    your AMH tests and examples.
-  : public TAO_Local_RefCounted_Object
+  : public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
index 93b27f86a93..6844480f692 100644
--- a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
@@ -23,7 +23,6 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::Buf
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::BufferingConstraintPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , buffering_constraint_ (buffering_constraint)
 {
 }
@@ -34,7 +33,6 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::BufferingConstraintPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , buffering_constraint_ (rhs.buffering_constraint_)
 {
 }
diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.h b/TAO/tao/Messaging/Buffering_Constraint_Policy.h
index 94a143e5c6a..7e0b4731b03 100644
--- a/TAO/tao/Messaging/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_Buffering_Constraint_Policy
   : public TAO::BufferingConstraintPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index ee8911d8bc5..17277cb67ca 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -23,7 +23,6 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::ConnectionTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (relative_expiry)
 {
 }
@@ -34,7 +33,6 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , TAO::ConnectionTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (rhs.relative_expiry_)
 {
 }
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index a3e17bb91b8..31badde98b6 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -44,7 +44,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_ConnectionTimeoutPolicy
   : public TAO::ConnectionTimeoutPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 
 public:
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
index d5462ee0dbc..5068e97c01f 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Messaging ORB initializer.
 class TAO_Messaging_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index 895fd31fd2d..001ec289089 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all Messaging related policies.
 class TAO_Messaging_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index ef2a42471c8..865c05e336a 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -25,7 +25,6 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , Messaging::RelativeRoundtripTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (relative_expiry)
 {
 }
@@ -36,7 +35,6 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , Messaging::RelativeRoundtripTimeoutPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , relative_expiry_ (rhs.relative_expiry_)
 {
 }
@@ -194,7 +192,6 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronizati
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , Messaging::SyncScopePolicy ()
-  , TAO_Local_RefCounted_Object ()
   , synchronization_ (synchronization)
 {
 }
@@ -204,7 +201,6 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , Messaging::SyncScopePolicy ()
-  , TAO_Local_RefCounted_Object ()
   , synchronization_ (rhs.synchronization_)
 {
 }
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 5da18bf8731..804fd215485 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_RelativeRoundtripTimeoutPolicy
   : public Messaging::RelativeRoundtripTimeoutPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 
 public:
@@ -97,7 +97,7 @@ private:
  */
 class TAO_Messaging_Export TAO_Sync_Scope_Policy
   : public Messaging::SyncScopePolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 
 public:
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index cc1b3de84a6..0d986873e92 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1761,7 +1761,6 @@ TAO_ORB_Core::root_poa (void)
   // DCL ..
   if (CORBA::is_nil (this->root_poa_.in ()))
     {
-
       // Making sure the initialization process in the current thread uses
       // the correct service repository (ours), instead of the global one.
       ACE_Service_Config_Guard scg (this->configuration ());
@@ -2220,7 +2219,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion)
   tm->cancel_all ();
 
   // If <wait_for_completion> is set, wait for all threads to exit.
-  if (wait_for_completion != 0)
+  if (wait_for_completion == true)
     tm->wait ();
 
   // Explicitly destroy the valuetype adapter
@@ -2247,7 +2246,6 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion)
 void
 TAO_ORB_Core::destroy (void)
 {
-  //
   // All destroy() should do is (a) call shutdown() and (b) unbind()
   // from the ORB table.  Nothing else should really be added to this
   // method.  Everything else should go to the shutdown() method.
@@ -3376,8 +3374,7 @@ TAO_ORB_Core_instance (void)
           try
             {
               int argc = 0;
-              CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, 0);
+              CORBA::ORB_var orb = CORBA::ORB_init (argc, 0);
             }
           catch (const ::CORBA::Exception&)
             {
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 5605656114b..7ffa421f3ef 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -125,6 +125,12 @@ CORBA::Object::_remove_ref (void)
   delete this;
 }
 
+CORBA::ULong
+CORBA::Object::_refcount_value() (void)
+{
+  return static_cast<CORBA::ULong> (this->ref_count_.value ());
+}
+
 void
 CORBA::Object::_tao_any_destructor (void *x)
 {
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 61672304e7f..028d818bc69 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -229,6 +229,9 @@ namespace CORBA
 
     /// Decrement the reference count.
     virtual void _remove_ref (void);
+
+    /// Get the refcount
+    virtual CORBA::ULong _refcount_value() const;
     //@}
 
     // Useful for template programming.
@@ -354,7 +357,6 @@ namespace CORBA
     Object &operator = (const Object &);
 
   private:
-
     /// Specify whether this is a local object or not.
     CORBA::Boolean is_local_;
 
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 5c20fb78627..92b3915f3cb 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -70,7 +70,7 @@ namespace Messaging
  */
 class TAO_PI_Export TAO_ClientRequestInfo
   : public virtual PortableInterceptor::ClientRequestInfo,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   TAO_ClientRequestInfo (TAO::Invocation_Base *invocation);
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 7f242cc78ec..bcbf37a597f 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -58,7 +58,7 @@ typedef TAO_Objref_Out_T<TAO_ORBInitInfo>
  */
 class TAO_PI_Export TAO_ORBInitInfo
   : public virtual PortableInterceptor::ORBInitInfo_3_1,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index c96f4d754f1..ff5d9763893 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -56,7 +56,7 @@ namespace TAO
    */
   class TAO_PI_Export PICurrent
     : public virtual PortableInterceptor::Current,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
   {
   public:
     /// Constructor.
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index 6f2e120fe0a..e60d882ffb3 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -36,7 +36,7 @@ class TAO_PI_PolicyFactory;
 /// PortableServer ORB initializer.
 class TAO_PI_Export TAO_PI_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index 9e3d8c9699b..35952a8aadd 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all PortableInterceptor related policies.
 class TAO_PI_Export TAO_PI_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index eaed641b54a..0e90621f627 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -40,7 +40,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_PI_Export TAO_ProcessingModePolicy
   : public PortableInterceptor::ProcessingModePolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index a3bf56b7cde..89b5abcbf43 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -28,7 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// PortableServer ORB initializer.
 class TAO_PortableServer_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
index c0d5a5037a3..7029c428f4f 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
@@ -28,7 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all PortableServer related policies.
 class TAO_PortableServer_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index 4d092c13069..ece77ed0bb0 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -69,7 +69,7 @@ namespace TAO
    */
   class ServerRequestInfo
     : public virtual PortableInterceptor::ServerRequestInfo
-    , public virtual CORBA::LocalObject
+    , public virtual ::CORBA::LocalObject
   {
   public:
 
diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h
index 5a569e889df..05c18e88e90 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -30,18 +30,13 @@
 #include "tao/Policy_CurrentC.h"
 #include "tao/LocalObject.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Policy_Current_Impl;
 
 class TAO_Policy_Current
   : public CORBA::PolicyCurrent
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
   /// Constructor
@@ -69,10 +64,6 @@ public:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #if defined (__ACE_INLINE__)
 # include "tao/Policy_Current.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 2cf22ee70ea..51bab3c1b0f 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -31,16 +31,11 @@
 #include "tao/LocalObject.h"
 #include "tao/Policy_Set.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Policy_Manager
   : public CORBA::PolicyManager
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
   /// constructor
@@ -76,10 +71,6 @@ private:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #if defined (__ACE_INLINE__)
 # include "tao/Policy_Manager.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
index b46b3746bdf..8db33e864b9 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h
@@ -40,7 +40,7 @@ namespace TAO
   {
     class TAO_PortableServer_Export IdAssignmentPolicy
       : public virtual ::PortableServer::IdAssignmentPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
       IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value);
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
index 04335db05e9..b48f1bad0a2 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h
@@ -40,7 +40,7 @@ namespace TAO
   {
     class TAO_PortableServer_Export IdUniquenessPolicy
       : public virtual ::PortableServer::IdUniquenessPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
       IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value);
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
index a53dad9fcc3..5ce1cf9f685 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
@@ -40,7 +40,7 @@ namespace TAO
   {
     class TAO_PortableServer_Export ImplicitActivationPolicy
       : public virtual ::PortableServer::ImplicitActivationPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
       ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value);
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
index 78b7be973fa..6bdeab1f43a 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.h
+++ b/TAO/tao/PortableServer/LifespanPolicy.h
@@ -40,7 +40,7 @@ namespace TAO
   {
     class TAO_PortableServer_Export LifespanPolicy
       : public virtual ::PortableServer::LifespanPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
       LifespanPolicy (::PortableServer::LifespanPolicyValue value);
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index b048cb1d617..23768dc0a8a 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -55,7 +55,7 @@ namespace PortableServer
 
 class TAO_PortableServer_Export TAO_POA_Manager :
   public PortableServer::POAManager,
-  public TAO_Local_RefCounted_Object
+  public ::CORBA::LocalObject
 {
   friend class TAO_Root_POA;
   friend class TAO_Object_Adapter;
diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h
index fe6ad4c46ed..30603d8db4b 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.h
+++ b/TAO/tao/PortableServer/POAManagerFactory.h
@@ -40,7 +40,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_PortableServer_Export TAO_POAManager_Factory :
   public ::PortableServer::POAManagerFactory,
-  public TAO_Local_RefCounted_Object
+  public ::CORBA::LocalObject
 {
 public:
   TAO_POAManager_Factory (TAO_Object_Adapter &object_adapter);
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index 204190abccd..4c08ad16c2a 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -39,7 +39,7 @@ namespace TAO
 
     class TAO_PortableServer_Export POA_Current
       : public PortableServer::Current
-      , public TAO_Local_RefCounted_Object
+      , public ::CORBA::LocalObject
     {
     public:
 
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
index d28b27a30b8..414ee2faf7f 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h
@@ -40,7 +40,7 @@ namespace TAO
   {
     class TAO_PortableServer_Export RequestProcessingPolicy :
       public virtual ::PortableServer::RequestProcessingPolicy,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
     {
     public:
       RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value);
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index caee0da2765..c8d4d6e23fd 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -212,7 +212,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
     lock_ (lock),
     orb_core_ (orb_core),
     object_adapter_ (object_adapter),
-    cleanup_in_progress_ (0),
+    cleanup_in_progress_ (false),
     outstanding_requests_ (0),
     outstanding_requests_condition_ (thread_lock),
     wait_for_completion_pending_ (0),
@@ -815,7 +815,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
   TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
                                                       wait_for_completion);
 
-  this->cleanup_in_progress_ = 1;
+  this->cleanup_in_progress_ = true;
 
   // Inform the custom servant dispatching strategy to stop the working
   // threads when the poa is destroyed.
@@ -1022,7 +1022,6 @@ TAO_Root_POA::adapter_name_i (void)
   while (!CORBA::is_nil (poa.in ()))
     {
       poa = poa->the_parent ();
-
       ++len;
     }
 
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index 5cb34358dfa..5cad8926cda 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -113,7 +113,7 @@ namespace PortableServer
  */
 class TAO_PortableServer_Export TAO_Root_POA
   : public virtual PortableServer::POA,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
index ac39b59738b..52c1cc978b1 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h
@@ -40,7 +40,7 @@ namespace TAO
   {
     class TAO_PortableServer_Export ServantRetentionPolicy :
       public virtual ::PortableServer::ServantRetentionPolicy,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
     {
     public:
       ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value);
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
index 78cb33815ec..ac3f94d125e 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.h
+++ b/TAO/tao/PortableServer/ThreadPolicy.h
@@ -40,7 +40,7 @@ namespace TAO
   {
     class TAO_PortableServer_Export ThreadPolicy
       : public virtual ::PortableServer::ThreadPolicy,
-        public virtual TAO_Local_RefCounted_Object
+        public virtual ::CORBA::LocalObject
     {
     public:
       ThreadPolicy (::PortableServer::ThreadPolicyValue value);
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 8af3c2010a9..fa3cbbc1c30 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -80,25 +80,6 @@ TAO_Profile::~TAO_Profile (void)
   //@@ TAO_PROFILE_SPL_DESTRUCTOR_ADD_HOOK
 }
 
-unsigned long
-TAO_Profile::_incr_refcnt (void)
-{
-  return this->refcount_.increment ();
-}
-
-unsigned long
-TAO_Profile::_decr_refcnt (void)
-{
-  unsigned long count = this->refcount_.decrement ();
-  if (count != 0)
-    return count;
-
-  // refcount is 0, so delete us!
-  // delete will call our ~ destructor which in turn deletes stuff.
-  delete this;
-  return 0;
-}
-
 void
 TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component)
 {
diff --git a/TAO/tao/Profile.inl b/TAO/tao/Profile.inl
index 4cbbee30eb3..676b90e438b 100644
--- a/TAO/tao/Profile.inl
+++ b/TAO/tao/Profile.inl
@@ -64,4 +64,25 @@ TAO_Profile::object_key (void) const
   return this->ref_object_key_->object_key ();
 }
 
+ACE_INLINE unsigned long
+TAO_Profile::_incr_refcnt (void)
+{
+  return this->refcount_.increment ();
+}
+
+ACE_INLINE unsigned long
+TAO_Profile::_decr_refcnt (void)
+{
+  unsigned long count = this->refcount_.decrement ();
+  if (count != 0)
+    return count;
+
+  // refcount is 0, so delete us!
+  // delete will call our ~ destructor which in turn deletes stuff.
+  delete this;
+  return 0;
+}
+
+
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index 6bbcafe8240..b48b7aecf2f 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -45,7 +45,7 @@ namespace RTCORBA
  * Allows setting of user-defined Network_Priority_Mapping at run-time.
  */
 class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager :
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 
 public:
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 8ffe9165443..1fa4a7f6278 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -42,7 +42,7 @@ typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr;
  * Allows setting of user-defined Priority_Mapping at run-time.
  */
 class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager :
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 
 public:
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 8da702d790e..c5372e2ad03 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_RTCORBA_Export TAO_RT_Current
   : public RTCORBA::Current
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index cf48e97d61c..bcaac3d1a57 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -50,7 +50,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTCORBA_Export TAO_RT_Mutex
   : public RTCORBA::Mutex,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index d5a42309038..8f07b73774a 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -92,7 +92,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_RT_ORB
   : public RTCORBA::RTORB,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index d0c1ecfc8a8..4ed80a2ec75 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -41,7 +41,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// RTCORBA ORB initializer.
 class TAO_RT_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   /// Priority mapping types
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index 99ca81ff1a6..13544f517a3 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all RTCORBA related policies.
 class TAO_RT_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 5b694fdbc7e..862579eacce 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -28,7 +28,6 @@ TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::PriorityModelPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , priority_model_ (priority_model)
   , server_priority_ (server_priority)
 {
@@ -39,7 +38,6 @@ TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::PriorityModelPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , priority_model_ (rhs.priority_model_)
   , server_priority_ (rhs.server_priority_)
 {
@@ -148,7 +146,6 @@ TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id)
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::ThreadpoolPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , id_ (id)
 {
 }
@@ -158,7 +155,6 @@ TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs)
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::ThreadpoolPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , id_ (rhs.id_)
 {
 }
@@ -233,7 +229,6 @@ TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (void)
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::PrivateConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
 {
 }
 
@@ -242,7 +237,6 @@ TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (const TAO_PrivateConne
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::PrivateConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
 {
 }
 
@@ -306,7 +300,6 @@ TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const RT
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::PriorityBandedConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , priority_bands_ (bands)
 {
 }
@@ -316,7 +309,6 @@ TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const TA
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::PriorityBandedConnectionPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , priority_bands_ (rhs.priority_bands_)
 {
 }
@@ -418,7 +410,6 @@ TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::ServerProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , protocols_ (protocols)
 {
 }
@@ -428,7 +419,6 @@ TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const TAO_ServerProtocolPoli
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::ServerProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , protocols_ (rhs.protocols_)
 {
 }
@@ -519,7 +509,6 @@ TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::ClientProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , protocols_ (protocols)
 {
 }
@@ -529,7 +518,6 @@ TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const TAO_ClientProtocolPoli
   , ::CORBA::Policy ()
   , ::CORBA::LocalObject ()
   , RTCORBA::ClientProtocolPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , protocols_ (rhs.protocols_)
 {
 }
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 863b5054636..2b2d27b8d38 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -47,7 +47,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_RTCORBA_Export TAO_PriorityModelPolicy
   : public RTCORBA::PriorityModelPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -120,7 +120,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_ThreadpoolPolicy
   : public RTCORBA::ThreadpoolPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -172,7 +172,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_PrivateConnectionPolicy
   : public RTCORBA::PrivateConnectionPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -220,7 +220,7 @@ protected:
  */
 class TAO_RTCORBA_Export TAO_PriorityBandedConnectionPolicy
   : public RTCORBA::PriorityBandedConnectionPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -289,7 +289,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_ServerProtocolPolicy
   : public RTCORBA::ServerProtocolPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -348,7 +348,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_ClientProtocolPolicy
   : public RTCORBA::ClientProtocolPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -419,7 +419,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_TCP_Protocol_Properties
   : public RTCORBA::TCPProtocolProperties,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -489,7 +489,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_UnixDomain_Protocol_Properties
   : public RTCORBA::UnixDomainProtocolProperties,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
@@ -549,7 +549,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_SharedMemory_Protocol_Properties
   : public RTCORBA::SharedMemoryProtocolProperties,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -646,7 +646,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_UserDatagram_Protocol_Properties
   : public RTCORBA::UserDatagramProtocolProperties,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -697,7 +697,7 @@ private:
  */
 class TAO_RTCORBA_Export TAO_StreamControl_Protocol_Properties
   : public RTCORBA::StreamControlProtocolProperties,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
   /// Constructor.
@@ -759,7 +759,7 @@ private:
 
 class TAO_RTCORBA_Export TAO_GIOP_Protocol_Properties
   : public RTCORBA::GIOPProtocolProperties,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
index 7e3b2bcce33..fd79a34a7b6 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
@@ -38,7 +38,7 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor
   : public TAO_Transport_Descriptor_Interface
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint,
                                CORBA::Boolean flag = false);
 
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
index cf38816b4d6..5b29b9b7fcc 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
@@ -36,7 +36,7 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Property
   friend class TAO_RT_Transport_Descriptor;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_RT_Transport_Descriptor_Property (void);
 
   /// Destructor
@@ -70,7 +70,7 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Private_Connection_Property
   : public TAO_RT_Transport_Descriptor_Property
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_RT_Transport_Descriptor_Private_Connection_Property (void);
   TAO_RT_Transport_Descriptor_Private_Connection_Property (long object_id);
 
@@ -108,7 +108,7 @@ class TAO_RTCORBA_Export TAO_RT_Transport_Descriptor_Banded_Connection_Property
   : public TAO_RT_Transport_Descriptor_Property
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_RT_Transport_Descriptor_Banded_Connection_Property (void);
   TAO_RT_Transport_Descriptor_Banded_Connection_Property (CORBA::Short low_priority,
                                                           CORBA::Short high_priority);
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 8a680b0353d..1155fa46067 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -77,7 +77,7 @@ typedef TAO_RTScheduler_Current* TAO_RTScheduler_Current_ptr;
 
 class TAO_RTScheduler_Export TAO_RTScheduler_Current
   : public RTScheduling::Current,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
  public:
   static ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter;
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
index 4840d1a9d42..82800837491 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTScheduler_Export TAO_DistributableThread:
   public RTScheduling::DistributableThread,
-  public TAO_Local_RefCounted_Object
+  public ::CORBA::LocalObject
 {
  public:
   TAO_DistributableThread (void);
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
index a2b6c0c30a1..399d107ec3c 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
@@ -40,7 +40,7 @@ class TAO_RTScheduler_Current;
 /// RTCORBA ORB initializer.
 class TAO_RTScheduler_ORB_Initializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index 8ed523f14f3..8b0cda25ebd 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -32,7 +32,7 @@ typedef TAO_RTScheduler_Manager *TAO_RTScheduler_Manager_ptr;
  * Allows setting of user-defined RTScheduler at run-time.
  */
 class TAO_RTScheduler_Export TAO_RTScheduler_Manager :
-  public virtual TAO_Local_RefCounted_Object
+  public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 85e4bc3cd19..447592830bb 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -19,7 +19,7 @@ extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
 
 class TAO_RTScheduler_Export Client_Interceptor:
   public PortableInterceptor::ClientRequestInterceptor,
-  public TAO_Local_RefCounted_Object
+  public ::CORBA::LocalObject
 {
 public:
 
@@ -44,7 +44,7 @@ public:
 
 class TAO_RTScheduler_Export Server_Interceptor :
   public PortableInterceptor::ServerRequestInterceptor,
-  public TAO_Local_RefCounted_Object
+  public ::CORBA::LocalObject
 {
 
 public:
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
index 268222087ca..d34023a9606 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTScheduler_Export TAO_ThreadAction:
 public RTScheduling::ThreadAction,
-  public TAO_Local_RefCounted_Object
+  public ::CORBA::LocalObject
 {
  public:
 
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
index 204702f7ec9..b00b26259b2 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * Contains the _var pointer to the real proxy.
  */
 class TAO_SmartProxies_Export TAO_Smart_Proxy_Base
-  : public TAO_Local_RefCounted_Object
+  : public ::CORBA::LocalObject
 {
 public:
   /// Destructor
diff --git a/TAO/tao/Strategies/Strategies_ORBInitializer.h b/TAO/tao/Strategies/Strategies_ORBInitializer.h
index e7267eddefd..496784269ef 100644
--- a/TAO/tao/Strategies/Strategies_ORBInitializer.h
+++ b/TAO/tao/Strategies/Strategies_ORBInitializer.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Strategies_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index 37181419431..cbf1ac1d2ac 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -156,7 +156,6 @@ TAO_Stub::next_profile_i (void)
 ACE_INLINE TAO_Profile *
 TAO_Stub::next_profile (void)
 {
-
   ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
                             guard,
                             *this->profile_lock_ptr_,
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index 011a4c9468c..6341fc475c1 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -41,7 +41,6 @@ class TAO_MProfile;
 class TAO_Export TAO_Thread_Lane_Resources_Manager
 {
 public:
-
   /// Constructor.
   TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core);
 
@@ -66,13 +65,11 @@ public:
 
   /// @name Accessors
   // @{
-
   virtual TAO_Thread_Lane_Resources &lane_resources (void) = 0;
 
   virtual TAO_Thread_Lane_Resources &default_lane_resources (void) = 0;
 
   TAO_LF_Strategy &lf_strategy (void);
-
   // @}
 
 protected:
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 4fefe078e3f..cd36b4b844d 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -37,7 +37,7 @@ namespace TAO
      */
     class TAO_Transport_Current_Export Current_Impl
       : public virtual Current
-      , public virtual TAO_Local_RefCounted_Object
+      , public virtual ::CORBA::LocalObject
       {
       public:
 
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index d92da1f47b7..257bda9b6dc 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -36,7 +36,7 @@ namespace TAO
   {
     class TAO_Transport_Current_Export Current_ORBInitializer_Base
       : public virtual PortableInterceptor::ORBInitializer
-      , public virtual TAO_Local_RefCounted_Object
+      , public virtual ::CORBA::LocalObject
     {
     public:
       Current_ORBInitializer_Base (const ACE_TCHAR* id);
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index cfa5337c0e5..0b3db9286eb 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -42,7 +42,7 @@ namespace TAO
 
 class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_i
     : public virtual CORBA::TypeCodeFactory,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
 {
 /**
  * @class TAO_TypeCodeFactory_i
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index bb43479af9d..140a2d99a77 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -68,13 +68,12 @@ public:
     Reference_Addr
   };
 
-  // Note: Please do not pass in a identifiers that is allocated on
-  // stack. These methods does not make a copy but holds the pointer
-  // passed in.
   /// Set the target specification by giving the object key.
+  /// @note Please do not pass in a identifiers that is allocated on
+  /// stack. These methods does not make a copy but holds the pointer
+  /// passed in.
   void target_specifier (const TAO::ObjectKey &key);
 
-
   /// Set the target specification by passing in an IOP::TaggedProfile.
   void target_specifier (IOP::TaggedProfile &profile);