diff options
author | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-13 22:24:53 +0000 |
---|---|---|
committer | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-13 22:24:53 +0000 |
commit | 035485d43a2c14c1e4737972416ce3ff1e6d6310 (patch) | |
tree | dd5da3c3bcfb4bdcce7f2b9323f4b566efb9b0f2 | |
parent | 7d69693cabee77dbabfd1fac9aee0be592b3c7fd (diff) | |
download | ATCD-035485d43a2c14c1e4737972416ce3ff1e6d6310.tar.gz |
*** empty log message ***
124 files changed, 409 insertions, 244 deletions
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index 3e82e7f8c79..33cb662f799 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -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.cpp b/TAO/examples/AMH/Sink_Server/client.cpp index 286f978a128..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 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 73eb3d6533e..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 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 fcf53b1a975..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) @@ -21,7 +22,8 @@ usage (const char *message) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 c67d6f6d742..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, @@ -73,6 +74,7 @@ private: int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var progress_object = diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp index d8a650c0076..05ac881a6a6 100644 --- a/TAO/examples/Advanced/ch_3/client.cpp +++ b/TAO/examples/Advanced/ch_3/client.cpp @@ -21,6 +21,7 @@ #include "timeC.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" // The following header is #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. @@ -29,6 +30,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); try { // Check arguments @@ -39,7 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } // 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]); diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp index e4efc619c9a..be27a730d67 100644 --- a/TAO/examples/Advanced/ch_3/server.cpp +++ b/TAO/examples/Advanced/ch_3/server.cpp @@ -21,6 +21,7 @@ #include "server.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. @@ -49,10 +50,11 @@ get_gmt (void) throw (CORBA::SystemException) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + 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 diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index 5f4332f44e0..bdccbf35b74 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/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_AMI, client, @@ -260,20 +261,20 @@ setup_buffering_constraints (CORBA::ORB_ptr orb int 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 110928b1f23..72443e37bb9 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -3,6 +3,7 @@ #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, @@ -39,11 +40,11 @@ parse_args (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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -62,7 +63,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -78,7 +79,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 a9bc29c261e..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$") @@ -116,20 +117,20 @@ parse_args (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 { // 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 9b0a09b7e33..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$") @@ -37,11 +38,11 @@ parse_args (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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -60,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -76,7 +77,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index 63b43bce7de..1bbbb931c30 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -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 a86870904eb..ecce3a44f2e 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -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 2f9dc2e7262..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 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 9e5ec8e0e4b..fcd8ce876bd 100644 --- a/TAO/examples/Callback_Quoter/notifier.cpp +++ b/TAO/examples/Callback_Quoter/notifier.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Notifier_Input_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(notifier, Callback_Quoter, "$Id$") @@ -9,6 +10,7 @@ ACE_RCSID(notifier, Callback_Quoter, "$Id$") int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 b6f7ce58868..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 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/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index ff3de1a69cd..3b691eddb3b 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, @@ -28,6 +29,7 @@ void invoke_requests (int argc, int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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; diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index 19f56edda82..73d9548f64e 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -7,6 +7,7 @@ #include "Web_ServerS.h" #include "Iterator_Factory_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Iterator, server, @@ -15,12 +16,12 @@ ACE_RCSID (AMI_Iterator, int 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/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 1dc3cd12b82..08e8295b948 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, @@ -28,6 +29,7 @@ void invoke_requests (int argc, int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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; diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 0deb0b8bcf0..39d6de39ef2 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -6,6 +6,7 @@ #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, @@ -14,12 +15,12 @@ ACE_RCSID (AMI_Observer, int 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/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index 9f96a17484b..3476e624386 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, @@ -34,6 +34,7 @@ int spawn_viewer (const char *content_type, int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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; diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index b756e238287..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" @@ -15,12 +16,12 @@ ACE_RCSID (SMI_Iterator, int 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 9910fff72cb..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$") @@ -112,10 +113,11 @@ Consumer::initialize (int argc, char *argv[]) int 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 4b76526c4ba..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$") @@ -63,8 +64,9 @@ Notifier::~Notifier (void) int 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 1622a55b7de..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) @@ -69,10 +70,11 @@ Supplier::init (int argc, char *argv[]) int 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 676dfdf7b91..ffb3c4f87bc 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -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/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 319aacfb947..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$") @@ -97,6 +98,7 @@ parse_args (int argc, char *argv[]) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 eda19c363a5..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$") @@ -82,6 +83,7 @@ Task_Stats task_stats; int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 59e045e2dcd..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$") @@ -97,6 +98,7 @@ parse_args (int argc, char *argv[]) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 7501961e904..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$") @@ -82,6 +83,7 @@ Task_Stats task_stats; int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 67844aae321..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$") @@ -102,6 +103,7 @@ parse_args (int argc, char *argv[]) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 4f946b2b250..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$") @@ -82,6 +83,7 @@ Task_Stats task_stats; int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 281bf74eeb6..4ac1ff98374 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), @@ -207,10 +208,11 @@ Identity_Client::~Identity_Client (void) int 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 3f86c25908d..b72f1b57ef4 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), @@ -212,10 +213,11 @@ Identity_Server::~Identity_Server (void) int 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 e84f86490c4..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) @@ -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, @@ -139,10 +140,11 @@ Load_Balancing_Service::~Load_Balancing_Service (void) int 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 dbde0df1ce8..cd3286b0e06 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), @@ -88,7 +89,7 @@ Identity_Client::init (int argc, return result; // Check the non-ORB arguments. - result = this->parse_args (argc, argv); + result = this->parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) return result; } @@ -247,10 +248,11 @@ Identity_Client::~Identity_Client (void) int 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 940a48302f9..7b0881163b4 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), @@ -270,14 +271,15 @@ Identity_Server::~Identity_Server (void) int 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_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index 1ff507d161f..372e7b6078c 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) @@ -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, @@ -77,7 +78,7 @@ Load_Balancing_Service::init (int argc, return result; // Check the non-ORB arguments. - result = this->parse_args (argc, argv); + result = this->parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) return result; @@ -176,10 +177,11 @@ Load_Balancing_Service::~Load_Balancing_Service (void) int 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/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp index ba45103ede6..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 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp index a379eaad52e..3a876c2fc14 100644 --- a/TAO/examples/Logging/Logging_Test.cpp +++ b/TAO/examples/Logging/Logging_Test.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Logging_Test_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Logger, Logging_Test, "$Id$") @@ -9,12 +10,13 @@ ACE_RCSID(Logger, Logging_Test, "$Id$") int 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/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index e4aaf9dfd66..8e6fc0219ea 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -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", 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 072d7512b57..4d4793e51d8 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 ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Checkpoint_Client_i client; diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp index ba0580fbcaa..4f8d6627cdf 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 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Checkpoint_i> server; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index f18f19f6e4b..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$") @@ -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 || @@ -264,18 +265,18 @@ write_iors_to_file (const char *first_ior, int 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 9d8a837bfeb..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$") @@ -102,6 +103,7 @@ read_IOR_from_file (void) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR **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 4a7343d296a..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$") @@ -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", @@ -80,15 +81,16 @@ write_iors_to_file (const char *first_ior) int 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 ba41ad43abd..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$") @@ -73,16 +74,17 @@ parse_args (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 { // 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 08a424d629e..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$") @@ -60,15 +61,16 @@ parse_args (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 { // 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 @@ ACE_TMAIN (int argc, ACE_TCHAR **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/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp index ef047688c89..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$") @@ -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 || @@ -120,19 +121,19 @@ write_iors_to_file (const char *first_ior, int 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 f718111c242..1b84668cb10 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, @@ -59,12 +60,13 @@ find_non_existant_POA (PortableServer::POA_ptr parent, int 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 d91b6aeda7d..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$") @@ -98,17 +99,18 @@ do_calls (test_ptr test int 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 b444dd49e3c..3681d2018bc 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$") @@ -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", @@ -178,19 +179,19 @@ int ACE_TMAIN (int argc, char **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/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp index 1c161910126..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$") @@ -106,21 +107,21 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time, int 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/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp index 679dc51c67e..6a205694424 100644 --- a/TAO/examples/POA/Loader/Server_Manager.cpp +++ b/TAO/examples/POA/Loader/Server_Manager.cpp @@ -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 540ac365c5b..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 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 d25b4007e73..30e1426c7a3 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, @@ -80,13 +81,13 @@ print_poa (PortableServer::POA_ptr poa int 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/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp index 4fc470c8d5f..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$") @@ -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) @@ -102,15 +103,17 @@ write_iors_to_file (const char *first_ior, int 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/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp index 61f8d614d80..bfd11c30f66 100644 --- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp @@ -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,13 +118,12 @@ Server_i::init (int argc, char **argv) ACE_TRY { // Initialize the ORB. - orb_ = CORBA::ORB_init (argc, - argv, + 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/server.cpp b/TAO/examples/POA/On_Demand_Loading/server.cpp index e77520d321d..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 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 0e98c0b37b2..32ed0e1b3f0 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, @@ -78,13 +78,13 @@ print_poa (PortableServer::POA_ptr poa int 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/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp index acea43a2bda..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$") @@ -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", @@ -107,18 +108,18 @@ write_iors_to_file (const char *ior) int 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 c2765ad016c..eb51a43f26b 100644 --- a/TAO/examples/POA/RootPOA/RootPOA.cpp +++ b/TAO/examples/POA/RootPOA/RootPOA.cpp @@ -23,6 +23,7 @@ #include "tao/ORB.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RootPOA, RootPOA, @@ -31,12 +32,13 @@ ACE_RCSID (RootPOA, int 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 f812ff7ddca..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$") @@ -174,15 +175,16 @@ public: int 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 6037adcc072..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 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 @@ ACE_TMAIN (int argc, ACE_TCHAR **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 @@ ACE_TMAIN (int argc, ACE_TCHAR **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 @@ ACE_TMAIN (int argc, ACE_TCHAR **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/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index a77e89dd9be..acb255facee 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -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", diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp index 9eca6ea9176..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 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 bdc3c7bcb01..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 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 dcdbdc2a7cc..559897d1175 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 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Grid_Factory_i> server; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp index eaf3fcb0587..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. @@ -76,13 +77,14 @@ parse_args (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, "" 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 737bfab9b71..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. @@ -62,10 +63,11 @@ parse_args (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, "" 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index 5639e21eddc..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" @@ -75,13 +76,14 @@ parse_args (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, "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 a417b20bba5..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" @@ -81,10 +82,11 @@ static ACE_THR_FUNC_RETURN svc (void *arg) 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, "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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 6beb2249f66..6161db6281d 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 @@ -63,11 +64,11 @@ private: //int testClient (char* orbName, char* iorFile) 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 d5e0d60822c..688660a679e 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" @@ -34,11 +35,11 @@ const char *ior_output_file = "test.ior"; 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; @@ -79,7 +80,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *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 0757996ed1a..de53842ce82 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, @@ -222,11 +223,12 @@ Quoter_Factory_Finder_Server::parse_args (void) int 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 dcc3a572208..746472da271 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, @@ -280,6 +281,7 @@ Quoter_Generic_Factory_Server::parse_args (void) int 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 diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index 47bc07ea8af..4ec6b9adfa1 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" @@ -374,6 +375,7 @@ Quoter_Client::init (int argc, char **argv) int ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_Thread_Manager thr_mgr; int i; @@ -386,7 +388,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) 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 8f9a4e58df2..582af47ef1c 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$") @@ -261,11 +262,12 @@ Quoter_Server::~Quoter_Server (void) int 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 4d0327b7c8c..ab320dd1637 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -65,10 +65,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,9 +401,9 @@ 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 ()) { @@ -433,6 +432,7 @@ Activity::create_started_flag_file (int argc, char *argv[]) int 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 +442,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index 69320dc5323..f20cad63015 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -23,7 +23,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 (); diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index d1b4ceaa3e2..c4df011e570 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -31,7 +31,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 cce1b948364..8591c1df86a 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -32,7 +32,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..c811ed9f8a2 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 ()) { diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h index aaf8e9db014..28e9733e9a5 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h @@ -38,7 +38,7 @@ 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; diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index bcd6ae53d88..a2974b08626 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -58,7 +58,7 @@ void Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *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); diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index 4a7db7dd4ab..94170a05b78 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -11,7 +11,7 @@ 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 +20,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 +70,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; @@ -587,7 +587,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/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index 5841566331c..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) { @@ -261,11 +262,12 @@ DT_Test::orb (void) int 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 980a902fe5d..3fa80cbb8ae 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 (); @@ -77,7 +77,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); @@ -139,7 +139,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_); @@ -152,7 +152,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 acf9febe00c..149120fa698 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -35,7 +35,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 29bf0e42ffd..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) { @@ -157,13 +158,14 @@ DT_Test::current (void) int 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 92a15b22ea4..8319c86ef1a 100644 --- a/TAO/examples/RTScheduling/POA_Holder.h +++ b/TAO/examples/RTScheduling/POA_Holder.h @@ -35,7 +35,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 15185dee0e3..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) @@ -134,10 +135,11 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list 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/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 77d364d710d..ac7ebb1c3ab 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -61,7 +61,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *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/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 f84501e9f32..afc6751b284 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -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", diff --git a/TAO/examples/Simple/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp index 586c124a1b4..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 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 9b7777922bb..344f9a0fa35 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 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<AccountManager_i> server; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index 1cc63d13363..bfffd972074 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -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 bbdf78afc6b..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 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 9d923aa8202..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 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 1cf6504cb4e..b46a6fa80f1 100644 --- a/TAO/examples/Simple/echo/client.cpp +++ b/TAO/examples/Simple/echo/client.cpp @@ -1,15 +1,16 @@ //$Id$ # include "Echo_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int 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")); diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index b72724f176a..b7f3319b4f3 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 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Echo_i> server; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp index ea29a16be66..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 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 ee52d3e1498..925e1ecfffd 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 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Grid_Factory_i> server; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp index 672242e4f23..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 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 d45139ea6c4..4f7c3ce38ae 100644 --- a/TAO/examples/Simple/time-date/server.cpp +++ b/TAO/examples/Simple/time-date/server.cpp @@ -21,6 +21,7 @@ #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, @@ -29,7 +30,9 @@ ACE_RCSID (time_date, int 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_ASCII_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 c4744c3f60a..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 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 319592e534b..7940dbe829b 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 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Time_i> server; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 2ac7820b5ef..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) { @@ -1086,6 +1087,8 @@ DualEC_Supplier::get_options (int argc, char *argv []) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 db30905e5ca..1004129d82c 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$") @@ -291,12 +292,14 @@ get_options (int argc, char *argv []) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 c3ddde7b827..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) { @@ -445,13 +446,15 @@ Event_Supplier::get_options (int argc, char *argv []) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 f61db5d51dd..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" @@ -491,13 +492,15 @@ Logging_Supplier::get_options (int argc, char *argv []) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 19eb91bad01..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 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 676360d9c16..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 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 ACE_TMAIN (int argc, ACE_TCHAR *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 1667a4ed9bb..7eea89b44cb 100644 --- a/TAO/examples/ior_corbaloc/corbaname_client.cpp +++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp @@ -14,17 +14,19 @@ #include "ior_corbaloc_client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" 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); diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp index 59af60a3f93..c5e325791c8 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 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; diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp index c75e3f4a808..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 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; |