diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h index f3d62fb03b0..f074a25113f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h @@ -17,17 +17,13 @@ // ========================================================================== #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H #define TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H - #include "ace/pre.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ #include "Notify_ProxySupplier_T.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_ConsumerAdmin_i; +class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -36,7 +32,7 @@ class TAO_Notify_ConsumerAdmin_i; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier> +class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier>, public PortableServer::RefCountServantBase { // = TITLE // TAO_Notify_StructuredProxyPushSupplier_i @@ -46,7 +42,7 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No // public: - TAO_Notify_StructuredProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumer_admin); + TAO_Notify_StructuredProxyPushSupplier_i (TAO_Notify_ConsumerAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); // Constructor virtual ~TAO_Notify_StructuredProxyPushSupplier_i (void); @@ -69,27 +65,22 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No CORBA::SystemException )); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); - // Shutdown. - protected: // = Helper methods - void shutdown_i (CORBA::Environment &ACE_TRY_ENV); - // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); // Deliver the event to the consumer. virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); // Deliver the update to the consumer. - // = Data Members - CosNotifyComm::StructuredPushConsumer_var push_consumer_; - // The consumer that we're connect to. + virtual void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + // Cleanup all resources used by this object. + + CosNotifyComm::StructuredPushConsumer_var push_consumer_; + // The consumer that we're connect to. - private: - typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier> - proxy_inherited; + typedef TAO_Notify_ProxySupplier<POA_CosNotifyChannelAdmin::StructuredProxyPushSupplier> + structured_proxy_inherited; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) |