diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h index 9f0a12e3cad..192ec369fe5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h @@ -19,18 +19,13 @@ #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H #define TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_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_ProxyConsumer_T.h" -#include "notify_export.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" class TAO_Notify_SupplierAdmin_i; +class TAO_Notify_Resource_Manager; #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -39,7 +34,7 @@ class TAO_Notify_SupplierAdmin_i; #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer> +class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer_i : public TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>, public PortableServer::RefCountServantBase { // = TITLE // TAO_Notify_StructuredProxyPushConsumer_i @@ -49,7 +44,7 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer_i : public TAO_No // public: - TAO_Notify_StructuredProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* supplier_admin); + TAO_Notify_StructuredProxyPushConsumer_i (TAO_Notify_SupplierAdmin_i* consumeradmin, TAO_Notify_Resource_Manager* resource_manager); // Constructor virtual ~TAO_Notify_StructuredProxyPushConsumer_i (void); @@ -86,13 +81,15 @@ protected: virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); // dispatch updates to the supplier. + void cleanup_i (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + // Cleanup all resources used by this object. + // = Data members CosNotifyComm::StructuredPushSupplier_var push_supplier_; // The supplier that we're connected to. -private: typedef TAO_Notify_ProxyConsumer <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer> - proxy_inherited; + structured_proxy_inherited; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) |