diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 6ea6950d196..777b034a758 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -25,7 +25,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Null_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -39,7 +39,7 @@ TAO_EC_Null_ObserverStrategy::append_observer ( void TAO_EC_Null_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -50,25 +50,25 @@ TAO_EC_Null_ObserverStrategy::remove_observer ( void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -83,7 +83,7 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Basic_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr obs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -106,15 +106,15 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( } RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->handle_generator_; @@ -124,7 +124,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( void TAO_EC_Basic_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -142,13 +142,13 @@ TAO_EC_Basic_ObserverStrategy::remove_observer ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -176,7 +176,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -184,13 +184,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -218,7 +218,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -226,13 +226,13 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -260,7 +260,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -268,13 +268,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -302,7 +302,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -310,12 +310,12 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Supplier_Headers worker (headers); - this->event_channel_->consumer_admin ()->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->event_channel_->consumer_admin ()->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::DependencySet& dep = qos.dependencies; @@ -337,13 +337,13 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Consumer_Headers worker (headers); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos.publications.length (headers.current_size ()); @@ -359,7 +359,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::ConsumerQOS& sub = supplier->subscriptions (); @@ -381,7 +381,7 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier void TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::SupplierQOS& pub = consumer->publications (); |