diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-05-23 15:09:23 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-05-23 15:09:23 +0000 |
| commit | 6db0d6b49dfa38391005eca3ed095861e82d9cd5 (patch) | |
| tree | bf5f802e35c399fa294fb66f38861382ae157395 /CIAO/connectors/dds4ccm/tests/Reader | |
| parent | 067527a7516693381aead1e89f7662d38e0aac69 (diff) | |
| download | ATCD-6db0d6b49dfa38391005eca3ed095861e82d9cd5.tar.gz | |
Mon May 23 15:07:33 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/PublisherListener.cpp:
* connectors/dds4ccm/impl/dds4ccm_conf.h:
* connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
* 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/Base/Writer_Base.idl:
* 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/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
* connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
* connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
* 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:
* connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
Increased portability
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/Reader')
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp | 9 |
1 files changed, 5 insertions, 4 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 527145fa594..6cf446c889f 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 @@ -29,6 +29,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" +#include "dds4ccm/impl/dds4ccm_conf.h" namespace CIAO_Reader_Test_Receiver_Impl { @@ -335,10 +336,10 @@ namespace CIAO_Reader_Test_Receiver_Impl key, readertest_info_seq.length ())); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ONE ALL: ") - ACE_TEXT ("Handle created for <%C>: length <%u> - isValid <%d>\n"), + ACE_TEXT ("Handle created for <%C>: ") + DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), key, - readinfo_seq[0].instance_handle.length, - readinfo_seq[0].instance_handle.isValid)); + DDS_INSTANCE_HANDLE_LOG(readinfo_seq[0].instance_handle))); } } } @@ -458,7 +459,7 @@ namespace CIAO_Reader_Test_Receiver_Impl ++nr_keys_changed; } // check readinfo struct. - if (!readinfo_seq[it].instance_handle.isValid) + if (DDS_INSTANCE_HANDLE_INVALID(readinfo_seq[it].instance_handle)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") ACE_TEXT ("received instance handle should be valid ") |