From cab486082414f13bd643d91c8450c6d6c53e7759 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 24 Feb 2010 13:21:49 +0000 Subject: Wed Feb 24 13:21:52 UTC 2010 Johnny Willemsen * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: Removed all lem interfaces * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: Fixed compile errors * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: Some callbacks are ndds specific --- CIAO/ChangeLog | 13 ++ CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl | 161 --------------------- .../dds4ccm/impl/ndds/ContentFilteredTopic.cpp | 2 + .../dds4ccm/impl/ndds/DataWriterListener_T.cpp | 2 + .../dds4ccm/impl/ndds/DataWriterListener_T.h | 2 + .../dds4ccm/impl/ndds/DomainParticipant.cpp | 2 +- 6 files changed, 20 insertions(+), 162 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 68c8f9777ae..4f4b7446b5c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Wed Feb 24 13:21:52 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + Removed all lem interfaces + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Fixed compile errors + + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: + Some callbacks are ndds specific + Wed Feb 24 11:43:52 UTC 2010 Johnny Willemsen * MPC/config/dds4ccm_ts_default.mpb: diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl index 41a7e6621c1..3a98aaae951 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl +++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl @@ -7,167 +7,6 @@ #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) # include "dds/DdsDcps.idl" -module DDS -{ - local interface CCM_Listener : ::DDS::Listener - { - }; -}; - -module DDS -{ - local interface CCM_TopicListener : ::DDS::TopicListener - { - }; -}; - -module DDS -{ - local interface CCM_DataWriterListener : ::DDS::DataWriterListener - { - }; -}; - -module DDS -{ - local interface CCM_PublisherListener : ::DDS::PublisherListener - { - }; -}; - -module DDS -{ - local interface CCM_DataReaderListener : ::DDS::DataReaderListener - { - }; -}; - -module DDS -{ - local interface CCM_SubscriberListener : ::DDS::SubscriberListener - { - }; -}; - -module DDS -{ - local interface CCM_DomainParticipantListener : ::DDS::DomainParticipantListener - { - }; -}; - -module DDS -{ - local interface CCM_Condition : ::DDS::Condition - { - }; -}; - -module DDS -{ - local interface CCM_StatusCondition : ::DDS::StatusCondition - { - }; -}; - -module DDS -{ - local interface CCM_ReadCondition : ::DDS::ReadCondition - { - }; -}; - -module DDS -{ - local interface CCM_QueryCondition : ::DDS::QueryCondition - { - }; -}; - -module DDS -{ - local interface CCM_Entity : ::DDS::Entity - { - }; -}; - -module DDS -{ - local interface CCM_DomainParticipant : ::DDS::DomainParticipant - { - }; -}; - -module DDS -{ - local interface CCM_DomainParticipantFactory : ::DDS::DomainParticipantFactory - { - }; -}; - -module DDS -{ - local interface CCM_TypeSupport : ::DDS::TypeSupport - { - }; -}; - -module DDS -{ - local interface CCM_TopicDescription : ::DDS::TopicDescription - { - }; -}; - -module DDS -{ - local interface CCM_Topic : ::DDS::Topic - { - }; -}; - - -module DDS -{ - local interface CCM_ContentFilteredTopic : ::DDS::ContentFilteredTopic - { - }; -}; - -module DDS -{ - local interface CCM_MultiTopic : ::DDS::MultiTopic - { - }; -}; - -module DDS -{ - local interface CCM_Publisher : ::DDS::Publisher - { - }; -}; - -module DDS -{ - local interface CCM_DataWriter : ::DDS::DataWriter - { - }; -}; - -module DDS -{ - local interface CCM_Subscriber : ::DDS::Subscriber - { - }; -}; - -module DDS -{ - local interface CCM_DataReader : ::DDS::DataReader - { - }; -}; #endif #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp index 244d1687065..9bdfb36e72d 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp @@ -85,6 +85,7 @@ namespace CIAO #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) return CORBA::string_dup (this->impl ()->get_type_name ()); #else + return this->impl ()->get_type_name (); #endif } @@ -94,6 +95,7 @@ namespace CIAO #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) return CORBA::string_dup (this->impl ()->get_name ()); #else + return this->impl ()->get_name (); #endif } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp index b8d3db721d6..898390a5959 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp @@ -48,6 +48,7 @@ CIAO::DDS4CCM::DataWriterListener_T::on_publication_matched { } +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) template void CIAO::DDS4CCM::DataWriterListener_T::on_reliable_reader_activity_changed ( @@ -55,6 +56,7 @@ CIAO::DDS4CCM::DataWriterListener_T::on_reliable_reader_acti const ::DDS::ReliableReaderActivityChangedStatus & ) { } +#endif template ::DDS::StatusMask diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h index 85da0d9dc9c..805499eac25 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h @@ -48,10 +48,12 @@ namespace CIAO ::DDS::DataWriter_ptr , const ::DDS::PublicationMatchedStatus & ); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) virtual void on_reliable_reader_activity_changed ( ::DDS::DataWriter_ptr , const ::DDS::ReliableReaderActivityChangedStatus & ); +#endif static ::DDS::StatusMask get_mask (void); }; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp index 28451f3a178..246f255f07f 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -538,7 +538,7 @@ namespace CIAO } #else ::DDS::Topic_var topic = this->impl ()->find_topic (impl_name, timeout); - if (rti_topic) + if (!CORBA::is_nil (topic.in ()) { ACE_NEW_RETURN (retval, CCM_DDS_Topic_i (topic.in ()), -- cgit v1.2.1