1 files changed, 14 insertions, 10 deletions

diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index dfebe21b163..83b14a82a2c 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ami_testS.h"
 
 ACE_RCSID (AMI,
@@ -31,7 +32,8 @@ int number_of_replies = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:n:i:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "dk:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -110,10 +112,10 @@ public:
                       out_l));
         }
 
-      --number_of_replies;
+      number_of_replies--;
     };
 
-   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))
     {
@@ -122,7 +124,7 @@ public:
                   "Callback method <foo_excep> called: \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
@@ -143,7 +145,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))
     {
@@ -158,7 +160,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))
     {
@@ -177,7 +179,7 @@ public:
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
-  void inout_arg_test_excep (::Messaging::ExceptionHolder *
+  void inout_arg_test_excep (A::AMI_AMI_TestExceptionHolder *
                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -188,16 +190,18 @@ public:
 Handler handler;
 
 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;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =