From a0889b64e0581d1e33faef6d2cbc4bc23526b46c Mon Sep 17 00:00:00 2001 From: msmit Date: Thu, 4 Mar 2010 09:34:34 +0000 Subject: Thu Mar 4 09:31:48 UTC 2010 Marcel Smit * 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. --- CIAO/ChangeLog | 8 ++++++++ .../CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp | 1 + .../tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) 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 + + * 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 * 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 { -- cgit v1.2.1