summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2011-06-15 07:30:11 +0000
committermsmit <msmit@remedy.nl>2011-06-15 07:30:11 +0000
commit41c6a58c1f67b912d86ae081c4fd02467cadf105 (patch)
tree1de64e5a2f9993c38f0d35b92afcabe1ca14f785
parent0ed029684dde60037f7a9fb7aeb5d51963d3837a (diff)
downloadATCD-41c6a58c1f67b912d86ae081c4fd02467cadf105.tar.gz
Wed Jun 15 07:30:00 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl: Fixed error in openDDS.
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl2
2 files changed, 6 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9cb5e926615..243b6053acd 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 15 07:30:00 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl:
+ Fixed error in openDDS.
+
Tue Jun 14 13:36:00 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h:
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
index 2131535aa70..fadd68c8746 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
@@ -12,7 +12,7 @@
#pragma opendds typesupport "Base/TypeRegistration_Test_BaseTypeSupportImpl.h"
#pragma DCPS_DATA_TYPE "MLDTypeRegistrationTest"
-#pragma DCPS_DATA_KEY "MLDTypeRegistrationTest symbol"
+#pragma DCPS_DATA_KEY "MLDTypeRegistrationTest key"
struct MLDTypeRegistrationTest {
unsigned long key;