diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage')
-rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp | 28 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp | 20 |
2 files changed, 23 insertions, 25 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index 31bdd2c32e2..4a5881deaaa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" static FILE *output_file = 0; @@ -88,7 +89,7 @@ Receiver_Callback::dump_samples (const char* file) ACE_DEBUG ((LM_DEBUG, "Dumping Stats.....\n")); - FILE* stats_file = ACE_OS::fopen (file, "w"); + FILE* stats_file = ACE_OS::fopen (file, ACE_TEXT("w")); if (stats_file == 0) { @@ -102,7 +103,7 @@ Receiver_Callback::dump_samples (const char* file) stats_.sample ((ACE_UINT64)stats [i]); } - stats_.dump_results ("Inter Frame Arrival Time Statistics ", + stats_.dump_results (ACE_TEXT("Inter Frame Arrival Time Statistics "), stats_file, 1); // ACE_High_Res_Timer::global_scale_factor ()); @@ -204,12 +205,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:s:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:"); int c; while ((c = opts ()) != -1) @@ -233,16 +232,17 @@ 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 { // 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; @@ -272,15 +272,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", @@ -293,8 +292,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; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index c98b0bed8bb..593430ec374 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -62,11 +63,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:dl:a:s:b:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:dl:a:s:b:"); int c; while ((c= opts ()) != -1) @@ -195,7 +195,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -434,15 +434,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } 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 { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -472,8 +473,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |