diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h | 105 |
1 files changed, 41 insertions, 64 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index 28d75a6fd28..248c4335d6c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -21,7 +21,13 @@ #include "orbsvcs/CosNotifyChannelAdminS.h" #include "Admin.h" -#include "Destroy_Callback.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ /** * @class TAO_NS_SupplierAdmin @@ -29,9 +35,9 @@ * @brief Implementation of CosNotifyChannelAdmin::SupplierAdmin * */ -class TAO_Notify_Export TAO_NS_SupplierAdmin : public virtual POA_CosNotifyChannelAdmin::SupplierAdmin, public TAO_NS_Admin, public TAO_NS_Destroy_Callback +class TAO_Notify_Export TAO_NS_SupplierAdmin : public virtual POA_CosNotifyChannelAdmin::SupplierAdmin + , public virtual TAO_NS_Admin { - friend class TAO_NS_Builder; public: /// Constuctor TAO_NS_SupplierAdmin (void); @@ -39,171 +45,142 @@ public: /// Destructor ~TAO_NS_SupplierAdmin (); - /// Return servant - virtual PortableServer::Servant servant (void); + /// Init + void init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL); /// ServantBase refcount methods. virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); - /// TAO_NS_Destroy_Callback methods + /// Release virtual void release (void); protected: /// = CosNotifyChannelAdmin::SupplierAdmin methods - virtual CosNotifyChannelAdmin::AdminID MyID ( - - ) + virtual CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - - ) + virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - - ) + virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers ( - - ) + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ( - - ) + virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( - CosNotifyChannelAdmin::ProxyID proxy_id - ) + virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyChannelAdmin::ProxyNotFound )); - virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer ( - CosNotifyChannelAdmin::ClientType ctype, + virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyChannelAdmin::AdminLimitExceeded )); - virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer ( - CosNotifyChannelAdmin::ClientType ctype, + virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyChannelAdmin::AdminLimitExceeded )); - virtual void destroy ( - - ) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosNotification::QoSProperties * get_qos ( - - ) + virtual ::CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void set_qos ( - const CosNotification::QoSProperties & qos - ) + virtual void set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException , CosNotification::UnsupportedQoS )); - virtual void validate_qos ( - const CosNotification::QoSProperties & required_qos, + virtual void validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - ) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException , CosNotification::UnsupportedQoS )); - virtual void offer_change ( - const CosNotification::EventTypeSeq & added, + virtual void offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyComm::InvalidEventType )); - virtual CosNotifyFilter::FilterID add_filter ( - CosNotifyFilter::Filter_ptr new_filter - ) + virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void remove_filter ( - CosNotifyFilter::FilterID filter - ) + virtual void remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyFilter::FilterNotFound )); - virtual ::CosNotifyFilter::Filter_ptr get_filter ( - CosNotifyFilter::FilterID filter - ) + virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException , CosNotifyFilter::FilterNotFound )); - virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters ( - - ) + virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void remove_all_filters ( - - ) + virtual void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ( - - ) + virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( - - ) + virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); }; +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + #if defined (__ACE_INLINE__) #include "SupplierAdmin.inl" #endif /* __ACE_INLINE__ */ |