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

6 files changed, 26 insertions, 26 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index fdf0a8886fa..09a07be02fd 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -271,17 +271,17 @@ DII_Cubit_Client::parse_args (void)
         TAO_debug_level++;
         break;
       case 'n':   // loop count
-        this->loop_count_ = ACE_OS::atoi (opts.optarg);
+        this->loop_count_ = ACE_OS::atoi (opts.opt_arg ());
         break;
       case 'i':   // Get the IOR from the command line.
-        this->factory_IOR_ = opts.optarg;
+        this->factory_IOR_ = opts.opt_arg ();
         break;
       case 'f':   // Read the IOR from the file.
-        result = this->read_ior (opts.optarg);
+        result = this->read_ior (opts.opt_arg ());
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read ior from %s : %p\n",
-                             opts.optarg),
+                             opts.opt_arg ()),
                             -1);
         break;
       case 'x':   // Shut down server after test run.
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index a7c426f6544..3f9d51cff0b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -219,24 +219,24 @@ Cubit_Client::parse_args (void)
       {
       case 'b':
         // bytes in octet sequence
-        result = ACE_OS::atoi (get_opts.optarg);
+        result = ACE_OS::atoi (get_opts.opt_arg ());
 
         if (result <= 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Invalid number of bytes entered: <%s>\n",
-                             get_opts.optarg),
+                             get_opts.opt_arg ()),
                             -1);
         else
           this->bytes_in_octet_sequence_ = (u_int) result;
         break;
       case 't':
-        test_mask = this->opt_to_mask (get_opts.optarg);
+        test_mask = this->opt_to_mask (get_opts.opt_arg ());
         if (test_mask == 0)
           return -1;
         this->enable_test (test_mask);
         break;
       case 'z':
-        test_mask = this->opt_to_mask (get_opts.optarg);
+        test_mask = this->opt_to_mask (get_opts.opt_arg ());
         if (test_mask == 0)
           return -1;
         this->disable_test (test_mask);
@@ -259,28 +259,28 @@ Cubit_Client::parse_args (void)
         TAO_debug_level++;
         break;
       case 'n':                 // loop count
-        result = ACE_OS::atoi (get_opts.optarg);
+        result = ACE_OS::atoi (get_opts.opt_arg ());
 
         if (result <= 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Invalid number of iterations entered: <%s>\n",
-                             get_opts.optarg),
+                             get_opts.opt_arg ()),
                             -1);
         else
           this->loop_count_ = (u_int) result;
         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->cubit_factory_key_ =
-          ACE_OS::strdup (get_opts.optarg);
+          ACE_OS::strdup (get_opts.opt_arg ());
         break;
       case 'x':
         ACE_DEBUG ((LM_DEBUG, "We will shutdown the server\n"));
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index 313495d228b..9e39a72109b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -30,11 +30,11 @@ Cubit_Server::parse_args (void)
         break;
 
       case 'f': // 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,
+                             get_opts.opt_arg (),
                              ""),
                             -1);
         break;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index bd4b767c5a4..b988891d80a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -82,11 +82,11 @@ main (int argc, char **argv)
     switch (c)
       {
       case 'c':
-        client_cmd = get_opts.optarg;
+        client_cmd = get_opts.opt_arg ();
         ACE_DEBUG ((LM_DEBUG, "Client argument: %s\n", client_cmd));
         break;
       case 's':
-        server_cmd = get_opts.optarg;
+        server_cmd = get_opts.opt_arg ();
         ACE_DEBUG ((LM_DEBUG, "Server argument: %s\n", server_cmd));
         break;
       default:
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 86d9b43b27c..06ac6b5d481 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -41,14 +41,14 @@ Globals::parse_args (int argc, char *argv[])
                         char[BUFSIZ],
                         -1);
         ACE_OS::strcpy (ior_file,
-                        opts.optarg);
+                        opts.opt_arg ());
         break;
       case 'e':
         ACE_OS::strcpy (endpoint,
-                        opts.optarg);
+                        opts.opt_arg ());
         break;
       case 't':
-        num_of_objs = ACE_OS::atoi (opts.optarg);
+        num_of_objs = ACE_OS::atoi (opts.opt_arg ());
         break;
       case '?':
       default:
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 8235905755c..824d3dbcabc 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -62,7 +62,7 @@ Task_State::parse_args (int argc,char *argv[])
   while ((c = opts ()) != -1)
     switch (c) {
     case 'g':
-      granularity_ = ACE_OS::atoi (opts.optarg);
+      granularity_ = ACE_OS::atoi (opts.opt_arg ());
       if (granularity_ < 1)
         granularity_ = 1;
       break;
@@ -80,10 +80,10 @@ Task_State::parse_args (int argc,char *argv[])
       break;
     case 'u':
       use_utilization_test_ = 1;
-      loop_count_ = ACE_OS::atoi (opts.optarg);
+      loop_count_ = ACE_OS::atoi (opts.opt_arg ());
       break;
     case 'f':
-      ior_file_ = ACE_OS::strdup (opts.optarg);
+      ior_file_ = ACE_OS::strdup (opts.opt_arg ());
       break;
     case 'o':
       oneway_ = 1;
@@ -96,7 +96,7 @@ Task_State::parse_args (int argc,char *argv[])
       break;
     case 'd':
       {
-        int datatype = ACE_OS::atoi (opts.optarg);
+        int datatype = ACE_OS::atoi (opts.opt_arg ());
         switch (datatype)
           {
           case CB_OCTET:
@@ -124,10 +124,10 @@ Task_State::parse_args (int argc,char *argv[])
       }
       continue;
     case 'n':                   // loop count
-      loop_count_ = (u_int) ACE_OS::atoi (opts.optarg);
+      loop_count_ = (u_int) ACE_OS::atoi (opts.opt_arg ());
       continue;
     case 't':
-      thread_count_ = (u_int) ACE_OS::atoi (opts.optarg);
+      thread_count_ = (u_int) ACE_OS::atoi (opts.opt_arg ());
       continue;
     case '?':
     default: