Thu Sep 25 20:55:39 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

17 files changed, 39 insertions, 31 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f1dedeae18e..d726f094441 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Thu Sep 25 20:55:39 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/AMI/FL_Callback/peer.cpp
+        * examples/AMI/FL_Callback/progress.cpp
+        * examples/Buffered_AMI/server.cpp
+        * examples/Buffered_Oneways/server.cpp
+        * examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+        * examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+        * examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+        * examples/mfc/client.cpp
+        * examples/mfc/server.cpp
+        * examples/PluggableUDP/tests/Performance/client.cpp
+        * examples/PluggableUDP/tests/Performance/server.cpp
+        * examples/PluggableUDP/tests/SimplePerformance/client.cpp
+        * examples/PluggableUDP/tests/SimplePerformance/server.cpp
+          ACE_TCHAR changes
+
 Thu Sep 25 20:46:39 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Abstract_Interface/server.cpp
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 4bbfd929e01..9344f9b88f3 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (FL_Callback,
            peer,
            "$Id$")
 
-const char *ior = "file://progress.ior";
+const ACE_TCHAR *ior = ACE_TEXT("file://progress.ior");
 int nthreads = 4;
 int interval = 0; // microseconds
 
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 4d386bcf065..0ae91b5edc9 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (FL_Callback,
 #include <FL/Fl.h>
 #include <FL/Fl_Window.h>
 
-const char *ior_output_file = "progress.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("progress.ior");
 int n_iterations = 1000;
 int n_peers = 1;
 
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index f32d67eda80..145aee143dd 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (Buffered_AMI,
            server,
            "$Id$")
 
-const char *ior_output_file = "ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 966176b3828..4012e5446ec 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -6,7 +6,7 @@
 
 ACE_RCSID(Buffered_Oneways, server, "$Id$")
 
-const char *ior_output_file = "ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index fba61d6f5f0..444a7c6d5d8 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -10,7 +10,7 @@
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
 int enable_dynamic_scheduling = 0;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index c76d24df11c..f45d15ffca6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -10,7 +10,7 @@
 
 ACE_RCSID(MT_Server, server, "$Id$")
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int nthreads = 2;
 int enable_dynamic_scheduling = 0;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index c28eb76b624..9f26fe1f470 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -10,7 +10,7 @@
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
 int enable_dynamic_scheduling = 0;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 1f87a89066c..50f3cb36b86 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -10,7 +10,7 @@
 
 ACE_RCSID(MT_Server, server, "$Id$")
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int nthreads = 2;
 int enable_dynamic_scheduling = 0;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 4ecdc6ff0e7..93c5138ba58 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -11,7 +11,7 @@
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
 int enable_dynamic_scheduling = 0;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 7a16efd3636..3baeb9d3535 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -10,7 +10,7 @@
 
 ACE_RCSID(MT_Server, server, "$Id$")
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int nthreads = 3;
 int enable_dynamic_scheduling = 0;
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index 6b0ccbde9ce..959a7f53c27 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -31,7 +31,7 @@
 
 ACE_RCSID(Performance, client, "$Id$")
 
-const char *ior = "file://test.ior";
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 ACE_UINT32 burst_messages = 1000;
 
 unsigned char performance_test = 0;
diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
index 6f93ab6da5d..76adfb37ab3 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
@@ -28,7 +28,7 @@
 
 ACE_RCSID(Performance, server, "$Id$")
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int orb_threads = 1; // Number of threads running inside the ORB.
 
 int
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 312baf9623f..c7795a082fc 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -30,7 +30,7 @@
 # define ACE_MAIN testClient
 #endif
 
-const char *iorFile = "file://test.ior";
+const ACE_TCHAR *iorFile = ACE_TEXT("file://test.ior");
 ACE_UINT32 niter = 10;
 ACE_UINT32 SIZE_BLOCK= 256;
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index 962f7d2bd87..0ae39fb96d6 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -31,7 +31,7 @@
 #endif
 
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index 7d12f7ec869..84859ecb403 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -8,13 +8,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      const char *orb_name = "";
-
       ACE_DEBUG ((LM_DEBUG,
                   "Initializing the ORB!\n"));
-      CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
-                                                argv,
-                                                orb_name);
+      CORBA::ORB_var the_orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var orb_obj =
         the_orb->resolve_initial_references ("RootPOA");
@@ -29,8 +25,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Reading the IOR!\n"));
 
-      const char *filename =
-        "file://ior.txt";
+      const ACE_TCHAR *filename = ACE_TEXT("file://ior.txt");
 
       orb_obj =
         the_orb->string_to_object (filename);
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 0186209c689..8f9e8658e9a 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -45,13 +45,7 @@ spawn_my_orb_thread (void *)
 {
   try
     {
-      // Initialization arguments for the ORB
-      const char *orb_name = "";
-
-      CORBA::ORB_var the_orb =
-        CORBA::ORB_init (__argc,
-                         __argv,
-                         orb_name);
+      CORBA::ORB_var the_orb = CORBA::ORB_init (__argc, __argv);
 
       CORBA::Object_var orb_obj =
         the_orb->resolve_initial_references ("RootPOA");
@@ -72,8 +66,7 @@ spawn_my_orb_thread (void *)
       CORBA::String_var ior =
         the_orb->object_to_string (orb_servant.in ());
 
-      FILE *output_file = ACE_OS::fopen ("ior.txt",
-                                        "w");
+      FILE *output_file = ACE_OS::fopen ("ior.txt", "w");
       ACE_OS::fprintf (output_file,
                        "%s",
                        ior.in ());
@@ -108,7 +101,7 @@ CServerApp::~CServerApp()
 
       int argc = 0;
       char **argv = 0;
-      const char *orb_name = "";
+      const ACE_TCHAR *orb_name = ACE_TEXT("");
 
       // Retrieving a reference to the ORB used inside the thread
       the_shutdown_orb =