1 files changed, 6 insertions, 26 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index fa8d1cc68ff..0eef922ab1c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -3,7 +3,7 @@
 #include "EC_Type_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Type_Filter.i"
+#include "EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Type_Filter, "$Id$")
@@ -22,7 +22,7 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
   if (event.length () != 1)
     return 0;
 
-  if (this->can_match (event[0].header)) // TAO_EC_Filter::matches (this->header
+  if (TAO_EC_Filter::matches (this->header_, event[0].header))
     {
       this->push (event, qos_info, ACE_TRY_ENV);
       return 1;
@@ -39,7 +39,7 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
   if (event.length () != 1)
     return 0;
 
-  if (this->can_match (event[0].header)) // TAO_EC_Filter::matches (this->header
+  if (TAO_EC_Filter::matches (this->header_, event[0].header))
     {
       this->push_nocopy (event, qos_info, ACE_TRY_ENV);
       return 1;
@@ -76,28 +76,8 @@ TAO_EC_Type_Filter::max_event_size (void) const
   return 1;
 }
 
-int
-TAO_EC_Type_Filter::can_match (
-      const RtecEventComm::EventHeader& header) const
-{
-  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
-          && this->header_.source == header.source);
-}
-
-int
-TAO_EC_Type_Filter::add_dependencies (
-      const RtecEventComm::EventHeader& header,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+void
+TAO_EC_Type_Filter::event_ids(TAO_EC_Filter::Headers& headers)
 {
-  return this->can_match (header);
+  headers.insert (this->header_, 1);
 }
-