diff options
Diffstat (limited to 'TAO/tests/RTCORBA/Policy_Combinations/server.cpp')
| -rw-r--r-- | TAO/tests/RTCORBA/Policy_Combinations/server.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index db378d994bd..38c44df730a 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testS.h" #include "tao/ORB_Core.h" #include "ace/Task.h" @@ -115,7 +116,7 @@ static CORBA::Boolean allow_borrowing = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "s:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:"); int c; while ((c = get_opts ()) != -1) @@ -150,7 +151,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ENV_ARG_DECL) { FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -906,19 +907,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; |