diff options
Diffstat (limited to 'TAO/tests/Big_AMI/client.cpp')
| -rw-r--r-- | TAO/tests/Big_AMI/client.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 23391b5b797..8b80c084e27 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -14,6 +14,7 @@ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" #include "ami_testS.h" @@ -31,7 +32,7 @@ CORBA::ULong payload_size = 128000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "db:k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "db:k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -98,7 +99,7 @@ public: } }; - void foo_excep (::Messaging::ExceptionHolder * excep_holder + void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -109,7 +110,7 @@ public: "Testing proper exception handling ...\n")); ACE_TRY { - excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); + excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -126,15 +127,16 @@ private: }; 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, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object_var = @@ -152,7 +154,7 @@ main (int argc, char *argv[]) poa_manager_var->activate (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; // We reuse the object_var smart pointer! |