diff options
author | msmit <msmit@remedy.nl> | 2009-11-25 07:52:54 +0000 |
---|---|---|
committer | msmit <msmit@remedy.nl> | 2009-11-25 07:52:54 +0000 |
commit | b32f82a57d476bbd79967f5dd22536858deeed97 (patch) | |
tree | 72258d822c34732a3a9639f9b2f696fe042488c4 | |
parent | 20d4746b06b0e3a01b91115baf7283eb5f0a2270 (diff) | |
download | ATCD-b32f82a57d476bbd79967f5dd22536858deeed97.tar.gz |
Wed Nov 25 07:52:16 UTC 2009 Marcel Smit <msmit@remedy.nl>
* bin/ciao_tests.lst:
Added !FIXED_BUGS_ONLY to Get_Connection_Test since the updater
is not working, yet.
* connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp:
No need to write samples to activate the listener.
* connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp:
* connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp:
* connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp:
Resolved compiler warnings.
7 files changed, 44 insertions, 31 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 3b98c646ebf..07700a3bdb2 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,18 @@ +Wed Nov 25 07:52:16 UTC 2009 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + Added !FIXED_BUGS_ONLY to Get_Connection_Test since the updater + is not working, yet. + + * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp: + No need to write samples to activate the listener. + + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: + Resolved compiler warnings. + Tue Nov 24 19:34:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index d2066b93310..2155d12a1f8 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -39,7 +39,7 @@ TAO/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: !STATIC !MI TAO/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS -TAO/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp index a108faae6f6..4b888345075 100644 --- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp @@ -71,8 +71,6 @@ namespace CIAO_Get_Connection_Test_Sender_Impl void Sender_exec_i::ccm_activate (void) { - Get_ConnectionTest gct; - this->writer_->write_one (gct, ::DDS::HANDLE_NIL); } void diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp index b74207ab51c..ebdaf19c3ec 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -39,7 +39,7 @@ namespace CIAO_Writer_Receiver_Impl const WriterTest_Seq & an_instance, const ::CCM_DDS::ReadInfoSeq & /* info */) { - for (int i = 0; i < an_instance.length (); ++i) + for (unsigned int i = 0; i < an_instance.length (); ++i) { CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("WriterTest_Listener: ") ACE_TEXT ("received writer info for <%C> at %u\n"), @@ -95,7 +95,7 @@ namespace CIAO_Writer_Receiver_Impl Receiver_exec_i::ccm_activate (void) { ::CCM_DDS::DataListenerControl_var lc = - this->context_->get_connection_info_out_data_control (); + this->context_->get_connection_info_out_data_control (); if (CORBA::is_nil (lc.in ())) { diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp index 00ecdc487af..8e87b74c37e 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp @@ -20,7 +20,7 @@ namespace CIAO_NonChangeable_NonChangeable_Connector_Impl bool nonchangeable_caught = false; try { - DDS::DomainId_t id; + DDS::DomainId_t id = 0; this->domain_id (id); } catch (CCM_DDS::NonChangeable) diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp index 5034a6730fc..a5f79bf1343 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp @@ -18,35 +18,35 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl // Operations from ::CCM_DDS::ConnectorStatusListener void ConnectorStatusListener_exec_i::on_inconsistent_topic( - ::DDS::Topic_ptr the_topic, - const DDS::InconsistentTopicStatus & status) + ::DDS::Topic_ptr /* the_topic */, + const DDS::InconsistentTopicStatus & /* status */) { this->inconsistent_ = true; //printf("Receiver: ConnectorStatusListener_exec_i::on_inconsistent_topic\n"); } void ConnectorStatusListener_exec_i::on_requested_incompatible_qos( - ::DDS::DataReader_ptr the_reader, - const DDS::RequestedIncompatibleQosStatus & status) { + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::RequestedIncompatibleQosStatus & /*status*/) { //printf("ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n"); } void ConnectorStatusListener_exec_i::on_sample_rejected( - ::DDS::DataReader_ptr the_reader, - const DDS::SampleRejectedStatus & status) { + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::SampleRejectedStatus & /*status*/) { //printf("ConnectorStatusListener_exec_i::on_sample_rejected\n"); } void ConnectorStatusListener_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status) { + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedDeadlineMissedStatus & /*status*/) { //printf("ConnectorStatusListener_exec_i::on_offered_deadline_missed\n"); } void ConnectorStatusListener_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr the_writer, - const DDS::OfferedIncompatibleQosStatus & status) { + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedIncompatibleQosStatus & /*status*/) { //printf("ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n"); } void ConnectorStatusListener_exec_i::on_unexpected_status( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) { + ::DDS::Entity_ptr /*the_entity*/, + ::DDS::StatusKind /*status_kind*/) { //printf("ConnectorStatusListener_exec_i::on_unexpected_status\n"); } @@ -62,7 +62,7 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl void TestTopic_RawListener_exec_i::on_one_data ( - const TestTopic & an_instance , + const TestTopic & /*an_instance*/ , const ::CCM_DDS::ReadInfo & /* info */) { //printf(" receive data ============= %d\n",this->received_); diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp index 99e6bb0c45c..e8a3734c333 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp @@ -25,35 +25,35 @@ namespace CIAO_ConnectorStatusListener_Test_Sender_Impl // Operations from ::CCM_DDS::ConnectorStatusListener void ConnectorStatusListener_sec_exec_i::on_inconsistent_topic( - ::DDS::Topic_ptr the_topic, - const DDS::InconsistentTopicStatus & status) + ::DDS::Topic_ptr /*the_topic*/, + const DDS::InconsistentTopicStatus & /*status*/) { // printf("Sender : ConnectorStatusListener_sec_exec_i::on_inconsistent_topic\n"); this->inconsistent_ = true; } void ConnectorStatusListener_sec_exec_i::on_requested_incompatible_qos( - ::DDS::DataReader_ptr the_reader, - const DDS::RequestedIncompatibleQosStatus & status) { + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::RequestedIncompatibleQosStatus & /*status*/) { // printf("ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n"); } void ConnectorStatusListener_sec_exec_i::on_sample_rejected( - ::DDS::DataReader_ptr the_reader, - const DDS::SampleRejectedStatus & status) { + ::DDS::DataReader_ptr /*the_reader*/, + const DDS::SampleRejectedStatus & /*status*/) { // printf("ConnectorStatusListener_exec_i::on_sample_rejected\n"); } void ConnectorStatusListener_sec_exec_i::on_offered_deadline_missed( - ::DDS::DataWriter_ptr the_writer, - const DDS::OfferedDeadlineMissedStatus & status) { + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedDeadlineMissedStatus & /*status*/) { // printf("ConnectorStatusListener_exec_i::on_offered_deadline_missed\n"); } void ConnectorStatusListener_sec_exec_i::on_offered_incompatible_qos( - ::DDS::DataWriter_ptr the_writer, - const DDS::OfferedIncompatibleQosStatus & status) { + ::DDS::DataWriter_ptr /*the_writer*/, + const DDS::OfferedIncompatibleQosStatus & /*status*/) { // printf("ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n"); } void ConnectorStatusListener_sec_exec_i::on_unexpected_status( - ::DDS::Entity_ptr the_entity, - ::DDS::StatusKind status_kind) { + ::DDS::Entity_ptr /*the_entity*/, + ::DDS::StatusKind /*status_kind*/) { // printf("ConnectorStatusListener_exec_i::on_unexpected_status\n"); } |