diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-03 21:44:49 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-03 21:44:49 +0000 |
| commit | 15f007d040533121edc7bd0f72a76bc9fa3b0105 (patch) | |
| tree | 18bd99d1b54c196ed01bc69146a0763112964996 | |
| parent | 66994f6920f0dbf1771fd08eacc4b8e11d3fb3c8 (diff) | |
| download | ATCD-15f007d040533121edc7bd0f72a76bc9fa3b0105.tar.gz | |
More of Daves ACE_USES_WCHAR fixes
150 files changed, 278 insertions, 318 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index 940a5ffc754..de5a4a6b40f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -113,8 +113,7 @@ Distributer::connection_manager (void) } int -Distributer::parse_args (int argc, - char **argv) +Distributer::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:a:"); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index 0b01546ce30..f78dd9cb96d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -143,8 +143,7 @@ Receiver::init (int, } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse the command line arguments ACE_Get_Arg_Opt<char> opts (argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index 91bf5332118..0da39936aff 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -54,8 +54,7 @@ Sender::Sender (void) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:da:"); @@ -292,7 +291,7 @@ Sender::connection_manager (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index e87500b2dad..1c27e3cf8a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -160,8 +160,7 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); @@ -270,7 +269,7 @@ Receiver::input_file (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 142781f1fcf..7a471f63f27 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -128,8 +128,7 @@ Sender::shutdown (void) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); @@ -428,7 +427,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index daea563557d..76531078f4e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -268,8 +268,7 @@ Distributer::connection_manager (void) } int -Distributer::parse_args (int argc, - char **argv) +Distributer::parse_args (int argc, char **argv) { /// Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:"); @@ -428,7 +427,7 @@ Distributer::done (int done) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -437,7 +436,7 @@ ACE_TMAIN (int argc, { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv() + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index da29c273573..d139e6f50f1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -223,8 +223,7 @@ Receiver::init (int, } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { /// Parse the command line arguments ACE_Get_Arg_Opt<char> opts (argc, @@ -287,7 +286,7 @@ Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -346,8 +345,7 @@ ACE_TMAIN (int argc, "File Opened Successfully\n")); result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index 79ecadec518..7170838c7c6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -174,8 +174,7 @@ Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { /// Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:d"); @@ -454,7 +453,7 @@ Sender::connection_manager (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 5a8ff5b4627..012d651f7ea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -102,8 +102,7 @@ FTP_Client_Producer::get_callback (const char *, } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:s"); @@ -344,7 +343,7 @@ Client::run (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp index 4f544812221..98f9d5798b0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -102,7 +102,7 @@ Server::format (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -222,7 +222,7 @@ Server::file (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 380c9b1774d..dbb3112476b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -87,7 +87,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index c57ded23318..0b4fbcddc1c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -103,7 +103,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index ce98aa717a2..20abc49fe83 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -120,7 +120,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index c9cbcd7b9ee..d0fd2ce12e1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -219,12 +219,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Arg_Opt<char> opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -246,7 +244,7 @@ parse_args (int argc, int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -285,8 +283,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index b2799fc2b65..c1704ef8157 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -91,8 +91,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); @@ -373,7 +372,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 38bdfb997c1..69b09769a0a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -124,8 +124,7 @@ Endpoint_Reactive_Strategy::make_stream_endpoint (FTP_Client_StreamEndPoint *&en } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:s"); @@ -348,7 +347,7 @@ Client::run (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -369,7 +368,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; int result = 0; - result = CLIENT::instance ()->init (argc,argv); + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index c9566d018d3..0f235cfb35e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -64,7 +64,7 @@ Server::Server (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -197,13 +197,12 @@ Server::file (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); int result = 0; - CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv() - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 1e16153adef..42b8f4db5be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -100,8 +100,7 @@ FTP_Client_Producer::get_callback (const char *, } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:sd"); @@ -383,7 +382,7 @@ Client::run (void) int ACE_TMAIN (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp index 01a9012853c..f554ad095ca 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp @@ -117,7 +117,7 @@ Server::format (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -244,7 +244,7 @@ Server::file (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index e9e53416379..81365243708 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -140,8 +140,7 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); @@ -231,7 +230,7 @@ Receiver::protocol_object (void) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 4fa62e6b4ff..e987cbab9be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -71,8 +71,7 @@ Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); @@ -369,7 +368,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index c75f52bae29..4639308b102 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -59,8 +59,7 @@ Client::set_protocol_object (TAO_AV_Protocol_Object *object) } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:r:sd"); @@ -417,7 +416,7 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp index 15e7e37e3cd..489181ade03 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp @@ -116,11 +116,9 @@ Server::init (int, int parse_args (int argc, - char **argv) + char **argv) { - ACE_Get_Arg_Opt<char> opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -142,7 +140,7 @@ parse_args (int argc, int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -156,8 +154,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index 4e44528adeb..0cf85d02a7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -140,12 +140,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Arg_Opt<char> opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -167,7 +165,7 @@ parse_args (int argc, int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -208,8 +206,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; @@ -229,8 +226,7 @@ ACE_TMAIN (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index ace05ebf11a..d67fc2ad4cc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -55,8 +55,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); @@ -345,7 +344,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 25d04bffff7..6b9590bd82d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -304,7 +304,7 @@ Distributer::done (int done) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp index d25258a58e8..3f9c8325208 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -141,12 +141,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Arg_Opt<char> opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -168,7 +166,7 @@ parse_args (int argc, int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -207,8 +205,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 5a0639b644e..69dd9016e78 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -86,8 +86,7 @@ Sender::streamctrl (AVStreams::StreamCtrl_ptr streamctrl) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); @@ -320,7 +319,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index ce367684fb2..73bb93f73b6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -205,12 +205,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Arg_Opt<char> opts (argc, - argv, - "f:s:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:"); int c; while ((c = opts ()) != -1) @@ -235,7 +233,7 @@ parse_args (int argc, int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -274,8 +272,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index b14fd6aa992..593430ec374 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -63,8 +63,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:dl:a:s:b:"); @@ -436,7 +435,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index 1788316edcf..0c9727ea0e7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -144,12 +144,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Arg_Opt<char> opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -171,7 +169,7 @@ parse_args (int argc, int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -210,8 +208,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 3a3b9d9b79e..8479b4394e6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -89,8 +89,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:l:a:d"); @@ -507,7 +506,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp index caf397dfb63..8420fd00355 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp @@ -16,7 +16,7 @@ int ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ; + CORBA::ORB_var orb = CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER ) ; ACE_TRY_CHECK; ACE_TRY_EX (nested) diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index 01545dc26f4..eb9a7b96371 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -3,6 +3,7 @@ #include "tao/IFR_Client/IFR_BasicC.h" #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN(int argc, ACE_TCHAR** argv) { diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp index c1975ec0bdc..00158e34bac 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp @@ -47,7 +47,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index acebec4212e..161cdd36fdb 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -62,7 +62,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_i server_impl (orb.in ()); diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp index 037ee900a4e..a95dc8ad9db 100755 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp @@ -84,7 +84,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // ep1 is equivalent to no other IORs - it is not an IOGR, and ep2 is a different endpoint. diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index 14e3a9e64f9..cb7497ab800 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -77,7 +77,7 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Argv_Type_Converter convert (argc, argv); @@ -93,7 +93,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -140,7 +140,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -574,7 +574,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp index e1ded5333ac..2ad430ca788 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp @@ -50,7 +50,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_CHECK; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index fc6f9a4a29b..01c983a1320 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -26,7 +26,7 @@ CORBA::Object_var object_secondary = 0; // Reference to the IOR manipulator int -parse_args (int argc, ACE_TCHAR* argv[]) +parse_args (int argc, char* argv[]) { ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:g:h:"); int c; @@ -87,7 +87,7 @@ ACE_TMAIN (int argc, ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -125,7 +125,7 @@ Manager::init (int& argc, char**& argv ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -390,8 +390,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -488,7 +488,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index 79c4a1acac6..7505a81493f 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -71,7 +71,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_CHECK; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 8c37d9ff2bc..b16a79ac00e 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -29,7 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Argv_Type_Converter convert (argc, argv); Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -47,13 +47,13 @@ Driver::Driver (void) // **************************************************************** int -Driver::run (int argc, ACE_TCHAR* argv[]) +Driver::run (int argc, char* argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 0a5986b69e3..f1f0225126d 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -33,13 +33,13 @@ ECMS_Driver::ECMS_Driver (void) // **************************************************************** int -ECMS_Driver::run (int argc, ACE_TCHAR* argv[]) +ECMS_Driver::run (int argc, char* argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -528,5 +528,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Argv_Type_Converter convert (argc, argv); ECMS_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 0fe80eb5f21..c5eb14c556d 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -91,7 +91,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the // -ORB options from the command line. - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-m udp_mcast_addr]\n")); diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 1fd45694260..496e9a257da 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -39,13 +39,13 @@ ECM_Driver::ECM_Driver (void) } int -ECM_Driver::run (int argc, ACE_TCHAR* argv[]) +ECM_Driver::run (int argc, char* argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->orb_ = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -1158,5 +1158,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) TAO_EC_Default_Factory::init_svcs (); ECM_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 1d05d10df86..ff62ad6dd1b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -126,13 +126,13 @@ print_priority_info (const char *const name) } int -Test_ECG::run (int argc, ACE_TCHAR* argv[]) +Test_ECG::run (int argc, char* argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -1608,7 +1608,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Test_ECG, -1); - const int status = test->run (argc, argv); + const int status = test->run (convert.get_argc(), convert.get_ASCII_argv()); delete test; return status; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 3aae2e7971c..50de18a26e4 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -27,7 +27,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Argv_Type_Converter convert (argc, argv); ECT_Consumer_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -48,13 +48,13 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void) } int -ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[]) +ECT_Consumer_Driver::run (int argc, char* argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->orb_ = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 04ecdd2d427..65e8abf658c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -27,7 +27,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Argv_Type_Converter convert (argc, argv); ECT_Supplier_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -55,13 +55,13 @@ ECT_Supplier_Driver::shutdown_consumer (void* } int -ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[]) +ECT_Supplier_Driver::run (int argc, char* argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 3411225d7c3..f0552072ff8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -34,7 +34,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) TAO_EC_Default_Factory::init_svcs (); ECT_Throughput driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -64,7 +64,7 @@ ECT_Throughput::~ECT_Throughput (void) } int -ECT_Throughput::run (int argc, ACE_TCHAR* argv[]) +ECT_Throughput::run (int argc, char* argv[]) { ACE_TRY_NEW_ENV { @@ -73,7 +73,7 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[]) ACE_High_Res_Timer::calibrate (); this->orb_ = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 2be96beeb0b..8c2c427ff0f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -31,9 +31,9 @@ EC_BCast::EC_BCast (void) } int -EC_BCast::parse_args (int& argc, ACE_TCHAR* argv[]) +EC_BCast::parse_args (int& argc, char **argv) { - if (this->EC_Driver::parse_args (argc, argv) != 0) + if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; ACE_TArg_Shifter< char > arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 23a345637f9..a20a0fcb21d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -43,7 +43,7 @@ EC_Master::~EC_Master (void) } int -EC_Master::run (int argc, ACE_TCHAR* argv[]) +EC_Master::run (int argc, char* argv[]) { ACE_TRY_NEW_ENV { @@ -56,7 +56,7 @@ EC_Master::run (int argc, ACE_TCHAR* argv[]) this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (this->parse_args (argc, argv)) + if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv())) return 1; ACE_DEBUG ((LM_DEBUG, @@ -195,7 +195,7 @@ EC_Master::initialize_orb_and_poa (int &argc, ACE_TCHAR* argv[] } int -EC_Master::parse_args (int &argc, ACE_TCHAR *argv[]) +EC_Master::parse_args (int &argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); @@ -262,7 +262,7 @@ EC_Observer::initialize_orb_and_poa (int&, char*[] int EC_Observer::parse_args (int& argc, ACE_TCHAR* argv[]) { - return this->EC_Driver::parse_args (argc, argv); + return this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()); } void diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 41b34dc0cb7..54f72265323 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -33,7 +33,7 @@ EC_Reconnect::EC_Reconnect (void) int EC_Reconnect::parse_args (int& argc, char* argv[]) { - if (this->EC_Driver::parse_args (argc, argv) != 0) + if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; ACE_Get_Arg_Opt<char> get_opt (argc, argv, "scd:"); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 3d4428604fa..9fb285b1fbc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "ace/Argv_Type_Converter.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer @@ -148,7 +149,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "", ACE_TRY_ENV); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp index 2008a8f43aa..6b02f5b9bea 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp @@ -9,7 +9,7 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv) ACE_Argv_Type_Converter convert (argc, argv); Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index 75bcc997221..314be258b0f 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" void send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer @@ -66,7 +67,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index a6f19e831e8..1876d3e0643 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -116,7 +116,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index f4a4aa22191..65c779140f2 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -55,7 +55,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index f0687da7ca1..c7c7ddc57d3 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -612,7 +612,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp index a70e980c9e5..f6f1bf18f7d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Gateway_EC.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR ** argv) @@ -9,7 +10,7 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv) Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index de2b83a9be7..2517e97aaf6 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -38,7 +38,7 @@ EC_Connect::execute_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) int EC_Connect::parse_args (int& argc, ACE_TCHAR* argv[]) { - if (this->EC_Driver::parse_args (argc, argv) != 0) + if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; ACE_TArg_Shifter< char > arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index ee2a38c9550..2af3d306bdb 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -30,7 +30,7 @@ EC_Inversion::EC_Inversion (void) } int -EC_Inversion::parse_args (int &argc, ACE_TCHAR *argv[]) +EC_Inversion::parse_args (int &argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); @@ -50,7 +50,7 @@ EC_Inversion::parse_args (int &argc, ACE_TCHAR *argv[]) } } - int r = this->EC_Driver::parse_args (argc, argv); + int r = this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) " diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index f349bda6317..442b885dda4 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -107,7 +107,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the event channel object reference diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 34fe2adf017..2ee08132c40 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -106,7 +106,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 045c106dc51..29734c4722c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -29,7 +29,7 @@ EC_Throughput::EC_Throughput (void) int EC_Throughput::parse_args (int& argc, ACE_TCHAR* argv[]) { - if (this->EC_Driver::parse_args (argc, argv) != 0) + if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; return 0; } diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index d0bd0fbd9ad..17a7430c38b 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -98,7 +98,7 @@ EC_Driver::run_init (int &argc, char* argv[] this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (this->parse_args (argc, argv)) + if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv())) ACE_THROW (CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO)); @@ -175,7 +175,7 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[] ACE_ENV_ARG_DECL) { this->orb_ = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 18dd45040a5..7422dedd82e 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -531,7 +531,7 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL) else { ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** " - ACE_SIZE_T_FORMAT_SPECIFIER_A + ACE_SIZE_T_FORMAT_SPECIFIER "\n", this->replica_pos_); } return result; diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index d78eaefc3d0..a7d01ca3c28 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -266,7 +266,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); ACE_TRY_CHECK; FTAPP::FT_Creator app; - result = app.parse_args(argc, argv); + result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { result = app.init (orb.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 2a549b6aaa7..f338e079ecc 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -19,7 +19,7 @@ public: virtual ~TAO_FT_ReplicationManagerController (); int init (int & argc, char * argv[]); - int parse_args (int & argc, ACE_TCHAR* argv[]); + int parse_args (int & argc, char* argv[]); int run (); ///////////////////////////// @@ -64,7 +64,7 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[]) ACE_TRY_NEW_ENV { // Initialize the ORB. - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 1c353279d4d..b6723974f22 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -45,13 +45,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv() - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Start out with the first IOR. Interaction with the second diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index e8df2d7a75c..574eaa0b00a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -161,7 +161,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::PolicyList policies; // Empty policy list. diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 5c221ea3c6c..3d43e3df4e3 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -61,7 +61,7 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Argv_Type_Converter convert (argc, argv); @@ -72,13 +72,12 @@ ACE_TMAIN (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -122,7 +121,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -313,7 +312,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index e39052d061b..e0e15132f9f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_CHECK; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index f8fdc99dcd7..f82c5a2b8fa 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -26,7 +26,7 @@ RtecEventChannelAdmin::EventChannel_ptr get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) { FtRtecEventChannelAdmin::EventChannel_var channel; - ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT("hi:nt:?")); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "hi:nt:?"); int opt; int use_gateway = 1; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 1529eedfbe3..6d45e1334b1 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -188,7 +188,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_OS::socket_init (); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 2f89867c7a0..2e841274430 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_OS::socket_init (); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index b26c359c383..b66c6231b1d 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -185,7 +185,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // We reuse the object_var smart pointer! diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index 62ae9c7c4c2..48603e5a34f 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -105,7 +105,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index 5a2d41c7106..6f03849ab56 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -103,7 +103,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i *server_impl = new Simple_Server_i (orb.in (), diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index 8849f10f9e2..95ed75b3959 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -4,6 +4,7 @@ #include "tests/test_config.h" #include <ace/Get_Opt.h> +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -50,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index 9f22ccfc584..aba9078d949 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -94,7 +94,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //-------- Prepare Servant - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp index aa2c5d2048d..209879f40fd 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ior_mcast_client_i.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp index e636f637c7c..80087193f30 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp @@ -24,7 +24,7 @@ ior_mcast_Client_i::init (int& argc, { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp index 376d275c022..8789dca767f 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "server_i.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index b0e070930f9..751ff4dd604 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -71,7 +71,7 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL) ACE_TRY { // Initialize the ORB - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Save pointers to the command line arguments diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 4706cf0304d..ebc5e2bdeb9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -118,7 +118,7 @@ Nestea_i::save_data (void) ACE_FILE_Connector connector; if (connector.connect (file, - ACE_FILE_Addr (this->data_filename_), + ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)), 0, ACE_Addr::sap_any) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -144,7 +144,7 @@ Nestea_i::load_data (void) ACE_FILE_Connector connector; if (connector.connect (file, - ACE_FILE_Addr (this->data_filename_), + ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)), 0, ACE_Addr::sap_any) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index bad1e708409..75e00da0cdb 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -97,7 +97,7 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL) ACE_TRY { // Initialize the ORB - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Save pointers to the command line arguments diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp index ee02f7a96d7..793cec1dfe7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp @@ -4,6 +4,7 @@ #include "testC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" using namespace CORBA; @@ -14,7 +15,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) ACE_TRY_NEW_ENV { - ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp index e433e1f66a8..a89c194887d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "server_i.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index e16ca614c5d..a3f9ec7ef1b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -55,7 +55,7 @@ Server_i::~Server_i() } int -Server_i::parse_args (int argc, ACE_TCHAR* argv[]) +Server_i::parse_args (int argc, char* argv[]) { ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:c:h"); int c; @@ -100,7 +100,7 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL) { ACE_TRY { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int retval = this->parse_args (argc, argv); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index 86ff583ad70..b759cedf515 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -2,6 +2,7 @@ // $Id$ #include "ifr_dii_client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, client, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index 8538cbb24b3..ee38e71a861 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -27,7 +27,7 @@ IFR_DII_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -98,8 +98,7 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL) } int -IFR_DII_Client::parse_args (int argc, - char *argv[]) +IFR_DII_Client::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> opts (argc, argv, "dn"); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index d091896f572..ec921b9cd71 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Application_Test, server, "$Id$") diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp index b14b5870951..1b1d241038c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp @@ -2,6 +2,7 @@ // $Id$ #include "idl3_client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, client, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index d91da19c26d..63339a65982 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -261,7 +261,7 @@ IDL3_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -341,8 +341,7 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL) } int -IDL3_Client::parse_args (int argc, - char *argv[]) +IDL3_Client::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> opts (argc, argv, "d"); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index a801eb92c67..189fae57f54 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -61,13 +61,12 @@ Admin_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) return retval; @@ -152,8 +151,7 @@ Admin_Client::run (void) } int -Admin_Client::parse_args (int argc, - char *argv[]) +Admin_Client::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> opts (argc, argv, "di:t:"); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp index 88e8ec9f6b0..af5265406ed 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp @@ -2,6 +2,7 @@ // $Id$ #include "Admin_Client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (IFR_Test, client, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index 65db04bf8ec..98bac03c3cd 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -31,13 +31,12 @@ Latency_Query_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) { @@ -162,8 +161,7 @@ Latency_Query_Client::run (void) } int -Latency_Query_Client::parse_args (int argc, - char *argv[]) +Latency_Query_Client::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> opts (argc, argv, "dhi:"); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index f4bb63a5a71..6364ca7811f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -2,6 +2,7 @@ // $Id$ #include "Latency_Query_Client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Latency__Test, client, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index af5ddc35f16..378064b3ac2 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -19,18 +19,16 @@ Ptest::~Ptest (void) } int -Ptest::init (int argc, - char *argv[]) +Ptest::init (int argc, char *argv[]) { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) return retval; @@ -102,8 +100,7 @@ Ptest::run (void) } int -Ptest::parse_args (int argc, - char *argv[]) +Ptest::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> opts (argc, argv, "dq"); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp index 1657e2a5ef7..bbb60bf359c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp @@ -2,6 +2,7 @@ // $Id$ #include "Ptest.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Persistence_Test, test, diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index 38b75a9d634..e841f9d87dc 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -19,6 +19,7 @@ // ============================================================================ #include "ncontextext_client_i.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp index 7cd4aa50277..88c05a0f529 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp @@ -45,7 +45,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index 11fab3150b7..aa6052041ae 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -1,5 +1,6 @@ #include "LB_server.h" #include "Basic.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Controlled, server, @@ -19,7 +20,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) const char *location5 = "MyLocation 5"; const char *location6 = "MyLocation 6"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp index e22b1c8678a..7f15ba73cd1 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp @@ -47,7 +47,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp index a7476db9cee..689942f3808 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp @@ -1,6 +1,7 @@ #include "LB_server.h" #include "Factory.h" #include "Simple.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Infrastructure_Controlled, server, @@ -14,7 +15,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) const char *location1 = "MyLocation 1"; const char *location2 = "MyLocation 2"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp index f3c4e393ab0..aa5eaba1146 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -1,6 +1,7 @@ #include "LB_server.h" #include "Basic.h" #include "Simple.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Manage_object_group, server, @@ -15,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const char *location1 = "MyLocation 1"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index a8aa2581339..ef980bfa7f0 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -37,7 +37,7 @@ BasicLog_Test::init (int argc, char *argv[]) ACE_TRY { // Initialize the ORB - orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + orb_ = CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp index 7c9da98dc2b..345e0c82b2f 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp @@ -1,6 +1,7 @@ #include "Basic_Log_Test.h" #include "ace/Log_Msg.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Basic_Log_Test, client, @@ -15,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG((LM_DEBUG, "\nBasic Log test \n\n")); - if (log_test.init(argc, argv) == -1) + if (log_test.init(convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR_RETURN((LM_ERROR, "xx - Failed initializing BasicLog_Test.\n"),-1); diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index 2dae462b151..7433d1064e7 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -49,7 +49,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index f5b88ab9ada..4856873214d 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -78,7 +78,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the group IOR. diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index eed1832ccbe..378e9f97e45 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -25,7 +25,7 @@ AdminProperties_Task::init (TAO_Notify_Tests_StructuredPushSupplier *supplier, A int AdminProperties_Task::init (int argc, ACE_TCHAR *argv[]) { - return ACE_Task_Base::init (convert.get_argc(), convert.get_ASCII_argv()); + return ACE_Task_Base::init (argc, argv); } int diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index d6f22b112d2..4ef65ef09cd 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -357,7 +357,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ConnectDisconnect client; - if (client.parse_args (argc, argv) == -1) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 4b0e23c371c..ddaaf415280 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -146,8 +146,7 @@ Events::init (int argc, } int -Events::parse_args (int argc, - char *argv[]) +Events::parse_args (int argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); @@ -329,7 +328,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) Events events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index 3f9f06dd552..e27ed2f1dcc 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -225,7 +225,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) Filter events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index 7c2b40af22f..e426c722707 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -25,8 +25,7 @@ IdAssignment::~IdAssignment (void) } int -IdAssignment::parse_args (int argc, - char *argv[]) +IdAssignment::parse_args (int argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); @@ -84,7 +83,7 @@ IdAssignment::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 2e56107fbd1..9e86827c5c4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -24,8 +24,7 @@ LifeCycle::~LifeCycle (void) } int -LifeCycle::parse_args (int argc, - char *argv[]) +LifeCycle::parse_args (int argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); @@ -66,7 +65,7 @@ LifeCycle::init (int argc, char* argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index b12b7d59ce7..70367532e69 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -382,7 +382,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) MultiTypes client; - if (client.parse_args (argc, argv) == -1) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index df72056327c..4dd49a84bb0 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -148,8 +148,7 @@ Sequence::init (int argc, } int -Sequence::parse_args (int argc, - char *argv[]) +Sequence::parse_args (int argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); @@ -361,7 +360,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) Sequence events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index ff24be81645..ba48eb507c7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -125,8 +125,7 @@ Simple_Test::init (int argc, } int -Simple_Test::parse_args (int argc, - char *argv[]) +Simple_Test::parse_args (int argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); @@ -245,7 +244,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) Simple_Test events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp index 7412024ad90..ce1c5d549d6 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp @@ -82,8 +82,6 @@ namespace { int ACE_TMAIN(int, ACE_TCHAR**) { - ACE_Argv_Type_Converter convert (argc, argv); - try { setUp(); diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index b6c5d2c95b6..44e477e70b5 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Dynamic_Service.h" #include "ace/ARGV.h" +#include "ace/Argv_Type_Converter.h" class TestSupplier : public POA_CosNotifyComm::StructuredPushSupplier @@ -52,7 +53,7 @@ class TestConsumer } }; -int ACE_TMAIN(int ac, ACE_TCHAR **av) +int ACE_TMAIN(int argc, ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); @@ -66,13 +67,13 @@ int ACE_TMAIN(int ac, ACE_TCHAR **av) CORBA::ORB_var orb; PortableServer::POA_var poa; - orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (orb.in ())); - if (ac > 2 && ACE_OS::strcmp (av[1], ACE_TEXT("-pass")) == 0) + if (convert.get_argc() > 2 && ACE_OS::strcmp (convert.get_ASCII_argv()[1], "-pass") == 0) { - int pn = av[2][0] - '0'; + int pn = argv[2][0] - '0'; switch (pn) { case 1: diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index a83ffcb563e..3874066e3ff 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -34,7 +34,7 @@ TAO_Notify_Tests_Activation_Manager::~TAO_Notify_Tests_Activation_Manager () } int -TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name) +TAO_Notify_Tests_Activation_Manager::ior_output_file (const char *file_name) { this->ior_output_file_ = ACE_OS::fopen (file_name, ACE_TEXT("w")); diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h index dd2bd77ebba..868e52895d9 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h @@ -88,7 +88,7 @@ public: void dump_stats (int dump_samples); // Returns 0 if the file could be opened for write. - int ior_output_file (const ACE_TCHAR *file_name); + int ior_output_file (const char *file_name); // Returns 1 if the file could be opened for read. int ior_input_file (const char *file_name); diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index bcb725c82bd..86ce3f339de 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -179,7 +179,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) { ACE_TArg_Shifter< char > arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -192,7 +192,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // -IORoutput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // -IORoutput file_name { if (this->activation_manager_->ior_output_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -201,7 +201,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORinput")))) // -IORinput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORinput"))) // -IORinput file_name { if (this->activation_manager_->ior_input_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -236,7 +236,7 @@ TAO_Notify_Tests_Driver::init (int argc, char *argv[] ACE_ENV_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp index 74fb0bfe707..447ee2e193e 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -12,7 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) RedGreen_Test client; - client.parse_args (argc, argv); + client.parse_args (convert.get_argc(), convert.get_ASCII_argv()); ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 3786ccfbd3e..82418f6cc57 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -598,7 +598,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) Notify_Throughput events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index 52167162da7..59af0166de4 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -738,8 +738,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) { Client client; - if (client.init (argc, - argv + if (client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 97a3aabed60..dac8f86c02a 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -17,6 +17,7 @@ // ============================================================================ #include "server.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(CosPropertyService, server, "$Id$") @@ -34,8 +35,7 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv) TAO_ORB_Manager m; // Initialize the ORB. - m.init_child_poa (argc, - argv, + m.init_child_poa (convert.get_argc(), convert.get_ASCII_argv(), "child_poa" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 92fda08eb84..ca0e631d11f 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -91,10 +91,10 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) int c_breath = 4; int c_depth = 4; int o_breath = 4; - ACE_TCHAR *ns1ref = 0; - ACE_TCHAR *ns2ref = 0; + char *ns1ref = 0; + char *ns2ref = 0; - ACE_Get_Arg_Opt<char> get_opts (argc, argv, ACE_TEXT ("b:d:o:p:q:")); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "b:d:o:p:q:"); int c; int i; @@ -156,7 +156,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) ACE_TRY_EX(bl_a) { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); // ior's are specified for the name servers through a commandline // option or a file. diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index 68688eaabaa..8199cfe0c7f 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -261,8 +261,6 @@ DynSched_Test::run_schedule (ACE_Scheduler_Strategy &strategy, int ACE_TMAIN (int, ACE_TCHAR *[]) { - ACE_Argv_Type_Converter convert (argc, argv); - int result = 0; // create a bunch of different strategies, indicating the minimum critical diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index 507b60683ea..527949071a1 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -54,7 +54,8 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, argv) != 0) + ACE_Argv_Type_Converter convert (argc, argv); + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index 564ee126a5e..73fa2906d71 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -106,7 +106,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index 3585bdb92e6..8a706f06f28 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -103,7 +103,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in (), diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index 433984d9816..e2d5cfe92d7 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp @@ -64,7 +64,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get Object Reference using IOR file diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index d213c2e7bae..e9d4bfbeb79 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -142,15 +142,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_NEW_ENV { - ACE_TString env ("SSL_CERT_FILE="); - env += cert_file; + ACE_TString env (ACE_TEXT("SSL_CERT_FILE=")); + env += ACE_TEXT_TO_TCHAR_IN(cert_file); ACE_OS::putenv (env.c_str ()); CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index 6c61970704a..2eb9ac6be6f 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -2,6 +2,7 @@ #include "Client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Time, client, "$Id$") diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 32bcb3e081f..965cead51a2 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -42,7 +42,7 @@ ACE_TMAIN (int argc, ACE_TCHAR** argv) // Command line argument interpretation. CORBA::Boolean verbose = 0; - ::parse_args (argc, argv, verbose); + ::parse_args (convert.get_argc(), convert.get_ASCII_argv(), verbose); // Initialize ORB. CORBA::ORB_var orb = orb_manager.orb (); diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 729c5d85b2f..eeaa244912a 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -24,7 +24,7 @@ ACE_TMAIN (int argc, ACE_TCHAR** argv) ACE_TRY_CHECK; // Command line argument interpretation. - TT_Parse_Args parse_args (argc, argv); + TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv()); // Init the orb and bootstrap to the trading service. CORBA::ORB_var orb = orb_manager.orb (); diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index 926ec5224ac..0d21623d5f8 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -17,7 +17,7 @@ ACE_TMAIN (int argc, ACE_TCHAR** argv) ACE_TRY_CHECK; // Command line argument interpretation. - TT_Parse_Args parse_args (argc, argv); + TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv()); // Initialize the ORB and bootstrap to the Lookup interface. CORBA::ORB_var orb = orb_manager.orb (); diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 48c031f5c8a..9a1f221c92b 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -20,6 +20,7 @@ // ============================================================================ #include "ior_corbaname_client_i.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index fcc308441bf..aefa18b60be 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -2,6 +2,7 @@ #include "status_i.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index 5a3aa8a218a..67dacf5f7d6 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -62,7 +62,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Use the first argument to create the object reference. CORBA::Object_var object = - orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); + orb->string_to_object (convert.get_ASCII_argv()[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if this object reference is a valid one.. diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp index fe43bf0dde9..c8582a8fb27 100644 --- a/TAO/tests/Exposed_Policies/server.cpp +++ b/TAO/tests/Exposed_Policies/server.cpp @@ -30,7 +30,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Policy_Tester policy_tester; - int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = policy_tester.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl index f7934977c22..e237ce94275 100644 --- a/ace/OS_NS_stdio.inl +++ b/ace/OS_NS_stdio.inl @@ -1000,23 +1000,18 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx) ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0); # else ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0); -# endif /* __BORLANDC__ */ -#else /* ACE_LACKS_TEMPNAM */ +# endif // __BORLANDC__ +#else // ACE_LACKS_TEMPNAM // No native wide-char support; convert to narrow and call the char* variant. char *name = ACE_OS::tempnam (ACE_TEXT_TO_CHAR_IN (dir), ACE_TEXT_TO_CHAR_IN (pfx)); // ACE_OS::tempnam returns a pointer to a malloc()-allocated space. // Convert that string to wide-char and free() the original. - const wchar_t* init = 0; - static ACE_TSS< wchar_t* > wname (&init); - ACE::String_Conversion::Allocator_malloc().free(*wname); + wchar_t* wname = 0; if (name != 0) { - *wname.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT( name ); // memory allocated! - } - else - { - *wname.ts_object() = 0; + ::free( name ); + wname = ACE_TEXT_TO_MALLOC_WCHAR_OUT( name ); } return *wname; #endif /* ACE_LACKS_TEMPNAM */ diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl index e0abe6ebedd..bdf1ac2faf0 100644 --- a/ace/OS_NS_stdlib.inl +++ b/ace/OS_NS_stdlib.inl @@ -8,6 +8,7 @@ #include "ace/os_include/os_errno.h" #include "ace/os_include/os_search.h" #include "ace/os_include/os_limits.h" +#include "ace/TSS_T.h" #if defined(ACE_WCHAR_IN_STD_NAMESPACE) # define ACE_WCHAR_STD_NAMESPACE std @@ -149,9 +150,9 @@ ACE_OS::getenv (const wchar_t *symbol) #elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0); #else - const wchar_t* init = 0; + wchar_t* init = 0; static ACE_TSS< wchar_t* > wvalue (&init); - ACE::String_Conversion::Allocator_malloc().free(*wvalue); + ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wvalue); *wvalue.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT ( ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (symbol))); return *wvalue; diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h index de822113f47..f6a3945d271 100644 --- a/ace/OS_NS_string.h +++ b/ace/OS_NS_string.h @@ -397,7 +397,7 @@ namespace ACE_OS { } /* namespace ACE_OS */ -#include "ace/OS_NS_string_base.inl" +#include "ace/OS_NS_string_base.h" # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) diff --git a/ace/OS_NS_string_base.inl b/ace/OS_NS_string_base.inl index b3f70eeb238..06a6e614694 100644 --- a/ace/OS_NS_string_base.inl +++ b/ace/OS_NS_string_base.inl @@ -4,6 +4,8 @@ #ifndef OS_NS_STRING_BASE_INL #define OS_NS_STRING_BASE_INL +#include <string.h> + namespace ACE_OS { diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl index 25f43d0e3f0..881fb3dd60c 100644 --- a/ace/OS_NS_time.inl +++ b/ace/OS_NS_time.inl @@ -6,6 +6,7 @@ #include "ace/Time_Value.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_time.h" +#include "ace/TSS_T.h" ACE_INLINE char * ACE_OS::asctime (const struct tm *t) @@ -112,7 +113,7 @@ ACE_OS::ctime (const time_t *t) #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0); #else -# if defined (ACE_USES_WCHAR) /* Not Win32, else it would do the above */ +# if defined (ACE_USES_WCHAR) // Wide and not Win32 char *narrow_time; ACE_OSCALL (::ctime (t), char *, 0, narrow_time); if (narrow_time == 0) @@ -121,15 +122,15 @@ ACE_OS::ctime (const time_t *t) // we've done this before, free the previous one. Yes, this leaves a // small memory leak (26 characters) but there's no way around this // that I know of. (Steve Huston, 12-Feb-2003). - const wchar_t* init = 0; + wchar_t* init = 0; static ACE_TSS< wchar_t* > wide_time (&init); - ACE::String_Conversion::Allocator_malloc().free(*wide_time); + ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wide_time); *wide_time.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT (narrow_time); return *wide_time; # else ACE_OSCALL_RETURN (::ctime (t), char *, 0); -# endif /* ACE_USES_WCHAR */ -# endif /* ACE_HAS_BROKEN_CTIME */ +# endif // ACE_USES_WCHAR +# endif // ACE_HAS_BROKEN_CTIME } #if !defined (ACE_HAS_WINCE) /* CE version in OS.cpp */ diff --git a/ace/String_Conversion_T.h b/ace/String_Conversion_T.h index 481ef722744..48f988ab6fc 100644 --- a/ace/String_Conversion_T.h +++ b/ace/String_Conversion_T.h @@ -264,9 +264,9 @@ private: # define ACE_TEXT_TO_WCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< wchar_t >( STRING ).c_str() # define ACE_TEXT_TO_TCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< ACE_TCHAR >( STRING ).c_str() -# define ACE_TEXT_TO_MALLOC_CHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< char, ACE::String_Conversion::Allocator_malloc >( STRING ).c_str() -# define ACE_TEXT_TO_MALLOC_WCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< wchar_t, ACE::String_Conversion::Allocator_malloc >( STRING ).c_str() -# define ACE_TEXT_TO_MALLOC_TCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< ACE_TCHAR, ACE::String_Conversion::Allocator_malloc >( STRING ).c_str() +# define ACE_TEXT_TO_MALLOC_CHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< char, ACE::String_Conversion::Allocator_malloc<char> >( STRING ).c_str() +# define ACE_TEXT_TO_MALLOC_WCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< wchar_t, ACE::String_Conversion::Allocator_malloc<wchar_t> >( STRING ).c_str() +# define ACE_TEXT_TO_MALLOC_TCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< ACE_TCHAR, ACE::String_Conversion::Allocator_malloc<ACE_TCHAR> >( STRING ).c_str() # define ACE_TEXT_TO_CHAR_IN(STRING) ACE::String_Conversion::Convert_In< char, wchar_t >( STRING ).c_str() # define ACE_TEXT_TO_WCHAR_IN(STRING) ACE::String_Conversion::Convert_In< wchar_t, char >( STRING ).c_str() diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index 93dc1faa6fb..24d7745d228 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -1,7 +1,3 @@ -here is the linux config file need to be in. - - - /* -*- C++ -*- */ // $Id$ @@ -410,3 +406,4 @@ here is the linux config file need to be in. #include /**/ "ace/post.h" #endif /* ACE_LINUX_COMMON_H */ + |