diff options
Diffstat (limited to 'TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 442d7a9356f..b66c6231b1d 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" #include "ami_testC.h" @@ -36,7 +37,7 @@ int debug = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:i:x"); int c; while ((c = get_opts ()) != -1) @@ -92,7 +93,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)) { @@ -102,7 +103,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_CATCH (A::DidTheRightThing, ex) @@ -129,7 +130,7 @@ public: result)); }; - void get_yadda_excep (::Messaging::ExceptionHolder * + void get_yadda_excep (A::AMI_AMI_TestExceptionHolder * ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -144,7 +145,7 @@ public: "Callback method <set_yadda> called: \n")); }; - void set_yadda_excep (::Messaging::ExceptionHolder * + void set_yadda_excep (A::AMI_AMI_TestExceptionHolder * ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -155,8 +156,10 @@ public: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_simple_client")); ACE_DECLARE_NEW_CORBA_ENV; @@ -164,7 +167,7 @@ main (int argc, char *argv[]) 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 = @@ -182,7 +185,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! |