1 files changed, 10 insertions, 11 deletions
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
index 27644baab31..5f337e514d2 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
@@ -7,6 +7,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/SString.h"
 #include "ace/Manual_Event.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "interceptors.h"
 #include "Collocated_ORBInitializer.h"
@@ -19,7 +20,7 @@ ACE_CString client_orb;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:o");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,10 +42,11 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc,
-                  argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   server_orb.set ("server_orb");
@@ -65,11 +67,9 @@ main (int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Argv_Type_Converter satc (argc, argv);
-
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -91,10 +91,9 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       me.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;