1 files changed, 8 insertions, 9 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 11a0624b3f4..42b8f4db5be 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -100,10 +100,9 @@ FTP_Client_Producer::get_callback (const char *,
 }
 
 int
-Client::parse_args (int argc,
-                    char **argv)
+Client::parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:a:p:sd");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:sd");
 
   this->use_sfp_ = 0;
   int c;
@@ -272,7 +271,7 @@ Client::init (int argc,char **argv)
                            "the TAO_Naming_Client. \n"),
                           -1);
 
-      this->fp_ = ACE_OS::fopen (this->filename_,"r");
+      this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r"));
       if (this->fp_ != 0)
         {
           ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
@@ -382,12 +381,12 @@ Client::run (void)
 }
 
 int
-main (int argc,
-      char *argv[])
+ACE_TMAIN (int argc,
+      ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv);
+  CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -414,7 +413,7 @@ main (int argc,
   ACE_CHECK_RETURN (-1);
 
   int result = 0;
-  result = CLIENT::instance ()->init (argc,argv);
+  result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
   result = CLIENT::instance ()->run ();