3 files changed, 17 insertions, 9 deletions
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index 85cadf3219a..aac4623c0f3 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*client) : taoexe, portableserver, rtcorba, minimum_corba {
+  exename = client
   source_files {
     client.cpp
     Custom_Network_Priority_Mapping.cpp
@@ -9,6 +10,7 @@ project(*client) : taoexe, portableserver, rtcorba, minimum_corba {
 }
 
 project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba {
+  exename = server
   after += *client
   source_files {
     server.cpp
diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index 1956eb1e5ac..a7c39a1d357 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -6,6 +6,7 @@
 #include "tao/RTCORBA/Network_Priority_Mapping.h"
 #include "Custom_Network_Priority_Mapping.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Policy_Manager.h"
 
 static const char *ior = "file://simple_servant.ior";
@@ -130,7 +131,7 @@ change_network_priority (int enable_network_priority,
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:p:x:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:p:x:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -183,15 +184,17 @@ toggle (int &i)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Initialize and obtain reference to the Test object.
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index cee01e1b4f7..6acc390f714 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -3,6 +3,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
@@ -52,7 +53,7 @@ static RTCORBA::Priority corba_priority = RTCORBA::minPriority;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -97,26 +98,28 @@ create_object (PortableServer::POA_ptr poa,
     orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  FILE *output_file= ACE_OS::fopen (filename, "w");
+  FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w"));
   ACE_OS::fprintf (output_file, "%s", ior.in ());
   ACE_OS::fclose (output_file);
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object;
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RootPOA.