Tue Sep 16 12:03:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

17 files changed, 31 insertions, 31 deletions

diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index af64450f88d..39cc70f24cc 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -18,9 +18,9 @@ void do_nothing (void)
 }
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index a6f4ff7c4d5..53dcd5df0c3 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -12,9 +12,9 @@ const char *ior_output_file = 0;
 int no_iterations = 10;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:i:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:i:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 844af0f98cb..c3eb2a47b52 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -15,9 +15,9 @@ long data_size = 3461724;
 bool shutdown_server = false;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:d:x");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:i:d:x"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index b12b2543792..c45cef8de73 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -40,9 +40,9 @@ private:
 static int n_threads = 1;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:t:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:t:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
index cf135212f1e..2b17ba02a20 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
@@ -97,9 +97,9 @@ secure_invocation_test (CORBA::Object_ptr object)
 }
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "nk:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("nk:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
index 6ecebab4999..b164bf3432d 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
@@ -13,9 +13,9 @@ const char *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index 840a7f574a4..7c453ff0a89 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -17,9 +17,9 @@ CORBA::Boolean call_shutdown = 0;
 int wait_time = 10;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "sk:w:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("sk:w:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 891e73774b4..2e9a8cb7a34 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -14,9 +14,9 @@ const char *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
index d71169fbc8a..1e289e3d0a0 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
@@ -15,7 +15,7 @@ CORBA::Short endpoint_port = 12345;
 int verbose = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   for (int c = 1; c < argc; c++) {
     if (ACE_OS::strcasecmp(argv[c],"-o") == 0)
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 56d23fe4eb9..c293492f955 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -13,7 +13,7 @@ int verbose = 0;
 bool as_server = true;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   for (int c = 1; c < argc; c++) {
     if (ACE_OS::strcasecmp(argv[c],"-o") == 0)
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 8fdd9e230f0..c5b98cc5b3b 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -10,9 +10,9 @@ int do_shutdown = 0;
 int nthreads = 5;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:x");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:i:x"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index fd2a9c66c1f..e435a962084 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -8,9 +8,9 @@ const char *ior_output_file = 0;
 int nthreads = 4;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 2ab78193c18..3408178ec0d 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -12,9 +12,9 @@ int do_shutdown = 0;
 int nthreads = 5;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:x");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:i:x"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index 57989276cdd..7c12307a9d3 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -12,9 +12,9 @@ char *another_table_name = 0;
 int nthreads = 4;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:o:n:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:o:n:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 5e5047464c3..262ea8cf79d 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -97,9 +97,9 @@ secure_invocation_test (CORBA::Object_ptr object)
 }
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 26c1e5ee695..0c880a614ec 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -13,9 +13,9 @@ const char *ior_output_file = 0;
 const char *cert_file = "cacert.pem";
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index f4df2a687ee..e20b9d5e3ce 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -86,7 +86,7 @@ CosNaming_Client::CosNaming_Client (void)
 int
 CosNaming_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:");
+  ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:"));
   int c;
 
   while ((c = get_opts ()) != -1)