1 files changed, 41 insertions, 51 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
index fdb2c60d64b..89a8f92a67e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
@@ -10,66 +10,56 @@
 
 #pragma ndds typesupport "Base/VTopics_BaseSupport.h"
 
-// Plain Topic
-struct TestTopic {
-  string key; //@key
-  long x;
-};
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
+  //string
+  struct TopicString {
+    string key; //@key
+    string x_str;
+   };
 
-// String
-struct TopicString {
-  string key; //@key
-  string x_str;
-};
+  //arrays
+  struct TopicArray {
+    string key; //@key
+    octet x_array[5];
+   };
 
-// Arrays
-struct TopicArray {
-  string key; //@key
-  octet x_array[5];
-};
+  //unions
+/*  union X_Union switch (short) {
+    case 0:
+      string x_test;
+    case 1:
+      long   x_long;
+   };
 
-// Unions
-union X_Union switch (short) {
-  case 0:
-    string x_test;
-  case 1:
-    long   x_long;
-};
+  struct TopicUnion {
+    string key; //@key
+    X_Union x_uni;
 
-struct TopicUnion {
-  string key; //@key
-  X_Union x_uni;
-};
+   };
 
-// Sequence
-struct test {
-  short x_test;
-  string x_teststr;
-};
-typedef sequence<test> test_seq;
+ */
 
-struct TopicSeq {
-  string key; //@key
-  test_seq x_seq;
+  struct test {
+    short x_test;
+    string x_teststr;
   };
+  typedef sequence<test> test_seq;
+
+  //sequence
+  struct TopicSeq {
+    string key; //@key
+    test_seq x_seq;
+   };
 
- // ValueType
-valuetype X_Valuetype {
-  public string type;
-  public long x_long;
-};
 
-struct TopicValuetype {
-  string key; //@key
-  X_Valuetype x_vt;
-};
+  typedef sequence<TestTopic> TestTopic_Seq;
+  typedef sequence<TopicString> TopicString_Seq;
+  typedef sequence<TopicArray> TopicArray_Seq;
+ // typedef sequence<TopicUnion> TopicUnion_Seq;
+  typedef sequence<TopicSeq> TopicSeq_Seq;
 
-// Sequences
-typedef sequence<TestTopic> TestTopic_Seq;
-typedef sequence<TopicString> TopicString_Seq;
-typedef sequence<TopicArray> TopicArray_Seq;
-typedef sequence<TopicUnion> TopicUnion_Seq;
-typedef sequence<TopicSeq> TopicSeq_Seq;
-typedef sequence<TopicValuetype> TopicValuetype_Seq;
 
 #endif