get_opt fix

71 files changed, 87 insertions, 87 deletions

diff --git a/examples/APG/Config/ARGV_Example.cpp b/examples/APG/Config/ARGV_Example.cpp
index 88249644d40..2e87b3caeba 100644
--- a/examples/APG/Config/ARGV_Example.cpp
+++ b/examples/APG/Config/ARGV_Example.cpp
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   static const ACE_TCHAR cmdline[] =
     ACE_TEXT ("-f /home/managed.cfg -h $HOSTNAME");
   ACE_ARGV cmdline_args (cmdline);
-  ACE_Get_Arg_Opt cmd_opts (cmdline_args.argc (),
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (cmdline_args.argc (),
                         cmdline_args.argv (),
                         options,
                         0);          // Don't skip any args
diff --git a/examples/APG/Config/Get_Opt.cpp b/examples/APG/Config/Get_Opt.cpp
index 26c643f3c7b..aff6ad035ee 100644
--- a/examples/APG/Config/Get_Opt.cpp
+++ b/examples/APG/Config/Get_Opt.cpp
@@ -16,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // Example for a long option without a corresponding short option.
   // Just put some context here so the following compiles and runs.
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Arg_Opt cmd_opts (argc, argv, options);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options);
 
   // Listing 1 code/ch04
   cmd_opts.long_option (ACE_TEXT ("cool_option"));
diff --git a/examples/APG/Config/Get_Opt_Long.cpp b/examples/APG/Config/Get_Opt_Long.cpp
index 7f86de3a6ec..8b212b7a32a 100644
--- a/examples/APG/Config/Get_Opt_Long.cpp
+++ b/examples/APG/Config/Get_Opt_Long.cpp
@@ -14,10 +14,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Arg_Opt cmd_opts
-    (argc, argv, options, 1, 0, ACE_Get_Arg_Opt::PERMUTE_ARGS, 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts
+    (argc, argv, options, 1, 0, ACE_Get_Arg_Opt<ACE_TCHAR>::PERMUTE_ARGS, 1);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
 
   int option;
diff --git a/examples/APG/Config/HA_Status.cpp b/examples/APG/Config/HA_Status.cpp
index f9d54992139..6fac607d8e6 100644
--- a/examples/APG/Config/HA_Status.cpp
+++ b/examples/APG/Config/HA_Status.cpp
@@ -32,9 +32,9 @@ HA_Status::init (int argc, ACE_TCHAR *argv[])
 
   // Listing 1 code/ch04
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Arg_Opt cmd_opts (argc, argv, options);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
   int option;
   ACE_TCHAR config_file[MAXPATHLEN];
diff --git a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
index 230196a28f8..edc3c03b630 100644
--- a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
@@ -17,9 +17,9 @@ int
 HA_Status::init (int argc, ACE_TCHAR *argv[])
 {
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Arg_Opt cmd_opts (argc, argv, options, 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options, 0);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
   int option;
   ACE_TCHAR config_file[MAXPATHLEN];
diff --git a/examples/APG/Svc_Config/HA_Status_Static.cpp b/examples/APG/Svc_Config/HA_Status_Static.cpp
index a6ac2152f0a..c9dbfbeb961 100644
--- a/examples/APG/Svc_Config/HA_Status_Static.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Static.cpp
@@ -17,9 +17,9 @@ int
 HA_Status::init (int argc, ACE_TCHAR *argv[])
 {
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Arg_Opt cmd_opts (argc, argv, options, 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options, 0);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
   int option;
   ACE_TCHAR config_file[MAXPATHLEN];
diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp
index d9719e46f7d..2a7a4d30808 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -108,7 +108,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("c:bdH:i:L:l:M:ns:t:T:v"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:bdH:i:L:l:M:ns:t:T:v"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 53d7d2e80bf..d0f9accec78 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -24,7 +24,7 @@ ACE_RCSID (Transceiver,
 int
 Event_Transceiver::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("Ch:p:S"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("Ch:p:S"));
 
   this->port_number_ = ACE_DEFAULT_SERVER_PORT;
   this->host_name_ = ACE_DEFAULT_SERVER_HOST;
diff --git a/examples/ASX/UPIPE_Event_Server/Options.cpp b/examples/ASX/UPIPE_Event_Server/Options.cpp
index 798bb27ddd6..31ec41fa55f 100644
--- a/examples/ASX/UPIPE_Event_Server/Options.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Options.cpp
@@ -98,7 +98,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("C:c:bdH:i:L:l:M:nS:s:t:T:v"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("C:c:bdH:i:L:l:M:nS:s:t:T:v"));
   int c;
 
   while ((c = getopt ()) != -1)
diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
index 90ceee19499..19cfc8a8a57 100644
--- a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
@@ -26,7 +26,7 @@ ACE_RCSID(UPIPE_Event_Server, Peer_Router, "$Id$")
 template <class PH, class PK> int
 Acceptor_Factory<PH, PK>::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("df:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("df:"), 0);
   ACE_UPIPE_Addr addr;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
index d174aed684a..4a0cde2e8ee 100644
--- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
@@ -388,13 +388,13 @@ int AC_Client_Logging_Daemon::init
   ACE_TCHAR sld_host[MAXHOSTNAMELEN];
   ACE_OS::strcpy (sld_host, ACE_LOCALHOST);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
   get_opt.long_option (ACE_TEXT ("client_port"), 'p',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_port"), 'r',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_name"), 's',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
diff --git a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index c0e6d753efa..841feaaa54f 100644
--- a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -287,13 +287,13 @@ int AIO_Client_Logging_Daemon::init
   ACE_TCHAR sld_host[MAXHOSTNAMELEN];
   ACE_OS::strcpy (sld_host, ACE_LOCALHOST);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
   get_opt.long_option (ACE_TEXT ("client_port"), 'p',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_port"), 'r',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_name"), 's',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp
index d5138d72b2f..b4802b0acb7 100644
--- a/examples/C++NPv2/Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/Client_Logging_Daemon.cpp
@@ -336,13 +336,13 @@ int Client_Logging_Daemon::init (int argc, ACE_TCHAR *argv[]) {
   ACE_TCHAR sld_host[MAXHOSTNAMELEN];
   ACE_OS::strcpy (sld_host, ACE_LOCALHOST);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
   get_opt.long_option (ACE_TEXT ("client_port"), 'p',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_port"), 'r',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_name"), 's',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
diff --git a/examples/C++NPv2/Service_Reporter.cpp b/examples/C++NPv2/Service_Reporter.cpp
index bb45fafdff7..022ae96944f 100644
--- a/examples/C++NPv2/Service_Reporter.cpp
+++ b/examples/C++NPv2/Service_Reporter.cpp
@@ -20,10 +20,10 @@ int Service_Reporter::init (int argc, ACE_TCHAR *argv[]) {
   ACE_INET_Addr local_addr (Service_Reporter::DEFAULT_PORT);
 
   // Start at argv[0].
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0);
   get_opt.long_option (ACE_TEXT ("port"),
                        'p',
-                       ACE_Get_Arg_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c) {
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index 9ddbcc28d15..47489d48c12 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -123,7 +123,7 @@ IPC_Server::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("ut:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("ut:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index b8f0de95683..f3c0cf61266 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -187,7 +187,7 @@ IPC_Client::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("ui:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("ui:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 94d0a33bc5e..4d43a474c56 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -115,7 +115,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("2h:i:m:p:q:st:T:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("2h:i:m:p:q:st:T:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 3684caa1469..3399229e37d 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -163,7 +163,7 @@ Options::Options (void)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("p:r:v"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("p:r:v"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index abd3d2235b7..0008c4a1b58 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -105,7 +105,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index f929d1c992d..6a6166ee1b8 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -110,7 +110,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index dbd64173f09..b09bf3ad326 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -173,7 +173,7 @@ Options::Options (void)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("p:r:v"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("p:r:v"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index c97678f1bef..425f040ccf5 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -42,7 +42,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   this->port_ = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp
index 070b706856d..eb87b2bef7b 100644
--- a/examples/Logger/simple-server/server_loggerd.cpp
+++ b/examples/Logger/simple-server/server_loggerd.cpp
@@ -41,7 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_INET_Addr addr (PORT);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Mem_Map/IO-tests/test_io.cpp b/examples/Mem_Map/IO-tests/test_io.cpp
index 13bf8a553af..11cdceee15f 100644
--- a/examples/Mem_Map/IO-tests/test_io.cpp
+++ b/examples/Mem_Map/IO-tests/test_io.cpp
@@ -59,7 +59,7 @@ cleanup (int = 0)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("i:n:o:r"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:n:o:r"));
 
   for (int c; ((c = get_opt ()) != -1); )
     switch (c)
diff --git a/examples/Misc/test_get_opt.cpp b/examples/Misc/test_get_opt.cpp
index 204f49d1247..dcb12e5eeff 100644
--- a/examples/Misc/test_get_opt.cpp
+++ b/examples/Misc/test_get_opt.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(Misc, test_get_opt, "$Id$")
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("ab:cd:ef:gh:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("ab:cd:ef:gh:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/NT_Service/main.cpp b/examples/NT_Service/main.cpp
index b239cb66822..2c0093a7f6b 100644
--- a/examples/NT_Service/main.cpp
+++ b/examples/NT_Service/main.cpp
@@ -95,7 +95,7 @@ Process::print_usage_and_die (void)
 void
 Process::parse_args (int argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("i:rskt:d"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:rskt:d"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/examples/OS/Process/imore.cpp b/examples/OS/Process/imore.cpp
index 1b43a72d1be..d9b645a3925 100644
--- a/examples/OS/Process/imore.cpp
+++ b/examples/OS/Process/imore.cpp
@@ -60,7 +60,7 @@ usage (void)
 static int
 parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("un"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("un"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/examples/OS/Process/process.cpp b/examples/OS/Process/process.cpp
index 83be36e7e6e..e5a30ce1c4a 100644
--- a/examples/OS/Process/process.cpp
+++ b/examples/OS/Process/process.cpp
@@ -58,7 +58,7 @@ static int run_wait = 0;
 static int
 parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("dlx:p:e:gastuw"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dlx:p:e:gastuw"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
index 6f4810c968c..b36a4a79341 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
+++ b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Arg_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
diff --git a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
index 6f4810c968c..b36a4a79341 100644
--- a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
+++ b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Arg_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
diff --git a/examples/QOS/Simple/QoS_Util.cpp b/examples/QOS/Simple/QoS_Util.cpp
index 6f4810c968c..b36a4a79341 100644
--- a/examples/QOS/Simple/QoS_Util.cpp
+++ b/examples/QOS/Simple/QoS_Util.cpp
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Arg_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp
index cee1f4c5253..bedfe046738 100644
--- a/examples/Reactor/Misc/pingpong.cpp
+++ b/examples/Reactor/Misc/pingpong.cpp
@@ -59,7 +59,7 @@ ACE_RCSID(Misc, pingpong, "$Id$")
 class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
 {
 public:
-  Ping_Pong (char b[], ACE_HANDLE f);
+  Ping_Pong (const char* b, ACE_HANDLE f);
   virtual ACE_HANDLE get_handle (void) const;
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
@@ -81,7 +81,7 @@ private:
   // Open handle.
 };
 
-Ping_Pong::Ping_Pong (char b[], ACE_HANDLE f)
+Ping_Pong::Ping_Pong (const char* b, ACE_HANDLE f)
   : buflen_ (ACE_OS::strlen (b) + 1 + (2 * sizeof (int))),
     pid_ (ACE_OS::getpid ()),
     handle_ (f)
diff --git a/examples/Reactor/Multicast/client.cpp b/examples/Reactor/Multicast/client.cpp
index 6258db992a5..3356540c880 100644
--- a/examples/Reactor/Multicast/client.cpp
+++ b/examples/Reactor/Multicast/client.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   ACE_LOG_MSG->open (argv[0]);
 
   // Start at argv[1]
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT("m:ui:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("m:ui:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp
index 5ddeb14b502..88454d8ebd4 100644
--- a/examples/Reactor/Ntalker/ntalker.cpp
+++ b/examples/Reactor/Ntalker/ntalker.cpp
@@ -180,7 +180,7 @@ Handler::Handler (u_short udp_port,
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("i:u"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:u"));
 
   int c;
 
diff --git a/examples/Reactor/Proactor/simple_test_proactor.cpp b/examples/Reactor/Proactor/simple_test_proactor.cpp
index 972999be9da..56cdecfe0cc 100644
--- a/examples/Reactor/Proactor/simple_test_proactor.cpp
+++ b/examples/Reactor/Proactor/simple_test_proactor.cpp
@@ -224,7 +224,7 @@ Simple_Tester::handle_write_file (const ACE_Asynch_Write_File::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("f:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:d:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_cancel.cpp b/examples/Reactor/Proactor/test_cancel.cpp
index 8990c7534eb..21749d71f17 100644
--- a/examples/Reactor/Proactor/test_cancel.cpp
+++ b/examples/Reactor/Proactor/test_cancel.cpp
@@ -184,7 +184,7 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("p:s:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:s:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 4b2a73e1923..99ac5b9d604 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -604,7 +604,7 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("h:p:f:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:f:d:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_proactor2.cpp b/examples/Reactor/Proactor/test_proactor2.cpp
index f7308ff5c59..7ee9e005a1b 100644
--- a/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/examples/Reactor/Proactor/test_proactor2.cpp
@@ -637,7 +637,7 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("n:p:d:h:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:p:d:h:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_proactor3.cpp b/examples/Reactor/Proactor/test_proactor3.cpp
index 91ba438dc43..83c8060118e 100644
--- a/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/examples/Reactor/Proactor/test_proactor3.cpp
@@ -669,7 +669,7 @@ set_proactor_type (const char *ptype)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("t:o:n:p:d:h:s:u"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("t:o:n:p:d:h:s:u"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_udp_proactor.cpp b/examples/Reactor/Proactor/test_udp_proactor.cpp
index 98a89fa41af..b605d0b8e82 100644
--- a/examples/Reactor/Proactor/test_udp_proactor.cpp
+++ b/examples/Reactor/Proactor/test_udp_proactor.cpp
@@ -368,7 +368,7 @@ Sender::handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
index 3d2ff186490..a5fb49207eb 100644
--- a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
+++ b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
@@ -261,7 +261,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   int result = 0;
 
   // Parse args
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("swmc"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("swmc"), 1);
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
diff --git a/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
index e9ec12e4317..ce054ec04af 100644
--- a/examples/Reactor/WFMO_Reactor/Multithreading.cpp
+++ b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
@@ -58,7 +58,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("t:h:s:i:e:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("t:h:s:i:e:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/examples/Reactor/WFMO_Reactor/Talker.cpp b/examples/Reactor/WFMO_Reactor/Talker.cpp
index a91cf3bcbf2..d9a20157dad 100644
--- a/examples/Reactor/WFMO_Reactor/Talker.cpp
+++ b/examples/Reactor/WFMO_Reactor/Talker.cpp
@@ -271,7 +271,7 @@ Peer_Handler::Peer_Handler (int argc, ACE_TCHAR *argv[])
   // then notifies us.
   this->msg_queue ()->notification_strategy (&this->strategy_);
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
index ddf682106a3..22f287b7a2b 100644
--- a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
@@ -31,7 +31,7 @@ print_usage_and_die (void)
 void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
index fb74c96301d..ab157f18775 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
@@ -39,7 +39,7 @@ print_usage_and_die (void)
 void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("c:f:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
index 33afc2885f5..76c9cbeaa62 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
@@ -39,7 +39,7 @@ parse_arguments (int argc, ACE_TCHAR *argv[])
   int tracing = 1;
   program_name = argv[0];
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("df:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("df:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
index 3333ba9a164..42065f10b1d 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("f:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
index 70b42f723e2..518c7aebf33 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
@@ -36,7 +36,7 @@ static void
 parse_arguments (int argc, char *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Arg_Opt get_opt (argc, argv, "dr:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dr:");
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
index c7de567eccc..15977728f43 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
@@ -35,7 +35,7 @@ void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("f:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
index 62cf01acea2..26ece126384 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("f:h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:h:p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
index e616baa92f3..6e12812a4fe 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
@@ -33,7 +33,7 @@ print_usage_and_die (void)
 void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("p:h:r"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:h:r"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
index 90c44103812..61192f2f469 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
@@ -40,7 +40,7 @@ void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("f:h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:h:p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
index 1704980fe08..4f42beb5674 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
@@ -39,7 +39,7 @@ void
 parse_args (int argc, char *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Arg_Opt get_opt (argc, argv, "f:h:p:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:h:p:");
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
index 57cda79340f..8fb87258041 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
@@ -50,7 +50,7 @@ ACE_INLINE int
 Handle_Broadcast::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sba (Handle_Broadcast::DEFAULT_PORT);
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
index 3935d2eec20..159cf410cb3 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
@@ -45,7 +45,7 @@ ACE_INLINE int
 Handle_L_CODgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr  sucd;
-  ACE_Get_Arg_Opt    get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT ("r:"), 0);
   const ACE_TCHAR *r = Handle_L_CODgram::DEFAULT_RENDEZVOUS;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
index 470b0cc8039..5e225fafd9e 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
@@ -45,7 +45,7 @@ ACE_INLINE int
 Handle_L_Dgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr  sudg;
-  ACE_Get_Arg_Opt    get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT ("r:"), 0);
   const ACE_TCHAR *r = Handle_L_Dgram::DEFAULT_RENDEZVOUS;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
index e36f1a401fd..8e8a3e1f960 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
@@ -43,7 +43,7 @@ ACE_INLINE int
 Handle_L_FIFO::init (int argc, ACE_TCHAR *argv[])
 {
   const ACE_TCHAR *rendezvous_fifo = Handle_L_FIFO::DEFAULT_RENDEZVOUS;
-  ACE_Get_Arg_Opt    get_opt (argc, argv, ACE_TEXT("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
index ec739d83ddf..72325011053 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
@@ -51,7 +51,7 @@ Handle_L_Pipe::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr sup;
   const ACE_TCHAR *r = Handle_L_Pipe::DEFAULT_RENDEZVOUS;
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
index 9841838eb3d..6f59b5d18a2 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
@@ -51,7 +51,7 @@ Handle_L_SPIPE::init (int argc, char *argv[])
 {
   ACE_SPIPE_Addr susp;
   const char     *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS;
-  ACE_Get_Arg_Opt    get_opt (argc, argv, "r:", 0);
+  ACE_Get_Arg_Opt<char>   get_opt (argc, argv, "r:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
index 1dae328b258..8da839253be 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
@@ -55,7 +55,7 @@ Handle_L_Stream::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr sus;
   const ACE_TCHAR *r = Handle_L_Stream::DEFAULT_RENDEZVOUS;
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
index 1ad1f628fae..df58c0173b8 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
@@ -45,7 +45,7 @@ ACE_INLINE int
 Handle_R_Dgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sidg (Handle_R_Dgram::DEFAULT_PORT);
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
index e8965ab0175..33045a3e44c 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
@@ -52,7 +52,7 @@ ACE_INLINE int
 Handle_R_Stream::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sis (Handle_R_Stream::DEFAULT_PORT);
-  ACE_Get_Arg_Opt   get_opt (argc, argv, ACE_TEXT("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index b93f6f224a0..f2f32b273ce 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -61,7 +61,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
   ACE_INET_Addr local_addr (ACE_DEFAULT_THR_PORT);
   int n_threads = ACE_DEFAULT_THREADS;
 
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("p:t:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:t:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
index dbdf430f720..d23d1a26caa 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
@@ -30,7 +30,7 @@ Handle_Timeout::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_Time_Value delta (10);
   ACE_Time_Value interval (1);
-  ACE_Get_Arg_Opt    get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0);
   int        arg = 0;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/Shared_Malloc/Options.cpp b/examples/Shared_Malloc/Options.cpp
index 1523602f30c..bd08e7a57ba 100644
--- a/examples/Shared_Malloc/Options.cpp
+++ b/examples/Shared_Malloc/Options.cpp
@@ -133,7 +133,7 @@ Options::Options (void)
 void
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT ("dehlL:mn:pst:T"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dehlL:mn:pst:T"));
 
   ACE_OS::strcpy (this->program_name_, ACE_TEXT_TO_CHAR_IN (argv[0]));
   ACE_LOG_MSG->open (argv[0]);
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index c093ee6cd27..c41e9d143bb 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -119,7 +119,7 @@ initialize (TEST_MALLOC *allocator)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("a:T"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:T"));
 
   for (int c;
        (c = get_opt ()) != -1;
diff --git a/examples/Synch/proc_sema.cpp b/examples/Synch/proc_sema.cpp
index c06444c8323..0c405fa52f7 100644
--- a/examples/Synch/proc_sema.cpp
+++ b/examples/Synch/proc_sema.cpp
@@ -46,7 +46,7 @@ int consumer (ACE_SYNCH_PROCESS_SEMAPHORE &sema,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("csn:xi:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("csn:xi:d:"));
 
   int is_consumer = 1;          // By default, make us a consumer.
   int delete_sema = 0;
diff --git a/examples/Threads/process_manager.cpp b/examples/Threads/process_manager.cpp
index ca47b83f041..7a03afca362 100644
--- a/examples/Threads/process_manager.cpp
+++ b/examples/Threads/process_manager.cpp
@@ -129,7 +129,7 @@ static int exit_code = 0;
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("i:e:cu"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:e:cu"));
 
   int c;
 
diff --git a/examples/Threads/reader_writer.cpp b/examples/Threads/reader_writer.cpp
index a96d435c4fa..3bcbbd9071a 100644
--- a/examples/Threads/reader_writer.cpp
+++ b/examples/Threads/reader_writer.cpp
@@ -53,7 +53,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("r:w:n:l:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("r:w:n:l:"));
 
   int c;
 
diff --git a/examples/Threads/recursive_mutex.cpp b/examples/Threads/recursive_mutex.cpp
index 04199a1d018..20cec4a7e82 100644
--- a/examples/Threads/recursive_mutex.cpp
+++ b/examples/Threads/recursive_mutex.cpp
@@ -33,7 +33,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt get_opt (argc, argv, ACE_TEXT("n:t:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:t:"));
 
   int c;
 
diff --git a/examples/Web_Crawler/Options.cpp b/examples/Web_Crawler/Options.cpp
index 5d5a12aca64..b010a3a24ea 100644
--- a/examples/Web_Crawler/Options.cpp
+++ b/examples/Web_Crawler/Options.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(Web_Crawler, Options, "$Id$")
 int 
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Arg_Opt getopt (argc, argv, ACE_TEXT ("df:h:i:l:rt:u:vo:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("df:h:i:l:rt:u:vo:p:"));
 
   ACE_LOG_MSG->open (argv[0]);