diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 6306943ef3f..7391d41bd8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -56,25 +56,25 @@ TAO_EC_Sched_Filter::size (void) const int TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); } int TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } // This is private, so we can make it inline in the .cpp file... void TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } @@ -104,14 +104,14 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info void TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -119,14 +119,14 @@ TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, void TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -152,25 +152,25 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const int TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int matches = this->body_->add_dependencies (header, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (matches != 0) { this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::RT_Info_var info = - this->scheduler_->get (qos_info.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), @@ -180,7 +180,7 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - (*i)->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); + (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 0; @@ -188,16 +188,16 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, void TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; } void -TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL) { if (this->rt_info_computed_) return; @@ -214,7 +214,7 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) 0, // quantum 0, // threads this->info_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if 0 @@ -224,17 +224,17 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) TAO_EC_Filter* filter = *i; TAO_EC_QOS_Info child; - filter->get_qos_info (child TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (child ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->scheduler_->add_dependency (this->rt_info_, child.rt_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (child.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -250,11 +250,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->body_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->body_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -267,11 +267,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->rt_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->parent_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), |