3 files changed, 10 insertions, 7 deletions
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index ace24d63d6e..c21f21625ef 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -49,7 +49,7 @@ Time_Client_i::run (const char *name,
       // Print out value
       // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly
       // under 64-bit solaris.
-      ACE_TCHAR ascii_timedate[64] = "";
+      ACE_TCHAR ascii_timedate[64] = ACE_TEXT("");
       ACE_OS::ctime_r (reinterpret_cast<const time_t *> (&timedate),
                        ascii_timedate, 64);
 
diff --git a/TAO/examples/Simple/time/client.cpp b/TAO/examples/Simple/time/client.cpp
index 28eab3cb977..fe1bfe44049 100644
--- a/TAO/examples/Simple/time/client.cpp
+++ b/TAO/examples/Simple/time/client.cpp
@@ -1,19 +1,20 @@
 //$Id$
 
 # include "Time_Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Time_Client_i client;
   
-
   ACE_DEBUG ((LM_DEBUG,
               "\n\tTime and date client\n\n"));
 
-  if (client.run ("Time",argc, argv) == -1)
+  if (client.run ("Time",convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 8c3792e16b5..22587e72d04 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -1,12 +1,14 @@
 // $Id$
 #include "../Simple_util.h"
 #include "Time_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server<Time_i> server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -17,8 +19,8 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       if (server.init ("Time",
-                       argc,
-                       argv
+                       convert.get_argc(),
+                       convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else