Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch

1 files changed, 9 insertions, 6 deletions

diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 3d6b5a7abdf..ea6d1e66b09 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -2,6 +2,7 @@
 #include "tao/FlResource_Loader.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(FL_Cube, client, "$Id$")
 
@@ -27,7 +28,7 @@ public:
   void show (void);
   // Call show on all the window objects
 
-  void parse_args (int argc, char *argv[]
+  void parse_args (int argc, ACE_TCHAR *argv[]
                    ACE_ENV_ARG_DECL);
 
 private:
@@ -51,14 +52,16 @@ private:
   // The server.
 };
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO::FlResource_Loader fl_loader;
 
   ACE_TRY_NEW_ENV
     {
       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;
 
       Fl_Window window (300, 100);
@@ -71,7 +74,7 @@ int main (int argc, char* argv[])
 
       client.show ();
 
-      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.parse_args (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Fl::run ();
@@ -166,12 +169,12 @@ Client::y_changed (void)
 }
 
 void
-Client::parse_args (int argc, char *argv[]
+Client::parse_args (int argc, ACE_TCHAR *argv[]
                     ACE_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
-  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)