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

6 files changed, 22 insertions, 22 deletions

diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp
index 822240f6a9f..c6d223ed095 100644
--- a/netsvcs/clients/Tokens/collection/collection.cpp
+++ b/netsvcs/clients/Tokens/collection/collection.cpp
@@ -100,18 +100,18 @@ parse_args (int argc, char *argv[])
       switch (c)
 	{
 	case 'h':  // specify the host machine on which the server is running
-	  server_host = get_opt.optarg;
+	  server_host = get_opt.opt_arg ();
 	  remote = 1;
 	  break;
 	case 'p':  // specify the port on which the server is running
-	  server_port = ACE_OS::atoi (get_opt.optarg);
+	  server_port = ACE_OS::atoi (get_opt.opt_arg ());
 	  remote = 1;
 	  break;
 	case 'd':
 	  debug = 1;
 	  break;
 	case 'n':
-	  iterations = ACE_OS::atoi (get_opt.optarg);
+	  iterations = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'u':
 	  // usage: fallthrough
diff --git a/netsvcs/clients/Tokens/collection/rw_locks.cpp b/netsvcs/clients/Tokens/collection/rw_locks.cpp
index e48f0e5db0d..2a64f8d9786 100644
--- a/netsvcs/clients/Tokens/collection/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/collection/rw_locks.cpp
@@ -82,16 +82,16 @@ parse_args (int argc, char *argv[])
       switch (c)
 	{
 	case 'h':  // specify the host machine on which the server is running
-	  server_host = get_opt.optarg;
+	  server_host = get_opt.opt_arg ();
 	  break;
 	case 'p':  // specify the port on which the server is running
-	  server_port = ACE_OS::atoi (get_opt.optarg);
+	  server_port = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 't':
-	  threads = ACE_OS::atoi (get_opt.optarg);
+	  threads = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'R':
-	  reads = ACE_OS::atoi (get_opt.optarg);
+	  reads = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'd':
 	  debug = 1;
@@ -103,7 +103,7 @@ parse_args (int argc, char *argv[])
 	  write_sleep = 1;
 	  break;
 	case 'n':
-	  iterations = ACE_OS::atoi (get_opt.optarg);
+	  iterations = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'i':
 	  ignore_deadlock = 1;
diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index 9b4c12b77e1..46a9daabf80 100644
--- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -184,15 +184,15 @@ parse_args (int argc, char *argv[])
 	  ignore_deadlock = 1;
 	  break;
 	case 'h':
-	  server_host = get_opt.optarg;
+	  server_host = get_opt.opt_arg ();
 	  remote_mutexes = 1;
 	  break;
 	case 'p':
-	  server_port = ACE_OS::atoi (get_opt.optarg);
+	  server_port = ACE_OS::atoi (get_opt.opt_arg ());
 	  remote_mutexes = 1;
 	  break;
 	case 'n':
-	  iterations = ACE_OS::atoi (get_opt.optarg);
+	  iterations = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'u':
 	default:
diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp
index 1393150f751..9574fc7edb6 100644
--- a/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/netsvcs/clients/Tokens/manual/manual.cpp
@@ -111,11 +111,11 @@ STDIN_Token::parse_args (int argc, char *argv[])
       switch (c)
 	{
 	case 'h':  // specify the host machine on which the server is running
-	  server_host_ = get_opt.optarg;
+	  server_host_ = get_opt.opt_arg ();
 	  remote_ = 1;
 	  break;
 	case 'p':  // specify the port on which the server is running
-	  server_port_ = ACE_OS::atoi (get_opt.optarg);
+	  server_port_ = ACE_OS::atoi (get_opt.opt_arg ());
 	  remote_ = 1;
 	  break;
 	case 'd':
diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
index b15243dffba..c291981789d 100644
--- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp
+++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
@@ -77,18 +77,18 @@ parse_args (int argc, char *argv[])
       switch (c)
 	{
 	case 't':
-	  spawn_count = ACE_OS::atoi (get_opt.optarg);
+	  spawn_count = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'h':  // specify the host machine on which the server is running
-	  server_host = get_opt.optarg;
+	  server_host = get_opt.opt_arg ();
 	  remote_mutexes = 1;
 	  break;
 	case 'p':  // specify the port on which the server is running
-	  server_port = ACE_OS::atoi (get_opt.optarg);
+	  server_port = ACE_OS::atoi (get_opt.opt_arg ());
 	  remote_mutexes = 1;
 	  break;
 	case 'n':  // specify the port on which the server is running
-	  iterations = ACE_OS::atoi (get_opt.optarg);
+	  iterations = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'u':
 	default:
diff --git a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
index f9d8da9eb9c..098d2bd9d84 100644
--- a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
@@ -150,21 +150,21 @@ parse_args (int argc, char *argv[])
       switch (c)
 	{
 	case 'h':  // specify the host machine on which the server is running
-	  server_host = get_opt.optarg;
+	  server_host = get_opt.opt_arg ();
 	  remote = 1;
 	  break;
 	case 'p':  // specify the port on which the server is running
-	  server_port = ACE_OS::atoi (get_opt.optarg);
+	  server_port = ACE_OS::atoi (get_opt.opt_arg ());
 	  remote = 1;
 	  break;
 	case 't':
-	  threads = ACE_OS::atoi (get_opt.optarg);
+	  threads = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'R':
 	  renew = 1;
 	  break;
 	case 'r':
-	  reads = ACE_OS::atoi (get_opt.optarg);
+	  reads = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'd':
 	  debug = 1;
@@ -173,7 +173,7 @@ parse_args (int argc, char *argv[])
 	  write_sleep = 1;
 	  break;
 	case 'n':
-	  iterations = ACE_OS::atoi (get_opt.optarg);
+	  iterations = ACE_OS::atoi (get_opt.opt_arg ());
 	  break;
 	case 'i':
 	  ignore_deadlock = 1;