diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index fa8d1cc68ff..bf8272708f1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -80,24 +80,14 @@ int TAO_EC_Type_Filter::can_match ( const RtecEventComm::EventHeader& header) const { - if (this->header_.source == 0) - if (this->header_.type == 0) - return 1; + if (this->header_.source == 0) + if (this->header_.type == 0) + return 1; else - return this->header_.type == header.type; - else if (this->header_.type == 0) - return this->header_.source == header.source; - + return this->header_.type == header.type; + else if (this->header_.type == 0) + return this->header_.source == header.source; + return (this->header_.type == header.type && this->header_.source == header.source); } - -int -TAO_EC_Type_Filter::add_dependencies ( - const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &, - CORBA::Environment &) -{ - return this->can_match (header); -} - |