summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CIAO/ChangeLog15
-rw-r--r--CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h (renamed from CIAO/connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h)0
-rw-r--r--CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp2
11 files changed, 24 insertions, 9 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 26d628bfa6b..94d196e1d55 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Thu Mar 4 10:30:04 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/impl/dds/TimeUtilities.h:
+ * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp:
+ * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
+ * connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h:
+ Moved TimeUtilities.h from impl/dds/ndds to impl/dds/.
+
Thu Mar 4 10:22:44 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/Policies/pub_qos_test.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h
index e6f1050e518..e6f1050e518 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h
+++ b/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
index 3f17677cb07..1eb3926d226 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
@@ -10,7 +10,7 @@
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_CSL_SRTest_Receiver_Impl
{
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
index e38fa1d9adf..f5cbc8b8ab2 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
@@ -6,7 +6,7 @@
#include "ciao/Logger/Log_Macros.h"
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_Keyed_Test_Receiver_Impl
{
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 ab461607a99..2a776cbfa23 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/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_PSL_DeadlineTest_Receiver_Impl
{
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
index 1eb1e402495..9c5ee585c66 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
@@ -9,7 +9,7 @@
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_PSL_SampleLost_Receiver_Impl
{
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
index 30577a85902..d8ae75b9b36 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
@@ -9,7 +9,7 @@
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_SL_Disabled_Receiver_Impl
{
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
index 3cef7ad4cf2..31921bf38ef 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
@@ -9,7 +9,7 @@
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_SL_ManyByMany_Receiver_Impl
{
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
index 6d1b786badb..5a0d47279f3 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
@@ -9,7 +9,7 @@
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_SL_OneByOne_Receiver_Impl
{
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
index 2131cb65216..338ad6e0d52 100644
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
+++ b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
#include "ace/OS_NS_sys_time.h"
int
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
index 548282b8b18..88977e8c4ca 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
@@ -8,7 +8,7 @@
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/TimeUtilities.h"
+#include "dds4ccm/impl/dds/TimeUtilities.h"
namespace CIAO_Updater_Receiver_Impl
{
View Lorry Controller Status