diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp index ce92ae11ad4..db78c8299a9 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp @@ -41,13 +41,17 @@ namespace CIAO RTI_Subscriber_i::get_statuscondition (void) { ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); ACE_NEW_THROW_EX (retval, - RTI_StatusCondition_i (), + CCM_DDS_StatusCondition_i (sc), CORBA::NO_MEMORY ()); - - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ()); - rti_sc->set_impl (sc); +#else + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); +#endif return retval._retn (); } @@ -160,7 +164,7 @@ namespace CIAO } DDSDataReader * rti_dr = 0; - RTI_Topic_i * topic = dynamic_cast < RTI_Topic_i * > (a_topic); + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); if (!topic) { @@ -222,7 +226,7 @@ namespace CIAO } DDSDataReader * rti_dr = 0; - RTI_Topic_i * topic = dynamic_cast < RTI_Topic_i * > (a_topic); + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); if (!topic) { |