Mon Nov 9 13:04:29 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl:
        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc:
        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h:
        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp:
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl:
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc:
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h:
        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.h:
        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.cpp:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.h:
        * connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.cpp:
          Renamed Sender.* and Receiver.* into Shapes_Sender.* and
          Shapes_Receiver.*

9 files changed, 58 insertions, 34 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index df0d3c8e311..8d5bbb3dd8b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,24 @@
+Mon Nov  9 13:04:29 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp:
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl:
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc:
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h:
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.h:
+        * connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.cpp:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender.idl:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.h:
+        * connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.cpp:
+          Renamed Sender.* and Receiver.* into Shapes_Sender.* and
+          Shapes_Receiver.*
+
 Mon Nov  9 12:43:45 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
index 5a226115392..5a226115392 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
index 58fbc870e21..f4843305dfe 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
@@ -12,7 +12,7 @@ project(DDS_Receiver_idl_gen) : componentidldefaults , connectoridldefaults  {
               -Wb,exec_export_include=Receiver_exec_export.h -I..
 
   IDL_Files {
-    Receiver.idl
+    Shapes_Receiver.idl
   }
 }
 
@@ -24,7 +24,7 @@ project(DDS_Receiver_lem_gen) : connectoridldefaults,   {
               -SS -Gxhst -I..
 
   IDL_Files {
-    ReceiverE.idl
+    Shapes_ReceiverE.idl
   }
 }
 
@@ -41,16 +41,16 @@ project(DDS_Receiver_lem_stub) : ccm_svnt , dds4ccm_base  {
   }
 
   Source_Files {
-    ReceiverEC.cpp
+    Shapes_ReceiverEC.cpp
   }
 
   Header_Files {
-    ReceiverEC.h
+    Shapes_ReceiverEC.h
     Receiver_lem_stub_export.h
   }
 
   Inline_Files {
-    ReceiverEC.inl
+    Shapes_ReceiverEC.inl
   }
 }
 
@@ -67,16 +67,16 @@ project(DDS_Receiver_stub) : ccm_stub , dds4ccm_base  {
   }
 
   Source_Files {
-    ReceiverC.cpp
+    Shapes_ReceiverC.cpp
   }
 
   Header_Files {
-    ReceiverC.h
+    Shapes_ReceiverC.h
     Receiver_stub_export.h
   }
 
   Inline_Files {
-    ReceiverC.inl
+    Shapes_ReceiverC.inl
   }
 }
 
@@ -93,11 +93,11 @@ project(DDS_Receiver_exec) : ciao_executor , dds4ccm_base  {
   }
 
   Source_Files {
-    Receiver_exec.cpp
+    Shapes_Receiver_exec.cpp
   }
 
   Header_Files {
-    Receiver_exec.h
+    Shapes_Receiver_exec.h
     Receiver_exec_export.h
   }
 
@@ -119,18 +119,18 @@ project(DDS_Receiver_svnt) : ciao_servant , dds4ccm_base, nddslib {
   }
 
   Source_Files {
-    ReceiverS.cpp
-    Receiver_svnt.cpp
+    Shapes_ReceiverS.cpp
+    Shapes_Receiver_svnt.cpp
   }
 
   Header_Files {
-    ReceiverS.h
-    Receiver_svnt.h
+    Shapes_ReceiverS.h
+    Shapes_Receiver_svnt.h
     Receiver_svnt_export.h
   }
 
   Inline_Files {
-    ReceiverS.inl
+    Shapes_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
index c5e4879538b..3af04eb3216 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-#include "Receiver_exec.h"
+#include "Shapes_Receiver_exec.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
index ecbc411ebae..91b001ef28b 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
@@ -34,7 +34,7 @@
 #define CIAO_RECEIVER_EXEC_H_
 
 
-#include "ReceiverEC.h"
+#include "Shapes_ReceiverEC.h"
 
 #include /**/ "Receiver_exec_export.h"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
index 135fcc35fb1..135fcc35fb1 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
index 8c0ca2f8433..115ba476168 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
@@ -13,7 +13,7 @@ project(DDS_Sender_idl_gen) : connectoridldefaults, componentidldefaults   {
               -I ..
 
   IDL_Files {
-    Sender.idl
+    Shapes_Sender.idl
   }
 }
 
@@ -25,7 +25,7 @@ project(DDS_Sender_lem_gen) : connectoridldefaults   {
               -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
 
   IDL_Files {
-    SenderE.idl
+    Shapes_SenderE.idl
   }
 }
 
@@ -42,16 +42,16 @@ project(DDS_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 
   Source_Files {
-    SenderEC.cpp
+    Shapes_SenderEC.cpp
   }
 
   Header_Files {
-    SenderEC.h
+    Shapes_SenderEC.h
     Sender_lem_stub_export.h
   }
 
   Inline_Files {
-    SenderEC.inl
+    Shapes_SenderEC.inl
   }
 }
 
@@ -68,16 +68,16 @@ project(DDS_Sender_stub) : ccm_stub, dds4ccm_base   {
   }
 
   Source_Files {
-    SenderC.cpp
+    Shapes_SenderC.cpp
   }
 
   Header_Files {
-    SenderC.h
+    Shapes_SenderC.h
     Sender_stub_export.h
   }
 
   Inline_Files {
-    SenderC.inl
+    Shapes_SenderC.inl
   }
 }
 
@@ -94,11 +94,11 @@ project(DDS_Sender_exec) : ciao_executor, dds4ccm_base   {
   }
 
   Source_Files {
-    Sender_exec.cpp
+    Shapes_Sender_exec.cpp
   }
 
   Header_Files {
-    Sender_exec.h
+    Shapes_Sender_exec.h
     Sender_exec_export.h
   }
 
@@ -121,18 +121,18 @@ project(DDS_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   }
 
   Source_Files {
-    SenderS.cpp
-    Sender_svnt.cpp
+    Shapes_SenderS.cpp
+    Shapes_Sender_svnt.cpp
   }
 
   Header_Files {
-    SenderS.h
-    Sender_svnt.h
+    Shapes_SenderS.h
+    Shapes_Sender_svnt.h
     Sender_svnt_export.h
   }
 
   Inline_Files {
-    SenderS.inl
+    Shapes_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
index d850eb79777..c431fc7ede9 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "Sender_exec.h"
+#include "Shapes_Sender_exec.h"
 #include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
index 2a4d4299926..81e75a5f44e 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
@@ -4,7 +4,8 @@
 #ifndef CIAO_SENDER_EXEC_H_
 #define CIAO_SENDER_EXEC_H_
 
-#include "SenderEC.h"
+
+#include "Shapes_SenderEC.h"
 
 #include /**/ "Sender_exec_export.h"
 
@@ -16,6 +17,8 @@
 #include "ace/Task.h"
 #include "ace/Reactor.h"
 
+#include <map>
+
 namespace CIAO_Shapes_Sender_Impl
 {
   class Sender_exec_i;