diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 8d685ccc521..6f31edc67ae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -40,7 +40,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; for (int i = 0; i < this->ntasks_; ++i) { ACE_TRY @@ -51,7 +51,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period); RtecScheduler::handle_t rt_info = - this->scheduler_->create (buf, ACE_TRY_ENV); + this->scheduler_->create (buf TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->scheduler_->set (rt_info, @@ -63,8 +63,8 @@ TAO_EC_Priority_Dispatching::activate (void) RtecScheduler::VERY_LOW_IMPORTANCE, 0, // quantum 1, // threads - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -112,19 +112,19 @@ void TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info, ACE_TRY_ENV); + this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->tasks_ == 0) this->activate (); @@ -137,5 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, } - this->tasks_[i]->push (proxy, consumer, event, ACE_TRY_ENV); + this->tasks_[i]->push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); } |