diff options
Diffstat (limited to 'TAO/tests/Nested_Upcall_Crash')
| -rw-r--r-- | TAO/tests/Nested_Upcall_Crash/client.cpp | 11 | ||||
| -rw-r--r-- | TAO/tests/Nested_Upcall_Crash/scavenger.cpp | 11 | ||||
| -rw-r--r-- | TAO/tests/Nested_Upcall_Crash/server.cpp | 13 |
3 files changed, 22 insertions, 13 deletions
diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index 0bafc403012..da732aee0c2 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Nested_Upcall_Crash, client, "$Id$") @@ -30,12 +31,14 @@ private: }; 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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -88,7 +91,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Client_Peer *impl; @@ -155,7 +158,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp index d2b7c7d3981..5091945dbde 100644 --- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp @@ -5,6 +5,7 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Nested_Upcall_Crash, scavenger, "$Id$") @@ -14,14 +15,16 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int ret_val = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -57,7 +60,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = @@ -104,7 +107,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index 0b7eb0628fe..c1a244f1615 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -8,6 +8,7 @@ #include "ace/Get_Opt.h" #include "ace/Reactor.h" #include "ace/OS_NS_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Nested_Upcall_Crash, server, @@ -33,12 +34,14 @@ private: }; 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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -94,7 +97,7 @@ main (int argc, char *argv[]) seed = (ACE_RANDR_TYPE) ACE_OS::gethrtime (); - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_DEBUG ((LM_DEBUG, "SEED = %u\n", seed)); @@ -115,7 +118,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -161,7 +164,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:b:"); int c; while ((c = get_opts ()) != -1) |