diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-08 13:04:51 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-08 13:04:51 +0000 |
| commit | 88e12fc88923c83bb79cb1db4b1ee0d490abdf29 (patch) | |
| tree | 0553cf14d1c2b185233e7040e8c5f08ad7e4f26f /CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp | |
| parent | 4edbf491a807248ab6f184420d77233bb5a3e878 (diff) | |
| download | ATCD-88e12fc88923c83bb79cb1db4b1ee0d490abdf29.tar.gz | |
Fri Jun 8 13:01:47 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ConditionManager.h:
* connectors/dds4ccm/impl/ConditionManager.cpp:
* connectors/dds4ccm/impl/Getter_T.cpp:
Simplified the condition manager and getter by using the
get_trigger_status call on the condition. The condition manager
wait method now only returns true when one of the conditions has
triggered, which means we don't have to check the conditions anymore
in the getter
* connectors/dds4ccm/impl/ndds/WaitSet.h:
* connectors/dds4ccm/impl/ndds/WaitSet.cpp:
Removed check_condition, this isn't a spec defined method but
was only here for the condition manager
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp index 463ddcaefad..eefaa2444e5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp @@ -162,22 +162,6 @@ namespace CIAO return ret; } - bool - DDS_WaitSet_i::check_condition ( - ::DDS::ReadCondition_ptr rc, - ::DDS::QueryCondition_ptr qc, - ::DDS::Condition_ptr condition) - { - DDS_ReadCondition_i * dds_rc = dynamic_cast <DDS_ReadCondition_i *> (rc); - DDS_QueryCondition_i * dds_qc = dynamic_cast <DDS_QueryCondition_i *> (qc); - - DDS_ReadCondition_i * rc_cond = dynamic_cast <DDS_ReadCondition_i *> (condition); - DDS_QueryCondition_i * qc_cond = dynamic_cast <DDS_QueryCondition_i *> (condition); - - return ((rc_cond && dds_rc && rc_cond->get_rti_entity () == dds_rc->get_rti_entity ()) || - (qc_cond && dds_qc && qc_cond->get_rti_entity () == dds_qc->get_rti_entity ()) ); - } - DDSWaitSet * DDS_WaitSet_i::get_rti_entity (void) { |