diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-11 12:40:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-11 12:40:54 +0000 |
| commit | 691966a7cc39034dcfa1975e73c2ac57301143a5 (patch) | |
| tree | 5d70ca8df868697bfd2b26422501001085016d98 /CIAO/connectors/dds4ccm/tests/Reader | |
| parent | 65066bb063d63ebf31525d1b96224e41668c0b2c (diff) | |
| download | ATCD-691966a7cc39034dcfa1975e73c2ac57301143a5.tar.gz | |
Mon Jun 11 12:37:55 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h:
* connectors/dds4ccm/impl/dds4ccm_conf.h:
* connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
* connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h:
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
* connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
* connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
* connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
* connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
* connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
* connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
The concept of invalid instance handles is RTI NDDS specific. Removed
the macros for that, but just compare the instance handles with nil
instead of checking the isValid
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/Reader')
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp index 6cf446c889f..73999fd53b3 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp @@ -459,7 +459,7 @@ namespace CIAO_Reader_Test_Receiver_Impl ++nr_keys_changed; } // check readinfo struct. - if (DDS_INSTANCE_HANDLE_INVALID(readinfo_seq[it].instance_handle)) + if (::DDS::HANDLE_NIL == readinfo_seq[it].instance_handle) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") ACE_TEXT ("received instance handle should be valid ") |