diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-01 23:23:59 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-01 23:23:59 +0000 |
| commit | 06b2fcccc0cb1e4b33bdca37f7b0db5daad6ce3b (patch) | |
| tree | c19bb53515b1cb4328652c5373e7e2dda944c8ee | |
| parent | 8dcdb931a9dffc338c6e8ed03cf0225d00b1062f (diff) | |
| download | ATCD-06b2fcccc0cb1e4b33bdca37f7b0db5daad6ce3b.tar.gz | |
More of Daves ACE_USES_WCHAR fixes
319 files changed, 1262 insertions, 880 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 1a01ae6bc62..940a5ffc754 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; @@ -236,13 +237,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -273,8 +275,7 @@ ACE_TMAIN (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 2aff76d4e6b..0b01546ce30 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; @@ -187,13 +188,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -224,15 +226,14 @@ ACE_TMAIN (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 +245,7 @@ ACE_TMAIN (int argc, "File Opened Successfully\n")); result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index 97489a648b8..91bf5332118 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. @@ -119,7 +120,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, @@ -293,11 +294,12 @@ int ACE_TMAIN (int argc, char **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 +330,7 @@ ACE_TMAIN (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 0e4eb464db6..e87500b2dad 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; @@ -209,7 +210,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, @@ -271,13 +272,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -306,7 +308,7 @@ ACE_TMAIN (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 +320,7 @@ ACE_TMAIN (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 61e6e0b107a..142781f1fcf 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; @@ -214,7 +215,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, @@ -429,12 +430,13 @@ int ACE_TMAIN (int argc, char **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 +471,7 @@ ACE_TMAIN (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 +482,7 @@ ACE_TMAIN (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 09f8ff94a57..daea563557d 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" @@ -429,13 +430,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv() 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -466,8 +468,7 @@ ACE_TMAIN (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 092d00669b5..da29c273573 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" @@ -288,13 +289,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -325,15 +327,14 @@ ACE_TMAIN (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", diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index ccd18326d87..79ecadec518 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" @@ -245,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, @@ -455,11 +456,12 @@ int ACE_TMAIN (int argc, char **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 +492,7 @@ ACE_TMAIN (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 869a1eb2018..5a8ff5b4627 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -246,7 +246,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) { @@ -346,11 +346,12 @@ int ACE_TMAIN (int argc, char **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 +366,7 @@ ACE_TMAIN (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 497b96472f7..374aa315357 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -191,7 +191,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")); @@ -223,13 +223,14 @@ int ACE_TMAIN (int argc, char **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 +251,7 @@ ACE_TMAIN (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 ef9b04aa3a1..d44665ee44f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -6,6 +6,7 @@ #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" ACE_RCSID (Latency, @@ -79,11 +80,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); parse_args (argc, argv); CORBA::Object_var obj diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index d0f754fbb25..c57ded23318 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" @@ -95,11 +96,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); parse_args (argc, argv); @@ -144,7 +146,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 1cdd65bedb0..ce98aa717a2 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" @@ -111,12 +112,13 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); parse_args (argc, argv); @@ -160,7 +162,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index ec26c543e61..c9cbcd7b9ee 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. @@ -247,13 +248,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -291,7 +293,7 @@ ACE_TMAIN (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", @@ -304,8 +306,7 @@ ACE_TMAIN (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 0b0180f6b14..b2799fc2b65 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. @@ -177,7 +178,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, @@ -374,12 +375,13 @@ int ACE_TMAIN (int argc, char **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 +412,7 @@ ACE_TMAIN (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 91eb1d33160..38bdfb997c1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -240,7 +240,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")); @@ -350,11 +350,12 @@ int ACE_TMAIN (int argc, char **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; 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 c0258a67baf..c9566d018d3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -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")); @@ -199,8 +199,10 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv() argv); ACE_DECLARE_NEW_CORBA_ENV; @@ -227,7 +229,7 @@ ACE_TMAIN (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 d07f7b6d831..1e16153adef 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -272,7 +272,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")); @@ -385,9 +385,9 @@ int ACE_TMAIN (int argc, char *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 +414,7 @@ ACE_TMAIN (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 2b8fa5aa6ff..01a9012853c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp @@ -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")); @@ -246,9 +246,9 @@ int ACE_TMAIN (int argc, char **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 @@ ACE_TMAIN (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 8163b88944d..e9e53416379 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", @@ -232,13 +233,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -268,8 +270,7 @@ ACE_TMAIN (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 e9b681f9068..4fa62e6b4ff 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. @@ -157,7 +158,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, @@ -370,12 +371,13 @@ int ACE_TMAIN (int argc, char **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 +408,7 @@ ACE_TMAIN (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 42b97e06bdb..c75f52bae29 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; @@ -183,7 +184,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", @@ -418,11 +419,12 @@ int ACE_TMAIN (int argc, char **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 +456,7 @@ ACE_TMAIN (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 5e8e0cda344..15e7e37e3cd 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. @@ -143,12 +144,13 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -162,7 +164,7 @@ ACE_TMAIN (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", @@ -198,8 +200,7 @@ ACE_TMAIN (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 f366a6a88cd..4e44528adeb 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" @@ -168,6 +169,8 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -175,8 +178,7 @@ ACE_TMAIN (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; @@ -214,7 +216,7 @@ ACE_TMAIN (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/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index a801de7f567..ace05ebf11a 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. @@ -141,7 +142,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, @@ -346,6 +347,8 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -353,8 +356,7 @@ ACE_TMAIN (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 +386,7 @@ ACE_TMAIN (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 7fe4e64b5ab..25d04bffff7 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 @@ -305,13 +306,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -342,8 +344,7 @@ ACE_TMAIN (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 e1a9d8e0fa8..d25258a58e8 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. @@ -169,13 +170,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -213,7 +215,7 @@ ACE_TMAIN (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", @@ -226,8 +228,7 @@ ACE_TMAIN (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 29c77f3372a..5a0639b644e 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. @@ -141,7 +142,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, @@ -321,12 +322,13 @@ int ACE_TMAIN (int argc, char **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 +358,7 @@ ACE_TMAIN (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 3cb1529efac..ce367684fb2 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) { @@ -236,13 +237,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -280,7 +282,7 @@ ACE_TMAIN (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", @@ -293,8 +295,7 @@ ACE_TMAIN (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index db6855c0935..b14fd6aa992 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. @@ -195,7 +196,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, @@ -437,12 +438,13 @@ int ACE_TMAIN (int argc, char **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 +474,7 @@ ACE_TMAIN (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 d68dd3d22fc..1788316edcf 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. @@ -172,13 +173,14 @@ int ACE_TMAIN (int argc, char **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -216,7 +218,7 @@ ACE_TMAIN (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", @@ -229,8 +231,7 @@ ACE_TMAIN (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 6591cbc0fea..3a3b9d9b79e 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; @@ -246,7 +247,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, @@ -508,12 +509,13 @@ int ACE_TMAIN (int argc, char **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 +545,7 @@ ACE_TMAIN (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/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 72054ff5833..58535a5ffd8 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -45,14 +45,15 @@ Time_impl::Shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) int 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 39375e3be43..88f1a575b63 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp @@ -11,6 +11,8 @@ // 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 ) ; diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index bbcd3632d93..01545dc26f4 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -6,9 +6,11 @@ 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 22e7e226e23..c1975ec0bdc 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; @@ -37,11 +38,13 @@ parse_args (int argc, char *argv[]) int 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) diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index 812d77add97..acebec4212e 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" @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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 = @@ -79,7 +82,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "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 ac432c28fa6..359e8a1f8ce 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -9,6 +9,8 @@ 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 +18,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* 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 3e73adf877b..037ee900a4e 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" @@ -74,11 +75,13 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte int 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) diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index bd463d0e189..14e3a9e64f9 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" @@ -78,6 +79,8 @@ int ACE_TMAIN (int argc, char *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -85,8 +88,7 @@ ACE_TMAIN (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -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 (convert.get_argc(), convert.get_ASCII_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 (convert.get_argc(), convert.get_ASCII_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 25225b3721c..e1ded5333ac 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; @@ -39,11 +40,13 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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 @@ -109,7 +112,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 7454227d297..fc6f9a4a29b 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" @@ -72,6 +73,8 @@ int ACE_TMAIN (int argc, char *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -79,8 +82,7 @@ ACE_TMAIN (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -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 (convert.get_argc(), convert.get_ASCII_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", @@ -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 (convert.get_argc(), convert.get_ASCII_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 a9ac2ed12d3..79c4a1acac6 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" @@ -49,7 +50,7 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -66,7 +67,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ -132,7 +133,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 770e6f3fae2..0e85c5d7de7 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -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", @@ -455,12 +455,14 @@ CC_Client::init (int argc, char **argv) int 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 ae06b5c4811..4da957a73f4 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -18,6 +18,8 @@ static void run_test (PortableServer::POA_ptr poa, int 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 +27,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 79c6aab0578..feb7d737f06 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -18,6 +18,8 @@ static void run_test (PortableServer::POA_ptr poa, int 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 +27,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 af510adde92..cca5eae7f43 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -13,6 +13,8 @@ ACE_RCSID (CEC_Tests_Basic, int 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 +22,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 e3865e17a36..1c2c0141bb8 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -13,6 +13,8 @@ ACE_RCSID (CEC_Tests_Basic, int 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 +22,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 84bf8e9dce6..ec7d5f71e75 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" @@ -14,6 +15,8 @@ ACE_RCSID (CEC_Tests, int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + RND_Driver driver; return driver.run (argc, argv); } @@ -50,12 +53,12 @@ RND_Driver::run (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; // **************************************************************** - 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 1d53e88a212..c24bfa7cc24 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -16,6 +16,8 @@ static void run_test (PortableServer::POA_ptr poa, int 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 +25,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 c32b0c1128f..8c37d9ff2bc 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" @@ -25,6 +26,8 @@ ACE_RCSID (EC_Custom_Marshal, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Driver driver; return driver.run (argc, argv); } @@ -50,7 +53,7 @@ Driver::run (int argc, ACE_TCHAR* 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 poa_object = @@ -90,7 +93,7 @@ Driver::run (int argc, ACE_TCHAR* 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,7 +313,7 @@ Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) } int -Driver::parse_args (int argc, ACE_TCHAR *argv[]) +Driver::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:n:h:p:"); int opt; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index 6350614787f..1d0adde39fd 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -76,7 +76,7 @@ public: // Maximum number of consumers. }; - int run (int argc, ACE_TCHAR* argv[]); + int run (int argc, char* argv[]); // Execute the test. void push_consumer (void* consumer_cookie, @@ -87,7 +87,7 @@ public: // received events it will invoke this method. private: - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); // parse the command line args void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 182fec63aca..0a5986b69e3 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" @@ -38,7 +39,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* 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 poa_object = @@ -81,7 +82,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* 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,7 +330,7 @@ ECMS_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) } int -ECMS_Driver::parse_args (int argc, ACE_TCHAR *argv[]) +ECMS_Driver::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:n:t:h:p:b:"); int opt; @@ -524,6 +525,8 @@ Test_Supplier::consumer_proxy (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECMS_Driver driver; return driver.run (argc, argv); } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index 8ca6b497687..10b3adb9270 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -90,7 +90,7 @@ public: // Maximum number of suppliers. }; - int run (int argc, ACE_TCHAR* argv[]); + int run (int argc, char* argv[]); // Execute the test. int supplier_task (Test_Supplier *supplier, @@ -107,7 +107,7 @@ public: // testing the short-circuit case. private: - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); // parse the command line args void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 2c3140605e9..0fe80eb5f21 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -13,6 +13,7 @@ #include "orbsvcs/Event/ECG_UDP_Out_Endpoint.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, @@ -69,6 +70,8 @@ int parse_args (int argc, char *argv[]); int 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 @@ -82,7 +85,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 9997928eae0..1fd45694260 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" @@ -44,7 +45,7 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[]) ACE_TRY { this->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 = @@ -121,7 +122,7 @@ ECM_Driver::run (int argc, ACE_TCHAR* 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,7 +340,7 @@ ECM_Driver::dump_results (void) // **************************************************************** int -ECM_Driver::parse_args (int argc, ACE_TCHAR *argv[]) +ECM_Driver::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:p:c:n:t:f:"); int opt; @@ -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; @@ -1152,6 +1153,8 @@ ECM_Local_Federation::subscribed_bit (int i) const int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ECM_Driver driver; diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index 0f4bf5e1635..a1044cb15aa 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -416,7 +416,7 @@ public: // Maximum number of federations in the simulation }; - int run (int argc, ACE_TCHAR* argv[]); + int run (int argc, char* argv[]); // Run the test, read all the configuration files, etc. void federation_has_shutdown (ECM_Local_Federation *federation @@ -456,7 +456,7 @@ private: int shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Called when the main thread. - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); // parse the command line arguments int parse_config_file (void); diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 8628cca5a20..1d05d10df86 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" @@ -131,7 +132,7 @@ Test_ECG::run (int argc, ACE_TCHAR* 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 poa_object = @@ -220,7 +221,7 @@ Test_ECG::run (int argc, ACE_TCHAR* 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,7 +1097,7 @@ Test_ECG::local_source (RtecEventComm::EventSourceID id) const } int -Test_ECG::parse_args (int argc, ACE_TCHAR *argv[]) +Test_ECG::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); int opt; @@ -1597,6 +1598,8 @@ Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) int 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 diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index d000b5a95f8..4bf7784e0cd 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -180,7 +180,7 @@ public: // Maximum number of suppliers. }; - int run (int argc, ACE_TCHAR* argv[]); + int run (int argc, char* argv[]); // Execute the test. void push_supplier (void* supplier_cookie, @@ -236,7 +236,7 @@ private: // Called when the main thread (i.e. not the scavenger thread) is // shutting down. - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); // parse the command line args void dump_results (void); 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 b2e8c366ba6..3aae2e7971c 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" @@ -23,6 +24,8 @@ ACE_RCSID (EC_Throughput, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Consumer_Driver driver; return driver.run (argc, argv); } @@ -51,7 +54,7 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[]) ACE_TRY { this->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 = @@ -95,7 +98,7 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* 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,7 +298,7 @@ ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) } int -ECT_Consumer_Driver::parse_args (int argc, ACE_TCHAR *argv[]) +ECT_Consumer_Driver::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "xdc:s:h:p:"); int opt; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 2731ca002b7..4af70e0f7a8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -41,7 +41,7 @@ public: // Maximum number of consumers. }; - int run (int argc, ACE_TCHAR* argv[]); + int run (int argc, char* argv[]); // Execute the test. virtual void shutdown_consumer (void* consumer_cookie @@ -51,7 +51,7 @@ public: // suppliers. private: - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); // parse the command line args void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, 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 8856277334e..04ecdd2d427 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" @@ -23,6 +24,8 @@ ACE_RCSID (EC_Throughput, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Supplier_Driver driver; return driver.run (argc, argv); } @@ -58,7 +61,7 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* 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 poa_object = @@ -107,7 +110,7 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* 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,7 +304,7 @@ ECT_Supplier_Driver::dump_results (void) } int -ECT_Supplier_Driver::parse_args (int argc, ACE_TCHAR *argv[]) +ECT_Supplier_Driver::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:u:n:t:b:h:p:"); int opt; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index 2b70bb6dd75..e51f0f73551 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h @@ -43,11 +43,11 @@ public: // Maximum number of suppliers. }; - int run (int argc, ACE_TCHAR* argv[]); + int run (int argc, char* argv[]); // Execute the test. private: - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); // parse the command line args void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 7c6ff6c965d..3411225d7c3 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" @@ -28,6 +29,8 @@ ACE_RCSID (EC_Throughput, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ECT_Throughput driver; @@ -70,7 +73,7 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[]) ACE_High_Res_Timer::calibrate (); this->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 = @@ -136,7 +139,7 @@ ECT_Throughput::run (int argc, ACE_TCHAR* 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,7 +478,7 @@ ECT_Throughput::dump_results (void) } int -ECT_Throughput::parse_args (int argc, ACE_TCHAR *argv[]) +ECT_Throughput::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); int opt; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h index d7d5ce95291..cb1ceae4a8b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h @@ -40,7 +40,7 @@ public: // Maximum number of suppliers. }; - int run (int argc, ACE_TCHAR* argv[]); + int run (int argc, char* argv[]); // Execute the test. virtual void shutdown_consumer (void* consumer_cookie @@ -50,7 +50,7 @@ public: // suppliers. private: - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); // parse the command line args void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index fdb3d107e4e..46b0f2e0976 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -20,6 +20,8 @@ const int event_source = 10; int 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 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 d3b0519cad7..2be96beeb0b 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, @@ -15,6 +16,8 @@ ACE_RCSID (EC_Tests_Basic, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_BCast driver; return driver.run (argc, argv); } @@ -33,7 +36,7 @@ EC_BCast::parse_args (int& argc, ACE_TCHAR* 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/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 883f6487148..225b737576c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -15,6 +15,8 @@ ACE_RCSID (EC_Tests, int 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 +24,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 e905ce485f0..96d6f5188d6 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -14,6 +14,8 @@ ACE_RCSID (EC_Tests, int 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 +23,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 429d5c57ae7..21431441673 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -20,6 +20,8 @@ const int event_source = 10; int 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 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 a226e275326..0f8a05fbc14 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -19,6 +19,8 @@ static void run_test (PortableServer::POA_ptr poa, int 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 +28,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index b62aaaa27d3..3cfc0ebd465 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -15,6 +15,8 @@ ACE_RCSID (EC_Tests, int 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 +24,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 83fc184d073..b7e977c3640 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -20,6 +20,8 @@ static void run_test (PortableServer::POA_ptr poa, int 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 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 a332f43cc11..3bb9d0e579e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -15,6 +15,8 @@ ACE_RCSID (EC_Tests, int 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 +24,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 9783ab7bee8..23a345637f9 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, @@ -15,6 +16,8 @@ ACE_RCSID (EC_Tests_Basic, int 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); @@ -165,7 +168,7 @@ EC_Master::initialize_orb_and_poa (int &argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL) { this->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_CHECK; CORBA::Object_var poa_object = @@ -194,7 +197,7 @@ EC_Master::initialize_orb_and_poa (int &argc, ACE_TCHAR* argv[] int EC_Master::parse_args (int &argc, ACE_TCHAR *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 c3d01c7b572..d029b5a3817 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -41,7 +41,7 @@ public: virtual int run (int argc, ACE_TCHAR* argv[]); /// Obtain the orb and the poa pointers - virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[] + virtual void initialize_orb_and_poa (int& argc, char* argv[] ACE_ENV_ARG_DECL); /// Accessors @@ -87,7 +87,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable observerions - virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[] + virtual void initialize_orb_and_poa (int& argc, char* argv[] ACE_ENV_ARG_DECL); virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index c5cc8968108..a0ffea18c74 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" @@ -16,6 +17,8 @@ ACE_RCSID (EC_Tests, int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + RND_Driver driver; return driver.run (argc, argv); } @@ -57,12 +60,12 @@ RND_Driver::run (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; // **************************************************************** - 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 dfd59ac9678..41b34dc0cb7 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, @@ -14,6 +15,8 @@ ACE_RCSID (EC_Tests_Basic, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Reconnect driver; return driver.run (argc, argv); } @@ -28,7 +31,7 @@ EC_Reconnect::EC_Reconnect (void) } int -EC_Reconnect::parse_args (int& argc, ACE_TCHAR* argv[]) +EC_Reconnect::parse_args (int& argc, char* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h index c17becfe57a..e99cd4b9ffb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h @@ -43,7 +43,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable reconnections - virtual int parse_args (int& argc, ACE_TCHAR* argv[]); + virtual int parse_args (int& argc, char* 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 3109b284237..7cb730a3301 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -9,6 +9,8 @@ ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$") int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Shutdown driver; return driver.run (argc, argv); } diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 6c7a096eb51..5c18c9af4c3 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -17,6 +17,8 @@ ACE_RCSID (EC_Tests, int 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 +26,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 a42ac259026..8e3b9824392 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -14,6 +14,8 @@ ACE_RCSID (EC_Tests, int 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 +23,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* 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 b7aad5eb6b1..e14cf58ed0a 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,7 +27,7 @@ Gateway_EC::check_for_nil (CORBA::Object_ptr obj, const char *message) } int -Gateway_EC::parse_args (int argc, ACE_TCHAR *argv[]) +Gateway_EC::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "i:"); int opt; @@ -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, @@ -90,7 +91,7 @@ Gateway_EC::run (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; orb_destroyer.init (orb); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 6914d93f843..3d4428604fa 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -139,11 +139,13 @@ parse_args (int /* argc */, char ** /* argv */) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp index 70bfe7303de..eabb9441d4c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp @@ -5,6 +5,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; if (test.run (argc, argv) == -1) return 1; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index b6cb60b4329..75bcc997221 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -56,12 +56,14 @@ parse_args (int /*argc*/, char ** /*argv*/) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize 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) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 473913781e6..a6f19e831e8 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -107,11 +107,13 @@ parse_args (int /* argc */, char ** /* argv */) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp index 209fac84fda..08071c8fca4 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp @@ -5,6 +5,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; if (test.run (argc, argv) == -1) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index e9a7cff1a7b..f4a4aa22191 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -46,11 +46,13 @@ parse_args (int /*argc*/, char ** /*argv*/) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 9a6c825171b..f0687da7ca1 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" @@ -599,6 +600,8 @@ parse_args (int argc, char ** argv) int 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,7 +609,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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) 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 a75057144b5..a70e980c9e5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp @@ -5,6 +5,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; if (test.run (argc, argv) == -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 8365308f2a8..de2b83a9be7 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" @@ -15,6 +16,8 @@ ACE_RCSID (EC_Tests_Performance, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Connect driver; return driver.run (argc, argv); } @@ -38,7 +41,7 @@ EC_Connect::parse_args (int& argc, ACE_TCHAR* 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 8855897158d..ee2a38c9550 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -7,6 +7,7 @@ #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, @@ -15,6 +16,8 @@ ACE_RCSID (EC_Tests_Performance, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Inversion driver; return driver.run (argc, argv); } @@ -29,7 +32,7 @@ EC_Inversion::EC_Inversion (void) int EC_Inversion::parse_args (int &argc, ACE_TCHAR *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 45f775759c8..f349bda6317 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" @@ -25,6 +26,8 @@ static int parse_args (int argc, char *argv[]); int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -50,7 +53,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index b771c4916a6..34fe2adf017 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" @@ -22,6 +23,8 @@ static int parse_args (int argc, char *argv[]); int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -122,7 +125,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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", diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index cde52a855c2..045c106dc51 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.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" ACE_RCSID (EC_Tests_Performance, Throughput, @@ -13,6 +14,8 @@ ACE_RCSID (EC_Tests_Performance, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Throughput driver; return driver.run (argc, argv); } diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index bed9ea90d50..aa8162270d7 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" @@ -59,7 +60,7 @@ EC_Driver::~EC_Driver (void) } int -EC_Driver::run (int argc, ACE_TCHAR* argv[]) +EC_Driver::run (int argc, char* argv[]) { ACE_TRY_NEW_ENV { @@ -67,7 +68,7 @@ EC_Driver::run (int argc, ACE_TCHAR* argv[]) // test. ACE_High_Res_Timer::calibrate (); - this->run_init (argc, argv ACE_ENV_ARG_PARAMETER); + this->run_init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -91,7 +92,7 @@ EC_Driver::run (int argc, ACE_TCHAR* argv[]) } void -EC_Driver::run_init (int &argc, ACE_TCHAR* argv[] +EC_Driver::run_init (int &argc, char* argv[] ACE_ENV_ARG_DECL) { this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER); @@ -106,7 +107,7 @@ EC_Driver::run_init (int &argc, ACE_TCHAR* 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", @@ -170,11 +171,11 @@ EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL) } void -EC_Driver::initialize_orb_and_poa (int &argc, ACE_TCHAR* argv[] +EC_Driver::initialize_orb_and_poa (int &argc, char* argv[] ACE_ENV_ARG_DECL) { this->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_CHECK; CORBA::Object_var poa_object = @@ -727,9 +728,9 @@ EC_Driver::dump_results (void) } int -EC_Driver::parse_args (int &argc, ACE_TCHAR *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/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index a4ef187600b..4ff4a1cffbe 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -58,21 +58,21 @@ public: int verbose (void) const; /// Execute the test. - virtual int run (int argc, ACE_TCHAR* argv[]); + virtual int run (int argc, char* argv[]); /// The initialization section - virtual void run_init (int& argc, ACE_TCHAR* argv[] + virtual void run_init (int& argc, char* argv[] ACE_ENV_ARG_DECL); /// The cleanup section virtual void run_cleanup (ACE_ENV_SINGLE_ARG_DECL); /// Initialize the ORB and obtain the RootPOA object - virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[] + virtual void initialize_orb_and_poa (int& argc, char* argv[] ACE_ENV_ARG_DECL); /// Parse the common command-line arguments for all tests - virtual int parse_args (int& argc, ACE_TCHAR* argv[]); + virtual int parse_args (int& argc, char* argv[]); /// Print the usage method virtual void print_usage (void); 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 1e615e6f46f..0fb925028ab 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -181,7 +181,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 +530,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; @@ -626,6 +626,8 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + FTClientMain app; int result = app.parse_args(argc, argv); if (result == 0) diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index e67c6418269..e681ee0c140 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -257,10 +257,12 @@ int FTAPP::FT_Creator::fini () int 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); 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 430f7173d79..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); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 5eb9a873b6e..65fc2dba0f4 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -63,7 +63,7 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[]) ACE_TRY_NEW_ENV { // Initialize the ORB. - this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. @@ -89,9 +89,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; } @@ -188,9 +187,11 @@ int TAO_FT_ReplicationManagerController::run () 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 e7048e9ce09..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 @@ -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 bcd7c371560..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" @@ -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 818488fd9b8..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 () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index d54c798f48a..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 @@ -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 2a157d8aa55..1c353279d4d 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" @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) int 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, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv() argv, "Client ORB" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 7f431b43b62..e8df2d7a75c 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" @@ -123,6 +124,8 @@ add_ft_prop (CORBA::ORB_ptr o, int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 = @@ -236,7 +239,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 " diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 8ff314d274b..5c221ea3c6c 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" @@ -62,6 +63,8 @@ int ACE_TMAIN (int argc, char *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -119,8 +122,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -260,7 +262,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 +313,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 (convert.get_argc(), convert.get_ASCII_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 810270542fa..e39052d061b 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/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; @@ -34,13 +35,13 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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 @@ -79,7 +80,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 2bfa68820df..da5232b6467 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -28,6 +28,7 @@ ACE_RCSID(IOGRManipluation, int 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 +37,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 ef1f13a7c8a..b8b2ecccaba 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" @@ -88,8 +89,10 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) 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; diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index d9e1035847d..f8fdc99dcd7 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" @@ -94,9 +95,11 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) 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; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 36cbfe1cd87..1529eedfbe3 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" @@ -177,12 +178,14 @@ Handler handler; int 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) diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 48847a3fcc2..2f89867c7a0 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$") @@ -60,12 +61,14 @@ parse_args (int argc, char *argv[]) int 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 = @@ -105,7 +108,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 7958fb7a444..b26c359c383 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" @@ -157,6 +158,8 @@ public: int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 = diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index 77f64036971..62ae9c7c4c2 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" @@ -42,13 +43,15 @@ parse_args (int argc, char *argv[]) int 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 = diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index 901a4a48ca7..5a2d41c7106 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" @@ -43,10 +44,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -131,7 +134,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index f170571d41e..8849f10f9e2 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -39,13 +39,15 @@ parse_args (int argc, char *argv[]) int 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) diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index c7fc644c0fe..9f22ccfc584 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" @@ -43,6 +44,8 @@ parse_args (int argc, char *argv[]) int 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 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 @@ -124,7 +127,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp index 9ddf92ad136..aa2c5d2048d 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp @@ -4,6 +4,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; @@ -13,7 +14,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *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..e636f637c7c 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 (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/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp index 4a30385474d..376d275c022 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp @@ -4,12 +4,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Server_i svr_i; - const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER); + const int init_result = svr_i.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (init_result != 0) diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index 96c56ea45f2..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,7 +160,7 @@ Server_i::enable_multicast (const char *ior) } int -Server_i::parse_args (int argc, ACE_TCHAR *argv[]) +Server_i::parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:"); int c; diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp index e3bbc19a88c..afbba7d4507 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp @@ -8,9 +8,11 @@ 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 8054c2af17e..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, @@ -13,11 +14,13 @@ ACE_RCSID (ImplRepo, int 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 ae9449e4866..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" diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp index 5136d0a01d8..f8b6542ca25 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp @@ -9,6 +9,8 @@ ACE_RCSID (ImplRepo, int 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 +18,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 22e2d3ba4fd..b0e070930f9 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" @@ -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", @@ -70,7 +71,7 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL) ACE_TRY { // Initialize the ORB - this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Save pointers to the command line arguments diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp index 7b9f5c023c7..f28e4dca349 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp @@ -13,11 +13,13 @@ ACE_RCSID (ImplRepo, int 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 7b66efdc9b9..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" diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index fb80b739154..ae8600d8656 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -7,6 +7,8 @@ ACE_RCSID(ImplRepo, nestea_server, "$Id$") int 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 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 1f406b5c5ae..bad1e708409 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" @@ -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", @@ -96,7 +97,7 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL) ACE_TRY { // Initialize the ORB - this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Save pointers to the command line arguments diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp index 7eabb17ef8b..ee02f7a96d7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp @@ -7,7 +7,9 @@ using namespace CORBA; -int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) +{ + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp index 8b1d1a770e7..e433e1f66a8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp @@ -5,12 +5,14 @@ int 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 db50c4d2274..e16ca614c5d 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" @@ -99,7 +100,7 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL) { ACE_TRY { - this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int retval = this->parse_args (argc, argv); diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h index 369768aeb61..222b179634a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h @@ -20,7 +20,7 @@ public: int run (ACE_ENV_SINGLE_ARG_DECL); private: - int parse_args (int argc, ACE_TCHAR* argv[]); + int parse_args (int argc, char* argv[]); CORBA::ORB_var orb_; PortableServer::POA_var root_poa_; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index 2e0806b3679..86ff583ad70 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -10,13 +10,14 @@ ACE_RCSID (Application_Test, int 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 119633c947d..8538cbb24b3 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 (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 9a0e0bc4a26..d091896f572 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -11,7 +11,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) { @@ -41,10 +41,11 @@ write_ior_to_file (const char *ior) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_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 1f37246ac94..b14b5870951 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp @@ -10,12 +10,13 @@ ACE_RCSID (Application_Test, int 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 bf42e747113..d91da19c26d 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 (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index 83e4254f58d..a801eb92c67 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,8 +61,7 @@ Admin_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -470,7 +470,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 +479,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 +488,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 +497,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 +566,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 (), members[i].in()) == 0); } @@ -606,7 +606,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 (fellows[i].in(), members[i].in()) == 0); } evar->name ("another_enum" @@ -846,7 +846,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 +855,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 +1085,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 +1102,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 +1111,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 +1120,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 +1180,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 +1624,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 +1765,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 +1782,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 +1791,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 +1800,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 +1809,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 +1872,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 +1909,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 +2092,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 +2122,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 +2524,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 +2986,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 +3050,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 5d52ae00658..88e8ec9f6b0 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp @@ -9,10 +9,11 @@ ACE_RCSID (IFR_Test, 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 11719d333f1..65db04bf8ec 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,8 +31,7 @@ Latency_Query_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->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/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index 39e8b144b41..f4bb63a5a71 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -10,10 +10,11 @@ ACE_RCSID (Latency__Test, int 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 6be36ed52da..af5ddc35f16 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$") @@ -23,8 +24,7 @@ Ptest::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -252,11 +252,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 8cbd2b7f573..1657e2a5ef7 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp @@ -9,10 +9,11 @@ ACE_RCSID (Persistence_Test, 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 69736bc8726..38b75a9d634 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -22,6 +22,8 @@ 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 +32,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *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 f7bb3f1a38c..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 @@ -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/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 e4f1add1632..7cd4aa50277 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, @@ -36,10 +37,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index 1d0d295726f..11fab3150b7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -8,6 +8,8 @@ ACE_RCSID (Application_Controlled, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *location1 = "MyLocation 1"; 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 f53d4f26249..e22b1c8678a 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, @@ -38,10 +39,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp index adc57a788e3..a7476db9cee 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp @@ -9,6 +9,8 @@ ACE_RCSID (Infrastructure_Controlled, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + const char *location1 = "MyLocation 1"; const char *location2 = "MyLocation 2"; 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 9ded185f1c6..f3c4e393ab0 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -9,6 +9,8 @@ ACE_RCSID (Manage_object_group, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *location1 = "MyLocation 1"; diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index 17148d7a329..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, @@ -64,12 +65,13 @@ check_loads (const CosLoadBalancing::LoadList & loads int 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 183a7c83661..a8aa2581339 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 @@ -5,6 +5,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" @@ -36,8 +37,7 @@ BasicLog_Test::init (int argc, char *argv[]) ACE_TRY { // Initialize the ORB - orb_ = CORBA::ORB_init (argc, - argv, + orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp index b906b2fb1e5..7c9da98dc2b 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp @@ -9,6 +9,8 @@ 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")); diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index 11304f1fed4..2dae462b151 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" @@ -40,10 +41,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index 89034adabaa..f5b88ab9ada 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" @@ -52,10 +53,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -87,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 ae2743df80e..eed1832ccbe 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" @@ -24,7 +25,7 @@ AdminProperties_Task::init (TAO_Notify_Tests_StructuredPushSupplier *supplier, A int AdminProperties_Task::init (int argc, ACE_TCHAR *argv[]) { - return ACE_Task_Base::init (argc, argv); + return ACE_Task_Base::init (convert.get_argc(), convert.get_ASCII_argv()); } int @@ -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; @@ -470,11 +471,13 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL) int 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 2f26a30e297..d6f22b112d2 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; @@ -352,6 +353,8 @@ ConnectDisconnect::check_results (void) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ConnectDisconnect client; if (client.parse_args (argc, argv) == -1) @@ -361,7 +364,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 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 632efa6fbe9..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, - ACE_TCHAR *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 511ceb7a635..4b0e23c371c 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" @@ -148,7 +149,7 @@ int 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; @@ -324,6 +325,8 @@ Events::check_results (void) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Events events; if (events.parse_args (argc, argv) == -1) @@ -333,8 +336,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 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 27a1f1c6308..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, - ACE_TCHAR *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 a385c0fdfac..3f9f06dd552 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" @@ -220,6 +221,8 @@ Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Filter events; if (events.parse_args (argc, argv) == -1) @@ -229,8 +232,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 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 99c0a982a5f..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, - ACE_TCHAR *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 dc6bb6bb3f4..7c2b40af22f 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" @@ -27,7 +28,7 @@ int 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 +84,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 (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -460,16 +460,16 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) 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 0ceb58e6283..2e56107fbd1 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> @@ -26,7 +27,7 @@ int 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; @@ -62,11 +63,10 @@ LifeCycle::parse_args (int argc, void LifeCycle::init (int argc, - ACE_TCHAR* argv[] + char* argv[] ACE_ENV_ARG_DECL) { - 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_CHECK; @@ -244,16 +244,16 @@ LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL) int 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 7d96b92972f..b12b7d59ce7 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" @@ -377,6 +378,8 @@ MultiTypes::check_results (void) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + MultiTypes client; if (client.parse_args (argc, argv) == -1) @@ -386,8 +389,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 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 bef9cffb398..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, - ACE_TCHAR *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 632219987fc..df72056327c 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" @@ -150,7 +151,7 @@ int 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; @@ -356,6 +357,8 @@ Sequence::check_results (void) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Sequence events; if (events.parse_args (argc, argv) == -1) @@ -365,8 +368,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 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 0cb961b7cd5..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, - ACE_TCHAR *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 14344fb4566..ff24be81645 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" @@ -127,7 +128,7 @@ int 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; @@ -240,6 +241,8 @@ Simple_Test::check_results (void) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Simple_Test events; if (events.parse_args (argc, argv) == -1) @@ -249,8 +252,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 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 509b602d005..c14b3bbfb88 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, - ACE_TCHAR *argv[]) + ACE_TCHAR *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 820d846dd4d..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" @@ -465,12 +466,13 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL) int 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 2ed94781206..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, ACE_TCHAR *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/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 1a9748b5a9d..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" @@ -29,7 +30,7 @@ static Notify_Structured_Push_Consumer* consumer_1 = 0; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -112,12 +113,14 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 64528ed5ff3..74e781eb3df 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" @@ -74,7 +75,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -174,12 +175,14 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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) @@ -202,7 +205,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp index 09944124843..24c32fdeb75 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp @@ -7,11 +7,13 @@ 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/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index de9b43d1235..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" @@ -30,7 +31,7 @@ static Notify_Sequence_Push_Consumer* consumer_1 = 0; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -135,12 +136,14 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 b52b9a87d46..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" @@ -89,7 +90,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -209,12 +210,14 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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 ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); 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 cb22d32930b..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" @@ -19,7 +20,7 @@ static Notify_Structured_Push_Consumer* consumer_1; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -129,12 +130,14 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 38edf8b627c..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" @@ -80,7 +81,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -190,12 +191,14 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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 ACE_TMAIN (int argc, ACE_TCHAR* 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..f618a8efedc 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp @@ -6,11 +6,13 @@ 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 62c1dd7ed90..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" @@ -30,7 +31,7 @@ static unsigned int expected = 1; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -127,12 +128,14 @@ disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) 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 60559e115a0..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" @@ -77,7 +78,7 @@ private: class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -196,11 +197,13 @@ disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) 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 ACE_TMAIN (int argc, ACE_TCHAR* 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 53b6a9d145b..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" @@ -20,7 +21,7 @@ static bool use_ordering = false; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -129,11 +130,13 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 43e1f7ddbd1..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" @@ -66,7 +67,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; int @@ -202,11 +203,13 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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 ACE_TMAIN (int argc, ACE_TCHAR* 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 e680e41a7c4..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"; @@ -18,7 +19,7 @@ static bool use_ordering = false; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; int @@ -124,11 +125,13 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 42a29cb88d2..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" @@ -65,7 +66,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -199,11 +200,13 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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 ACE_TMAIN (int argc, ACE_TCHAR* 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 ce1c5d549d6..7412024ad90 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp @@ -82,6 +82,8 @@ namespace { int ACE_TMAIN(int, ACE_TCHAR**) { + ACE_Argv_Type_Converter convert (argc, argv); + try { setUp(); 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..a1348b3d0b6 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -33,9 +33,9 @@ TAO_Notify_Tests_RT_POA_Command::name (void) } 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..d819fa2087c 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -42,7 +42,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index eddc05f7554..da91f87afda 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -1040,7 +1040,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 +1064,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 +1267,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 +1359,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,6 +1874,8 @@ int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = -1; Consumer_Main app; ACE_TRY_NEW_ENV diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 3c4efaf2598..816222bd243 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -444,7 +444,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 +468,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 +657,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 +749,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_)); @@ -1285,7 +1285,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); @@ -1343,6 +1343,8 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = -1; Supplier_Main app; ACE_TRY_NEW_ENV 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 5cf0e9af604..db5d2e086a3 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" @@ -29,7 +30,7 @@ static unsigned int high = 7; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -140,12 +141,14 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 49a8aee89e2..6831136ed88 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" @@ -76,7 +77,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -226,12 +227,14 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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) @@ -253,7 +256,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " 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 5b4539f4461..62ebda43d54 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" @@ -32,7 +33,7 @@ static const char* constraintString = "Number == 10"; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; int @@ -143,12 +144,14 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index 33fc9a79e9f..2ce98df2f79 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 @@ -78,7 +79,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; int @@ -228,13 +229,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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) @@ -257,7 +260,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index a21ea41d759..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" @@ -24,7 +25,7 @@ static const char* GRAMMAR = "TCL"; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; int @@ -71,11 +72,13 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 8f7d2313263..16845443d3e 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" @@ -133,11 +134,13 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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 ACE_TMAIN (int argc, ACE_TCHAR * 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 7448eedaa0d..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" @@ -25,7 +26,7 @@ static const char* GRAMMAR = "TCL"; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; int @@ -88,11 +89,13 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 f9a57637f7c..36fbe655b2e 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" @@ -68,7 +69,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -203,11 +204,13 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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 ACE_TMAIN (int argc, ACE_TCHAR * 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 70d1aa1a430..b6c5d2c95b6 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -54,6 +54,8 @@ class TestConsumer int ACE_TMAIN(int ac, ACE_TCHAR **av) { + ACE_Argv_Type_Converter convert (argc, argv); + int retval = 1; bool pass1 = false; @@ -68,7 +70,7 @@ int ACE_TMAIN(int ac, ACE_TCHAR **av) ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (orb.in ())); - if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0) + if (ac > 2 && ACE_OS::strcmp (av[1], ACE_TEXT("-pass")) == 0) { int pn = av[2][0] - '0'; switch (pn) diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 86b477c1bba..a83ffcb563e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -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; diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h index 7ba0f5bb176..dd2bd77ebba 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h @@ -91,7 +91,7 @@ public: int ior_output_file (const ACE_TCHAR *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 b1b7c5a8646..684ea59c128 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -33,7 +33,7 @@ TAO_Notify_Tests_Application_Command::name (void) } 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..67746f13f3b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -40,7 +40,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 4e63d4ba284..3b31614d141 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< char >& /*arg_shifter*/) { // default: do nothing. } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index c46ee3ba6fb..739188699d8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -20,6 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/CORBA_macros.h" namespace CORBA @@ -44,7 +45,7 @@ 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< char >& arg_shifter); /// Implement command execution. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0; diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index e95b8ed81b2..93d067000bf 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" @@ -21,7 +22,7 @@ TAO_Notify_Tests_Command_Builder::~TAO_Notify_Tests_Command_Builder () int TAO_Notify_Tests_Command_Builder::init (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); ACE_CString current_arg; TAO_Notify_Tests_Command_Factory* factory = 0; diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 789fc22358f..1bae181df50 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -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..89469f27047 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -39,7 +39,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 6c4c0036b4f..bcb725c82bd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -177,13 +177,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; 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) { @@ -226,7 +226,7 @@ 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); 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 d1c9c08b71a..d92b3f6a36d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -33,7 +33,7 @@ TAO_Notify_Tests_EventChannel_Command::name (void) } 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 1a07e216014..1de43ed107d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -42,7 +42,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 48ff6bfae18..0a371bd6d0f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -29,7 +29,7 @@ TAO_Notify_Tests_Filter_Command::name (void) } 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..0da50304fd4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -39,7 +39,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp index 87e0c004674..6a887d34c56 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp @@ -5,7 +5,7 @@ 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 char* const TAO_Notify_Tests_Name::target = name; TAO_Notify_Tests_DECLARE_NAME (command_builder,"Command_Builder") TAO_Notify_Tests_DECLARE_NAME (root_poa,"RootPOA") diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index b97f63df58d..938396dabc9 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, ACE_TCHAR *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 (convert.get_argc(), convert.get_ASCII_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 5ffb0e9a332..493d4144c7e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -37,10 +37,10 @@ public: Notify_Test_Client (void); virtual ~Notify_Test_Client (); - virtual int init (int argc, ACE_TCHAR *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, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); // Allow the user to override this empty method int ORB_run (ACE_ENV_SINGLE_ARG_DECL); @@ -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 fbcb5f8c03b..103533945d1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -19,9 +19,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 ()) { @@ -50,9 +50,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 7acd1919324..2f9dd8faf3b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h @@ -20,6 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNotificationC.h" /** @@ -38,10 +39,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 3273306214b..2d369b5ba2a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -22,8 +22,8 @@ #include "orbsvcs/CosNotifyChannelAdminC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/SString.h" - -class ACE_Arg_Shifter; +#include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" /** * @class TAO_Notify_Tests_Peer @@ -44,7 +44,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 efa4eb67f71..387487eef41 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 "tao/debug.h" #include "orbsvcs/Time_Utilities.h" @@ -40,13 +41,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 ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h index 62f8746dde0..21527b93ac4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h @@ -21,10 +21,11 @@ #include "Task_Stats.h" #include "Notify_StructuredPushConsumer.h" +#include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" class TAO_Notify_Tests_Task_Callback; class ACE_Barrier; -class ACE_Arg_Shifter; /** * @class TAO_Notify_Tests_Periodic_Consumer @@ -45,7 +46,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index 7b3e5527ed7..6bf3b75202b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -36,7 +36,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::name (void) } 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..1ceb20ea3e7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -41,7 +41,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index b2aea30f498..8ed7b16978b 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 ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index d342e83a066..1731e3cb3f7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -24,10 +24,11 @@ #include "StructuredEvent.h" #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" class TAO_Notify_Tests_Task_Callback; class ACE_Barrier; -class ACE_Arg_Shifter; /** * @class TAO_Notify_Tests_Periodic_Supplier @@ -48,7 +49,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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 0378605ffea..4ce750ceda9 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -35,7 +35,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::name (void) } 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..78daa11edce 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -41,7 +41,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index e29e95e8adb..b11ee0e31d2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -30,7 +30,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::name (void) } 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..57872a67baf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -39,7 +39,7 @@ 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); diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp index 3669f3987a1..a2e6db40f33 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp @@ -58,7 +58,7 @@ Task_Stats::end_time (ACE_UINT64 time) void Task_Stats::dump_samples (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/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index c82df3448e0..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" @@ -34,7 +35,7 @@ static unsigned int expected = 100; // 100 sets of 10 class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -153,12 +154,14 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 e7da87eb95d..0d4ec17c912 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" @@ -76,7 +77,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -178,13 +179,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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) @@ -207,7 +210,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " 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 defdc2ed2ef..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" @@ -32,7 +33,7 @@ static unsigned int expected = 1000; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -152,12 +153,14 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, 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 b81c312628d..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" @@ -76,7 +77,7 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, ACE_TCHAR* argv[]); + virtual int parse_args (int argc, char* argv[]); }; @@ -181,12 +182,14 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, 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 ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " 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 2931a6bfae7..cc27838df92 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; @@ -83,7 +84,7 @@ RedGreen_Test::~RedGreen_Test () void RedGreen_Test::init (int argc, - ACE_TCHAR *argv[]) + ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { this->init_ORB (argc, @@ -146,10 +147,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, + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv() argv, "" ACE_ENV_ARG_PARAMETER); 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 7a9d503fbe3..cccaba98a8a 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, - ACE_TCHAR *argv[]) + ACE_TCHAR *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 d95f21742cc..74fb0bfe707 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -6,6 +6,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_High_Res_Timer::calibrate (); RedGreen_Test client; @@ -14,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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 07b0160d3e1..3786ccfbd3e 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,7 +333,7 @@ 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; while (arg_shifter.is_anything_left ()) @@ -591,6 +592,8 @@ Notify_Throughput::dump_results (void) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_High_Res_Timer::calibrate (); Notify_Throughput events; @@ -602,7 +605,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 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 45d6735ba3b..4feae0b87d2 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, ACE_TCHAR *argv[]) ACE_ENV_ARG_DECL); + int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); // initialization. void run_test (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index 014b5ee5484..52167162da7 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -730,6 +730,8 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL) int ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY 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/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 37adbd9cb01..97a3aabed60 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -25,6 +25,8 @@ ACE_RCSID(CosPropertyService, server, "$Id$") int ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index ec85a4f6862..92fda08eb84 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, @@ -85,6 +86,8 @@ My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED) int 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; diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index 9aaa759ac72..9f3ee07f92c 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -260,6 +260,8 @@ DynSched_Test::run_schedule (ACE_Scheduler_Strategy &strategy, int ACE_TMAIN (int, ACE_TCHAR *[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; // create a bunch of different strategies, indicating the minimum critical diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index ce2969d39cc..507b60683ea 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,7 +25,7 @@ const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, " "static_cast<RtecScheduler::Info_Type_t> (%d)}\n"; int -parse_args (int argc, ACE_TCHAR *argv[]) +parse_args (int argc, char *argv[]) { ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:"); int opt; @@ -340,7 +341,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *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/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index c827a09d61b..564ee126a5e 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" @@ -46,10 +47,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index 1c8f0d4cc8d..3585bdb92e6 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" @@ -43,10 +44,12 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -128,7 +131,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index fd66e9d659c..433984d9816 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" @@ -53,12 +54,14 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" 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) diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index 9039c39aeec..d213c2e7bae 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" @@ -137,6 +138,8 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { ACE_TString env ("SSL_CERT_FILE="); @@ -144,7 +147,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) 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) diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index 29ea9d270a6..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$") @@ -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, @@ -1270,9 +1271,11 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) int 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/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 29ea9d270a6..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$") @@ -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, @@ -1270,9 +1271,11 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) int 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 db4dabd2566..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" diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index 72d974a6956..6c61970704a 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -10,12 +10,14 @@ ACE_RCSID(Time, client, "$Id$") int 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..d25982b229e 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 (link_name_seq2[i].in(), "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/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index a9a1b0768d8..32bcb3e081f 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" @@ -31,10 +32,12 @@ parse_args (int argc, char *argv[], int ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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. diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index cbb296a43c4..729c5d85b2f 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -15,10 +15,12 @@ ACE_RCSID (Trading, int 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. @@ -129,14 +131,14 @@ ACE_TMAIN (int argc, ACE_TCHAR** 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 55098ac42da..926ec5224ac 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -8,10 +8,12 @@ ACE_RCSID(Trading, import_test, "$Id$") int 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. diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 854e8a942b3..48c031f5c8a 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -23,13 +23,14 @@ 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 f5b15bdafa9..fcc308441bf 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -5,13 +5,15 @@ 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 58c8afa213f..c523c170efd 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -38,13 +38,14 @@ ACE_RCSID (tests_svc_loader, 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 diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h index 61e0814dd67..33be6327440 100644 --- a/TAO/tao/Managed_Types.h +++ b/TAO/tao/Managed_Types.h @@ -24,6 +24,10 @@ #include "tao/Basic_Types.h" #include "tao/CORBA_String.h" +#if !defined (ACE_LACKS_DEPRECATED_MACROS) +# include "ace/OS_NS_string.h" +#endif + /****************************************************************/ /** @@ -323,6 +327,43 @@ private: }; +// Allows for the implicit conversion of TAO_String_Manager to const char* +#if !defined (ACE_LACKS_DEPRECATED_MACROS) +namespace ACE_OS +{ + template <> inline size_t + strlen( const TAO_String_Manager& str ) + { + return ACE_OS::strlen( str.in() ); + } + template <> inline int + strcmp( const TAO_String_Manager& lhs, const char* rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs ); + } + template <> inline int + strcmp( const TAO_String_Manager& lhs, const TAO_String_Manager& rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs.in() ); + } + template <> inline size_t + strlen( const TAO_WString_Manager& str ) + { + return ACE_OS::strlen( str.in() ); + } + template <> inline int + strcmp( const TAO_WString_Manager& lhs, const char* rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs ); + } + template <> inline int + strcmp( const TAO_WString_Manager& lhs, const TAO_WString_Manager& rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs.in() ); + } +} +#endif /* ACE_LACKS_DEPRECATED_MACROS */ + #if defined (__ACE_INLINE__) #include "tao/Managed_Types.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 80053a3ee98..595f3bb55db 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -330,8 +330,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_TEXT ("cannot cache hostname\n"))); return -1; } -// what! - this->host_ = ACE_TEXT_TO_CHAR_IN(tmp_host); + this->host_ = ACE_TEXT_TO_CHAR_OUT(tmp_host); } // This avoids having child processes acquire the listen socket thereby diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index f2b9a3f6f9c..0a463afe0e3 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -100,8 +100,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) if (argc > 0 && argv != 0) { -// what! - argv0 = ACE_TEXT_TO_CHAR_IN (argv[0]); + argv0 = ACE_TEXT_TO_CHAR_OUT (argv[0]); } CORBA::ULong len = 0; diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp index 9217adffe0c..e24baecc6eb 100644 --- a/ace/Arg_Shifter.cpp +++ b/ace/Arg_Shifter.cpp @@ -7,202 +7,3 @@ ACE_RCSID (ace, Arg_Shifter, "$Id$") - - -ACE_Arg_Shifter::ACE_Arg_Shifter (int& argc, - const ACE_TCHAR** argv, - const ACE_TCHAR** temp) - : argc_ (argc), - total_size_ (argc), - temp_ (temp), - argv_ (argv), - current_index_ (0), - back_ (argc - 1), - front_ (0) -{ - this->init (); -} - -ACE_Arg_Shifter::ACE_Arg_Shifter (int& argc, - ACE_TCHAR** argv, - ACE_TCHAR** temp) - : argc_ (argc), - total_size_ (argc), - temp_ ((const ACE_TCHAR **) temp), - argv_ ((const ACE_TCHAR **) argv), - current_index_ (0), - back_ (argc - 1), - front_ (0) -{ - this->init (); -} - -void -ACE_Arg_Shifter::init (void) -{ - // If not provided with one, allocate a temporary array. - if (this->temp_ == 0) - ACE_NEW (this->temp_, - const ACE_TCHAR *[this->total_size_]); - - if (this->temp_ != 0) - { - // Fill the temporary array. - this->argc_ = 0; - for (int i = 0; i < this->total_size_; i++) - { - this->temp_[i] = this->argv_[i]; - this->argv_[i] = 0; - } - } - else - { - // Allocation failed, prohibit iteration. - this->current_index_ = this->argc_; - this->front_ = this->argc_; - } -} - -ACE_Arg_Shifter::~ACE_Arg_Shifter (void) -{ - // Delete the temporary vector. - delete [] temp_; -} - -const ACE_TCHAR * -ACE_Arg_Shifter::get_current (void) const -{ - const ACE_TCHAR * retval = 0; - - if (this->is_anything_left ()) - retval = this->temp_[current_index_]; - - return retval; -} - -const ACE_TCHAR * -ACE_Arg_Shifter::get_the_parameter (const ACE_TCHAR *flag) -{ - // the return 0's abound because this method - // would otherwise be a deep if { } else { } - - // check to see if any arguments still exist - if (!this->is_anything_left()) - return 0; - - // check to see if the flag is the argument - int offset = this->cur_arg_strncasecmp (flag); - if (offset == -1) - return 0; - - if (offset == 0) - { - this->consume_arg (); - - if (!this->is_parameter_next()) - { - return 0; - } - } - // the paramter is in the middle somewhere... - return this->temp_[current_index_] + offset; -} - -int -ACE_Arg_Shifter::cur_arg_strncasecmp (const ACE_TCHAR *flag) -{ - // Check for a current argument - if (this->is_anything_left()) - { - size_t flag_length = ACE_OS::strlen (flag); - - // Check for presence of the flag - if (ACE_OS::strncasecmp(this->temp_[current_index_], - flag, - flag_length) == 0) - { - if (ACE_OS::strlen(temp_[current_index_]) == - flag_length) - { - // match and lengths are equal - return 0; - } - else - { - // matches, with more info to boot! - size_t remaining = ACE_OS::strspn - (this->temp_[current_index_] + flag_length, - ACE_LIB_TEXT (" ")) + flag_length; - return static_cast<int> (remaining); - } - } - } - // failure - return -1; -} - -int -ACE_Arg_Shifter::consume_arg (int number) -{ - int retval = 0; - - // Stick knowns at the end of the vector (consumed). - if (this->is_anything_left() >= number) - { - for (int i = 0, j = this->back_ - (number - 1); - i < number; - ++i, ++j, ++this->current_index_) - this->argv_[j] = this->temp_[this->current_index_]; - - this->back_ -= number; - retval = 1; - } - - return retval; -} - -int -ACE_Arg_Shifter::ignore_arg (int number) -{ - int retval = 0; - - // Keep unknowns at the head of the vector. - if (this->is_anything_left () >= number) - { - for (int i = 0; - i < number; - i++, this->current_index_++, this->front_++) - this->argv_[this->front_] = this->temp_[this->current_index_]; - - retval = 1; - this->argc_ += number; - } - - return retval; -} - -int -ACE_Arg_Shifter::is_anything_left (void) const -{ - return this->total_size_ - this->current_index_; -} - -int -ACE_Arg_Shifter::is_option_next (void) const -{ - return this->is_anything_left () && - this->temp_[this->current_index_][0] == '-'; -} - -int -ACE_Arg_Shifter::is_parameter_next (void) const -{ - return this->is_anything_left () - && this->temp_[this->current_index_][0] != '-'; -} - -int -ACE_Arg_Shifter::num_ignored_args (void) const -{ - return this->front_; -} diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h index 66901baf659..dbae5593674 100644 --- a/ace/Arg_Shifter.h +++ b/ace/Arg_Shifter.h @@ -37,7 +37,8 @@ * has placed all the unknown arguments in their original order at * the front of original @a argv. */ -class ACE_Export ACE_Arg_Shifter +template < typename CHAR_TYPE = char > +class ACE_TArg_Shifter { public: // = Initialization and termination methods. @@ -55,28 +56,28 @@ public: * @param argv The argument vector to shift. The string pointers in * the vector will be reordered to place the @a argc unconsumed * arguments at the front of the vector. - * @param temp A vector of @c ACE_TCHAR pointers at least @a argc + * @param temp A vector of @c CHAR_TYPE pointers at least @a argc * elements long. The vector will be used for argument shifting as * the specified @a argv vector is consumed. The vector must not * be modified while this object exists. If this argument is 0 * (the default) the object will allocate and free the temporary * vector transparently. */ - ACE_Arg_Shifter (int& argc, - const ACE_TCHAR **argv, - const ACE_TCHAR **temp = 0); + ACE_TArg_Shifter (int& argc, + const CHAR_TYPE **argv, + const CHAR_TYPE **temp = 0); /// Same behavior as the preceding constructor, but without the /// "const" qualifier. - ACE_Arg_Shifter (int& argc, - ACE_TCHAR **argv, - ACE_TCHAR **temp = 0); + ACE_TArg_Shifter (int& argc, + CHAR_TYPE **argv, + CHAR_TYPE **temp = 0); /// Destructor. - ~ACE_Arg_Shifter (void); + ~ACE_TArg_Shifter (void); /// Get the current head of the vector. - const ACE_TCHAR *get_current (void) const; + const CHAR_TYPE *get_current (void) const; /** * If the @a flag matches the current_arg of arg shifter @@ -110,7 +111,7 @@ public: * together '-foobarflagVALUE', the flag is NOT consumed * and the cur arg is left pointing to the entire flag/value pair */ - const ACE_TCHAR *get_the_parameter (const ACE_TCHAR* flag); + const CHAR_TYPE *get_the_parameter (const CHAR_TYPE* flag); /** * Check if the current argument matches (case insensitive) <flag> @@ -141,7 +142,7 @@ public: * Case C: If neither of Case A or B is met (no match) * then -1 is returned */ - int cur_arg_strncasecmp (const ACE_TCHAR *flag); + int cur_arg_strncasecmp (const CHAR_TYPE *flag); /// Consume @a number argument(s) by sticking them/it on the end of /// the vector. @@ -167,10 +168,10 @@ public: private: /// Copy Constructor should not be used. - ACE_Arg_Shifter (const ACE_Arg_Shifter&); + ACE_TArg_Shifter (const ACE_TArg_Shifter&); /// Assignment '=' operator should not be used. - ACE_Arg_Shifter operator= (const ACE_Arg_Shifter&); + ACE_TArg_Shifter operator= (const ACE_TArg_Shifter&); /// Refactor the constructor logic. void init (void); @@ -182,10 +183,10 @@ private: int total_size_; /// The temporary array over which we traverse. - const ACE_TCHAR **temp_; + const CHAR_TYPE **temp_; /// The array in which the arguments are reordered. - const ACE_TCHAR **argv_; + const CHAR_TYPE **argv_; /// The element in <temp_> we're currently examining. int current_index_; @@ -199,6 +200,10 @@ private: int front_; }; +typedef ACE_TArg_Shifter< ACE_TCHAR > ACE_Arg_Shifter; + +#include "ace/Arg_Shifter.inl" + #include /**/ "ace/post.h" #endif /* ACE_ARG_SHIFTER_H */ diff --git a/ace/Basic_Stats.cpp b/ace/Basic_Stats.cpp index eaf51d04a17..80f95b9d7cf 100644 --- a/ace/Basic_Stats.cpp +++ b/ace/Basic_Stats.cpp @@ -42,7 +42,7 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs) } void -ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, +ACE_Basic_Stats::dump_results (const char *msg, ACE_UINT32 sf) const { #ifndef ACE_NLOGGING @@ -68,3 +68,10 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, #endif /* ACE_NLOGGING */ } + +void +ACE_Basic_Stats::dump_results (const wchar_t *msg, + ACE_UINT32 sf) const +{ + // TODO +} diff --git a/ace/Basic_Stats.h b/ace/Basic_Stats.h index 7a6c7fd8ab6..ffbd7ce1df6 100644 --- a/ace/Basic_Stats.h +++ b/ace/Basic_Stats.h @@ -53,7 +53,10 @@ public: * high resolution timer samples are acquired in clock ticks, but often * presented in microseconds. */ - void dump_results (const ACE_TCHAR *msg, + void dump_results (const char *msg, + ACE_UINT32 scale_factor) const; + + void dump_results (const wchar_t *msg, ACE_UINT32 scale_factor) const; /// The number of samples diff --git a/ace/Functor.inl b/ace/Functor.inl index 29cd493c97d..99bc0af7216 100644 --- a/ace/Functor.inl +++ b/ace/Functor.inl @@ -53,7 +53,7 @@ ACE_Hash<char>::operator () (char t) const return t; } -#if defined (ACE_LACKS_BUILTIN_WCHAR_T) +#if !defined (ACE_LACKS_BUILTIN_WCHAR_T) ACE_INLINE unsigned long ACE_Hash<wchar_t>::operator () (wchar_t t) const { diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index 88c7bc28f70..e0f7813329a 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -512,12 +512,12 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str, #endif /* !ACE_HAS_WINCE */ int -ACE_High_Res_Timer::get_env_global_scale_factor (const ACE_TCHAR *env) +ACE_High_Res_Timer::get_env_global_scale_factor (const char *env) { #if !defined (ACE_HAS_WINCE) if (env != 0) { - const ACE_TCHAR *env_value = ACE_OS::getenv (env); + const char *env_value = ACE_OS::getenv (env); if (env_value != 0) { int value = ACE_OS::atoi (env_value); diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h index 194143b097b..705165547f7 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -136,8 +136,7 @@ public: * This is basically a no-op on CE because there is no concept of * environment variable on CE. */ - static int get_env_global_scale_factor (const ACE_TCHAR *env - = ACE_LIB_TEXT ("ACE_SCALE_FACTOR")); + static int get_env_global_scale_factor (const char *env = "ACE_SCALE_FACTOR"); /** * Set (and return, for info) the global scale factor by sleeping diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp index 0e82b87bb5d..9c6ae0faff6 100644 --- a/ace/Lib_Find.cpp +++ b/ace/Lib_Find.cpp @@ -318,8 +318,8 @@ ACE::ldfind (const ACE_TCHAR* filename, # else // Wide-char, non-Windows only offers char * getenv. So capture // it, translate to wide-char, and continue. - ACE::String_Conversion::Convert_In< wchar_t, char >( STRING ) wide_ldpath(ACE_OS::getenv (ACE_LD_SEARCH_PATH_A); - ld_path = wide_ldpath.c_str (); + ACE::String_Conversion::Convert_In< ACE_TCHAR, ACE_ANTI_TCHAR > wide_ldpath(ACE_OS::getenv (ACE_LD_SEARCH_PATH_A)); + ld_path = const_cast<ACE_TCHAR*>(wide_ldpath.c_str ()); # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ # endif /* ACE_DEFAULT_LD_SEARCH_PATH */ diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl index 694491e1098..110fada58f4 100644 --- a/ace/OS_NS_stdio.inl +++ b/ace/OS_NS_stdio.inl @@ -743,7 +743,7 @@ ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode) #else // Non-Windows doesn't use wchar_t file systems. ACE_OSCALL_RETURN - (::fopen (ACE_TEXT_TO_CHAR_IN (filename).c_str (), + (::fopen (ACE_TEXT_TO_CHAR_IN (filename), ACE_TEXT_TO_CHAR_IN (mode)), FILE*, 0); #endif /* ACE_HAS_WINCE */ } diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl index f8d27093c5b..dcc0efb8e81 100644 --- a/ace/OS_NS_stdlib.inl +++ b/ace/OS_NS_stdlib.inl @@ -189,7 +189,7 @@ ACE_INLINE ACE_HANDLE ACE_OS::mkstemp (wchar_t *s) { # if !defined (ACE_LACKS_MKSTEMP) - return ::mkstemp (ACE_TEXT_TO_CHAR_IN_INOUT (s)); + return ::mkstemp (ACE_TEXT_TO_CHAR_INOUT (s)); # else return ACE_OS::mkstemp_emulation (ACE_TEXT_TO_TCHAR_INOUT (s)); # endif /* !ACE_LACKS_MKSTEMP */ @@ -221,7 +221,7 @@ ACE_OS::mktemp (wchar_t *s) // For narrow-char filesystems, we must convert the wide-char input to // a narrow-char string for mktemp(), then convert the name back to // wide-char for the caller. - if (::mktemp (ACE_TEXT_TO_CHAR_IN_INOUT (s)) == 0) + if (::mktemp (ACE_TEXT_TO_CHAR_INOUT (s)) == 0) return 0; return s; #endif @@ -357,7 +357,7 @@ ACE_OS::realpath (const wchar_t *file_name, return ::_wfullpath (resolved_name, file_name, PATH_MAX); # else /* ACE_WIN32 */ char n_resolved[PATH_MAX]; - if (0 != ACE_OS::realpath ( ACE_TEXT_TO_CHAR_IN (file_name), n_resolved) + if (0 != ACE_OS::realpath ( ACE_TEXT_TO_CHAR_IN (file_name), n_resolved)) { ACE_OS::string_copy (resolved_name, n_resolved, PATH_MAX); return resolved_name; @@ -407,7 +407,7 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) # else // Use char * for environment on non-Windows. char *temp = 0; - if ((temp = ACE_OS::getenv (&str[1])) != 0) + if ((temp = ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN(&str[1])) != 0) return ACE_OS::strdup (ACE_TEXT_TO_TCHAR_IN (temp)); # endif /* ACE_WIN32 */ return ACE_OS::strdup (str); diff --git a/ace/OS_NS_stdlib_base.inl b/ace/OS_NS_stdlib_base.inl index a1f49197afe..8a8b025f7cc 100644 --- a/ace/OS_NS_stdlib_base.inl +++ b/ace/OS_NS_stdlib_base.inl @@ -6,6 +6,8 @@ #ifndef OS_NS_STDLIB_BASE_INL #define OS_NS_STDLIB_BASE_INL +#include "OS_NS_string_base.h" + namespace ACE_OS { diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl index d1f747e20f7..d24afc0abc6 100644 --- a/ace/OS_NS_time.inl +++ b/ace/OS_NS_time.inl @@ -124,8 +124,7 @@ ACE_OS::ctime (const time_t *t) static wchar_t *wide_time = 0; if (wide_time != 0) delete [] wide_time; - wide_time = ACE_TEXT_TO_WCHAR_IN::convert (narrow_time); -// WHAT! + wide_time = ACE_TEXT_TO_WCHAR_OUT(narrow_time); return wide_time; # else ACE_OSCALL_RETURN (::ctime (t), char *, 0); @@ -176,7 +175,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; # if defined (ACE_USES_WCHAR) - ACE_OS::string_copy (buf, wide_buf, buflen); + ACE_OS::string_copy (buf, bufp, buflen); return buf; # else return bufp; diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp index 068e35dabe2..c81f5384580 100644 --- a/ace/OS_NS_unistd.cpp +++ b/ace/OS_NS_unistd.cpp @@ -269,9 +269,8 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) ACE_OS::exit (errno); --arg_count; // Back to 0-indexed cargv[arg_count] = 0; -// WHAT! while (--arg_count >= 0) - cargv[arg_count] = ACE_TEXT_TO_CHAR_IN::convert (argv[arg_count]); + cargv[arg_count] = ACE_TEXT_TO_CHAR_OUT::convert (argv[arg_count]); // Don't worry about freeing the cargv or the strings it points to. // Either the process will be replaced, or we'll exit. if (ACE_OS::execv (cargv[0], cargv) == -1) diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index a2d2ad35d4f..7a0f31201cd 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -518,9 +518,9 @@ ACE_OS::getcwd (wchar_t *buf, size_t size) # elif defined (ACE_WIN32) return ::_wgetcwd (buf, static_cast<int> (size)); # else - ACE::String_Conversion::Convert_InOut< char, wchar_t > convert (buf, size); - result = ACE_OS::getcwd (convert.c_str(), convert.size()); - return result == 0 ? 0 : buf; + ACE::String_Conversion::Convert_InOut< char, wchar_t > convert( buf, size ); + char* result = ACE_OS::getcwd( convert.c_str(), convert.size() ); + return ( result ? buf : 0 ); # endif /* ACE_WIN32 */ } @@ -684,10 +684,7 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen) #else /* ACE_WIN32 && !ACE_HAS_WINCE */ // Emulate using the char version ACE::String_Conversion::Convert_InOut< char, wchar_t > convert (name, maxnamelen); - result = ACE_OS::hostname (convert.c_str(), convert.size()); - - delete [] char_name; - return result; + return ACE_OS::hostname (convert.c_str(), convert.size()); #endif /* ACE_WIN32 && !ACE_HAS_WINCE */ } diff --git a/ace/Process.cpp b/ace/Process.cpp index e94397a89c8..c505feaa874 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -360,7 +360,7 @@ ACE_Process::spawn (ACE_Process_Options &options) procargv[vcount] = 0; for (i = 0; i < vcount; ++i) - procargv[i] = ACE_TEXT_TO_CHAR_IN_OUT (wargv[i]); // memory allocated! + procargv[i] = ACE_TEXT_TO_CHAR_OUT (wargv[i]); // memory allocated! wargv = options.env_argv (); for (vcount = 0; wargv[vcount] != 0; ++vcount) @@ -368,7 +368,7 @@ ACE_Process::spawn (ACE_Process_Options &options) char **procenv = new char *[vcount + 1]; // Need 0 at the end procenv[vcount] = 0; for (i = 0; i < vcount; ++i) - procenv[i] = ACE_TEXT_TO_CHAR_IN_OUT (wargv[i]); // memory allocated! + procenv[i] = ACE_TEXT_TO_CHAR_OUT (wargv[i]); // memory allocated! # else const char *procname = options.process_name (); char *const *procargv = options.command_line_argv (); diff --git a/ace/Stats.cpp b/ace/Stats.cpp index 47c4da1dae4..486eae5c360 100644 --- a/ace/Stats.cpp +++ b/ace/Stats.cpp @@ -519,7 +519,7 @@ ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs) } void -ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, +ACE_Throughput_Stats::dump_results (const char* msg, ACE_UINT32 sf) { if (this->samples_count () == 0u) @@ -582,7 +582,14 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, } void -ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg, +ACE_Throughput_Stats::dump_results (const wchar_t* msg, + ACE_UINT32 sf) +{ + // TODO +} + +void +ACE_Throughput_Stats::dump_throughput (const char *msg, ACE_UINT32 sf, ACE_UINT64 elapsed_time, ACE_UINT32 samples_count) @@ -612,6 +619,15 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg, #endif /* ACE_NLOGGING */ } +void +ACE_Throughput_Stats::dump_throughput (const wchar_t *msg, + ACE_UINT32 sf, + ACE_UINT64 elapsed_time, + ACE_UINT32 samples_count) +{ + // TODO +} + // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/ace/Stats.h b/ace/Stats.h index 3d043cecb82..ab11b399303 100644 --- a/ace/Stats.h +++ b/ace/Stats.h @@ -238,10 +238,19 @@ public: void accumulate (const ACE_Throughput_Stats &throughput); /// Print down the stats - void dump_results (const ACE_TCHAR* msg, ACE_UINT32 scale_factor); + void dump_results (const char* msg, ACE_UINT32 scale_factor); + + /// Print down the stats + void dump_results (const wchar_t* msg, ACE_UINT32 scale_factor); + + /// Dump the average throughput stats. + static void dump_throughput (const char *msg, + ACE_UINT32 scale_factor, + ACE_UINT64 elapsed_time, + ACE_UINT32 samples_count); /// Dump the average throughput stats. - static void dump_throughput (const ACE_TCHAR *msg, + static void dump_throughput (const wchar_t *msg, ACE_UINT32 scale_factor, ACE_UINT64 elapsed_time, ACE_UINT32 samples_count); diff --git a/ace/String_Conversion_T.h b/ace/String_Conversion_T.h index 604ded41e7a..343a136abbc 100644 --- a/ace/String_Conversion_T.h +++ b/ace/String_Conversion_T.h @@ -1,8 +1,8 @@ /* -*- C++ -*- */ // $Id$ -#ifndef ACE_CHAR_CONVERT_T_H -#define ACE_CHAR_CONVERT_T_H +#ifndef STRING_CONVERTER_T_H +#define STRING_CONVERTER_T_H #include /**/ "ace/pre.h" #include /**/ "ace/ace_wchar.h" @@ -85,7 +85,7 @@ public: } // Make certain we provide a counter to the allocation - static free( DestT* ptr ) + static void free( DestT* ptr ) { Allocator().free( ptr ); } @@ -180,16 +180,33 @@ private: * The if a temp string is created, it is copied * back to the src on destruction. * + * NOTE: Make certain src points to a NULL teminated string. + * * NOTE: The size passed in at construction is buffer size, * including space for the NULL char. + * + * NOTE: encode_factor is used when we believe that the number + * of characters required differs between the two representations. + * To avoid data loss, we default to an oversized buffer of size*3. */ template < typename DestT, typename SrcT > class Convert_InOut { public: //template < typename SrcT > - explicit Convert_InOut( SrcT* src, size_t size = calc_len ) - : len_(size==calc_len ? calc_len : size-1) + explicit Convert_InOut( SrcT* src, size_t size, size_t encode_factor = 3 ) + : len_((size-1)*encode_factor) + , encode_factor_(encode_factor) + , str_(0) + , orig_(src) + , ownstr_( duplicate<DestT, SrcT, Allocator_cpp<DestT> >(src, &len_)) + { + } + + //template < typename SrcT > + explicit Convert_InOut( SrcT* src ) + : len_(calc_len) + , encode_factor_(1) , str_(0) , orig_(src) , ownstr_( duplicate<DestT, SrcT, Allocator_cpp<DestT> >(src, &len_)) @@ -226,6 +243,7 @@ public: private: /// Internal pointer to the converted string. size_t len_; + size_t encode_factor_; DestT* str_; SrcT* orig_; DestT* ownstr_; @@ -321,4 +339,4 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString; #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" -#endif /* ACE_CHAR_CONVERT_T_H */ +#endif /* STRING_CONVERTER_T_H */ diff --git a/ace/String_Conversion_T.inl b/ace/String_Conversion_T.inl index 9e3944393e9..6523ea03653 100644 --- a/ace/String_Conversion_T.inl +++ b/ace/String_Conversion_T.inl @@ -33,9 +33,8 @@ Allocator_cpp< T >::free( T* str ) const template < typename T > ACE_INLINE T* Allocator_malloc< T >::alloc( size_t len ) const -: str_( 0 ) { - T* result = static_cast<T*>::malloc((len+1)*sizeof(T)); + T* result = static_cast<T*>(::malloc((len+1)*sizeof(T))); result[ 0 ] = 0; return result; } @@ -44,7 +43,7 @@ template < typename T > ACE_INLINE void Allocator_malloc< T >::free( T* str ) const { - ::free (str_); + ::free (str); } template < typename DestT, typename SrcT, typename Allocator > ACE_INLINE @@ -58,19 +57,28 @@ duplicate( const SrcT* src, size_t* dest_len ) return dest; } - size_t len = ACE_OS::string_copy( static_cast<DestT*>(0), src, 0 ); + size_t required_len = ACE_OS::string_copy( static_cast<DestT*>(0), src, 0 ); + size_t alloc_len = required_len; + size_t copy_len = required_len; if ( dest_len != 0 ) { - if ( *dest_len < len && *dest_len != calc_len ) - len = *dest_len; - else - *dest_len = len; + // If we are calculating len + if ( *dest_len == calc_len ) + *dest_len = required_len; + + // alloc_len is the greater + else if ( *dest_len > required_len ) + alloc_len = *dest_len; + + // copy_len is the lesser + else if ( *dest_len < required_len ) + copy_len = *dest_len; } - dest = Allocator().alloc( len ); + dest = Allocator().alloc( alloc_len ); - copy( dest, src, len ); + copy( dest, src, copy_len ); return dest; } @@ -132,7 +140,7 @@ Convert_InOut< DestT, SrcT >::~Convert_InOut( void ) { if (ownstr_ != 0) { - copy(orig_, ownstr_, len_); + copy(orig_, ownstr_, (len_/encode_factor_)); Allocator_cpp<DestT>().free( ownstr_ ); } } diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index c17204b01ec..b73ed06f010 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -18,8 +18,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined(ACE_SIZEOF_WCHAR) || !defined (ACE_WCHAR_MAX) - #error Must (Un)define ACE_SIZEOF_WCHAR, ACE_WCHAR_MAX, \ - and ACE_LACKS_BUILTIN_WCHAR_T in the config-<platform>.h +#error Must define ACE_SIZEOF_WCHAR, ACE_WCHAR_MAX, \ +and (maybe undefine) ACE_LACKS_BUILTIN_WCHAR_T in the config-<platform>.h. \ +Typedef wchar_t, wint_t, and/or wctype_t in the config-<platform>.h \ +or within the conditional #includes below if the platform does \ +not supply them. #endif // Add includes and/or typedefs to get wchar_t, wint_t, and wctype_t. @@ -123,7 +126,7 @@ using std::size_t; #define ACE_WCHAR_T_TYPE wchar_t #define ACE_LACKS_NATIVR_WCHAR_T ACE_LACKS_BUILTIN_WCHAR_T namespace ACE_OS { typedef wchar_t WChar; } -#endif +#endif /* ACE_LACKS_DEPRECATED_MACROS */ // This package should only be included in the implementation files // that use it. diff --git a/tests/WChar_Conversion.cpp b/tests/WChar_Conversion.cpp index 7ccc63d5329..962dc63db86 100644 --- a/tests/WChar_Conversion.cpp +++ b/tests/WChar_Conversion.cpp @@ -9,6 +9,31 @@ ACE_RCSID(tests, WChar_Conversion, "$Id$") +// Typical pattern for C-style system call +template < typename CHAR_TYPE > +CHAR_TYPE* system_call( CHAR_TYPE* bucket, size_t bucket_size ) +{ + size_t i = 0; + for( ; i < bucket_size/2; ++i ) + { + bucket[ i ] = 'a' + (i % 6); + } + bucket[ i ] = 0; + return ( bucket[ 0 ] == 0 ? 0 : bucket ); +} + +// The following would be a typical emulation pattern where the system +// call takes an out param. Dta may be lost if the two representations +// require a different number of characters +template < typename ANTI_TYPE, typename CHAR_TYPE > +CHAR_TYPE* system_call_emulation( CHAR_TYPE* bucket, size_t bucket_size ) +{ + bucket[ 0 ] = 0; + ACE::String_Conversion::Convert_InOut< ANTI_TYPE, CHAR_TYPE > convert( bucket, bucket_size ); + const ANTI_TYPE* result = system_call( convert.c_str(), convert.size() ); + return ( result ? bucket : 0 ); +} + int run_main (int, ACE_TCHAR *[]) { @@ -254,6 +279,13 @@ run_main (int, ACE_TCHAR *[]) ACE_ASSERT( ACE_OS::strcmp( L"Tource", source ) == 0 ); } +// Emulation pattern + { + wchar_t source[ 16 ] = { 6, 3, 7, 3, 2 }; // garbage + wchar_t* result = system_call_emulation< char >( source, 16 ); + ACE_ASSERT( result == source && source[ 0 ] != 6 && source[ 15 ] == 0 ); + } + ACE_END_TEST; return 0; } |