diff options
77 files changed, 212 insertions, 132 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7af2e53e6c2..2885f93e624 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,83 @@ +Tue Sep 16 11:25:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * utils/monitor/monitor_client.cpp: + * performance-tests/Anyop/anyop.cpp + * performance-tests/Callback/client.cpp + * performance-tests/Callback/server.cpp + * performance-tests/CSD_Strategy/TestApps/ClientApp.cpp + * performance-tests/CSD_Strategy/TestApps/ClientApp.h + * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp + * performance-tests/CSD_Strategy/TestApps/ServerApp.h + * performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp + * performance-tests/CSD_Strategy/TestInf/TestAppBase.h + * performance-tests/Cubit/TAO/DII_Cubit/client.cpp + * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp + * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp + * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp + * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp + * performance-tests/Latency/AMH_Single_Threaded/client.cpp + * performance-tests/Latency/AMH_Single_Threaded/server.cpp + * performance-tests/Latency/AMI/client.cpp + * performance-tests/Latency/AMI/server.cpp + * performance-tests/Latency/Collocation/Collocated_Test.cpp + * performance-tests/Latency/Deferred/client.cpp + * performance-tests/Latency/Deferred/server.cpp + * performance-tests/Latency/DII/client.cpp + * performance-tests/Latency/DII/server.cpp + * performance-tests/Latency/DSI/client.cpp + * performance-tests/Latency/DSI/server.cpp + * performance-tests/Latency/Single_Threaded/client.cpp + * performance-tests/Latency/Single_Threaded/server.cpp + * performance-tests/Latency/Thread_Per_Connection/client.cpp + * performance-tests/Latency/Thread_Per_Connection/server.cpp + * performance-tests/Latency/Thread_Pool/client.cpp + * performance-tests/Latency/Thread_Pool/server.cpp + * performance-tests/Memory/IORsize/client.cpp + * performance-tests/Memory/IORsize/server.cpp + * performance-tests/Memory/Single_Threaded/client.cpp + * performance-tests/Memory/Single_Threaded/server.cpp + * performance-tests/Pluggable/PP_Test_Client.cpp + * performance-tests/Pluggable/PP_Test_Server.cpp + * performance-tests/POA/Create_Reference/create_reference.cpp + * performance-tests/POA/Demux/demux_stats.cpp + * performance-tests/POA/Demux/demux_test_client.cpp + * performance-tests/POA/Demux/demux_test_server.cpp + * performance-tests/POA/Implicit_Activation/client.cpp + * performance-tests/POA/Implicit_Activation/collocated.cpp + * performance-tests/POA/Implicit_Activation/server.cpp + * performance-tests/POA/Object_Creation_And_Registration/registration.cpp + * performance-tests/Protocols/distributor.cpp + * performance-tests/Protocols/receiver.cpp + * performance-tests/Protocols/sender.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp + * performance-tests/RTCorba/Oneways/Reliable/client.cpp + * performance-tests/RTCorba/Oneways/Reliable/server.cpp + * performance-tests/RTCorba/Thread_Pool/client.cpp + * performance-tests/RTCorba/Thread_Pool/server.cpp + * performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp + * performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp + * performance-tests/Sequence_Latency/AMI/client.cpp + * performance-tests/Sequence_Latency/AMI/server.cpp + * performance-tests/Sequence_Latency/Deferred/client.cpp + * performance-tests/Sequence_Latency/Deferred/server.cpp + * performance-tests/Sequence_Latency/DII/client.cpp + * performance-tests/Sequence_Latency/DII/server.cpp + * performance-tests/Sequence_Latency/DSI/client.cpp + * performance-tests/Sequence_Latency/DSI/server.cpp + * performance-tests/Sequence_Latency/Single_Threaded/client.cpp + * performance-tests/Sequence_Latency/Single_Threaded/server.cpp + * performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp + * performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp + * performance-tests/Sequence_Latency/Thread_Pool/client.cpp + * performance-tests/Sequence_Latency/Thread_Pool/server.cpp + * performance-tests/Throughput/client.cpp + * performance-tests/Throughput/server.cpp + ACE_TCHAR changes + Tue Sep 16 11:06:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * examples/AMH/Sink_Server/AMH_Servant.cpp diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp index d103eecb0b2..0f9be8b5200 100644 --- a/TAO/performance-tests/Anyop/anyop.cpp +++ b/TAO/performance-tests/Anyop/anyop.cpp @@ -52,7 +52,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - ACE_Get_Opt get_opt (argc, argv, "dien:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dien:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp index 423866c5fb6..9ff54a057a7 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp @@ -78,11 +78,11 @@ ClientApp::cleanup() int -ClientApp::parse_args(int argc, char* argv[]) +ClientApp::parse_args(int argc, ACE_TCHAR* argv[]) { this->exe_name_ = argv[0]; - ACE_Get_Opt get_opts(argc, argv, "i:n:l:"); + ACE_Get_Opt get_opts(argc, argv, ACE_TEXT("i:n:l:")); int c; diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h index 7b211e03de0..c7b7eee2f69 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h @@ -40,7 +40,7 @@ class ClientApp : public TestAppBase void cleanup(); // Helper methods used by the methods above. - int parse_args(int argc, char* argv[]); + int parse_args(int argc, ACE_TCHAR* argv[]); int set_arg(unsigned& value, const char* arg, diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp index 5d7a63b0f9e..f85cc11482b 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp @@ -205,11 +205,11 @@ ServerApp::cleanup() int -ServerApp::parse_args(int argc, char* argv[]) +ServerApp::parse_args(int argc, ACE_TCHAR* argv[]) { this->exe_name_ = argv[0]; - ACE_Get_Opt get_opts(argc, argv, "p:s:n:t:r:c:l:u:x:z:"); + ACE_Get_Opt get_opts(argc, argv, ACE_TEXT("p:s:n:t:r:c:l:u:x:z:")); int c; diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h index 8082e5bc14a..26e4884936c 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h @@ -50,7 +50,7 @@ class ServerApp : public TestAppBase // Helper methods used by the methods above. - int parse_args(int argc, char* argv[]); + int parse_args(int argc, ACE_TCHAR* argv[]); int set_arg(unsigned& value, const char* arg, diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp index 8f264fbb111..0f89412cbc0 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp @@ -20,7 +20,7 @@ TestAppBase::name() const int -TestAppBase::run(int argc, char* argv[]) +TestAppBase::run(int argc, ACE_TCHAR* argv[]) { int rc = this->run_i(argc, argv); diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h index b19cfed2f0d..bfd5e6a28f1 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h @@ -15,7 +15,7 @@ class CSD_PT_TestInf_Export TestAppBase virtual ~TestAppBase(); // Returns 0 for success, and -1 for failure. - int run(int argc, char* argv[]); + int run(int argc, ACE_TCHAR* argv[]); const char* name() const; diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index f7544879d73..4805bfbf072 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -22,7 +22,7 @@ int do_dump_history = 0; const char *ior = "file://server.ior"; /// Parse the arguments. -static int parse_args (int argc, char *argv[]); +static int parse_args (int argc, ACE_TCHAR *argv[]); /// Send events in another thread class Task : public ACE_Task_Base @@ -190,9 +190,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hi:k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp index d08189aca93..71550d5a561 100644 --- a/TAO/performance-tests/Callback/server.cpp +++ b/TAO/performance-tests/Callback/server.cpp @@ -14,7 +14,7 @@ ACE_RCSID(Callback, server, "$Id$") const char *ior_file_name = "test.ior"; /// Parse the arguments. -static int parse_args (int argc, char *argv[]); +static int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -123,9 +123,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index 7bf2baed2db..79830e64f1d 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -252,7 +252,7 @@ DII_Cubit_Client::init (int argc, ACE_TCHAR **argv) int DII_Cubit_Client::parse_args (void) { - ACE_Get_Opt opts (argc_, argv_, "dn:i:f:x"); + ACE_Get_Opt opts (argc_, argv_, ACE_TEXT("dn:i:f:x")); int c; int result; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index 6ffffc010c1..e8009382f0d 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -216,7 +216,7 @@ Cubit_Client::read_ior (const char *filename) int Cubit_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "b:t:z:ovdn:f:k:xsq"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("b:t:z:ovdn:f:k:xsq")); int c = 0; int result = 0; u_int test_mask = 0; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp index c6c491c2911..ae6e7d748d1 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp @@ -20,7 +20,7 @@ Cubit_Server::Cubit_Server (void) int Cubit_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp index 5c41ad53d0e..a485e2bfdf3 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -71,7 +71,7 @@ svr_worker (void *arg) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "s:c:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("s:c:")); int c = -1; const char *client_cmd = 0; diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp index 305e5a8dc33..a570eb81a27 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp @@ -24,9 +24,9 @@ Globals::Globals (void) } int -Globals::parse_args (int argc, char *argv[]) +Globals::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "e:t:f:rm"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("e:t:f:rm")); int c; while ((c = opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index c797e5fa43d..d01ed715d17 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -55,7 +55,7 @@ Task_State::Task_State (void) int Task_State::parse_args (int argc,char *argv[]) { - ACE_Get_Opt opts (argc, argv, "mu:n:t:d:rxof:g:1cl"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("mu:n:t:d:rxof:g:1cl")); int c; while ((c = opts ()) != -1) diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp index cea362569c4..980330ff75b 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp @@ -19,9 +19,9 @@ int do_dump_history = 0; int do_shutdown = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp index d0803e32f7f..4ccd5902b60 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Single_Threaded_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index 5b9dabde0ec..5be734b10f3 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -18,9 +18,9 @@ ACE_hrtime_t throughput_base; int niterations = 1000; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp index 44cddc75a6a..e3b6e18b89c 100644 --- a/TAO/performance-tests/Latency/AMI/server.cpp +++ b/TAO/performance-tests/Latency/AMI/server.cpp @@ -14,9 +14,9 @@ const char *ior_output_file = "test.ior"; int nthreads = 4; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp index 3318a9fc138..72527c74b41 100644 --- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp +++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp @@ -12,9 +12,9 @@ int niterations = 250000; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index 80e2f9d9bed..d7a652e2f12 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -23,9 +23,9 @@ int do_dump_history = 0; int do_shutdown = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index d0803e32f7f..4ccd5902b60 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Single_Threaded_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index 6e6479e6197..b16a1bd330f 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -19,9 +19,9 @@ int do_dump_history = 0; int do_shutdown = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp index d99326001f1..10d65aeac09 100644 --- a/TAO/performance-tests/Latency/DSI/server.cpp +++ b/TAO/performance-tests/Latency/DSI/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(DSI_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index a676ab99fcb..ca350bdd960 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -29,9 +29,9 @@ int do_shutdown = 1; int do_dump_history = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:b:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index d0803e32f7f..4ccd5902b60 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Single_Threaded_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp index cea362569c4..980330ff75b 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp @@ -19,9 +19,9 @@ int do_dump_history = 0; int do_shutdown = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index 739ebc14c67..6bbfc51c918 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Single_Threaded_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp index 5a6380fd2ca..3c0113f176f 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp @@ -17,9 +17,9 @@ int niterations = 1000; int do_shutdown = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("xk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 98777ac9605..11d99a87a84 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp index 0d6d489b68d..7dbde20c78d 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp @@ -17,9 +17,9 @@ int niterations = 1000; int do_shutdown = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("xk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index 469c7b48352..a562957489b 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -13,9 +13,9 @@ ACE_RCSID(Thread_Pool_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp index 16fcbb1c59c..320cb4595a6 100644 --- a/TAO/performance-tests/Memory/IORsize/client.cpp +++ b/TAO/performance-tests/Memory/IORsize/client.cpp @@ -10,9 +10,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; static int n = 10; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp index e80dfc28753..51471891b09 100644 --- a/TAO/performance-tests/Memory/IORsize/server.cpp +++ b/TAO/performance-tests/Memory/IORsize/server.cpp @@ -11,9 +11,9 @@ ACE_RCSID (Hello, const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp index 3a5bd7a3f1d..90a844a4224 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp @@ -8,9 +8,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; static int n = 100; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp index e80dfc28753..51471891b09 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp @@ -11,9 +11,9 @@ ACE_RCSID (Hello, const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 70f6b9822ce..bc70ea33275 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -19,9 +19,9 @@ int do_dump_history = 0; ACE_UINT32 gsf; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hi:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp index 6dc1ac1c948..46816b75a80 100644 --- a/TAO/performance-tests/POA/Demux/demux_stats.cpp +++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp @@ -46,7 +46,7 @@ int Demux_Stats::parse_args (int argc_, char * argv_ []) { - ACE_Get_Opt get_opts (argc_, argv_, "i:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("i:")); int c; iterations = 0; diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index 9992b8cfabc..15d9ff96182 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -133,7 +133,7 @@ int Demux_Test_Client::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:"); + ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:m:n:o:p:i:s:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 093e9587c30..91a92aed546 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -332,7 +332,7 @@ int Demux_Test_Server::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:o:p:ut"); + ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:o:p:ut")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index c980abefec2..cded8e0a68d 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -16,9 +16,9 @@ int do_dump_history = 0; int do_shutdown = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 95334b5ff93..1ebe294a825 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -15,9 +15,9 @@ int niterations = 10000; int do_dump_history = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hi:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 758035423a4..92f253acdf6 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -11,9 +11,9 @@ ACE_RCSID(Activation, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index b1e42a3efb3..5773846e15b 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -80,7 +80,7 @@ static u_long iterations = 1000; static int parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "i:r"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:r")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp index aca94dff778..cc7d8f3ba94 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp @@ -109,7 +109,7 @@ PP_Test_Client::read_ior (char *filename) int PP_Test_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "ovdn:f:k:x"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("ovdn:f:k:x")); int c; int result; diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp index bdffc79c844..bed8fb72d53 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp @@ -15,7 +15,7 @@ PP_Test_Server::PP_Test_Server (void) int PP_Test_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "do:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp index a7abff92b8d..d57082b9d85 100644 --- a/TAO/performance-tests/Protocols/distributor.cpp +++ b/TAO/performance-tests/Protocols/distributor.cpp @@ -17,7 +17,7 @@ static int number_of_connection_attempts = 20; static int parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp index 880a77a0646..565ea6bb5c4 100644 --- a/TAO/performance-tests/Protocols/receiver.cpp +++ b/TAO/performance-tests/Protocols/receiver.cpp @@ -19,7 +19,7 @@ static ACE_UINT32 gsf = 0; static int parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "d:f:m:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:f:m:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp index 3c6c758f08f..0a9c1920586 100644 --- a/TAO/performance-tests/Protocols/sender.cpp +++ b/TAO/performance-tests/Protocols/sender.cpp @@ -47,7 +47,7 @@ static Test_Type test_type = PACED; static int parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:b:c:d:e:i:k:m:p:r:s:t:x:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index e851ceb2a00..f5806540f76 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -74,9 +74,9 @@ Client client[MAX_THREADS]; int priorities[MAX_THREADS]; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:t:n:p:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index 925a9ace664..6b39f46796d 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -50,9 +50,9 @@ int priorities[MAX_THREADS]; const char *ior_output_file_base = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:t:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:t:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index 629fc49689a..dc7756f8c37 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -74,9 +74,9 @@ Client client[MAX_THREADS]; int priorities[MAX_THREADS]; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:t:n:p:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index beb08bf7d6e..61468fcd369 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -9,9 +9,9 @@ const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index ecff5af4157..d2405d1d336 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -269,9 +269,9 @@ oneway_payload_test (Test_ptr server) } static int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ps:k:i:t:l:m:w:x"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ps:k:i:t:l:m:w:x")); int error = 0; int c; diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index 6e274a9de6e..78c236d22fd 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Reliable, server, "$Id$") static const char *ior_output_file = "test.ior"; static int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index 7a7747e763a..b4e4d9414cd 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -63,7 +63,7 @@ struct Synchronizers }; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "c:e:g:hi:k:m:p:q:r:t:u:v:w:x:y:z:" //client options diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index ad57949ee7b..0ca347da806 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -79,7 +79,7 @@ static const char *bands_file = "empty-file"; static const char *lanes_file = "empty-file"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "b:f:hl:n:o:s:" // server options diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index adaadd5c793..e1f3db1576d 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -22,9 +22,9 @@ int sz = 512; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:s:hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp index d0803e32f7f..4ccd5902b60 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Single_Threaded_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index c47babb3c76..78e20aaa282 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -26,9 +26,9 @@ int sz = 512; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:k:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:s:k:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp index 44cddc75a6a..e3b6e18b89c 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp @@ -14,9 +14,9 @@ const char *ior_output_file = "test.ior"; int nthreads = 4; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp index 533dc3c4876..c83839f8a1e 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp @@ -29,9 +29,9 @@ int sz = 512; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:s:hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp index b59f0b53be0..0be15aa462c 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(DII_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index 12cd430644d..b1ced26606e 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -24,9 +24,9 @@ int sz = 512; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:s:hxk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp index d99326001f1..10d65aeac09 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(DSI_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index 84605cd11b8..12355fe7c79 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -31,9 +31,9 @@ int sz = 512; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:b:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:s:hxk:i:b:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp index 2965512d67e..af291b4f3da 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Deferred_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp index 3b0026e7d57..71ea56df8f6 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp @@ -22,9 +22,9 @@ int do_shutdown = 1; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ht:xs:k:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ht:xs:k:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index 4d7e97a480b..e9632f37297 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Single_Threaded_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp index 5387cdca495..21fe0aba4d7 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp @@ -20,9 +20,9 @@ int sz = 512; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:s:xk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 98777ac9605..11d99a87a84 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp index 72a5d60e363..b3ed31d711b 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp @@ -20,9 +20,9 @@ int sz = 512; const char *data_type = "octet"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:s:xk:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 8c91e305ae9..9a62b97c50b 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -13,9 +13,9 @@ ACE_RCSID(Thread_Pool_Latency, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp index b3a236f2897..e76206696ce 100644 --- a/TAO/performance-tests/Throughput/client.cpp +++ b/TAO/performance-tests/Throughput/client.cpp @@ -14,9 +14,9 @@ int test_runs = 6; int do_shutdown = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:b:i:n:x"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:b:i:n:x")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index 73582407879..5c80d2ce99b 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -9,9 +9,9 @@ ACE_RCSID(Throughput, server, "$Id$") const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/utils/monitor/monitor_client.cpp b/TAO/utils/monitor/monitor_client.cpp index 7a5e1747158..a8310af053d 100644 --- a/TAO/utils/monitor/monitor_client.cpp +++ b/TAO/utils/monitor/monitor_client.cpp @@ -17,7 +17,7 @@ const ACE_TCHAR * filter = ACE_TEXT (""); int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:p:ci:s:f:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:p:ci:s:f:")); int c; while ((c = get_opts ()) != -1) |