diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index d24c92414ff..0cf85d02a7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_String.h" #include "ace/High_Res_Timer.h" @@ -139,12 +140,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -165,9 +164,11 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -175,8 +176,7 @@ main (int argc, // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -206,15 +206,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -227,8 +226,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |