diff options
Diffstat (limited to 'TAO/tests/Collocation_Exception_Test')
-rw-r--r-- | TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp | 19 | ||||
-rw-r--r-- | TAO/tests/Collocation_Exception_Test/Server_Task.cpp | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp index f4e4a6b9615..82ef56a5b5c 100644 --- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp @@ -16,7 +16,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n:"); int c; while ((c = get_opts ()) != -1) @@ -43,19 +43,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -76,10 +76,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index 746c3ff7758..9e6a33cc62c 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -66,7 +66,7 @@ Server_Task::svc (void) // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", |