diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 2d064471253..ff62ad6dd1b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -18,6 +18,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -220,7 +221,7 @@ Test_ECG::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -1096,9 +1097,9 @@ Test_ECG::local_source (RtecEventComm::EventSourceID id) const } int -Test_ECG::parse_args (int argc, char *argv []) +Test_ECG::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); int opt; while ((opt = get_opt ()) != EOF) @@ -1595,8 +1596,10 @@ Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Test_ECG *test; // Dynamically allocate the Test_ECG instance so that we don't have @@ -1605,7 +1608,7 @@ main (int argc, char *argv []) Test_ECG, -1); - const int status = test->run (argc, argv); + const int status = test->run (convert.get_argc(), convert.get_ASCII_argv()); delete test; return status; |