diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index b180b3492cf..6f52a5a67bf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -18,20 +18,17 @@ TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void) } TAO_EC_Filter* -TAO_EC_Basic_Filter_Builder::build ( - TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment&) const +TAO_EC_Basic_Filter_Builder:: + build (RtecEventChannelAdmin::ConsumerQOS& qos) const { CORBA::ULong pos = 0; - return this->recursive_build (supplier, qos, pos); + return this->recursive_build (qos, pos); } TAO_EC_Filter* -TAO_EC_Basic_Filter_Builder:: recursive_build ( - TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::ULong& pos) const +TAO_EC_Basic_Filter_Builder:: + recursive_build (RtecEventChannelAdmin::ConsumerQOS& qos, + CORBA::ULong& pos) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR) @@ -43,7 +40,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); for (CORBA::ULong i = 0; i != n; ++i) { - children[i] = this->recursive_build (supplier, qos, pos); + children[i] = this->recursive_build (qos, pos); pos++; } return new TAO_EC_Conjunction_Filter (children, n); @@ -57,7 +54,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); for (CORBA::ULong i = 0; i != n; ++i) { - children[i] = this->recursive_build (supplier, qos, pos); + children[i] = this->recursive_build (qos, pos); pos++; } return new TAO_EC_Disjunction_Filter (children, n); @@ -69,7 +66,6 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( pos++; TAO_EC_QOS_Info qos_info; return new TAO_EC_Timeout_Filter (this->event_channel_, - supplier, qos_info, e.header.type, e.header.creation_time); |