2 files changed, 7 insertions, 4 deletions
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index d7123478053..a82b7249d71 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -3,6 +3,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
@@ -34,8 +35,7 @@ BasicLog_Test::init (int argc, char *argv[])
   ACE_TRY
     {
       // Initialize the ORB
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
+      orb_ = CORBA::ORB_init (argc, argv,
                               "internet"
                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -542,7 +542,7 @@ BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite)
 int
 BasicLog_Test::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "di");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
index b906b2fb1e5..345e0c82b2f 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
@@ -1,6 +1,7 @@
 #include "Basic_Log_Test.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Basic_Log_Test,
            client,
@@ -9,11 +10,13 @@ ACE_RCSID (Basic_Log_Test,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   BasicLog_Test log_test;
 
   ACE_DEBUG((LM_DEBUG, "\nBasic Log test \n\n"));
 
-  if (log_test.init(argc, argv) == -1)
+  if (log_test.init(convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       ACE_ERROR_RETURN((LM_ERROR,
 			    "xx - Failed initializing BasicLog_Test.\n"),-1);