summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-06-06 15:08:42 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-06-06 15:08:42 +0000
commit0db8a5cf02ad5735c91bf3ca769b170fe3d47972 (patch)
tree7af8b168459a37ee1fceb628efb85b8a210ade9f
parentd0b0c648ccb31f46c95a769faaa073e5a0bb9343 (diff)
downloadATCD-0db8a5cf02ad5735c91bf3ca769b170fe3d47972.tar.gz
Mon Jun 6 15:08:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/idl/dds_rtf2_dcps.idl: Added support for CoreDX
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl2
2 files changed, 6 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 95ceb448552..59456592e0e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 6 15:08:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
+ Added support for CoreDX
+
Wed Jun 1 12:56:35 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
index a8f4638b45f..98463bb4dbb 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
@@ -7,7 +7,7 @@
# include "dds/DdsDcps.idl"
#endif
-#if (CIAO_DDS4CCM_NDDS==1)
+#if (CIAO_DDS4CCM_NDDS==1) || (CIAO_DDS4CCM_COREDX == 1)
# include "connectors/dds4ccm/idl/ndds/ndds_dcps.idl"
#endif