diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 20a4f41e712..902912a2183 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -62,10 +62,10 @@ public: virtual ~TAO_EC_ProxyPushConsumer (void); /// Activate in the POA - virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - void deactivate (CORBA::Environment &ACE_TRY_ENV); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -82,29 +82,29 @@ public: * it is disconnected then it returns true and sets the * <disconnected> flag. */ - CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL); /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. - virtual void connected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); + virtual void connected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. - virtual void connected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &env); + virtual void connected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (CORBA::Environment&); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// The QoS (subscription) used to connect to the EC, assumes the /// locks are held, use with care! @@ -117,22 +117,20 @@ public: // = The RtecEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment &) + const RtecEventChannelAdmin::SupplierQOS& qos + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); - virtual void push (const RtecEventComm::EventSet& event, - CORBA::Environment &) + virtual void push (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the |