1 files changed, 10 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 7a7a0686962..98f9d5798b0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "server.h"
+#include "ace/Argv_Type_Converter.h"
 
 FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ())
@@ -101,7 +102,7 @@ Server::format (void)
 
 int
 Server::init (int argc,
-              char **argv)
+             char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -183,7 +184,7 @@ Server::run (void)
 int
 Server::parse_args (int argc,char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:p:");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -191,7 +192,7 @@ Server::parse_args (int argc,char **argv)
       switch (c)
         {
         case 'f':
-          this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w");
+          this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w"));
           if (this->fp_ != 0)
             {
               ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
@@ -220,16 +221,17 @@ Server::file (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -250,7 +252,7 @@ main (int argc,
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  result = FTP_SERVER::instance ()->init (argc,argv);
+  result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
 
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,"SERVER::init failed\n"),1);