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 | 37 |
1 files changed, 11 insertions, 26 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..105794b8d1b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -5,7 +5,6 @@ #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" #include "EC_Disjunction_Filter.h" -#include "EC_Timeout_Filter.h" #if ! defined (__ACE_INLINE__) #include "EC_Basic_Filter_Builder.i" @@ -18,20 +17,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 +39,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,23 +53,11 @@ 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); } - else if (e.header.type == ACE_ES_EVENT_TIMEOUT - || e.header.type == ACE_ES_EVENT_INTERVAL_TIMEOUT - || e.header.type == ACE_ES_EVENT_DEADLINE_TIMEOUT) - { - 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); - } return new TAO_EC_Type_Filter (e.header); } @@ -83,8 +67,9 @@ TAO_EC_Basic_Filter_Builder:: CORBA::ULong pos) const { CORBA::ULong l = qos.dependencies.length (); - CORBA::ULong i; - for (i = pos; i != l; ++i) + for (CORBA::ULong i = pos; + i != l; + ++i) { const RtecEventComm::Event& e = qos.dependencies[i].event; if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR |