1 files changed, 6 insertions, 10 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
index 1b2687c3c1d..55ba006b059 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.h
@@ -70,6 +70,11 @@ namespace CIAO_Shapes_Sender_Impl
 
     //@{
     /** Supported operations and attributes. */
+    enum TYPE_OF_SHAPE {
+      SHAPE_TYPE_SQUARE,
+      SHAPE_TYPE_TRIANGLE,
+      SHAPE_TYPE_CIRCLE
+    };
 
     //@}
 
@@ -115,21 +120,12 @@ namespace CIAO_Shapes_Sender_Impl
 
   private:
     ::Shapes::CCM_Sender_Context_var ciao_context_;
-    ::Shapes::DDS_Typed::Writer_var writer_sq_;
-    ::Shapes::DDS_Typed::Writer_var writer_tr_;
-    ::Shapes::DDS_Typed::Writer_var writer_cl_;
 
     ShapeType* square_;
     ShapeType* triangle_;
     ShapeType* circle_;
     pulse_Generator * ticker_;
 
-    ::DDS::InstanceHandle_t instance_handle_sq_;
-    ::DDS::InstanceHandle_t instance_handle_tr_;
-    ::DDS::InstanceHandle_t instance_handle_cq_;
-
-
-
     //@{
     /** Component attributes. */
 
@@ -146,7 +142,7 @@ namespace CIAO_Shapes_Sender_Impl
 
     //@{
     /** User defined members. */
-    CORBA::UShort ShapeNr;
+    TYPE_OF_SHAPE TypeOfShape;
     //@}
 
     //@{