summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl2
2 files changed, 5 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 58f338602bb..70f3715625d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 8 12:32:48 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+ Fixed problem with OpenDDS
+
Wed Jun 8 07:00:55 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
index 53f0e739827..5f2ba4a9182 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
@@ -40,8 +40,6 @@ struct TopicArray {
octet_array x_array;
};
-#pragma DCPS_DATA_TYPE "X_Union"
-
// Unions
union X_Union switch (short) {
case 0: