*** empty log message ***

14 files changed, 31 insertions, 31 deletions

diff --git a/performance-tests/Misc/basic_perf.cpp b/performance-tests/Misc/basic_perf.cpp
index 8de63d6c1dc..0aa04d3b007 100644
--- a/performance-tests/Misc/basic_perf.cpp
+++ b/performance-tests/Misc/basic_perf.cpp
@@ -498,7 +498,7 @@ static
 unsigned int
 get_options (int argc, ACE_TCHAR *argv [])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("i:?"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:?"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp
index 723901c7b47..8707bce198e 100644
--- a/performance-tests/Misc/childbirth_time.cpp
+++ b/performance-tests/Misc/childbirth_time.cpp
@@ -336,7 +336,7 @@ prof_mutex_base (size_t iteration)
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("n:l:pftahmxe"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:l:pftahmxe"));
   int c;
   size_t iteration = 10;
   Profiler profiler = 0;
diff --git a/performance-tests/Misc/context_switch_time.cpp b/performance-tests/Misc/context_switch_time.cpp
index 97d548cfa44..a14f918bc93 100644
--- a/performance-tests/Misc/context_switch_time.cpp
+++ b/performance-tests/Misc/context_switch_time.cpp
@@ -1085,7 +1085,7 @@ static
 u_int
 get_options (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("c:n?"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("c:n?"));
   int opt;
   while ((opt = get_opt ()) != EOF) {
     switch (opt) {
diff --git a/performance-tests/Misc/preempt.cpp b/performance-tests/Misc/preempt.cpp
index 6473f769e13..2c68e817385 100644
--- a/performance-tests/Misc/preempt.cpp
+++ b/performance-tests/Misc/preempt.cpp
@@ -293,7 +293,7 @@ Low_Priority_Task::svc (void)
 static int
 get_options (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("fh:l:n:p:y?"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("fh:l:n:p:y?"));
   int opt;
   while ((opt = get_opt ()) != EOF) {
     switch (opt) {
diff --git a/performance-tests/SCTP/Options_Manager.cpp b/performance-tests/SCTP/Options_Manager.cpp
index 8db8bfdfc6d..dcf3f740072 100644
--- a/performance-tests/SCTP/Options_Manager.cpp
+++ b/performance-tests/SCTP/Options_Manager.cpp
@@ -69,43 +69,43 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
 
     // Declare options with ACE_Get_Arg_Opt
     int c;
-    ACE_Get_Arg_Opt * get_opt = 0;
+    ACE_Get_Arg_Opt<ACE_TCHAR> * get_opt = 0;
     if (!ACE_OS::strcmp(ACE_TEXT ("client-opts"), opts_set)){
-      get_opt = new ACE_Get_Arg_Opt(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h"));
+      get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h"));
 
       get_opt->long_option (ACE_TEXT ("test_iterations"),         'c',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("test_enable_nagle"),       'n');
       get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_min_bin"),       'm',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_max_bin"),       'M',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_num_outliers"),  'x',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_bin_count"),     'b',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("client_port"),             'C',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("client_accept_addr"),      'i',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_port"),             'p',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_host"),             'H',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("payload_size_power_of_2"), 's',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("help"),                    'h');
     } else if (!ACE_OS::strcmp (ACE_TEXT ("server-opts"), opts_set)){
-      get_opt = new ACE_Get_Arg_Opt(argc, argv, ACE_TEXT("nt:p:a:u"));
+      get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("nt:p:a:u"));
       get_opt->long_option (ACE_TEXT ("test_enable_nagle"),       'n');
       get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_port"),             'p',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_accept_addr"),      'a',
-                            ACE_Get_Arg_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("help"),                    'h');
     } else {
       _error = 1;
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
index b849898f0f0..b081ff9b4d3 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
@@ -246,7 +246,7 @@ Leader_Follower_Task::svc (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("m:t:d:s:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:t:d:s:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
index ffc0b1f2da0..5ba6738013d 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
@@ -192,7 +192,7 @@ Leader_Follower_Task::svc (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
index 132d1086eee..239fc1f622e 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
@@ -396,7 +396,7 @@ Output_Task::put (ACE_Message_Block *mb, ACE_Time_Value *)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("m:s:t:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index c4ed80bcfc0..83a75a2fd52 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -235,7 +235,7 @@ IO_Task::svc (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index b3356a7bec7..256ad60b902 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -40,7 +40,7 @@ Baseline_Test_Base::init (int argc, ACE_TCHAR *argv[])
 int
 Baseline_Test_Base::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("i:ylrw"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("i:ylrw"), 0);
   int c;
 
   while ((c = getopt ()) != -1)
@@ -102,7 +102,7 @@ Baseline_Test_Options::Baseline_Test_Options (void)
 int
 Baseline_Test_Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("tv"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("tv"), 0);
   int c;
 
   while ((c = getopt ()) != -1)
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
index 791aab2a9fe..f62eed366c7 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
@@ -74,7 +74,7 @@ Performance_Test_Options::Performance_Test_Options (void)
 void
 Performance_Test_Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("a:A:bBc:C:dDe:F:g:H:i:L:l:M:m:n:Np:P:s:S:t:T:uvX:Z:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:A:bBc:C:dDe:F:g:H:i:L:l:M:m:n:Np:P:s:S:t:T:uvX:Z:"), 0);
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
index e5085a2871a..429bd97a031 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
@@ -37,7 +37,7 @@ ACE_Thread_Mutex Guard_Test::mutex_;
 int
 Guard_Test::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("gt"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("gt"));
   int c;
 
   while ((c = getopt()) != -1)
diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp
index ad2ddc00ed3..a08f475e62f 100644
--- a/performance-tests/TCP/tcp_test.cpp
+++ b/performance-tests/TCP/tcp_test.cpp
@@ -528,7 +528,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
 
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:"));
 
   while ((c = getopt ()) != -1)
     {
diff --git a/performance-tests/UDP/udp_test.cpp b/performance-tests/UDP/udp_test.cpp
index 5e068cbf8ea..1d3b773061a 100644
--- a/performance-tests/UDP/udp_test.cpp
+++ b/performance-tests/UDP/udp_test.cpp
@@ -609,7 +609,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   cmd = argv;
 
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("x:w:f:vs:I:p:rtn:b:a"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("x:w:f:vs:I:p:rtn:b:a"));
 
   while ((c = getopt ()) != -1)
     {