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

19 files changed, 50 insertions, 28 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a8ff42ce661..89a3cbf6508 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,25 @@
+Tue Sep 16 12:19:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/Gateway/Gateway/Event_Channel.h
+        * apps/gperf/src/Options.cpp
+        * apps/gperf/src/Options.h
+        * apps/JAWS2/JAWS/Server.cpp
+        * apps/JAWS2/JAWS/Server.h
+        * apps/JAWS3/bench/mkfiles.cpp
+        * apps/JAWS3/bench/rqfiles.cpp
+        * apps/JAWS3/http/HTTP_Service_Handler.cpp
+        * apps/JAWS3/small/SS_Service_Handler.cpp
+        * apps/JAWS/stress_testing/benchd.cpp
+        * netsvcs/clients/Tokens/collection/collection.cpp
+        * netsvcs/clients/Tokens/collection/rw_locks.cpp
+        * netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+        * netsvcs/clients/Tokens/manual/manual.cpp
+        * netsvcs/clients/Tokens/mutex/test_mutex.cpp
+        * netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
+        * performance-tests/Misc/test_guard.cpp
+        * performance-tests/RPC/client.cpp
+          ACE_TCHAR changes
+
 Tue Sep 16 10:52:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * include/makeinclude/*.bor:
diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.h b/ACE/apps/Gateway/Gateway/Event_Channel.h
index 64788cc0cdb..0d4b56a5c80 100644
--- a/ACE/apps/Gateway/Gateway/Event_Channel.h
+++ b/ACE/apps/Gateway/Gateway/Event_Channel.h
@@ -88,7 +88,7 @@ public:
   // Suppliers.
 
 private:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command-line arguments.
 
   // = Methods for handling events.
diff --git a/ACE/apps/JAWS/stress_testing/benchd.cpp b/ACE/apps/JAWS/stress_testing/benchd.cpp
index 02209a12a13..350277a0db0 100644
--- a/ACE/apps/JAWS/stress_testing/benchd.cpp
+++ b/ACE/apps/JAWS/stress_testing/benchd.cpp
@@ -173,9 +173,9 @@ Handle_Events::serve (char *buf)
 }
 
 static void
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:u:q");
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:u:q"));
 
   int c;
 
diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp
index 67e033b91cb..aeb3e9cbd7d 100644
--- a/ACE/apps/JAWS2/JAWS/Server.cpp
+++ b/ACE/apps/JAWS2/JAWS/Server.cpp
@@ -140,13 +140,13 @@ JAWS_Server::open (JAWS_Pipeline_Handler *protocol,
 }
 
 void
-JAWS_Server::parse_args (int argc, char *argv[])
+JAWS_Server::parse_args (int argc, ACE_TCHAR *argv[])
 {
   int c;
   int t = 0;
 
   //FUZZ: disable check_for_lack_ACE_OS
-  ACE_Get_Opt getopt (argc, argv, "t" "p:c:d:n:m:f:r:");
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("t" "p:c:d:n:m:f:r:"));
   while ((c = getopt ()) != -1)
   //FUZZ: enable check_for_lack_ACE_OS
     switch (c)
diff --git a/ACE/apps/JAWS2/JAWS/Server.h b/ACE/apps/JAWS2/JAWS/Server.h
index 0cac8f17ae0..c8a3fc30708 100644
--- a/ACE/apps/JAWS2/JAWS/Server.h
+++ b/ACE/apps/JAWS2/JAWS/Server.h
@@ -20,7 +20,7 @@ public:
   int open (JAWS_Pipeline_Handler *ph, JAWS_Dispatch_Policy *dp = 0);
 
 private:
-  void parse_args (int argc, char *argv[]);
+  void parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse arguments
 
 private:
diff --git a/ACE/apps/JAWS3/bench/mkfiles.cpp b/ACE/apps/JAWS3/bench/mkfiles.cpp
index 50140dbefbd..03d932ec9ef 100644
--- a/ACE/apps/JAWS3/bench/mkfiles.cpp
+++ b/ACE/apps/JAWS3/bench/mkfiles.cpp
@@ -10,7 +10,7 @@ static float poidev (float xm);
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt options (argc, argv, "m:s:x:n:");
+  ACE_Get_Opt options (argc, argv, ACE_TEXT("m:s:x:n:"));
   // m -- median file size in kB
   // x -- maximum file size in kB
   // n -- number of files
diff --git a/ACE/apps/JAWS3/bench/rqfiles.cpp b/ACE/apps/JAWS3/bench/rqfiles.cpp
index c0ead18ec20..714754cdec9 100644
--- a/ACE/apps/JAWS3/bench/rqfiles.cpp
+++ b/ACE/apps/JAWS3/bench/rqfiles.cpp
@@ -175,7 +175,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Reactor::instance ()->register_handler (SIGINT, signal_handler);
   ACE_OS::signal (SIGPIPE, SIG_IGN);
 
-  ACE_Get_Opt options (argc, argv, "f:r:n:w:");
+  ACE_Get_Opt options (argc, argv, ACE_TEXT("f:r:n:w:"));
 
   // f -- file list
   // r -- request rate in requests per second
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
index 56e2d2c7e92..f35897def98 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.cpp
@@ -37,7 +37,7 @@ JAWS_HTTP_Service_Handler::close (unsigned long)
 int
 JAWS_HTTP_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt opt (argc, argv, "p:");
+  ACE_Get_Opt opt (argc, argv, ACE_TEXT("p:"));
 
   unsigned short p = 0;
 
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
index 627996a7b07..d255e627023 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.cpp
@@ -37,7 +37,7 @@ TeraSS_Service_Handler::close (unsigned long)
 int
 TeraSS_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt opt (argc, argv, "p:");
+  ACE_Get_Opt opt (argc, argv, ACE_TEXT("p:"));
 
   unsigned short p = 0;
 
diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp
index b6ef8e4a95e..3210622b1a0 100644
--- a/ACE/apps/gperf/src/Options.cpp
+++ b/ACE/apps/gperf/src/Options.cpp
@@ -256,13 +256,13 @@ Options::~Options (void)
 // option_word_.
 
 int
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   if (ACE_LOG_MSG->open (argv[0]) == -1)
     return -1;
 
   //FUZZ: disable check_for_lack_ACE_OS
-  ACE_Get_Opt getopt (argc, argv, "abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:");
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:"));
   //FUZZ: enable check_for_lack_ACE_OS
 
   int option_char;
diff --git a/ACE/apps/gperf/src/Options.h b/ACE/apps/gperf/src/Options.h
index c53ba235a2d..2026c957594 100644
--- a/ACE/apps/gperf/src/Options.h
+++ b/ACE/apps/gperf/src/Options.h
@@ -103,7 +103,7 @@ public:
   Options (void);
   ~Options (void);
   int operator[] (Option_Type option);
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   void operator= (enum Option_Type);
   bool operator!= (enum Option_Type);
   static void print_options (void);
diff --git a/ACE/netsvcs/clients/Tokens/collection/collection.cpp b/ACE/netsvcs/clients/Tokens/collection/collection.cpp
index 84724d1a6ea..b4dcf69b056 100644
--- a/ACE/netsvcs/clients/Tokens/collection/collection.cpp
+++ b/ACE/netsvcs/clients/Tokens/collection/collection.cpp
@@ -87,11 +87,11 @@ run_thread (void *vp)
 }
 
 static int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
 
-  ACE_Get_Opt get_opt (argc, argv, "un:dp:h:", 1);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("un:dp:h:"), 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp b/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp
index 33ca18b9dba..1b1b0291e55 100644
--- a/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp
+++ b/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp
@@ -70,11 +70,11 @@ run_thread (void *vp)
 }
 
 static int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
 
-  ACE_Get_Opt get_opt (argc, argv, "t:iun:drR:sp:h:", 1);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:iun:drR:sp:h:"), 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index 3a1a13195d4..76be5ea34cc 100644
--- a/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/ACE/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -167,11 +167,11 @@ run_writer (void *vp)
 }
 
 static int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, "iuh:rp:n:", 1);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("iuh:rp:n:"), 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/ACE/netsvcs/clients/Tokens/manual/manual.cpp b/ACE/netsvcs/clients/Tokens/manual/manual.cpp
index 1e0154a12c7..966cf0d214e 100644
--- a/ACE/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/ACE/netsvcs/clients/Tokens/manual/manual.cpp
@@ -43,7 +43,7 @@ public:
   STDIN_Token (void);
   // Construction.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse command-line arguments.
 
   //FUZZ: disable check_for_lack_ACE_OS
@@ -101,11 +101,11 @@ STDIN_Token::STDIN_Token (void)
 }
 
 int
-STDIN_Token::parse_args (int argc, char *argv[])
+STDIN_Token::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR);
 
-  ACE_Get_Opt get_opt (argc, argv, "h:p:diu", 1);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:diu"), 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/ACE/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/ACE/netsvcs/clients/Tokens/mutex/test_mutex.cpp
index 165ef2b50ee..a4e14cbfa1c 100644
--- a/ACE/netsvcs/clients/Tokens/mutex/test_mutex.cpp
+++ b/ACE/netsvcs/clients/Tokens/mutex/test_mutex.cpp
@@ -65,11 +65,11 @@ run_test (void *)
 }
 
 static int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, "t:uh:p:n:", 1);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:uh:p:n:"), 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
index 23d6a5e7f20..7e4e3264671 100644
--- a/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
+++ b/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
@@ -141,11 +141,11 @@ run_thread (void *)
 }
 
 static int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
 
-  ACE_Get_Opt get_opt (argc, argv, "t:iun:dr:sp:h:R", 1);
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:iun:dr:sp:h:R"), 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/ACE/performance-tests/Misc/test_guard.cpp b/ACE/performance-tests/Misc/test_guard.cpp
index 11c28741405..e559508af41 100644
--- a/ACE/performance-tests/Misc/test_guard.cpp
+++ b/ACE/performance-tests/Misc/test_guard.cpp
@@ -55,7 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   ACE_Profile_Timer timer;
 
   //FUZZ: disable check_for_lack_ACE_OS
-  ACE_Get_Opt getopt (argc, argv, "gtn:");
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("gtn:"));
   //FUZZ: enable check_for_lack_ACE_OS
 
   int iterations = DEFAULT_ITERATIONS;
diff --git a/ACE/performance-tests/RPC/client.cpp b/ACE/performance-tests/RPC/client.cpp
index f03bd77211e..7e309a1d64a 100644
--- a/ACE/performance-tests/RPC/client.cpp
+++ b/ACE/performance-tests/RPC/client.cpp
@@ -14,7 +14,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   int c;
 
   //FUZZ: disable check_for_lack_ACE_OS
-  ACE_Get_Opt getopt (argc, argv, "h:i:");
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("h:i:"));
 
   while ((c = getopt ()) != -1)
     {