ChangeLogTag:Wed Dec 26 11:18:31 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

28 files changed, 104 insertions, 104 deletions

diff --git a/tests/CDR_Array_Test.cpp b/tests/CDR_Array_Test.cpp
index 83b56112e0b..103fd7a9930 100644
--- a/tests/CDR_Array_Test.cpp
+++ b/tests/CDR_Array_Test.cpp
@@ -913,7 +913,7 @@ main (int argc, ACE_TCHAR *argv[])
         {
           if (opts[i].c == opt)
             {
-              int v = ACE_OS::atoi (get_opt.optarg);
+              int v = ACE_OS::atoi (get_opt.opt_arg ());
               if (!(opts[i].checkf) (v))
                 {
                   usage(argv[0]);
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index 08c31941498..cd3b5304778 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -313,7 +313,7 @@ main (int argc, ACE_TCHAR *argv[])
       switch (opt)
         {
         case 'f':
-          fn = get_opt.optarg;
+          fn = get_opt.opt_arg ();
           break;
         case 'r':
           writing = 0;
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index 576c5033398..36aa5b7fdf4 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -393,10 +393,10 @@ main (int argc, ACE_TCHAR *argv[])
             debug++;
             break;
           case 'n':
-            n = ACE_OS::atoi (get_opt.optarg);
+            n = ACE_OS::atoi (get_opt.opt_arg ());
             break;
           case 'l':
-            nloops = ACE_OS::atoi (get_opt.optarg);
+            nloops = ACE_OS::atoi (get_opt.opt_arg ());
             break;
           case '?':
           default:
diff --git a/tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp b/tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp
index c1a419a31db..c0badafd1c0 100644
--- a/tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp
+++ b/tests/CLASSIX/CLASSIX_Con_Acc_Test.cpp
@@ -259,19 +259,19 @@ main (int argc, char *argv[])
         opt_priority_reactor = 0;
         break;
       case 'i':
-        opt_max_msgs = atoi (getopt.optarg);
+        opt_max_msgs = atoi (getopt.opt_arg ());
         break;
       case 'c':
-        opt_nchildren = atoi (getopt.optarg);
+        opt_nchildren = atoi (getopt.opt_arg ());
         break;
       case 'l':
-        opt_nloops = atoi (getopt.optarg);
+        opt_nloops = atoi (getopt.opt_arg ());
         break;
       case 'm':
-        max_retries = atoi (getopt.optarg);
+        max_retries = atoi (getopt.opt_arg ());
         break;
       case 't':
-        opt_max_duration = atoi (getopt.optarg);
+        opt_max_duration = atoi (getopt.opt_arg ());
         break;
       case '?':
       default:
diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp
index fd703743c69..c1d6ce31fc7 100644
--- a/tests/Cache_Map_Manager_Test.cpp
+++ b/tests/Cache_Map_Manager_Test.cpp
@@ -485,26 +485,26 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (cc)
       {
       case 'c':
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("null")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("null")) == 0)
           caching_strategy_type = ACE_NULL;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("lru")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("lru")) == 0)
           caching_strategy_type = ACE_LRU;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("lfu")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("lfu")) == 0)
           caching_strategy_type = ACE_LFU;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("fifo")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("fifo")) == 0)
           caching_strategy_type = ACE_FIFO;
         break;
       case 'i':
-        iterations = ACE_OS::atoi (get_opt.optarg);
+        iterations = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'f':
-        no_of_lookups = ACE_OS::atoi (get_opt.optarg);
+        no_of_lookups = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'r':
-        randomize_lookups = ACE_OS::atoi (get_opt.optarg);
+        randomize_lookups = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'p':
-        purge_percent = ACE_OS::atoi (get_opt.optarg);
+        purge_percent = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'd':
         debug = 1;
diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp
index e2ee073fe14..82c95c49129 100644
--- a/tests/Cached_Accept_Conn_Test.cpp
+++ b/tests/Cached_Accept_Conn_Test.cpp
@@ -609,30 +609,30 @@ parse_args (int argc, ACE_TCHAR *argv[])
         debug = 1;
         break;
       case 'l':
-        listen_once = ACE_OS::atoi (get_opt.optarg);
+        listen_once = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'i':
-        iterations = ACE_OS::atoi (get_opt.optarg);
+        iterations = ACE_OS::atoi (get_opt.opt_arg ());
         user_has_specified_iterations = 1;
         break;
       case 'p':
-        purge_percentage = ACE_OS::atoi (get_opt.optarg);
+        purge_percentage = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'c':
         // Note that if null caching strategy is used then this test
         // will fail if the number of servers exceed number of open
         // files allowed for the process.
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("null")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("null")) == 0)
           caching_strategy_type = ACE_NULL;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("lru")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("lru")) == 0)
           caching_strategy_type = ACE_LRU;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("lfu")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("lfu")) == 0)
           caching_strategy_type = ACE_LFU;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("fifo")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("fifo")) == 0)
           caching_strategy_type = ACE_FIFO;
         break;
       case 'a':
-        keep_handles_available = ACE_OS::atoi (get_opt.optarg);
+        keep_handles_available = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case '?':
       case 'h':
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
index 85909048927..5f04ab3f09f 100644
--- a/tests/Cached_Conn_Test.cpp
+++ b/tests/Cached_Conn_Test.cpp
@@ -580,30 +580,30 @@ parse_args (int argc, ACE_TCHAR *argv[])
         debug = 1;
         break;
       case 'l':
-        listen_once = ACE_OS::atoi (get_opt.optarg);
+        listen_once = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'i':
-        iterations = ACE_OS::atoi (get_opt.optarg);
+        iterations = ACE_OS::atoi (get_opt.opt_arg ());
         user_has_specified_iterations = 1;
         break;
       case 'p':
-        purge_percentage = ACE_OS::atoi (get_opt.optarg);
+        purge_percentage = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'c':
         // Note that if null caching strategy is used then this test
         // will fail if the number of servers exceed number of open
         // files allowed for the process.
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("null")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("null")) == 0)
           caching_strategy_type = ACE_NULL;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("lru")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("lru")) == 0)
           caching_strategy_type = ACE_LRU;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("lfu")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("lfu")) == 0)
           caching_strategy_type = ACE_LFU;
-        if (ACE_OS::strcmp (get_opt.optarg, ACE_TEXT ("fifo")) == 0)
+        if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("fifo")) == 0)
           caching_strategy_type = ACE_FIFO;
         break;
       case 'a':
-        keep_handles_available = ACE_OS::atoi (get_opt.optarg);
+        keep_handles_available = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case '?':
       case 'h':
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index c95c394b1b2..f06e2666f3f 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -821,13 +821,13 @@ main (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'c':
-        n_clients = ACE_OS::atoi (getopt.optarg);
+        n_clients = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'i':
-        n_client_iterations = ACE_OS::atoi (getopt.optarg);
+        n_client_iterations = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 's':
-        n_servers = ACE_OS::atoi (getopt.optarg);
+        n_servers = ACE_OS::atoi (getopt.opt_arg ());
         break;
       }
 
diff --git a/tests/Get_Opt_Test.cpp b/tests/Get_Opt_Test.cpp
index e7e1b8b3421..a193cd7389d 100644
--- a/tests/Get_Opt_Test.cpp
+++ b/tests/Get_Opt_Test.cpp
@@ -133,7 +133,7 @@ parse_args (int test_number,
         case 'r':
           // This one has a required argument, we wouldn't be here if the 
           // arg were missing.  Note that we call get_opt.opt_arg () to return the 
-          // argument, but we could have used get_opt.optarg since optarg 
+          // argument, but we could have used get_opt.opt_arg () since.opt_arg () 
           // is defined as "opt_arg ()".
           ACE_DEBUG ((LM_INFO, 
                       "   Found option '%c' with required argument \"%s\"\n", 
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp
index d128a441ec1..483043993de 100644
--- a/tests/Hash_Map_Bucket_Iterator_Test.cpp
+++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp
@@ -38,10 +38,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (cc)
       {
       case 't':
-        table_size = ACE_OS::atoi (get_opt.optarg);
+        table_size = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'i':
-        iterations = ACE_OS::atoi (get_opt.optarg);
+        iterations = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case '?':
       case 'h':
diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp
index 5e1b3aab578..5d86f13b6d5 100644
--- a/tests/High_Res_Timer_Test.cpp
+++ b/tests/High_Res_Timer_Test.cpp
@@ -118,7 +118,7 @@ main (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'i':
-        iterations = ACE_OS::atoi (getopt.optarg);
+        iterations = ACE_OS::atoi (getopt.opt_arg ());
         break;
       }
 
diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp
index 0531acded2a..7fc0bdb5fc9 100644
--- a/tests/Logging_Strategy_Test.cpp
+++ b/tests/Logging_Strategy_Test.cpp
@@ -331,18 +331,18 @@ parse_args (int argc, ACE_TCHAR *argv[])
       switch (c)
         {
         case 's':
-          file_name = get_opt.optarg;
+          file_name = get_opt.opt_arg ();
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("File name: %s\n"),
                       file_name));
           break;
         case 'i':
-          interval_time = ACE_OS::atoi (get_opt.optarg);
+          interval_time = ACE_OS::atoi (get_opt.opt_arg ());
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Interval time (s): %d\n"),
                       interval_time));
           break;
         case 'm':
-          max_size_files = ACE_OS::atoi (get_opt.optarg);
+          max_size_files = ACE_OS::atoi (get_opt.opt_arg ());
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Maximum size (KB): %d\n"),
                       max_size_files));
@@ -350,10 +350,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
         case 'f':
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Modes: %s\n"),
-                      get_opt.optarg));
+                      get_opt.opt_arg ()));
           break;
         case 'N':
-          max_num_files = ACE_OS::atoi (get_opt.optarg);
+          max_num_files = ACE_OS::atoi (get_opt.opt_arg ());
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Maximum files number: %d\n"),
                       max_num_files));
diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp
index 6bd389cb209..be8f03aec43 100644
--- a/tests/MEM_Stream_Test.cpp
+++ b/tests/MEM_Stream_Test.cpp
@@ -449,7 +449,7 @@ main (int argc, ACE_TCHAR *argv[])
           switch (opt)
             {
             case 'p':
-              iport = ACE_OS::atoi (opts.optarg);
+              iport = ACE_OS::atoi (opts.opt_arg ());
               port = ACE_static_cast (u_short, iport);
               break;
 
diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp
index bc71fe78955..59e1ae7f8bc 100644
--- a/tests/Notify_Performance_Test.cpp
+++ b/tests/Notify_Performance_Test.cpp
@@ -167,10 +167,10 @@ main (int argc, ACE_TCHAR *argv[])
         opt_wfmo_reactor = 1;
         break;
       case 'c':
-        opt_nthreads = ACE_OS::atoi (getopt.optarg);
+        opt_nthreads = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'l':
-        opt_nloops = ACE_OS::atoi (getopt.optarg);
+        opt_nloops = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'd':
         opt_pass_notify_data = 1;
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp
index da43003fc01..727ee4421b4 100644
--- a/tests/Pipe_Test.cpp
+++ b/tests/Pipe_Test.cpp
@@ -55,7 +55,7 @@ parse_args (int argc, char *argv[])
       child_process = 1;
       break;
     case 'i':
-      iterations = atoi (get_opt.optarg);
+      iterations = atoi (get_opt.opt_arg ());
       break;
     default:
       print_usage_and_die ();
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index 8f396a6eb67..d88adb36c74 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -250,16 +250,16 @@ main (int argc, ACE_TCHAR *argv[])
         opt_priority_reactor = 0;
         break;
       case 'c':
-        opt_nchildren = ACE_OS::atoi (getopt.optarg);
+        opt_nchildren = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'l':
-        opt_nloops = ACE_OS::atoi (getopt.optarg);
+        opt_nloops = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'm':
-        max_retries = ACE_OS::atoi (getopt.optarg);
+        max_retries = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 't':
-        opt_max_duration = ACE_OS::atoi (getopt.optarg);
+        opt_max_duration = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case '?':
       default:
diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index d0c996af2aa..1cccb31f8fb 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -1201,7 +1201,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'i':  // time to run
-        seconds = ACE_OS::atoi (get_opt.optarg);
+        seconds = ACE_OS::atoi (get_opt.opt_arg ());
         if ( seconds < MIN_TIME )
 	        seconds = MIN_TIME;
         if ( seconds > MAX_TIME )
@@ -1211,30 +1211,30 @@ parse_args (int argc, ACE_TCHAR *argv[])
         both = 1;
         break;
       case 'v':  // log level
-        loglevel = ACE_OS::atoi (get_opt.optarg);
+        loglevel = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'd':         // duplex
-        duplex = ACE_OS::atoi (get_opt.optarg);
+        duplex = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'h':         // host for sender
-        host = get_opt.optarg;
+        host = get_opt.opt_arg ();
         break;
       case 'p':         // port number
-        port = ACE_OS::atoi (get_opt.optarg);
+        port = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'n':         // thread pool size
-        threads = ACE_OS::atoi (get_opt.optarg);
+        threads = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 's':     // number of senders
-        senders = ACE_OS::atoi (get_opt.optarg);
+        senders = ACE_OS::atoi (get_opt.opt_arg ());
         if (senders > MAX_SENDERS)
           senders = MAX_SENDERS;
         break;
       case 'o':     // max number of aio for proactor
-        max_aio_operations = ACE_OS::atoi (get_opt.optarg);
+        max_aio_operations = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 't':    //  Proactor Type
-        if (set_proactor_type (get_opt.optarg))
+        if (set_proactor_type (get_opt.opt_arg ()))
           break;
         return print_usage (argc,argv);
       case 'u':
diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp
index 48c61341511..5b5a9ef1d0e 100644
--- a/tests/Process_Manager_Test.cpp
+++ b/tests/Process_Manager_Test.cpp
@@ -108,9 +108,9 @@ main (int argc, ACE_TCHAR *argv[])
         break;
       }
 
-  if (args.optind == argc - 1)
+  if (args.opt_ind () == argc - 1)
     {     // child process: sleep & exit
-      int secs = ACE_OS::atoi (argv[args.optind]);
+      int secs = ACE_OS::atoi (argv[args.opt_ind ()]);
       ACE_OS::sleep (secs ? secs : 1);
       if (debug_test)
         ACE_DEBUG ((LM_DEBUG,
@@ -119,7 +119,7 @@ main (int argc, ACE_TCHAR *argv[])
       return secs;
     }
 
-  if (args.optind != argc)      // incorrect usage
+  if (args.opt_ind () != argc)      // incorrect usage
     usage (argv[0]);
 
   ACE_START_TEST (ACE_TEXT ("Process_Manager_Test"));
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index e5c45a4346f..7d4a2638571 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -62,7 +62,7 @@ parse_args (int argc, char *argv[])
       child_process = 1;
       break;
     case 'n':
-      mutex_name = get_opt.optarg;
+      mutex_name = get_opt.opt_arg ();
       break;
     default:
       print_usage_and_die ();
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 29378957c55..9df08889e69 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -198,16 +198,16 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'c':
-        if (ACE_OS::strcmp (get_opt.optarg,
+        if (ACE_OS::strcmp (get_opt.opt_arg (),
                             ACE_TEXT ("REACTIVE")) == 0)
           OPTIONS::instance ()->concurrency_type (Options::REACTIVE);
 #if !defined (ACE_LACKS_FORK)
-        else if (ACE_OS::strcmp (get_opt.optarg,
+        else if (ACE_OS::strcmp (get_opt.opt_arg (),
                                  ACE_TEXT ("PROCESS")) == 0)
           OPTIONS::instance ()->concurrency_type (Options::PROCESS);
 #endif /* !ACE_LACKS_FORK */
 #if defined (ACE_HAS_THREADS)
-        else if (ACE_OS::strcmp (get_opt.optarg,
+        else if (ACE_OS::strcmp (get_opt.opt_arg (),
                                  ACE_TEXT ("THREAD")) == 0)
           OPTIONS::instance ()->concurrency_type (Options::THREAD);
 #endif /* ACE_HAS_THREADS */
@@ -215,10 +215,10 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("WARNING: concurrency strategy \"%s\" ")
                       ACE_TEXT ("is not supported\n"),
-                      get_opt.optarg));
+                      get_opt.opt_arg ()));
         break;
       case 'f':
-        ACE_OS::strcpy (this->filename_, get_opt.optarg);
+        ACE_OS::strcpy (this->filename_, get_opt.opt_arg ());
         break;
       default:
         ACE_DEBUG ((LM_DEBUG,
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index c3940b71ad6..099135793e4 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -326,10 +326,10 @@ main (int argc, ACE_TCHAR *argv[])
         opt_wfmo_reactor = 1;
         break;
       case 'c':
-        opt_nconnections = ACE_OS::atoi (getopt.optarg);
+        opt_nconnections = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'l':
-        opt_nloops = ACE_OS::atoi (getopt.optarg);
+        opt_nloops = ACE_OS::atoi (getopt.opt_arg ());
         break;
       case 'd':
         opt_debug = 1;
diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp
index 41d68d88100..3484da4fb76 100644
--- a/tests/Reader_Writer_Test.cpp
+++ b/tests/Reader_Writer_Test.cpp
@@ -81,13 +81,13 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
     {
     case 'r':
-      n_readers = ACE_OS::atoi (get_opt.optarg);
+      n_readers = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     case 'w':
-      n_writers = ACE_OS::atoi (get_opt.optarg);
+      n_writers = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     case 'n':
-      n_iterations = ACE_OS::atoi (get_opt.optarg);
+      n_iterations = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     default:
       print_usage_and_die ();
diff --git a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
index 24f357eff48..51a5bd10103 100644
--- a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
+++ b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
@@ -95,22 +95,22 @@ parse_arg (int argc, ACE_TCHAR *argv[])
       switch (c)
         {
         case 'r':                   // hostname:port
-          rendezvous = getopt.optarg;
+          rendezvous = getopt.opt_arg ();
           break;
         case 's':
-          svr_thrno = ACE_OS::atoi (getopt.optarg);
+          svr_thrno = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'c':
-          cli_thrno = ACE_OS::atoi (getopt.optarg);
+          cli_thrno = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'd':
-          req_delay = ACE_OS::atoi (getopt.optarg);
+          req_delay = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'i':
-          cli_conn_no = ACE_OS::atoi (getopt.optarg);
+          cli_conn_no = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'n':
-          cli_req_no = ACE_OS::atoi (getopt.optarg);
+          cli_req_no = ACE_OS::atoi (getopt.opt_arg ());
           break;
         default:
           ACE_ERROR ((LM_ERROR,
diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp
index 191abd3285f..a6308496a9e 100644
--- a/tests/Semaphore_Test.cpp
+++ b/tests/Semaphore_Test.cpp
@@ -124,13 +124,13 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
     {
     case 's':
-      n_release_count = ACE_OS::atoi (get_opt.optarg);
+      n_release_count = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     case 'w':
-      n_workers = ACE_OS::atoi (get_opt.optarg);
+      n_workers = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     case 'n':
-      n_iterations = ACE_OS::atoi (get_opt.optarg);
+      n_iterations = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     default:
       print_usage_and_die ();
diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp
index 94d34fe5682..063aea8addd 100644
--- a/tests/Signal_Test.cpp
+++ b/tests/Signal_Test.cpp
@@ -376,16 +376,16 @@ parse_args (int argc, char *argv[])
     switch (c)
     {
     case 'i':
-      n_iterations = ACE_OS::atoi (get_opt.optarg);
+      n_iterations = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     case 'c':
       child = 1;
       break;
     case 'p':
-      parent_pid = ACE_OS::atoi (get_opt.optarg);
+      parent_pid = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     case 't':
-      test_number = ACE_OS::atoi (get_opt.optarg);
+      test_number = ACE_OS::atoi (get_opt.opt_arg ());
       break;
     case 'h':
     default:
diff --git a/tests/Thread_Pool_Reactor_Resume_Test.cpp b/tests/Thread_Pool_Reactor_Resume_Test.cpp
index 1ace61df9bf..cac1e673da2 100644
--- a/tests/Thread_Pool_Reactor_Resume_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Resume_Test.cpp
@@ -89,22 +89,22 @@ parse_arg (int argc, ACE_TCHAR *argv[])
       switch (c)
         {
         case 'r':                   // hostname:port
-          rendezvous = getopt.optarg;
+          rendezvous = getopt.opt_arg ();
           break;
         case 's':
-          svr_thrno = ACE_OS::atoi (getopt.optarg);
+          svr_thrno = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'c':
-          cli_thrno = ACE_OS::atoi (getopt.optarg);
+          cli_thrno = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'd':
-          req_delay = ACE_OS::atoi (getopt.optarg);
+          req_delay = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'i':
-          cli_conn_no = ACE_OS::atoi (getopt.optarg);
+          cli_conn_no = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'n':
-          cli_req_no = ACE_OS::atoi (getopt.optarg);
+          cli_req_no = ACE_OS::atoi (getopt.opt_arg ());
           break;
         default:
           ACE_ERROR ((LM_ERROR,
diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp
index 28420c5c1a1..846f686b591 100644
--- a/tests/Thread_Pool_Reactor_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Test.cpp
@@ -92,22 +92,22 @@ parse_arg (int argc, ACE_TCHAR *argv[])
       switch (c)
         {
         case 'r':                   // hostname:port
-          rendezvous = getopt.optarg;
+          rendezvous = getopt.opt_arg ();
           break;
         case 's':
-          svr_thrno = ACE_OS::atoi (getopt.optarg);
+          svr_thrno = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'c':
-          cli_thrno = ACE_OS::atoi (getopt.optarg);
+          cli_thrno = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'd':
-          req_delay = ACE_OS::atoi (getopt.optarg);
+          req_delay = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'i':
-          cli_conn_no = ACE_OS::atoi (getopt.optarg);
+          cli_conn_no = ACE_OS::atoi (getopt.opt_arg ());
           break;
         case 'n':
-          cli_req_no = ACE_OS::atoi (getopt.optarg);
+          cli_req_no = ACE_OS::atoi (getopt.opt_arg ());
           break;
         default:
           ACE_ERROR ((LM_ERROR,
diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp
index 7f9daae5c51..76773302fa0 100644
--- a/tests/Upgradable_RW_Test.cpp
+++ b/tests/Upgradable_RW_Test.cpp
@@ -123,19 +123,19 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'e':
-        n_entries = ACE_OS::atoi (get_opt.optarg);
+        n_entries = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'f':
         thr_flags = THR_BOUND | THR_SCHED_FIFO;
         break;
       case 'r':
-        n_readers = ACE_OS::atoi (get_opt.optarg);
+        n_readers = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'w':
-        n_writers = ACE_OS::atoi (get_opt.optarg);
+        n_writers = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'n':
-        n_iterations = ACE_OS::atoi (get_opt.optarg);
+        n_iterations = ACE_OS::atoi (get_opt.opt_arg ());
         break;
       case 'u':
         use_try_upgrade = 1;