diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
| commit | d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch) | |
| tree | cf04398acb7ad9fb45311eb105d60975028bbc03 /TAO/orbsvcs/tests | |
| parent | 1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff) | |
| download | ATCD-oci_wchar_refactor_post_1_5_1_branch.tar.gz | |
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
Diffstat (limited to 'TAO/orbsvcs/tests')
336 files changed, 1803 insertions, 1273 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index a651f3c4ca4..b3cc2fa54f3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -13,7 +13,7 @@ Connection_Manager::~Connection_Manager (void) void Connection_Manager::load_ep_addr (const char* file_name) { - FILE* addr_file = ACE_OS::fopen (file_name, "r"); + FILE* addr_file = ACE_OS::fopen (file_name, ACE_TEXT("r")); if (addr_file == 0) { diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index 34239319d22..de5a4a6b40f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -2,6 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/AV/Protocol_Factory.h" typedef ACE_Unmanaged_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; @@ -112,11 +113,10 @@ Distributer::connection_manager (void) } int -Distributer::parse_args (int argc, - char **argv) +Distributer::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:r:a:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:a:"); int c; while ((c= opts ()) != -1) @@ -233,16 +233,17 @@ Distributer::done (int done) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -273,8 +274,7 @@ main (int argc, // Initialize the Distributer int result = - DISTRIBUTER::instance ()->init (argc, - argv + DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index 437bf6d21b7..f78dd9cb96d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" // File handle of the file into which received data is written. static FILE *output_file = 0; @@ -142,11 +143,10 @@ Receiver::init (int, } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:r:a:"); @@ -184,16 +184,17 @@ Receiver::output_file_name (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; 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; @@ -224,15 +225,14 @@ main (int argc, Receiver receiver; int result = - receiver.parse_args (argc, - argv); + receiver.parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (receiver.output_file_name ().c_str (), - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -244,8 +244,7 @@ main (int argc, "File Opened Successfully\n")); result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index e97f210997e..0da39936aff 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -53,11 +54,10 @@ Sender::Sender (void) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:f:r:da:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:da:"); int c; while ((c= opts ()) != -1) @@ -119,7 +119,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -290,14 +290,15 @@ Sender::connection_manager (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - 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; @@ -328,8 +329,7 @@ main (int argc, // Initialize the Client. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index 3683e3e7ba2..1c27e3cf8a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" static FILE *output_file = 0; @@ -159,11 +160,10 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); int c; while ((c= opts ()) != -1) @@ -209,7 +209,7 @@ Receiver::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -268,16 +268,17 @@ Receiver::input_file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; 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; @@ -306,7 +307,7 @@ main (int argc, // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -318,8 +319,7 @@ main (int argc, "Output File Opened Successfully\n")); int result = - RECEIVER::instance ()->init (argc, - argv + RECEIVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 2e806a208a2..7a471f63f27 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" typedef ACE_Unmanaged_Singleton<Sender, ACE_Null_Mutex> SENDER; @@ -127,11 +128,10 @@ Sender::shutdown (void) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -214,7 +214,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -426,15 +426,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; @@ -469,8 +470,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -481,7 +481,7 @@ main (int argc, // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index bcc4f71458d..9aa2db8b1c0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -3,6 +3,7 @@ #include "distributer.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/AV/Protocol_Factory.h" #include "orbsvcs/AV/FlowSpec_Entry.h" @@ -267,11 +268,10 @@ Distributer::connection_manager (void) } int -Distributer::parse_args (int argc, - char **argv) +Distributer::parse_args (int argc, char **argv) { /// Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:r:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:"); int c; while ((c= opts ()) != -1) @@ -426,16 +426,17 @@ Distributer::done (int done) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -466,8 +467,7 @@ main (int argc, /// Initialize the Distributer int result = - DISTRIBUTER::instance ()->init (argc, - argv + DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index 573fdb12f34..b1a6c0ee29a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "tao/Strategies/advanced_resource.h" @@ -222,11 +223,10 @@ Receiver::init (int, } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { /// Parse the command line arguments - ACE_Get_Opt opts (argc, + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:r:"); @@ -285,16 +285,17 @@ Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// 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; @@ -325,15 +326,14 @@ main (int argc, Receiver receiver; int result = - receiver.parse_args (argc, - argv); + receiver.parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; /// Make sure we have a valid <output_file> output_file = ACE_OS::fopen (receiver.output_file_name ().c_str (), - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -345,8 +345,7 @@ main (int argc, "File Opened Successfully\n")); result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index 34c878c4584..f5d4bff2bb9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Event_Handler.h" @@ -173,11 +174,10 @@ Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { /// Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:d"); int c; while ((c= opts ()) != -1) @@ -245,7 +245,7 @@ Sender::init (int argc, /// Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -452,14 +452,15 @@ Sender::connection_manager (void) // } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - 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; @@ -490,8 +491,7 @@ main (int argc, /// Initialize the Client. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 16d694eb261..012d651f7ea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -102,10 +102,9 @@ FTP_Client_Producer::get_callback (const char *, } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { - ACE_Get_Opt opts (argc,argv,"f:l:a:p:s"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:s"); this->use_sfp_ = 0; int c; @@ -246,7 +245,7 @@ Client::init (int argc,char **argv) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() )); - this->fp_ = ACE_OS::fopen (this->filename_,"r"); + this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r")); if (this->fp_ != 0) { @@ -343,14 +342,15 @@ Client::run (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -365,7 +365,7 @@ main (int argc, int result = 0; - result = CLIENT::instance ()->init (argc,argv); + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h index bb0cfdd19c0..cffb6fbd151 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h @@ -5,6 +5,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Flows_T.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp index 7a7a0686962..98f9d5798b0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "server.h" +#include "ace/Argv_Type_Converter.h" FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void) :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ()) @@ -101,7 +102,7 @@ Server::format (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -183,7 +184,7 @@ Server::run (void) int Server::parse_args (int argc,char **argv) { - ACE_Get_Opt opts (argc,argv,"f:p:"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:"); int c; while ((c = opts ()) != -1) @@ -191,7 +192,7 @@ Server::parse_args (int argc,char **argv) switch (c) { case 'f': - this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w"); + this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -220,16 +221,17 @@ Server::file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -250,7 +252,7 @@ main (int argc, ACE_ENDTRY; ACE_CHECK_RETURN (-1); - result = FTP_SERVER::instance ()->init (argc,argv); + result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"SERVER::init failed\n"),1); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index f88e8ee7c20..5f9483fb1e0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Flows_T.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 07ce3c8e804..dbb3112476b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -6,7 +6,9 @@ #include "tao/Strategies/advanced_resource.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/INET_Addr.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Latency, ping, @@ -23,7 +25,7 @@ int milliseconds = 30000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:g:s:r:t:p:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:g:s:r:t:p:d"); int c; while ((c = get_opts ()) != -1) @@ -77,14 +79,15 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); - parse_args (argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 886394ae9f9..0b4fbcddc1c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -5,6 +5,7 @@ #include "tao/ORB.h" #include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" @@ -28,7 +29,7 @@ ACE_Throughput_Stats recv_latency; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xo:s:r:t:"); int c; while ((c = get_opts ()) != -1) @@ -93,15 +94,16 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -144,7 +146,7 @@ int main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 42979b096e9..20abc49fe83 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -7,6 +7,7 @@ #include "tao/ORB.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" @@ -32,7 +33,7 @@ ACE_Throughput_Stats send_latency; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:b:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xo:s:r:t:b:d"); int c; while ((c = get_opts ()) != -1) @@ -109,16 +110,17 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -160,7 +162,7 @@ int main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index f9dc8ccefca..d0fd2ce12e1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File handle of the file into which received data is written. @@ -218,12 +219,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -244,16 +243,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -283,15 +283,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -304,8 +303,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 5788046dcb9..c1704ef8157 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -90,11 +91,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -177,7 +177,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -371,15 +371,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; @@ -410,8 +411,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index ee6b23f62df..07d956ef648 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -124,10 +124,9 @@ Endpoint_Reactive_Strategy::make_stream_endpoint (FTP_Client_StreamEndPoint *&en } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { - ACE_Get_Opt opts (argc,argv,"f:a:p:s"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:s"); this->use_sfp_ = 0; int c; @@ -240,7 +239,7 @@ Client::init (int argc,char **argv) "the TAO_Naming_Client. \n"), -1); - this->fp_ = ACE_OS::fopen (this->filename_,"r"); + this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -347,14 +346,15 @@ Client::run (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -368,7 +368,7 @@ main (int argc, ACE_TRY_CHECK; int result = 0; - result = CLIENT::instance ()->init (argc,argv); + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h index 9cd6cc7e47f..2fae237090a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h @@ -5,6 +5,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index 343079ff7dd..0f235cfb35e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -64,7 +64,7 @@ Server::Server (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -165,7 +165,7 @@ Server::run (void) int Server::parse_args (int argc,char **argv) { - ACE_Get_Opt opts (argc,argv,"f:p:"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:"); int c; while ((c = opts ()) != -1) @@ -173,7 +173,7 @@ Server::parse_args (int argc,char **argv) switch (c) { case 'f': - this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w"); + this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -196,12 +196,13 @@ Server::file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); ACE_DECLARE_NEW_CORBA_ENV; @@ -227,7 +228,7 @@ main (int argc, ACE_ENDTRY; ACE_CHECK_RETURN (-1); - result = FTP_SERVER::instance ()->init (argc,argv); + result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::init failed\n"),1); result = FTP_SERVER::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h index a92714819df..8ba803f3b57 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Strategies/advanced_resource.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 11a0624b3f4..42b8f4db5be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -100,10 +100,9 @@ FTP_Client_Producer::get_callback (const char *, } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { - ACE_Get_Opt opts (argc,argv,"f:a:p:sd"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:sd"); this->use_sfp_ = 0; int c; @@ -272,7 +271,7 @@ Client::init (int argc,char **argv) "the TAO_Naming_Client. \n"), -1); - this->fp_ = ACE_OS::fopen (this->filename_,"r"); + this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -382,12 +381,12 @@ Client::run (void) } int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, + ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); ACE_DECLARE_NEW_CORBA_ENV; @@ -414,7 +413,7 @@ main (int argc, ACE_CHECK_RETURN (-1); int result = 0; - result = CLIENT::instance ()->init (argc,argv); + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h index acb8081d72d..53721f1e894 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h @@ -5,6 +5,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/PortableServer.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp index a83a5b623da..f554ad095ca 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp @@ -117,7 +117,7 @@ Server::format (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -211,7 +211,7 @@ Server::run (void) int Server::parse_args (int argc,char **argv) { - ACE_Get_Opt opts (argc,argv,"f:p:"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:"); int c; while ((c = opts ()) != -1) @@ -219,7 +219,7 @@ Server::parse_args (int argc,char **argv) switch (c) { case 'f': - this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w"); + this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -243,12 +243,12 @@ Server::file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -274,7 +274,7 @@ main (int argc, ACE_CHECK_RETURN (-1); int result = 0; - result = FTP_SERVER::instance ()->init (argc,argv); + result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::init failed\n"),1); result = FTP_SERVER::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index bdd2957c2ec..0f2efc52d0a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Endpoint_Strategy.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index ef33207328f..81365243708 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" int endstream = 0; @@ -57,7 +58,7 @@ Receiver_Callback::flowname (const char* flow_name) // Make sure we have a valid <output_file> this->output_file_ = ACE_OS::fopen (this->flowname_.c_str (), - "w"); + ACE_TEXT("w")); if (this->output_file_ == 0) ACE_ERROR ((LM_DEBUG, "Cannot open output file %s\n", @@ -139,11 +140,10 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); int c; while ((c= opts ()) != -1) @@ -229,16 +229,17 @@ Receiver::protocol_object (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; 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; @@ -268,8 +269,7 @@ main (int argc, ACE_TRY_CHECK; int result = - RECEIVER::instance ()->init (argc, - argv + RECEIVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 79169527b6d..e987cbab9be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -70,11 +71,10 @@ Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -157,7 +157,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -367,15 +367,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; @@ -406,8 +407,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index d3519e0114f..7aac2982793 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -3,6 +3,7 @@ #include "ftp.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_High_Res_Timer last_frame_sent_time; @@ -58,11 +59,10 @@ Client::set_protocol_object (TAO_AV_Protocol_Object *object) } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc,argv,"f:l:a:p:r:sd"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:r:sd"); this->use_sfp_ = 0; @@ -183,7 +183,7 @@ Client::init (int argc, // Open file to read. this->fp_ = ACE_OS::fopen (this->filename_, - "r"); + ACE_TEXT("r")); if (this->fp_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", @@ -415,14 +415,15 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - 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; @@ -454,8 +455,7 @@ main (int argc, // INitialize the Client. int result = 0; - result = CLIENT::instance ()->init (argc, - argv + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index 4f405b5a9da..c6bcf24e526 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -22,6 +22,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Endpoint_Strategy.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp index db4658830c7..489181ade03 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp @@ -4,6 +4,7 @@ #include "server.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File into which the received data is written. @@ -115,11 +116,9 @@ Server::init (int, int parse_args (int argc, - char **argv) + char **argv) { - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -140,29 +139,29 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -198,8 +197,7 @@ main (int argc, Server server; result = - server.init (argc, - argv + server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index d24c92414ff..0cf85d02a7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_String.h" #include "ace/High_Res_Timer.h" @@ -139,12 +140,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -165,9 +164,11 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -175,8 +176,7 @@ main (int argc, // 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; @@ -206,15 +206,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -227,8 +226,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 9af1f2ba80b..d67fc2ad4cc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -54,11 +55,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -141,7 +141,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -343,9 +343,11 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -353,8 +355,7 @@ main (int argc, ACE_High_Res_Timer::global_scale_factor (); CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -384,8 +385,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index dd2c65abfdd..6b9590bd82d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -2,6 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/AV/Protocol_Factory.h" // An Unmanaged_Singleton is used to avoid static object destruction @@ -302,16 +303,17 @@ Distributer::done (int done) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -342,8 +344,7 @@ main (int argc, // Initialize the Distributer int result = - DISTRIBUTER::instance ()->init (argc, - argv + DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp index 7a64da3488c..3f9c8325208 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File handle of the file into which received data is written. @@ -140,12 +141,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -166,16 +165,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -205,15 +205,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -226,8 +225,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 9e766993cf7..69dd9016e78 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -85,11 +86,10 @@ Sender::streamctrl (AVStreams::StreamCtrl_ptr streamctrl) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); int c; while ((c= opts ()) != -1) @@ -141,7 +141,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -318,15 +318,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -356,8 +357,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index 31bdd2c32e2..4a5881deaaa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" static FILE *output_file = 0; @@ -88,7 +89,7 @@ Receiver_Callback::dump_samples (const char* file) ACE_DEBUG ((LM_DEBUG, "Dumping Stats.....\n")); - FILE* stats_file = ACE_OS::fopen (file, "w"); + FILE* stats_file = ACE_OS::fopen (file, ACE_TEXT("w")); if (stats_file == 0) { @@ -102,7 +103,7 @@ Receiver_Callback::dump_samples (const char* file) stats_.sample ((ACE_UINT64)stats [i]); } - stats_.dump_results ("Inter Frame Arrival Time Statistics ", + stats_.dump_results (ACE_TEXT("Inter Frame Arrival Time Statistics "), stats_file, 1); // ACE_High_Res_Timer::global_scale_factor ()); @@ -204,12 +205,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:s:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:"); int c; while ((c = opts ()) != -1) @@ -233,16 +232,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -272,15 +272,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -293,8 +292,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index c98b0bed8bb..593430ec374 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -62,11 +63,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:dl:a:s:b:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:dl:a:s:b:"); int c; while ((c= opts ()) != -1) @@ -195,7 +195,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -434,15 +434,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -472,8 +473,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index 527be2f6f10..0c9727ea0e7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File handle of the file into which received data is written. @@ -143,12 +144,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -169,16 +168,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -208,15 +208,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -229,8 +228,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 05bc380156d..8479b4394e6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" static u_long peak_bandwidth = 18400; @@ -88,11 +89,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:l:a:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:l:a:d"); int c; while ((c= opts ()) != -1) @@ -246,7 +246,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -505,15 +505,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -543,8 +544,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc index 1201bb99646..af7410ff1cf 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): namingexe, portableserver, bidir_giop, utils { + exename = TimeServer Source_Files { TimeServer.cpp } diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 23f3ff6baf8..01c18a645e5 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/PolicyList_Destroyer.h" #include "orbsvcs/CosNamingC.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/Argv_Type_Converter.h" class Time_impl : public POA_TimeModule::Time @@ -43,16 +44,17 @@ Time_impl::Shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize orb 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; diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp index 52e3543d1ee..8420fd00355 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp @@ -2,6 +2,7 @@ // $Id$ // #include "tao/corba.h" +#include "ace/Argv_Type_Converter.h" // Attempts to resolve the NameService. // Returns: @@ -9,11 +10,13 @@ // 1 if the NameService could not be resolved // 2 if something else went wrong // -int main( int argc, char *argv[] ) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ; + CORBA::ORB_var orb = CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER ) ; ACE_TRY_CHECK; ACE_TRY_EX (nested) diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index 6a3c7f89e53..a573a085978 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -3,12 +3,15 @@ #include "tao/IFR_Client/IFR_BasicC.h" #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" -int main(int argc, char** argv) +int ACE_TMAIN(int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 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; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp index 69909f4e3d5..00158e34bac 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "file://test.ior"; int shutdown_server = 0; @@ -9,7 +10,7 @@ int shutdown_server = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,16 +36,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; 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 tmp = diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index 65c1f4c8a2b..161cdd36fdb 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Test_i.h" #include "ace/OS_NS_stdio.h" @@ -9,7 +10,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -32,14 +33,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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 = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_i server_impl (orb.in ()); @@ -79,7 +82,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "SERVER (%P): Cannot open output file " diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index 8115122177e..fb387fc28c7 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -6,9 +6,12 @@ #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h" #include "tao/AnyTypeCode/NVList.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_NEW_ENV { @@ -16,7 +19,7 @@ int main (int argc, char* argv[]) // Initialise ORB. // - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER) ; + CORBA::ORB_var orb = CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER) ; ACE_TRY_CHECK; // Find the Interface Repository. diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp index 46148e21dee..2326f722c53 100755 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" #include "tao/corba.h" #include "tao/PI/PI.h" @@ -11,7 +12,7 @@ CORBA::ORB_var orb = CORBA::ORB::_nil (); int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, ""); int c; while ((c = get_opts ()) != -1) @@ -73,16 +74,18 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::Boolean result = 0; ACE_TRY_NEW_ENV { 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; // ep1 is equivalent to no other IORs - it is not an IOGR, and ep2 is a different endpoint. diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc index cfeafb2ed12..a447eee0a74 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc @@ -10,6 +10,7 @@ project(*idl): taoidldefaults { } project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba { + exename = server after += *idl Source_Files { test_i.cpp @@ -22,6 +23,7 @@ project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba } project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, minimum_corba { + exename = Manager after += *idl Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index 74d54ebda92..215f6b349be 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -3,6 +3,7 @@ #include "Client_i.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" @@ -31,7 +32,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:c:sm"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:c:sm"); int c; while ((c = get_opts ()) != -1) @@ -75,9 +76,11 @@ parse_args (int argc, char *argv[]) int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, + ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -85,13 +88,12 @@ main (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -138,8 +140,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -286,7 +287,7 @@ Manager::write_to_file (void) 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", @@ -360,8 +361,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key) if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -419,8 +420,8 @@ int run_abort_test (Simple_Server_ptr server, if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -470,8 +471,8 @@ int run_shutdown_test (Simple_Server_ptr server, if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -573,8 +574,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp index d597ec0d27d..2ad430ca788 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" const char *ior_output_file = 0; const char *key = 0; @@ -9,7 +10,7 @@ const char *key = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:"); int c; while ((c = get_opts ()) != -1) @@ -37,17 +38,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -109,7 +112,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc index b3ba87fb27c..7f5ddb09532 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc @@ -3,6 +3,7 @@ project(*idl): taoidldefaults { idlflags += -Sc + avoids += uses_wchar IDL_Files { test.idl @@ -14,6 +15,7 @@ project(*idl): taoidldefaults { project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, minimum_corba { after += *idl + avoids += uses_wchar Source_Files { test_i.cpp @@ -32,6 +34,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, minimum_corba { after += *idl + avoids += uses_wchar Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 0d6a828940b..629830580d0 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -3,6 +3,7 @@ #include "Client_i.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "tao/IORManipulation/IORManip_Loader.h" #include "tao/PortableServer/PortableServer.h" @@ -27,7 +28,7 @@ CORBA::Object_var object_secondary = 0; int parse_args (int argc, char* argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:g:h:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:g:h:"); int c; while ((c = get_opts ()) != -1) @@ -69,9 +70,11 @@ parse_args (int argc, char* argv[]) int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { +// This test cannot be run on a wide character build +// ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -79,8 +82,7 @@ main (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -123,8 +125,7 @@ Manager::init (int& argc, char**& argv ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -320,7 +321,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const char* ior_output_file) 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", @@ -389,8 +390,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -445,8 +446,8 @@ int run_abort_test (Simple_Server_ptr server, if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -487,8 +488,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index 60f306ac782..7505a81493f 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -4,6 +4,7 @@ #include "Server_Request_Interceptor.h" #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/FaultTolerance/FT_Service_Activate.h" #include "tao/ORBInitializer_Registry.h" @@ -15,7 +16,7 @@ const char *key = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:f:"); int c; while ((c = get_opts ()) != -1) @@ -47,9 +48,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -66,11 +67,11 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; 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; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -132,7 +133,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 93760c93800..0e85c5d7de7 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -90,7 +90,7 @@ CC_Client::read_ior (char *filename) int CC_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dc:sf:k:xbhe:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dc:sf:k:xbhe:"); int c; int result; @@ -180,7 +180,7 @@ CC_Client::run (void) // Open the command file for parsing if the filename!=stdin if(ACE_OS::strcmp(this->script_file_, "stdin")!=0) { - f = ACE_OS::fopen(this->script_file_, "r"); + f = ACE_OS::fopen(this->script_file_, ACE_TEXT("r")); if(f==0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s\n", @@ -453,14 +453,16 @@ CC_Client::init (int argc, char **argv) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + CC_Client cc_client; ACE_DEBUG ((LM_DEBUG, "\n \t CosConcurrencyControl: client \n\n")); - if (cc_client.init (argc, argv) == -1) + if (cc_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_DEBUG ((LM_DEBUG, "Did not initialize correctly\n")); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h index a81df69daa0..44d9d0d1eca 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h @@ -19,6 +19,7 @@ // ============================================================================ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 5e8ce733528..d8485d8ba45 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CEC_Tests, Disconnect, @@ -16,8 +17,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -25,7 +28,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index 0c94a7bdb15..de7a4095f71 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -3,6 +3,7 @@ #include "MT_Disconnect.h" #include "Counting_Consumer.h" #include "Counting_Supplier.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" @@ -16,8 +17,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -25,7 +28,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index abaa9184f9b..c57760a147a 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -5,14 +5,17 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CEC_Tests_Basic, Pull_Push_Event, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -20,7 +23,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 3ff9f720233..627999a0e97 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -5,14 +5,17 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CEC_Tests_Basic, Push_Event, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -20,7 +23,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 0c5aea70a2f..5c6b2ffc431 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" @@ -12,10 +13,12 @@ ACE_RCSID (CEC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + RND_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -55,7 +58,7 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index 85ec4180e9f..642435bb061 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -4,6 +4,7 @@ #include "Counting_Supplier.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID( CEC_Tests_Basic, Shutdown, @@ -14,8 +15,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -23,7 +26,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 7203f01d09c..b16a79ac00e 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -13,6 +13,7 @@ #include "tao/CDR.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -23,10 +24,12 @@ ACE_RCSID (EC_Custom_Marshal, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -90,7 +93,7 @@ Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -310,9 +313,9 @@ Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) } int -Driver::parse_args (int argc, char *argv []) +Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "dc:n:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:n:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index f8dd801aa63..f1f0225126d 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/ACE.h" @@ -81,7 +82,7 @@ ECMS_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -329,9 +330,9 @@ ECMS_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) } int -ECMS_Driver::parse_args (int argc, char *argv []) +ECMS_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "ds:n:t:h:p:b:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:n:t:h:p:b:"); int opt; while ((opt = get_opt ()) != EOF) @@ -522,8 +523,10 @@ Test_Supplier::consumer_proxy (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECMS_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 2ec6c650a2c..a67e826a5e6 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -4,6 +4,7 @@ #include "Consumer.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_MT_Mcast, Consumer, diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 5441a632e0e..c61ffba80fc 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -14,6 +14,7 @@ #include "tao/Strategies/advanced_resource.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (EC_MT_Mcast, @@ -68,8 +69,10 @@ run_orb_within_thread (void *) int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can // simply using the ACE_STATIC_SVC_DEFINE() macro, unfortunately TAO @@ -83,13 +86,13 @@ main (int argc, char* argv[]) // **************** HERE IS THE ORB SETUP // Create the ORB, pass the argv list for parsing. - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the // -ORB options from the command line. - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-m udp_mcast_addr]\n")); @@ -399,7 +402,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "m:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index 0060bd58ed5..102c098053f 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -4,6 +4,7 @@ #include "Supplier.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_MT_Mcast, Supplier, diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 1fcb246b5ea..496e9a257da 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -12,6 +12,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/Read_Buffer.h" @@ -121,7 +122,7 @@ ECM_Driver::run (int argc, char* argv[]) if (this->pid_filename_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_filename_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_filename_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -339,9 +340,9 @@ ECM_Driver::dump_results (void) // **************************************************************** int -ECM_Driver::parse_args (int argc, char *argv []) +ECM_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "l:p:c:n:t:f:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:p:c:n:t:f:"); int opt; while ((opt = get_opt ()) != EOF) @@ -414,7 +415,7 @@ ECM_Driver::parse_config_file (void) { FILE* cfg = 0; if (this->config_filename_ != 0) - cfg = ACE_OS::fopen (this->config_filename_, "r"); + cfg = ACE_OS::fopen (this->config_filename_, ACE_TEXT("r")); else cfg = stdin; @@ -1150,10 +1151,12 @@ ECM_Local_Federation::subscribed_bit (int i) const } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ECM_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 2d064471253..ff62ad6dd1b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -18,6 +18,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -220,7 +221,7 @@ Test_ECG::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -1096,9 +1097,9 @@ Test_ECG::local_source (RtecEventComm::EventSourceID id) const } int -Test_ECG::parse_args (int argc, char *argv []) +Test_ECG::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); int opt; while ((opt = get_opt ()) != EOF) @@ -1595,8 +1596,10 @@ Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Test_ECG *test; // Dynamically allocate the Test_ECG instance so that we don't have @@ -1605,7 +1608,7 @@ main (int argc, char *argv []) Test_ECG, -1); - const int status = test->run (argc, argv); + const int status = test->run (convert.get_argc(), convert.get_ASCII_argv()); delete test; return status; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index ade2d62e17a..9989afbbf97 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 609bf639245..50de18a26e4 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Consumer_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -95,7 +98,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -295,9 +298,9 @@ ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) } int -ECT_Consumer_Driver::parse_args (int argc, char *argv []) +ECT_Consumer_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "xdc:s:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 0d75c42b29b..e4a90ac8900 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index d2350ca9a04..65e8abf658c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Supplier_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -107,7 +110,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -301,9 +304,9 @@ ECT_Supplier_Driver::dump_results (void) } int -ECT_Supplier_Driver::parse_args (int argc, char *argv []) +ECT_Supplier_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "ds:u:n:t:b:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:u:n:t:b:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 8aeb5fbbc40..f0552072ff8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -15,6 +15,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" @@ -26,12 +27,14 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ECT_Throughput driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -136,7 +139,7 @@ ECT_Throughput::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -475,9 +478,9 @@ ECT_Throughput::dump_results (void) } int -ECT_Throughput::parse_args (int argc, char *argv []) +ECT_Throughput::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 6e4b0d31665..3ddb3d7c466 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -4,6 +4,7 @@ #include "Counting_Supplier.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Event_Utilities.h" @@ -18,8 +19,10 @@ const int event_type = 20; const int event_source = 10; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -27,7 +30,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 93e068b6d84..794eed8a11b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "tao/ORB_Core.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/INET_Addr.h" ACE_RCSID (EC_Tests_Basic, @@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_BCast driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -28,12 +31,12 @@ EC_BCast::EC_BCast (void) } int -EC_BCast::parse_args (int& argc, char* argv[]) +EC_BCast::parse_args (int& argc, char **argv) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -85,7 +88,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; // Obtain UDP address in the string format for Gateway initialization. - char address_server_arg [256]; + ACE_TCHAR address_server_arg [256]; ACE_INET_Addr udp_addr; if (udp_addr.set (this->bcast_port_, this->bcast_address_) == -1 || udp_addr.addr_to_string (address_server_arg, 256) == -1) @@ -103,7 +106,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL) TAO_ECG_Mcast_Gateway gateway; if (gateway.init (sub, - address_server_arg, + ACE_TEXT_TO_CHAR_IN(address_server_arg), lAttributes) == -1) return; diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 83ee58c7eb8..4c299497b98 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Bitmask, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -22,7 +25,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 5a021eb4e08..3cb84193bb9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -6,14 +6,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Complex, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -21,7 +24,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index d5e07b61bb9..ce99d63f092 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -9,6 +9,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Control, @@ -18,8 +19,10 @@ const int event_type = 20; const int event_source = 10; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -27,7 +30,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index f0a3aafbcae..8f7708cefec 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Disconnect, @@ -17,8 +18,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -26,7 +29,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc index d18e0dd4515..7e0cca0b454 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -2,90 +2,105 @@ // $Id$ project(*Reconnect): rteventtestexe { + exename = Reconnect Source_Files { Reconnect.cpp } } project(*Shutdown): rteventtestexe { + exename = Shutdown Source_Files { Shutdown.cpp } } project(*Observer): rteventtestexe { + exename = Observer Source_Files { Observer.cpp } } project(*BCast): rteventtestexe { + exename = BCast Source_Files { BCast.cpp } } project(*Timeout): rteventtestexe { + exename = Timeout Source_Files { Timeout.cpp } } project(*Wildcard): rteventtestexe { + exename = Wildcard Source_Files { Wildcard.cpp } } project(*Negation): rteventtestexe { + exename = Negation Source_Files { Negation.cpp } } project(*Disconnect): rteventtestexe { + exename = Disconnect Source_Files { Disconnect.cpp } } project(*MT_Disconnect): rteventtestexe { + exename = MT_Disconnect Source_Files { MT_Disconnect.cpp } } project(*Atomic_Reconnect): rteventtestexe { + exename = Atomic_Reconnect Source_Files { Atomic_Reconnect.cpp } } project(*Bitmask): rteventtestexe { + exename = Bitmask Source_Files { Bitmask.cpp } } project(*Complex): rteventtestexe { + exename = Complex Source_Files { Complex.cpp } } project(*Gateway): rteventtestexe { + exename = Gateway Source_Files { Gateway.cpp } } project(*Control): rteventtestexe { + exename = Control Source_Files { Control.cpp } } project(*Random) : rteventtestexe { + exename = Random Source_Files { Random.cpp } diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 39c750d1a4d..324bda69d55 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Gateway, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -22,7 +25,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 9f91b760a0a..79c8420c310 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, MT_Disconnect, @@ -18,8 +19,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -27,7 +30,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 37ab5c1fb30..8d4124d1ea7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Negation, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -22,7 +25,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index d58d828573f..ee0756b5de7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_RCSID (EC_Tests_Basic, @@ -13,11 +14,13 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); EC_Master master; - return master.run (argc, argv); + return master.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -192,9 +195,9 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[] } int -EC_Master::parse_args (int &argc, char *argv []) +EC_Master::parse_args (int &argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index bb788c01258..738c8f8d257 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -49,7 +49,7 @@ public: EC_Observer* channel (int i) const; private: - int parse_args (int &argc, char *argv []); + int parse_args (int &argc, char *argv[]); private: /// The seed diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index b9397f997ed..471ea0ab073 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" @@ -14,10 +15,12 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + RND_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -62,7 +65,7 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 1fd8c294029..a00e851f14e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -5,6 +5,7 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_RCSID (EC_Tests_Basic, @@ -12,10 +13,12 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Reconnect driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -33,7 +36,7 @@ EC_Reconnect::parse_args (int& argc, char* argv[]) if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Get_Opt get_opt (argc, argv, "scd:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "scd:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index b06b6e50355..0eca9c96a9d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -14,7 +14,7 @@ ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { EC_Schedule driver; return driver.run (argc, argv); @@ -28,7 +28,7 @@ EC_Schedule::EC_Schedule (void) } int -EC_Schedule::parse_args (int& argc, char* argv[]) +EC_Schedule::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index c139b699227..7fc14197459 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -47,7 +47,7 @@ public: // = The EC_Driver methods /// add some command line args to change the scheduling service to /// use. - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index ea2c18a1743..3ae199c24c0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -3,14 +3,17 @@ #include "Shutdown.h" #include "Consumer.h" #include "Supplier.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Shutdown driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index f00ec8abab4..6a2f80bde09 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Timeout, @@ -15,8 +16,10 @@ ACE_RCSID (EC_Tests, // **************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -24,7 +27,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index af77cc9fcbd..05ad26f5f44 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -6,14 +6,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Wildcard, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -21,7 +24,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... 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 object = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index 667ac9e8efb..178d8417b90 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_stdio.h" @@ -26,9 +27,9 @@ Gateway_EC::check_for_nil (CORBA::Object_ptr obj, const char *message) } int -Gateway_EC::parse_args (int argc, char *argv []) +Gateway_EC::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "i:"); int opt; while ((opt = get_opt ()) != EOF) @@ -63,7 +64,7 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb, str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; - FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w"); + FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, ACE_TEXT("w")); if (output_file == 0) { ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 6d81936beb4..9fb285b1fbc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "ace/Argv_Type_Converter.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer @@ -137,16 +138,18 @@ parse_args (int /* argc */, char ** /* argv */) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "", ACE_TRY_ENV); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp index 7ab5ff9b030..6b02f5b9bea 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp @@ -1,12 +1,15 @@ // $Id$ #include "Gateway_EC.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index ab13f1a28ef..314be258b0f 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" void send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer @@ -54,17 +55,19 @@ parse_args (int /*argc*/, char ** /*argv*/) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize ORB and parse args. 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) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 7b95c67318f..81596b248fc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "ace/Argv_Type_Converter.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer @@ -105,16 +106,18 @@ parse_args (int /* argc */, char ** /* argv */) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB and POA, POA Manager, parse args. 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) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp index 462f226b0aa..d89047ce037 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp @@ -1,13 +1,16 @@ // $Id$ #include "Gateway_EC.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index d7d0b4f1973..a22424715e1 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" void send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer @@ -44,16 +45,18 @@ parse_args (int /*argc*/, char ** /*argv*/) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB and parse args. 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) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index ce7c85cdd95..c7c7ddc57d3 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -14,6 +14,7 @@ #include "ace/Array_Base.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Reactor.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" @@ -571,7 +572,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message) int parse_args (int argc, char ** argv) { - ACE_Get_Opt get_opt (argc, argv, "d"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "d"); int opt; while ((opt = get_opt ()) != EOF) @@ -597,8 +598,10 @@ parse_args (int argc, char ** argv) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // We may want this to be alive beyond the next block. TAO_EC_Servant_Var<Heartbeat_Application> app; @@ -606,10 +609,10 @@ main (int argc, char *argv[]) { // Initialize ORB and POA, POA Manager, parse args. 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) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp index c048843d90b..f6f1bf18f7d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp @@ -1,13 +1,16 @@ // $Id$ #include "Gateway_EC.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 874f96cc737..5cad1a265c6 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -5,6 +5,7 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/OS_NS_strings.h" @@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Performance, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Connect driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -38,7 +41,7 @@ EC_Connect::parse_args (int& argc, char* argv[]) if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index c3c4661d8c2..faccac7ef74 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -7,16 +7,19 @@ #include "orbsvcs/Event_Utilities.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests_Performance, Inversion, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Inversion driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -27,9 +30,9 @@ EC_Inversion::EC_Inversion (void) } int -EC_Inversion::parse_args (int &argc, char *argv []) +EC_Inversion::parse_args (int &argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 2d0cd3903aa..16e4ce2faa1 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Sample_History.h" #include "ace/Basic_Stats.h" #include "ace/Sched_Params.h" @@ -23,8 +24,10 @@ const char *ec_ior = "file://ec.ior"; static int parse_args (int argc, char *argv[]); int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -50,7 +53,7 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -104,7 +107,7 @@ main (int argc, char *argv []) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the event channel object reference @@ -224,7 +227,7 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf)); if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -272,7 +275,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 524d4301164..2ee08132c40 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Sample_History.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -20,8 +21,10 @@ const char *ior_file_name = "ec.ior"; static int parse_args (int argc, char *argv[]); int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); int priority = @@ -49,7 +52,7 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -103,7 +106,7 @@ main (int argc, char *argv []) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -122,7 +125,7 @@ main (int argc, char *argv []) if (ior_file_name != 0) { - FILE *output_file= ACE_OS::fopen (ior_file_name, "w"); + FILE *output_file= ACE_OS::fopen (ior_file_name, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -156,7 +159,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 513434e07f9..9a1336b4d3f 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -5,16 +5,19 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests_Performance, Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Throughput driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index d74d6f76b84..3bf1845cb11 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -13,6 +13,7 @@ #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/OS_NS_errno.h" @@ -106,7 +107,7 @@ EC_Driver::run_init (int &argc, char* argv[] if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -727,9 +728,9 @@ EC_Driver::dump_results (void) } int -EC_Driver::parse_args (int &argc, char *argv []) +EC_Driver::parse_args (int &argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp index 253e373e20b..fe0458110c5 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<StubFaultAnalyzer> server_run("FaultAnalyzer"); return server_run.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp index 131b6daa877..729b18bbb41 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<TAO::PG_FactoryRegistry> server_main("FactoryRegistry"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp index f5e732d47ab..571ae796aea 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<ReplicationManagerFaultConsumerAdapter> server_main("FaultConsumer"); return server_main.run(argc, argv); diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp index 2ae607f7f0f..784a3109c15 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp @@ -18,6 +18,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<StubFaultNotifier> server_main("FaultNotifier"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 2c77a1e7750..728d1e885ac 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -8,6 +8,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" class FTClientMain { @@ -171,7 +172,7 @@ FTClientMain::parse_args (int argc, char *argv[]) // note: dfnkx are simple_util options // include them here so we can detect bad args - ACE_Get_Opt get_opts (argc, argv, "c:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:f:"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -181,7 +182,7 @@ FTClientMain::parse_args (int argc, char *argv[]) case 'c': { this->inFileName_ = get_opts.opt_arg (); - this->inFile_ = ACE_OS::fopen (this->inFileName_, "r"); + this->inFile_ = ACE_OS::fopen (this->inFileName_, ACE_TEXT("r")); if(this->inFile_ && !ferror (this->inFile_)) { ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n", this->inFileName_); @@ -530,7 +531,7 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL) else { ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", this->replica_pos_); } return result; @@ -624,10 +625,12 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + FTClientMain app; - int result = app.parse_args(argc, argv); + int result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { ACE_TRY_NEW_ENV diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 996c2a27fb7..a7d01ca3c28 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -19,6 +19,7 @@ #include <ace/Get_Opt.h> #include <ace/OS_NS_stdio.h> +#include "ace/Argv_Type_Converter.h" FTAPP::FT_Creator::FT_Creator () : creator_ () @@ -43,7 +44,7 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[]) { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "r:ignf:u:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "r:ignf:u:p:"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -255,15 +256,17 @@ int FTAPP::FT_Creator::fini () } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; 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_TRY_CHECK; FTAPP::FT_Creator app; - result = app.parse_args(argc, argv); + result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { result = app.init (orb.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp index 1fcc2339969..0eb71bf1f77 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<FT_ReplicaFactory_i> server_main("TestReplicaFactory"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index ba8b3d7e58d..0fef5007a56 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -13,6 +13,7 @@ #include "FT_ReplicaFactory_i.h" #include "FT_TestReplica_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/PortableGroupC.h" @@ -141,7 +142,7 @@ void FT_ReplicaFactory_i::shutdown_i() int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, "w"); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); @@ -162,7 +163,7 @@ int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) int FT_ReplicaFactory_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:f:i:l:t:qu"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:f:i:l:t:qu"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 16f1f70eee4..f338e079ecc 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -6,6 +6,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" // A simple class for building a client that "controls' the // Replication Manager (right now it just shuts it down). @@ -89,9 +90,8 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[]) if (CORBA::is_nil (this->replication_manager_.in())) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO_FT_ReplicationManagerController::init: " - "Could not get Replication Manager's IOR.\n") + ACE_TEXT ("TAO_FT_ReplicationManagerController::init: ") + ACE_TEXT ("Could not get Replication Manager's IOR.\n") )); result = -1; } @@ -116,7 +116,7 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[]) { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -186,11 +186,13 @@ int TAO_FT_ReplicationManagerController::run () return result; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; TAO_FT_ReplicationManagerController rmctrl; - result = rmctrl.init (argc, argv); + result = rmctrl.init (convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { result = rmctrl.run (); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index ad89659b3bc..3cd2451a91e 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -451,7 +451,7 @@ void FT_TestReplica_i::request_quit() void FT_TestReplica_i::store(long counter) { - FILE * f = ACE_OS::fopen("Persistent.dat", "w"); + FILE * f = ACE_OS::fopen("Persistent.dat", ACE_TEXT("w")); if(f != 0) { unsigned char* buffer = 0; @@ -472,7 +472,7 @@ void FT_TestReplica_i::store(long counter) long FT_TestReplica_i::load () { long counter = 0; - FILE * f = ACE_OS::fopen("Persistent.dat","r"); + FILE * f = ACE_OS::fopen("Persistent.dat",ACE_TEXT("r")); if(f != 0) { unsigned char buffer[sizeof(long)]; diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 12357cb9297..632de09d56b 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -4,6 +4,7 @@ #include "ReplicationManagerFaultConsumerAdapter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" // FUZZ: disable check_for_streams_include @@ -38,7 +39,7 @@ size_t ReplicationManagerFaultConsumerAdapter::notifications () const int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -335,7 +336,7 @@ int ReplicationManagerFaultConsumerAdapter::init ( // Signal that we are ready to go. if (result == 0 && this->readyFile_ != 0) { - FILE* ready = ACE_OS::fopen (this->readyFile_, "w"); + FILE* ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w")); if (ready) { ACE_OS::fprintf (ready, "ready\n"); diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 6d0e445511f..66c9fd5ab58 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -4,6 +4,7 @@ #include "StubBatchConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index 56731cf5f59..2f1ddc40202 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -4,6 +4,7 @@ #include "StubFaultAnalyzer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -25,7 +26,7 @@ StubFaultAnalyzer::~StubFaultAnalyzer () int StubFaultAnalyzer::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -228,7 +229,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) if (result == 0 && this->readyFile_ != 0) { - FILE *ready = ACE_OS::fopen (this->readyFile_, "w"); + FILE *ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w")); if ( ready ) { ACE_OS::fprintf (ready, "ready\n"); diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 25a2934df15..33731acec0e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -4,6 +4,7 @@ #include "StubFaultConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () @@ -40,7 +41,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[]) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); #else // NO_ARGS_FOR_NOW - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, ""); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 24c320efb8e..4fd2e6b5f0c 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -4,6 +4,7 @@ #include "StubFaultNotifier.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include @@ -35,7 +36,7 @@ PortableServer::ObjectId StubFaultNotifier::objectId()const int StubFaultNotifier::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -324,7 +325,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) int StubFaultNotifier::write_ior_file() { int result = -1; - FILE* out = ACE_OS::fopen (this->ior_output_file_, "w"); + FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", this->ior_.in ()); diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 8bb35b960a1..8cbd09b8a6c 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -453,7 +453,7 @@ int TAO::Object_Group_Creator::fini () int TAO::Object_Group_Creator::write_ior_file (const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, "w"); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 58fd3cc610b..6057d7b5a50 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "orbsvcs/FaultTolerance/FT_Service_Activate.h" @@ -14,7 +15,7 @@ const char *ior = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,20 +36,21 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Start out with the first IOR. Interaction with the second diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index ee1bd7e9d0e..574eaa0b00a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" @@ -23,7 +24,7 @@ const char *ior_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -121,8 +122,10 @@ add_ft_prop (CORBA::ORB_ptr o, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -138,7 +141,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -158,7 +161,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::PolicyList policies; // Empty policy list. @@ -236,7 +239,7 @@ main (int argc, char *argv[]) // Write each IOR to a file. // IOR 1 - FILE *output_file= ACE_OS::fopen (ior_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file <%s> for writing " @@ -272,7 +275,7 @@ main (int argc, char *argv[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { return 0; } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc index bdc5ba72437..f2b005ba49f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc @@ -9,6 +9,7 @@ project(*idl): taoidldefaults { } project(*server): portableserver, orbsvcsexe, iormanip, ftorb, messaging { + exename = server after += *idl Source_Files { test_i.cpp @@ -21,6 +22,7 @@ project(*server): portableserver, orbsvcsexe, iormanip, ftorb, messaging { } project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb { + exename = Manager after += *idl Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 543da3eff4f..3d43e3df4e3 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -3,6 +3,7 @@ #include "Client_i.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "tao/IORManipulation/IORManip_Loader.h" #include "tao/PortableServer/PortableServer.h" @@ -27,7 +28,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:"); int c; while ((c = get_opts ()) != -1) @@ -59,9 +60,11 @@ parse_args (int argc, char *argv[]) int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, + ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -69,13 +72,12 @@ main (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -119,8 +121,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -260,7 +261,7 @@ Manager::write_to_file (void) 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", @@ -311,8 +312,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index ade1a560f4d..e0e15132f9f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -2,13 +2,14 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -32,19 +33,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -79,7 +80,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 72014970c1d..63bd82cd46a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -20,14 +20,16 @@ #include "tao/ORB.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(IOGRManipluation, IOGRTest, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n")); @@ -36,8 +38,7 @@ main (int argc, char *argv[]) ACE_TRY { // Retrieve 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/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp index 45874808c2f..3b86e717032 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "PushConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" @@ -23,10 +24,10 @@ CORBA::ORB_var orb; auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; RtecEventChannelAdmin::EventChannel_ptr -get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) +get_event_channel(int argc, char** argv ACE_ENV_ARG_DECL) { FtRtecEventChannelAdmin::EventChannel_var channel; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:n")); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "hi:n"); int opt; int use_gateway = 1; @@ -86,15 +87,17 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) return channel._retn(); } -int main(int argc, ACE_TCHAR** argv) +int ACE_TMAIN(int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init(argc, argv, "" + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel - = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER); + = get_event_channel(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index 9033f5b02c2..229e2350a3f 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "PushSupplier.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" @@ -22,10 +23,10 @@ CORBA::ORB_var orb; auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; RtecEventChannelAdmin::EventChannel_ptr -get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) +get_event_channel(int argc, char** argv ACE_ENV_ARG_DECL) { FtRtecEventChannelAdmin::EventChannel_var channel; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:nt:?")); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "hi:nt:?"); int opt; int use_gateway = 1; @@ -92,17 +93,19 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) } -int main(int argc, ACE_TCHAR** argv) +int ACE_TMAIN(int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - orb = CORBA::ORB_init(argc, argv, "" + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel - = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER); + = get_event_channel(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp index 8ab1d029463..ad74dd300fc 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp @@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index efc9e973701..c4a9c06f609 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -20,6 +20,7 @@ #include "tests/test_config.h" #include "ace/OS_NS_sys_socket.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" #include "ami_testC.h" #include "ami_testS.h" @@ -35,7 +36,7 @@ int number_of_replies = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:n:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:n:i:"); int c; while ((c = get_opts ()) != -1) @@ -175,17 +176,19 @@ public: Handler handler; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_client")); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; ACE_OS::socket_init (); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index ee6a7282b5f..2e841274430 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -23,6 +23,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_sys_socket.h" ACE_RCSID(AMI, server, "$Id$") @@ -32,7 +33,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -58,14 +59,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server")); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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 = @@ -85,7 +88,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_OS::socket_init (); @@ -105,7 +108,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 442d7a9356f..e44e2b4a128 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" #include "ami_testC.h" @@ -36,7 +37,7 @@ int debug = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:i:x"); int c; while ((c = get_opts ()) != -1) @@ -155,8 +156,10 @@ public: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_simple_client")); ACE_DECLARE_NEW_CORBA_ENV; @@ -164,7 +167,7 @@ main (int argc, char *argv[]) ACE_TRY { 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 object_var = @@ -182,7 +185,7 @@ main (int argc, char *argv[]) poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // We reuse the object_var smart pointer! diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index 8ab1d029463..ad74dd300fc 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index a9a6dac7d63..48603e5a34f 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -16,7 +17,7 @@ void do_nothing (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -40,15 +41,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb = CORBA::ORB::_nil(); PortableServer::POA_var root_poa = PortableServer::POA::_nil(); Callback_i *servant = 0; ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -102,7 +105,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index acd21da590e..6f03849ab56 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -2,6 +2,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -14,7 +15,7 @@ int no_iterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -100,7 +103,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i *server_impl = new Simple_Server_i (orb.in (), @@ -131,7 +134,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index 8ab1d029463..ad74dd300fc 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index e8d3ff65f68..95ed75b3959 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -4,6 +4,7 @@ #include "tests/test_config.h" #include <ace/Get_Opt.h> +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -37,18 +38,20 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("Hello_client")); 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 tmp = diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index e3ba7544ee9..aba9078d949 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -5,6 +5,7 @@ #include "tests/test_config.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/IORTable/IORTable.h" #include "orbsvcs/CosNamingC.h" @@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -41,8 +42,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("Hello_server")); ACE_TRY_NEW_ENV @@ -50,7 +53,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n")); 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; //------ Get Root POA & POA Manager references @@ -91,7 +94,7 @@ main (int argc, char *argv[]) //-------- Prepare Servant - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -124,7 +127,7 @@ main (int argc, char *argv[]) ior_table->bind("HelloObj", ior.in() ACE_ENV_ARG_PARAMETER); // Output the IOR to the <ior_output_file> - 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/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index c87f7c6ecb4..960ceea80d7 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -43,7 +43,7 @@ #undef ACE_NDEBUG #undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT +#define ACE_TEXT ACE_TEXT #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. @@ -251,7 +251,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc index 01fcb2cd41a..1cab9bda0ea 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc +++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc @@ -2,6 +2,7 @@ // $Id$ project(*idl): taoidldefaults { + avoids += uses_wchar IDL_Files { MCast.idl } @@ -10,6 +11,7 @@ project(*idl): taoidldefaults { project(*server): namingexe, iortable, svc_utils { exename = server + avoids += uses_wchar after += *idl Source_Files { @@ -25,6 +27,7 @@ project(*server): namingexe, iortable, svc_utils { project(*client): namingexe, iortable, svc_utils { exename = client + avoids += uses_wchar after += *idl Source_Files { diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp index 7a79bec47bc..209879f40fd 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp @@ -1,9 +1,11 @@ // $Id$ #include "ior_mcast_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; @@ -13,7 +15,7 @@ int main (int argc, char *argv []) ior_mcast_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; return 0; diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp index 26a0d6c3e12..80087193f30 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp @@ -2,6 +2,7 @@ #include "ior_mcast_client_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" ior_mcast_Client_i::ior_mcast_Client_i (void) @@ -23,8 +24,7 @@ ior_mcast_Client_i::init (int& argc, { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp index be8c6ab97c8..09bfed08ece 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp @@ -1,9 +1,13 @@ // $Id$ #include "server_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { +// This test cannot be run on a wide character build +// ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index e9a12f65dc5..d877a11543c 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" Server_i::Server_i (void) @@ -159,9 +160,9 @@ Server_i::enable_multicast (const char *ior) } int -Server_i::parse_args (int argc, char *argv []) +Server_i::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index 848b239d9ee..70338445b0f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -10,6 +10,7 @@ project(airplane_idl) : taoidldefaults { project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + exename = airplane_server after += airplane_idl IDL_Files { @@ -25,6 +26,7 @@ project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, } project(airplane client) : portableserver, orbsvcsexe, minimum_corba, iortable { + exename = airplane_client after += airplane_idl IDL_Files { @@ -47,6 +49,7 @@ project(nestea_idl): taoidldefaults { } project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + exename = nestea_server avoids += ace_for_tao after += nestea_idl @@ -69,6 +72,7 @@ project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, im } project(nestea client) : portableserver, orbsvcsexe, minimum_corba, iortable { + exename = nestea_client after += nestea_idl IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc index fe939b060c5..04d79b8e063 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -2,5 +2,5 @@ // $Id$ project: namingexe, minimum_corba { + exename = test } - diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp index b885f1b28ed..1004fb6663b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp @@ -3,14 +3,17 @@ // #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var ns_obj = diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp index 1bee519f70d..61d2f742ff4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp @@ -3,6 +3,7 @@ #include "airplane_client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ImplRepo, airplane_client, @@ -11,13 +12,15 @@ ACE_RCSID (ImplRepo, // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Airplane_Client_i client; ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Client\n\n")); - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; else return client.run (); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index 079c8e9b4e1..9acada3cf81 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -3,6 +3,7 @@ #include "airplane_client_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/ACE.h" @@ -22,7 +23,7 @@ Airplane_Client_i::Airplane_Client_i (void) int Airplane_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp index 45f4bd9bca3..8baba3b2ff9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp @@ -1,14 +1,17 @@ // $Id$ #include "airplane_server_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ImplRepo, airplane_server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Airplane_Server_i server; ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n")); @@ -16,7 +19,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index 92ffd886c0f..751ff4dd604 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/Root_POA.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_time.h" @@ -29,7 +30,7 @@ Airplane_Server_i::Airplane_Server_i (void) int Airplane_Server_i::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +40,7 @@ Airplane_Server_i::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.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/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp index 60d05c63a82..0c68b4ad481 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp @@ -3,6 +3,7 @@ #include "nestea_client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ImplRepo, nestea_client, @@ -11,13 +12,15 @@ ACE_RCSID (ImplRepo, // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Nestea_Client_i client; ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Client\n\n")); - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; else return client.run (); diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index a92bf39e6c8..c1793f75d8f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -3,6 +3,7 @@ #include "nestea_client_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/ACE.h" @@ -22,7 +23,7 @@ Nestea_Client_i::Nestea_Client_i (void) int Nestea_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dsn:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dsn:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 4706cf0304d..ebc5e2bdeb9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -118,7 +118,7 @@ Nestea_i::save_data (void) ACE_FILE_Connector connector; if (connector.connect (file, - ACE_FILE_Addr (this->data_filename_), + ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)), 0, ACE_Addr::sap_any) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -144,7 +144,7 @@ Nestea_i::load_data (void) ACE_FILE_Connector connector; if (connector.connect (file, - ACE_FILE_Addr (this->data_filename_), + ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)), 0, ACE_Addr::sap_any) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index 51a8ec71ebe..3d6803e847e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -1,12 +1,15 @@ // $Id$ #include "nestea_server_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(ImplRepo, nestea_server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Nestea_Server_i server; ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n")); @@ -14,7 +17,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index f3278167081..75e00da0cdb 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/Root_POA.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" @@ -36,7 +37,7 @@ Nestea_Server_i::~Nestea_Server_i (void) int Nestea_Server_i::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:"); int c; while ((c = get_opts ()) != -1) @@ -46,7 +47,7 @@ Nestea_Server_i::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.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/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp index f5e1e660533..793cec1dfe7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp @@ -4,15 +4,18 @@ #include "testC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" using namespace CORBA; -int main(int argc, char* argv[]) { +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) +{ + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { - ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc index 5e8640bf068..a4c891ef470 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc @@ -8,6 +8,7 @@ project(*idl): taoidldefaults { } project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + exename = server after += *idl IDL_Files { @@ -22,6 +23,7 @@ project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_clie } project(*client) : portableserver, orbsvcsexe, minimum_corba, iortable { + exename = client after += *idl IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp index 769d8126ae4..a89c194887d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp @@ -1,16 +1,19 @@ // $Id$ #include "server_i.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Server_i server; - int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index 21edebb203f..a3f9ec7ef1b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -7,6 +7,7 @@ #include "tao/ImR_Client/ImR_Client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/streams.h" @@ -56,7 +57,7 @@ Server_i::~Server_i() int Server_i::parse_args (int argc, char* argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:c:h"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:c:h"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc index 3396f7a98fe..30860084757 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc @@ -2,6 +2,7 @@ // $Id$ project(*server): taoexe, portableserver, ifr_client, minimum_corba { + exename = server Source_Files { test_i.cpp @@ -10,6 +11,7 @@ project(*server): taoexe, portableserver, ifr_client, minimum_corba { } project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba { + exename = client IDL_Files { } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index 3e16668c65b..b759cedf515 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -2,21 +2,23 @@ // $Id$ #include "ifr_dii_client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + IFR_DII_Client client; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - if (client.init (argc, - argv + if (client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index f6dd2238e12..7952549b52f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -3,6 +3,7 @@ #include "ifr_dii_client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, ifr_dii_client, @@ -26,8 +27,7 @@ IFR_DII_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -98,10 +98,9 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL) } int -IFR_DII_Client::parse_args (int argc, - char *argv[]) +IFR_DII_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dn"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "dn"); int c; while ((c = opts ()) != -1) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 7cfe8d9c287..ec921b9cd71 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Application_Test, server, "$Id$") @@ -11,7 +12,7 @@ static const char *ior_output_file = "iorfile"; static int write_ior_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) { @@ -39,12 +40,13 @@ write_ior_to_file (const char *ior) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp index 410ad1fd4f3..1b1d241038c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp @@ -2,20 +2,22 @@ // $Id$ #include "idl3_client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + IDL3_Client client; ACE_TRY_NEW_ENV { - if (client.init (argc, - argv + if (client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index 93fa6ae910a..b0652fe8484 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -3,6 +3,7 @@ #include "idl3_client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_string.h" ACE_RCSID (Application_Test, @@ -260,8 +261,7 @@ IDL3_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -341,10 +341,9 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL) } int -IDL3_Client::parse_args (int argc, - char *argv[]) +IDL3_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "d"); int c; while ((c = opts ()) != -1) @@ -1890,4 +1889,3 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd return 0; } - diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index ef26b0b054d..a1afbad818e 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -7,6 +7,7 @@ #include "tao/CDR.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/SString.h" ACE_RCSID (IFR_Test, @@ -60,14 +61,12 @@ Admin_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) return retval; @@ -152,10 +151,9 @@ Admin_Client::run (void) } int -Admin_Client::parse_args (int argc, - char *argv[]) +Admin_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "di:t:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "di:t:"); int c; int result = 0; CORBA::ULong i = 0; @@ -470,7 +468,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_enum") == 0); if (this->debug_) { @@ -479,7 +477,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->id.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_enum:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->id.in(), "IDL:my_enum:1.0") == 0); if (this->debug_) { @@ -488,7 +486,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->defined_in.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->defined_in, "") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->defined_in.in(), "") == 0); if (this->debug_) { @@ -497,7 +495,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.0") == 0); CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -566,7 +564,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) str.in ())); } - ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i]) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), static_cast<const char*>(members[i])) == 0); } @@ -606,7 +604,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) tmp)); } - ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0); + ACE_ASSERT (ACE_OS::strcmp (static_cast<const char*>(fellows[i]), static_cast<const char*>(members[i])) == 0); } evar->name ("another_enum" @@ -846,7 +844,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_alias") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_alias") == 0); if (this->debug_) { @@ -855,7 +853,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL) td->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.1") == 0); kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -1085,7 +1083,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) str.in ())); } - ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name.in()) == 0); } CORBA::Contained::Description_var desc = @@ -1102,7 +1100,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_struct") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_struct") == 0); if (this->debug_) { @@ -1111,7 +1109,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) td->id.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_struct:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->id.in(), "IDL:my_struct:1.0") == 0); if (this->debug_) { @@ -1120,7 +1118,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) td->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.0") == 0); members.length (2); members[0].name = CORBA::string_dup ("long_mem"); @@ -1180,13 +1178,13 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) if (i == length - 1) { cmp_result = - ACE_OS::strcmp (out_members[i].name, "my_enum"); + ACE_OS::strcmp (out_members[i].name.in(), "my_enum"); ACE_ASSERT (cmp_result == 0); } else { cmp_result = - ACE_OS::strcmp (out_members[i].name, members[i].name); + ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in()); ACE_ASSERT (cmp_result == 0); } } @@ -1624,7 +1622,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL) } // Multiple labels for first member shifts index by 1. - ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name.in()) == 0); CORBA::Any_var label = tc->member_label (i ACE_ENV_ARG_PARAMETER); @@ -1765,7 +1763,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) str.in ())); } - ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name.in()) == 0); } CORBA::Contained::Description_var desc = @@ -1782,7 +1780,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->name.in(), "my_exception") == 0); if (this->debug_) { @@ -1791,7 +1789,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->id.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->id, "IDL:my_exception:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->id.in(), "IDL:my_exception:1.0") == 0); if (this->debug_) { @@ -1800,7 +1798,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->defined_in.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->defined_in, "") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->defined_in.in(), "") == 0); if (this->debug_) { @@ -1809,7 +1807,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->version, "1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->version.in(), "1.0") == 0); members.length (2); members[0].name = CORBA::string_dup ("long_mem"); @@ -1872,13 +1870,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) if (i == 2) { cmp_result = - ACE_OS::strcmp (out_members[i].name, "my_enum"); + ACE_OS::strcmp (out_members[i].name.in(), "my_enum"); ACE_ASSERT (cmp_result == 0); } else { cmp_result = - ACE_OS::strcmp (out_members[i].name, members[i].name); + ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in()); ACE_ASSERT (cmp_result == 0); } } @@ -1909,13 +1907,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) if (i == 1) { cmp_result = - ACE_OS::strcmp (out_members[i].name, "my_enum"); + ACE_OS::strcmp (out_members[i].name.in(), "my_enum"); ACE_ASSERT (cmp_result == 0); } else { cmp_result = - ACE_OS::strcmp (out_members[i].name, members[i].name); + ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in()); ACE_ASSERT (cmp_result == 0); } } @@ -2092,7 +2090,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->name.in(), "my_exception") == 0); } else { @@ -2122,7 +2120,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_enum") == 0); } } @@ -2524,7 +2522,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL) od->defined_in.in ())); } - ACE_ASSERT (ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (od->defined_in.in(), "IDL:p_iface:1.0") == 0); CORBA::TypeCode_var result = od->result; CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2986,7 +2984,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL) tmp)); } - ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name.in()) == 0); } CORBA::ContainedSeq_var out_contents = @@ -3050,7 +3048,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL) } else { - ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name.in()) == 0); } } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp index aa3af160455..af5265406ed 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp @@ -2,17 +2,19 @@ // $Id$ #include "Admin_Client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (IFR_Test, client, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Admin_Client admin_client; - int retval = admin_client.init (argc, - argv); + int retval = admin_client.init (convert.get_argc(), convert.get_ASCII_argv()); if (retval == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index c29daa4ff2a..33d5a850b02 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -3,6 +3,7 @@ #include "Latency_Query_Client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/Sample_History.h" @@ -30,14 +31,12 @@ Latency_Query_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) { @@ -137,7 +136,7 @@ Latency_Query_Client::run (void) if (this->do_dump_history_) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -162,10 +161,9 @@ Latency_Query_Client::run (void) } int -Latency_Query_Client::parse_args (int argc, - char *argv[]) +Latency_Query_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dhi:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "dhi:"); int c; int result = 0; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc index f2cf973217a..243b151c51f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc @@ -1,4 +1,5 @@ // $Id$ project: ifr_client { + exename = client avoids += ace_for_tao } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index 43c9155ebb1..6364ca7811f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -2,18 +2,20 @@ // $Id$ #include "Latency_Query_Client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Latency__Test, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Latency_Query_Client client; - int retval = client.init (argc, - argv); + int retval = client.init (convert.get_argc(), convert.get_ASCII_argv()); if (retval == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index 10146a9a882..378064b3ac2 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -3,6 +3,7 @@ #include "Ptest.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_string.h" ACE_RCSID(Persistence_Test, Ptest, "$Id$") @@ -18,19 +19,16 @@ Ptest::~Ptest (void) } int -Ptest::init (int argc, - char *argv[]) +Ptest::init (int argc, char *argv[]) { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) return retval; @@ -102,10 +100,9 @@ Ptest::run (void) } int -Ptest::parse_args (int argc, - char *argv[]) +Ptest::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dq"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "dq"); int c; while ((c = opts ()) != -1) @@ -252,11 +249,11 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL) if (i == length - 1) { - ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, "my_enum") == 0); + ACE_ASSERT (ACE_OS::strcmp (out_members[i].name.in(), "my_enum") == 0); } else { - ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, members[i]) == 0); + ACE_ASSERT (ACE_OS::strcmp (out_members[i].name.in(), members[i]) == 0); } } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp index 2155c1c4c36..bbb60bf359c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp @@ -2,17 +2,19 @@ // $Id$ #include "Ptest.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Persistence_Test, test, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Ptest ptest; - int retval = ptest.init (argc, - argv); + int retval = ptest.init (convert.get_argc(), convert.get_ASCII_argv()); if (retval == -1) return 1; diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index a7b13988c33..e841f9d87dc 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -19,9 +19,12 @@ // ============================================================================ #include "ncontextext_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_DECLARE_NEW_CORBA_ENV; @@ -30,7 +33,7 @@ int main (int argc, char *argv []) NContextExt_Client_i client; - if (client.init (argc, argv) != 0) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index 2f6f2d7ad72..aa0a40033b6 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -22,6 +22,7 @@ #include "ncontextext_client_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" // FUZZ: disable check_for_streams_include @@ -43,7 +44,7 @@ int NContextExt_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dvs"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dvs"); int c; this->view_ = 1; @@ -322,10 +323,11 @@ NContextExt_Client_i::print_values (CosNaming::Name name, CORBA::String_var url_string) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT ("The first component id is %s," - "The first component kind is %s," - "The second component id is %s," - "The second component kind is %s\n\n"), + ACE_DEBUG((LM_DEBUG, + ACE_TEXT ("The first component id is %s,") + ACE_TEXT ("The first component kind is %s,") + ACE_TEXT ("The second component id is %s,") + ACE_TEXT ("The second component kind is %s\n\n"), name[0].id.in (), name[0].kind.in (), name[1].id.in (), @@ -334,19 +336,21 @@ NContextExt_Client_i::print_values (CosNaming::Name name, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The string form of the input name is: \n%s\n\n"), str_name.in ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The unstringified version of the name components are:," - "The first component id is %s," - "The first component kind is %s," - "The second component id is %s," - "The second component kind is %s\n\n"), + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("The unstringified version of the name components are:,") + ACE_TEXT ("The first component id is %s,") + ACE_TEXT ("The first component kind is %s,") + ACE_TEXT ("The second component id is %s,") + ACE_TEXT ("The second component kind is %s\n\n"), nm[0].id.in (), nm[0].kind.in (), nm[1].id.in (), nm[1].kind.in ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("When the address of the NamingContext is:" - "myhost.555xyz.com:9999" - "and the Object name is \n%s\n"), + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("When the address of the NamingContext is:") + ACE_TEXT ("myhost.555xyz.com:9999") + ACE_TEXT ("and the Object name is \n%s\n"), obj_name.in ())); ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %s\n"), diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc index 91756218ae9..9ecb81cca72 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc @@ -9,6 +9,7 @@ project(*idl): taoidldefaults { } project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { + exename = server after += *idl Source_Files { server.cpp @@ -22,6 +23,7 @@ project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { } project(*client): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { + exename = client after += *idl Source_Files { client.cpp diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index f112c8a0af6..dda25bc2f2d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -62,7 +62,7 @@ int LB_server::write_ior_to_file (const char *ior) { FILE *output_file = - ACE_OS::fopen ("obj.ior", "w"); + ACE_OS::fopen ("obj.ior", ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp index 3a588d90066..88c05a0f529 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp @@ -1,5 +1,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Controlled, client, @@ -10,7 +11,7 @@ const char *ior = "file://obj.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index 68236f62685..aa6052041ae 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -1,13 +1,16 @@ #include "LB_server.h" #include "Basic.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Controlled, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *location1 = "MyLocation 1"; @@ -17,7 +20,7 @@ main (int argc, char *argv[]) const char *location5 = "MyLocation 5"; const char *location6 = "MyLocation 6"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc index af901a174ec..30f885252d5 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc @@ -7,6 +7,7 @@ project(*idl): taoidldefaults { } project(*Server): loadbalancing { + exename = server after += *idl Source_Files { server.cpp @@ -23,6 +24,7 @@ project(*Server): loadbalancing { } project(*Client): loadbalancing { + exename = client after += *idl Source_Files { TestC.cpp diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index fef78510c70..117895744c3 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -75,7 +75,7 @@ int LB_server::write_ior_to_file (const char *ior) { FILE *output_file = - ACE_OS::fopen ("obj.ior", "w"); + ACE_OS::fopen ("obj.ior", ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp index 8a85b412846..7f15ba73cd1 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp @@ -1,5 +1,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Infrastructure_Controlled, @@ -12,7 +13,7 @@ const char *ior = "file://obj.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -36,15 +37,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp index 735da982dc4..689942f3808 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp @@ -1,18 +1,21 @@ #include "LB_server.h" #include "Factory.h" #include "Simple.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Infrastructure_Controlled, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + const char *location1 = "MyLocation 1"; const char *location2 = "MyLocation 2"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp index 4f4724ab6c6..aa5eaba1146 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -1,19 +1,22 @@ #include "LB_server.h" #include "Basic.h" #include "Simple.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Manage_object_group, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *location1 = "MyLocation 1"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc index 55c91a8d3df..751fc1454c0 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc @@ -1,4 +1,5 @@ // $Id$ project(*Client): loadbalancing { + exename = client } diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index ccae399abb8..cdbe425b4d6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/CosLoadBalancingC.h" #include "orbsvcs/PortableGroup/PG_Operators.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CPU, @@ -18,7 +19,7 @@ const CosLoadBalancing::LoadId LOAD_ID = CosLoadBalancing::LoadAverage; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "l:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "l:"); int c; @@ -62,14 +63,15 @@ check_loads (const CosLoadBalancing::LoadList & loads } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index d7123478053..a82b7249d71 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -3,6 +3,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" @@ -34,8 +35,7 @@ BasicLog_Test::init (int argc, char *argv[]) ACE_TRY { // Initialize the ORB - orb_ = CORBA::ORB_init (argc, - argv, + orb_ = CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -542,7 +542,7 @@ BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite) int BasicLog_Test::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp index b906b2fb1e5..345e0c82b2f 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp @@ -1,6 +1,7 @@ #include "Basic_Log_Test.h" #include "ace/Log_Msg.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Basic_Log_Test, client, @@ -9,11 +10,13 @@ ACE_RCSID (Basic_Log_Test, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + BasicLog_Test log_test; ACE_DEBUG((LM_DEBUG, "\nBasic Log test \n\n")); - if (log_test.init(argc, argv) == -1) + if (log_test.init(convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR_RETURN((LM_ERROR, "xx - Failed initializing BasicLog_Test.\n"),-1); diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc index 8e9210a7702..09d68e14a1b 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc @@ -9,6 +9,7 @@ project(*idl): taoidldefaults { } project(*server): orbsvcsexe, portablegroup, portableserver { + exename = server after += *idl Source_Files { McastHello.cpp @@ -21,6 +22,7 @@ project(*server): orbsvcsexe, portablegroup, portableserver { } project(*client): orbsvcsexe, portablegroup, portableserver { + exename = client after += *idl Source_Files { TestC.cpp diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index 10180538dbf..7433d1064e7 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Object_T.h" #include "orbsvcs/PortableGroup/MIOP.h" @@ -14,7 +15,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -38,15 +39,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index ecf06638ce2..4856873214d 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -2,6 +2,7 @@ #include "McastHello.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/PortableGroup/MIOP.h" #include "orbsvcs/PortableGroup/GOA.h" @@ -21,7 +22,7 @@ static const char *group_ior = "corbaloc:miop:1.0@1.0-TestDomain-1/224.1.239.2:1 int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -50,12 +51,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -75,7 +78,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the group IOR. @@ -87,7 +90,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Output the Group IOR to the <ior_output_file> - 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/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index 08309efacca..378e9f97e45 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -3,6 +3,7 @@ #include "AdminProperties.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "tao/debug.h" @@ -146,7 +147,7 @@ AdminProperties::~AdminProperties (void) int AdminProperties::parse_args(int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -468,13 +469,15 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + AdminProperties test; ACE_TRY_NEW_ENV { - test.init (argc, argv ACE_ENV_ARG_PARAMETER); + test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index f3087187a05..4ef65ef09cd 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "ConnectDisconnect.h" @@ -142,7 +143,7 @@ ConnectDisconnect::init (int argc, int ConnectDisconnect::parse_args(int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -350,18 +351,20 @@ ConnectDisconnect::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ConnectDisconnect client; - if (client.parse_args (argc, argv) == -1) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - client.init (argc, argv ACE_ENV_ARG_PARAMETER); + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h index a08cd5dd3ad..7648731fe48 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h @@ -73,7 +73,7 @@ public: char *argv[]); int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 58d348d5859..ddaaf415280 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Events.h" @@ -145,10 +146,9 @@ Events::init (int argc, } int -Events::parse_args (int argc, - char *argv[]) +Events::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -322,19 +322,20 @@ Events::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Events events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h index e7493489b67..899c71f5c85 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h @@ -74,7 +74,7 @@ public: char *argv[]) ; int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index 3d54679c307..f256f95c017 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Filter.h" @@ -219,19 +220,20 @@ Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL) //*************************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Filter events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h index 9bd93156d6d..8431336a32c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h @@ -35,7 +35,7 @@ public: virtual ~Filter (void); int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index ebfd98f3df1..e426c722707 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/CosNotifyCommC.h" @@ -24,10 +25,9 @@ IdAssignment::~IdAssignment (void) } int -IdAssignment::parse_args (int argc, - char *argv[]) +IdAssignment::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -83,8 +83,7 @@ IdAssignment::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -458,18 +457,18 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) //******************************************************************************** } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { IdAssignment test; - test.parse_args (argc, - argv); + test.parse_args (convert.get_argc(), convert.get_ASCII_argv()); - test.init (argc, - argv + test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 0bb420600c7..9e86827c5c4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include <orbsvcs/CosNamingC.h> #include <orbsvcs/CosNotifyCommC.h> @@ -23,10 +24,9 @@ LifeCycle::~LifeCycle (void) } int -LifeCycle::parse_args (int argc, - char *argv[]) +LifeCycle::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -65,8 +65,7 @@ LifeCycle::init (int argc, char* argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -242,18 +241,18 @@ LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { LifeCycle test; - test.parse_args (argc, - argv); + test.parse_args (convert.get_argc(), convert.get_ASCII_argv()); - test.init (argc, - argv + test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index f8bb9dd472a..60461e451dc 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "MultiTypes.h" @@ -379,19 +380,20 @@ MultiTypes::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + MultiTypes client; - if (client.parse_args (argc, argv) == -1) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - client.init (argc, - argv + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h index ac2701e61b8..0076aef88e0 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h @@ -108,7 +108,7 @@ public: char *argv[]); int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index 7842be55e57..32918c34390 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "Sequence.h" @@ -147,10 +148,9 @@ Sequence::init (int argc, } int -Sequence::parse_args (int argc, - char *argv[]) +Sequence::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -354,19 +354,20 @@ Sequence::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Sequence events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index 5a8e1138f3b..aed998ddb9e 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -75,7 +75,7 @@ public: char *argv[]) ; int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index fd0dffb4620..ba48eb507c7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Simple.h" @@ -124,10 +125,9 @@ Simple_Test::init (int argc, } int -Simple_Test::parse_args (int argc, - char *argv[]) +Simple_Test::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -238,19 +238,20 @@ Simple_Test::check_results (void) //*************************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Simple_Test events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index a941fcfb027..b4022839e36 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -75,7 +75,7 @@ public: char *argv[]) ; int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index 3933aaa37a1..73bb7694a96 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Updates.h" @@ -463,14 +464,15 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Updates updates; ACE_TRY_NEW_ENV { - updates.init (argc, - argv + updates.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h index e4c7104f9bf..a2cc8ae170b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h @@ -78,7 +78,7 @@ public: Updates (void); virtual ~Updates (); - int init (int argc, char *argv [] ACE_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // initialization. void run_test (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index 4139898c4ce..1263ca3afb5 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -80,7 +80,7 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service", unlink $namingior; $naming_spawn = $Naming->Spawn (); -if ($naming_spawn != 0) +if ($naming_spawn != 0) { exit 1; } @@ -101,20 +101,20 @@ for $config (@test_configs) "-ORBSvcConf $config"); unlink $notifyior; $Notification->Spawn (); - + if (PerlACE::waitforfile_timed ($notifyior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; $Notification->Kill (); $Naming->Kill (); exit 1; } - + for $name (@tests) { ## The MaxQueueLength and MaxEventsPerConsumer are not supported in the Reactive ## configuration, so we skip this test for now. ## The Notification should actually throw an exception for the property not supported. - if ($name->{name} eq "AdminProperties" + if ($name->{name} eq "AdminProperties" && ($config eq "notify.reactive.conf" || $config eq "notify.rt.conf")) { next; @@ -125,7 +125,7 @@ for $config (@test_configs) "-ORBInitRef NameService=file://$namingior " . "$name->{args} "); $test_spawn = $test->Spawn (); - if ($test_spawn != 0) + if ($test_spawn != 0) { break; } @@ -134,13 +134,13 @@ for $config (@test_configs) (defined $name->{extra} ? $name->{extra} : 0)); - if ($status != 0) + if ($status != 0) { print STDERR "ERROR: $name->{name} returned $status\n"; break; } } - + $Notification->Kill (); } diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index 3e7c1986bb9..95379cf09d0 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -94,8 +94,8 @@ Notify_Structured_Push_Consumer::push_structured_event ( if (this->count_ > this->expected_) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too " - "many events received.\n"))); + ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received.\n"))); } if (this->count_ >= this->expected_) diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index c1ef387256c..2eee91d4016 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -36,7 +37,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:t:"); int c; while ((c = get_opts ()) != -1) @@ -110,14 +111,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status != 0) ACE_ERROR_RETURN ((LM_ERROR, "Error: Client init failed.\n"),1); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 8097361c468..07e30148612 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -6,6 +6,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" @@ -82,7 +83,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -173,14 +174,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -203,7 +206,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp index 09944124843..fd925c0b1ee 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp @@ -3,15 +3,18 @@ #include "../lib/Notify_Test_Client.h" #include "orbsvcs/NotifyExtC.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, char *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the base class. Notify_Test_Client client; - client.init (argc, argv ACE_ENV_ARG_PARAMETER); + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory (); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index f107177b9d5..50e50144748 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -76,8 +76,8 @@ Notify_Structured_Push_Consumer::push_structured_event ( { this->client_.consumer_done (this); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too " - "many events received (%d).\n"), this->count_)); + ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received (%d).\n"), this->count_)); } ACE_ASSERT(ACE_OS::strcmp(event.header.variable_header[0].name.in(), "Id") == 0); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index d357454f33d..8929c89305f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -37,7 +38,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:"); int c; while ((c = get_opts ()) != -1) @@ -133,14 +134,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index 95d08daca21..cef82710b31 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -96,7 +97,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -207,14 +208,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -243,7 +246,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); ACE_ASSERT(output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index b457324f6ed..631b0e2d8e3 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" @@ -26,7 +27,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -127,14 +128,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 9fee28c5c34..5b1aee259d2 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -87,7 +88,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -188,14 +189,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -224,7 +227,7 @@ int main (int argc, char* argv[]) client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); ACE_ASSERT (output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp index 1ad6142c0d4..6e50d7653df 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp @@ -2,15 +2,18 @@ #include "../lib/Driver.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, char *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_Notify_Tests_Driver driver; ACE_TRY_NEW_ENV { - int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = driver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index 851210f4877..ee409dbf52b 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" @@ -37,7 +38,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:c:f"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:c:f"); int c; while ((c = get_opts ()) != -1) @@ -125,14 +126,16 @@ disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index 4612ff106bf..9bb2820f430 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -84,7 +85,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:fc:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:fc:"); int c; while ((c = get_opts ()) != -1) @@ -194,13 +195,15 @@ disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -221,7 +224,7 @@ int main (int argc, char* argv[]) 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 " diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index 79f44545167..5a93e714da8 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_stat.h" @@ -27,7 +28,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ok:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ok:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -127,13 +128,15 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index c1d572de8c2..17097320483 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -11,6 +11,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" #include "ace/Auto_Ptr.h" @@ -72,7 +73,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -200,13 +201,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -234,7 +237,7 @@ int main (int argc, char* argv[]) 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 " diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index d86df34f06b..ffb69a54092 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" static const char* ior = "file://supplier.ior"; @@ -24,7 +25,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ok:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ok:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -122,13 +123,15 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index bda45d89f6c..6970ba38d0c 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -12,6 +12,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/Auto_Ptr.h" @@ -72,7 +73,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -197,13 +198,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -231,7 +234,7 @@ int main (int argc, char* argv[]) 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 " diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp index ea040206afc..3d0e525a0e0 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp @@ -61,7 +61,7 @@ namespace { } void setUp() { - ACE_ARGV av; + ACE_TARGV<char> av; int ac = 0; orb = ORB_init(ac, av.argv()); ACE_ASSERT(! is_nil(orb.in())); @@ -80,7 +80,7 @@ namespace { } -int main(int, char**) +int ACE_TMAIN(int, ACE_TCHAR**) { try { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp index 4d9aa177a6c..f4396d74662 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -20,22 +20,22 @@ TAO_Notify_Tests_RT_POA_Command::~TAO_Notify_Tests_RT_POA_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_RT_POA_Command::get_name (void) { return TAO_Notify_Tests_RT_POA_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_RT_POA_Command::name (void) { return TAO_Notify_Tests_Name::poa_command; } void -TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_RT_POA_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h index b5bcb27a825..63b8625eb44 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -42,14 +42,14 @@ public: /// Parse args and populate options. /// The arg_shifter options are read in the following manner: -Create <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)* - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Get the command name. - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: /// Create the POA with the params parsed. diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 43acfd70c38..0d33874b2e2 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -7,6 +7,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_stdio.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$") @@ -163,7 +164,7 @@ StructuredPushConsumer_i::push_structured_event ( } if (notification.filterable_data.length () > 0) { - if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number")) + if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number")) { const CORBA::Any & data = notification.filterable_data[0].value; @@ -189,8 +190,8 @@ StructuredPushConsumer_i::push_structured_event ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") - && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, "")) + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY") + && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), "")) { const CORBA::Any * any; if (notification.remainder_of_body >>= any) @@ -398,7 +399,7 @@ SequencePushConsumer_i::push_structured_events ( const CosNotification::StructuredEvent & notification = notifications[nevent]; if (notification.filterable_data.length () > 0) { - if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number")) + if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number")) { const CORBA::Any & data = notification.filterable_data[0].value; @@ -424,8 +425,8 @@ SequencePushConsumer_i::push_structured_events ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") - && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, "")) + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY") + && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), "")) { CORBA::ULong seq = 0; if (notification.remainder_of_body >>= seq) @@ -619,7 +620,7 @@ AnyPushConsumer_i::push ( { if (notification->filterable_data.length () > 0) { - if (0 == ACE_OS::strcmp (notification->filterable_data[0].name, "serial_number")) + if (0 == ACE_OS::strcmp (notification->filterable_data[0].name.in(), "serial_number")) { const CORBA::Any & data = notification->filterable_data[0].value; @@ -1040,7 +1041,7 @@ void Consumer_Main::save_ids() { FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "w"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("w")); if (idf != 0) { @@ -1064,7 +1065,7 @@ Consumer_Main::load_ids() { bool ok = false; FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "r"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("r")); if (idf != 0) { @@ -1267,7 +1268,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // try to read from it if (!ok && this->channel_file_.length () > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "r"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("r")); if (chf != 0) { char buffer[100]; @@ -1359,7 +1360,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // save channel id if (ok && this->channel_file_.length() > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "w"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("w")); if (chf != 0) { ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_)); @@ -1874,13 +1875,15 @@ int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = -1; Consumer_Main app; ACE_TRY_NEW_ENV { - result = app.init(argc, argv ACE_ENV_ARG_PARAMETER); + result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK if (result == 0) diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc index f04e76917c9..0e4d776fe91 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc @@ -1,12 +1,14 @@ // $Id$ project(*Supplier): notifytest { + exename = Supplier Source_Files { Supplier.cpp } } project(*Consumer): notifytest { + exename = Consumer Source_Files { Consumer.cpp } diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 1bd46703440..3420d2a1be4 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -7,6 +7,7 @@ #include "tao/TimeBaseC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_strings.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify_Tests, Supplier_Main, "$Id$") @@ -220,7 +221,7 @@ Supplier_Main::Supplier_Main () , use_naming_service_ (true) , serial_number_ (0) , disconnect_on_exit_ (false) - , id_file_ (ACE_TEXT ("supplier.ids")) + , id_file_ ("supplier.ids") , pause_ (0) , ec_id_ (0) , sa_id_(0) @@ -276,47 +277,47 @@ int Supplier_Main::parse_single_arg (int argc, char *argv[]) { int consumed = 0; - if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-v")) == 0) + if (ACE_OS::strcasecmp (argv[0], "-v") == 0) { this->verbose_ = true; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-any")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-any") == 0) { this->mode_ = MODE_ANY; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-structured")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-structured") == 0) { this->mode_ = MODE_STRUCTURED; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-sequence")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-sequence") == 0) { this->mode_ = MODE_SEQUENCE; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-channel")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-channel") == 0) { this->channel_file_= argv[1]; consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-send")) == 0 && argc > 1) + else if (ACE_OS::strcasecmp (argv[0], "-send") == 0 && argc > 1) { this->send_ = ACE_OS::atoi (argv[1]); consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-pause")) == 0 && argc > 1) + else if (ACE_OS::strcasecmp (argv[0], "-pause") == 0 && argc > 1) { this->pause_ = ACE_OS::atoi (argv[1]); consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-serial_number")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-serial_number") == 0) { this->serial_number_= ACE_OS::atoi (argv[1]); consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-nonamesvc")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-nonamesvc") == 0) { this->use_naming_service_ = false; consumed = 1; @@ -444,7 +445,7 @@ void Supplier_Main::save_ids() { FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "w"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("w")); if (idf != 0) { @@ -468,7 +469,7 @@ Supplier_Main::load_ids() { bool ok = false; FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "r"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("r")); if (idf != 0) { @@ -657,7 +658,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // try to read from it if (!ok && this->channel_file_.length () > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "r"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("r")); if (chf != 0) { char buffer[100]; @@ -749,7 +750,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // save channel id if (ok && this->channel_file_.length() > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "w"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("w")); if (chf != 0) { ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_)); @@ -1286,7 +1287,7 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL) )); } reconnections = this->reconnection_callback_.reconnect_count (); - FILE * pause_file = ACE_OS::fopen ("Supplier.paused", "w"); + FILE * pause_file = ACE_OS::fopen ("Supplier.paused", ACE_TEXT("w")); if (pause_file != 0) { ACE_OS::fputs (ACE_TEXT ("paused\n"), pause_file); @@ -1342,13 +1343,15 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = -1; Supplier_Main app; ACE_TRY_NEW_ENV { - result = app.init(argc, argv ACE_ENV_ARG_PARAMETER); + result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK if (result == 0) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index 9a7df06e215..5c611a89efe 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -72,15 +72,15 @@ Notify_Sequence_Push_Consumer::push_structured_events ( this->count_ += events.length(); if (this->count_ > this->high_) - { - this->client_.consumer_done (this); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too " - "many events received.\n"))); - ACE_THROW (CORBA::INTERNAL ()); - } - else if (this->count_ >= this->low_) - { - this->client_.consumer_done (this); - } + { + this->client_.consumer_done (this); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received.\n"))); + ACE_THROW (CORBA::INTERNAL ()); + } + else if (this->count_ == this->low_) + { + this->client_.consumer_done (this); + } } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index c59a53095fb..642b84cdb30 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -36,7 +37,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:"); int c; while ((c = get_opts ()) != -1) @@ -138,14 +139,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 483a7446f92..1f1fc1236f4 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -83,7 +84,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -204,14 +205,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -233,7 +236,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index b39323d5890..36cca406978 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -80,8 +80,8 @@ Notify_Sequence_Push_Consumer::push_structured_events( { this->client_.consumer_done (this); ACE_ERROR((LM_ERROR, - ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too " - "many events received.\n"))); + ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received.\n"))); } else if (this->count_ >= this->low_) { diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 5ac22e79b8b..61abb9946ef 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -37,7 +38,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:c:"); int c; while ((c = get_opts ()) != -1) @@ -114,14 +115,20 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + + int status = 0; + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + //int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + ACE_ASSERT(status == 0); ACE_UNUSED_ARG(status); @@ -163,6 +170,7 @@ int main (int argc, char* argv[]) constraint_list[0].constraint_expr = CORBA::string_dup(constraintString); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; admin->add_filter(filter.in()); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index 30c0a2e2b0d..e6020243c2d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" // FUZZ: disable check_for_streams_include @@ -84,7 +85,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -205,15 +206,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -236,7 +239,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index 7f41538007e..76e2278d1af 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" @@ -30,7 +31,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "fe:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "fe:"); int x; while ((x = get_opts ()) != -1) @@ -69,13 +70,15 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV; { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index 161d3f3e8c4..1c6720afa0c 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -14,6 +14,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" @@ -131,13 +132,15 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV; { Notify_Test_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -166,7 +169,7 @@ int main (int argc, char * argv[]) client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen (ior_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w")); ACE_ASSERT (output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index eb633882bcc..218f66fbb7a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" @@ -31,7 +32,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:s:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:s:e:"); int x; while ((x = get_opts ()) != -1) @@ -86,13 +87,15 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status != 0) { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index 69463ea273a..c7438cb868d 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" @@ -75,7 +76,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "e:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "e:f:"); int x; while ((x = get_opts ()) != -1) @@ -201,13 +202,15 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV; { Supplier_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -243,7 +246,7 @@ int main (int argc, char * argv[]) client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen (ior_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w")); ACE_ASSERT (output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 07ba1cbfdd9..99e0aaf445c 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -53,7 +53,7 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra // Check Poolid if (ACE_OS::strncmp (constraint_list[i].constraint_expr.in (), PoolId_prefix, poolId_index) == 0) { - if (ACE_OS::strlen (constraint_list[i].constraint_expr) > poolId_index) + if (ACE_OS::strlen (constraint_list[i].constraint_expr.in()) > poolId_index) { this->expected_pool_id_ = ACE_OS::atoi (&constraint_list[i].constraint_expr[poolId_index]); @@ -64,7 +64,7 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra // Check Poolid else if (ACE_OS::strncmp (constraint_list[i].constraint_expr.in (), LaneId_prefix, laneId_index) == 0) { - if (ACE_OS::strlen (constraint_list[i].constraint_expr) > laneId_index) + if (ACE_OS::strlen (constraint_list[i].constraint_expr.in()) > laneId_index) { this->expected_lane_id_ = ACE_OS::atoi (&constraint_list[i].constraint_expr[laneId_index]); diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index 463a3fc9b8d..896da12b065 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Dynamic_Service.h" #include "ace/ARGV.h" +#include "ace/Argv_Type_Converter.h" class TestSupplier : public POA_CosNotifyComm::StructuredPushSupplier @@ -52,8 +53,10 @@ class TestConsumer } }; -int main(int ac, char **av) +int ACE_TMAIN(int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int retval = 1; bool pass1 = false; @@ -64,13 +67,13 @@ int main(int ac, char **av) CORBA::ORB_var orb; PortableServer::POA_var poa; - orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (orb.in ())); - if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0) + if (convert.get_argc() > 2 && ACE_OS::strcmp (convert.get_ASCII_argv()[1], "-pass") == 0) { - int pn = av[2][0] - '0'; + int pn = argv[2][0] - '0'; switch (pn) { case 1: diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 86b477c1bba..757baa0e912 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -34,7 +34,7 @@ TAO_Notify_Tests_Activation_Manager::~TAO_Notify_Tests_Activation_Manager () } int -TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name) +TAO_Notify_Tests_Activation_Manager::ior_output_file (const char *file_name) { this->ior_output_file_ = ACE_OS::fopen (file_name, ACE_TEXT("w")); @@ -45,7 +45,7 @@ TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name } int -TAO_Notify_Tests_Activation_Manager::ior_input_file (const ACE_TCHAR *file_name) +TAO_Notify_Tests_Activation_Manager::ior_input_file (const char *file_name) { this->ior_input_file_ = file_name; return 0; @@ -204,7 +204,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) if (sup_iter.next (sup_entry) != 0) { supplier = sup_entry->int_id_; - supplier->dump_stats (msg, dump_samples); + supplier->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); } } @@ -219,7 +219,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) if (cons_iter.next (cons_entry) != 0) { consumer = cons_entry->int_id_; - consumer->dump_stats (msg, dump_samples); + consumer->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); } } } diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h index 838516b3d64..b52176dbd22 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h @@ -91,10 +91,10 @@ public: void dump_stats (int dump_samples); // Returns 0 if the file could be opened for write. - int ior_output_file (const ACE_TCHAR *file_name); + int ior_output_file (const char *file_name); // Returns 1 if the file could be opened for read. - int ior_input_file (const ACE_TCHAR *file_name); + int ior_input_file (const char *file_name); void write_ior (ACE_ENV_SINGLE_ARG_DECL); void wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 5172ae18620..11f24ede767 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -11,6 +11,8 @@ ACE_RCSID(lib, TAO_Application_Command, "$Id$") #include "Driver_Base.h" #include "Priority_Mapping.h" +#include "ace/Arg_Shifter.h" + TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void) : dump_samples_ (0) { @@ -20,20 +22,20 @@ TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Application_Command::get_name (void) { return TAO_Notify_Tests_Application_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Application_Command::name (void) { return TAO_Notify_Tests_Name::application_command; } void -TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Application_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index ff267fc37a3..89902c795e6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -40,14 +40,14 @@ public: ~TAO_Notify_Tests_Application_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Get the command name. - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: #ifdef HPUX_11 diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 4e63d4ba284..c77c5c9655b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -19,7 +19,7 @@ TAO_Notify_Tests_Command::~TAO_Notify_Tests_Command () } void -TAO_Notify_Tests_Command::init (ACE_Arg_Shifter& /*arg_shifter*/) +TAO_Notify_Tests_Command::init (ACE_TArg_Shifter< ACE_TCHAR >& /*arg_shifter*/) { // default: do nothing. } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index 41f23995f0b..91c9e0c2c33 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -21,6 +21,7 @@ #include "tao/orbconf.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -47,16 +48,16 @@ public: virtual ~TAO_Notify_Tests_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< ACE_TCHAR >& arg_shifter); /// Implement command execution. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Return the name of this command. - virtual const char* get_name (void)= 0; + virtual const ACE_TCHAR* get_name (void)= 0; ///= Each derived type must also implement the following signature: - // static const char* name (void); + // static const ACE_TCHAR* name (void); protected: /// Next command after this one. diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index e95b8ed81b2..0a412cfe89d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -3,6 +3,7 @@ #include "Command_Builder.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Command.h" #include "Command_Factory.h" #include "Name.h" @@ -19,11 +20,11 @@ TAO_Notify_Tests_Command_Builder::~TAO_Notify_Tests_Command_Builder () } int -TAO_Notify_Tests_Command_Builder::init (int argc, char *argv[]) +TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< ACE_TCHAR > arg_shifter (argc, argv); - ACE_CString current_arg; + ACE_TString current_arg; TAO_Notify_Tests_Command_Factory* factory = 0; if (arg_shifter.is_anything_left ()) @@ -65,7 +66,7 @@ TAO_Notify_Tests_Command_Builder::fini (void) } void -TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory) +TAO_Notify_Tests_Command_Builder::_register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory) { if (this->factory_map_.bind (command_factory_name, command_factory) == -1) ACE_DEBUG ((LM_DEBUG, "Failed to register command factory for %s\n", command_factory_name.c_str ())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h index 7ca63765dbe..a29bd93e7d3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h @@ -46,11 +46,11 @@ public: ~TAO_Notify_Tests_Command_Builder (); /// = Service_Object virtual method overloads. - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int fini (void); /// Register the factory against the name of the factory. - void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); + void _register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); /// Execute the <start_command_>. void execute (ACE_ENV_SINGLE_ARG_DECL); @@ -63,7 +63,7 @@ protected: TAO_Notify_Tests_Command* last_command_; /// The factory map. - ACE_Hash_Map_Manager <ACE_CString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_; + ACE_Hash_Map_Manager <ACE_TString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_NOTIFY_TEST, TAO_Notify_Tests_Command_Builder) diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 2965bc0094c..2b7e3020db7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -17,13 +17,13 @@ TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void) { return TAO_Notify_Tests_ConsumerAdmin_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_ConsumerAdmin_Command::name (void) { return TAO_Notify_Tests_Name::consumer_admin_command; @@ -96,7 +96,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_N } void -TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index a94146e47bc..dcc6b8aeea2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -39,14 +39,14 @@ public: ~TAO_Notify_Tests_ConsumerAdmin_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 8985aa6f772..6fb6f16accf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -186,13 +186,13 @@ TAO_Notify_Tests_Driver::~TAO_Notify_Tests_Driver () int TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Timeout")))) // -Timeout timeout_period_S + if ((current_arg = arg_shifter.get_the_parameter ("-Timeout"))) // -Timeout timeout_period_S { if (current_arg != 0) { @@ -201,7 +201,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // -IORoutput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // -IORoutput file_name { if (this->activation_manager_->ior_output_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -210,7 +210,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORinput")))) // -IORinput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORinput"))) // -IORinput file_name { if (this->activation_manager_->ior_input_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -235,17 +235,17 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) } int -TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) +TAO_Notify_Tests_Driver::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - 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); - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index 610e6b02e79..f909a8ed2a0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -107,7 +107,7 @@ public: ~TAO_Notify_Tests_Driver (); /// Init - int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); /// Execute the commands. void run (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index 519fee9fc45..76842ecce19 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -20,20 +20,20 @@ TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_EventChannel_Command::get_name (void) { return TAO_Notify_Tests_EventChannel_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_EventChannel_Command::name (void) { return TAO_Notify_Tests_Name::event_channel_command; } void -TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_EventChannel_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index 35a2baa4bb0..368b1963b0c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -44,14 +44,14 @@ public: virtual ~TAO_Notify_Tests_EventChannel_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: ///= Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 2bb7bb716b4..4832672fe07 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -16,20 +16,20 @@ TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Filter_Command::get_name (void) { return TAO_Notify_Tests_Filter_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Filter_Command::name (void) { return TAO_Notify_Tests_Name::filter_command; } void -TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Filter_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 2678b6c4437..24d1b9dfb43 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -39,14 +39,14 @@ public: ~TAO_Notify_Tests_Filter_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp index 87e0c004674..532fa99954a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp @@ -5,33 +5,36 @@ ACE_RCSID(lib, TAO_Name, "$Id$") #define TAO_Notify_Tests_DECLARE_NAME(target, name) \ -const char* const TAO_Notify_Tests_Name::target = ACE_TEXT (name); +const ACE_TCHAR* const TAO_Notify_Tests_Name::target = name; -TAO_Notify_Tests_DECLARE_NAME (command_builder,"Command_Builder") -TAO_Notify_Tests_DECLARE_NAME (root_poa,"RootPOA") -TAO_Notify_Tests_DECLARE_NAME (event_channel_factory,"NotifyEventChannelFactory") -TAO_Notify_Tests_DECLARE_NAME (naming_service,"NameService") +#define TAO_Notify_Tests_DECLARE_NAME_A(target, name) \ +const char* const TAO_Notify_Tests_Name::target = name; -TAO_Notify_Tests_DECLARE_NAME (application_command,"Application") -TAO_Notify_Tests_DECLARE_NAME (application_command_factory,"Application_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (command_builder, ACE_TEXT("Command_Builder")) +TAO_Notify_Tests_DECLARE_NAME_A (root_poa, "RootPOA") +TAO_Notify_Tests_DECLARE_NAME_A (event_channel_factory, "NotifyEventChannelFactory") +TAO_Notify_Tests_DECLARE_NAME_A (naming_service, "NameService") -TAO_Notify_Tests_DECLARE_NAME (event_channel_command,"EventChannel") -TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory,"EventChannel_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (application_command, ACE_TEXT("Application")) +TAO_Notify_Tests_DECLARE_NAME (application_command_factory, ACE_TEXT("Application_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command,"ConsumerAdmin") -TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory,"ConsumerAdmin_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (event_channel_command, ACE_TEXT("EventChannel")) +TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory, ACE_TEXT("EventChannel_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command,"SupplierAdmin") -TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory,"SupplierAdmin_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command, ACE_TEXT("ConsumerAdmin")) +TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory, ACE_TEXT("ConsumerAdmin_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, "PeriodicSupplier") -TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, "PeriodicSupplier_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command, ACE_TEXT("SupplierAdmin")) +TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory, ACE_TEXT("SupplierAdmin_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, "PeriodicConsumer") -TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, "PeriodicConsumer_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, ACE_TEXT("PeriodicSupplier")) +TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, ACE_TEXT("PeriodicSupplier_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (poa_command, "POA") -TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, "POA_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, ACE_TEXT("PeriodicConsumer")) +TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, ACE_TEXT("PeriodicConsumer_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (filter_command, "Filter") -TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, "Filter_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (poa_command, ACE_TEXT("POA")) +TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, ACE_TEXT("POA_Command_Factory")) + +TAO_Notify_Tests_DECLARE_NAME (filter_command, ACE_TEXT("Filter")) +TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, ACE_TEXT("Filter_Command_Factory")) diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.h b/TAO/orbsvcs/tests/Notify/lib/Name.h index 602f3d1e6de..188eb6113c0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.h +++ b/TAO/orbsvcs/tests/Notify/lib/Name.h @@ -32,31 +32,31 @@ public: static const char* const event_channel_factory; static const char* const naming_service; - static const char* const command_builder; + static const ACE_TCHAR* const command_builder; - static const char* const application_command_factory; - static const char* const application_command; + static const ACE_TCHAR* const application_command_factory; + static const ACE_TCHAR* const application_command; - static const char* const event_channel_command_factory; - static const char* const event_channel_command; + static const ACE_TCHAR* const event_channel_command_factory; + static const ACE_TCHAR* const event_channel_command; - static const char* const supplier_admin_command_factory; - static const char* const supplier_admin_command; + static const ACE_TCHAR* const supplier_admin_command_factory; + static const ACE_TCHAR* const supplier_admin_command; - static const char* const consumer_admin_command_factory; - static const char* const consumer_admin_command; + static const ACE_TCHAR* const consumer_admin_command_factory; + static const ACE_TCHAR* const consumer_admin_command; - static const char* const periodic_supplier_command; - static const char* const periodic_supplier_command_factory; + static const ACE_TCHAR* const periodic_supplier_command; + static const ACE_TCHAR* const periodic_supplier_command_factory; - static const char* const periodic_consumer_command; - static const char* const periodic_consumer_command_factory; + static const ACE_TCHAR* const periodic_consumer_command; + static const ACE_TCHAR* const periodic_consumer_command_factory; - static const char* const poa_command; - static const char* const poa_command_factory; + static const ACE_TCHAR* const poa_command; + static const ACE_TCHAR* const poa_command_factory; - static const char* const filter_command; - static const char* const filter_command_factory; + static const ACE_TCHAR* const filter_command; + static const ACE_TCHAR* const filter_command_factory; }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index cd6a689acfa..30ac0894ea3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -34,7 +34,7 @@ Notify_Test_Client::~Notify_Test_Client () } int -Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +Notify_Test_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -57,11 +57,10 @@ Notify_Test_Client::parse_args (int /*argc*/, char** /*argv*/) int Notify_Test_Client::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 39bbed208fe..493d4144c7e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -37,7 +37,7 @@ public: Notify_Test_Client (void); virtual ~Notify_Test_Client (); - virtual int init (int argc, char *argv [] ACE_ENV_ARG_DECL); + virtual int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // starts the orb and resolves the notify factory via a naming service. virtual int parse_args (int argc, char* argv[]); @@ -76,7 +76,7 @@ public: protected: int init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index 2685d1bfd5b..847cfaba864 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -21,9 +21,9 @@ TAO_Notify_Tests_Options_Parser::~TAO_Notify_Tests_Options_Parser () } void -TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_TArg_Shifter< char >& arg_shifter) { - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -52,9 +52,9 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, } void -TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_TArg_Shifter< char >& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; int default_priority = ACE_DEFAULT_THREAD_PRIORITY; if (arg_shifter.cur_arg_strncasecmp ("-ThreadPool") == 0) // -ThreadPool [-Threads static_threads] [-Priority default_priority] diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h index cecfce11495..7bbc3c3588c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h @@ -21,8 +21,10 @@ #include "orbsvcs/CosNotificationC.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter< char >; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -41,10 +43,10 @@ public: ~TAO_Notify_Tests_Options_Parser (); /// Populates <qos> with options apecified in <arg_shifter> - void execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter); + void execute (CosNotification::QoSProperties& qos, ACE_TArg_Shifter< char >& arg_shifter); /// Populates <added> and <removed> with options apecified in <arg_shifter> - void execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter); + void execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_TArg_Shifter< char >& arg_shifter); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp index 293218f1ae5..0c2f8934212 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -11,6 +11,7 @@ ACE_RCSID (lib, "$Id$") #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" @@ -33,7 +34,7 @@ TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL_NOT_U } int -TAO_Notify_Tests_Peer::init_state (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Peer::init_state (ACE_TArg_Shifter< char >& arg_shifter) { while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h index b1f93a4b815..d9a3c8185da 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -23,8 +23,10 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//template <typename> ACE_TArg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -46,7 +48,7 @@ public: void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL_NOT_USED); /// Init this object. - virtual int init_state (ACE_Arg_Shifter& arg_shifter); + virtual int init_state (ACE_TArg_Shifter< char >& arg_shifter); /// Set POA void set_poa (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 556d11fb0f0..c62df60ac6b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -10,6 +10,7 @@ ACE_RCSID (Notify, "$Id$") #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index a718deb73bf..e524f2537ad 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -3,6 +3,7 @@ #include "Periodic_Consumer.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Task.h" #include "tao/debug.h" @@ -41,13 +42,13 @@ TAO_Notify_Tests_Periodic_Consumer::task_callback (TAO_Notify_Tests_Task_Callbac } int -TAO_Notify_Tests_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Consumer::init_state (ACE_TArg_Shifter< char >& arg_shifter) { // First, let the base class look for options. if (TAO_Notify_Tests_StructuredPushConsumer::init_state (arg_shifter) == -1) return -1; - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -257,7 +258,7 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification } void -TAO_Notify_Tests_Periodic_Consumer::dump_stats (ACE_TCHAR* msg, int dump_samples) +TAO_Notify_Tests_Periodic_Consumer::dump_stats (const ACE_TCHAR* msg, int dump_samples) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h index de06aa31135..8858c155029 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h @@ -22,9 +22,11 @@ #include "Task_Stats.h" #include "Notify_StructuredPushConsumer.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter< char >; ACE_END_VERSIONED_NAMESPACE_DECL class TAO_Notify_Tests_Task_Callback; @@ -48,10 +50,10 @@ public: void task_callback(TAO_Notify_Tests_Task_Callback* client); /// Init the state of this object. - virtual int init_state (ACE_Arg_Shifter& arg_shifter); + virtual int init_state (ACE_TArg_Shifter< char >& arg_shifter); /// dump stats - void dump_stats (ACE_TCHAR* msg, int dump_samples); + void dump_stats (const ACE_TCHAR* msg, int dump_samples); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index cfda2e788f8..12871ea3eb0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -23,20 +23,20 @@ TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_ { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void) { return TAO_Notify_Tests_Periodic_Consumer_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Consumer_Command::name (void) { return TAO_Notify_Tests_Name::periodic_consumer_command; } void -TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index d258c7e2e8a..f61cdcaf201 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -41,14 +41,14 @@ public: ~TAO_Notify_Tests_Periodic_Consumer_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: ///= Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index b2aea30f498..901964d7b1d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -3,6 +3,7 @@ #include "Periodic_Supplier.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" @@ -45,13 +46,13 @@ TAO_Notify_Tests_Periodic_Supplier::task_callback(TAO_Notify_Tests_Task_Callback } int -TAO_Notify_Tests_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Supplier::init_state (ACE_TArg_Shifter< char >& arg_shifter) { // First, let the base class look for options. if (TAO_Notify_Tests_StructuredPushSupplier::init_state (arg_shifter) == -1) return -1; - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -340,7 +341,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void) } void -TAO_Notify_Tests_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples) +TAO_Notify_Tests_Periodic_Supplier::dump_stats (const ACE_TCHAR* msg, int dump_samples) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index 969f07cb4ec..906197cf38f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -25,9 +25,11 @@ #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter< char >; ACE_END_VERSIONED_NAMESPACE_DECL class TAO_Notify_Tests_Task_Callback; @@ -51,7 +53,7 @@ public: void task_callback(TAO_Notify_Tests_Task_Callback* client); /// Init the state of this object. - int init_state (ACE_Arg_Shifter& arg_shifter); + int init_state (ACE_TArg_Shifter< char >& arg_shifter); /// Activate this task, synch on the given barrier. virtual int activate_task (ACE_Barrier* barrier); @@ -60,7 +62,7 @@ public: virtual int svc (void); /// Dump stats. - void dump_stats (ACE_TCHAR* msg, int dump_samples); + void dump_stats (const ACE_TCHAR* msg, int dump_samples); /// Get the name of the proxy const char* proxy_name (void); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 9cdfaccbb51..f771ee167ba 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -22,20 +22,20 @@ TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_ { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void) { return TAO_Notify_Tests_Periodic_Supplier_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Supplier_Command::name (void) { return TAO_Notify_Tests_Name::periodic_supplier_command; } void -TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 726d7cd0ddd..c30ba056992 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -41,14 +41,14 @@ public: ~TAO_Notify_Tests_Periodic_Supplier_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index 5adaa65c92c..c2a47b86e34 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -17,20 +17,20 @@ TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_SupplierAdmin_Command::get_name (void) { return TAO_Notify_Tests_SupplierAdmin_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_SupplierAdmin_Command::name (void) { return TAO_Notify_Tests_Name::supplier_admin_command; } void -TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index fbed3172551..ed73819a9b0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -39,14 +39,14 @@ public: ~TAO_Notify_Tests_SupplierAdmin_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp index 3669f3987a1..7d2ae5888cd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp @@ -55,10 +55,20 @@ Task_Stats::end_time (ACE_UINT64 time) end_time_ = time; } +void Task_Stats::dump_samples (const char *file_name, const char *msg, int dump_samples) +{ + dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); +} + +void Task_Stats::dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples) +{ + dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); +} + void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples) +Task_Stats::dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples) { - 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/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h index cc4d7190887..6de23f231f4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h @@ -70,9 +70,13 @@ class TAO_NOTIFY_TEST_Export Task_Stats /// Record a sample int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples); + void dump_samples (const char *file_name, const char *msg, int dump_samples); + + void dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples); + + private: + void dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples); - protected: /// Base and end times ACE_UINT64 base_time_; ACE_UINT64 end_time_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index 8d284b588a5..0430a25e7a5 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" @@ -41,7 +42,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:c:e:f"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:c:e:f"); int c; while ((c = get_opts ()) != -1) @@ -151,14 +152,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index 7b7df800ca5..76033fa9aed 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -83,7 +84,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -184,15 +185,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -215,7 +218,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index a45be86190f..594e97b06f3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" @@ -39,7 +40,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:c:f"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:c:f"); int c; while ((c = get_opts ()) != -1) @@ -150,14 +151,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index f89028a58c1..8d701e5062b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -83,7 +84,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -179,14 +180,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -209,7 +212,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 38d260bc9ba..9190355728b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -3,6 +3,7 @@ #include "RedGreen_Test.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" @@ -29,7 +30,7 @@ int RedGreen_Test::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -106,7 +107,7 @@ RedGreen_Test::~RedGreen_Test () void RedGreen_Test::init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->init_ORB (argc, @@ -169,11 +170,10 @@ RedGreen_Test::done (void) void RedGreen_Test::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 03e74861531..a5541fef2e2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -76,7 +76,7 @@ class RedGreen_Test void dump_results (void); void init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initialize the Client. @@ -92,7 +92,7 @@ class RedGreen_Test protected: void init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp index 8d41fd8fe15..2a8b628db00 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -2,19 +2,22 @@ // $Id$ #include "RedGreen_Test.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_High_Res_Timer::calibrate (); RedGreen_Test client; - client.parse_args (argc, argv); + client.parse_args (convert.get_argc(), convert.get_ASCII_argv()); ACE_TRY_NEW_ENV { - client.init (argc, argv + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 020b750ffa5..9d3b137620d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -4,6 +4,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Synch.h" #include "ace/OS.h" #include "ace/Dynamic_Service.h" @@ -332,9 +333,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) int Notify_Throughput::parse_args(int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; while (arg_shifter.is_anything_left ()) { if (arg_shifter.cur_arg_strncasecmp ("-collocated_ec") == 0) @@ -589,20 +590,22 @@ Notify_Throughput::dump_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_High_Res_Timer::calibrate (); Notify_Throughput events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index 802054bd6cf..a22ed8b7a2b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -141,7 +141,7 @@ public: int parse_args(int argc, char *argv[]) ; - int init (int argc, char *argv [] ACE_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // initialization. void run_test (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index 6e8b8e678f8..91e52a15a7a 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -2,12 +2,14 @@ // $Id$ project(*server): namingexe, property_serv, utils { + exename = server Source_Files { server.cpp } } project(*client): namingexe, property, utils { + exename = client Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index bfc5efa2dd0..59af0166de4 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -728,16 +728,17 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Client client; - if (client.init (argc, - argv + if (client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 2d0f0760c99..58538e78535 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -29,6 +29,7 @@ #include "ace/Task.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp index d9e9a9f2a3e..c9c5608e701 100644 --- a/TAO/orbsvcs/tests/Property/main.cpp +++ b/TAO/orbsvcs/tests/Property/main.cpp @@ -468,7 +468,7 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY { diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index bcaeae71a5f..dac8f86c02a 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -17,14 +17,17 @@ // ============================================================================ #include "server.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(CosPropertyService, server, "$Id$") // Main program int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -32,8 +35,7 @@ main (int argc, char ** argv) TAO_ORB_Manager m; // Initialize the ORB. - m.init_child_poa (argc, - argv, + m.init_child_poa (convert.get_argc(), convert.get_ASCII_argv(), "child_poa" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index c89d3699c52..f07344f66c6 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -72,7 +72,7 @@ parse_args (int argc, char *argv[]) { /// We set the '-' flag for getopts because we have to do this /// parsing before the ORB does it's parsing, and we'd confuse it to reorder - ACE_Get_Opt get_opts (argc, argv, "-B:R:A:X:N:C:F:T:?:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "-B:R:A:X:N:C:F:T:?:"); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp index dbc60e82c6f..91d37266902 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp @@ -73,7 +73,7 @@ parse_args (int argc, char *argv[]) // We set the '-' flag for getopts because we have to do // this parsing before the ORB does it's //parsing, and we'd confuse it to reorder - ACE_Get_Opt get_opts (argc, argv, "-:N:F:S:T:A:X:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "-:N:F:S:T:A:X:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 9e767cc7dad..ca0e631d11f 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -21,6 +21,7 @@ #include "orbsvcs/Naming/Naming_Server.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" ACE_RCSID (Simple_Naming, @@ -83,15 +84,17 @@ My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED) // This function runs the test. int -main (int argc, ACE_TCHAR **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int c_breath = 4; int c_depth = 4; int o_breath = 4; - ACE_TCHAR *ns1ref = 0; - ACE_TCHAR *ns2ref = 0; + char *ns1ref = 0; + char *ns2ref = 0; - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("b:d:o:p:q:")); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "b:d:o:p:q:"); int c; int i; @@ -153,7 +156,7 @@ main (int argc, ACE_TCHAR **argv) ACE_TRY_EX(bl_a) { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); // ior's are specified for the name servers through a commandline // option or a file. @@ -161,7 +164,7 @@ main (int argc, ACE_TCHAR **argv) // Resolve the first name server CORBA::Object_var ns1obj = orb->string_to_object ( - ACE_TEXT_ALWAYS_CHAR (ns1ref) ACE_ENV_ARG_PARAMETER); + ACE_TEXT_TO_CHAR_IN (ns1ref) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_a); if (CORBA::is_nil (ns1obj.in ())) @@ -177,7 +180,7 @@ main (int argc, ACE_TCHAR **argv) // Resolve the second name server CORBA::Object_var ns2obj = orb->string_to_object ( - ACE_TEXT_ALWAYS_CHAR (ns2ref) ACE_ENV_ARG_PARAMETER); + ACE_TEXT_TO_CHAR_IN (ns2ref) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_a); if (CORBA::is_nil (ns2obj.in ())) diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index fe06daf6ba8..8199cfe0c7f 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/Sched/Strategy_Scheduler.h" #include "orbsvcs/Time_Utilities.h" +#include "ace/Argv_Type_Converter.h" #if defined (ACE_HAS_QUANTIFY) # include <quantify.h> #endif /* ACE_HAS_QUANTIFY */ @@ -258,7 +259,7 @@ DynSched_Test::run_schedule (ACE_Scheduler_Strategy &strategy, } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { int result = 0; diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index a856587a8f7..527949071a1 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -5,6 +5,7 @@ #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Scheduler_Factory.h" @@ -24,9 +25,9 @@ const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, " "static_cast<RtecScheduler::Info_Type_t> (%d)}\n"; int -parse_args (int argc, char *argv []) +parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:"); int opt; while ((opt = get_opt ()) != EOF) @@ -51,9 +52,10 @@ parse_args (int argc, char *argv []) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, argv) != 0) + ACE_Argv_Type_Converter convert (argc, argv); + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -340,7 +342,7 @@ main (int argc, char *argv[]) { // 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 = diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index 23d60c3709c..632c061cae2 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -22,9 +22,9 @@ const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, " "static_cast<RtecScheduler::Info_Type_t> (%d)}\n"; int -parse_args (int argc, char *argv []) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:"); int opt; while ((opt = get_opt ()) != EOF) @@ -49,7 +49,7 @@ parse_args (int argc, char *argv []) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) { diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp index 12692c53c26..ad13b636c01 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp @@ -19,7 +19,7 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index fb15517f37e..fa6d82bf742 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -20,7 +21,7 @@ void do_nothing (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -44,12 +45,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -103,7 +106,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index 44ddec21390..8a706f06f28 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" @@ -14,7 +15,7 @@ int no_iterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -100,7 +103,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in (), @@ -128,7 +131,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp index 44eeca19e7d..aa6a0effa62 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp @@ -14,7 +14,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp index a2a09539439..3813f86c837 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp @@ -15,7 +15,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp index 2ddfbc0be3d..9a26c5a4ce4 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Callback, const char *cert_file = "cacert.pem"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp index 881d7d2ca58..bdeaa4ad187 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Callback, const char *cert_file = "cacert.pem"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index dd70e280f98..b4c60648b3f 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -19,7 +19,7 @@ int wait_time = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "sk:w:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "sk:w:"); int c; while ((c = get_opts ()) != -1) @@ -48,7 +48,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index c880f1e4858..610aa4d47b1 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -16,7 +16,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index 5da628db89d..e2d5cfe92d7 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Client_Worker.h" @@ -12,7 +13,7 @@ int nthreads = 5; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x"); int c; while ((c = get_opts ()) != -1) @@ -51,17 +52,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" 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; // Get Object Reference using IOR file diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp index 29c53ecb7b8..14e591bbd70 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp @@ -10,7 +10,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp index 8ef6242213a..fd07ed0acba 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp @@ -14,7 +14,7 @@ int nthreads = 5; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x"); int c; while ((c = get_opts ()) != -1) @@ -53,7 +53,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl index 0bdb4fe461c..d1480fd47d1 100755 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl @@ -1,3 +1,4 @@ + eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp index b05e356507c..72cea2af0f2 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp @@ -14,7 +14,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:n:"); int c; while ((c = get_opts ()) != -1) @@ -60,7 +60,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index 40877b8871f..e9d4bfbeb79 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "FooC.h" #include "orbsvcs/SecurityC.h" @@ -112,7 +113,7 @@ secure_invocation_test (CORBA::Object_ptr object int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -135,19 +136,21 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - ACE_TString env ("SSL_CERT_FILE="); - env += cert_file; + ACE_TString env (ACE_TEXT("SSL_CERT_FILE=")); + env += ACE_TEXT_TO_TCHAR_IN(cert_file); ACE_OS::putenv (env.c_str ()); CORBA::ORB_var orb = - CORBA::ORB_init (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/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp index 8b7ff656577..e5f3b2f6af5 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp @@ -15,7 +15,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index 904a68a489b..a81edd2f705 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -21,6 +21,7 @@ #include "client.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple_Naming, client, "$Id$") @@ -90,7 +91,7 @@ CosNaming_Client::CosNaming_Client (void) int CosNaming_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "p:dstieym:c:"); int c; while ((c = get_opts ()) != -1) @@ -146,7 +147,7 @@ CosNaming_Client::parse_args (void) if (this->test_ == 0) { FILE * ior_output_file = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (ior_output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -1268,11 +1269,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + CosNaming_Client cosnaming_client; - if (cosnaming_client.init (argc, argv) == -1) + if (cosnaming_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return cosnaming_client.run (); diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index 0a4a4f0b63a..059cd8a60cc 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Client) : namingexe, utils, portableserver { + exename = client Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 904a68a489b..a81edd2f705 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -21,6 +21,7 @@ #include "client.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple_Naming, client, "$Id$") @@ -90,7 +91,7 @@ CosNaming_Client::CosNaming_Client (void) int CosNaming_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "p:dstieym:c:"); int c; while ((c = get_opts ()) != -1) @@ -146,7 +147,7 @@ CosNaming_Client::parse_args (void) if (this->test_ == 0) { FILE * ior_output_file = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (ior_output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -1268,11 +1269,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + CosNaming_Client cosnaming_client; - if (cosnaming_client.init (argc, argv) == -1) + if (cosnaming_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return cosnaming_client.run (); diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 9a8d23a4996..12979b67653 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -5,6 +5,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" @@ -248,7 +249,7 @@ Client_i::read_ior (char *filename) int Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:f:xk:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:f:xk:"); int c; int result; diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index 690b329a7d7..2eb9ac6be6f 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -2,20 +2,23 @@ #include "Client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Time, client, "$Id$") // This function runs the Time Service client test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Client_i client; ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Time Service Client\n")); - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return client.run (); diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 13f5084d1f6..201d04d92df 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -99,7 +99,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL) CORBA::ULong length = link_name_seq2->length (); for (i = 0; i < length; i++) { - if (ACE_OS::strcmp (link_name_seq2[i], "Bootstrap") != 0) + if (ACE_OS::strcmp (static_cast<const char*>(link_name_seq2[i]), "Bootstrap") != 0) break; } diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index e13b3b0766b..b56bf53f635 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -272,7 +272,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv) quiet_ (0), ior_ (0) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -299,7 +299,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv) if (arg_shifter.is_parameter_next ()) { const char* file_name = arg_shifter.get_current (); - ior_file = ACE_OS::fopen (file_name, "r"); + ior_file = ACE_OS::fopen (file_name, ACE_TEXT("r")); if (ior_file == 0) ACE_ERROR ((LM_ERROR, @@ -309,7 +309,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv) arg_shifter.consume_arg (); } else - ior_file = ACE_OS::fdopen (ACE_STDIN, "r"); + ior_file = ACE_OS::fdopen (ACE_STDIN, ACE_TEXT("r")); if (ior_file != 0) { diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index de4935df75c..fdda73a79c3 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -5,6 +5,7 @@ #include "TTestS.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "orbsvcs/CosTradingC.h" #include "orbsvcs/CosTradingReposC.h" diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index 008ef7449a7..ef1fa9fec52 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -24,6 +24,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, utils, pi, codecfactory { } project(*export test): namingexe, trading_serv, utils { + exename = export_test after += Trading_Test_Lib libs += TTest @@ -36,6 +37,7 @@ project(*export test): namingexe, trading_serv, utils { } project(*import test): namingexe, trading_serv, utils { + exename = import_test after += Trading_Test_Lib libs += TTest @@ -48,6 +50,7 @@ project(*import test): namingexe, trading_serv, utils { } project(*colocated test): namingexe, trading_serv, utils { + exename = colocated_test after += Trading_Test_Lib libs += TTest diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 67d9232a315..965cead51a2 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -2,6 +2,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Utils/ORB_Manager.h" #include "Offer_Exporter.h" #include "Offer_Importer.h" @@ -18,7 +19,7 @@ parse_args (int argc, char *argv[], CORBA::Boolean& verbose) { int opt; - ACE_Get_Opt get_opt (argc, argv, "fq"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "fq"); verbose = 1; while ((opt = get_opt ()) != EOF) @@ -29,17 +30,19 @@ parse_args (int argc, char *argv[], } int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. CORBA::Boolean verbose = 0; - ::parse_args (argc, argv, verbose); + ::parse_args (convert.get_argc(), convert.get_ASCII_argv(), verbose); // Initialize ORB. CORBA::ORB_var orb = orb_manager.orb (); diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 9078aa74b23..eeaa244912a 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -13,16 +13,18 @@ ACE_RCSID (Trading, "$Id$") int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. - TT_Parse_Args parse_args (argc, argv); + TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv()); // Init the orb and bootstrap to the trading service. CORBA::ORB_var orb = orb_manager.orb (); @@ -129,14 +131,14 @@ main (int argc, char** argv) size_t offset = 0; char file[1024]; - ACE_OS::strcpy(file, argv[0]); + ACE_OS::string_copy(file, argv[0], sizeof(file)/sizeof(file[0])); if ((offset = (size_t)ACE_OS::strrchr(file, '/')) != 0) { offset -= ((size_t)file - 1); } ACE_OS::strcpy(file + offset, "export_test_ready"); FILE *ready_file = - ACE_OS::fopen (file, "w"); + ACE_OS::fopen (file, ACE_TEXT("w")); if (ready_file != 0) { ACE_OS::fprintf (ready_file, "The export test is ready\n"); ACE_OS::fclose (ready_file); diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index f303d292998..0d21623d5f8 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -6,16 +6,18 @@ ACE_RCSID(Trading, import_test, "$Id$") int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. - TT_Parse_Args parse_args (argc, argv); + TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv()); // Initialize the ORB and bootstrap to the Lookup interface. CORBA::ORB_var orb = orb_manager.orb (); diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 54eb5f996f4..9a1f221c92b 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -20,16 +20,18 @@ // ============================================================================ #include "ior_corbaname_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { IOR_corbaname_Client_i client; - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; else { diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp index d183b4ff8a9..c3dc6049385 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp @@ -21,6 +21,7 @@ #include "ior_corbaname_client_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index 4582f0445a0..aefa18b60be 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -2,16 +2,19 @@ #include "status_i.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index f4f3d3311c2..67dacf5f7d6 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -29,6 +29,7 @@ #include "ace/Service_Config.h" #include "ace/Log_Msg.h" #include "ace/CORBA_macros.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (tests_svc_loader, @@ -36,15 +37,16 @@ ACE_RCSID (tests_svc_loader, "$Id$") -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // There must be at least one argument, the file that has to be @@ -60,7 +62,7 @@ int main (int argc, char *argv []) // Use the first argument to create the object reference. CORBA::Object_var object = - orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); + orb->string_to_object (convert.get_ASCII_argv()[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if this object reference is a valid one.. |