2 files changed, 16 insertions, 29 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
index 2963487e229..886f6a47324 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
@@ -10,7 +10,6 @@
 
 #pragma ndds typesupport "Base/VTopic_BaseSupport.h"
 
-// Plain topic
 struct TestTopic {
   string key; //@key
   long x;
@@ -28,49 +27,38 @@ struct TopicArray {
   octet x_array[5];
  };
 
-// Unions
-union X_Union switch (short) {
+//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;
 
+// 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;
-};
-
-// 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;
+  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;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
index fada4388221..c6fc6f2306c 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
@@ -5,12 +5,11 @@ project (DDS_VTopic_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default
   dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL
   libout = ../lib
 
-  idlflags += -SS -Sci \
+  idlflags += -SS -Gxhst -Sci \
               -Wb,stub_export_macro=VTOPIC_BASE_STUB_Export \
               -Wb,stub_export_include=VTopic_Base_stub_export.h
 
   IDL_Files {
-    idlflags += -Gxhst
     VTopic_Base.idl
   }