From 19804879bf683cc1e77ddb3a2113d1809d13d464 Mon Sep 17 00:00:00 2001 From: msmit Date: Wed, 24 Feb 2010 08:09:58 +0000 Subject: Wed Feb 24 08:06:47 UTC 2010 Marcel Smit * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: * connectors/dds4ccm/impl/ndds/DataReader.cpp: * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: * connectors/dds4ccm/impl/ndds/DataWriter.cpp: * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: * connectors/dds4ccm/impl/ndds/DomainParticipant.h: * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: * connectors/dds4ccm/impl/ndds/Subscriber.h: * connectors/dds4ccm/impl/ndds/Subscriber.cpp: * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: * connectors/dds4ccm/impl/ndds/Topic.cpp: * connectors/dds4ccm/impl/ndds/Utils.h: Resolved compiler warnings. Also removed unnecessary space characters. --- CIAO/ChangeLog | 22 ++++++++++++ .../dds4ccm/impl/ndds/ContentFilteredTopic.cpp | 4 +-- CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp | 42 +++++++++++----------- .../dds4ccm/impl/ndds/DataReaderListener.cpp | 14 ++++---- CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp | 38 +++++++++++--------- .../dds4ccm/impl/ndds/DataWriterListener.cpp | 8 ++--- .../dds4ccm/impl/ndds/DomainParticipant.cpp | 18 ++++++---- .../dds4ccm/impl/ndds/DomainParticipant.h | 2 +- .../dds4ccm/impl/ndds/DomainParticipantFactory.cpp | 4 +-- .../impl/ndds/DomainParticipantListener_T.h | 2 +- .../dds4ccm/impl/ndds/PublisherListener.cpp | 8 ++--- .../dds4ccm/impl/ndds/PublisherListener_T.cpp | 6 ++-- .../dds4ccm/impl/ndds/QueryCondition.cpp | 8 ++--- CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp | 6 ++-- CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h | 2 +- .../dds4ccm/impl/ndds/SubscriberListener.cpp | 16 ++++----- CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp | 20 +++++------ CIAO/connectors/dds4ccm/impl/ndds/Utils.h | 2 +- 18 files changed, 129 insertions(+), 93 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index fd53bf6da17..f708e51a7f6 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,25 @@ +Wed Feb 24 08:06:47 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.h: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + * connectors/dds4ccm/impl/ndds/Utils.h: + Resolved compiler warnings. Also removed unnecessary + space characters. + Wed Feb 24 07:28:52 UTC 2010 Johnny Willemsen * connectors/dds4ccm/idl/dds_rtf2_dcps.idl diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp index dee53d8ac70..8eaf1247a00 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp @@ -41,7 +41,7 @@ namespace CIAO #else ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( expression_parameters); -#endif +#endif return retval; } @@ -57,7 +57,7 @@ namespace CIAO return this->impl ()->set_expression_parameters (parameters); #else return this->impl ()->set_expression_parameters (expression_parameters); -#endif +#endif } ::DDS::Topic_ptr diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp index 7aa512fca47..9fb0b784d05 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp @@ -57,7 +57,7 @@ namespace CIAO return retval._retn (); #else return this->impl ()->get_statuscondition (); -#endif +#endif } ::DDS::StatusMask @@ -76,7 +76,7 @@ namespace CIAO return handle; #else return this->impl ()->get_instance_handle (); -#endif +#endif } ::DDS::ReadCondition_ptr @@ -97,7 +97,7 @@ namespace CIAO return retval._retn (); #else return this->impl ()->create_readcondition (sample_states, view_states, instance_states); -#endif +#endif } ::DDS::QueryCondition_ptr @@ -134,7 +134,7 @@ namespace CIAO instance_states, query_expression, query_parameters); -#endif +#endif } ::DDS::ReturnCode_t @@ -150,7 +150,7 @@ namespace CIAO return this->impl ()->delete_readcondition (rc->get_impl ()); #else return this->impl ()->delete_readcondition (a_condition); -#endif +#endif } ::DDS::ReturnCode_t @@ -169,7 +169,7 @@ namespace CIAO return this->impl ()->set_qos (ddsqos); #else return this->impl ()->set_qos (qos); -#endif +#endif } ::DDS::ReturnCode_t @@ -183,7 +183,7 @@ namespace CIAO return retval; #else return this->impl ()->get_qos (qos); -#endif +#endif } ::DDS::ReturnCode_t @@ -204,7 +204,7 @@ namespace CIAO return this->impl ()->set_listener (rti_drl, mask); #else return this->impl ()->set_listener (a_listener, mask); -#endif +#endif } ::DDS::DataReaderListener_ptr @@ -224,7 +224,7 @@ namespace CIAO return rti_drl->get_datareaderlistener (); #else return this->impl ()->get_listener (); -#endif +#endif } ::DDS::TopicDescription_ptr @@ -242,7 +242,7 @@ namespace CIAO return dds_td._retn (); #else return this->impl ()->get_topicdescription (); -#endif +#endif } ::DDS::Subscriber_ptr @@ -260,7 +260,7 @@ namespace CIAO return dds_td._retn (); #else return this->impl ()->get_subscriber (); -#endif +#endif } ::DDS::ReturnCode_t @@ -274,7 +274,7 @@ namespace CIAO return retval; #else return this->impl ()->get_sample_rejected_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -288,7 +288,7 @@ namespace CIAO return retval; #else return this->impl ()->get_liveliness_changed_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -302,7 +302,7 @@ namespace CIAO return retval; #else return this->impl ()->get_requested_deadline_missed_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -316,7 +316,7 @@ namespace CIAO return retval; #else return this->impl ()->get_requested_incompatible_qos_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -330,7 +330,7 @@ namespace CIAO return retval; #else return this->impl ()->get_subscription_matched_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -344,7 +344,7 @@ namespace CIAO return retval; #else return this->impl ()->get_sample_lost_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -357,7 +357,7 @@ namespace CIAO return this->impl ()->wait_for_historical_data (rtiduration); #else return this->impl ()->wait_for_historical_data (max_wait); -#endif +#endif } ::DDS::ReturnCode_t @@ -371,7 +371,7 @@ namespace CIAO return retval; #else return this->impl ()->get_matched_publications (publication_handles); -#endif +#endif } ::DDS::ReturnCode_t @@ -380,11 +380,13 @@ namespace CIAO DDS_INSTANCE_HANDLE_T_IN publication_handle) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (publication_data); + ACE_UNUSED_ARG (publication_handle); throw CORBA::NO_IMPLEMENT (); // Add your implementation here #else return this->impl ()->get_matched_publication_data (publication_data, publication_handle); -#endif +#endif } DDSDataReader * diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp index 49767d79dc9..cf307eb4251 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp @@ -44,7 +44,7 @@ namespace CIAO this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); #else this->impl_->on_requested_deadline_missed (the_reader, status); -#endif +#endif } void @@ -63,7 +63,7 @@ namespace CIAO this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); #else this->impl_->on_requested_incompatible_qos (the_reader, status); -#endif +#endif } void @@ -82,7 +82,7 @@ namespace CIAO this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); #else this->impl_->on_sample_rejected (the_reader, status); -#endif +#endif } void @@ -101,7 +101,7 @@ namespace CIAO this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); #else this->impl_->on_liveliness_changed (the_reader, status); -#endif +#endif } void @@ -116,7 +116,7 @@ namespace CIAO this->impl_->on_data_available (dds_reader.in ()); #else this->impl_->on_data_available (the_reader); -#endif +#endif } void @@ -135,7 +135,7 @@ namespace CIAO this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); #else this->impl_->on_subscription_matched (the_reader, status); -#endif +#endif } void @@ -154,7 +154,7 @@ namespace CIAO this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); #else this->impl_->on_sample_lost (the_reader, status); -#endif +#endif } ::DDS::DataReaderListener_ptr diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp index 11bc06a0ba9..f5dba7c72ce 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp @@ -33,25 +33,27 @@ namespace CIAO ::DDS::ReturnCode_t RTI_DataWriter_i::set_qos (const ::DDS::DataWriterQos & qos) { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) DDS4CCM_TRACE ("RTI_DataWriter_i::set_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); throw CORBA::NO_IMPLEMENT (); // Add your implementation here #else return this->impl ()->set_qos (qos); -#endif +#endif } ::DDS::ReturnCode_t RTI_DataWriter_i::get_qos (::DDS::DataWriterQos & qos) { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) DDS4CCM_TRACE ("RTI_DataWriter_i::get_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); throw CORBA::NO_IMPLEMENT (); // Add your implementation here #else return this->impl ()->get_qos (qos); -#endif +#endif } ::DDS::ReturnCode_t @@ -69,7 +71,7 @@ namespace CIAO return this->impl ()->set_listener (rti_impl_list, mask); #else return this->impl ()->set_listener (a_listener, mask); -#endif +#endif } ::DDS::DataWriterListener_ptr @@ -87,7 +89,7 @@ namespace CIAO return list_proxy->get_datawriterlistener (); #else return this->impl ()->get_listener (); -#endif +#endif } ::DDS::Topic_ptr @@ -105,7 +107,7 @@ namespace CIAO return retval._retn (); #else return this->impl ()->get_topic (); -#endif +#endif } ::DDS::Publisher_ptr @@ -123,7 +125,7 @@ namespace CIAO return retval._retn (); #else return this->impl ()->get_publisher (); -#endif +#endif } ::DDS::ReturnCode_t @@ -135,7 +137,7 @@ namespace CIAO return this->impl ()->wait_for_acknowledgments (rtiduration); #else return this->impl ()->wait_for_acknowledgments (max_wait); -#endif +#endif } ::DDS::ReturnCode_t @@ -148,7 +150,7 @@ namespace CIAO return retval; #else return this->impl ()->get_liveliness_lost_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -161,7 +163,7 @@ namespace CIAO return retval; #else return this->impl ()->get_offered_deadline_missed_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -174,7 +176,7 @@ namespace CIAO return retval; #else return this->impl ()->get_offered_incompatible_qos_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -187,7 +189,7 @@ namespace CIAO return retval; #else return this->impl ()->get_publication_matched_status (status); -#endif +#endif } ::DDS::ReturnCode_t @@ -206,7 +208,7 @@ namespace CIAO return retval; #else return this->impl ()->get_matched_subscriptions (subscription_handles); -#endif +#endif } ::DDS::ReturnCode_t @@ -215,11 +217,13 @@ namespace CIAO { DDS4CCM_TRACE ("RTI_DataWriter_i::get_matched_subscription_data"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (subscription_data); + ACE_UNUSED_ARG (subscription_handle); throw CORBA::NO_IMPLEMENT (); // Add your implementation here #else return this->impl ()->get_matched_subscription_data (subscription_data, subscription_handle); -#endif +#endif } ::DDS::ReturnCode_t @@ -243,7 +247,7 @@ namespace CIAO return retval._retn (); #else return this->impl ()->get_statuscondition (); -#endif +#endif } ::DDS::StatusMask @@ -262,7 +266,7 @@ namespace CIAO return handle; #else return this->impl ()->get_instance_handle (); -#endif +#endif } DDSDataWriter * diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp index bdbeb97994a..4883dcbd755 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp @@ -37,7 +37,7 @@ namespace CIAO this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); #else this->impl_->on_offered_deadline_missed (the_writer, status); -#endif +#endif } void @@ -55,7 +55,7 @@ namespace CIAO this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); #else this->impl_->on_offered_incompatible_qos (the_writer, status); -#endif +#endif } void @@ -73,7 +73,7 @@ namespace CIAO this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); #else this->impl_->on_liveliness_lost (the_writer, status); -#endif +#endif } void @@ -91,7 +91,7 @@ namespace CIAO this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); #else this->impl_->on_publication_matched (the_writer, status); -#endif +#endif } ::DDS::DataWriterListener_ptr diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp index 773629913e7..a501959fcfa 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -94,8 +94,10 @@ namespace CIAO ::DDS::PublisherListener_ptr a_listener, ::DDS::StatusMask mask) { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + + ACE_UNUSED_ARG (qos); DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_publisher - " "Creating Publisher\n")); @@ -170,7 +172,7 @@ namespace CIAO return retval; #else return this->impl ()->delete_publisher (p); -#endif +#endif } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) @@ -232,6 +234,8 @@ namespace CIAO DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_subscriber - " "Creating Subscriber\n")); @@ -336,6 +340,8 @@ namespace CIAO DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + if (impl_name == 0) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " @@ -684,7 +690,7 @@ namespace CIAO return this->impl_->set_listener (rti_impl_list, mask); #else return this->impl_->set_listener (a_listener, mask); -#endif +#endif } ::DDS::DomainParticipantListener_ptr @@ -704,7 +710,7 @@ namespace CIAO return list_proxy->get_domainparticipantlistener (); #else return this->impl ()->get_listener (); -#endif +#endif } ::DDS::ReturnCode_t @@ -728,7 +734,7 @@ namespace CIAO return this->impl ()->ignore_topic (rti_handle); #else return this->impl ()->ignore_topic (handle); -#endif +#endif } ::DDS::ReturnCode_t @@ -923,7 +929,7 @@ namespace CIAO return handle; #else return this->impl ()->get_instance_handle (); -#endif +#endif } DDSDomainParticipant * diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h index 807d9af5b2b..22cb4a3e268 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h @@ -54,7 +54,7 @@ namespace CIAO const char *profile_name, ::DDS::PublisherListener_ptr a_listener, ::DDS::StatusMask mask); -#endif +#endif virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp index 3ed951edf51..e2fa09f16e6 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp @@ -79,7 +79,7 @@ namespace CIAO qos, a_listener, mask); -#endif +#endif } #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) @@ -247,7 +247,7 @@ namespace CIAO return retval._retn (); #else return DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); -#endif +#endif } ::DDS::ReturnCode_t diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h index 2b6aa8bb364..50b8b59806f 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h @@ -98,7 +98,7 @@ namespace CIAO on_reliable_reader_activity_changed ( ::DDS::DataWriter_ptr , const ::DDS::ReliableReaderActivityChangedStatus & ); -#endif +#endif private: ::CCM_DDS::ConnectorStatusListener_var error_listener_; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp index 47b62bea608..ee06aeeebba 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp @@ -45,7 +45,7 @@ namespace CIAO this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); #else this->impl_->on_offered_deadline_missed (writer, status); -#endif +#endif } void @@ -65,7 +65,7 @@ namespace CIAO this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); #else this->impl_->on_offered_incompatible_qos (writer, status); -#endif +#endif } void @@ -85,7 +85,7 @@ namespace CIAO this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); #else this->impl_->on_liveliness_lost (writer, status); -#endif +#endif } void @@ -105,7 +105,7 @@ namespace CIAO this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); #else this->impl_->on_publication_matched (writer, status); -#endif +#endif } ::DDS::PublisherListener_ptr diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp index 15cce2fcd52..f1789309e7c 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp @@ -242,13 +242,15 @@ CIAO::DDS4CCM::PublisherListener_T::get_mask ( { if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) { - return ::DDS::OFFERED_DEADLINE_MISSED_STATUS | + return DDS_STATUS_MASK_ALL; +/* + ::DDS::OFFERED_DEADLINE_MISSED_STATUS | ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS | #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS | #endif ::DDS::LIVELINESS_LOST_STATUS | - ::DDS::PUBLICATION_MATCHED_STATUS; + ::DDS::PUBLICATION_MATCHED_STATUS;*/ } else { diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp index 853f4fb1f60..7546ce89371 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp @@ -63,7 +63,7 @@ namespace CIAO return dds_reader._retn (); #else return this->impl ()->get_datareader (); -#endif +#endif } char * @@ -73,7 +73,7 @@ namespace CIAO return ::CORBA::string_dup (this->impl ()->get_query_expression ()); #else return this->impl ()->get_query_expression (); -#endif +#endif } ::DDS::ReturnCode_t @@ -88,7 +88,7 @@ namespace CIAO return retval; #else return this->impl ()->get_query_parameters (query_parameters); -#endif +#endif } ::DDS::ReturnCode_t @@ -101,7 +101,7 @@ namespace CIAO return this->impl ()->set_query_parameters (parameters); #else return this->impl ()->set_query_parameters (query_parameters); -#endif +#endif } DDSQueryCondition * diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp index 19b187c8b6f..ce92ae11ad4 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp @@ -67,7 +67,7 @@ namespace CIAO return handle; #else return this->impl ()->get_instance_handle (); -#endif +#endif } DDSDataReader * @@ -80,7 +80,7 @@ namespace CIAO DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; #else ::DDS::DataReaderQos rti_qos; -#endif +#endif return this->impl ()->create_datareader (topic, rti_qos, rti_drl, @@ -97,7 +97,7 @@ namespace CIAO DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; #else DDS::DataReaderQos rti_qos; -#endif +#endif return this->impl ()->create_datareader (topic, rti_qos, rti_drl, diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h index 7120fdc2fba..efc943e5b33 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h @@ -175,7 +175,7 @@ namespace CIAO const char *profile_name, DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask); -#endif +#endif }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp index 42ea79c421e..1f5133fd3ba 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp @@ -42,7 +42,7 @@ namespace CIAO this->impl_->on_data_on_readers (sub.in ()); #else this->impl_->on_data_on_readers (the_subscriber); -#endif +#endif the_subscriber->notify_datareaders (); } @@ -63,7 +63,7 @@ namespace CIAO this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); #else this->impl_->on_requested_deadline_missed (the_reader, status); -#endif +#endif } void @@ -83,7 +83,7 @@ namespace CIAO this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); #else this->impl_->on_requested_incompatible_qos (the_reader, status); -#endif +#endif } void @@ -103,7 +103,7 @@ namespace CIAO this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); #else this->impl_->on_sample_rejected (the_reader, status); -#endif +#endif } void @@ -123,7 +123,7 @@ namespace CIAO this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); #else this->impl_->on_liveliness_changed (the_reader, status); -#endif +#endif } void @@ -140,7 +140,7 @@ namespace CIAO this->impl_->on_data_available (dds_reader.in ()); #else this->impl_->on_data_available (the_reader); -#endif +#endif } void @@ -160,7 +160,7 @@ namespace CIAO this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); #else this->impl_->on_subscription_matched (the_reader, status); -#endif +#endif } void @@ -180,7 +180,7 @@ namespace CIAO this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); #else this->impl_->on_sample_lost (the_reader, status); -#endif +#endif } ::DDS::SubscriberListener_ptr diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp index 3c17b9aa68a..0bce5bb96c7 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp @@ -33,7 +33,7 @@ namespace CIAO return this->impl ()->set_qos (ddsqos); #else return this->impl ()->set_qos (qos); -#endif +#endif } ::DDS::ReturnCode_t @@ -46,7 +46,7 @@ namespace CIAO return retval; #else return this->impl ()->get_qos (qos); -#endif +#endif } ::DDS::ReturnCode_t @@ -66,7 +66,7 @@ namespace CIAO return this->impl ()->set_listener (rti_impl_list, mask); #else return this->impl ()->set_listener (a_listener, mask); -#endif +#endif } ::DDS::TopicListener_ptr @@ -86,7 +86,7 @@ namespace CIAO return list_proxy->get_topiclistener (); #else return this->impl ()->get_listener (); -#endif +#endif } ::DDS::ReturnCode_t @@ -98,7 +98,7 @@ namespace CIAO return this->impl ()->get_inconsistent_topic_status (ddsstatus); #else return this->impl ()->get_inconsistent_topic_status (a_status); -#endif +#endif } ::DDS::ReturnCode_t @@ -122,7 +122,7 @@ namespace CIAO return retval._retn (); #else return this->impl ()->get_statuscondition (); -#endif +#endif } ::DDS::StatusMask @@ -141,7 +141,7 @@ namespace CIAO return handle; #else return this->impl ()->get_instance_handle (); -#endif +#endif } char * @@ -151,7 +151,7 @@ namespace CIAO return CORBA::string_dup (this->impl ()->get_type_name ()); #else return this->impl ()->get_type_name (); -#endif +#endif } char * @@ -161,7 +161,7 @@ namespace CIAO return CORBA::string_dup (this->impl ()->get_name ()); #else return this->impl ()->get_name (); -#endif +#endif } ::DDS::DomainParticipant_ptr @@ -179,7 +179,7 @@ namespace CIAO return retval._retn (); #else return this->impl ()->get_participant (); -#endif +#endif } DDSTopic * diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h index 6937d5c1a98..5401a887ce1 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h @@ -61,7 +61,7 @@ namespace CIAO //RTI_DDS_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) RTI_DDS_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS); -#endif +#endif //RTI_DDS_RETCODE (DDS::DATA_WRITER_CACHE_STATUS); //RTI_DDS_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS); //RTI_DDS_RETCODE (DDS::DATA_READER_CACHE_STATUS); -- cgit v1.2.1