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

11 files changed, 23 insertions, 35 deletions

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);