diff options
Diffstat (limited to 'TAO/orbsvcs')
69 files changed, 76 insertions, 85 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h index 062e4077d88..1e892df895f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h @@ -36,7 +36,7 @@ class ImR_Locator_i; */ class INS_Locator : public virtual IORTable::Locator, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: INS_Locator (ImR_Locator_i& loc); diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h index 18b2210531d..0fb4c8c1ed6 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h @@ -10,7 +10,7 @@ class ORB_Initializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h index de2e6ebd5c6..6e92e1eb365 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h @@ -30,7 +30,7 @@ state_slot_id (PortableInterceptor::SlotId slot_id); class ReplicaController : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: virtual diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h index 584463e99a7..171dfdeb7a6 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h @@ -44,7 +44,7 @@ class ServerRequestInterceptor; */ class ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h index 74cb2fd2228..a5be7e9910e 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h @@ -46,7 +46,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL */ class ServerRequestInterceptor : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index fc5b5b2a382..52d41076d35 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -21,7 +21,7 @@ class Server_IORInterceptor : public virtual PortableInterceptor::IORInterceptor_3_0, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h index f64aa68b211..6ea98e2fab8 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h @@ -19,7 +19,7 @@ class Server_IORInterceptor_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: 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: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h index 3c46e040344..f099ff747f9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h @@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// RTCORBA ORB initializer. class FTRT_ClientORB_Initializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// Priority mapping types diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h index e1eb6fa03ef..b91a962f3bf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h @@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FTRT_ClientORB_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /// ctor. diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h index 877c6a26205..fb97b6ac338 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h @@ -24,7 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class FTEC_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/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h index 5823e871dab..9edff67c3da 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Set_Update_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: TAO_Set_Update_Interceptor (); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h index 5e954707386..6692136aab7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h @@ -45,7 +45,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_LB_ClientORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h index a20986f4f6d..b7c379ecc40 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h @@ -54,7 +54,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_LB_ClientRequestInterceptor : public virtual PortableInterceptor::ClientRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index aa22bfd1059..5a45b571013 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -50,7 +50,7 @@ class TAO_LB_LoadAlert; */ class TAO_LB_IORInterceptor : public virtual PortableInterceptor::IORInterceptor_3_0, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index d5a570cb318..a090cbdcb01 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -40,7 +40,7 @@ class TAO_LB_LoadManager; */ class TAO_LB_MemberLocator : public virtual PortableServer::ServantLocator, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index c019eebf019..1e99d50c554 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -52,7 +52,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_LB_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index dfdd7c2f0e6..e9750636ba0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -48,7 +48,7 @@ class TAO_LB_LoadAlert; */ class TAO_LoadBalancing_Export TAO_LB_ServerRequestInterceptor : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index 78d9db559d8..c79d3690a82 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -37,7 +37,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// PortableGroup ORB initializer. class TAO_PortableGroup_Export TAO_PortableGroup_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/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index f1b942eaaaa..1e38ca405f3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -57,7 +57,7 @@ namespace TAO */ class TAO_SSLIOP_Export SSLIOP_Credentials : public virtual SecurityLevel3::Credentials, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: typedef SSLIOP::Credentials_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index 3cd5ecb3e5f..88ac30c7fb9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -60,7 +60,7 @@ namespace TAO */ class TAO_SSLIOP_Export CredentialsAcquirer : public virtual SecurityLevel3::CredentialsAcquirer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 9d7cd1cf0e9..269b53d2e1f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -57,7 +57,7 @@ namespace TAO */ class Current : public ::SSLIOP::Current, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: typedef Current_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index 9375c18ac2d..be13316b77b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -54,7 +54,7 @@ namespace TAO */ class Server_Invocation_Interceptor : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 82c86738a09..fa85e9f75bb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -51,7 +51,7 @@ namespace TAO */ class ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index b53f35a3582..7d3311aeeb1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -53,7 +53,7 @@ namespace TAO */ class EstablishTrustPolicy : public virtual SecurityLevel2::EstablishTrustPolicy, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index bd5c87416be..95048ce20fc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -50,7 +50,7 @@ namespace TAO */ class QOPPolicy : public virtual SecurityLevel2::QOPPolicy, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h index 32da7a31219..3c74c27d5e2 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h @@ -52,7 +52,7 @@ namespace TAO */ class AccessDecision : public virtual TAO::SL2::AccessDecision, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: /*! Constructor */ @@ -166,7 +166,7 @@ namespace TAO */ class SecurityManager : public virtual SecurityLevel2::SecurityManager, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 74065d41b01..2d207113592 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -45,7 +45,7 @@ namespace TAO */ class ContextEstablishmentPolicy : public virtual SecurityLevel3::ContextEstablishmentPolicy, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index 25c932ef5e9..238b0f06d41 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -59,7 +59,7 @@ namespace TAO */ class TAO_Security_Export CredentialsCurator : public virtual SecurityLevel3::CredentialsCurator, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: typedef CredentialsCurator_ptr _ptr_type; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index f45f789aaaf..68b5118359f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -50,7 +50,7 @@ namespace TAO */ class ObjectCredentialsPolicy : public virtual SecurityLevel3::ObjectCredentialsPolicy, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 9804c3013c5..121f24d4f23 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -45,7 +45,7 @@ namespace TAO */ class PolicyFactory : public virtual PortableInterceptor::PolicyFactory, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index 08bfa48a9d3..3da92850217 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -55,7 +55,7 @@ namespace TAO */ class TAO_Security_Export SecurityCurrent : public virtual SecurityLevel3::SecurityCurrent, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 4bd46f9ea20..bc97221694c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -46,7 +46,7 @@ namespace TAO */ class SecurityManager : public virtual SecurityLevel3::SecurityManager, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 847ad9a85fd..ccc784d678b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -46,7 +46,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Security_Export TAO_Security_Current : public SecurityLevel2::Current, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index 5fafd3f3928..936af6c378e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -54,7 +54,7 @@ namespace TAO */ class TAO_Security_Export ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 336d9523d21..f81f25a26c0 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -48,7 +48,7 @@ namespace TAO */ class PolicyFactory : public PortableInterceptor::PolicyFactory, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h index b081f37b25f..7d812e928eb 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h @@ -44,7 +44,7 @@ class ServerRequestInterceptor; */ class ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h index 7ccd73b60f5..5e1e7c5fbcc 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h @@ -44,7 +44,7 @@ class ServerRequestInterceptor; */ class ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h index bbcd23168c9..015cb27533f 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h @@ -45,7 +45,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL */ class ServerRequestInterceptor : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h index 9d6ac8cca22..97d4735ebf8 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h @@ -38,7 +38,7 @@ class Server_Request_Interceptor; /// Server side ORB initializer. class Server_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h index cf3f4ff782e..4d49861d69d 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h @@ -35,7 +35,7 @@ */ class Server_Request_Interceptor : public virtual Simple_ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h index b80f8a306dc..6dc4fb2876b 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h @@ -23,7 +23,7 @@ /// RTCORBA ORB initializer. class Server_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h index 58a08867a06..ed30383aacc 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h @@ -23,7 +23,7 @@ /// RTCORBA ORB initializer. class Server_ORBInitializer2 : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h index 0b5eb02ab6c..d4ede34bf6b 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h @@ -25,7 +25,7 @@ */ class TAO249_ServerRequest_Interceptor : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h index 209e1ecd17c..a2c88f6ddce 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h @@ -26,7 +26,7 @@ */ class TAO249_ServerRequest_Interceptor2 : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h index 58a08867a06..ed30383aacc 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h @@ -23,7 +23,7 @@ /// RTCORBA ORB initializer. class Server_ORBInitializer2 : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h index 536d3782173..a038756837b 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h @@ -26,7 +26,7 @@ */ class TAO249_ServerRequest_Interceptor2 : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h index 58a08867a06..ed30383aacc 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h @@ -23,7 +23,7 @@ /// RTCORBA ORB initializer. class Server_ORBInitializer2 : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h index 7b978a5702a..1085209cac6 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h @@ -25,7 +25,7 @@ */ class ServerRequest_Interceptor2 : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h index 71fc032b9d5..088c8343ac8 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h @@ -23,7 +23,7 @@ /// RTCORBA ORB initializer. class Server_ORBInitializer2 : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h index 1e5af4cc2d5..cdeb9e083ac 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h @@ -26,7 +26,7 @@ */ class TAO249_ServerRequest_Interceptor2 : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h index a4e8ed8baa5..6b53d4ca40f 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h @@ -23,7 +23,7 @@ /// RTCORBA ORB initializer. class Server_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h index bf87427ba9b..b28599c118a 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h @@ -25,7 +25,7 @@ */ class TAO249_ServerRequest_Interceptor : public virtual PortableInterceptor::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h index fa650dc5676..9ae2e562723 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h @@ -41,7 +41,7 @@ class Server_Request_Interceptor; /// Server side ORB initializer. class Server_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h index 5dc35aa4be1..9389883ffde 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h @@ -39,7 +39,7 @@ */ class Server_Request_Interceptor : public virtual ForwardRequestTest::ServerRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + public virtual ::CORBA::LocalObject { public: |