ChangeLogTag: Fri Oct 24 10:40:00 UTC 2008 Simon Massey <sma at prismtech dot com>

5 files changed, 17 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 971a3005a30..d3b2dc11ada 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Oct 24 10:40:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * orbsvcs/DevGuideExamples/EventServices/EchoEventConsumerMain.cpp:
+        * orbsvcs/DevGuideExamples/EventServices/EchoEventSupplierMain.cpp:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+
+          ACE_TCHAR problems.
+
 Fri Oct 24 07:58:27 UTC 2008  Vladimir Zykov  <vzykov@prismtech.com>
 
         * orbsvcs/tests/Event/UDP/receiver.cpp:
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
index dcb4ef19d7f..1224b68f7ff 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
@@ -24,7 +24,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Initialize the ORB.
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
-    const char* ecname = "EventService";
+    const ACE_TCHAR *ecname = ACE_TEXT ("EventService");
     for (int i = 0; argv[i] != 0; i++) {
       if (ACE_OS::strcmp(argv[i], ACE_TEXT("-ecname")) == 0) {
         if (argv[i+1] != 0) {
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
index 4735d2e9682..4628d07582b 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
@@ -40,9 +40,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Initialize the ORB.
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
-    const char* ecname = "EventService";
-    const char* remote_ecname = 0;
-    const char* iorfile = 0;
+    const ACE_TCHAR* ecname = ACE_TEXT ("EventService");
+    const ACE_TCHAR* remote_ecname = 0;
+    const ACE_TCHAR* iorfile = 0;
     for (int i = 0; argv[i] != 0; i++) {
       if (ACE_OS::strcmp(argv[i], ACE_TEXT("-ecname")) == 0) {
         if (argv[i+1] != 0) {
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 9bd23fbe075..3708eea562c 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -24,7 +24,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Initialize the ORB.
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
-    const char* ecname = "EventService";
+    const ACE_TCHAR* ecname = ACE_TEXT ("EventService");
     for (int i = 0; argv[i] != 0; i++) {
       if (ACE_OS::strcmp(argv[i], ACE_TEXT("-ecname")) == 0) {
         if (argv[i+1] != 0) {
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index a1c76e382a6..e05a908b053 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -40,9 +40,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Initialize the ORB.
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
-    const char* ecname = "EventService";
-    const char* address = "localhost";
-    const char* iorfile = 0;
+    const ACE_TCHAR* ecname = ACE_TEXT ("EventService");
+    const ACE_TCHAR* address = ACE_TEXT ("localhost");
+    const ACE_TCHAR* iorfile = 0;
     u_short port = 12345;
     u_short listenport = 12345;
     int mcast = 1;