diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-06-08 12:33:39 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-06-08 12:33:39 +0000 |
| commit | e5953078f2930b03f917142e6ee6a729fa0605fa (patch) | |
| tree | 9b887a2f7f990b0030be737d7632de0510f0bfc1 | |
| parent | 5ac9d3ac7240b9bf592e2af72378052555b94a15 (diff) | |
| download | ATCD-e5953078f2930b03f917142e6ee6a729fa0605fa.tar.gz | |
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
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl | 2 |
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: |