diff options
Diffstat (limited to 'TAO/examples')
168 files changed, 705 insertions, 520 deletions
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp index 1bb6f2cbc19..fa1ef36c477 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp @@ -31,7 +31,7 @@ AMH_Servant::parse_args (int &argc, char **argv) { // *** To get correct behaviour, SET POSIXLY_CORECT=1 on Linux // systems!!! *** - ACE_Get_Opt get_opts (argc, argv, "s:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:"); int c; int count_argv = 0; diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index b1a722b18d8..33cb662f799 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -43,7 +43,7 @@ Base_Server::parse_args (void) { // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux // systems!!! *** - ACE_Get_Opt get_opts (this->argc_, this->argv_, "o:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "o:"); int c; int count_argv = 0; @@ -210,7 +210,7 @@ Base_Server::write_ior_to_file (const char * ior) { // If the ior_output_file exists, output the ior to it FILE *output_file = - ACE_OS::fopen (this->ior_output_file_, "w"); + ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp index 9b31627ae37..59fd9c58e81 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp +++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp @@ -21,7 +21,7 @@ Client_Task::Client_Task (int &argc, char **argv) int Client_Task::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "k:n:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp index 43ef2b385cc..2b949f5c373 100644 --- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp @@ -45,7 +45,7 @@ MT_AMH_Server::parse_args (void) ACE_OS::exit (1); } - ACE_Get_Opt get_opts (this->argc_, this->argv_, "n:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "n:"); int c; int count_argv = 0; diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc index 873085457c1..5e7d22fe322 100644 --- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc +++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc @@ -9,6 +9,7 @@ project(*IDL) : taoidldefaults, amh { } project(*st_server): taoexe, strategies, valuetype, amh, portableserver { + exename = st_server after += *IDL Source_Files { st_server.cpp @@ -23,6 +24,7 @@ project(*st_server): taoexe, strategies, valuetype, amh, portableserver { } project(*mt_server): taoexe, strategies, valuetype, amh, portableserver { + exename = mt_server after += *IDL Source_Files { mt_server.cpp @@ -38,6 +40,7 @@ project(*mt_server): taoexe, strategies, valuetype, amh, portableserver { } project(*client): taoexe, strategies, valuetype, amh, portableserver { + exename = client after += *IDL Source_Files { Client_Task.cpp diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp index 8ac228e10f5..f0cdbabc08c 100644 --- a/TAO/examples/AMH/Sink_Server/client.cpp +++ b/TAO/examples/AMH/Sink_Server/client.cpp @@ -3,11 +3,13 @@ // #include "Client_Task.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Client_Task task (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + Client_Task task (convert.get_argc(), convert.get_ASCII_argv()); if (task.parse_args () != 1) { diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp index be36239007c..8176e904a16 100644 --- a/TAO/examples/AMH/Sink_Server/mt_server.cpp +++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp @@ -2,11 +2,13 @@ #include "MT_AMH_Server.h" #include "AMH_Servant.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - MT_AMH_Server amh_server (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + MT_AMH_Server amh_server (convert.get_argc(), convert.get_ASCII_argv()); amh_server.try_RT_scheduling(); amh_server.start_orb_and_poa (); @@ -18,7 +20,7 @@ main (int argc, char *argv[]) AMH_Servant servant (amh_server.orb ()); - if (servant.parse_args (argc, argv) != 1) + if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1) { amh_server.usage ("sleep time unspecified"); ACE_OS::exit (1); diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp index 5983c3cd99f..1986d33f38f 100644 --- a/TAO/examples/AMH/Sink_Server/st_server.cpp +++ b/TAO/examples/AMH/Sink_Server/st_server.cpp @@ -2,6 +2,7 @@ #include "AMH_Servant.h" #include "Base_Server.h" +#include "ace/Argv_Type_Converter.h" void usage (const char *message) @@ -19,9 +20,10 @@ usage (const char *message) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Base_Server amh_server (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + Base_Server amh_server (convert.get_argc(), convert.get_ASCII_argv()); amh_server.try_RT_scheduling(); amh_server.start_orb_and_poa (); @@ -33,7 +35,7 @@ main (int argc, char *argv[]) AMH_Servant servant (amh_server.orb ()); - if (servant.parse_args (argc, argv) != 1) + if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1) { usage ("Sleep time unspecified \n"); ACE_OS::exit (1); diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 529143d03f2..8c9b334590c 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -5,6 +5,7 @@ #include "ace/Task.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (FL_Callback, peer, @@ -17,7 +18,7 @@ int interval = 0; // microseconds int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:t:"); int c; while ((c = get_opts ()) != -1) @@ -71,8 +72,9 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -102,7 +104,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -125,7 +127,7 @@ main (int argc, char *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 progress_object = diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp index d5d9556a839..5b267306226 100644 --- a/TAO/examples/AMI/FL_Callback/progress.cpp +++ b/TAO/examples/AMI/FL_Callback/progress.cpp @@ -19,7 +19,7 @@ int n_peers = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:i:"); int c; while ((c = get_opts ()) != -1) @@ -53,7 +53,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { TAO::FlResource_Loader fl_loader; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Advanced/ch_12/client.cpp b/TAO/examples/Advanced/ch_12/client.cpp index d02bccc4c52..271bb80d8b6 100644 --- a/TAO/examples/Advanced/ch_12/client.cpp +++ b/TAO/examples/Advanced/ch_12/client.cpp @@ -136,7 +136,7 @@ set_temp (CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) } int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { CORBA::ULong i = 0; try diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp index 4b745c72953..d3df38508c6 100644 --- a/TAO/examples/Advanced/ch_12/server.cpp +++ b/TAO/examples/Advanced/ch_12/server.cpp @@ -641,7 +641,7 @@ preinvoke (const PortableServer::ObjectId & oid, } int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { CORBA::ORB_var orb; diff --git a/TAO/examples/Advanced/ch_18/client.cpp b/TAO/examples/Advanced/ch_18/client.cpp index 57631ddbb19..314c21f1258 100644 --- a/TAO/examples/Advanced/ch_18/client.cpp +++ b/TAO/examples/Advanced/ch_18/client.cpp @@ -223,7 +223,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { CORBA::ULong i = 0; diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp index 17b74ff11fa..848d6877461 100644 --- a/TAO/examples/Advanced/ch_18/server.cpp +++ b/TAO/examples/Advanced/ch_18/server.cpp @@ -687,7 +687,7 @@ preinvoke ( //---------------------------------------------------------------- int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { CORBA::ORB_var orb; diff --git a/TAO/examples/Advanced/ch_21/client.cpp b/TAO/examples/Advanced/ch_21/client.cpp index 8db73588d82..b85caad10fd 100644 --- a/TAO/examples/Advanced/ch_21/client.cpp +++ b/TAO/examples/Advanced/ch_21/client.cpp @@ -139,7 +139,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { CORBA::ULong i = 0; try { diff --git a/TAO/examples/Advanced/ch_21/server.cpp b/TAO/examples/Advanced/ch_21/server.cpp index 02631e1f536..f2d057d40c2 100644 --- a/TAO/examples/Advanced/ch_21/server.cpp +++ b/TAO/examples/Advanced/ch_21/server.cpp @@ -687,7 +687,7 @@ preinvoke ( //---------------------------------------------------------------- int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { try { // Initialize orb diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp index b8e0b3db2e5..994e668d249 100644 --- a/TAO/examples/Advanced/ch_3/client.cpp +++ b/TAO/examples/Advanced/ch_3/client.cpp @@ -21,29 +21,33 @@ #include "timeC.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" + +#include "tao/Policy_ForwardC.h" // The following header is #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. //#include <iostream.h> int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try + ACE_Argv_Type_Converter convert (argc, argv); + try { // Check arguments - if (argc != 2) + if (argc != 2) { cerr << "Usage: client IOR_string" << endl; throw 0; } // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); // Destringify argv[1] - CORBA::Object_var obj = orb->string_to_object (argv[1]); - if (CORBA::is_nil (obj.in ())) + CORBA::Object_var obj = orb->string_to_object (convert.get_ASCII_argv()[1]); + if (CORBA::is_nil (obj.in ())) { cerr << "Nil Time reference" << endl; throw 0; @@ -52,7 +56,7 @@ main (int argc, char *argv[]) // Narrow Time_var tm = Time::_narrow (obj.in ()); - if (CORBA::is_nil (tm.in ())) + if (CORBA::is_nil (tm.in ())) { cerr << "Argument is not a Time reference" << endl; throw 0; @@ -71,14 +75,14 @@ main (int argc, char *argv[]) << setw (2) << setfill ('0') << tod.minute << ":" << setw (2) << setfill ('0') << tod.second << endl; } - catch (const CORBA::Exception &x) + catch (const CORBA::Exception &x) { ACE_PRINT_EXCEPTION (x, "Who is the culprit \n"); cerr << "Uncaught CORBA exception" << endl; return 1; } - catch (...) + catch (...) { return 1; } diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp index fb8fbd74601..82d603e836a 100644 --- a/TAO/examples/Advanced/ch_3/server.cpp +++ b/TAO/examples/Advanced/ch_3/server.cpp @@ -20,7 +20,12 @@ // ============================================================================ #include "server.h" + +#include "tao/CORBA_String.h" + #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" + // The following headers are #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. @@ -47,12 +52,13 @@ get_gmt (void) throw (CORBA::SystemException) // ______________________________________________________ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try + ACE_Argv_Type_Converter convert (argc, argv); + try { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); // Get reference to Root POA. CORBA::Object_var obj @@ -76,18 +82,10 @@ main (int argc, char *argv[]) // Accept requests orb->run (); } - catch (const CORBA::Exception &) + catch (const CORBA::Exception &) { cerr << "Uncaught CORBA exception" << endl; return 1; } return 0; } - - - - - - - - diff --git a/TAO/examples/Advanced/ch_8_and_10/client.cpp b/TAO/examples/Advanced/ch_8_and_10/client.cpp index 593d3bd28b3..2395847f348 100644 --- a/TAO/examples/Advanced/ch_8_and_10/client.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/client.cpp @@ -135,7 +135,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { try { // Initialize the ORB diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp index e2f6b3093a2..4e2346a12fe 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp @@ -413,7 +413,7 @@ throw(CORBA::SystemException) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { try { // Initialize orb diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index f74694e7d6e..9a0f6eaeb6d 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -14,11 +14,15 @@ // ================================================================ #include "testS.h" + +#include "tao/Policy_ForwardC.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/TAOA.h" + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Buffered_AMI, client, @@ -106,7 +110,7 @@ public: static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:k:m:i:t:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:k:m:i:t:x"); int c; while ((c = get_opts ()) != -1) @@ -258,22 +262,22 @@ setup_buffering_constraints (CORBA::ORB_ptr orb } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp index 4049f81222e..fc42ba1afc5 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -1,8 +1,11 @@ // $Id$ +#include "tao/CORBA_String.h" + #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "test_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Buffered_AMI, server, @@ -13,7 +16,7 @@ const char *ior_output_file = "ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,13 +40,13 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -62,7 +65,7 @@ main (int argc, char *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 servant (orb.in ()); @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index 7851ec8638e..d4af0615cd1 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -19,6 +19,7 @@ #include "tao/AnyTypeCode/TAOA.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Buffered_Oneways, client, "$Id$") @@ -50,7 +51,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:f:c:b:i:z:t:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:f:c:b:i:z:t:x"); int c; while ((c = get_opts ()) != -1) @@ -114,22 +115,22 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 3b900d8f8a3..f286936ffee 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Buffered_Oneways, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,13 +36,13 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -60,7 +61,7 @@ main (int argc, char *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 servant (orb.in ()); @@ -76,7 +77,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp index b55bdff6842..587407e555f 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp @@ -18,7 +18,7 @@ ClientApp::~ClientApp() int ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -32,7 +32,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL) return result; } - CORBA::Object_var obj + CORBA::Object_var obj = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -81,7 +81,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - + } ACE_ENDTRY; } @@ -139,4 +139,3 @@ ClientApp::usage_statement() "\t[-?]\n\n", this->exe_name_.c_str())); } - diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index 4aeab0b4941..8fd1086855f 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -94,7 +94,7 @@ Consumer_Handler::read_ior (char *filename) int Consumer_Handler::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "a:t:d:f:xk:xs"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "a:t:d:f:xk:xs"); int c; int result; diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index 7874c0ef56b..1bbbb931c30 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -99,7 +99,7 @@ Notifier_Input_Handler::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) int Notifier_Input_Handler::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:s "); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:s "); int c; while ((c = get_opts ()) != -1) @@ -110,7 +110,7 @@ Notifier_Input_Handler::parse_args (void) break; case 'f': // output the IOR toi a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index 35bcc26633a..ecce3a44f2e 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -86,7 +86,7 @@ Supplier::read_ior (char *filename) int Supplier::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:f:i:xk:xs"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:f:i:xk:xs"); int c; int result; @@ -335,7 +335,7 @@ Supplier::reactor_used (void) const int Supplier::read_file (char *filename) { - f_ptr_ = ACE_OS::fopen (filename, "r"); + f_ptr_ = ACE_OS::fopen (filename, ACE_TEXT("r")); ACE_DEBUG ((LM_DEBUG, "filename = %s\n",filename)); diff --git a/TAO/examples/Callback_Quoter/consumer.cpp b/TAO/examples/Callback_Quoter/consumer.cpp index 9060eb9ec1d..c56708c331f 100644 --- a/TAO/examples/Callback_Quoter/consumer.cpp +++ b/TAO/examples/Callback_Quoter/consumer.cpp @@ -1,18 +1,20 @@ // $Id$ #include "Consumer_Handler.h" +#include "ace/Argv_Type_Converter.h" // This function runs the Callback Quoter Consumer application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Consumer_Handler consumer; ACE_DEBUG ((LM_DEBUG, "\n\t***Consumer***\n\n")); - if (consumer.init (argc, argv) == -1) + if (consumer.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return consumer.run (); diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp index 44f07d70cd1..fcd8ce876bd 100644 --- a/TAO/examples/Callback_Quoter/notifier.cpp +++ b/TAO/examples/Callback_Quoter/notifier.cpp @@ -1,14 +1,16 @@ // $Id$ #include "Notifier_Input_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(notifier, Callback_Quoter, "$Id$") // This is the main driver program for the Callback Quoter Notifier. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Notifier_Input_Handler notifier; ACE_DEBUG ((LM_DEBUG, @@ -17,7 +19,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int rc = notifier.init (argc, argv ACE_ENV_ARG_PARAMETER); + int rc = notifier.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rc == -1) diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp index 5d746eb0bc9..befb3418fd0 100644 --- a/TAO/examples/Callback_Quoter/supplier.cpp +++ b/TAO/examples/Callback_Quoter/supplier.cpp @@ -1,18 +1,20 @@ // $Id$ #include "Supplier_i.h" +#include "ace/Argv_Type_Converter.h" // This function runs the Callback Quoter Supplier daemon. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { - Supplier supplier; + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; ACE_DEBUG ((LM_DEBUG, "\n\tMarket Status Supplier Daemon\n\n")); - if (supplier.init (argc, argv) == -1) + if (supplier.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return supplier.run (); diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index c5ae00a4544..313893dd39a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -11,7 +11,7 @@ ACE_RCSID (AMI_Iterator, Content_Iterator_i, "$Id$") Content_Iterator_i::Content_Iterator_i (const char *pathname, CORBA::ULong file_size) - : file_ (pathname), + : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)), file_io_ (), file_size_ (file_size), chunk_index_ (1) diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 4f4368cca67..6699b86e461 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "Web_ServerC.h" #include "Iterator_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Iterator, client, @@ -26,8 +27,9 @@ void invoke_requests (int argc, ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -37,8 +39,7 @@ main (int argc, char *argv[]) ACE_TEXT ("[filename ...]\n")), -1); // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -79,8 +80,7 @@ main (int argc, char *argv[]) // completed. int request_count = 0; - ::invoke_requests (argc, - argv, + ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(), &request_count, factory.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index a1c2d6de7e5..73d9548f64e 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -7,20 +7,21 @@ #include "Web_ServerS.h" #include "Iterator_Factory_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Iterator, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp index 832e96b6732..5052e229ce2 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp @@ -11,7 +11,7 @@ ACE_RCSID (AMI_Observer, Callback_Handler, "$Id$") Callback_Handler::Callback_Handler (const char *pathname, Web_Server::Callback_ptr client_callback) - : file_ (pathname), + : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)), file_io_ (), callback_ (Web_Server::Callback::_duplicate (client_callback)), ami_handler_ (), diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 986c828875a..a8d56209ce8 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "Push_Web_ServerC.h" #include "Push_Iterator_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Observer, client, @@ -26,8 +27,9 @@ void invoke_requests (int argc, ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -38,8 +40,7 @@ main (int argc, char *argv[]) -1); // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -80,8 +81,7 @@ main (int argc, char *argv[]) int request_count = 0; // Activate and run the reply handlers. - ::invoke_requests (argc, - argv, + ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(), &request_count, factory.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 83388bc3fb9..39d6de39ef2 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -6,20 +6,21 @@ #include "orbsvcs/CosNamingC.h" #include "Push_Web_ServerS.h" #include "Push_Iterator_Factory_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Observer, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index 669ead91a3b..a31b5962d28 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -12,7 +12,7 @@ ACE_RCSID(SMI_Iterator, Content_Iterator_i, "$Id$") Content_Iterator_i::Content_Iterator_i (const char *pathname, CORBA::ULong file_size) - : file_ (pathname), + : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)), file_io_ (), file_size_ (file_size), chunk_index_ (1) diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index dcec6b9a578..7a1e2504d21 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -9,7 +9,7 @@ #include "Web_ServerC.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" - +#include "ace/Argv_Type_Converter.h" ACE_RCSID (SMI_Iterator, client, @@ -32,8 +32,9 @@ int spawn_viewer (const char *content_type, const char *filename); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -43,8 +44,7 @@ main (int argc, char *argv[]) -1); // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -92,7 +92,7 @@ main (int argc, char *argv[]) } // Get a Content_Iterator - const char *pathname = argv[1]; + const char *pathname = convert.get_ASCII_argv()[1]; Web_Server::Content_Iterator_var contents; Web_Server::Metadata_Type_var metadata; factory->get_iterator (pathname, @@ -211,7 +211,7 @@ int retrieve_data (const char *content_type, // Now spawn a view to display the retrieved data. if (::spawn_viewer (content_type, - file_addr.get_path_name ()) != 0) + ACE_TEXT_TO_CHAR_IN(file_addr.get_path_name ())) != 0) return -1; return 0; diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index 701dccbeac0..e140cac77f8 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/CosNamingC.h" #include "Web_ServerS.h" +#include "ace/Argv_Type_Converter.h" #include "Iterator_Factory_i.h" @@ -13,14 +14,14 @@ ACE_RCSID (SMI_Iterator, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp index 55b157feaf0..52af5c5c731 100644 --- a/TAO/examples/Event_Comm/consumer.cpp +++ b/TAO/examples/Event_Comm/consumer.cpp @@ -2,6 +2,7 @@ #include "Consumer_Handler.h" #include "Consumer_Input_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Consumer, consumer, "$Id$") @@ -110,12 +111,13 @@ Consumer::initialize (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Initialize the supplier and consumer object references. Consumer consumer; - if (consumer.initialize (argc, argv) == -1) + if (consumer.initialize (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Consumer init failed\n"), diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp index 8e348b1df5b..d9d365d8d97 100644 --- a/TAO/examples/Event_Comm/notifier.cpp +++ b/TAO/examples/Event_Comm/notifier.cpp @@ -2,6 +2,7 @@ #include "Notifier_Server.h" #include "notifier.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Notifier, notifier, "$Id$") @@ -61,10 +62,11 @@ Notifier::~Notifier (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Initialize server daemon. - Notifier notifier (argc, argv); + Notifier notifier (convert.get_argc(), convert.get_ASCII_argv()); // Loop forever handling events. notifier.run (); diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp index c44b6123b8d..3e665ee8bc8 100644 --- a/TAO/examples/Event_Comm/supplier.cpp +++ b/TAO/examples/Event_Comm/supplier.cpp @@ -3,6 +3,7 @@ #include "Notifier_Handler.h" #include "Supplier_Input_Handler.h" #include "supplier.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Supplier, supplier, "$Id$") Supplier::Supplier (void) @@ -67,12 +68,13 @@ Supplier::init (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Initialize server daemon. Supplier supplier; - if (supplier.init (argc, argv) == -1) + if (supplier.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "supplier init failed"), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp index d7d06da76fd..0db393b8ce1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -57,10 +57,10 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (output_file == 0) { @@ -70,7 +70,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, } // first dump what the caller has to say. - ACE_OS::fprintf (output_file, "%s\n",msg); + ACE_OS::fprintf (output_file, ACE_TEXT("%s\n"),msg); // next, compose and dump what we want to say. ACE_UINT32 val_1; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h index f3d7d4a300f..6519e30c942 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h @@ -61,10 +61,10 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats /// Record a sample int sample (ACE_UINT32 thr_run_time, int thr_count); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 6d3ab90a29b..b9318e79331 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "FP_Scheduler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -52,7 +53,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds"); int c; while ((c = get_opts ()) != -1) @@ -95,8 +96,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Fixed_Priority_Scheduler* scheduler=0; RTScheduling::Current_var current; int prio; @@ -141,10 +143,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + 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/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp index 839dcd2c9cf..7b134f49a8b 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "FP_Scheduler.h" #include "Task_Stats.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "$Id$") @@ -20,7 +21,7 @@ int enable_yield = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds"); int c; while ((c = get_opts ()) != -1) @@ -80,8 +81,9 @@ private: Task_Stats task_stats; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Fixed_Priority_Scheduler* scheduler=0; RTScheduling::Current_var current; long flags; @@ -98,7 +100,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -118,7 +120,7 @@ main (int argc, char *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; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index 122e2b06881..2640256aff1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "MIF_Scheduler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -52,7 +53,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds"); int c; while ((c = get_opts ()) != -1) @@ -95,8 +96,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MIF_Scheduler* scheduler=0; RTScheduling::Current_var current; int prio; @@ -141,10 +143,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + 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/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp index a137b5d45f8..e3e2ac239cd 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "MIF_Scheduler.h" #include "Task_Stats.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "$Id$") @@ -20,7 +21,7 @@ int enable_yield = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds"); int c; while ((c = get_opts ()) != -1) @@ -80,8 +81,9 @@ private: Task_Stats task_stats; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MIF_Scheduler* scheduler=0; RTScheduling::Current_var current; long flags; @@ -98,7 +100,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -118,7 +120,7 @@ main (int argc, char *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; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 81e8d8b0d83..2f1d212ae32 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -8,6 +8,7 @@ #include "testC.h" #include "MUF_Scheduler.h" #include "orbsvcs/Time_Utilities.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -57,7 +58,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds"); int c; while ((c = get_opts ()) != -1) @@ -100,8 +101,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MUF_Scheduler* scheduler=0; RTScheduling::Current_var current; int prio; @@ -146,10 +148,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + 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/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp index f22355074e1..625df80826e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "MUF_Scheduler.h" #include "Task_Stats.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "$Id$") @@ -20,7 +21,7 @@ int enable_yield = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds"); int c; while ((c = get_opts ()) != -1) @@ -80,8 +81,9 @@ private: Task_Stats task_stats; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MUF_Scheduler* scheduler = 0; RTScheduling::Current_var current; long flags; @@ -98,7 +100,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -118,7 +120,7 @@ main (int argc, char *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; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index 7948ab73785..2a8d5776792 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -20,6 +20,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" Identity_Client::Identity_Client (void) : group_factory_ior_ (0), @@ -31,7 +32,7 @@ Identity_Client::Identity_Client (void) int Identity_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:n:r"); int c; while ((c = get_opts ()) != -1) @@ -205,12 +206,13 @@ Identity_Client::~Identity_Client (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Client client; - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 638dd1e245b..ef03f6c6357 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -17,6 +17,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Identity_Server::Identity_Server (void) : group_factory_ior_ (0), @@ -28,7 +29,7 @@ Identity_Server::Identity_Server (void) int Identity_Server::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:a:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:a:o:"); int c; while ((c = get_opts ()) != -1) @@ -166,7 +167,7 @@ Identity_Server::create_objects (size_t number_of_objects, // Create an id for this servant. char id[BUFSIZ]; ACE_OS::sprintf (id, - "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER, + "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A, i); // Create and activate a servant. @@ -210,12 +211,13 @@ Identity_Server::~Identity_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Server server; - if (server.init (argc, argv) == -1) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index b2369ebe8b4..3a4dc4c5871 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -17,6 +17,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) @@ -26,7 +27,7 @@ Load_Balancing_Service::Load_Balancing_Service (void) int Load_Balancing_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +38,7 @@ Load_Balancing_Service::parse_args (int argc, char *argv[]) break; case 'o': // outputs object ior to the specified file. this->ior_output_file_ = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -137,12 +138,13 @@ Load_Balancing_Service::~Load_Balancing_Service (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Load_Balancing_Service factory; - if (factory.init (argc, argv) == -1) + if (factory.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 0ffc8625639..d122b750da3 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -19,6 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" +#include "ace/Argv_Type_Converter.h" Identity_Client::Identity_Client (void) : group_factory_ior_ (0), @@ -31,7 +32,7 @@ Identity_Client::Identity_Client (void) int Identity_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:n:k:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:n:k:r"); int c; while ((c = get_opts ()) != -1) @@ -245,12 +246,13 @@ Identity_Client::~Identity_Client (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Client client; - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 772a2092ada..f07a86b7a2b 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -5,6 +5,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Identity_Server::Identity_Server (void) : group_factory_ior_ (0), @@ -16,7 +17,7 @@ Identity_Server::Identity_Server (void) int Identity_Server::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:a:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:a:o:"); int c; while ((c = get_opts ()) != -1) @@ -208,7 +209,7 @@ Identity_Server::create_objects (size_t number_of_objects, // Create an id for this servant. char id[BUFSIZ]; ACE_OS::sprintf (id, - "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER, + "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A, i); // Create and activate a servant. @@ -268,16 +269,17 @@ Identity_Server::~Identity_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Server server; - if (server.init (argc, argv) == -1) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Check the non-ORB arguments. - if (server.parse_args (argc, argv) == -1) + if (server.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index f5d171a3b4f..311b6c25c61 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -635,8 +635,8 @@ Object_Group_i::bind (const Load_Balancer::Member & member this->allocator_) == 0) ACE_THROW (Load_Balancer::duplicate_member ()); - size_t id_len = ACE_OS::strlen (member.id) + 1; - size_t ref_len = ACE_OS::strlen (member.obj) + 1; + size_t id_len = ACE_OS::strlen (member.id.in()) + 1; + size_t ref_len = ACE_OS::strlen (member.obj.in()) + 1; char *mem_alloc = (char *)this->allocator_->malloc (id_len + ref_len); diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index ec94198bcc1..62374de6938 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -17,6 +17,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) @@ -26,7 +27,7 @@ Load_Balancing_Service::Load_Balancing_Service (void) int Load_Balancing_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +38,7 @@ Load_Balancing_Service::parse_args (int argc, char *argv[]) break; case 'o': // outputs object ior to the specified file. this->ior_output_file_ = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -174,12 +175,13 @@ Load_Balancing_Service::~Load_Balancing_Service (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Load_Balancing_Service factory; - if (factory.init (argc, argv) == -1) + if (factory.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 1e425fbd119..4499989e881 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -151,7 +151,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, // Create a temporary buffer for manipulating the logging message, // adding additional space for formatting characters.. - ACE_TCHAR msgbuf [ACE_MAXLOGMSGLEN + 4]; + char msgbuf [ACE_MAXLOGMSGLEN + 4]; // Format the message for proper display. ACE_OS::strcpy (msgbuf, "::"); @@ -162,7 +162,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, ACE_MAXLOGMSGLEN); // Set <ACE_Log_Record.msg_data> to the value stored in <msgbuf>. - rec.msg_data (msgbuf); + rec.msg_data (ACE_TEXT_TO_TCHAR_IN(msgbuf)); CORBA::Long addr = log_rec.host_addr; @@ -172,13 +172,13 @@ Logger_i::logv (const Logger::Log_Record &log_rec, static_cast<ACE_UINT32> (addr)); // Create a buffer and fill it with the host name of the logger - ACE_TCHAR namebuf[MAXHOSTNAMELEN + 1]; + char namebuf[MAXHOSTNAMELEN + 1]; ACE_OS::strncpy (namebuf, addy.get_host_addr (), MAXHOSTNAMELEN); u_long verb_level = this->verbosity_conversion (verbosity); - rec.print (namebuf, + rec.print (ACE_TEXT_TO_TCHAR_IN(namebuf), verb_level, stderr); // Print out the logging message to stderr with the given level of diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp index 51f5062e56e..e338b9524f7 100644 --- a/TAO/examples/Logging/Logging_Service.cpp +++ b/TAO/examples/Logging/Logging_Service.cpp @@ -2,12 +2,14 @@ #include "Logging_Service_i.h" #include "tao/debug.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Logging_Service, Logging_Service, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Set TAO_debug_level to 0 to ensure silent running unless // debugging is explicitly invoked TAO_debug_level = 0; @@ -17,7 +19,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int ret = log_server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int ret = log_server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret == -1) return 1; diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index 3b65ab4da94..7332a301d1d 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -14,7 +14,7 @@ Logger_Server::Logger_Server (void) int Logger_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp index f309e54d9e6..3a876c2fc14 100644 --- a/TAO/examples/Logging/Logging_Test.cpp +++ b/TAO/examples/Logging/Logging_Test.cpp @@ -1,20 +1,22 @@ // $Id$ #include "Logging_Test_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Logger, Logging_Test, "$Id$") // This function runs the Logging service test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Logger_Client logger_client; ACE_DEBUG ((LM_DEBUG, "\n \t IDL_Logger: client \n\n")); - if (logger_client.init (argc, argv) == -1) + if (logger_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return logger_client.run (); diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index f82bba200c4..8b9b8780683 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -297,7 +297,7 @@ Logger_Client::run (void) int Logger_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "d"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 979bc54cc79..8e6fc0219ea 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -33,7 +33,7 @@ Server<Servant>::~Server (void) template <class Servant> int Server<Servant>::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:"); int c = 0; while ((c = get_opts ()) != -1) @@ -43,7 +43,7 @@ Server<Servant>::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", @@ -196,7 +196,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename) template <class InterfaceObj, class Var> int Client<InterfaceObj, Var>::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:nk:x"); int c = 0; int result = 0; diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index bbadaefee44..ff2038a0c89 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -14,7 +14,7 @@ Checkpoint_Client_i::run (const char *name, char *argv[]) { // Initialize the client (read ior...). - if (checkpoint.init (name,argc, argv) == -1) + if (checkpoint.init (name, argc, argv) == -1) return -1; // Set random seed diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp index d4e502a26bd..5e18b4bbaf2 100644 --- a/TAO/examples/OBV/Typed_Events/client.cpp +++ b/TAO/examples/OBV/Typed_Events/client.cpp @@ -1,12 +1,14 @@ //$Id$ # include "Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Checkpoint_Client_i client; @@ -14,8 +16,8 @@ main (int argc, char **argv) "\nEvent_Types client\n\n")); if (client.run ("Event_Types_Checkpoint", - argc, - argv) == -1) + convert.get_argc(), + convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp index 2a8bb4802ba..00c2f07f345 100644 --- a/TAO/examples/OBV/Typed_Events/server.cpp +++ b/TAO/examples/OBV/Typed_Events/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Server_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Checkpoint_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Event_Types_Checkpoint", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index 550f5082ff8..cfb17546d95 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -27,6 +27,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #include "tao/PortableServer/AdapterActivatorC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Adapter_Activator, server, "$Id$") @@ -172,7 +173,7 @@ const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -209,9 +210,9 @@ write_iors_to_file (const char *first_ior, ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file); ACE_OS::sprintf (ior_output_file_3, "%s_3", ior_output_file); - FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); - FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); - FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w"); + FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w")); + FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0 || @@ -262,20 +263,20 @@ write_iors_to_file (const char *first_ior, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index f3361796b0b..f6262d78466 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI, client, "$Id$") @@ -31,7 +32,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "xk:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:f:"); int c; while ((c = get_opts ()) != -1) @@ -100,8 +101,9 @@ read_IOR_from_file (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; char str [255]; @@ -110,15 +112,13 @@ main (int argc, char **argv) { ACE_OS::strcpy (str, "CORBA::ORB_init"); - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the location of the // IOR - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; if (IOR == 0) diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp index 2e7bc06fe6e..27d9d8a846f 100644 --- a/TAO/examples/POA/DSI/server.cpp +++ b/TAO/examples/POA/DSI/server.cpp @@ -18,6 +18,7 @@ #include "Database_i.h" #include "ace/Get_Opt.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI, server, "$Id$") @@ -26,7 +27,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +53,7 @@ parse_args (int argc, char **argv) static int write_iors_to_file (const char *first_ior) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n", @@ -78,17 +79,18 @@ write_iors_to_file (const char *first_ior) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the 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); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp index a1a99766578..2f62f81c7aa 100644 --- a/TAO/examples/POA/Default_Servant/client.cpp +++ b/TAO/examples/POA/Default_Servant/client.cpp @@ -22,6 +22,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Default_Servant, client, "$Id$") @@ -32,7 +33,7 @@ static const char *message = "POA rules!!"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "dk:f:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:f:m:"); int c; while ((c = get_opts ()) != -1) @@ -71,18 +72,19 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the 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); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); // parse args should catch this, but just in case... if (iorfile == 0) diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp index be45c3a1297..18ffb067100 100644 --- a/TAO/examples/POA/Default_Servant/server.cpp +++ b/TAO/examples/POA/Default_Servant/server.cpp @@ -21,6 +21,7 @@ #include "ace/Get_Opt.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Default_Servant, server, "$Id$") @@ -29,7 +30,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -58,17 +59,18 @@ parse_args (int argc, char **argv) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the 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); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; @@ -152,7 +154,7 @@ main (int argc, char **argv) ACE_DEBUG ((LM_DEBUG,"%s\n", file_system_ior.in ())); - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc index 60b77c13641..88edaabf756 100644 --- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc +++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp index 924ce3bd0f1..255b27c4e2b 100644 --- a/TAO/examples/POA/Explicit_Activation/server.cpp +++ b/TAO/examples/POA/Explicit_Activation/server.cpp @@ -20,6 +20,7 @@ #include "ace/SString.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Explicit_Activation, server, "$Id$") @@ -28,7 +29,7 @@ const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -65,9 +66,9 @@ write_iors_to_file (const char *first_ior, ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file); ACE_OS::sprintf (ior_output_file_3, "%s_3", ior_output_file); - FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); - FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); - FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w"); + FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w")); + FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0 || @@ -118,21 +119,21 @@ write_iors_to_file (const char *first_ior, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp index 3d811df3b1b..a7e69aafb9a 100644 --- a/TAO/examples/POA/FindPOA/FindPOA.cpp +++ b/TAO/examples/POA/FindPOA/FindPOA.cpp @@ -22,6 +22,7 @@ #include "tao/ORB.h" #include "ace/Log_Msg.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (FindPOA, FindPOA, @@ -57,14 +58,15 @@ find_non_existant_POA (PortableServer::POA_ptr parent, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; // Initialize the ORB ACE_TRY { - 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; // Obtain the RootPOA. diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp index a47f480a36d..de04867761d 100644 --- a/TAO/examples/POA/Forwarding/client.cpp +++ b/TAO/examples/POA/Forwarding/client.cpp @@ -20,6 +20,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "testC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forwarding, client, "$Id$") @@ -30,7 +31,7 @@ static int iterations = 3; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "s:i:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:i:k:"); int c; while ((c = get_opts ()) != -1) @@ -96,19 +97,20 @@ do_calls (test_ptr test int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the 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); ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp index b4a4e26b918..d10cdd520d3 100644 --- a/TAO/examples/POA/Forwarding/server.cpp +++ b/TAO/examples/POA/Forwarding/server.cpp @@ -21,6 +21,7 @@ #include "test_i.h" #include "Servant_Activator.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forwarding, server, "$Id$") @@ -30,7 +31,7 @@ static const char *forward_to_ior = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:o:"); int c; while ((c = get_opts ()) != -1) @@ -161,7 +162,7 @@ create_servant_manager (CORBA::ORB_ptr orb, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR ((LM_ERROR, "Cannot open output file for writing IOR: %s\n", @@ -175,22 +176,22 @@ create_servant_manager (CORBA::ORB_ptr orb, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); 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/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc index 3c249a12a2e..802087ae34d 100644 --- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc +++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc @@ -9,6 +9,7 @@ project(*lib): taolib_with_idl, portableserver, minimum_corba { } project(*client): taoexe, portableserver, minimum_corba { + exename = client avoids += ace_for_tao after += *lib libs += Generic_Servant diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp index 901c06ce028..e45bee28678 100644 --- a/TAO/examples/POA/Generic_Servant/client.cpp +++ b/TAO/examples/POA/Generic_Servant/client.cpp @@ -4,6 +4,7 @@ #include "ace/Profile_Timer.h" #include "ace/Read_Buffer.h" #include "testC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Generic_Servant, client, "$Id$") @@ -17,7 +18,7 @@ static int timed_method = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:k:i:T:otx"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:k:i:T:otx"); int c; while ((c = get_opts ()) != -1) @@ -104,23 +105,23 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index 72bf969c798..077b016cab6 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -36,7 +36,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, : orb_ (CORBA::ORB::_duplicate (orb)) { // The dll is opened using the dllname passed. - if (this->dll_.open (dllname) == -1) + if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1) ACE_ERROR ((LM_ERROR, "%p\n", this->dll_.error ())); @@ -46,7 +46,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - void *symbol = this->dll_.symbol (factory_function); + void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function)); long function = reinterpret_cast<long> (symbol); servant_supplier_ = @@ -54,7 +54,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. - symbol = this->dll_.symbol (garbage_collection_function); + symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function)); function = reinterpret_cast<long> (symbol); servant_garbage_collector_ = reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function); diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index 3850c8743ce..d2e154105b1 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -36,7 +36,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, : orb_ (CORBA::ORB::_duplicate (orb)) { // The dll is opened using the dllname passed. - if (this->dll_.open (dllname) == -1) + if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1) ACE_ERROR ((LM_ERROR, "%p", this->dll_.error ())); @@ -48,7 +48,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. // - void *symbol = this->dll_.symbol (factory_function); + void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function)); long function = reinterpret_cast<long> (symbol); servant_supplier_ = @@ -56,7 +56,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. - symbol = this->dll_.symbol (garbage_collection_function); + symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function)); function = reinterpret_cast<long> (symbol); servant_garbage_collector_ = diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp index 287be59afe8..6a205694424 100644 --- a/TAO/examples/POA/Loader/Server_Manager.cpp +++ b/TAO/examples/POA/Loader/Server_Manager.cpp @@ -22,7 +22,7 @@ int Server_i::parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -67,9 +67,9 @@ Server_i::write_iors_to_file (const char *first_ior, ior_output_file_); FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, - "w"); + ACE_TEXT("w")); FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, - "w"); + ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -113,8 +113,7 @@ Server_i::init (int argc, char **argv) ACE_TRY { // Initialize the ORB. - orb_ = CORBA::ORB_init (argc, - argv, + orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/Loader/server.cpp b/TAO/examples/POA/Loader/server.cpp index e705b1ddf93..2d69b4826f1 100644 --- a/TAO/examples/POA/Loader/server.cpp +++ b/TAO/examples/POA/Loader/server.cpp @@ -14,15 +14,17 @@ //============================================================================= #include "Server_Manager.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Loader, server, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Server_i server; - if (server.init (argc, argv) != 0) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) != 0) ACE_ERROR_RETURN ((LM_ERROR, "Failure during Initialisation: init ()\n"), -1); diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp index be4283821ee..1a4293ecc61 100644 --- a/TAO/examples/POA/NewPOA/NewPOA.cpp +++ b/TAO/examples/POA/NewPOA/NewPOA.cpp @@ -27,6 +27,7 @@ #include "ace/SString.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (NewPOA, NewPOA, @@ -78,15 +79,15 @@ print_poa (PortableServer::POA_ptr poa } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // The first step Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc index 7b2742cdd86..7be7d2e4804 100644 --- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc +++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp index c5aa44a172f..b10183877a0 100644 --- a/TAO/examples/POA/On_Demand_Activation/server.cpp +++ b/TAO/examples/POA/On_Demand_Activation/server.cpp @@ -19,6 +19,7 @@ #include "Servant_Activator.h" #include "Servant_Locator.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(On_Demand_Activation, server, "$Id$") @@ -27,7 +28,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -61,8 +62,8 @@ write_iors_to_file (const char *first_ior, ACE_OS::sprintf (ior_output_file_1, "%s_1", ior_output_file); ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file); - FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); - FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); + FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0) @@ -100,17 +101,19 @@ write_iors_to_file (const char *first_ior, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the 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); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc index 843c856715b..fff74892921 100644 --- a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc +++ b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server Source_Files { server.cpp Servant_Activator.cpp diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp index 8564219f925..118c807c2c6 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp @@ -69,7 +69,7 @@ ServantManager_i::obtain_servant (const char *str, "Bind failed"), 0); // Now that the dll name is available we open the dll. - if (dll->open (dllname_.c_str ()) == -1) + if (dll->open (ACE_TEXT_TO_TCHAR_IN(dllname_.c_str ())) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p", dll->error ()), @@ -80,7 +80,7 @@ ServantManager_i::obtain_servant (const char *str, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - void *symbol = dll->symbol (create_symbol_.c_str ()); + void *symbol = dll->symbol (ACE_TEXT_TO_TCHAR_IN(create_symbol_.c_str ())); long function = reinterpret_cast<long> (symbol); SERVANT_FACTORY servant_creator = diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp index c1d6f600d34..8e4724ef153 100644 --- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp @@ -26,7 +26,7 @@ int Server_i::parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -71,9 +71,9 @@ Server_i::write_iors_to_file (const char *first_ior, ior_output_file_); FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, - "w"); + ACE_TEXT("w")); FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, - "w"); + ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -118,8 +118,7 @@ Server_i::init (int argc, char **argv) ACE_TRY { // Initialize the ORB. - orb_ = CORBA::ORB_init (argc, - argv, + orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/On_Demand_Loading/server.cpp b/TAO/examples/POA/On_Demand_Loading/server.cpp index 04ff3faf909..4cadc9b1ee4 100644 --- a/TAO/examples/POA/On_Demand_Loading/server.cpp +++ b/TAO/examples/POA/On_Demand_Loading/server.cpp @@ -14,15 +14,17 @@ //============================================================================= #include "Server_Manager.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(On_Demand_Loading, server, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Server_i server; - if (server.init (argc, argv) != 0) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) != 0) ACE_ERROR_RETURN ((LM_ERROR, "Failure during Initialisation: init ()\n"), -1); diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp index df22f01b0a9..cfe114ea1ea 100644 --- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp +++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp @@ -24,7 +24,7 @@ #include "tao/ORB.h" #include "ace/SString.h" - +#include "ace/Argv_Type_Converter.h" ACE_RCSID (POA_BiDir, POA_BiDir, @@ -76,15 +76,15 @@ print_poa (PortableServer::POA_ptr poa } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // The first step Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc index 71264867f12..2235cf816f4 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc +++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp index 5c3bcb3b2b0..6c5aea2407a 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp +++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp @@ -23,6 +23,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Reference_Counted_Servant, server, "$Id$") @@ -53,7 +54,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -80,7 +81,7 @@ parse_args (int argc, char **argv) static int write_iors_to_file (const char *ior) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n", @@ -105,20 +106,20 @@ write_iors_to_file (const char *ior) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp index 687f400c6bb..eb51a43f26b 100644 --- a/TAO/examples/POA/RootPOA/RootPOA.cpp +++ b/TAO/examples/POA/RootPOA/RootPOA.cpp @@ -23,20 +23,22 @@ #include "tao/ORB.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RootPOA, RootPOA, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initilize the 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); ACE_TRY_CHECK; // Resolve the initial references for the name RootPOA thus getting diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp index 9f29271ff6d..9844c3c8490 100644 --- a/TAO/examples/POA/TIE/client.cpp +++ b/TAO/examples/POA/TIE/client.cpp @@ -19,6 +19,7 @@ #include "ace/Profile_Timer.h" #include "testC.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(TIE, client, "$Id$") @@ -28,7 +29,7 @@ static int iterations = 1; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:f:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:f:i:"); int c; while ((c = get_opts ()) != -1) @@ -172,17 +173,18 @@ public: }; int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the 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); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp index 1c53b7ebb97..884e170f738 100644 --- a/TAO/examples/POA/TIE/server.cpp +++ b/TAO/examples/POA/TIE/server.cpp @@ -18,12 +18,14 @@ #include "ace/SString.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(TIE, server, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; char str[256]; @@ -33,7 +35,7 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "CORBA::ORB_init"); // Initialize the ORB first. - 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; // Obtain the RootPOA. @@ -175,10 +177,10 @@ main (int argc, char **argv) orb->object_to_string (a_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w"); - FILE *output_file_2 = ACE_OS::fopen ("ior_2", "w"); - FILE *output_file_3 = ACE_OS::fopen ("ior_3", "w"); - FILE *output_file_4 = ACE_OS::fopen ("ior_4", "w"); + FILE *output_file_1 = ACE_OS::fopen ("ior_1", ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen ("ior_2", ACE_TEXT("w")); + FILE *output_file_3 = ACE_OS::fopen ("ior_3", ACE_TEXT("w")); + FILE *output_file_4 = ACE_OS::fopen ("ior_4", ACE_TEXT("w")); if (output_file_1) ACE_OS::fprintf (output_file_1, @@ -214,8 +216,8 @@ main (int argc, char **argv) orb->object_to_string (c_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w"); - FILE *output_file_6 = ACE_OS::fopen ("ior_6", "w"); + FILE *output_file_5 = ACE_OS::fopen ("ior_5", ACE_TEXT("w")); + FILE *output_file_6 = ACE_OS::fopen ("ior_6", ACE_TEXT("w")); if (output_file_5) ACE_OS::fprintf (output_file_5, diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index ab94a8760c1..58aefca32f3 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -29,7 +29,7 @@ Grid_Client_i::parse_args (int argc, char *argv[]) { // Parses some of the options that are specific to this example - ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:v:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "df:nk:xw:h:v:"); int c = 0; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp index fcec899cc6e..7e3951da107 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_i.cpp @@ -185,7 +185,7 @@ Grid_Factory_i::make_grid (CORBA::Short width, // Get a memory pool ACE_NEW_THROW_EX (pool_t_, - pool_t (pool_name_), + pool_t (ACE_TEXT_TO_TCHAR_IN(pool_name_)), CORBA::NO_MEMORY ()); // pool_t_ = new pool_t (pool_name_); diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp index b3b5b0dfd7e..f1ede7ccb23 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp @@ -24,7 +24,7 @@ Persistent_Client_i::parse_args (int argc, char *argv[]) { // Parses some of the options that are specific to this example - ACE_Get_Opt get_opts (argc, argv, "dk:f:xw:h:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:f:xw:h:r"); int c = 0; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index b69f2e4f6f8..acb255facee 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -32,7 +32,7 @@ Server<Servant>::~Server (void) template <class Servant> int Server<Servant>::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:m:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:m:"); int c = 0; while ((c = get_opts ()) != -1) @@ -42,7 +42,7 @@ Server<Servant>::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", @@ -205,7 +205,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename) template <class InterfaceObj, class Var> int Client<InterfaceObj, Var>::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:k:x"); int c = 0; int result = 0; diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp index c67b7b80261..d550dfc97db 100644 --- a/TAO/examples/Persistent_Grid/client.cpp +++ b/TAO/examples/Persistent_Grid/client.cpp @@ -1,18 +1,20 @@ // $Id$ # include "Grid_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Grid_Client_i client; ACE_DEBUG ((LM_DEBUG, "\nGrid client\n\n")); - if (client.run ("Grid", argc, argv) == -1) + if (client.run ("Grid", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Persistent_Grid/persistent_client.cpp b/TAO/examples/Persistent_Grid/persistent_client.cpp index 3bd9a3137e6..40d09ce1ea4 100644 --- a/TAO/examples/Persistent_Grid/persistent_client.cpp +++ b/TAO/examples/Persistent_Grid/persistent_client.cpp @@ -1,19 +1,20 @@ // $Id$ # include "Persistent_Client.h" +#include "ace/Argv_Type_Converter.h" // The "persistent client" program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Persistent_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nGrid client\n\n")); - if (client.run ("grid", argc, argv) == -1) + if (client.run ("grid", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp index 99f007eae7f..1debd6b942a 100644 --- a/TAO/examples/Persistent_Grid/server.cpp +++ b/TAO/examples/Persistent_Grid/server.cpp @@ -2,12 +2,14 @@ #include "Simple_util.h" #include "Grid_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Grid_Factory_i> server; ACE_DEBUG ((LM_DEBUG, @@ -18,8 +20,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Grid", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp index 882b5078c5d..1b0da8ea299 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp @@ -32,7 +32,7 @@ UDP_Client_i::svc (void) { ACE_CString client_name ("UDP"); - ACE_TCHAR pid[256]; + char pid[256]; ACE_OS::sprintf (pid, "%u", static_cast<u_int> (ACE_OS::getpid ())); diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp index f7db9081cbd..0cc01c831e8 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp @@ -25,6 +25,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" // The following include file forces DIOP to be linked into the // executable and initialized for static builds. @@ -39,7 +40,7 @@ unsigned int iterations = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:t:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:t:i:"); int c; while ((c = get_opts ()) != -1) @@ -74,15 +75,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + 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/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp index ba54736c4d4..bd7f21ffee2 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp @@ -22,6 +22,7 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" // The following include file forces DIOP to be linked into the // executable and initialized for static builds. @@ -34,7 +35,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -60,12 +61,13 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -112,7 +114,7 @@ main (int argc, char *argv[]) policies[1]->destroy (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; UDP_i udp_i; @@ -150,7 +152,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index 77db4ccca0e..dfce99289c6 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -35,7 +35,7 @@ UDP_PerformanceClient::svc () { ACE_CString client_name ("UDP"); - ACE_TCHAR pid[256]; + char pid[256]; ACE_OS::sprintf (pid, "%u", static_cast<u_int> (ACE_OS::getpid ())); diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index 07bb98914ee..b641317ef94 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -19,6 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "UDPC.h" @@ -41,7 +42,7 @@ unsigned char performance_test = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:t:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:t:i:"); int c; while ((c = get_opts ()) != -1) @@ -73,15 +74,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceClient" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "PerformanceClient" 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/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 0a003a08589..b015d29ba63 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -18,6 +18,7 @@ #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" +#include "ace/Argv_Type_Converter.h" #include "UDP_i.h" @@ -34,7 +35,7 @@ int orb_threads = 1; // Number of threads running inside the ORB. int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:"); int c; while ((c = get_opts ()) != -1) @@ -79,12 +80,13 @@ static ACE_THR_FUNC_RETURN svc (void *arg) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceServer" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "PerformanceServer" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -132,7 +134,7 @@ main (int argc, char *argv[]) policies[1]->destroy (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; UDP_i udp_i; @@ -169,7 +171,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 8c5b4c7bd21..0f8f2217a1d 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -19,6 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/High_Res_Timer.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" // The following include file forces DIOP to be linked into the @@ -61,13 +62,13 @@ private: //int testClient (char* orbName, char* iorFile) -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB_Test_Client" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index acc84689614..6fe540360ff 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -18,6 +18,7 @@ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" @@ -33,13 +34,13 @@ const char *ior_output_file = "test.ior"; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB_Test_Server" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -80,7 +81,7 @@ int main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp index f8b7c4a070e..8c3afbbbffe 100644 --- a/TAO/examples/Quoter/Factory_Finder.cpp +++ b/TAO/examples/Quoter/Factory_Finder.cpp @@ -15,6 +15,7 @@ // ============================================================================ #include "Factory_Finder.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Quoter, @@ -189,7 +190,7 @@ Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL) u_int Quoter_Factory_Finder_Server::parse_args (void) { - ACE_Get_Opt get_opt (this->argc_, this->argv_, "?d:"); + ACE_Get_Arg_Opt<char> get_opt (this->argc_, this->argv_, "?d:"); int opt; int exit_code = 0; @@ -220,13 +221,14 @@ Quoter_Factory_Finder_Server::parse_args (void) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Quoter_Factory_Finder_Server quoter_Factory_Finder_Server; ACE_TRY_NEW_ENV { - int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = quoter_Factory_Finder_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index eb1bfe506ab..fca74893051 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -16,6 +16,7 @@ #include "Generic_Factory.h" #include "orbsvcs/LifeCycleServiceC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Quoter, Generic_Factory, @@ -243,7 +244,7 @@ Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL) u_int Quoter_Generic_Factory_Server::parse_args (void) { - ACE_Get_Opt get_opt (this->argc_, this->argv_, "l?d:"); + ACE_Get_Arg_Opt<char> get_opt (this->argc_, this->argv_, "l?d:"); int opt; int exit_code = 0; @@ -278,14 +279,15 @@ Quoter_Generic_Factory_Server::parse_args (void) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Quoter_Generic_Factory_Server quoter_Generic_Factory_Server; ACE_TRY_NEW_ENV { - if (quoter_Generic_Factory_Server.init (argc, - argv + if (quoter_Generic_Factory_Server.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc index a5ed3d19def..159c242befc 100644 --- a/TAO/examples/Quoter/Quoter.mpc +++ b/TAO/examples/Quoter/Quoter.mpc @@ -9,6 +9,7 @@ project(*IDL): taoidldefaults { } project(*server): namingexe, lifecycle, minimum_corba, utils { + exename = server after += *IDL Source_Files { server.cpp @@ -21,6 +22,7 @@ project(*server): namingexe, lifecycle, minimum_corba, utils { } project(*client): namingexe, lifecycle, minimum_corba { + exename = client after += *IDL Source_Files { client.cpp @@ -31,6 +33,7 @@ project(*client): namingexe, lifecycle, minimum_corba { } project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils { + exename = Factory_Finder after += *IDL Source_Files { Factory_Finder.cpp @@ -43,6 +46,7 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils { } project(*Generic Factory): namingexe, lifecycle, minimum_corba, utils { + exename = Generic_Factory after += *IDL Source_Files { Generic_Factory.cpp diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index 7dec1d90a22..1d3482cacd6 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNamingC.h" @@ -42,7 +43,7 @@ Quoter_Client::Quoter_Client (void) int Quoter_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "n:d:lx"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "n:d:lx"); int opt; int exit_code = 0; @@ -372,21 +373,22 @@ Quoter_Client::init (int argc, char **argv) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_Thread_Manager thr_mgr; int i; int threads = 1; for (i = 0; i < argc; i++) - if (ACE_OS::strcmp (argv[i], "-n") == 0) - threads = ACE_OS::atoi(argv[i + 1]); + if (ACE_OS::strcmp (convert.get_ASCII_argv()[i], "-n") == 0) + threads = ACE_OS::atoi(convert.get_ASCII_argv()[i + 1]); Quoter_Task **clients = new Quoter_Task*[threads]; for (i = 0; i < threads; i++) - clients[i] = new Quoter_Task (argc, argv); + clients[i] = new Quoter_Task (convert.get_argc(), convert.get_ASCII_argv()); for (i = 0; i < threads; i++) diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index 973111c3e7e..7b8d054358b 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -15,6 +15,7 @@ #include "server.h" #include "tao/ORB_Core.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Quoter, server, "$Id$") @@ -28,7 +29,7 @@ Quoter_Server::Quoter_Server (void) int Quoter_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d:n:"); int c; while ((c = get_opts ()) != -1) @@ -259,13 +260,14 @@ Quoter_Server::~Quoter_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Quoter_Server quoter_server; ACE_TRY_NEW_ENV { - int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = quoter_server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 4207926db61..f4f40d917a1 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -1,7 +1,9 @@ //$Id$ + + #include "Activity.h" -#include "Thread_Task.h" #include "Job_i.h" +#include "Thread_Task.h" #include "POA_Holder.h" #include "Builder.h" @@ -12,7 +14,7 @@ #include "ace/Barrier.h" #include "ace/Timer_Heap.h" #include "ace/Service_Config.h" -#include "ace/Arg_Shifter.h" +//#include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/Signal.h" @@ -65,10 +67,9 @@ Activity::init (int& argc, char *argv [] ACE_ENV_ARG_DECL) { // Copy command line parameter. - ACE_Argv_Type_Converter command_line(argc, argv); + ACE_Argv_Type_Converter convert(argc, argv); - this->orb_ = CORBA::ORB_init (command_line.get_argc(), - command_line.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -402,13 +403,13 @@ Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL) void Activity::create_started_flag_file (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, 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 ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag")))) + if ((current_arg = arg_shifter.get_the_parameter ("-Started_Flag"))) { FILE *file = ACE_OS::fopen (current_arg, ACE_TEXT("w")); @@ -431,8 +432,9 @@ Activity::create_started_flag_file (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_Builder); ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP); @@ -442,7 +444,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER); + ACTIVITY::instance()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp index 7ef5a89da40..37a99e01305 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.cpp +++ b/TAO/examples/RTCORBA/Activity/Builder.cpp @@ -29,9 +29,9 @@ Builder::~Builder(void) int Builder::init (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; int task_count = 0; int poa_count = 0; diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 20c001a4989..10e77ebc9a3 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -19,12 +19,9 @@ #include "ace/Service_Config.h" #include "ace/Service_Object.h" #include "activity_export.h" +#include "ace/Arg_Shifter.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; -ACE_END_VERSIONED_NAMESPACE_DECL - class Activity; class Periodic_Task; class Job_i; diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index 69320dc5323..98f0fee4a44 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -23,8 +23,11 @@ Job_i::poa (void) } int -Job_i::init (ACE_Arg_Shifter& arg_shifter) +Job_i::init (ACE_TArg_Shifter<char>& arg_shifter) { + int tmpInt = 1; + char ** tmp; + ACE_TArg_Shifter<char> arg_shifter_(tmpInt, tmp); job_name_ = arg_shifter.get_current (); // Read the name of the Job arg_shifter.consume_arg (); diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index 8ca42bb86b5..3594aa49416 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -16,9 +16,10 @@ #include "JobS.h" #include "activity_export.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -34,7 +35,7 @@ class activity_Export Job_i : public POA_Job Job_i (void); /// Init the state of this object. - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// = Accessors const ACE_CString& name (void); diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index 07e3f1e97b8..5c9c4755533 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp @@ -11,9 +11,9 @@ POA_Holder::POA_Holder (void) } int -POA_Holder::init (ACE_Arg_Shifter& arg_shifter) +POA_Holder::init (ACE_TArg_Shifter<char>& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; POA_name_ = arg_shifter.get_current (); // Read the name of the POA arg_shifter.consume_arg (); diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h index 3c056a88fba..1e44b40d6b1 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -17,9 +17,10 @@ #include "tao/PortableServer/PortableServer.h" #include "activity_export.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -35,7 +36,7 @@ class activity_Export POA_Holder POA_Holder (void); /// The arg_shifter options are read in the following manner: -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)* - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// Activate the new POA using the parameters initialized before. void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp index 03a87bb3a6c..870fac04ecc 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp @@ -26,9 +26,9 @@ Periodic_Task::~Periodic_Task () } int -Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter) +Periodic_Task::init_task (ACE_TArg_Shifter<char>& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -101,7 +101,7 @@ Periodic_Task::job (Job_ptr job) } void -Periodic_Task::dump_stats (ACE_TCHAR* msg) +Periodic_Task::dump_stats (char* msg) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s%s", name_.c_str (),".dat"); diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h index ca4c822eeff..3fb8ed12a82 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h @@ -19,10 +19,10 @@ #include "ace/SString.h" #include "JobC.h" #include "activity_export.h" +#include "ace/Arg_Shifter.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; -class ACE_Arg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL class Task_Stats; @@ -41,13 +41,13 @@ class activity_Export Periodic_Task : public ACE_Task <ACE_SYNCH> ~Periodic_Task (); /// Init the state of this object. - int init_task (ACE_Arg_Shifter& arg_shifter); + int init_task (ACE_TArg_Shifter<char>& arg_shifter); /// Activate this task, synch on the given barrier. virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping) = 0; /// Dump the stats collected. - void dump_stats (ACE_TCHAR* msg); + void dump_stats (char* msg); /// = Job get/set /// Returns the name of the Job exec'ed by this Task. diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index bcd6ae53d88..1ef20b42e0b 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -55,10 +55,10 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); // first dump what the caller has to say. ACE_OS::fprintf (output_file, "%s\n",msg); @@ -67,7 +67,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, // calc throughput. - ACE_TCHAR out_msg[BUFSIZ]; + char out_msg[BUFSIZ]; ACE_hrtime_t elapsed_microseconds = (end_time_ - base_time_) / scale_factor; double elapsed_seconds = @@ -99,12 +99,12 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, } void -Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) +Task_Stats::dump_latency_stats (char *out_msg, ACE_UINT32 sf) { if (this->samples_count_ == 0u) { ACE_OS::sprintf (out_msg, - ACE_TEXT ("# no data collected\n")); + "# no data collected\n"); return; } @@ -141,7 +141,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) ACE_UINT32 tmax = ACE_CU64_TO_CU32 (tmax_); ACE_OS::sprintf(out_msg, - ACE_TEXT ("#latency : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"), + "#latency : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n", l_min, this->exec_time_min_at_, l_avg, l_max, this->exec_time_max_at_, diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h index 8252c071c89..dcfb00a145b 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.h +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h @@ -61,10 +61,10 @@ class activity_Export Task_Stats /// Record a sample int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index 4a7db7dd4ab..6a27728be15 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -8,10 +8,12 @@ #include "DT_Creator.h" #include "tao/RTScheduling/Current.h" +#include "ace/Arg_Shifter.h" + ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter; int -DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter) +DT_Creator::dt_task_init (ACE_TArg_Shifter<char>& arg_shifter) { static int dt_index = 0; int start_time = 0; @@ -20,7 +22,7 @@ DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter) int importance = 0; char *job_name = 0; int dist = 0; - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; if (arg_shifter.cur_arg_strncasecmp ("-Importance") == 0) { arg_shifter.consume_arg (); @@ -70,9 +72,9 @@ DT_Creator::init (int argc, char *argv []) active_job_count_ = 0; ACE_NEW_RETURN (log, char*[BUFSIZ * 100],-1); - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; dt_count_ = 0; poa_count_ = 0; @@ -136,7 +138,7 @@ DT_Creator::init (int argc, char *argv []) delete this->job_list_[job_count]; return -1; } - else + else job_count++; } else if ((current_arg = arg_shifter.get_the_parameter ("-OutFile"))) @@ -216,10 +218,10 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Synch Name %s\n", synch_name.c_str ())); - + ACE_NEW (synch_, Synch_i); - + Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -274,7 +276,7 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - + for (int i = 0; i < poa_count_; ++i) { poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in () @@ -454,13 +456,13 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current ACE_DEBUG ((LM_DEBUG, "Waiting to Synch\n")); - + while (!this->synch ()->synched ()) { this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - + CORBA::Policy_var sched_param; sched_param = CORBA::Policy::_duplicate (this->sched_param (100)); const char * name = 0; @@ -587,7 +589,7 @@ DT_Creator::check_ifexit (void) shutdown = 1; - FILE* log_file = ACE_OS::fopen (log_file_name_, "w"); + FILE* log_file = ACE_OS::fopen (log_file_name_, ACE_TEXT("w")); if (log_file != NULL) { diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index b461ab298b2..da03d5b5f3f 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -28,7 +28,7 @@ class DT_Creator : public ACE_Service_Object int init (int argc, char *argv []); - int dt_task_init (ACE_Arg_Shifter& arg_shifter); + int dt_task_init (ACE_TArg_Shifter<char>& arg_shifter); virtual void create_distributable_threads (RTScheduling::Current_ptr current ACE_ENV_ARG_DECL_WITH_DEFAULTS); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 5019ee6ae5d..9b874cefd04 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -213,7 +213,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf char msg [BUFSIZ]; ACE_OS::sprintf (msg, "The Guid is " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", gu_id); DT_TEST::instance ()->dt_creator ()->log_msg (msg); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index 2d328877266..e88c41a27eb 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -8,6 +8,7 @@ #include "../Task_Stats.h" #include "../Synch_i.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" DT_Test::DT_Test (void) { @@ -259,13 +260,14 @@ DT_Test::orb (void) } int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_FP_DT_Creator); - DT_TEST::instance ()->run (argc, argv + DT_TEST::instance ()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp index 6179d1dac37..b8aee4ede56 100644 --- a/TAO/examples/RTScheduling/Job_i.cpp +++ b/TAO/examples/RTScheduling/Job_i.cpp @@ -37,7 +37,7 @@ Job_i::poa (void) } int -Job_i::init (ACE_Arg_Shifter& arg_shifter) +Job_i::init (ACE_TArg_Shifter<char>& arg_shifter) { job_name_ = arg_shifter.get_current (); // Read the name of the Job arg_shifter.consume_arg (); @@ -75,7 +75,7 @@ Job_i::work (CORBA::ULong work, char msg [BUFSIZ]; ACE_OS::sprintf (msg, "Guid is " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", guid_); dt_creator_->log_msg (msg); @@ -137,7 +137,7 @@ Job_i::dump_stats (void) char fname [BUFSIZ]; ACE_OS::sprintf (fname, "Job_" - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A ".dat", guid_); @@ -150,7 +150,7 @@ Job_i::dump_stats (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "#Schedule Output for DT " - ACE_SIZE_T_FORMAT_SPECIFIER, + ACE_SIZE_T_FORMAT_SPECIFIER_A, guid_); task_stats_->dump_samples (fname, diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h index 3aaf9bf3e1b..6b290a7e7a6 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -17,8 +17,10 @@ #include "Task_Stats.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL class DT_Creator; @@ -38,7 +40,7 @@ class Job_i : public POA_Job ~Job_i (void); /// Init the state of this object. - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// = Accessors const ACE_CString& name (void); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index bfb170e19b2..7aca93a7626 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -92,7 +92,7 @@ MIF_Task::perform_task (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "MIF_Task::perform_task " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", count_); dt_creator_->log_msg (msg); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 8ef6d268b8d..ebf9c28cd9d 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -8,6 +8,7 @@ #include "../Thread_Task.h" #include "../Task_Stats.h" #include "../Synch_i.h" +#include "ace/Argv_Type_Converter.h" DT_Test::DT_Test (void) { @@ -155,15 +156,16 @@ DT_Test::current (void) } int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_MIF_DT_Creator); ACE_DEBUG ((LM_DEBUG, "%t\n")); - DT_TEST::instance ()->run (argc, argv + DT_TEST::instance ()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp index 3013a8769f7..61a51a7ff8c 100644 --- a/TAO/examples/RTScheduling/POA_Holder.cpp +++ b/TAO/examples/RTScheduling/POA_Holder.cpp @@ -12,12 +12,12 @@ POA_Holder::POA_Holder (void) } int -POA_Holder::init (ACE_Arg_Shifter& arg_shifter) +POA_Holder::init (ACE_TArg_Shifter<char>& arg_shifter) { ACE_DEBUG ((LM_DEBUG, "Init POA\n")); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; POA_name_ = arg_shifter.get_current (); // Read the name of the POA arg_shifter.consume_arg (); diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h index 28adbd31a18..b155203b515 100644 --- a/TAO/examples/RTScheduling/POA_Holder.h +++ b/TAO/examples/RTScheduling/POA_Holder.h @@ -17,11 +17,12 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -//#include "activity_export.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -38,7 +39,7 @@ public: /// The arg_shifter options are read in the following manner: ///-POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)* - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// Activate the new POA using the parameters initialized before. void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp index 3e0b46bca7d..8abff46a9f0 100644 --- a/TAO/examples/RTScheduling/Starter.cpp +++ b/TAO/examples/RTScheduling/Starter.cpp @@ -2,6 +2,7 @@ #include "Starter.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Argv_Type_Converter.h" Starter::Starter (CORBA::ORB_ptr orb) @@ -132,12 +133,13 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 77d364d710d..c3078316775 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -57,11 +57,11 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h index b32f1041bfc..e76f669562f 100644 --- a/TAO/examples/RTScheduling/Task_Stats.h +++ b/TAO/examples/RTScheduling/Task_Stats.h @@ -60,10 +60,10 @@ class Task_Stats /// Record a sample int sample (ACE_UINT32 thr_run_time, int thr_count); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp index e7c3997f565..217f34ed25e 100644 --- a/TAO/examples/RTScheduling/Thread_Task.cpp +++ b/TAO/examples/RTScheduling/Thread_Task.cpp @@ -45,7 +45,7 @@ Thread_Task::svc (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "Thread_Task::svc Imp=%d Guid=" - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", importance_, count_); @@ -112,7 +112,7 @@ Thread_Task::dump_stats (void) char fname [BUFSIZ]; ACE_OS::sprintf (fname, "DT_" - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A ".dat",count_); if (TAO_debug_level > 0) @@ -123,7 +123,7 @@ Thread_Task::dump_stats (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "#Schedule Output for DT " - ACE_SIZE_T_FORMAT_SPECIFIER, + ACE_SIZE_T_FORMAT_SPECIFIER_A, count_); task_stats_->dump_samples (fname, diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index 6a1e517f271..afc6751b284 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -34,7 +34,7 @@ Server<Servant>::~Server (void) template <class Servant> int Server<Servant>::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:"); int c = 0; while ((c = get_opts ()) != -1) @@ -44,7 +44,7 @@ Server<Servant>::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", @@ -317,7 +317,7 @@ Client<INTERFACE_OBJECT, Var>::read_ior (char *filename) template <class INTERFACE_OBJECT, class Var> int Client<INTERFACE_OBJECT, Var>::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:nk:x"); int c = 0; int result = 0; diff --git a/TAO/examples/Simple/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp index 0f426992f06..0368a2a9a6b 100644 --- a/TAO/examples/Simple/bank/client.cpp +++ b/TAO/examples/Simple/bank/client.cpp @@ -1,19 +1,20 @@ // $Id$ # include "Bank_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Bank_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nBank client\n\n")); - if (client.run ("Bank",argc, argv) == -1) + if (client.run ("Bank",convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp index 57ded2b1063..e3742560466 100644 --- a/TAO/examples/Simple/bank/server.cpp +++ b/TAO/examples/Simple/bank/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "AccountManager_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<AccountManager_i> server; ACE_DEBUG ((LM_DEBUG, @@ -15,8 +17,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { if (server.init ("Bank", - argc, - argv + convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index 268da16eaeb..a89acd1f4d7 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -45,7 +45,7 @@ Client_i::~Client_i (void) int Client_i::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:f:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index 208a440ad86..bfffd972074 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -35,7 +35,7 @@ Server_i::~Server_i (void) int Server_i::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -109,7 +109,7 @@ int Server_i::write_IOR(const char* ior) { FILE* ior_output_file_ = - ACE_OS::fopen (this->ior_file_name_, "w"); + ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w")); if (ior_output_file_) { diff --git a/TAO/examples/Simple/chat/client.cpp b/TAO/examples/Simple/chat/client.cpp index 7caf6e595a0..310388c23b3 100644 --- a/TAO/examples/Simple/chat/client.cpp +++ b/TAO/examples/Simple/chat/client.cpp @@ -17,15 +17,17 @@ // =========================================================== #include "Client_i.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { Client_i client_i; - if (client_i.init (argc, argv) == -1 + if (client_i.init (convert.get_argc(), convert.get_ASCII_argv()) == -1 || client_i.run () == -1) return -1; diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp index 66937b85a2e..6f418bb94bc 100644 --- a/TAO/examples/Simple/chat/server.cpp +++ b/TAO/examples/Simple/chat/server.cpp @@ -18,16 +18,17 @@ // =========================================================== #include "Server_i.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { Server_i server_i; - int ret = server_i.init (argc, argv ACE_ENV_ARG_PARAMETER); + int ret = server_i.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Simple/echo/client.cpp b/TAO/examples/Simple/echo/client.cpp index f2aa863069b..e684030e64e 100644 --- a/TAO/examples/Simple/echo/client.cpp +++ b/TAO/examples/Simple/echo/client.cpp @@ -1,21 +1,22 @@ //$Id$ # include "Echo_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Echo_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nEcho client\n\n")); if (client.run ("Echo", - argc, - argv) == -1) + convert.get_argc(), + convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index b74d5bc7af6..1d10849bf82 100644 --- a/TAO/examples/Simple/echo/server.cpp +++ b/TAO/examples/Simple/echo/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Echo_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Echo_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Echo", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp index d333682c8dd..0d5abe3d825 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.cpp +++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp @@ -32,7 +32,7 @@ Grid_Client_i::parse_args (int argc, char *argv[]) { // Parses some of the options that are specific to this example - ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:p:q:v:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "df:nk:xw:h:p:q:v:"); int c = 0; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp index 4bec0e49dad..e3bfee639d3 100644 --- a/TAO/examples/Simple/grid/client.cpp +++ b/TAO/examples/Simple/grid/client.cpp @@ -1,19 +1,20 @@ // $Id$ # include "Grid_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Grid_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nGrid client\n\n")); - if (client.run ("Grid", argc, argv) == -1) + if (client.run ("Grid", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp index 6e95c17f2b5..4f871176f8c 100644 --- a/TAO/examples/Simple/grid/server.cpp +++ b/TAO/examples/Simple/grid/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Grid_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Grid_Factory_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Grid", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index 78bd1de184d..8d7359b8eec 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -138,7 +138,7 @@ DLL_ORB::fini (void) int Time_Date_Servant::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dn:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dn:o:"); int c = 0; this->orb_ = "ORB"; @@ -150,7 +150,7 @@ Time_Date_Servant::parse_args (int argc, char *argv[]) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp index 452afbec7fa..2f1f52367c6 100644 --- a/TAO/examples/Simple/time-date/client.cpp +++ b/TAO/examples/Simple/time-date/client.cpp @@ -1,18 +1,20 @@ // $Id$ # include "Time_Date_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Time_Date_Client_i client; ACE_DEBUG ((LM_DEBUG, "\nTime_Date client\n\n")); - if (client.run ("Time_Date", argc, argv) == -1) + if (client.run ("Time_Date", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/time-date/server.cpp b/TAO/examples/Simple/time-date/server.cpp index f9ddbadc4bb..11282eacc7a 100644 --- a/TAO/examples/Simple/time-date/server.cpp +++ b/TAO/examples/Simple/time-date/server.cpp @@ -21,15 +21,18 @@ #include "ace/Service_Config.h" #include "ace/Reactor.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (time_date, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (ACE_Service_Config::open (argc, argv) == -1 + ACE_Argv_Type_Converter convert (argc, argv); + + if (ACE_Service_Config::open (convert.get_argc(), convert.get_TCHAR_argv()) == -1 && errno != ENOENT) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index ace24d63d6e..c21f21625ef 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -49,7 +49,7 @@ Time_Client_i::run (const char *name, // Print out value // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly // under 64-bit solaris. - ACE_TCHAR ascii_timedate[64] = ""; + ACE_TCHAR ascii_timedate[64] = ACE_TEXT(""); ACE_OS::ctime_r (reinterpret_cast<const time_t *> (&timedate), ascii_timedate, 64); diff --git a/TAO/examples/Simple/time/client.cpp b/TAO/examples/Simple/time/client.cpp index 28eab3cb977..fe1bfe44049 100644 --- a/TAO/examples/Simple/time/client.cpp +++ b/TAO/examples/Simple/time/client.cpp @@ -1,19 +1,20 @@ //$Id$ # include "Time_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Time_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\n\tTime and date client\n\n")); - if (client.run ("Time",argc, argv) == -1) + if (client.run ("Time",convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp index 8c3792e16b5..22587e72d04 100644 --- a/TAO/examples/Simple/time/server.cpp +++ b/TAO/examples/Simple/time/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Time_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Time_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Time", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 66548bcc92c..008c19f07ba 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -37,6 +37,7 @@ #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event_Supplier, DualEC_Sup, @@ -824,7 +825,7 @@ DualEC_Supplier::load_schedule_data () FILE *input_file; int scan_count = 0; - input_file = ACE_OS::fopen(this->input_file_name_, "r"); + input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r")); if (input_file) { @@ -952,7 +953,7 @@ DualEC_Supplier::load_schedule_data () unsigned int DualEC_Supplier::get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "f:m:b:n:w:dsrp"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:b:n:w:dsrp"); int opt; int temp; @@ -1084,8 +1085,10 @@ DualEC_Supplier::get_options (int argc, char *argv []) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); @@ -1111,8 +1114,8 @@ main (int argc, char *argv []) // Initialize ORB. TAO_ORB_Manager orb_Manager; - orb_Manager.init (argc, - argv + orb_Manager.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1121,7 +1124,7 @@ main (int argc, char *argv []) DualEC_Supplier *event_Supplier_ptr; ACE_NEW_RETURN (event_Supplier_ptr, - DualEC_Supplier(argc, argv), + DualEC_Supplier(convert.get_argc(), convert.get_ASCII_argv()), -1); // Initialize everthing diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index e14e834f16c..2a760e659f3 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -37,6 +37,7 @@ #include "ace/streams.h" #include "ace/os_include/os_limits.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Event_Supplier, Event_Con, "$Id$") @@ -253,7 +254,7 @@ Demo_Consumer::shutdown (void) static unsigned int get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "Oc:djm:s:t:?"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "Oc:djm:s:t:?"); int opt; while ((opt = get_opt ()) != EOF) @@ -289,14 +290,16 @@ get_options (int argc, char *argv []) // function main. int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -334,7 +337,7 @@ main (int argc, char *argv []) ACE_Scheduler_Factory::use_config (naming_context.in ()); - if (get_options (argc, argv)) + if (get_options (convert.get_argc(), convert.get_ASCII_argv())) ACE_OS::exit (-1); // Get the Event Channel. diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 748cc06b360..31a5d91e55c 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -34,6 +34,7 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event_Supplier, Event_Sup, @@ -129,7 +130,7 @@ Event_Supplier::load_schedule_data FILE *input_file; int scan_count = 0; - input_file = ACE_OS::fopen(this->input_file_name_, "r"); + input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r")); if (input_file) { @@ -381,7 +382,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data, unsigned int Event_Supplier::get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "f:m:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:"); int opt; int temp; @@ -443,15 +444,17 @@ Event_Supplier::get_options (int argc, char *argv []) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. TAO_ORB_Manager orb_Manager; - orb_Manager.init (argc, - argv + orb_Manager.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -460,7 +463,7 @@ main (int argc, char *argv []) Event_Supplier *event_Supplier_ptr; ACE_NEW_RETURN (event_Supplier_ptr, - Event_Supplier(argc, argv), + Event_Supplier(convert.get_argc(), convert.get_ASCII_argv()), -1); // Initialize everthing diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index f0d96b78e60..7a5845427cd 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -36,6 +36,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" #include "ace/os_include/os_ctype.h" @@ -137,7 +138,7 @@ Logging_Supplier::load_schedule_data FILE *input_file; int scan_count = 0; - input_file = ACE_OS::fopen(this->input_file_name_, "r"); + input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r")); if (input_file) { @@ -410,7 +411,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, unsigned int Logging_Supplier::get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "f:m:d:s"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:d:s"); int opt; int temp; @@ -489,15 +490,17 @@ Logging_Supplier::get_options (int argc, char *argv []) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. TAO_ORB_Manager orb_Manager; - orb_Manager.init (argc, - argv + orb_Manager.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -506,7 +509,7 @@ main (int argc, char *argv []) Logging_Supplier *event_Supplier_ptr; ACE_NEW_RETURN (event_Supplier_ptr, - Logging_Supplier(argc, argv), + Logging_Supplier(convert.get_argc(), convert.get_ASCII_argv()), -1); // Initialize everthing diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index b811e0b9aca..37cde53d55f 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -3,15 +3,18 @@ #include "testC.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(TypeCode_Creation, main, "$Id$") -int main(int argc, char *argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/ior_corbaloc/client.cpp b/TAO/examples/ior_corbaloc/client.cpp index 1cbae2ff35e..6c0c946cc87 100644 --- a/TAO/examples/ior_corbaloc/client.cpp +++ b/TAO/examples/ior_corbaloc/client.cpp @@ -18,9 +18,12 @@ // ============================================================================ #include "ior_corbaloc_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -29,7 +32,7 @@ int main (int argc, char *argv []) IOR_corbaloc_Client_i client; int init_result; - init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + init_result = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (init_result == 0) diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp index 80c352cb9fa..a91683c5637 100644 --- a/TAO/examples/ior_corbaloc/corbaname_client.cpp +++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp @@ -14,17 +14,19 @@ #include "corbalocC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); @@ -38,7 +40,7 @@ int main (int argc, char *argv []) // Get an object reference using a corbaname: style URL CORBA::Object_var obj = - orb->string_to_object (argv[1] + orb->string_to_object (convert.get_ASCII_argv()[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp index b5351d69be2..fcf73639625 100644 --- a/TAO/examples/ior_corbaloc/server.cpp +++ b/TAO/examples/ior_corbaloc/server.cpp @@ -4,15 +4,18 @@ #include "status_i.h" #include "tao/PortableServer/PortableServer.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -43,7 +46,7 @@ int main (int argc, char* argv[]) // Create the servant corbaloc_Status_i status_i; - status_i.set_name (argv[1]); + status_i.set_name (convert.get_ASCII_argv()[1]); // Activate it to obtain the reference corbaloc::Status_var status = status_i._this (); diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp index bc4b918404d..a25399ef526 100644 --- a/TAO/examples/mfc/client.cpp +++ b/TAO/examples/mfc/client.cpp @@ -2,19 +2,20 @@ #include "w32_testS.h" #include "ace/streams.h" - +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *orb_name = ""; ACE_DEBUG ((LM_DEBUG, "Initializing the ORB!\n")); - CORBA::ORB_var the_orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var the_orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |