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

3 files changed, 20 insertions, 14 deletions

diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index b62ff14a3d9..68097115ebf 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -2,12 +2,14 @@
 // $Id$
 
 project(*Server): rt_server {
+  exename = server
   Source_Files {
     server.cpp
   }
 }
 
 project(*Client): rt_client {
+  exename = client
   after += *Server
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 248fb4b0f2e..db79df757f8 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/ORB_Core.h"
 #include "../check_supported_priorities.cpp"
@@ -14,7 +15,7 @@ const char *ior2 = "file://test2.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -314,22 +315,23 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index b45fef9cba9..deac22c02b8 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -3,6 +3,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
@@ -134,7 +135,7 @@ const char *ior_output_file2 = "test2.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "b:o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -174,7 +175,7 @@ get_priority_bands (RTCORBA::PriorityBands &bands)
   // Read bands from a file.
   //
   FILE* file =
-    ACE_OS::fopen (bands_file, "r");
+    ACE_OS::fopen (bands_file, ACE_TEXT("r"));
 
   if (file == 0)
     return -1;
@@ -257,7 +258,7 @@ create_object (PortableServer::POA_ptr poa,
   if (filename != 0)
     {
       FILE *output_file =
-        ACE_OS::fopen (filename, "w");
+        ACE_OS::fopen (filename, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
@@ -344,24 +345,25 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb;
 
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
       orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;