diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h index dda47b67941..992e3e09fea 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h @@ -18,17 +18,13 @@ #ifndef TAO_NOTIFY_PROXYPUSHCONSUMER_I_H #define TAO_NOTIFY_PROXYPUSHCONSUMER_I_H - #include "ace/pre.h" -#include "Notify_ProxyConsumer_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "Notify_ProxyConsumer_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_SupplierAdmin_i; +class TAO_Notify_Resource_Manager; class TAO_Notify_Event_Manager; #if defined(_MSC_VER) @@ -38,7 +34,7 @@ class TAO_Notify_Event_Manager; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_ProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::ProxyPushConsumer> +class TAO_Notify_Export TAO_Notify_ProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::ProxyPushConsumer>, public PortableServer::RefCountServantBase { // = TITLE // TAO_Notify_ProxyPushConsumer_i @@ -48,7 +44,8 @@ class TAO_Notify_Export TAO_Notify_ProxyPushConsumer_i : public TAO_Notify_Proxy // public: - TAO_Notify_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin); + TAO_Notify_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, + TAO_Notify_Resource_Manager* resource_manager); // Constructor virtual ~TAO_Notify_ProxyPushConsumer_i (void); @@ -81,7 +78,10 @@ virtual void disconnect_push_consumer ( // = Helper methods virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); - // = Data members + void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + // Cleanup all resources used by this object. + +// = Data members CORBA::Boolean notify_style_supplier_; // True if the supplier supports the NotifySubscribe interface. // If it does, we use the <notify_push_supplier_> else we use @@ -91,7 +91,6 @@ virtual void disconnect_push_consumer ( CosNotifyComm::PushSupplier_var notify_push_supplier_; // The supplier connected to us. - private: typedef TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::ProxyPushConsumer> proxy_inherited; }; @@ -107,7 +106,7 @@ class TAO_Notify_Export TAO_Notify_CosEC_ProxyPushConsumer_i : public virtual PO // public: // = Initialization and termination methods. - TAO_Notify_CosEC_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmi); + TAO_Notify_CosEC_ProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplieradmin, TAO_Notify_Resource_Manager* resource_manager); // Constructor. virtual ~TAO_Notify_CosEC_ProxyPushConsumer_i (void); @@ -131,7 +130,6 @@ public: CosEventChannelAdmin::AlreadyConnected)); // Connects a push supplier. protected: - // = Data Members TAO_Notify_ProxyPushConsumer_i notify_proxy_; // Proxy to delegate to. }; |