ChangeLogTag:Wed Dec 26 09:07:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

65 files changed, 183 insertions, 183 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 4a9892f4428..40185c17c92 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -137,10 +137,10 @@ Distributer::parse_args (int argc,
       switch (c)
         {
         case 's':
-          this->sender_name_ = opts.optarg;
+          this->sender_name_ = opts.opt_arg ();
           break;
         case 'r':
-          this->distributer_name_ = opts.optarg;
+          this->distributer_name_ = opts.opt_arg ();
           break;
         default:
           ACE_DEBUG ((LM_DEBUG,"Unknown Option\n"));
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 4bcedbd078b..9c6f00c9c0b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -151,13 +151,13 @@ Receiver::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->output_file_name_ = opts.optarg;
+          this->output_file_name_ = opts.opt_arg ();
           break;
         case 's':
-          this->sender_name_ = opts.optarg;
+          this->sender_name_ = opts.opt_arg ();
           break;
         case 'r':
-          this->receiver_name_ = opts.optarg;
+          this->receiver_name_ = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index dd8678dd200..e26ac09e57f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -60,13 +60,13 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 's':
-          this->sender_name_ = opts.optarg;
+          this->sender_name_ = opts.opt_arg ();
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 7c8defb9058..1856b71f12c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -171,10 +171,10 @@ Receiver::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index bdc873a3ac6..c09aa152355 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -132,13 +132,13 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'p':
-          this->protocol_ = opts.optarg;
+          this->protocol_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 5720e0a6cb6..0c14f07d0f3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -279,10 +279,10 @@ Distributer::parse_args (int argc,
       switch (c)
         {
         case 's':
-          this->sender_name_ = opts.optarg;
+          this->sender_name_ = opts.opt_arg ();
           break;
         case 'r':
-          this->distributer_name_ = opts.optarg;
+          this->distributer_name_ = opts.opt_arg ();
           break;
         default:
           ACE_DEBUG ((LM_DEBUG,"Unknown Option\n"));
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index afede31f802..eaf26a7c5b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -250,13 +250,13 @@ Receiver::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->output_file_name_ = opts.optarg;
+          this->output_file_name_ = opts.opt_arg ();
           break;
         case 's':
-          this->sender_name_ = opts.optarg;
+          this->sender_name_ = opts.opt_arg ();
           break;
         case 'r':
-          this->receiver_name_ = opts.optarg;
+          this->receiver_name_ = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 833a089cae7..266729c4943 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -183,13 +183,13 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 's':
-          this->sender_name_ = opts.optarg;
+          this->sender_name_ = opts.opt_arg ();
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index ab852c5c2de..61b48a9c005 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -114,13 +114,13 @@ Client::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = ACE_OS::strdup (opts.optarg);
+          this->filename_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'a':
-          this->address_ = ACE_OS::strdup (opts.optarg);
+          this->address_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.optarg);
+          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 's':
           this->use_sfp_ = 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index aac3bf6209c..9670783dc64 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -199,14 +199,14 @@ Server::parse_args (int argc,char **argv)
       switch (c)
         {
         case 'f':
-          this->fp_ = ACE_OS::fopen (opts.optarg,"w");
+          this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w");
           if (this->fp_ != 0)
             {
               ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
             }
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.optarg);
+          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,"Usage: server -f filename"),-1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 6f7c7af972f..a95b90e6a84 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -28,27 +28,27 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'f':
-        ping_ior = get_opts.optarg;
+        ping_ior = get_opts.opt_arg ();
         break;
 
       case 'g':
-        pong_ior = get_opts.optarg;
+        pong_ior = get_opts.opt_arg ();
         break;
 
       case 'r':
-        ping_address = get_opts.optarg;
+        ping_address = get_opts.opt_arg ();
         break;
 
       case 's':
-        pong_address = get_opts.optarg;
+        pong_address = get_opts.opt_arg ();
         break;
 
       case 't':
-        milliseconds = ACE_OS::atoi (get_opts.optarg);
+        milliseconds = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'p':
-        protocol = get_opts.optarg;
+        protocol = get_opts.opt_arg ();
         break;
 
       case 'd':
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 3a061df9629..125b1d10ba7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -33,14 +33,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
 
       case 'r':
         {
           CORBA::ULong l = ping_protocols.length ();
           ping_protocols.length (l + 1);
-          ping_protocols[l] = CORBA::string_dup (get_opts.optarg);
+          ping_protocols[l] = CORBA::string_dup (get_opts.opt_arg ());
         }
         break;
 
@@ -48,12 +48,12 @@ parse_args (int argc, char *argv[])
         {
           CORBA::ULong l = pong_protocols.length ();
           pong_protocols.length (l + 1);
-          pong_protocols[l] = CORBA::string_dup (get_opts.optarg);
+          pong_protocols[l] = CORBA::string_dup (get_opts.opt_arg ());
         }
         break;
 
       case 't':
-        milliseconds = ACE_OS::atoi (get_opts.optarg);
+        milliseconds = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 2ab4114cd1e..8cd24dbb20c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -37,14 +37,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
 
       case 'r':
         {
           CORBA::ULong l = ping_protocols.length ();
           ping_protocols.length (l + 1);
-          ping_protocols[l] = CORBA::string_dup (get_opts.optarg);
+          ping_protocols[l] = CORBA::string_dup (get_opts.opt_arg ());
         }
         break;
 
@@ -52,16 +52,16 @@ parse_args (int argc, char *argv[])
         {
           CORBA::ULong l = pong_protocols.length ();
           pong_protocols.length (l + 1);
-          pong_protocols[l] = CORBA::string_dup (get_opts.optarg);
+          pong_protocols[l] = CORBA::string_dup (get_opts.opt_arg ());
         }
         break;
 
       case 't':
-        milliseconds = ACE_OS::atoi (get_opts.optarg);
+        milliseconds = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'b':
-        message_size = ACE_OS::atoi (get_opts.optarg);
+        message_size = ACE_OS::atoi (get_opts.opt_arg ());
         if (message_size < sizeof(ACE_hrtime_t))
           {
             ACE_DEBUG ((LM_DEBUG, "Invalid message size\n"));
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index 027a15f2ee3..2df60ade3e3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -234,7 +234,7 @@ parse_args (int argc,
       switch (c)
         {
         case 'f':
-          output_file_name = opts.optarg;
+          output_file_name = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index b06449a23e8..36ee0a3a896 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -98,13 +98,13 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'p':
-          this->protocol_ = opts.optarg;
+          this->protocol_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 0161ba2d659..0fad378c503 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -136,13 +136,13 @@ Client::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = ACE_OS::strdup (opts.optarg);
+          this->filename_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'a':
-          this->address_ = ACE_OS::strdup (opts.optarg);
+          this->address_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.optarg);
+          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 's':
           this->use_sfp_ = 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 4fa4582f4b2..c86c2b628ed 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -156,14 +156,14 @@ Server::parse_args (int argc,char **argv)
       switch (c)
         {
         case 'f':
-          this->fp_ = ACE_OS::fopen (opts.optarg,"w");
+          this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w");
           if (this->fp_ != 0)
             {
               ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
             }
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.optarg);
+          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,"Usage: server -f filename"),-1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index d624906a378..ce0c4f59231 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -116,13 +116,13 @@ Client::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = ACE_OS::strdup (opts.optarg);
+          this->filename_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'a':
-          this->address_ = ACE_OS::strdup (opts.optarg);
+          this->address_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.optarg);
+          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 's':
           this->use_sfp_ = 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 5c1275ac3bd..7cc5081694f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -219,14 +219,14 @@ Server::parse_args (int argc,char **argv)
       switch (c)
         {
         case 'f':
-          this->fp_ = ACE_OS::fopen (opts.optarg,"w");
+          this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w");
           if (this->fp_ != 0)
             {
               ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
             }
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.optarg);
+          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,"Usage: server -f filename"),-1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 2219157b301..305b7bb377e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -146,10 +146,10 @@ Receiver::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 52d9ea10836..8b6934f72c0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -79,13 +79,13 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'p':
-          this->protocol_ = opts.optarg;
+          this->protocol_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 969f9c8d451..32cebfb96f1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -71,16 +71,16 @@ Client::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = ACE_OS::strdup (opts.optarg);
+          this->filename_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'a':
-          this->address_ = ACE_OS::strdup (opts.optarg);
+          this->address_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'p':
-          this->protocol_ = ACE_OS::strdup (opts.optarg);
+          this->protocol_ = ACE_OS::strdup (opts.opt_arg ());
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 's':
           this->use_sfp_ = 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 3a98209ae10..75a6cb9dfcf 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -124,7 +124,7 @@ parse_args (int argc,
       switch (c)
         {
         case 'f':
-          output_file_name = opts.optarg;
+          output_file_name = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index f5ef0bf7a7b..263fe9fa9e6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -152,7 +152,7 @@ parse_args (int argc,
       switch (c)
         {
         case 'f':
-          output_file_name = opts.optarg;
+          output_file_name = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 2161de268e9..8cb7ae5514b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -61,13 +61,13 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'p':
-          this->protocol_ = opts.optarg;
+          this->protocol_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index 815bf7fb79d..ddd291d989c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -153,7 +153,7 @@ parse_args (int argc,
       switch (c)
         {
         case 'f':
-          output_file_name = opts.optarg;
+          output_file_name = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 777f3b0a4e0..72cc84048a5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -93,10 +93,10 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 815bf7fb79d..ddd291d989c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -153,7 +153,7 @@ parse_args (int argc,
       switch (c)
         {
         case 'f':
-          output_file_name = opts.optarg;
+          output_file_name = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 1f82e374339..8ab02026164 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -61,13 +61,13 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'p':
-          this->protocol_ = opts.optarg;
+          this->protocol_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index da934900655..fe8204c6cd2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -134,7 +134,7 @@ parse_args (int argc,
       switch (c)
         {
         case 'f':
-          output_file_name = opts.optarg;
+          output_file_name = opts.opt_arg ();
           break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 943390dd384..119c9edbb3b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -99,19 +99,19 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.optarg;
+          this->filename_ = opts.opt_arg ();
           break;
         case 'p':
-          this->protocol_ = opts.optarg;
+          this->protocol_ = opts.opt_arg ();
           break;
         case 'r':
-          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
           break;
         case 'd':
           TAO_debug_level++;
           break;
         case 'a':
-          this->address_ = opts.optarg;
+          this->address_ = opts.opt_arg ();
           break;
         default:
           ACE_DEBUG ((LM_DEBUG, "Unknown Option\n"));
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 9c6d58d3aec..66be6ea80a1 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -103,26 +103,26 @@ CC_Client::parse_args (void)
         break;
       case 'c':
         this->use_script_file_ = 1;
-        this->script_file_ = ACE_OS::strdup (get_opts.optarg);
+        this->script_file_ = ACE_OS::strdup (get_opts.opt_arg ());
         break;
       case 'd':  // debug flag
         TAO_debug_level++;
         break;
       case 'e':  // debug flag
         run_extended_tests_ = 1;
-        this->extended_tests_params_ = ACE_OS::strdup (get_opts.optarg);
+        this->extended_tests_params_ = ACE_OS::strdup (get_opts.opt_arg ());
         break;
       case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg);
+        result = this->read_ior (get_opts.opt_arg ());
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
+                             get_opts.opt_arg ()),
                             -1);
             break;
       case 'k': // read the cubit IOR from the command-line.
         this->cc_factory_key_ =
-          ACE_OS::strdup (get_opts.optarg);
+          ACE_OS::strdup (get_opts.opt_arg ());
         break;
       case 'x':
         this->shutdown_ = 1;
diff --git a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
index 63d27a105bc..16dea85c540 100644
--- a/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/NS_client.cpp
@@ -59,11 +59,11 @@ CosNaming_Client::parse_args (void)
         break;
       case 'n':
         this->resolve_name_ = 1;
-        this->name_to_resolve_ = get_opts.optarg;
+        this->name_to_resolve_ = get_opts.opt_arg ();
         break;
       case 'c':
         this->resolve_name_ = 1;
-        this->context_to_resolve_ = get_opts.optarg;
+        this->context_to_resolve_ = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 1b6cfc819b1..b48029fdcff 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -313,17 +313,17 @@ Driver::parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 'c':
-          this->n_consumers_ = ACE_OS::atoi (get_opt.optarg);
+          this->n_consumers_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'n':
-          this->event_count_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_count_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'h':
           {
             char* aux;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -332,7 +332,7 @@ Driver::parse_args (int argc, char *argv [])
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.optarg;
+          this->pid_file_name_ = get_opt.opt_arg ();
           break;
 
         case '?':
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index fb5da0a99f6..e1c50294c76 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -328,25 +328,25 @@ ECMS_Driver::parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 's':
-          this->n_suppliers_ = ACE_OS::atoi (get_opt.optarg);
+          this->n_suppliers_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'n':
-          this->event_count_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_count_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 't':
-          this->event_period_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_period_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'b':
-          this->event_size_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_size_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'h':
           {
             char* aux;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -355,7 +355,7 @@ ECMS_Driver::parse_args (int argc, char *argv [])
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.optarg;
+          this->pid_file_name_ = get_opt.opt_arg ();
           break;
 
         case '?':
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index d8629f4a59b..f8673a5ec88 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -340,26 +340,26 @@ ECM_Driver::parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 'p':
-          this->pid_filename_ = get_opt.optarg;
+          this->pid_filename_ = get_opt.opt_arg ();
           break;
 
         case 'c':
-          this->config_filename_ = get_opt.optarg;
+          this->config_filename_ = get_opt.opt_arg ();
           break;
 
         case 't':
-          this->event_period_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_period_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'n':
-          this->event_count_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_count_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'f':
           {
             char* aux;
             int i = 0;
-            for (char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+            for (char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
                  arg != 0 && i < ECM_Driver::MAX_LOCAL_FEDERATIONS;
                  arg = ACE_OS::strtok_r (0, ",", &aux), ++i)
               {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index c7c895f046b..d7db5c3d7f9 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1131,23 +1131,23 @@ Test_ECG::parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 'l':
-          this->lcl_name_ = get_opt.optarg;
+          this->lcl_name_ = get_opt.opt_arg ();
           break;
 
         case 'r':
-          this->rmt_name_ = get_opt.optarg;
+          this->rmt_name_ = get_opt.opt_arg ();
           break;
 
         case 's':
-          if (ACE_OS::strcasecmp (get_opt.optarg, "global") == 0)
+          if (ACE_OS::strcasecmp (get_opt.opt_arg (), "global") == 0)
             {
               this->scheduling_type_ = Test_ECG::ss_global;
             }
-          else if (ACE_OS::strcasecmp (get_opt.optarg, "local") == 0)
+          else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "local") == 0)
             {
               this->scheduling_type_ = Test_ECG::ss_local;
             }
-          else if (ACE_OS::strcasecmp (get_opt.optarg, "runtime") == 0)
+          else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "runtime") == 0)
             {
               this->scheduling_type_ = Test_ECG::ss_runtime;
             }
@@ -1156,7 +1156,7 @@ Test_ECG::parse_args (int argc, char *argv [])
               ACE_DEBUG ((LM_DEBUG,
                           "Unknown scheduling type <%s> "
                           "defaulting to local\n",
-                          get_opt.optarg));
+                          get_opt.opt_arg ()));
               this->scheduling_type_ = Test_ECG::ss_local;
             }
           break;
@@ -1168,7 +1168,7 @@ Test_ECG::parse_args (int argc, char *argv [])
         case 'i':
           {
             char* aux = 0;
-            char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+            char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
             this->consumer_disconnects_ = ACE_OS::atoi (arg);
             arg = ACE_OS::strtok_r (0, ",", &aux);
             this->supplier_disconnects_ = ACE_OS::atoi (arg);
@@ -1178,7 +1178,7 @@ Test_ECG::parse_args (int argc, char *argv [])
         case 'h':
           {
             char* aux = 0;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->hp_suppliers_ = ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -1203,7 +1203,7 @@ Test_ECG::parse_args (int argc, char *argv [])
         case 'w':
           {
             char* aux = 0;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->lp_suppliers_ = ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -1226,10 +1226,10 @@ Test_ECG::parse_args (int argc, char *argv [])
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.optarg;
+          this->pid_file_name_ = get_opt.opt_arg ();
           break;
         case 'd':
-          this->schedule_file_ = get_opt.optarg;
+          this->schedule_file_ = get_opt.opt_arg ();
           break;
 
         case '?':
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index d07f0b23081..d233ca90453 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -305,17 +305,17 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv [])
           break;
 
         case 'c':
-          this->n_consumers_ = ACE_OS::atoi (get_opt.optarg);
+          this->n_consumers_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 's':
-          this->n_suppliers_ = ACE_OS::atoi (get_opt.optarg);
+          this->n_suppliers_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'h':
           {
             char* aux;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -324,7 +324,7 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv [])
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.optarg;
+          this->pid_file_name_ = get_opt.opt_arg ();
           break;
 
         case '?':
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 28e99d96f72..90c8dac6867 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -307,29 +307,29 @@ ECT_Supplier_Driver::parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 's':
-          this->n_suppliers_ = ACE_OS::atoi (get_opt.optarg);
+          this->n_suppliers_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'u':
-          this->burst_count_ = ACE_OS::atoi (get_opt.optarg);
+          this->burst_count_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'n':
-          this->burst_size_ = ACE_OS::atoi (get_opt.optarg);
+          this->burst_size_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'b':
-          this->event_size_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_size_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 't':
-          this->burst_pause_ = ACE_OS::atoi (get_opt.optarg);
+          this->burst_pause_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'h':
           {
             char* aux;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -338,7 +338,7 @@ ECT_Supplier_Driver::parse_args (int argc, char *argv [])
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.optarg;
+          this->pid_file_name_ = get_opt.opt_arg ();
           break;
 
         case '?':
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 850436bb2af..6e69d0feb01 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -524,17 +524,17 @@ ECT_Throughput::parse_args (int argc, char *argv [])
           break;
 
         case 'm':
-          if (ACE_OS::strcasecmp (get_opt.optarg, "rt") == 0)
+          if (ACE_OS::strcasecmp (get_opt.opt_arg (), "rt") == 0)
             {
               this->new_ec_ = 0;
               this->reactive_ec_ = 0;
             }
-          else if (ACE_OS::strcasecmp (get_opt.optarg, "st") == 0)
+          else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "st") == 0)
             {
               this->new_ec_ = 0;
               this->reactive_ec_ = 1;
             }
-          else if (ACE_OS::strcasecmp (get_opt.optarg, "new") == 0)
+          else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "new") == 0)
             {
               this->new_ec_ = 1;
               this->reactive_ec_ = 1;
@@ -544,40 +544,40 @@ ECT_Throughput::parse_args (int argc, char *argv [])
               ACE_DEBUG ((LM_DEBUG,
                           "Unknown mode <%s> "
                           "default is rt\n",
-                          get_opt.optarg));
+                          get_opt.opt_arg ()));
               this->new_ec_ = 0;
               this->reactive_ec_ = 0;
             }
           break;
 
         case 'c':
-          this->n_consumers_ = ACE_OS::atoi (get_opt.optarg);
+          this->n_consumers_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 's':
-          this->n_suppliers_ = ACE_OS::atoi (get_opt.optarg);
+          this->n_suppliers_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'u':
-          this->burst_count_ = ACE_OS::atoi (get_opt.optarg);
+          this->burst_count_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'n':
-          this->burst_size_ = ACE_OS::atoi (get_opt.optarg);
+          this->burst_size_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'b':
-          this->event_size_ = ACE_OS::atoi (get_opt.optarg);
+          this->event_size_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 't':
-          this->burst_pause_ = ACE_OS::atoi (get_opt.optarg);
+          this->burst_pause_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case 'h':
           {
             char* aux;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->consumer_type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -590,7 +590,7 @@ ECT_Throughput::parse_args (int argc, char *argv [])
         case 'l':
           {
             char* aux;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
+                char* arg = ACE_OS::strtok_r (get_opt.opt_arg (), ",", &aux);
 
             this->supplier_type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
@@ -601,11 +601,11 @@ ECT_Throughput::parse_args (int argc, char *argv [])
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.optarg;
+          this->pid_file_name_ = get_opt.opt_arg ();
           break;
 
         case 'w':
-          this->ec_concurrency_hwm_ = ACE_OS::atoi (get_opt.optarg);
+          this->ec_concurrency_hwm_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case '?':
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 3a2533f44d4..4b8879820ec 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -45,7 +45,7 @@ EC_Reconnect::parse_args (int& argc, char* argv[])
           this->allow_supplier_reconnect_ = 1;
           break;
         case 'd':
-          this->disconnections_ = ACE_OS::atoi (get_opt.optarg);
+          this->disconnections_ = ACE_OS::atoi (get_opt.opt_arg ());
           break;
 
         case '?':
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 9cafab8e20e..6debc2655ba 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -282,11 +282,11 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'i':
-        iterations = ACE_OS::atoi (get_opts.optarg);
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'k':
-        ec_ior = get_opts.optarg;
+        ec_ior = get_opts.opt_arg ();
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index ce6a4225dc5..30b38cfe38a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -162,7 +162,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_file_name = get_opts.optarg;
+        ior_file_name = get_opts.opt_arg ();
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 2d24fddbe2e..508bf74dbc1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -33,13 +33,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'a':
-        first_ior = get_opts.optarg;
+        first_ior = get_opts.opt_arg ();
         break;
       case 'b':
-        second_ior = get_opts.optarg;
+        second_ior = get_opts.opt_arg ();
         break;
       case 'c':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index 1c984b1de4b..f078943789e 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -14,7 +14,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index ec0094ed072..da83e55d580 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -167,7 +167,7 @@ Server_i::parse_args (int argc, char *argv [])
     switch (c)
       {
       case 'a':
-        this->mcast_address_ = get_opts.optarg;
+        this->mcast_address_ = get_opts.opt_arg ();
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index a138972dd69..97786e3d430 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -31,10 +31,10 @@ Airplane_Client_i::parse_args (void)
         TAO_debug_level++;
         break;
       case 'n':  // loop count
-        this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 'k':  // ior provide on command line
-        this->server_key_ = ACE::strnew (get_opts.optarg);
+        this->server_key_ = ACE::strnew (get_opts.opt_arg ());
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index d0864f3e575..2c7e1e9ebb1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -33,11 +33,11 @@ Airplane_Server_i::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
+                             get_opts.opt_arg ()), -1);
         break;
       case '?':  // display help for use of the server.
       default:
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index f0c05263d59..15205c9dcc3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -30,7 +30,7 @@ Nestea_Client_i::parse_args (void)
         TAO_debug_level++;
         break;
       case 'k':  // ior provide on command line
-        this->server_key_ = ACE::strnew (get_opts.optarg);
+        this->server_key_ = ACE::strnew (get_opts.opt_arg ());
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 9387ac9edcd..40ced68ec1e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -53,11 +53,11 @@ Nestea_Server_i::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
+                             get_opts.opt_arg ()), -1);
         break;
       case '?':  // display help for use of the server.
       default:
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index e66b8396231..959b01cc9df 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -159,13 +159,13 @@ Admin_Client::parse_args (int argc,
         this->debug_ = 1;
         break;
       case 'i':   // iterations
-        result = ACE_OS::atoi (opts.optarg);
+        result = ACE_OS::atoi (opts.opt_arg ());
         if (result > 0)
           this->iterations_ = result;
         break;
       case 't':   // test selection
         this->all_tests_ = 0;
-        name = opts.optarg;
+        name = opts.opt_arg ();
 
         for (i = 0; i < NUMBER_OF_TESTS; ++i)
           {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/client.cpp
index 38cde7ddf4c..5f09d83d3ff 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/client.cpp
@@ -38,15 +38,15 @@ main (int argc, char *argv[])
         switch (c)
           {
           case 'k':
-            ior = options.optarg;
+            ior = options.opt_arg ();
             break;
 
           case 't':
-            timeout = ACE_OS::atoi (options.optarg);
+            timeout = ACE_OS::atoi (options.opt_arg ());
             break;
 
           case 'i':
-            iterations = ACE_OS::atoi (options.optarg);
+            iterations = ACE_OS::atoi (options.opt_arg ());
             break;
 
           default:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
index 45087ff4c62..fcdc16cd4e7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
@@ -29,11 +29,11 @@ main (int argc, char *argv[])
         switch (c)
           {
           case 'k':
-            balancer_ior = options.optarg;
+            balancer_ior = options.opt_arg ();
             break;
 
           case 'o':
-            ior_output = options.optarg;
+            ior_output = options.opt_arg ();
             break;
           default:
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 28c3e09023c..43040ab75ed 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 'n':
-          service_name = get_opt.optarg;
+          service_name = get_opt.opt_arg ();
           break;
         case '?':
         default:
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index c95c7e82ac9..844b4d3bfa4 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 'n':
-          service_name = get_opt.optarg;
+          service_name = get_opt.opt_arg ();
           break;
         case '?':
         default:
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 80c2b156565..42ca277fc98 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -19,7 +19,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-        ior = get_opts.optarg;
+        ior = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index 2b5bfd756b3..191d6c0da9e 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -23,7 +23,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index a99610317c7..919696c7716 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -20,15 +20,15 @@ parse_args (int argc, char *argv[])
       {
 
       case 'k':
-        ior = get_opts.optarg;
+        ior = get_opts.opt_arg ();
         break;
 
       case 'n':
-        nthreads = ACE_OS::atoi (get_opts.optarg);
+        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'i':
-        niterations = ACE_OS::atoi (get_opts.optarg);
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index 189e4ea5804..b5149ff965f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -17,11 +17,11 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
 
       case 'n':
-        nthreads = ACE_OS::atoi (get_opts.optarg);
+        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 7dc2b43d35e..468ad3bce42 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -117,7 +117,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-        ior = get_opts.optarg;
+        ior = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index cbd5ea22072..45304dcd39d 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -19,7 +19,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
index 8e7d836f771..f631708d4fc 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
@@ -18,7 +18,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-        ior = get_opts.optarg;
+        ior = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
index e4565c73fa2..724b5139f91 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
@@ -20,7 +20,7 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-        ior_output_file = get_opts.optarg;
+        ior_output_file = get_opts.opt_arg ();
         break;
       case '?':
       default:
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 12b1ff7e0c2..233ea44feb0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -109,7 +109,7 @@ CosNaming_Client::parse_args (void)
       case 'm':
         if (this->test_ == 0)
           {
-            int size = ACE_OS::atoi (get_opts.optarg);
+            int size = ACE_OS::atoi (get_opts.opt_arg ());
             if (size <= 0)
               size = 10;
 
@@ -147,12 +147,12 @@ CosNaming_Client::parse_args (void)
         if (this->test_ == 0)
           {
             FILE * ior_output_file =
-              ACE_OS::fopen (get_opts.optarg, "w");
+              ACE_OS::fopen (get_opts.opt_arg (), "w");
 
             if (ior_output_file == 0)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "Unable to open %s for writing: %p\n",
-                                 get_opts.optarg), -1);
+                                 get_opts.opt_arg ()), -1);
 
             ACE_NEW_RETURN (this->test_,
                             Persistent_Test_Begin (this->orbmgr_.orb (),
@@ -164,7 +164,7 @@ CosNaming_Client::parse_args (void)
         if (this->test_ == 0)
           ACE_NEW_RETURN (this->test_,
                           Persistent_Test_End (this->orbmgr_.orb (),
-                                               get_opts.optarg),
+                                               get_opts.opt_arg ()),
                           -1);
         break;
       default:
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index b1a5b774470..3036479c109 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -257,17 +257,17 @@ Client_i::parse_args (void)
          TAO_debug_level++;
          break;
        case 'n':  // loop count
-         this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+         this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.opt_arg ());
          break;
        case 'k':  // ior provide on command line
-         this->ior_ = ACE_OS::strdup (get_opts.optarg);
+         this->ior_ = ACE_OS::strdup (get_opts.opt_arg ());
          break;
        case 'f': // read the IOR from the file.
-         result = this->read_ior (get_opts.optarg);
+         result = this->read_ior (get_opts.opt_arg ());
          if (result < 0)
            ACE_ERROR_RETURN ((LM_ERROR,
                               "[CLIENT] Process/Thread Id : (%P/%t) Unable to read ior from %s : %p\n",
-                              get_opts.optarg),
+                              get_opts.opt_arg ()),
                              -1);
          break;
        case 'x':