2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 9a8d23a4996..12979b67653 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -5,6 +5,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
@@ -248,7 +249,7 @@ Client_i::read_ior (char *filename)
 int
 Client_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:xk:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:f:xk:");
   int c;
   int result;
 
diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp
index 690b329a7d7..2eb9ac6be6f 100644
--- a/TAO/orbsvcs/tests/Time/client.cpp
+++ b/TAO/orbsvcs/tests/Time/client.cpp
@@ -2,20 +2,23 @@
 
 #include "Client_i.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Time, client, "$Id$")
 
 // This function runs the Time Service client test.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Client_i client;
 
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Time Service Client\n"));
 
-  if (client.init (argc, argv) == -1)
+  if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
   else
     return client.run ();