diff options
13 files changed, 59 insertions, 329 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d36cc8bcb96..7405965f8d7 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,26 @@ +Wed Mar 6 11:03:12 2002 Ossama Othman <ossama@uci.edu> + + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i + (_add_ref, _remove_ref): + * tao/IORManipulation/IORManipulation.h: + * tao/IORManipulation/IORManipulation.cpp (_add_ref, _remove_ref): + * tests/Portable_Interceptors/Benchmark/interceptors.h: + * tests/Portable_Interceptors/Benchmark/interceptors.cpp + (_add_ref, _remove_ref): + * tests/Portable_Interceptors/Dynamic/interceptors.h: + * tests/Portable_Interceptors/Dynamic/interceptors.cpp + (_add_ref, _remove_ref): + * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h: + * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp (_add_ref, _remove_ref): + * tests/RTCORBA/Client_Propagated/interceptors.h: + * tests/RTCORBA/Client_Propagated/interceptors.cpp: + (_add_ref, _remove_ref): + + Removed these methods. They called methods that no longer + exist. Inheriting from TAO_Local_RefCounted_Object provides the + correct implementation. + Wed Mar 6 07:29:19 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * orbsvcs/orbsvcs/Property/CosPropertyService_i.h: Correctly push/pop diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index 3fe6434051e..f18b59e7ad2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -44,8 +44,9 @@ class TAO_Profile; -class TAO_FT_Export TAO_FT_IOGR_Property : public TAO_IOP::TAO_IOR_Property, - public CORBA::LocalObject +class TAO_FT_Export TAO_FT_IOGR_Property + : public virtual TAO_IOP::TAO_IOR_Property, + public virtual TAO_Local_RefCounted_Object { // = TITLE // TAO_FT_IOGR_Property @@ -68,12 +69,6 @@ public: ~TAO_FT_IOGR_Property (void); // destructor - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual CORBA::Boolean set_property ( CORBA::Object_ptr ior ACE_ENV_ARG_DECL_WITH_DEFAULTS) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i index 653fe207511..71c47597639 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i @@ -1,4 +1,7 @@ +// -*- C++ -*- +// //$Id$ + ACE_INLINE TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ( FT::TagFTGroupTaggedComponent &ft_group) @@ -11,20 +14,6 @@ TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void) { } -ACE_INLINE void -TAO_FT_IOGR_Property::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -ACE_INLINE void -TAO_FT_IOGR_Property::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - ACE_INLINE CORBA::Boolean TAO_FT_IOGR_Property::reset_tagged_components ( FT::TagFTGroupTaggedComponent &ft_group) diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 728d357f902..97937df074a 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -33,20 +33,6 @@ TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void) { } -void -TAO_IOR_Manipulation_impl::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -TAO_IOR_Manipulation_impl::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - CORBA::Object_ptr TAO_IOR_Manipulation_impl::merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index 2fe4a8cc396..52cbf0be36b 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -39,7 +39,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation_impl : public TAO_IOP::TAO_IOR_Manipulation, - public CORBA::LocalObject + public TAO_Local_RefCounted_Object { // = TITLE // IOR Manipulation class @@ -55,12 +55,6 @@ public: ~TAO_IOR_Manipulation_impl (void); // destructor - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors ACE_ENV_ARG_DECL_WITH_DEFAULTS) diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp index b90b7642047..80d45689a3a 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp @@ -18,20 +18,6 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor () { } -void -Vault_Client_Request_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Client_Request_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -167,20 +153,6 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor () { } -void -Vault_Server_Request_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Server_Request_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -297,20 +269,6 @@ Vault_Client_Request_Context_Interceptor::~Vault_Client_Request_Context_Intercep { } -void -Vault_Client_Request_Context_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Client_Request_Context_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Client_Request_Context_Interceptor::name ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -420,20 +378,6 @@ Vault_Server_Request_Context_Interceptor::~Vault_Server_Request_Context_Intercep { } -void -Vault_Server_Request_Context_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Server_Request_Context_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Server_Request_Context_Interceptor::name ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -518,20 +462,6 @@ Vault_Client_Request_Dynamic_Interceptor::~Vault_Client_Request_Dynamic_Intercep { } -void -Vault_Client_Request_Dynamic_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Client_Request_Dynamic_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Client_Request_Dynamic_Interceptor::name ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -672,20 +602,6 @@ Vault_Server_Request_Dynamic_Interceptor::~Vault_Server_Request_Dynamic_Intercep { } -void -Vault_Server_Request_Dynamic_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Server_Request_Dynamic_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Server_Request_Dynamic_Interceptor::name ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -808,20 +724,6 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor () { } -void -Vault_Client_Request_NOOP_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Client_Request_NOOP_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Client_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -911,20 +813,6 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor () { } -void -Vault_Server_Request_NOOP_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Vault_Server_Request_NOOP_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Vault_Server_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h index 05206a6e7d4..ee26d3e0537 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h @@ -19,8 +19,8 @@ #endif /* _MSC_VER */ class Vault_Client_Request_Interceptor - : public PortableInterceptor::ClientRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Client-side Vault interceptor. For checking interceptor visually only. public: @@ -29,12 +29,6 @@ public: virtual ~Vault_Client_Request_Interceptor (); // dtor. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -70,8 +64,8 @@ private: }; class Vault_Server_Request_Interceptor - : public PortableInterceptor::ServerRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ServerRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Server-side Vault interceptor. For checking interceptor visually only. public: @@ -80,12 +74,6 @@ public: ~Vault_Server_Request_Interceptor (); // dotr. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -123,8 +111,8 @@ private: }; class Vault_Client_Request_Context_Interceptor - : public PortableInterceptor::ClientRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Client-side Vault interceptor. For checking interceptor visually only. public: @@ -133,12 +121,6 @@ public: virtual ~Vault_Client_Request_Context_Interceptor (); // dtor. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -174,8 +156,8 @@ private: }; class Vault_Server_Request_Context_Interceptor - : public PortableInterceptor::ServerRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ServerRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Server-side Vault interceptor. For checking interceptor visually only. public: @@ -184,12 +166,6 @@ public: ~Vault_Server_Request_Context_Interceptor (); // dotr. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -228,8 +204,8 @@ private: class Vault_Client_Request_Dynamic_Interceptor - : public PortableInterceptor::ClientRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Client-side Vault interceptor. For checking interceptor visually only. public: @@ -238,12 +214,6 @@ public: virtual ~Vault_Client_Request_Dynamic_Interceptor (); // dtor. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -279,8 +249,8 @@ private: }; class Vault_Server_Request_Dynamic_Interceptor - : public PortableInterceptor::ServerRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ServerRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Server-side Vault interceptor. For checking interceptor visually only. public: @@ -289,12 +259,6 @@ public: ~Vault_Server_Request_Dynamic_Interceptor (); // dotr. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -333,8 +297,8 @@ private: class Vault_Client_Request_NOOP_Interceptor - : public PortableInterceptor::ClientRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Client-side Vault interceptor. For checking interceptor visually only. public: @@ -343,12 +307,6 @@ public: virtual ~Vault_Client_Request_NOOP_Interceptor (); // dtor. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -384,8 +342,8 @@ private: }; class Vault_Server_Request_NOOP_Interceptor - : public PortableInterceptor::ServerRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ServerRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Server-side Vault interceptor. For checking interceptor visually only. public: @@ -394,12 +352,6 @@ public: ~Vault_Server_Request_NOOP_Interceptor (); // dotr. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp index 254109d8afe..cc7bc8877e7 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp @@ -20,20 +20,6 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } -void -Echo_Client_Request_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Echo_Client_Request_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -197,20 +183,6 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () { } -void -Echo_Server_Request_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Echo_Server_Request_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h index e0f6bfa90ab..61979e6c859 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ #ifndef TAO_INTERCEPTORS_H @@ -17,22 +19,17 @@ #endif /* _MSC_VER */ class Echo_Client_Request_Interceptor -: public PortableInterceptor::ClientRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Client-side echo interceptor. For checking interceptor visually only. public: + Echo_Client_Request_Interceptor (void); // ctor. virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -78,8 +75,8 @@ private: }; class Echo_Server_Request_Interceptor -: public PortableInterceptor::ServerRequestInterceptor, - public CORBA::LocalObject + : public PortableInterceptor::ServerRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Server-side echo interceptor. For checking interceptor visually only. public: @@ -88,12 +85,6 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp index 94318e09bdc..f1463742537 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp @@ -22,20 +22,6 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) { } -void -Echo_Client_Request_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Echo_Client_Request_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -289,20 +275,6 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) { } -void -Echo_Server_Request_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Echo_Server_Request_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h index c1c21678dae..c1dc2439716 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h @@ -21,8 +21,8 @@ #endif /* _MSC_VER */ class Echo_Client_Request_Interceptor - : public PortableInterceptor::ClientRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Client-side echo interceptor. For checking interceptor visually only. public: @@ -32,12 +32,6 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. @@ -79,8 +73,8 @@ private: }; class Echo_Server_Request_Interceptor - : public PortableInterceptor::ServerRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ServerRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { // = Server-side echo interceptor. For checking interceptor visually only. public: @@ -90,12 +84,6 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp index 5f25dd80e4a..3b99bfb23ad 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -18,20 +18,6 @@ Client_Request_Interceptor::~Client_Request_Interceptor (void) { } -void -Client_Request_Interceptor::_add_ref (void) -{ - this->_incr_refcnt (); - // This is a TAO specific implementation. -} - -void -Client_Request_Interceptor::_remove_ref (void) -{ - this->_decr_refcnt (); - // This is a TAO specific implementation. -} - char * Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h index 3bea78ef097..a82ac39dc31 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h @@ -21,8 +21,8 @@ #endif /* _MSC_VER */ class Client_Request_Interceptor - : public PortableInterceptor::ClientRequestInterceptor, - public CORBA::LocalObject + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual TAO_Local_RefCounted_Object { /// Client-side interceptor. Verifies presense of RTCORBA priority /// context in the reply messages. @@ -33,12 +33,6 @@ public: virtual ~Client_Request_Interceptor (); // dtor. - virtual void _add_ref (void); - // Increment the reference count. - - virtual void _remove_ref (void); - // Decrement the reference count. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. |