12 files changed, 13 insertions, 14 deletions
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);