Tue Sep 30 18:25:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 7 insertions, 8 deletions

diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index d6e6eb958f6..e8278de8dd5 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -288,7 +288,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       int threads = 1;
 
       for (i = 0; i < argc; i++)
-        if (ACE_OS::strcmp (argv[i], "-n") == 0)
+        if (ACE_OS::strcmp (argv[i], ACE_TEXT("-n")) == 0)
           threads = ACE_OS::atoi(argv[i + 1]);
 
       // create a separate server thread
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 417852da351..8c248eba672 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -59,7 +59,7 @@ MT_Server::MT_Server ()
 
 // Reads the MT Object IOR from a file
 int
-MT_Server::read_ior (char *filename)
+MT_Server::read_ior (ACE_TCHAR *filename)
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (filename,0);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index e653a49d3a8..b486c2f443e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -63,7 +63,7 @@ public:
   // Just run it briefly
 
 private:
-  int read_ior (char *filename);
+  int read_ior (ACE_TCHAR *filename);
   // reading the IOR of mt object in
 
   int parse_args (void);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index 001bc0231be..3c3acc77d85 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -63,8 +63,7 @@ MT_Object_Server::parse_args (void)
 }
 
 int
-MT_Object_Server::init (int argc,
-                       char** argv)
+MT_Object_Server::init (int argc, ACE_TCHAR** argv)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index c24e1e37cdb..803fd4da740 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -39,7 +39,7 @@ Initiator_Server::Initiator_Server (void)
 // A_B == 1, means read Object B's IOR
 
 int
-Initiator_Server::read_ior (char *filename, unsigned int A_B)
+Initiator_Server::read_ior (ACE_TCHAR *filename, unsigned int A_B)
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (filename,0);
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 318ee6ca75e..36be7ab5da6 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -47,7 +47,7 @@ public:
   ~Initiator_Server (void);
   // Destructor
 
-  int read_ior (char *filename, unsigned int A_B);
+  int read_ior (ACE_TCHAR *filename, unsigned int A_B);
   // read in the IOR's for the two objects A and B
 
   int init (int argc,
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index d9e9480590f..fa1a29d8ddb 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -64,7 +64,7 @@ Object_A_Server::parse_args (void)
 
 int
 Object_A_Server::init (int argc,
-                       char** argv)
+                       ACE_TCHAR** argv)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.