diff options
Diffstat (limited to 'examples')
134 files changed, 225 insertions, 214 deletions
diff --git a/examples/APG/Config/ARGV_Example.cpp b/examples/APG/Config/ARGV_Example.cpp index 92fb25cd30d..2e87b3caeba 100644 --- a/examples/APG/Config/ARGV_Example.cpp +++ b/examples/APG/Config/ARGV_Example.cpp @@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) static const ACE_TCHAR cmdline[] = ACE_TEXT ("-f /home/managed.cfg -h $HOSTNAME"); ACE_ARGV cmdline_args (cmdline); - ACE_Get_Opt cmd_opts (cmdline_args.argc (), + ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (cmdline_args.argc (), cmdline_args.argv (), options, 0); // Don't skip any args diff --git a/examples/APG/Config/Get_Opt.cpp b/examples/APG/Config/Get_Opt.cpp index 604dc38326e..aff6ad035ee 100644 --- a/examples/APG/Config/Get_Opt.cpp +++ b/examples/APG/Config/Get_Opt.cpp @@ -1,7 +1,7 @@ /** * $Id$ * - * ACE_Get_Opt examples not in a larger program. Sample code from The ACE + * ACE_Get_Arg_Opt examples not in a larger program. Sample code from The ACE * Programmer's Guide, Copyright 2003 Addison-Wesley. All Rights Reserved. */ @@ -16,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Example for a long option without a corresponding short option. // Just put some context here so the following compiles and runs. static const ACE_TCHAR options[] = ACE_TEXT (":f:"); - ACE_Get_Opt cmd_opts (argc, argv, options); + ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options); // Listing 1 code/ch04 cmd_opts.long_option (ACE_TEXT ("cool_option")); diff --git a/examples/APG/Config/Get_Opt_Long.cpp b/examples/APG/Config/Get_Opt_Long.cpp index 66baed05cdb..8b212b7a32a 100644 --- a/examples/APG/Config/Get_Opt_Long.cpp +++ b/examples/APG/Config/Get_Opt_Long.cpp @@ -1,7 +1,7 @@ /** * $Id$ * - * ACE_Get_Opt long_only examples. Sample code from The ACE + * ACE_Get_Arg_Opt long_only examples. Sample code from The ACE * Programmer's Guide, Copyright 2003 Addison-Wesley. All Rights Reserved. */ @@ -14,10 +14,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { static const ACE_TCHAR options[] = ACE_TEXT (":f:"); - ACE_Get_Opt cmd_opts - (argc, argv, options, 1, 0, ACE_Get_Opt::PERMUTE_ARGS, 1); + ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts + (argc, argv, options, 1, 0, ACE_Get_Arg_Opt<ACE_TCHAR>::PERMUTE_ARGS, 1); if (cmd_opts.long_option - (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1) + (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1) return -1; int option; diff --git a/examples/APG/Config/HA_Status.cpp b/examples/APG/Config/HA_Status.cpp index 1bad687be80..6fac607d8e6 100644 --- a/examples/APG/Config/HA_Status.cpp +++ b/examples/APG/Config/HA_Status.cpp @@ -27,14 +27,14 @@ int HA_Status::init (int argc, ACE_TCHAR *argv[]) { - // Do ACE_Get_Opt and get conf file name, read out the sections + // Do ACE_Get_Arg_Opt and get conf file name, read out the sections // and print the names. // Listing 1 code/ch04 static const ACE_TCHAR options[] = ACE_TEXT (":f:"); - ACE_Get_Opt cmd_opts (argc, argv, options); + ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options); if (cmd_opts.long_option - (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1) + (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1) return -1; int option; ACE_TCHAR config_file[MAXPATHLEN]; diff --git a/examples/APG/Logging/Callback-2.h b/examples/APG/Logging/Callback-2.h index 906b2e43286..27cbdcd0ab7 100644 --- a/examples/APG/Logging/Callback-2.h +++ b/examples/APG/Logging/Callback-2.h @@ -22,20 +22,20 @@ public: const ACE_TCHAR *prio_name = ACE_Log_Record::priority_name (prio); cerr << "\tType: " - << ACE_TEXT_ALWAYS_CHAR (prio_name) + << ACE_TEXT_TO_CHAR_IN (prio_name) << endl; cerr << "\tLength: " << log_record.length () << endl; const time_t epoch = log_record.time_stamp ().sec (); cerr << "\tTime_Stamp: " - << ACE_TEXT_ALWAYS_CHAR (ACE_OS::ctime (&epoch)) + << ACE_TEXT_TO_CHAR_IN (ACE_OS::ctime (&epoch)) << flush; cerr << "\tPid: " << log_record.pid () << endl; ACE_CString data (">> "); - data += ACE_TEXT_ALWAYS_CHAR (log_record.msg_data ()); + data += ACE_TEXT_TO_CHAR_IN (log_record.msg_data ()); cerr << "\tMsgData: " << data.c_str () << endl; } diff --git a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp index 39f871a8bb3..990ab0906b4 100644 --- a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp +++ b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp @@ -17,9 +17,9 @@ int HA_Status::init (int argc, ACE_TCHAR *argv[]) { static const ACE_TCHAR options[] = ACE_TEXT (":f:"); - ACE_Get_Opt cmd_opts (argc, argv, options, 0); + ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options, 0); if (cmd_opts.long_option - (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1) + (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1) return -1; int option; ACE_TCHAR config_file[MAXPATHLEN]; diff --git a/examples/APG/Svc_Config/HA_Status_Static.cpp b/examples/APG/Svc_Config/HA_Status_Static.cpp index ef09bcaa5cd..09f2d75fd59 100644 --- a/examples/APG/Svc_Config/HA_Status_Static.cpp +++ b/examples/APG/Svc_Config/HA_Status_Static.cpp @@ -17,9 +17,9 @@ int HA_Status::init (int argc, ACE_TCHAR *argv[]) { static const ACE_TCHAR options[] = ACE_TEXT (":f:"); - ACE_Get_Opt cmd_opts (argc, argv, options, 0); + ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options, 0); if (cmd_opts.long_option - (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1) + (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1) return -1; int option; ACE_TCHAR config_file[MAXPATHLEN]; diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp index 6ef846f2f31..ac98f1f45db 100644 --- a/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -108,7 +108,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_LOG_MSG->open (argv[0]); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:bdH:i:L:l:M:ns:t:T:v")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:bdH:i:L:l:M:ns:t:T:v")); int c; while ((c = get_opt ()) != EOF) @@ -172,7 +172,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-s supplier port]\n" "\t[-t number of threads]\n" "\t[-v] (verbose) \n", - ACE_TEXT_ALWAYS_CHAR (argv[0])); + ACE_TEXT_TO_CHAR_IN (argv[0])); ::exit (1); /* NOTREACHED */ break; @@ -181,17 +181,17 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // This is a major hack to get the size_t format spec to be a narrow // char, same as the other strings for printf() here. It only works // because this is the end of the source file. It makes the - // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_LIB_TEXT, effectively. -#undef ACE_LIB_TEXT -#define ACE_LIB_TEXT(A) A + // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_TEXT, effectively. +#undef ACE_TEXT +#define ACE_TEXT(A) A if (this->verbose ()) ACE_OS::printf ("%8d = initial concurrency hint\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = thread count\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = low water mark\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = high water mark\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = message_size\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = initial queue length\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = total iterations\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = thread count\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = low water mark\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = high water mark\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = message_size\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = initial queue length\n" "%8d = THR_BOUND\n" "%8d = THR_NEW_LWP\n", ACE_Thread::getconcurrency (), diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp index 37bbaad7d3d..c1da28ddb74 100644 --- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp +++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp @@ -24,7 +24,7 @@ ACE_RCSID (Transceiver, int Event_Transceiver::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("Ch:p:S")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("Ch:p:S")); this->port_number_ = ACE_DEFAULT_SERVER_PORT; this->host_name_ = ACE_DEFAULT_SERVER_HOST; diff --git a/examples/ASX/Message_Queue/buffer_stream.cpp b/examples/ASX/Message_Queue/buffer_stream.cpp index b1f918cfef5..cef4a62ae51 100644 --- a/examples/ASX/Message_Queue/buffer_stream.cpp +++ b/examples/ASX/Message_Queue/buffer_stream.cpp @@ -242,7 +242,7 @@ Filter::put (ACE_Message_Block *mb, // Prepend the line count in front of the buffer. ACE_OS::sprintf (mb->rd_ptr (), - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A ": %s", this->count_++, buf); @@ -302,7 +302,7 @@ ACE_TMAIN (int, ACE_TCHAR *argv[]) } #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("threads not supported on this platform\n"))); diff --git a/examples/ASX/UPIPE_Event_Server/Options.cpp b/examples/ASX/UPIPE_Event_Server/Options.cpp index ca2cbbca887..2cec2691abd 100644 --- a/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -98,7 +98,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_LOG_MSG->open (argv[0]); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("C:c:bdH:i:L:l:M:nS:s:t:T:v")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("C:c:bdH:i:L:l:M:nS:s:t:T:v")); int c; while ((c = getopt ()) != -1) @@ -170,27 +170,20 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-s supplier port]\n" "\t[-t number of threads]\n" "\t[-v] (verbose) \n", - ACE_TEXT_ALWAYS_CHAR (argv[0])); + ACE_TEXT_TO_CHAR_IN (argv[0])); ::exit (1); /* NOTREACHED */ break; } - // HACK! This needs to be done to avoid the mismatch from ACE_LIB_TEXT - // in ACE_SIZE_T_FORMAT_SPECIFIER to narrow-char on wide-char builds. - // It only works because it's at the end of the file. -# if defined (ACE_LIB_TEXT) -# undef ACE_LIB_TEXT -# endif -# define ACE_LIB_TEXT(X) X if (this->verbose ()) ACE_OS::printf ("%8d = initial concurrency hint\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = thread count\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = low water mark\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = high water mark\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = message_size\n" - ACE_SIZE_T_FORMAT_SPECIFIER " = initial queue length\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = total iterations\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = thread count\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = low water mark\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = high water mark\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = message_size\n" + ACE_SIZE_T_FORMAT_SPECIFIER_A " = initial queue length\n" "%8d = THR_BOUND\n" "%8d = THR_NEW_LWP\n", ACE_OS::thr_getconcurrency (), diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index 757eecedc33..19cfc8a8a57 100644 --- a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -26,7 +26,7 @@ ACE_RCSID(UPIPE_Event_Server, Peer_Router, "$Id$") template <class PH, class PK> int Acceptor_Factory<PH, PK>::init (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("df:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("df:"), 0); ACE_UPIPE_Addr addr; for (int c; (c = get_opt ()) != -1; ) diff --git a/examples/C++NPv1/Iterative_Logging_Server.cpp b/examples/C++NPv1/Iterative_Logging_Server.cpp index f4c28f08da7..ca8a7478064 100644 --- a/examples/C++NPv1/Iterative_Logging_Server.cpp +++ b/examples/C++NPv1/Iterative_Logging_Server.cpp @@ -5,13 +5,15 @@ */ #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" #include "Iterative_Logging_Server.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Iterative_Logging_Server server; - if (server.run (argc, argv) == -1) + if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1); return 0; } diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp index 56434d35699..764b0682f5b 100644 --- a/examples/C++NPv1/Logging_Client.cpp +++ b/examples/C++NPv1/Logging_Client.cpp @@ -12,6 +12,7 @@ #include "ace/Log_Msg.h" #include "ace/Log_Record.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -39,7 +40,7 @@ int operator<< (ACE_OutputCDR &cdr, const ACE_Log_Record &log_record) cdr << ACE_CDR::Long (log_record.time_stamp ().sec ()); cdr << ACE_CDR::Long (log_record.time_stamp ().usec ()); cdr << ACE_CDR::ULong (msglen); - cdr.write_char_array (nonconst_record.msg_data (), msglen); + cdr.write_char_array (ACE_TEXT_TO_CHAR_IN(nonconst_record.msg_data ()), msglen); return cdr.good_bit (); } @@ -91,11 +92,15 @@ public: }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *targv[]) { + ACE_Argv_Type_Converter convert (argc, targv); + argc = convert.get_argc(); + char** argv = convert.get_ASCII_argv(); + u_short logger_port = argc > 1 ? atoi (argv[1]) : 0; const char *logger_host = - argc > 2 ? argv[2] : ACE_DEFAULT_SERVER_HOST; + argc > 2 ? argv[2] : ACE_DEFAULT_SERVER_HOST_A; int result; ACE_INET_Addr server_addr; @@ -150,7 +155,7 @@ int main (int argc, char *argv[]) ACE_Time_Value now (ACE_OS::gettimeofday ()); ACE_Log_Record log_record (LM_INFO, now, ACE_OS::getpid ()); - log_record.msg_data (user_input.c_str ()); + log_record.msg_data (ACE_TEXT_TO_TCHAR_IN(user_input.c_str ())); if (logging_client.send (log_record) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "logging_client.send()"), 1); diff --git a/examples/C++NPv1/Logging_Handler.cpp b/examples/C++NPv1/Logging_Handler.cpp index dc1d56b3190..e29faf77812 100644 --- a/examples/C++NPv1/Logging_Handler.cpp +++ b/examples/C++NPv1/Logging_Handler.cpp @@ -27,13 +27,13 @@ int operator>> (ACE_InputCDR &cdr, ACE_Log_Record &log_record) // Extract each field from input CDR stream into <log_record>. if ((cdr >> type) && (cdr >> pid) && (cdr >> sec) && (cdr >> usec) && (cdr >> buffer_len)) { - ACE_TCHAR log_msg[ACE_Log_Record::MAXLOGMSGLEN+1]; + char log_msg[ACE_Log_Record::MAXLOGMSGLEN+1]; log_record.type (type); log_record.pid (pid); log_record.time_stamp (ACE_Time_Value (sec, usec)); cdr.read_char_array (log_msg, buffer_len); log_msg[buffer_len] = '\0'; - log_record.msg_data (log_msg); + log_record.msg_data (ACE_TEXT_TO_TCHAR_IN(log_msg)); } return cdr.good_bit (); } @@ -113,7 +113,7 @@ int Logging_Handler::write_log_record (ACE_Message_Block *mblk) cdr >> length; ACE_Log_Record log_record; cdr >> log_record; // Finally extract the <ACE_log_record>. - log_record.print (mblk->rd_ptr (), 1, cerr); + log_record.print (ACE_TEXT_TO_TCHAR_IN(mblk->rd_ptr ()), 1, cerr); } return mblk->total_length (); } diff --git a/examples/C++NPv1/Logging_Server.cpp b/examples/C++NPv1/Logging_Server.cpp index c685412c769..161adfa3ecc 100644 --- a/examples/C++NPv1/Logging_Server.cpp +++ b/examples/C++NPv1/Logging_Server.cpp @@ -52,16 +52,16 @@ int Logging_Server::open (u_short logger_port) int Logging_Server::make_log_file (ACE_FILE_IO &logging_file, ACE_SOCK_Stream *logging_peer) { - char filename[MAXHOSTNAMELEN + sizeof (".log")]; + ACE_TCHAR filename[MAXHOSTNAMELEN + sizeof (ACE_TEXT(".log"))]; if (logging_peer != 0) { // Use client's hostname as log file name. ACE_INET_Addr logging_peer_addr; logging_peer->get_remote_addr (logging_peer_addr); logging_peer_addr.get_host_name (filename, MAXHOSTNAMELEN); - ACE_OS::strcat (filename, ".log"); + ACE_OS::strcat (filename, ACE_TEXT(".log")); } else - ACE_OS::strcpy (filename, "logging_server.log"); + ACE_OS::strcpy (filename, ACE_TEXT("logging_server.log")); ACE_FILE_Connector connector; return connector.connect (logging_file, diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp index 54d936962aa..f992ea824bc 100644 --- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp +++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp @@ -9,6 +9,7 @@ #include "ace/Signal.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_fcntl.h" +#include "ace/Argv_Type_Converter.h" #include "Process_Per_Connection_Logging_Server.h" #include "Logging_Handler.h" @@ -164,15 +165,17 @@ Process_Per_Connection_Logging_Server::run_worker (int, char *argv[]) } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Register to receive the <SIGTERM> signal. ACE_Sig_Action sa ((ACE_SignalHandler)sigterm_handler, SIGTERM); Process_Per_Connection_Logging_Server server; - if (server.run (argc, argv) == -1 && errno != EINTR) + if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1 && errno != EINTR) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1); // Barrier synchronization. diff --git a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp index febbf1964d5..577e606ed8f 100644 --- a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp +++ b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp @@ -10,6 +10,7 @@ #include "ace/Sched_Params.h" #include "ace/Signal.h" #include "ace/Thread_Manager.h" +#include "ace/Argv_Type_Converter.h" #include "RT_Thread_Per_Connection_Logging_Server.h" #include "Logging_Handler.h" @@ -114,15 +115,16 @@ Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client) } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Register to receive the <SIGTERM> signal. ACE_Sig_Action sa ((ACE_SignalHandler) sigterm_handler, SIGTERM); RT_Thread_Per_Connection_Logging_Server server; - if (server.run (argc, argv) == -1) + if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1); // Cooperative thread cancellation and barrier synchronization. diff --git a/examples/C++NPv1/Reactive_Logging_Server.cpp b/examples/C++NPv1/Reactive_Logging_Server.cpp index 39d2c6b51be..2c493aecf8b 100644 --- a/examples/C++NPv1/Reactive_Logging_Server.cpp +++ b/examples/C++NPv1/Reactive_Logging_Server.cpp @@ -5,13 +5,15 @@ */ #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" #include "Reactive_Logging_Server.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Reactive_Logging_Server server; - if (server.run (argc, argv) == -1) + if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1); return 0; } diff --git a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp index b8bc363180a..08f29422bed 100644 --- a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp +++ b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp @@ -6,14 +6,16 @@ #include "ace/Functor.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" #include "Reactive_Logging_Server_Ex.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Reactive_Logging_Server_Ex server; - if (server.run (argc, argv) == -1) + if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1); return 0; } diff --git a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp index 3737957ff70..493628ab436 100644 --- a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp +++ b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp @@ -9,6 +9,7 @@ #include "ace/Log_Msg.h" #include "ace/Signal.h" #include "ace/Thread_Manager.h" +#include "ace/Argv_Type_Converter.h" #include "Thread_Per_Connection_Logging_Server.h" #include "Logging_Handler.h" @@ -75,15 +76,16 @@ Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client) } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Register to receive the <SIGTERM> signal. ACE_Sig_Action sa ((ACE_SignalHandler) sigterm_handler, SIGTERM); Thread_Per_Connection_Logging_Server server; - if (server.run (argc, argv) == -1) + if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1); // Cooperative thread cancellation and barrier synchronization. diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp index 759dcb44861..dd70afabcf2 100644 --- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp @@ -388,13 +388,13 @@ int AC_Client_Logging_Daemon::init ACE_TCHAR sld_host[MAXHOSTNAMELEN]; ACE_OS::strcpy (sld_host, ACE_LOCALHOST); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); get_opt.long_option (ACE_TEXT ("client_port"), 'p', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt.long_option (ACE_TEXT ("server_port"), 'r', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt.long_option (ACE_TEXT ("server_name"), 's', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); for (int c; (c = get_opt ()) != -1;) switch (c) { diff --git a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 56983e8f89a..841feaaa54f 100644 --- a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -287,13 +287,13 @@ int AIO_Client_Logging_Daemon::init ACE_TCHAR sld_host[MAXHOSTNAMELEN]; ACE_OS::strcpy (sld_host, ACE_LOCALHOST); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); get_opt.long_option (ACE_TEXT ("client_port"), 'p', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt.long_option (ACE_TEXT ("server_port"), 'r', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt.long_option (ACE_TEXT ("server_name"), 's', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); for (int c; (c = get_opt ()) != -1;) switch (c) { diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp index 5fc0d554cbd..1bc2b5ea1d8 100644 --- a/examples/C++NPv2/Client_Logging_Daemon.cpp +++ b/examples/C++NPv2/Client_Logging_Daemon.cpp @@ -336,13 +336,13 @@ int Client_Logging_Daemon::init (int argc, ACE_TCHAR *argv[]) { ACE_TCHAR sld_host[MAXHOSTNAMELEN]; ACE_OS::strcpy (sld_host, ACE_LOCALHOST); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0); get_opt.long_option (ACE_TEXT ("client_port"), 'p', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt.long_option (ACE_TEXT ("server_port"), 'r', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt.long_option (ACE_TEXT ("server_name"), 's', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); for (int c; (c = get_opt ()) != -1;) switch (c) { diff --git a/examples/C++NPv2/Logging_Event_Handler.cpp b/examples/C++NPv2/Logging_Event_Handler.cpp index d805e776390..3bac6208b27 100644 --- a/examples/C++NPv2/Logging_Event_Handler.cpp +++ b/examples/C++NPv2/Logging_Event_Handler.cpp @@ -12,8 +12,8 @@ int Logging_Event_Handler::open () { - static const char LOGFILE_SUFFIX[] = ".log"; - char filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)]; + static const ACE_TCHAR LOGFILE_SUFFIX[] = ACE_TEXT(".log"); + ACE_TCHAR filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)]; ACE_INET_Addr logging_peer_addr; logging_handler_.peer ().get_remote_addr (logging_peer_addr); diff --git a/examples/C++NPv2/Reactor_Logging_Server.cpp b/examples/C++NPv2/Reactor_Logging_Server.cpp index b36539c2a6d..269e158d243 100644 --- a/examples/C++NPv2/Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/Reactor_Logging_Server.cpp @@ -11,7 +11,7 @@ typedef Reactor_Logging_Server<Logging_Acceptor_Ex> Server_Logging_Daemon; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Reactor reactor; Server_Logging_Daemon *server; diff --git a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp index 128ad5cabd3..9c6f89db458 100644 --- a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp +++ b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp @@ -23,7 +23,7 @@ Reactor_Logging_Server_Adapter<ACCEPTOR>::init (int argc, ACE_Auto_Array_Ptr<char *> char_argv (array); for (i = 0; i < argc; ++i) - char_argv[i] = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (argv[i])); + char_argv[i] = ACE::strnew (ACE_TEXT_TO_CHAR_IN (argv[i])); ACE_NEW_NORETURN (server_, Reactor_Logging_Server<ACCEPTOR> (i, char_argv.get (), ACE_Reactor::instance ())); diff --git a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp index 24123c3b3c6..2361ad8d871 100644 --- a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp @@ -87,7 +87,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Select_Reactor select_reactor; ACE_Reactor reactor (&select_reactor); diff --git a/examples/C++NPv2/Service_Reporter.cpp b/examples/C++NPv2/Service_Reporter.cpp index ad9cd05d26c..022ae96944f 100644 --- a/examples/C++NPv2/Service_Reporter.cpp +++ b/examples/C++NPv2/Service_Reporter.cpp @@ -20,10 +20,10 @@ int Service_Reporter::init (int argc, ACE_TCHAR *argv[]) { ACE_INET_Addr local_addr (Service_Reporter::DEFAULT_PORT); // Start at argv[0]. - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0); get_opt.long_option (ACE_TEXT ("port"), 'p', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); for (int c; (c = get_opt ()) != -1; ) switch (c) { diff --git a/examples/C++NPv2/TP_Logging_Server.h b/examples/C++NPv2/TP_Logging_Server.h index 9c4869cdcee..cb98be5e353 100644 --- a/examples/C++NPv2/TP_Logging_Server.h +++ b/examples/C++NPv2/TP_Logging_Server.h @@ -107,7 +107,7 @@ public: ACE_Auto_Array_Ptr<char *> char_argv (array); for (i = 0; i < argc; ++i) - char_argv[i] = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (argv[i])); + char_argv[i] = ACE::strnew (ACE_TEXT_TO_CHAR_IN (argv[i])); ACE_NEW_NORETURN (logging_dispatcher_, TP_Logging_Server::LOGGING_DISPATCHER diff --git a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp index 0d3216fe4e5..41d363af060 100644 --- a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp @@ -93,7 +93,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) { } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const size_t N_THREADS = 4; ACE_TP_Reactor tp_reactor; diff --git a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp index 2174cd20412..46fff8bf083 100644 --- a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp +++ b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp @@ -119,7 +119,7 @@ typedef Reactor_Logging_Server<Logging_Acceptor_WFMO> Server_Logging_Daemon; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const size_t N_THREADS = 4; ACE_WFMO_Reactor wfmo_reactor; @@ -138,7 +138,7 @@ int main (int argc, char *argv[]) } #else /* !ACE_WIN32 */ -int main (int, char *[]) +int ACE_TMAIN (int, ACE_TCHAR *[]) { return 0; } diff --git a/examples/C++NPv2/display_logfile.cpp b/examples/C++NPv2/display_logfile.cpp index 19f251e9463..d884662090d 100644 --- a/examples/C++NPv2/display_logfile.cpp +++ b/examples/C++NPv2/display_logfile.cpp @@ -277,7 +277,7 @@ public: char timestamp[26]; // Max size of ctime_r() string. time_t time_secs (secs); ACE_OS::ctime_r (&time_secs, timestamp_t, sizeof timestamp_t); - ACE_OS::strcpy (timestamp, ACE_TEXT_ALWAYS_CHAR (timestamp_t)); + ACE_OS::strcpy (timestamp, ACE_TEXT_TO_CHAR_IN (timestamp_t)); mblk->size (26); // Max size of ctime_r() string. mblk->reset (); timestamp[19] = '\0'; // NUL-terminate after the time. diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp index 8885b0353cd..85f8acc6156 100644 --- a/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -123,7 +123,7 @@ IPC_Server::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_LOG_MSG->open (argv[0]); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("ut:r:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("ut:r:")); for (int c; (c = get_opt ()) != -1; ) { diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp index 6618b64f0cb..9b2ea043c77 100644 --- a/examples/Connection/blocking/SPIPE-connector.cpp +++ b/examples/Connection/blocking/SPIPE-connector.cpp @@ -187,7 +187,7 @@ IPC_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_LOG_MSG->open (argv[0]); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("ui:r:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("ui:r:")); for (int c; (c = get_opt ()) != -1; ) { diff --git a/examples/Connection/blocking/test_spipe_acceptor.cpp b/examples/Connection/blocking/test_spipe_acceptor.cpp index 549690ebf43..83003eb1c85 100644 --- a/examples/Connection/blocking/test_spipe_acceptor.cpp +++ b/examples/Connection/blocking/test_spipe_acceptor.cpp @@ -25,7 +25,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Asynchronous IO is unsupported.\n"))); diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp index 23c85b283a3..bc786f428fe 100644 --- a/examples/Connection/misc/test_upipe.cpp +++ b/examples/Connection/misc/test_upipe.cpp @@ -113,7 +113,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "your platform does not support threads\n"), diff --git a/examples/Connection/non_blocking/test_tli_acceptor.cpp b/examples/Connection/non_blocking/test_tli_acceptor.cpp index 8f281c26bd1..270f4cc3c47 100644 --- a/examples/Connection/non_blocking/test_tli_acceptor.cpp +++ b/examples/Connection/non_blocking/test_tli_acceptor.cpp @@ -16,7 +16,7 @@ typedef Svc_Handler<ACE_TLI_STREAM> SVC_HANDLER; typedef IPC_Server<SVC_HANDLER, ACE_TLI_ACCEPTOR> IPC_SERVER; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Perform Service_Config initializations ACE_Service_Config daemon (argv[0]); diff --git a/examples/Connection/non_blocking/test_tli_connector.cpp b/examples/Connection/non_blocking/test_tli_connector.cpp index 67756fe795d..eb8bdf23c3f 100644 --- a/examples/Connection/non_blocking/test_tli_connector.cpp +++ b/examples/Connection/non_blocking/test_tli_connector.cpp @@ -14,7 +14,7 @@ typedef Peer_Handler<ACE_TLI_STREAM> PEER_HANDLER; typedef IPC_Client<PEER_HANDLER, ACE_TLI_CONNECTOR> IPC_CLIENT; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Perform Service_Config initializations ACE_Service_Config daemon (argv[0]); diff --git a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp index e4cf8997857..082dfb1f6dc 100644 --- a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp @@ -49,7 +49,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } // Determine IP address of the server. - if ((hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR(host))) == 0) + if ((hp = ACE_OS::gethostbyname (ACE_TEXT_TO_CHAR_IN(host))) == 0) ACE_OS::perror (ACE_TEXT("gethostbyname")), ACE_OS::exit (1); // Set up the address information to contact the server. diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index 3428b02cd12..e91668e205f 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -115,7 +115,7 @@ Options::read (void *buf, size_t len, size_t &iteration) int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("2h:i:m:p:q:st:T:"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("2h:i:m:p:q:st:T:"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index 43df0572f74..46dd0049da2 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -163,7 +163,7 @@ Options::Options (void) int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("p:r:v"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("p:r:v"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp index 31f76d4826a..e6778984b40 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp +++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp @@ -105,7 +105,7 @@ Options::read (void *buf, size_t len, size_t &iteration) int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) @@ -127,7 +127,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) break; case 'q': ACE_OS::strncpy (this->quit_string_, - ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()), + ACE_TEXT_TO_CHAR_IN (getopt.opt_arg ()), QUIT_STRING_SIZE); break; case 's': diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp index 539b97c931c..7ab033550d1 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp +++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp @@ -110,7 +110,7 @@ Options::read (void *buf, size_t len, size_t &iteration) int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) @@ -132,7 +132,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) break; case 'q': ACE_OS::strncpy (this->quit_string_, - ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()), + ACE_TEXT_TO_CHAR_IN (getopt.opt_arg ()), QUIT_STRING_SIZE); break; case 's': diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp index e2d2c8ad0c1..e1a9177e56b 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -173,7 +173,7 @@ Options::Options (void) int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("p:r:v"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("p:r:v"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp index 83333ccc357..23a53a7e7c7 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp +++ b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp @@ -170,7 +170,7 @@ handle_connections (ACE_SSL_SOCK_Acceptor &peer_acceptor, } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { u_short port = ACE_DEFAULT_SERVER_PORT + 1; @@ -204,7 +204,7 @@ main (int, char *[]) } #else #include "ace/OS_NS_stdio.h" -int main (int, char *[]) +int ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_OS::fprintf (stderr, "This feature is not supported\n"); return 0; diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp index 22535160cf0..6be3ce47b9e 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp +++ b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp @@ -355,7 +355,7 @@ run_event_loop (u_short port) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { u_short port = ACE_DEFAULT_SERVER_PORT; diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp index 8563067af03..c1f173cd72f 100644 --- a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp +++ b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp @@ -414,7 +414,7 @@ run_event_loop (u_short port) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_SSL_Context *context = ACE_SSL_Context::instance (); diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp index 6990763a8b0..35dda19f05e 100644 --- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp +++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp @@ -11,7 +11,7 @@ ACE_RCSID(TLI_SAP, CPP_ATM_client, "$Id$") /* ACE_XTI/ATM Client */ -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (argc < 2) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp index d4d3dec813c..5f45d465b49 100644 --- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp +++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(TLI_SAP, CPP_ATM_server, "$Id$") // ACE_TLI Server int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Time_Value timeout (ACE_DEFAULT_TIMEOUT); diff --git a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp index b027315ef26..b955faa75f0 100644 --- a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp +++ b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp @@ -13,7 +13,7 @@ ACE_RCSID(TLI_SAP, CPP_client, "$Id$") /* ACE_TLI Client */ -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const char *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST; u_short r_port = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT; diff --git a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp index 4ed8c0bf643..a85070ccb9e 100644 --- a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp +++ b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp @@ -11,7 +11,7 @@ ACE_RCSID(TLI_SAP, CPP_server, "$Id$") // ACE_TLI Server int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT; ACE_Time_Value timeout (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_TIMEOUT); diff --git a/examples/IPC_SAP/TLI_SAP/db-client.cpp b/examples/IPC_SAP/TLI_SAP/db-client.cpp index 51858b5f0cc..9051db43c21 100644 --- a/examples/IPC_SAP/TLI_SAP/db-client.cpp +++ b/examples/IPC_SAP/TLI_SAP/db-client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(TLI_SAP, db_client, "$Id$") const int MAXLINE = 255; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (argc < 2) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/examples/IPC_SAP/TLI_SAP/db-server.cpp b/examples/IPC_SAP/TLI_SAP/db-server.cpp index 145c4a13ad0..3b547e154a3 100644 --- a/examples/IPC_SAP/TLI_SAP/db-server.cpp +++ b/examples/IPC_SAP/TLI_SAP/db-server.cpp @@ -86,7 +86,7 @@ lookup_name (ACE_HANDLE handle) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT; ACE_INET_Addr l_addr (port); diff --git a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp index f12da575039..c544641fd5b 100644 --- a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp +++ b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(TLI_SAP, ftp_client, "$Id$") #if defined (ACE_HAS_TLI) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (argc < 2) ACE_OS::fprintf (stderr, "Usage: %s filename [server-host port-number]\n", argv[0]), ACE_OS::exit (1); diff --git a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp index 23596a84dd4..601a90987ff 100644 --- a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp +++ b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp @@ -42,7 +42,7 @@ read_file (void *fd) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT; ACE_TLI_Acceptor server; diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp index fac6447d898..ea265241bcf 100644 --- a/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -42,7 +42,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) { this->port_ = ACE_DEFAULT_SERVER_PORT; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:")); for (int c; (c = get_opt ()) != -1; ) switch (c) @@ -138,9 +138,9 @@ Logging_Handler::handle_input (ACE_HANDLE) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) "))); #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, cerr); + lp.print (ACE_TEXT_TO_TCHAR_IN (this->peer_name_), 1, cerr); #else - lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, stderr); + lp.print (ACE_TEXT_TO_TCHAR_IN (this->peer_name_), 1, stderr); #endif } else diff --git a/examples/Logger/simple-server/Logging_Handler.cpp b/examples/Logger/simple-server/Logging_Handler.cpp index 111a26248fc..2ca0b8558a7 100644 --- a/examples/Logger/simple-server/Logging_Handler.cpp +++ b/examples/Logger/simple-server/Logging_Handler.cpp @@ -87,7 +87,7 @@ Logging_Handler::handle_input (ACE_HANDLE) if (lp.length () == n) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) "))); - lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->host_name_), 1); + lp.print (ACE_TEXT_TO_TCHAR_IN (this->host_name_), 1); } else ACE_ERROR ((LM_ERROR, diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp index f323a2f3826..7420aeb637e 100644 --- a/examples/Logger/simple-server/server_loggerd.cpp +++ b/examples/Logger/simple-server/server_loggerd.cpp @@ -41,7 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_INET_Addr addr (PORT); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Mem_Map/IO-tests/test_io.cpp b/examples/Mem_Map/IO-tests/test_io.cpp index b60401cc813..11cdceee15f 100644 --- a/examples/Mem_Map/IO-tests/test_io.cpp +++ b/examples/Mem_Map/IO-tests/test_io.cpp @@ -40,7 +40,7 @@ print_usage_and_die (void) { ACE_OS::fprintf (stderr, "usage: %s" " [-i input_file] [-o output_file] [-n iteration_count] [-r]\n", - ACE_TEXT_ALWAYS_CHAR (program_name)); + ACE_TEXT_TO_CHAR_IN (program_name)); ACE_OS::exit (1); } @@ -59,7 +59,7 @@ cleanup (int = 0) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:n:o:r")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:n:o:r")); for (int c; ((c = get_opt ()) != -1); ) switch (c) @@ -162,7 +162,7 @@ run_tests (int iterations, FILE *input_fp, FILE *output_fp) } int -main (int argc, ACE_TCHAR *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { program_name = ACE::basename (argv[0], ACE_DIRECTORY_SEPARATOR_CHAR); diff --git a/examples/Misc/test_get_opt.cpp b/examples/Misc/test_get_opt.cpp index 3fd0a16ac80..dcb12e5eeff 100644 --- a/examples/Misc/test_get_opt.cpp +++ b/examples/Misc/test_get_opt.cpp @@ -1,6 +1,6 @@ // $Id$ -// Test the ACE_Get_Opt class. +// Test the ACE_Get_Arg_Opt class. #include "ace/OS_main.h" #include "ace/Get_Opt.h" @@ -11,7 +11,7 @@ ACE_RCSID(Misc, test_get_opt, "$Id$") int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("ab:cd:ef:gh:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("ab:cd:ef:gh:")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/NT_Service/main.cpp b/examples/NT_Service/main.cpp index fbbf4a60cf4..5f10e209df1 100644 --- a/examples/NT_Service/main.cpp +++ b/examples/NT_Service/main.cpp @@ -95,7 +95,7 @@ Process::print_usage_and_die (void) void Process::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:rskt:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:rskt:d")); int c; while ((c = get_opt ()) != -1) diff --git a/examples/OS/Process/imore.cpp b/examples/OS/Process/imore.cpp index 181254e0cb4..3740725a690 100644 --- a/examples/OS/Process/imore.cpp +++ b/examples/OS/Process/imore.cpp @@ -60,7 +60,7 @@ usage (void) static int parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("un")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("un")); int c; while ((c = get_opt ()) != -1) diff --git a/examples/OS/Process/process.cpp b/examples/OS/Process/process.cpp index de0f2db0d57..e5a30ce1c4a 100644 --- a/examples/OS/Process/process.cpp +++ b/examples/OS/Process/process.cpp @@ -58,7 +58,7 @@ static int run_wait = 0; static int parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dlx:p:e:gastuw")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dlx:p:e:gastuw")); int c; while ((c = get_opt ()) != -1) diff --git a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index 0ef3b353248..b36a4a79341 100644 --- a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void) int QoS_Util::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; while ((c = get_opts ()) != -1) diff --git a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index 0ef3b353248..b36a4a79341 100644 --- a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void) int QoS_Util::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; while ((c = get_opts ()) != -1) diff --git a/examples/QOS/Simple/QoS_Util.cpp b/examples/QOS/Simple/QoS_Util.cpp index 0ef3b353248..b36a4a79341 100644 --- a/examples/QOS/Simple/QoS_Util.cpp +++ b/examples/QOS/Simple/QoS_Util.cpp @@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void) int QoS_Util::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; while ((c = get_opts ()) != -1) diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp index a04663b28ad..e276791fc47 100644 --- a/examples/Reactor/Misc/notification.cpp +++ b/examples/Reactor/Misc/notification.cpp @@ -377,7 +377,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "threads must be supported to run this application\n"), -1); diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp index f4a3bc0630e..803b98c24cd 100644 --- a/examples/Reactor/Misc/pingpong.cpp +++ b/examples/Reactor/Misc/pingpong.cpp @@ -53,7 +53,7 @@ ACE_RCSID(Misc, pingpong, "$Id$") class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t> { public: - Ping_Pong (char b[], ACE_HANDLE f); + Ping_Pong (const char* b, ACE_HANDLE f); virtual ACE_HANDLE get_handle (void) const; virtual int handle_input (ACE_HANDLE); virtual int handle_output (ACE_HANDLE); @@ -75,7 +75,7 @@ private: // Open handle. }; -Ping_Pong::Ping_Pong (char b[], ACE_HANDLE f) +Ping_Pong::Ping_Pong (const char* b, ACE_HANDLE f) : buflen_ (ACE_OS::strlen (b) + 1 + (2 * sizeof (int))), pid_ (ACE_OS::getpid ()), handle_ (f) @@ -198,7 +198,7 @@ run_svc (ACE_HANDLE handle) { Ping_Pong *callback = 0; ACE_NEW (callback, - Ping_Pong (ACE_TEXT_ALWAYS_CHAR (string_name), + Ping_Pong (ACE_TEXT_TO_CHAR_IN (string_name), handle)); ACE_Reactor reactor; diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp index a08580672e0..1676703118e 100644 --- a/examples/Reactor/Misc/test_reactors.cpp +++ b/examples/Reactor/Misc/test_reactors.cpp @@ -187,7 +187,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); return 0; diff --git a/examples/Reactor/Misc/test_signals_2.cpp b/examples/Reactor/Misc/test_signals_2.cpp index 466ab58482f..00886ed6549 100644 --- a/examples/Reactor/Misc/test_signals_2.cpp +++ b/examples/Reactor/Misc/test_signals_2.cpp @@ -282,7 +282,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *[]) } #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "The HP C++ compiler is too lame to support this feature\n"), diff --git a/examples/Reactor/Misc/test_time_value.cpp b/examples/Reactor/Misc/test_time_value.cpp index a1c1c874b78..6557a0716de 100644 --- a/examples/Reactor/Misc/test_time_value.cpp +++ b/examples/Reactor/Misc/test_time_value.cpp @@ -23,7 +23,7 @@ operator<< (ostream &stream, const ACE_Time_Value &tv) } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_Time_Value tv1; ACE_Time_Value tv2 (2); diff --git a/examples/Reactor/Multicast/Log_Wrapper.cpp b/examples/Reactor/Multicast/Log_Wrapper.cpp index 055b57b9975..b3f84071a32 100644 --- a/examples/Reactor/Multicast/Log_Wrapper.cpp +++ b/examples/Reactor/Multicast/Log_Wrapper.cpp @@ -33,7 +33,7 @@ Log_Wrapper::open (const int port, const char *mcast_addr) #if defined (ACE_LACKS_UTSNAME_T) if ((host_info = ACE_OS::gethostbyname - (ACE_TEXT_ALWAYS_CHAR(host_data.nodename))) == NULL) + (ACE_TEXT_TO_CHAR_IN(host_data.nodename))) == NULL) #else if ((host_info = ACE_OS::gethostbyname (host_data.nodename)) == NULL) #endif diff --git a/examples/Reactor/Multicast/client.cpp b/examples/Reactor/Multicast/client.cpp index 25b18c2ae6c..3356540c880 100644 --- a/examples/Reactor/Multicast/client.cpp +++ b/examples/Reactor/Multicast/client.cpp @@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) ACE_LOG_MSG->open (argv[0]); // Start at argv[1] - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("m:ui:"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("m:ui:"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp index 65e39b97d1a..c3cef116638 100644 --- a/examples/Reactor/Multicast/server.cpp +++ b/examples/Reactor/Multicast/server.cpp @@ -238,7 +238,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) } #else int -main (int, char *argv[]) +ACE_TMAIN (int, ACE_TCHAR *argv[]) { ACE_ERROR_RETURN ((LM_ERROR, "error: %s must be run on a platform that support IP multicast\n", diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp index 80873ead1a9..88454d8ebd4 100644 --- a/examples/Reactor/Ntalker/ntalker.cpp +++ b/examples/Reactor/Ntalker/ntalker.cpp @@ -180,7 +180,7 @@ Handler::Handler (u_short udp_port, static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:u")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:u")); int c; diff --git a/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp b/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp index be720fdef40..f68d91e7b6e 100644 --- a/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp +++ b/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp @@ -127,7 +127,7 @@ have_asynchio (void) } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { if (have_asynchio () == 0) printf ("Test successful\n"); diff --git a/examples/Reactor/Proactor/post_completions.cpp b/examples/Reactor/Proactor/post_completions.cpp index e6545241953..636f2c7f3fa 100644 --- a/examples/Reactor/Proactor/post_completions.cpp +++ b/examples/Reactor/Proactor/post_completions.cpp @@ -295,7 +295,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/ int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_DEBUG, "This example cannot work with AIOCB_Proactor.\n")); diff --git a/examples/Reactor/Proactor/simple_test_proactor.cpp b/examples/Reactor/Proactor/simple_test_proactor.cpp index 1f4557d7df5..56cdecfe0cc 100644 --- a/examples/Reactor/Proactor/simple_test_proactor.cpp +++ b/examples/Reactor/Proactor/simple_test_proactor.cpp @@ -224,7 +224,7 @@ Simple_Tester::handle_write_file (const ACE_Asynch_Write_File::Result &result) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("f:d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:d:")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/Reactor/Proactor/test_aiocb.cpp b/examples/Reactor/Proactor/test_aiocb.cpp index c9c0d280f1b..cb3a5139832 100644 --- a/examples/Reactor/Proactor/test_aiocb.cpp +++ b/examples/Reactor/Proactor/test_aiocb.cpp @@ -216,7 +216,7 @@ Test_Aio::do_aio (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { Test_Aio test_aio; diff --git a/examples/Reactor/Proactor/test_aiocb_ace.cpp b/examples/Reactor/Proactor/test_aiocb_ace.cpp index 17705de1f03..2ae450968ea 100644 --- a/examples/Reactor/Proactor/test_aiocb_ace.cpp +++ b/examples/Reactor/Proactor/test_aiocb_ace.cpp @@ -231,7 +231,7 @@ Test_Aio::do_aio (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { ACE_UNUSED_ARG (argc); diff --git a/examples/Reactor/Proactor/test_aiosig.cpp b/examples/Reactor/Proactor/test_aiosig.cpp index 1746a10a49c..683753280e6 100644 --- a/examples/Reactor/Proactor/test_aiosig.cpp +++ b/examples/Reactor/Proactor/test_aiosig.cpp @@ -282,7 +282,7 @@ null_handler (int /* signal_number */, } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { if (test_aio_calls () == 0) printf ("RT SIG test successful:\n" diff --git a/examples/Reactor/Proactor/test_aiosig_ace.cpp b/examples/Reactor/Proactor/test_aiosig_ace.cpp index 34c1b9b5ab2..acde4d6f90e 100644 --- a/examples/Reactor/Proactor/test_aiosig_ace.cpp +++ b/examples/Reactor/Proactor/test_aiosig_ace.cpp @@ -346,7 +346,7 @@ null_handler (int signal_number, } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { if (test_aio_calls () == 0) printf ("RT SIG test successful:\n" diff --git a/examples/Reactor/Proactor/test_cancel.cpp b/examples/Reactor/Proactor/test_cancel.cpp index c10f8e9be2c..c225af561b0 100644 --- a/examples/Reactor/Proactor/test_cancel.cpp +++ b/examples/Reactor/Proactor/test_cancel.cpp @@ -184,7 +184,7 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:s:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:s:")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/Reactor/Proactor/test_end_event_loop.cpp b/examples/Reactor/Proactor/test_end_event_loop.cpp index 096f77b089d..964088ad629 100644 --- a/examples/Reactor/Proactor/test_end_event_loop.cpp +++ b/examples/Reactor/Proactor/test_end_event_loop.cpp @@ -157,7 +157,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/ int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_DEBUG, "This example cannot work with AIOCB_Proactor.\n")); diff --git a/examples/Reactor/Proactor/test_multiple_loops.cpp b/examples/Reactor/Proactor/test_multiple_loops.cpp index ac4228ab641..40a51ecd58f 100644 --- a/examples/Reactor/Proactor/test_multiple_loops.cpp +++ b/examples/Reactor/Proactor/test_multiple_loops.cpp @@ -133,7 +133,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) } #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { return 0; } diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp index 53a9fb7b474..1d0951658f4 100644 --- a/examples/Reactor/Proactor/test_proactor.cpp +++ b/examples/Reactor/Proactor/test_proactor.cpp @@ -604,7 +604,7 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:f:d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:f:d:")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/Reactor/Proactor/test_proactor2.cpp b/examples/Reactor/Proactor/test_proactor2.cpp index cd5cbf7092e..2fac76990d5 100644 --- a/examples/Reactor/Proactor/test_proactor2.cpp +++ b/examples/Reactor/Proactor/test_proactor2.cpp @@ -637,7 +637,7 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:p:d:h:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:p:d:h:")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/Reactor/Proactor/test_proactor3.cpp b/examples/Reactor/Proactor/test_proactor3.cpp index c47468276c8..dc5bfa128d5 100644 --- a/examples/Reactor/Proactor/test_proactor3.cpp +++ b/examples/Reactor/Proactor/test_proactor3.cpp @@ -669,7 +669,7 @@ set_proactor_type (const char *ptype) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:o:n:p:d:h:s:u")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("t:o:n:p:d:h:s:u")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/Reactor/Proactor/test_timeout.cpp b/examples/Reactor/Proactor/test_timeout.cpp index 39351717db9..ab15f33dc5a 100644 --- a/examples/Reactor/Proactor/test_timeout.cpp +++ b/examples/Reactor/Proactor/test_timeout.cpp @@ -119,7 +119,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/ int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_DEBUG, "This example is multithreaded version of test_timeout_st.cpp\n" diff --git a/examples/Reactor/Proactor/test_udp_proactor.cpp b/examples/Reactor/Proactor/test_udp_proactor.cpp index bffb9acbaf7..b605d0b8e82 100644 --- a/examples/Reactor/Proactor/test_udp_proactor.cpp +++ b/examples/Reactor/Proactor/test_udp_proactor.cpp @@ -368,7 +368,7 @@ Sender::handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index 9eb6d7c727a..a5fb49207eb 100644 --- a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -261,7 +261,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int result = 0; // Parse args - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("swmc"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("swmc"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) { diff --git a/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/examples/Reactor/WFMO_Reactor/Multithreading.cpp index 0778f375251..bc80e1bebe1 100644 --- a/examples/Reactor/WFMO_Reactor/Multithreading.cpp +++ b/examples/Reactor/WFMO_Reactor/Multithreading.cpp @@ -58,7 +58,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:h:s:i:e:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("t:h:s:i:e:")); int c; while ((c = get_opt ()) != -1) diff --git a/examples/Reactor/WFMO_Reactor/Talker.cpp b/examples/Reactor/WFMO_Reactor/Talker.cpp index 32438088614..d9a20157dad 100644 --- a/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -271,7 +271,7 @@ Peer_Handler::Peer_Handler (int argc, ACE_TCHAR *argv[]) // then notifies us. this->msg_queue ()->notification_strategy (&this->strategy_); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:")); int c; while ((c = get_opt ()) != EOF) diff --git a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp index 4cbb964cd74..22f287b7a2b 100644 --- a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp @@ -31,7 +31,7 @@ print_usage_and_die (void) void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp index 3f8ed3db866..ab157f18775 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp @@ -39,7 +39,7 @@ print_usage_and_die (void) void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:f:r:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:f:r:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp index 9fb26b4088e..e90890fddc1 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp @@ -39,7 +39,7 @@ parse_arguments (int argc, ACE_TCHAR *argv[]) int tracing = 1; program_name = argv[0]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("df:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("df:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp index 7193440b440..42065f10b1d 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp @@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) { program_name = argv[0]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:r:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:r:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp index 91d81338ea1..981190e9f71 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp @@ -36,7 +36,7 @@ static void parse_arguments (int argc, ACE_TCHAR *argv[]) { program_name = argv[0]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dr:")); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dr:"); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp index 390b14e19b8..15977728f43 100644 --- a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp @@ -35,7 +35,7 @@ void parse_args (int argc, ACE_TCHAR *argv[]) { program_name = argv[0]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:r:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:r:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp index e5bec64d8c6..5ee3361da62 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp @@ -37,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) { program_name = argv[0]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("f:h:p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:h:p:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp index cee8ca1469f..6e12812a4fe 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp @@ -33,7 +33,7 @@ print_usage_and_die (void) void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:h:r")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:h:r")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp index d7d4ef7346c..12f3941de51 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp @@ -40,7 +40,7 @@ void parse_args (int argc, ACE_TCHAR *argv[]) { program_name = argv[0]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("f:h:p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:h:p:")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp index 113c809069d..e368b86cb25 100644 --- a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp +++ b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp @@ -39,7 +39,7 @@ void parse_args (int argc, ACE_TCHAR *argv[]) { program_name = argv[0]; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:h:p:")); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:h:p:"); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i index ce7f42617e7..8fb87258041 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i @@ -50,7 +50,7 @@ ACE_INLINE int Handle_Broadcast::init (int argc, ACE_TCHAR *argv[]) { ACE_INET_Addr sba (Handle_Broadcast::DEFAULT_PORT); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i index a77d75e1fa8..159cf410cb3 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i @@ -31,7 +31,7 @@ Handle_L_CODgram::info (ACE_TCHAR **strp, size_t length) const if (ACE_LSOCK_CODgram::get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local connected datagram\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -45,7 +45,7 @@ ACE_INLINE int Handle_L_CODgram::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sucd; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); const ACE_TCHAR *r = Handle_L_CODgram::DEFAULT_RENDEZVOUS; for (int c; (c = get_opt ()) != -1; ) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i index 3b2ab29331f..5e225fafd9e 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i @@ -31,7 +31,7 @@ Handle_L_Dgram::info (ACE_TCHAR **strp, size_t length) const if (this->ACE_LSOCK_Dgram::get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local datagram\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -45,7 +45,7 @@ ACE_INLINE int Handle_L_Dgram::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sudg; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); const ACE_TCHAR *r = Handle_L_Dgram::DEFAULT_RENDEZVOUS; for (int c; (c = get_opt ()) != -1; ) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i index f6cd0cda734..8e8a3e1f960 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i @@ -43,7 +43,7 @@ ACE_INLINE int Handle_L_FIFO::init (int argc, ACE_TCHAR *argv[]) { const ACE_TCHAR *rendezvous_fifo = Handle_L_FIFO::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("r:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i index ce978aa85ea..72325011053 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i @@ -36,7 +36,7 @@ Handle_L_Pipe::info (ACE_TCHAR **strp, size_t length) const if (ACE_LSOCK_Acceptor::get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local pipe\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -51,7 +51,7 @@ Handle_L_Pipe::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sup; const ACE_TCHAR *r = Handle_L_Pipe::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i index 910938d8648..50c9bb36416 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i @@ -51,8 +51,8 @@ ACE_INLINE int Handle_L_SPIPE::init (int argc, ACE_TCHAR *argv[]) { ACE_SPIPE_Addr susp; - const ACE_TCHAR *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + const char *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS; + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "r:", 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i index 80b21852293..8da839253be 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i @@ -40,7 +40,7 @@ Handle_L_Stream::info (ACE_TCHAR **strp, size_t length) const if (this->get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local ACE_Stream\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -55,7 +55,7 @@ Handle_L_Stream::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sus; const ACE_TCHAR *r = Handle_L_Stream::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) @@ -130,7 +130,7 @@ Handle_L_Stream::handle_input (ACE_HANDLE) if (new_local_stream.send (4, Handle_L_Stream::login_name, ACE_OS::strlen (Handle_L_Stream::login_name), - ACE_TEXT_ALWAYS_CHAR (cs), + ACE_TEXT_TO_CHAR_IN (cs), ACE_OS::strlen (cs)) == -1) return -1; else if (ACE_OS::close (handle) == -1) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i index 88212a988f0..df58c0173b8 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i @@ -45,7 +45,7 @@ ACE_INLINE int Handle_R_Dgram::init (int argc, ACE_TCHAR *argv[]) { ACE_INET_Addr sidg (Handle_R_Dgram::DEFAULT_PORT); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i index f126cd13aee..33045a3e44c 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i @@ -52,7 +52,7 @@ ACE_INLINE int Handle_R_Stream::init (int argc, ACE_TCHAR *argv[]) { ACE_INET_Addr sis (Handle_R_Stream::DEFAULT_PORT); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp index fb53c0f8d70..0a15478caed 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp @@ -61,7 +61,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[]) ACE_INET_Addr local_addr (ACE_DEFAULT_THR_PORT); int n_threads = ACE_DEFAULT_THREADS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:t:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:t:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) @@ -154,7 +154,7 @@ CLI_Stream<PR_ST_2>::svc (void) ACE_OS::cuserid (login_name); ACE_OS::sprintf (buf, "user %s %s", login_name, - ACE_TEXT_ALWAYS_CHAR (ACE_OS::ctime ((const time_t *) &t))); + ACE_TEXT_TO_CHAR_IN (ACE_OS::ctime ((const time_t *) &t))); if (this->peer ().send_n (buf, ACE_OS::strlen (buf) + 1) == -1) return -1; diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i index 346a22e773c..d23d1a26caa 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i @@ -30,7 +30,7 @@ Handle_Timeout::init (int argc, ACE_TCHAR *argv[]) { ACE_Time_Value delta (10); ACE_Time_Value interval (1); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0); int arg = 0; for (int c; (c = get_opt ()) != -1; ) diff --git a/examples/Shared_Malloc/Options.cpp b/examples/Shared_Malloc/Options.cpp index 6716fa66c31..bd08e7a57ba 100644 --- a/examples/Shared_Malloc/Options.cpp +++ b/examples/Shared_Malloc/Options.cpp @@ -133,9 +133,9 @@ Options::Options (void) void Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dehlL:mn:pst:T")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dehlL:mn:pst:T")); - ACE_OS::strcpy (this->program_name_, ACE_TEXT_ALWAYS_CHAR (argv[0])); + ACE_OS::strcpy (this->program_name_, ACE_TEXT_TO_CHAR_IN (argv[0])); ACE_LOG_MSG->open (argv[0]); // Put in a special-case check for child process. diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp index b6143aa989c..ead20c17b63 100644 --- a/examples/Shared_Malloc/test_malloc.cpp +++ b/examples/Shared_Malloc/test_malloc.cpp @@ -110,7 +110,7 @@ spawn (void) #endif /* ACE_HAS_THREADS */ } #if !defined (ACE_WIN32) - else if (ACE_OS::fork (ACE_TEXT_CHAR_TO_TCHAR (Options::instance ()->program_name ())) == 0) + else if (ACE_OS::fork (ACE_TEXT_TO_TCHAR_IN (Options::instance ()->program_name ())) == 0) { if (Options::instance ()->exec_slave ()) { diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp index b4c66e54957..c6d3111e06f 100644 --- a/examples/Shared_Malloc/test_position_independent_malloc.cpp +++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp @@ -119,7 +119,7 @@ initialize (TEST_MALLOC *allocator) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("a:T")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:T")); for (int c; (c = get_opt ()) != -1; diff --git a/examples/Synch/proc_sema.cpp b/examples/Synch/proc_sema.cpp index d9da687ca6a..0c405fa52f7 100644 --- a/examples/Synch/proc_sema.cpp +++ b/examples/Synch/proc_sema.cpp @@ -46,7 +46,7 @@ int consumer (ACE_SYNCH_PROCESS_SEMAPHORE &sema, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("csn:xi:d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("csn:xi:d:")); int is_consumer = 1; // By default, make us a consumer. int delete_sema = 0; diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp index 547e4175121..5f26eb583b4 100644 --- a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp @@ -16,7 +16,7 @@ ACE_RCSID(SV_Message_Queues, MQ_Client, "$Id$") #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { long pid = long (ACE_OS::getpid ()); ACE_SV_Message_Queue msgque (SRV_KEY); diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp index 57c7502cabd..a685f2e67f7 100644 --- a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp @@ -27,7 +27,7 @@ handler (int) } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { long pid = long (ACE_OS::getpid ()); Message_Block recv_msg (SRV_ID); diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp index 02c41602b9f..bda5e1bafa6 100644 --- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp @@ -29,7 +29,7 @@ handler (int) } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { char *username = ACE_OS::cuserid (static_cast<char *> (0)); Message_Data msg_data ((int) ACE_OS::getpid (), username, "I received your message."); diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp index 2331ea772ec..581dff8f7f6 100644 --- a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp +++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp @@ -67,7 +67,7 @@ child (char *shm) } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { char *shm = (char *) alloc.malloc (27); diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp index e0ae9cd2bb5..933bd09a3bf 100644 --- a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp +++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp @@ -83,7 +83,7 @@ child (char *shm) } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { char *shm = (char *) my_alloc.malloc (27); diff --git a/examples/TMCast/Member/member.cpp b/examples/TMCast/Member/member.cpp index f89c68564ea..fbbbe6b9f13 100644 --- a/examples/TMCast/Member/member.cpp +++ b/examples/TMCast/Member/member.cpp @@ -32,7 +32,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ACE_INET_Addr address (argv[3]); - ACE_TMCast::Group group (address, ACE_TEXT_ALWAYS_CHAR (argv[2])); + ACE_TMCast::Group group (address, ACE_TEXT_TO_CHAR_IN (argv[2])); if (receiver) { diff --git a/examples/Threads/process_manager.cpp b/examples/Threads/process_manager.cpp index b8c2455b469..7a03afca362 100644 --- a/examples/Threads/process_manager.cpp +++ b/examples/Threads/process_manager.cpp @@ -129,7 +129,7 @@ static int exit_code = 0; static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:e:cu")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:e:cu")); int c; diff --git a/examples/Threads/reader_writer.cpp b/examples/Threads/reader_writer.cpp index 5344ba4d5b4..b8a523cc827 100644 --- a/examples/Threads/reader_writer.cpp +++ b/examples/Threads/reader_writer.cpp @@ -53,7 +53,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("r:w:n:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("r:w:n:l:")); int c; diff --git a/examples/Threads/recursive_mutex.cpp b/examples/Threads/recursive_mutex.cpp index 3c915682d90..20cec4a7e82 100644 --- a/examples/Threads/recursive_mutex.cpp +++ b/examples/Threads/recursive_mutex.cpp @@ -33,7 +33,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:t:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:t:")); int c; diff --git a/examples/Threads/task_one.cpp b/examples/Threads/task_one.cpp index ea4fd71dcf8..c2c23306152 100644 --- a/examples/Threads/task_one.cpp +++ b/examples/Threads/task_one.cpp @@ -94,7 +94,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); return 0; diff --git a/examples/Web_Crawler/Command_Processor.cpp b/examples/Web_Crawler/Command_Processor.cpp index 9f4141f3c6c..afe234926d3 100644 --- a/examples/Web_Crawler/Command_Processor.cpp +++ b/examples/Web_Crawler/Command_Processor.cpp @@ -23,7 +23,7 @@ URL_Command::execute (void) { ACE_CString check_string - (ACE_TEXT_ALWAYS_CHAR (this->url_->url_addr ().get_path_name ())); + (ACE_TEXT_TO_CHAR_IN (this->url_->url_addr ().get_path_name ())); if (check_string.find ("news:") >= 0) return 0; diff --git a/examples/Web_Crawler/HTTP_URL.cpp b/examples/Web_Crawler/HTTP_URL.cpp index 44ceea324d4..351a3a7ac7d 100644 --- a/examples/Web_Crawler/HTTP_URL.cpp +++ b/examples/Web_Crawler/HTTP_URL.cpp @@ -43,7 +43,7 @@ HTTP_URL::send_request (void) ACE_OS::sprintf (cmd_ptr.get (), "GET /%s HTTP/1.1\r\n", - ACE_TEXT_ALWAYS_CHAR (this->url_addr ().get_path_name ())); + ACE_TEXT_TO_CHAR_IN (this->url_addr ().get_path_name ())); // Send the GET command to the connected server. if (this->stream ().send_n (cmd_ptr.get (), diff --git a/examples/Web_Crawler/Options.cpp b/examples/Web_Crawler/Options.cpp index 389cbfa0733..b010a3a24ea 100644 --- a/examples/Web_Crawler/Options.cpp +++ b/examples/Web_Crawler/Options.cpp @@ -11,7 +11,7 @@ ACE_RCSID(Web_Crawler, Options, "$Id$") int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("df:h:i:l:rt:u:vo:p:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("df:h:i:l:rt:u:vo:p:")); ACE_LOG_MSG->open (argv[0]); diff --git a/examples/Web_Crawler/URL_Addr.cpp b/examples/Web_Crawler/URL_Addr.cpp index 5a630e387fb..b65c5c7ba4a 100644 --- a/examples/Web_Crawler/URL_Addr.cpp +++ b/examples/Web_Crawler/URL_Addr.cpp @@ -39,7 +39,7 @@ ACE_URL_Addr::addr_to_string (ACE_TCHAR *s, else { ACE_OS::sprintf (s, ACE_TEXT ("%s:%d/%s"), - ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0 + ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0 ? this->get_host_name () : this->get_host_addr ()), this->get_port_number (), @@ -73,7 +73,7 @@ ACE_URL_Addr::addr_to_string (int ipaddr_format) const } ACE_OS::sprintf (this->addr_string_, ACE_TEXT ("%s:%d/%s"), - ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0 + ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0 ? this->get_host_name () : this->get_host_addr ()), this->get_port_number (), diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp index 1422665ffb0..b4cd8138212 100644 --- a/examples/Web_Crawler/URL_Visitor.cpp +++ b/examples/Web_Crawler/URL_Visitor.cpp @@ -119,7 +119,7 @@ HTML_Body_Validation_Strategy::execute (void) char temp[BUFSIZ + 1]; ACE_CString prev_location (temp); - prev_location.set (ACE_TEXT_ALWAYS_CHAR (this->url_.url_addr ().get_path_name ()), + prev_location.set (ACE_TEXT_TO_CHAR_IN (this->url_.url_addr ().get_path_name ()), ACE_OS::strlen (this->url_.url_addr ().get_path_name ()), 1); int index = prev_location.rfind ('/', prev_location.length ()); @@ -164,7 +164,7 @@ HTML_Body_Validation_Strategy::execute (void) ACE_URL_Addr, 0); Auto_Destroyer<ACE_URL_Addr> url_addr_ptr (url_addr); - if (url_addr_ptr->string_to_addr (ACE_TEXT_CHAR_TO_TCHAR (url.c_str ())) == 0) + if (url_addr_ptr->string_to_addr (ACE_TEXT_TO_TCHAR_IN (url.c_str ())) == 0) { HTTP_URL *http_url; ACE_NEW_RETURN (http_url, |