diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp index b7a2218fdda..d53e7e0cb17 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp @@ -167,19 +167,19 @@ namespace CIAO ::DDS::DomainParticipant_ptr CCM_DDS_Topic_i::get_participant (void) { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); ACE_NEW_THROW_EX (retval, - ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i (), + CCM_DDS_DomainParticipant_i (p), CORBA::NO_MEMORY ()); - - DDSDomainParticipant* p = this->impl ()->get_participant (); - ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *rti_dp = dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *> (retval.in ()); - rti_dp->set_impl (p); - return retval._retn (); #else - return this->impl ()->get_participant (); + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); #endif + return retval._retn (); } DDSTopic * |