diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index e731eb6fb4e..b095cfaebe9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -120,11 +120,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_EC_Dispatching* dispatching (void) const; @@ -188,20 +188,20 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Simple flags to control the EC behavior, set by the application // at construction time. @@ -226,31 +226,31 @@ public: // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: - /// this->consumer_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL) + for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: - /// this->supplier_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, |