Mon Apr 28 14:24:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 21 insertions, 30 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index 3a933b94c75..acab0b5ceda 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// FT ORB initializer.
 class TAO_FT_ClientORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 49a8b165b93..289f386ab77 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all FTCORBA related policies.
 class TAO_FT_ClientPolicyFactory
   : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index 870a3c23f6e..a3cf1126670 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -44,7 +44,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
@@ -89,7 +89,7 @@ private:
  */
 class TAO_FT_Heart_Beat_Policy
   : public FT::HeartbeatPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
index 637356ff8ec..1fc06596f71 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
@@ -18,9 +18,8 @@ TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
   )
   : CORBA::Object (),
     CORBA::Policy (),
-    CORBA::LocalObject (),
     FT::RequestDurationPolicy (),
-    TAO_Local_RefCounted_Object (),
+    CORBA::LocalObject (),
     request_duration_ (rhs.request_duration_)
 {
 }
@@ -43,9 +42,8 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
   )
   : CORBA::Object (),
     CORBA::Policy (),
-    CORBA::LocalObject (),
     FT::HeartbeatPolicy (),
-    TAO_Local_RefCounted_Object (),
+    CORBA::LocalObject (),
     heartbeat_ (rhs.heartbeat_),
     heartbeat_interval_ (rhs.heartbeat_interval_),
     heartbeat_timeout_ (rhs.heartbeat_timeout_)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index aa61223e197..8b2546ff124 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -69,7 +69,7 @@ namespace TAO
    */
   class FT_ClientRequest_Interceptor
     : public virtual PortableInterceptor::ClientRequestInterceptor,
-      public virtual TAO_Local_RefCounted_Object
+      public virtual ::CORBA::LocalObject
   {
   public:
 
@@ -90,7 +90,7 @@ namespace TAO
     virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
 
     virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
-        
+
     void ft_send_extended_sc (CORBA::Boolean send);
 
   protected:
@@ -119,7 +119,7 @@ namespace TAO
 
     /// Retention id generated by the client
     CORBA::Long retention_id_;
-        
+
     /// Transmit a TAG_FT_GROUP component in place of the
     /// FT_GROUP_VERSION data required by the spec.
     CORBA::Boolean ft_send_extended_sc_;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index 947686c2c51..5550f15dffc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -53,7 +53,7 @@ class TAO_Profile;
  */
 class TAO_FT_ORB_Utils_Export TAO_FT_IOGR_Property
   : public virtual TAO_IOP::TAO_IOR_Property,
-    public virtual TAO_Local_RefCounted_Object
+    public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index aba180a7e2d..b544ada7263 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// RTCORBA ORB initializer.
 class TAO_FT_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index fd3ba323a2d..5bb75dfa353 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -40,7 +40,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all FTCORBA related policies.
 class TAO_FT_PolicyFactory
   : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index 5e40b4b054c..55c1f2f5ab8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
@@ -87,7 +87,7 @@ private:
  */
 class TAO_FT_Export TAO_FT_Heart_Beat_Policy
   : public FT::HeartbeatPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
@@ -143,7 +143,7 @@ private:
  */
 class TAO_FT_Export TAO_FT_Heart_Beat_Enabled_Policy
   : public FT::HeartbeatEnabledPolicy,
-    public TAO_Local_RefCounted_Object
+    public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
index 3aa80e1b0a1..e07682aff63 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
@@ -9,7 +9,6 @@ TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TimeBase::
   :ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
   , request_duration_ (duration)
 {
 }
@@ -18,9 +17,8 @@ ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TAO_FT_Request_Duration_Policy &rhs)
   :ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , FT::RequestDurationPolicy ()
-  , TAO_Local_RefCounted_Object ()
+  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , request_duration_ (rhs.request_duration_)
 {
 }
@@ -33,7 +31,6 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (
   : ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_ (heartbeat)
   , heartbeat_interval_ (interval)
   , heartbeat_timeout_ (timeout)
@@ -46,7 +43,6 @@ TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (const TAO_FT_Heart_Beat_Poli
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , FT::HeartbeatPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_ (rhs.heartbeat_)
   , heartbeat_interval_ (rhs.heartbeat_interval_)
   , heartbeat_timeout_ (rhs.heartbeat_timeout_)
@@ -60,7 +56,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   : ACE_NESTED_CLASS (CORBA, Object) ()
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_enabled_value_ (heartbeat)
 {
 }
@@ -72,7 +67,6 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   , ACE_NESTED_CLASS (CORBA, Policy) ()
   , ACE_NESTED_CLASS (CORBA, LocalObject) ()
   , FT::HeartbeatEnabledPolicy ()
-  , TAO_Local_RefCounted_Object ()
   , heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index b45f004765c..681b774a3db 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// RTCORBA ORB initializer.
 class TAO_FT_ServerORBInitializer
   : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+  , public virtual ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index 55eba9ef6fb..76353d509ab 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /// Policy factory for all FTCORBA related policies.
 class TAO_FT_ServerPolicyFactory
   : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 5d602eec42e..34ac0eabd2a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_FT_Heart_Beat_Enabled_Policy
   : public FT::HeartbeatEnabledPolicy
-  , public TAO_Local_RefCounted_Object
+  , public ::CORBA::LocalObject
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
index 21dfaed4af7..15006251244 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
@@ -18,9 +18,8 @@ TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy (
   )
   : CORBA::Object (),
     CORBA::Policy (),
-    CORBA::LocalObject (),
     FT::HeartbeatEnabledPolicy (),
-    TAO_Local_RefCounted_Object (),
+    CORBA::LocalObject (),
     heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 3af991ac16e..98de05c3e06 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -49,7 +49,7 @@ namespace TAO
    */
   class FT_ServerRequest_Interceptor
     : public virtual PortableInterceptor::ServerRequestInterceptor
-    , public virtual TAO_Local_RefCounted_Object
+    , public virtual ::CORBA::LocalObject
   {
   public: