Thu Sep 25 20:19:39 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

14 files changed, 33 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2309c58874b..d0b98d72a60 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Thu Sep 25 20:19:39 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/File_IO/client.cpp:
+        * tests/File_IO/server.cpp:
+        * tests/Multiple_Inheritance/client.cpp:
+        * tests/Multiple_Inheritance/server.cpp:
+        * tests/Param_Test/options.cpp:
+        * tests/Param_Test/options.h:
+        * tests/POA/DSI/server.cp:
+        * tests/POA/Forwarding/client.cpp:
+        * tests/POA/Forwarding/server.cpp:
+        * tests/POA/Object_Reactivation/Object_Reactivation.cpp:
+        * tests/POA/On_Demand_Actiation/server.cpp:
+        * tests/POA/TIE/client.cpp:
+        * tests/UNKNOWN_Exception/client.cpp:
+          ACE_TCHAR changes
+
 Thu Sep 25 11:27:39 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * orbsvcs/orbsvcs/CosLifeCycle.mpc:
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 731d9e63a5f..229d5218417 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -34,7 +34,7 @@ static int iterations = 100;
 static CORBA::ORB_var orb;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:dk:f:i:"));
   int c;
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 116777f4500..75e39d9432f 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -38,7 +38,7 @@ private:
 
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:d"));
   int c;
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index ffcf356bb6a..4db190e3581 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -28,7 +28,7 @@ static char *ior = 0;
 static char *ior_input_file = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:f:"));
   int c;
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index dc5ae4f536a..01bd5957c28 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -18,7 +18,7 @@ Multiple_Inheritance_i::Multiple_Inheritance_i (void)
 }
 
 int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:"));
   int c;
diff --git a/TAO/tests/POA/DSI/server.cpp b/TAO/tests/POA/DSI/server.cpp
index 84c325dd666..991d3f17342 100644
--- a/TAO/tests/POA/DSI/server.cpp
+++ b/TAO/tests/POA/DSI/server.cpp
@@ -24,7 +24,7 @@ ACE_RCSID(DSI, server, "$Id$")
 static const char *ior_output_file = "ior";
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:"));
   int c;
diff --git a/TAO/tests/POA/Forwarding/client.cpp b/TAO/tests/POA/Forwarding/client.cpp
index 6e417cc0be7..3e110619a1d 100644
--- a/TAO/tests/POA/Forwarding/client.cpp
+++ b/TAO/tests/POA/Forwarding/client.cpp
@@ -28,7 +28,7 @@ static int servers = 2;
 static int iterations = 3;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("s:i:k:"));
   int c;
diff --git a/TAO/tests/POA/Forwarding/server.cpp b/TAO/tests/POA/Forwarding/server.cpp
index 58925bc7479..3ff7749dba7 100644
--- a/TAO/tests/POA/Forwarding/server.cpp
+++ b/TAO/tests/POA/Forwarding/server.cpp
@@ -28,7 +28,7 @@ static const char *ior_output_file = 0;
 static const char *forward_to_ior = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:o:"));
   int c;
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index d8b43d788c5..67835cf92cf 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -27,7 +27,7 @@
 static int debug = 1;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:"));
   int c;
diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp
index b4a89a4d054..017c1b0e581 100644
--- a/TAO/tests/POA/On_Demand_Activation/server.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/server.cpp
@@ -25,7 +25,7 @@ ACE_RCSID(On_Demand_Activation, server, "$Id$")
 static const char *ior_output_file = "ior";
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:"));
   int c;
diff --git a/TAO/tests/POA/TIE/client.cpp b/TAO/tests/POA/TIE/client.cpp
index 7f4fc2187af..fd64ae096ab 100644
--- a/TAO/tests/POA/TIE/client.cpp
+++ b/TAO/tests/POA/TIE/client.cpp
@@ -26,7 +26,7 @@ ACE_RCSID(TIE, client, "$Id$")
 static int iterations = 1;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:b:c:d:e:f:i:"));
   int c;
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index a0bb4b72b49..979001fc6fa 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -46,7 +46,7 @@ Options::~Options (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Options::parse_args (int argc, char **argv)
+Options::parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("xdn:f:i:t:k:"));
   int c;
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index 5291afb7a7c..11b82caa1b6 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -86,7 +86,7 @@ public:
   ~Options (void);
   // destructor
 
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR **argv);
   // Parses the arguments passed on the command line.
 
   char const * param_test_ior (void) const;
diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp
index 63f8e6eb039..aedca49babe 100644
--- a/TAO/tests/UNKNOWN_Exception/client.cpp
+++ b/TAO/tests/UNKNOWN_Exception/client.cpp
@@ -5,11 +5,11 @@
 
 ACE_RCSID (UNKNOWN_Exception, client, "$Id$")
 
-static const char *ior = "file://ior";
+static const ACE_TCHAR *ior = "file://ior";
 static int shutdown_server = 1;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:x:"));
   int c;
@@ -49,8 +49,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
-      int result =
-        parse_args (argc, argv);
+      int const result = parse_args (argc, argv);
+
       if (result != 0)
         return result;