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

6 files changed, 19 insertions, 19 deletions

diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index f35e7f21db3..4a9b205d073 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -40,18 +40,18 @@ Server<Servant>::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 'n': //Use naming service
         this->naming_ = 1;
         break;
       case 'i': // For Testing the InterOperable Naming Service.
-        this->ins_ = CORBA::string_dup (get_opts.optarg);
+        this->ins_ = CORBA::string_dup (get_opts.opt_arg ());
         break;
       case 'h':  // display help for use of the server.
       default:
@@ -325,17 +325,17 @@ Client<INTERFACE_OBJECT, Var>::parse_args (void)
         TAO_debug_level++;
         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 'n': // Use naming service
         this->naming_ = 1;
         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 'x': // read the flag for shutting down
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index d5acaa2513e..8bb32f85cf3 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -50,11 +50,11 @@ Client_i::parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'n':  // get the users nickname
-        this->nickname_ = get_opts.optarg;
+        this->nickname_ = get_opts.opt_arg ();
         break;
 
       case 'f':  // get the file name to write to
-        this->ior_file_name_ = get_opts.optarg;
+        this->ior_file_name_ = get_opts.opt_arg ();
         break;
 
       default: // display help for use of the serve
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index 856d2d22a06..fa68b36aa10 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -41,7 +41,7 @@ Server_i::parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':  // get the file name to write to
-       this->ior_file_name_ = get_opts.optarg;
+       this->ior_file_name_ = get_opts.opt_arg ();
       break;
 
       case '?':  // display help for use of the server.
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index 56269b68c41..87f68f83547 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -37,20 +37,20 @@ Grid_Client_i::parse_args (int argc,
       {
       case 'p': // A horizontal position of the grid where
                 // the value is stored
-        setx_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        setx_ = (u_int) ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 'q': // A vertical position of the grid where a
                 // value is stored
-        sety_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        sety_ = (u_int) ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 'w':
-        width_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        width_ = (u_int) ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 'h':
-        height_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        height_ = (u_int) ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 'v':
-        value_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        value_ = (u_int) ACE_OS::atoi (get_opts.opt_arg ());
         break;
       }
 
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index d7b92d3f695..abed3c23fc4 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -110,15 +110,15 @@ Time_Date_Servant::parse_args (int argc, char *argv[])
         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;
         // Find the ORB in the Service Repository.
       case 'n':
-        this->orb_ = get_opts.optarg;
+        this->orb_ = get_opts.opt_arg ();
         break;
       case '?':  // display help for use of the server.
       default:
diff --git a/TAO/examples/Simple/time/Time_Client.java b/TAO/examples/Simple/time/Time_Client.java
index 77c837a2b5c..6f430ec48ad 100644
--- a/TAO/examples/Simple/time/Time_Client.java
+++ b/TAO/examples/Simple/time/Time_Client.java
@@ -47,10 +47,10 @@ public class Time_Client
                 switch (ch)
                     {
                     case 'k':
-                        ior = getopt.optarg ();
+                        ior = getopt.opt_arg () ();
                         break;
                     case 'f':
-                        ior_file = getopt.optarg ();
+                        ior_file = getopt.opt_arg () ();
                         try
                             {
                                 java.io.FileInputStream file =