diff options
| author | msmit <msmit@remedy.nl> | 2010-03-04 09:34:34 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-03-04 09:34:34 +0000 |
| commit | a0889b64e0581d1e33faef6d2cbc4bc23526b46c (patch) | |
| tree | 28408a388bd294c125db7d30b0982236c8afc5e7 | |
| parent | f61aa7dff6c5008333ea526ee1f01e067e09ed9c (diff) | |
| download | ATCD-a0889b64e0581d1e33faef6d2cbc4bc23526b46c.tar.gz | |
Thu Mar 4 09:31:48 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp:
Set is_coherent_write to true.
* connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
Resolve compile issue.
3 files changed, 10 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index ef69bed8440..4f0b1e37fbe 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 4 09:31:48 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: + Set is_coherent_write to true. + + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + Resolve compile issue. + Thu Mar 4 09:21:49 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp index 3d959b7c75c..5d24afeea3d 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp @@ -136,6 +136,7 @@ namespace CIAO_CoherentWrite_Test_Sender_Impl try { this->writer_ = this->context_->get_connection_info_write_data (); + this->writer_->is_coherent_write (true); this->starter_ = this->context_->get_connection_start_reader (); WriteHandler *wh = new WriteHandler (*this); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (wh); diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp index 2a776cbfa23..ab461607a99 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp @@ -11,7 +11,7 @@ #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" #include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/dds/ndds/TimeUtilities.h" namespace CIAO_PSL_DeadlineTest_Receiver_Impl { |