This commit was manufactured by cvs2svn to create tagoci_wchar_refactor_merge_in_4_14_06

'oci_wchar_refactor_merge_in_4_14_06'.

2 files changed, 9 insertions, 8 deletions

diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index 410ad1fd4f3..1b1d241038c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -2,20 +2,22 @@
 // $Id$
 
 #include "idl3_client.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Application_Test, 
            client, 
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   IDL3_Client client;
 
   ACE_TRY_NEW_ENV
     {
-      if (client.init (argc,
-                       argv
+      if (client.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER)
            == -1)
         {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index c291082e7a4..63339a65982 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -3,6 +3,7 @@
 
 #include "idl3_client.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (Application_Test, 
@@ -260,8 +261,7 @@ IDL3_Client::init (int argc,
                    char *argv[]
                    ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -341,10 +341,9 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IDL3_Client::parse_args (int argc,
-                         char *argv[])
+IDL3_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "d");
   int c;
 
   while ((c = opts ()) != -1)