diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-12-26 15:55:59 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-12-26 15:55:59 +0000 |
| commit | 9373ca40cf71d21bf53f64d2a0ccd130d6524e73 (patch) | |
| tree | 1534aad8ba29d75881ad6f4ab980fb04525b42f3 /TAO/tests | |
| parent | 0bc80fab4dc53994efbd511b22b0c86d59baff8c (diff) | |
| download | ATCD-9373ca40cf71d21bf53f64d2a0ccd130d6524e73.tar.gz | |
ChangeLogTag:Wed Dec 26 09:07:45 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
Diffstat (limited to 'TAO/tests')
168 files changed, 354 insertions, 354 deletions
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 5ce889f4cfb..3dfd4a579a1 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -43,13 +43,13 @@ parse_args (int argc, char *argv[]) debug = 1; break; 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 '?': default: diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index a5916a29a99..da4274ab73f 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -35,7 +35,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 'd': TAO_debug_level++; diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 7cd8199157f..b203a92e2c7 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -49,10 +49,10 @@ parse_args (int argc, char *argv[]) debug = 1; break; case 'k': - ior = get_opts.optarg; + ior = 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': shutdown_flag = 1; diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index e9dc9dfbe62..c4bc16203d6 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -17,7 +17,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/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index cc3efc9f4ab..1b3841c5af7 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -42,15 +42,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - server_ior = get_opts.optarg; + server_ior = get_opts.opt_arg (); break; case 'a': - admin_ior = get_opts.optarg; + admin_ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'c': diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index 5403607d06d..469c863e865 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -18,11 +18,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 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index 00c680e2009..104925ce803 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -42,10 +42,10 @@ parse_args (int argc, char *argv[]) TAO_debug_level++; break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 't': - msec = ACE_OS::atoi (get_opts.optarg); + msec = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index c5185d188f0..c9ea325ae42 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -35,7 +35,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 'd': TAO_debug_level++; diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index cdc63d41f5e..f6658882d03 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -22,7 +22,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp index 17934fa1b42..9ad9a5032b4 100644 --- a/TAO/tests/BiDirectional/server.cpp +++ b/TAO/tests/BiDirectional/server.cpp @@ -19,10 +19,10 @@ 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 'i': - no_iterations = ACE_OS::atoi (get_opts.optarg); + no_iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 2fed8b8707f..b119fd6e7cb 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -23,7 +23,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp index 9b7753566de..9623dcf960f 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp @@ -19,10 +19,10 @@ 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 'i': - no_iterations = ACE_OS::atoi (get_opts.optarg); + no_iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index 2bf4fc0ca25..1b90a459f6f 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/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 '?': diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 0287285b12b..20111f3eabe 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -22,23 +22,23 @@ 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 'p': - peer_count = ACE_OS::atoi (get_opts.optarg); + peer_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'b': - payload_size = ACE_OS::atoi (get_opts.optarg); + payload_size = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'i': - message_count = ACE_OS::atoi (get_opts.optarg); + message_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'n': - thread_count = ACE_OS::atoi (get_opts.optarg); + thread_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index c4b67da432f..2ada7182cf3 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -17,7 +17,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/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index 71ac4df2afb..e00ea261bfc 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -21,7 +21,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/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp index 47e29b9544d..52518c3d9bc 100644 --- a/TAO/tests/Big_Request_Muxing/client.cpp +++ b/TAO/tests/Big_Request_Muxing/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/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index bda9db4e71d..55ccd63e20e 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -17,7 +17,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/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index 2bf4fc0ca25..1b90a459f6f 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/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 '?': diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index daba45ad5cc..6b164fb63f9 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -22,23 +22,23 @@ 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 'p': - peer_count = ACE_OS::atoi (get_opts.optarg); + peer_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'b': - payload_size = ACE_OS::atoi (get_opts.optarg); + payload_size = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'i': - message_count = ACE_OS::atoi (get_opts.optarg); + message_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'n': - thread_count = ACE_OS::atoi (get_opts.optarg); + thread_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp index 0a10da916d4..6275dd20856 100644 --- a/TAO/tests/Blocking_Sync_None/client.cpp +++ b/TAO/tests/Blocking_Sync_None/client.cpp @@ -19,11 +19,11 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index 87bed6de345..59278406f4f 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -17,7 +17,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/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp index 1ab19749a8e..b5814a217ac 100644 --- a/TAO/tests/CDR/allocator.cpp +++ b/TAO/tests/CDR/allocator.cpp @@ -91,25 +91,25 @@ main (int argc, char *argv[]) tss = 1; break; case 'n': - iterations = ACE_OS::atoi (get_opt.optarg); + iterations = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'r': - repeat = ACE_OS::atoi (get_opt.optarg); + repeat = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'f': - max_fragments = ACE_OS::atoi (get_opt.optarg); + max_fragments = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'm': - max_fragment_size = ACE_OS::atoi (get_opt.optarg); + max_fragment_size = ACE_OS::atoi (get_opt.opt_arg ()); break; case 's': - seed = ACE_OS::atoi (get_opt.optarg); + seed = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'a': - max_arguments = ACE_OS::atoi (get_opt.optarg); + max_arguments = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'b': - max_argument_size = ACE_OS::atoi (get_opt.optarg); + max_argument_size = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'q': quiet = 1; diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index 6933e23c293..7b6407c01d9 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -227,10 +227,10 @@ main (int argc, char *argv[]) TAO_debug_level++; 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/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp index ee95907335b..4cd5700958e 100644 --- a/TAO/tests/CDR/growth.cpp +++ b/TAO/tests/CDR/growth.cpp @@ -79,16 +79,16 @@ main (int argc, char *argv[]) TAO_debug_level++; break; case 'n': - n = ACE_OS::atoi (get_opt.optarg); + n = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'l': - low = ACE_OS::atoi (get_opt.optarg); + low = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'h': - hi = ACE_OS::atoi (get_opt.optarg); + hi = ACE_OS::atoi (get_opt.opt_arg ()); break; case 's': - s = ACE_OS::atoi (get_opt.optarg); + s = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'q': quiet = 1; diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp index cfa57e4609b..896af123dd7 100644 --- a/TAO/tests/Cache_Growth_Test/client.cpp +++ b/TAO/tests/Cache_Growth_Test/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 'x': diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index 37e44cc4c33..dab7a38e33a 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -17,7 +17,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/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp index 9366170a104..3dac3dff84a 100644 --- a/TAO/tests/Client_Leaks/client.cpp +++ b/TAO/tests/Client_Leaks/client.cpp @@ -19,15 +19,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'n': - threads = ACE_OS::atoi (get_opts.optarg); + threads = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index 185626ebe56..9f1492674bc 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -18,7 +18,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/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index b253b9f4dbc..0af2e31ef87 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -16,7 +16,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index d8972b2362a..dce725de720 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -16,7 +16,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/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp index b689510cd8a..0ea17c4a904 100644 --- a/TAO/tests/Crash_On_Write/client.cpp +++ b/TAO/tests/Crash_On_Write/client.cpp @@ -18,11 +18,11 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index 6fae627ce65..da03693e775 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -18,7 +18,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/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index 7f81e47e831..1c07493fbcc 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/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/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index e0e2e637d72..09cfd2db824 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/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/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index cdc2bf8fa0d..5496c07f1fa 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -21,7 +21,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 1e574748e7f..aae697c0b63 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -24,7 +24,7 @@ parse_args (int argc, char *argv[]) { case 'o': - ior_file = get_opts.optarg; + ior_file = get_opts.opt_arg (); break; default: diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index b90a0724f11..047d01fe24f 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -35,11 +35,11 @@ parse_args (int argc, char *argv[]) break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp index 2dbe2dad28d..dce3e19f8cc 100644 --- a/TAO/tests/DSI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_Gateway/gateway.cpp @@ -25,15 +25,15 @@ parse_args (int argc, char *argv[]) break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'o': - ior_output_file = get_opts.optarg; + ior_output_file = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp index 7bc94dda05f..8d4eabba3da 100644 --- a/TAO/tests/DSI_Gateway/server.cpp +++ b/TAO/tests/DSI_Gateway/server.cpp @@ -20,11 +20,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/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index 2cbc2873eac..5b44900d2d4 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -115,17 +115,17 @@ Driver::parse_args (int argc, char* argv[]) switch (c) { case 't': - if (!ACE_OS::strcmp (get_opts.optarg, "dynany")) + if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynany")) this->test_type_ = TEST_DYNANY; - else if (!ACE_OS::strcmp (get_opts.optarg, "dynarray")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynarray")) this->test_type_ = TEST_DYNARRAY; - else if (!ACE_OS::strcmp (get_opts.optarg, "dynenum")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynenum")) this->test_type_ = TEST_DYNENUM; - else if (!ACE_OS::strcmp (get_opts.optarg, "dynsequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynsequence")) this->test_type_ = TEST_DYNSEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "dynstruct")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynstruct")) this->test_type_ = TEST_DYNSTRUCT; - else if (!ACE_OS::strcmp (get_opts.optarg, "dynunion")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "dynunion")) this->test_type_ = TEST_DYNUNION; break; diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index b714a1f80ab..7745b295325 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -36,7 +36,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 'd': TAO_debug_level++; diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp index 1956c605ca5..49072049238 100644 --- a/TAO/tests/FL_Cube/client.cpp +++ b/TAO/tests/FL_Cube/client.cpp @@ -188,7 +188,7 @@ Client::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/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index f8f466aecd7..bd86b538654 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -31,7 +31,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/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index f293e7095f8..0c2e85cca46 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -43,11 +43,11 @@ parse_args (int argc, char *argv[]) break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 157a5a9fc9b..38d853b4cdb 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -19,15 +19,15 @@ 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 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index 3f571087e52..e3d5480d0a0 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -17,7 +17,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/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index 1066400e786..6165d7520c9 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -21,19 +21,19 @@ parse_args (int argc, char *argv[]) switch (c) { case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'p': - period = ACE_OS::atoi (get_opts.optarg); + period = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 't': - kill_on = ACE_OS::atoi (get_opts.optarg); + kill_on = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp index 1ed8bab1f07..dc8742840fa 100644 --- a/TAO/tests/Faults/server.cpp +++ b/TAO/tests/Faults/server.cpp @@ -17,7 +17,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/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index 5160344c020..11021da4b71 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -47,10 +47,10 @@ parse_args (int argc, char **argv) TAO_debug_level++; break; case 'k': - iorfile = get_opts.optarg; + iorfile = get_opts.opt_arg (); break; case 'f': - filename = get_opts.optarg; + filename = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index 87749551f69..93faa6764d4 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -45,7 +45,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 'd': TAO_debug_level++; diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index 74fb63e708f..528c3dfde2c 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -25,11 +25,11 @@ parse_args (int argc, char *argv[]) break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp index c1978fab285..2b2acda8579 100644 --- a/TAO/tests/Forwarding/server.cpp +++ b/TAO/tests/Forwarding/server.cpp @@ -18,7 +18,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/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp index d2f8b87923b..3837dd04185 100644 --- a/TAO/tests/Hello/client.cpp +++ b/TAO/tests/Hello/client.cpp @@ -17,7 +17,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp index 9cc27af8ec3..a5e2ca1ea95 100644 --- a/TAO/tests/Hello/server.cpp +++ b/TAO/tests/Hello/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 '?': diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp index 97b776c45ff..6a5a08b94cf 100644 --- a/TAO/tests/InterOp-Naming/Server_i.cpp +++ b/TAO/tests/InterOp-Naming/Server_i.cpp @@ -34,15 +34,15 @@ 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 '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 '?': // display help for use of the server. diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index ca19357f5dd..45efec07038 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -51,23 +51,23 @@ parse_args (int argc, char **argv) switch (c) { case 'k': - IOR = get_opts.optarg; + IOR = get_opts.opt_arg (); break; case 'c': - number_of_client_threads = ::atoi (get_opts.optarg); + number_of_client_threads = ::atoi (get_opts.opt_arg ()); break; case 'e': - number_of_event_loop_threads = ::atoi (get_opts.optarg); + number_of_event_loop_threads = ::atoi (get_opts.opt_arg ()); break; case 't': - event_loop_timeout = ::atoi (get_opts.optarg); + event_loop_timeout = ::atoi (get_opts.opt_arg ()); break; case 'w': - remote_work = ::atoi (get_opts.optarg); + remote_work = ::atoi (get_opts.opt_arg ()); break; case 'x': diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 1746658649c..6876d4a0b27 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -22,11 +22,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 'e': - number_of_event_loop_threads = ::atoi (get_opts.optarg); + number_of_event_loop_threads = ::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index 64d285abdd4..997c8871d2f 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_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/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index 6eeacf2732d..188afbd32d1 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -17,7 +17,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/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index 12e9fd95501..b1e6cfa917a 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -17,7 +17,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/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index 5a58dbfd8f7..1c43c2468cc 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -17,7 +17,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/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index e15389d644c..0358a8aac7c 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -26,11 +26,11 @@ parse_args (int argc, char *argv[]) break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'm': - name = get_opts.optarg; + name = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp index 0edb0a7bd20..ac965b990ac 100644 --- a/TAO/tests/MProfile/server.cpp +++ b/TAO/tests/MProfile/server.cpp @@ -17,7 +17,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/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp index c7d8400ef38..1f394084e40 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.cpp +++ b/TAO/tests/MProfile_Forwarding/Manager.cpp @@ -18,16 +18,16 @@ 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': - third_ior = get_opts.optarg; + third_ior = get_opts.opt_arg (); break; case 'd': - ior_output_file = get_opts.optarg; + ior_output_file = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp index 10c176b81a7..36b0dd3c49e 100644 --- a/TAO/tests/MProfile_Forwarding/client.cpp +++ b/TAO/tests/MProfile_Forwarding/client.cpp @@ -18,7 +18,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_input_file = get_opts.optarg; + ior_input_file = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 1d88b1a6acf..4672bcd0a74 100755 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp @@ -17,7 +17,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/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index 75dbdd84241..61a155fc737 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -22,13 +22,13 @@ parse_args (int argc, char *argv[]) switch (c) { 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': server_shutdown = 1; diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 97b08f0eb11..244d1a92ca2 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -21,13 +21,13 @@ parse_args (int argc, char *argv[]) switch (c) { 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 '?': default: diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp index e7a42f825ce..4d344552377 100644 --- a/TAO/tests/MT_Client/server.cpp +++ b/TAO/tests/MT_Client/server.cpp @@ -17,7 +17,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/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp index 8f0642d546b..a6c60fb78f9 100644 --- a/TAO/tests/MT_Server/client.cpp +++ b/TAO/tests/MT_Server/client.cpp @@ -24,11 +24,11 @@ parse_args (int argc, char *argv[]) break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index bfc8e14d63f..debba16f9e3 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -20,11 +20,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/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index ae5308cab04..e8b3e285b7c 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -19,15 +19,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'n': - threads = ACE_OS::atoi (get_opts.optarg); + threads = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index 91dede3b629..2b60e0c130d 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -18,7 +18,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/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp index 5f1a4b00dba..465cf0e591b 100644 --- a/TAO/tests/Multiple_Inheritance/client.cpp +++ b/TAO/tests/Multiple_Inheritance/client.cpp @@ -35,10 +35,10 @@ parse_args (int argc, char **argv) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'f': - ior_input_file = get_opts.optarg; + ior_input_file = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index 42a5d54f11c..4fa16427905 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -25,7 +25,7 @@ parse_args (int argc, char **argv) switch (c) { case 'f': - ior_output_file = ACE_OS::strdup (get_opts.optarg); + ior_output_file = ACE_OS::strdup (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index 348025219f9..f9bc046097b 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -17,7 +17,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/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index b0481c089ee..e2e54be6e31 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -18,7 +18,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/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp index 5cd7c837c6b..67811435ae2 100644 --- a/TAO/tests/Native_Exceptions/client.cpp +++ b/TAO/tests/Native_Exceptions/client.cpp @@ -18,11 +18,11 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp index 8de43cfbbf1..1ee0e319c74 100644 --- a/TAO/tests/Native_Exceptions/server.cpp +++ b/TAO/tests/Native_Exceptions/server.cpp @@ -17,7 +17,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/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index fb2c7d74986..61eef4524e8 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -98,28 +98,28 @@ MT_Client::parse_args (void) case 'f': // read the IOR from the file. if ((this->client_number_ % 2) == 0) { - result = this->read_ior (get_opts.optarg); + result = this->read_ior (get_opts.opt_arg ()); // read IOR for MT Object 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 'g': // read the IOR from the file. if ((this->client_number_ % 2) == 1) { - result = this->read_ior (get_opts.optarg); + result = this->read_ior (get_opts.opt_arg ()); // read IOR for Object A 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 'i': this->iterations_ = ACE_OS::atoi (get_opts.optarg); + case 'i': this->iterations_ = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'h': case 'n': diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 39212cdb3ed..fff693f2e46 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -95,12 +95,12 @@ MT_Server::parse_args (void) break; case 'h': // read the IOR from the file. int result; - result = this->read_ior (get_opts.optarg); + result = this->read_ior (get_opts.opt_arg ()); // read IOR for MT Object 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 'f': @@ -108,7 +108,7 @@ MT_Server::parse_args (void) case 'i': case 'n': break; - case 's': this->iterations_ = atoi (get_opts.optarg); + case 's': this->iterations_ = atoi (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index ec7dbe786a5..a259d0c2f74 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -40,11 +40,11 @@ MT_Object_Server::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 '?': default: diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index cf084955ba9..63e789b52b3 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -82,11 +82,11 @@ parse_args (int argc, break; case 'n': - call_count = ACE_OS::atoi (get_opts.optarg); + call_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index d556b0955e6..75312958193 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -90,11 +90,11 @@ parse_args (int argc, break; case 't': - number_of_threads = ACE_OS::atoi (get_opts.optarg); + number_of_threads = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'f': - ior_file = get_opts.optarg; + ior_file = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index 1ec28af256e..ed8c279cd01 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -87,15 +87,15 @@ parse_args (int argc, break; case 'n': - call_count = ACE_OS::atoi (get_opts.optarg); + call_count = ACE_OS::atoi (get_opts.opt_arg ()); break; case 't': - number_of_threads = ACE_OS::atoi (get_opts.optarg); + number_of_threads = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 1f91b27f5ee..78bb62a8a1b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -84,21 +84,21 @@ Initiator_Server::parse_args (void) TAO_debug_level++; break; case 'f': // read the IOR from the file. - result = this->read_ior (get_opts.optarg,0); + result = this->read_ior (get_opts.opt_arg (),0); // read IOR for Object A 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 'g': // read the IOR from the file. - result = this->read_ior (get_opts.optarg,1); + result = this->read_ior (get_opts.opt_arg (),1); // read IOR for Object A 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 '?': diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index c48d187544d..e43921d9291 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -40,11 +40,11 @@ Object_A_Server::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 '?': default: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index 259f0043db4..5a692acab73 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -40,11 +40,11 @@ Object_B_Server::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 '?': default: diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index 4069909cdcb..f10cf46ab27 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -31,15 +31,15 @@ parse_args (int argc, char **argv) switch (c) { case 'k': - IOR = get_opts.optarg; + IOR = get_opts.opt_arg (); break; case 'i': - event_loop_iterations = ::atoi (get_opts.optarg); + event_loop_iterations = ::atoi (get_opts.opt_arg ()); break; case 'd': - event_loop_depth = ::atoi (get_opts.optarg); + event_loop_depth = ::atoi (get_opts.opt_arg ()); break; case 'x': diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 822c457c159..869da38609d 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/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/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index 6c625cb3fa5..6ab217974cb 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -14,7 +14,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 4cc4faef799..e4899d1bd61 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -127,7 +127,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/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp index 4aa340c639e..ed40d39c960 100644 --- a/TAO/tests/OctetSeq/OctetSeq.cpp +++ b/TAO/tests/OctetSeq/OctetSeq.cpp @@ -185,16 +185,16 @@ main (int argc, char *argv[]) switch (opt) { case 'n': - n = ACE_OS::atoi (get_opt.optarg); + n = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'l': - lo = ACE_OS::atoi (get_opt.optarg); + lo = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'h': - hi = ACE_OS::atoi (get_opt.optarg); + hi = ACE_OS::atoi (get_opt.opt_arg ()); break; case 's': - s = ACE_OS::atoi (get_opt.optarg); + s = ACE_OS::atoi (get_opt.opt_arg ()); break; case 'q': quiet = 1; diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index 881ee8b3a7a..0af72bbd4ae 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -20,15 +20,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 's': - seed = ACE_OS::atoi (get_opts.optarg); + seed = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'v': diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index cfad7fffd81..8dfbfe81e03 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -17,7 +17,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/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index f2e44e5ede2..874f6f9c508 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -17,7 +17,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/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp index 388ddeafcf7..b7dfdc27606 100644 --- a/TAO/tests/Oneway_Buffering/client.cpp +++ b/TAO/tests/Oneway_Buffering/client.cpp @@ -41,15 +41,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - server_ior = get_opts.optarg; + server_ior = get_opts.opt_arg (); break; case 'a': - admin_ior = get_opts.optarg; + admin_ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'c': diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index bc92d73ca4c..047b841e608 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -18,11 +18,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 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index 49526d4786c..be485765c03 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/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/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index c69f94b9103..50d503f6736 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -18,7 +18,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/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index c4d03c0e96f..fe874758829 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -47,7 +47,7 @@ main (int argc, char *argv[]) TAO_debug_level++; break; case 'n': - n = ACE_OS::atoi (get_opt.optarg); + n = ACE_OS::atoi (get_opt.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index a4b65950b0f..aad23a5f1b9 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -63,102 +63,102 @@ Options::parse_args (int argc, char **argv) break; case 'n': // loop count - this->loop_count_ = (CORBA::ULong) ACE_OS::atoi (get_opts.optarg); + this->loop_count_ = (CORBA::ULong) ACE_OS::atoi (get_opts.opt_arg ()); break; case 'f': - 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': CORBA::string_free (this->ior_); - this->ior_ = CORBA::string_dup (get_opts.optarg); + this->ior_ = CORBA::string_dup (get_opts.opt_arg ()); break; case 'i': // invocation - if (!ACE_OS::strcmp (get_opts.optarg, "dii")) + if (!ACE_OS::strcmp (get_opts.opt_arg (), "dii")) this->invoke_type_ = Options::DII; break; case 't': // data type - if (!ACE_OS::strcmp (get_opts.optarg, "short")) + if (!ACE_OS::strcmp (get_opts.opt_arg (), "short")) this->test_type_ = Options::TEST_SHORT; - else if (!ACE_OS::strcmp (get_opts.optarg, "ulonglong")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ulonglong")) this->test_type_ = Options::TEST_ULONGLONG; - else if (!ACE_OS::strcmp (get_opts.optarg, "ubstring")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ubstring")) this->test_type_ = Options::TEST_UB_STRING; - else if (!ACE_OS::strcmp (get_opts.optarg, "ubwstring")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ubwstring")) this->test_type_ = Options::TEST_UB_WSTRING; - else if (!ACE_OS::strcmp (get_opts.optarg, "bdstring")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bdstring")) this->test_type_ = Options::TEST_BD_STRING; - else if (!ACE_OS::strcmp (get_opts.optarg, "bdwstring")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bdwstring")) this->test_type_ = Options::TEST_BD_WSTRING; - else if (!ACE_OS::strcmp (get_opts.optarg, "fixed_struct")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "fixed_struct")) this->test_type_ = Options::TEST_FIXED_STRUCT; - else if (!ACE_OS::strcmp (get_opts.optarg, "ub_strseq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ub_strseq")) this->test_type_ = Options::TEST_UB_STRING_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "bd_strseq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bd_strseq")) this->test_type_ = Options::TEST_BD_STRING_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "ub_wstrseq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ub_wstrseq")) this->test_type_ = Options::TEST_UB_WSTRING_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "bd_wstrseq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bd_wstrseq")) this->test_type_ = Options::TEST_BD_WSTRING_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "var_struct")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "var_struct")) this->test_type_ = Options::TEST_VAR_STRUCT; - else if (!ACE_OS::strcmp (get_opts.optarg, "nested_struct")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "nested_struct")) this->test_type_ = Options::TEST_NESTED_STRUCT; - else if (!ACE_OS::strcmp (get_opts.optarg, "recursive_struct")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "recursive_struct")) this->test_type_ = Options::TEST_RECURSIVE_STRUCT; - else if (!ACE_OS::strcmp (get_opts.optarg, "objref_struct")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "objref_struct")) this->test_type_ = Options::TEST_OBJREF_STRUCT; - else if (!ACE_OS::strcmp (get_opts.optarg, "ub_struct_seq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ub_struct_seq")) this->test_type_ = Options::TEST_UB_STRUCT_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "bd_struct_seq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bd_struct_seq")) this->test_type_ = Options::TEST_BD_STRUCT_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "ub_array_seq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ub_array_seq")) this->test_type_ = Options::TEST_UB_ARRAY_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "bd_array_seq")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bd_array_seq")) this->test_type_ = Options::TEST_BD_ARRAY_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "objref")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "objref")) this->test_type_ = Options::TEST_OBJREF; - else if (!ACE_OS::strcmp (get_opts.optarg, "typecode")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "typecode")) this->test_type_ = Options::TEST_TYPECODE; - else if (!ACE_OS::strcmp (get_opts.optarg, "any")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "any")) this->test_type_ = Options::TEST_ANY; - else if (!ACE_OS::strcmp (get_opts.optarg, "objref_sequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "objref_sequence")) this->test_type_ = Options::TEST_OBJREF_SEQUENCE; - else if (!ACE_OS::strcmp (get_opts.optarg, "any_sequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "any_sequence")) this->test_type_ = Options::TEST_ANYSEQ; - else if (!ACE_OS::strcmp (get_opts.optarg, "ub_short_sequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ub_short_sequence")) this->test_type_ = Options::TEST_UB_SHORTSEQ; - else if (!ACE_OS::strcmp (get_opts.optarg, "bd_short_sequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bd_short_sequence")) this->test_type_ = Options::TEST_BD_SHORTSEQ; - else if (!ACE_OS::strcmp (get_opts.optarg, "ub_long_sequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "ub_long_sequence")) this->test_type_ = Options::TEST_UB_LONGSEQ; - else if (!ACE_OS::strcmp (get_opts.optarg, "bd_long_sequence")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "bd_long_sequence")) this->test_type_ = Options::TEST_BD_LONGSEQ; - else if (!ACE_OS::strcmp (get_opts.optarg, "fixed_array")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "fixed_array")) this->test_type_ = Options::TEST_FIXED_ARRAY; - else if (!ACE_OS::strcmp (get_opts.optarg, "var_array")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "var_array")) this->test_type_ = Options::TEST_VAR_ARRAY; - else if (!ACE_OS::strcmp (get_opts.optarg, "multdim_array")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "multdim_array")) this->test_type_ = Options::TEST_MULTDIM_ARRAY; - else if (!ACE_OS::strcmp (get_opts.optarg, "exception")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "exception")) this->test_type_ = Options::TEST_EXCEPTION; - else if (!ACE_OS::strcmp (get_opts.optarg, "big_union")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "big_union")) this->test_type_ = Options::TEST_BIG_UNION; - else if (!ACE_OS::strcmp (get_opts.optarg, "small_union")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "small_union")) this->test_type_ = Options::TEST_SMALL_UNION; - else if (!ACE_OS::strcmp (get_opts.optarg, "recursive_union")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "recursive_union")) this->test_type_ = Options::TEST_RECURSIVE_UNION; - else if (!ACE_OS::strcmp (get_opts.optarg, "complex_any")) + else if (!ACE_OS::strcmp (get_opts.opt_arg (), "complex_any")) this->test_type_ = Options::TEST_COMPLEX_ANY; break; diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index c1ed50851ec..2fa7b83009e 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -36,11 +36,11 @@ parse_args (int argc, char *argv[]) TAO_debug_level++; break; case 'o': - ior_output_file = ACE_OS::fopen (get_opts.optarg, "w"); + ior_output_file = 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); break; case '?': default: diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index 4993239c92d..549033856ae 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -22,10 +22,10 @@ parse_args (int argc, char *argv[]) switch (c) { 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 '?': default: diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index 32370917a2d..769632b1f33 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -29,10 +29,10 @@ parse_args (int argc, char *argv[]) case 'e': break; case 'f': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'n': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index c25209504bb..d3849370316 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -21,7 +21,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/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index d725bb1c6d7..0e927949c71 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -23,7 +23,7 @@ parse_args (int argc, char *argv[]) case 'e': break; case 'f': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 3acaf0dba2f..0b5756e38d1 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -21,7 +21,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/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp index 0d3e80d0426..42c9f336a0f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -29,9 +29,9 @@ parse_args (int argc, char *argv[]) case 'k': if (ior1 == 0) - ior1 = get_opts.optarg; + ior1 = get_opts.opt_arg (); else if (ior2 == 0) - ior2 = get_opts.optarg; + ior2 = get_opts.opt_arg (); break; default: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index cdfc78c8ac8..3a4e7f1fa21 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -32,12 +32,12 @@ parse_args (int argc, char *argv[]) if (ior_count == 1) { - ior1_file = get_opts.optarg; + ior1_file = get_opts.opt_arg (); ++ior_count; } else if (ior_count == 2) { - ior2_file = get_opts.optarg; + ior2_file = get_opts.opt_arg (); ++ior_count; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index 53095e667a2..f0177e0af19 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -21,7 +21,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; default: ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index 1dc39b2df36..e981076e18b 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -21,7 +21,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; default: ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 86a6cc69e5b..5a88a5bb0cc 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -21,7 +21,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; default: ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 85b1c03a21c..12ba83e873a 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/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; default: ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 1a99d53e0f2..872b042472e 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -27,7 +27,7 @@ parse_args (int argc, char *argv[]) { case 'k': if (ior == 0) - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; default: ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index f3b08527929..5f1a1aac394 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -26,7 +26,7 @@ parse_args (int argc, char *argv[]) { case 'o': - ior_file = get_opts.optarg; + ior_file = get_opts.opt_arg (); break; default: diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index 67ecc0f5985..72d0eff0e95 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -21,7 +21,7 @@ parse_args (int argc, char *argv[]) case 'e': break; case 'f': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index b90dc3879b5..ee954a1172c 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -21,7 +21,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/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index e64d14733a2..d6082da0e8a 100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -86,7 +86,7 @@ Client::parse_args (int argc, switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 009f27951d7..1094e5f4c37 100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -36,7 +36,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/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 566e7060c23..13ad05417f5 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -19,10 +19,10 @@ parse_args (int argc, char *argv[]) switch (c) { case 'n': - ior1 = get_opts.optarg; + ior1 = get_opts.opt_arg (); break; case 'o': - ior2 = get_opts.optarg; + ior2 = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index 76c3f99f1d9..c2b2660d8fc 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -141,15 +141,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'n': - ior_output_file1 = get_opts.optarg; + ior_output_file1 = get_opts.opt_arg (); break; case 'o': - ior_output_file2 = get_opts.optarg; + ior_output_file2 = get_opts.opt_arg (); break; case 'b': - bands_file = get_opts.optarg; + bands_file = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index 1b21f8edc82..28c586f5857 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/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/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index a7a5637a71d..21af1d36fdb 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -90,7 +90,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/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index d5d56cc5d92..e4375ae41cd 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -20,13 +20,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 's': - ior1 = get_opts.optarg; + ior1 = get_opts.opt_arg (); break; case 'c': - ior2 = get_opts.optarg; + ior2 = get_opts.opt_arg (); break; case 'p': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%u", &protocol_type); if (result == 0 || result == EOF) diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index c2aba8d8213..f88ad59a419 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -64,15 +64,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 's': - ior_output_file1 = get_opts.optarg; + ior_output_file1 = get_opts.opt_arg (); break; case 'c': - ior_output_file2 = get_opts.optarg; + ior_output_file2 = get_opts.opt_arg (); break; case 'p': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%u", &protocol_type); if (result == 0 || result == EOF) diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp index 9ed5a011b1a..dcd58ff34b0 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp @@ -26,7 +26,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp index 924ea8c69de..3319ee9fae4 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp @@ -18,7 +18,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index ea30d8e4266..d0801d884c2 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -63,7 +63,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/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 556c5fa5b20..d60fc0fc5e3 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -26,11 +26,11 @@ parse_args (int argc, char **argv) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ::atoi (get_opts.optarg); + iterations = ::atoi (get_opts.opt_arg ()); break; case 'x': @@ -38,11 +38,11 @@ parse_args (int argc, char **argv) break; case 'p': - invocation_priorities_file = get_opts.optarg; + invocation_priorities_file = get_opts.opt_arg (); break; case 'b': - bands_file = get_opts.optarg; + bands_file = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 2f4a26e031b..38e267f9d49 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -84,11 +84,11 @@ parse_args (int argc, char **argv) switch (c) { case 'b': - bands_file = get_opts.optarg; + bands_file = get_opts.opt_arg (); break; case 'l': - lanes_file = get_opts.optarg; + lanes_file = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 8b2e6eb4110..e5f063ef5db 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -61,13 +61,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'n': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'o': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'a': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%hd", &priority1); if (result == 0 || result == EOF) @@ -76,7 +76,7 @@ parse_args (int argc, char *argv[]) -1); break; case 'b': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%hd", &priority2); if (result == 0 || result == EOF) @@ -85,7 +85,7 @@ parse_args (int argc, char *argv[]) -1); break; case 'e': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%u", &protocol1); if (result == 0 || result == EOF) @@ -94,7 +94,7 @@ parse_args (int argc, char *argv[]) -1); break; case 'f': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%u", &protocol2); if (result == 0 || result == EOF) diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 873bdf1165a..1c3c0ee9ad2 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -61,7 +61,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/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp index 3affdc5150b..d8de32f08be 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp @@ -18,11 +18,11 @@ parse_args (int argc, char **argv) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ::atoi (get_opts.optarg); + iterations = ::atoi (get_opts.opt_arg ()); break; case 'x': diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index c4bf7b418d1..f9a2ee4eaa5 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -81,15 +81,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'p': - persistent_ior = get_opts.optarg; + persistent_ior = get_opts.opt_arg (); break; case 't': - transient_ior = get_opts.optarg; + transient_ior = get_opts.opt_arg (); break; case 'd': - debug = ACE_OS::atoi (get_opts.optarg); + debug = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index 24688032808..23c6fd3679d 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -21,11 +21,11 @@ parse_args (int argc, char **argv) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ::atoi (get_opts.optarg); + iterations = ::atoi (get_opts.opt_arg ()); break; case 'x': diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 879aa6ccb6e..15504b7afaf 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -122,11 +122,11 @@ parse_args (int argc, char **argv) switch (c) { case 's': - ::server_priority = ::atoi (get_opts.optarg); + ::server_priority = ::atoi (get_opts.opt_arg ()); break; case 'c': - ::client_priority = ::atoi (get_opts.optarg); + ::client_priority = ::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index 9639177547a..940062c0f5b 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -17,10 +17,10 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior1 = get_opts.optarg; + ior1 = get_opts.opt_arg (); break; case 'p': - ior2 = get_opts.optarg; + ior2 = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 7b8d15d709b..69de99f823e 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -62,11 +62,11 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file1 = get_opts.optarg; + ior_output_file1 = get_opts.opt_arg (); break; case 'p': - ior_output_file2 = get_opts.optarg; + ior_output_file2 = get_opts.opt_arg (); break; case '?': diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index fdb42ab30ed..4acef208296 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -18,10 +18,10 @@ parse_args (int argc, char *argv[]) switch (c) { case 'p': - ior1 = get_opts.optarg; + ior1 = get_opts.opt_arg (); break; case 'o': - ior2 = get_opts.optarg; + ior2 = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 20fc89252ac..ffccc07a31f 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -92,15 +92,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'p': - ior_output_file1 = get_opts.optarg; + ior_output_file1 = get_opts.opt_arg (); break; case 'o': - ior_output_file2 = get_opts.optarg; + ior_output_file2 = get_opts.opt_arg (); break; case 'a': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%hd", &poa_priority); if (result == 0 || result == EOF) @@ -110,7 +110,7 @@ parse_args (int argc, char *argv[]) break; case 'b': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%hd", &object_priority); if (result == 0 || result == EOF) diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index dfd281c6433..c9e04b9131f 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -17,7 +17,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/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 7601a327a51..a5ab9ea5636 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -55,11 +55,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 'p': - result = ::sscanf (get_opts.optarg, + result = ::sscanf (get_opts.opt_arg (), "%u", &protocol_type); if (result == 0 || result == EOF) diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index 0bc45408f53..2415f06176f 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -25,11 +25,11 @@ parse_args (int argc, char *argv[]) break; case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 20645be64e4..192350c0c60 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -23,19 +23,19 @@ 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 's': - static_threads = ACE_OS::atoi (get_opts.optarg); + static_threads = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'd': - dynamic_threads = ACE_OS::atoi (get_opts.optarg); + dynamic_threads = ACE_OS::atoi (get_opts.opt_arg ()); break; case 't': - nap_time = ACE_OS::atoi (get_opts.optarg); + nap_time = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp index ea3ca82198a..97fd5efbe17 100644 --- a/TAO/tests/Reliable_Oneways/client.cpp +++ b/TAO/tests/Reliable_Oneways/client.cpp @@ -31,11 +31,11 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); + iterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'n': diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index 2475bfc8d22..0bff331018c 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -17,7 +17,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/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp index 5505a41b60b..d2fd0122245 100644 --- a/TAO/tests/Server_Leaks/client.cpp +++ b/TAO/tests/Server_Leaks/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 'x': diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index 47e9986ae9c..19117df1d8e 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -17,7 +17,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/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp index 68a1e72872c..edd0773c52f 100644 --- a/TAO/tests/Single_Read/client.cpp +++ b/TAO/tests/Single_Read/client.cpp @@ -30,13 +30,13 @@ parse_args (int argc, char **argv) switch (c) { case 'k': - IOR = get_opts.optarg; + IOR = get_opts.opt_arg (); break; case 'i': - iterations = ::atoi (get_opts.optarg); + iterations = ::atoi (get_opts.opt_arg ()); break; case 'd': - data_bytes = ::atoi (get_opts.optarg); + data_bytes = ::atoi (get_opts.opt_arg ()); break; case 'x': shutdown_server = 1; diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index 6607db33fdc..6f82d84ac69 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -17,7 +17,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/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index f019ad60a01..e155adea751 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -69,13 +69,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'i': - ior = ACE_OS::strdup (get_opts.optarg); + ior = ACE_OS::strdup (get_opts.opt_arg ()); break; case 'n': - niterations = ACE_OS::atoi (get_opts.optarg); + niterations = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'r': - register_smart_proxy = ACE_OS::atoi (get_opts.optarg); + register_smart_proxy = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index 9c6f0e15935..f029aefbd0d 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -82,7 +82,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = ACE_OS::strdup (get_opts.optarg); + ior_output_file = ACE_OS::strdup (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp index 701aa5e3d8e..38576ea7d60 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp @@ -34,7 +34,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'i': - ior = ACE_OS::strdup (get_opts.optarg); + ior = ACE_OS::strdup (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 8260da63128..aa8145b53ec 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -80,7 +80,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = ACE_OS::strdup (get_opts.optarg); + ior_output_file = ACE_OS::strdup (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp index 5c5c0f2211a..b9a9b71b233 100644 --- a/TAO/tests/Smart_Proxies/Policy/client.cpp +++ b/TAO/tests/Smart_Proxies/Policy/client.cpp @@ -36,13 +36,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'i': - ior1 = ACE_OS::strdup (get_opts.optarg); + ior1 = ACE_OS::strdup (get_opts.opt_arg ()); break; case 'j': - ior2 = ACE_OS::strdup (get_opts.optarg); + ior2 = ACE_OS::strdup (get_opts.opt_arg ()); break; case 'f': - one_shot_factory = ACE_OS::atoi (get_opts.optarg); + one_shot_factory = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 6c1780056d6..d83fffb74e9 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -80,7 +80,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = ACE_OS::strdup (get_opts.optarg); + ior_output_file = ACE_OS::strdup (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index caeee42c552..7a1936ab633 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -34,7 +34,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'i': - ior = ACE_OS::strdup (get_opts.optarg); + ior = ACE_OS::strdup (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index 71b28c0ecff..bf15eee2556 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -80,7 +80,7 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = ACE_OS::strdup (get_opts.optarg); + ior_output_file = ACE_OS::strdup (get_opts.opt_arg ()); break; case '?': default: diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index ad0a7a6378b..9886e27c16e 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/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 'x': server_shutdown = 1; diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp index 47dd25e76ed..589a59091aa 100644 --- a/TAO/tests/Strategies/server.cpp +++ b/TAO/tests/Strategies/server.cpp @@ -17,7 +17,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/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index ad3665fbd00..11765552378 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -62,27 +62,27 @@ parse_args (int argc, char **argv) break; case 'k': - IOR = get_opts.optarg; + IOR = get_opts.opt_arg (); break; case 'i': - iterations = ::atoi (get_opts.optarg); + iterations = ::atoi (get_opts.opt_arg ()); break; case 'd': - data_bytes = ::atoi (get_opts.optarg); + data_bytes = ::atoi (get_opts.opt_arg ()); break; case 't': - timeout = ::atoi (get_opts.optarg); + timeout = ::atoi (get_opts.opt_arg ()); break; case 'w': - work = ::atoi (get_opts.optarg); + work = ::atoi (get_opts.opt_arg ()); break; case 'z': - interval = ::atoi (get_opts.optarg); + interval = ::atoi (get_opts.opt_arg ()); break; case 'x': diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index 6607db33fdc..6f82d84ac69 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -17,7 +17,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/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index dc5416aceeb..4fc08c121d0 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -21,15 +21,15 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case 'l': - min_timeout = ACE_OS::atoi (get_opts.optarg); + min_timeout = ACE_OS::atoi (get_opts.opt_arg ()); break; case 'h': - max_timeout = ACE_OS::atoi (get_opts.optarg); + max_timeout = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp index c79786c701e..7678b8438b5 100644 --- a/TAO/tests/Timeout/server.cpp +++ b/TAO/tests/Timeout/server.cpp @@ -17,7 +17,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/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp index b81d13c6c98..58c06433cbd 100644 --- a/TAO/tests/Xt_Stopwatch/client.cpp +++ b/TAO/tests/Xt_Stopwatch/client.cpp @@ -90,7 +90,7 @@ Client::parse_args (int argc, switch (c) { case 'k': - ior = get_opts.optarg; + ior = get_opts.opt_arg (); break; case '?': default: diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp index 0086ad471bd..984aa6b5304 100644 --- a/TAO/tests/Xt_Stopwatch/server.cpp +++ b/TAO/tests/Xt_Stopwatch/server.cpp @@ -34,7 +34,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 '?': |