diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
| commit | d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch) | |
| tree | cf04398acb7ad9fb45311eb105d60975028bbc03 | |
| parent | 1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff) | |
| download | ATCD-oci_wchar_refactor_post_1_5_1_branch.tar.gz | |
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
1828 files changed, 12961 insertions, 9175 deletions
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp index b6f5e6aa423..731676d7f94 100644 --- a/ACEXML/common/HttpCharStream.cpp +++ b/ACEXML/common/HttpCharStream.cpp @@ -251,7 +251,7 @@ ACEXML_HttpCharStream::get_url (size_t& len) int ACEXML_HttpCharStream::send_request (void) { - char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name())); + char* path = ACE::strnew (ACE_TEXT_TO_CHAR_IN (this->url_addr_->get_path_name())); ACE_Auto_Basic_Array_Ptr<char> path_ptr (path); size_t commandsize = ACE_OS::strlen (path) + ACE_OS::strlen (this->url_addr_->get_host_name ()) @@ -382,7 +382,7 @@ ACEXML_HttpCharStream::read (ACEXML_Char *str, return -1; len = len * sizeof (ACEXML_Char); char* temp = const_cast<char*> (this->stream_->recv (len)); - str = ACE_TEXT_CHAR_TO_TCHAR (temp); + ACE_OS::string_copy( str, temp, len ); if (str == 0) return -1; return static_cast<int> (len); diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp index b58c916c73f..3bec4ae6ec4 100644 --- a/ACEXML/common/URL_Addr.cpp +++ b/ACEXML/common/URL_Addr.cpp @@ -33,7 +33,7 @@ ACEXML_URL_Addr::addr_to_string (ACEXML_Char *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 (), @@ -55,7 +55,7 @@ ACEXML_URL_Addr::addr_to_string (int ipaddr_format) } 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 (), @@ -67,7 +67,7 @@ ACEXML_URL_Addr::addr_to_string (int ipaddr_format) int ACEXML_URL_Addr::string_to_addr (const char* s) { - return this->string_to_addr (ACE_TEXT_CHAR_TO_TCHAR (s)); + return this->string_to_addr (ACE_TEXT_TO_TCHAR_IN (s)); } #endif /* ACE_USES_WCHAR */ diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h index 5a55d6b7754..ed8f170e290 100644 --- a/ACEXML/common/XML_Types.h +++ b/ACEXML/common/XML_Types.h @@ -27,17 +27,17 @@ #include "ace/SString.h" #include "ace/Functor_String.h" -# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2) +# if (ACE_SIZEOF_WCHAR == 2) typedef wchar_t ACEXML_UTF16; # else typedef ACE_USHORT16 ACEXML_UTF16; -# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 2 */ +# endif /* ACE_SIZEOF_WCHAR == 2 */ -# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 4) +# if (ACE_SIZEOF_WCHAR == 4) typedef wchar_t ACEXML_UCS4; # else typedef ACE_UINT32 ACEXML_UCS4; -# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 4 */ +# endif /* ACE_SIZEOF_WCHAR == 4 */ typedef char ACEXML_UTF8; diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp index f6f334cee0e..f5eb2625125 100644 --- a/ACEXML/examples/SAXPrint/main.cpp +++ b/ACEXML/examples/SAXPrint/main.cpp @@ -37,7 +37,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int zip = 0; ACEXML_Char* url = 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("sf:lu:z")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("sf:lu:z")); int c; while ((c = get_opt ()) != EOF) diff --git a/ASNMP/agent/main.cpp b/ASNMP/agent/main.cpp index ff0c9431518..c47d0da0ce9 100644 --- a/ASNMP/agent/main.cpp +++ b/ASNMP/agent/main.cpp @@ -9,13 +9,13 @@ ACE_RCSID(agent, main, "$Id$") -int -main (int argc, char *argv[]) +int +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE::init (); snmp_agent the_agent; - if (the_agent.set_args(argc, argv)) + if (the_agent.set_args(argc, argv)) return 1; if (!the_agent.valid()) { diff --git a/ASNMP/agent/snmp_agent.cpp b/ASNMP/agent/snmp_agent.cpp index 520c58eaccf..0ed8285b373 100644 --- a/ASNMP/agent/snmp_agent.cpp +++ b/ASNMP/agent/snmp_agent.cpp @@ -41,7 +41,7 @@ int snmp_agent::set_args(int argc, char *argv[]) const ACE_TCHAR *wr = WR_COM; ACE_Argv_Type_Converter to_tchar (argc, argv); - ACE_Get_Opt get_opt + ACE_Get_Arg_Opt<char> get_opt (argc, to_tchar.get_TCHAR_argv (), ACE_TEXT ("p:w:r:hv")); for (int c; (c = get_opt ()) != -1; ) { switch (c) @@ -71,8 +71,8 @@ int snmp_agent::set_args(int argc, char *argv[]) agent_ = new agent_impl(port, - ACE_TEXT_ALWAYS_CHAR (rd), - ACE_TEXT_ALWAYS_CHAR (wr)); // opens OS IO port + ACE_TEXT_TO_CHAR_IN (rd), + ACE_TEXT_TO_CHAR_IN (wr)); // opens OS IO port return 0; } diff --git a/ASNMP/asnmp/sagent.cpp b/ASNMP/asnmp/sagent.cpp index 8ee2fdb5b8d..70fef1fc5bd 100644 --- a/ASNMP/asnmp/sagent.cpp +++ b/ASNMP/asnmp/sagent.cpp @@ -55,7 +55,7 @@ int sagent::handle_input(ACE_HANDLE fd) const ACE_INET_Addr &ta = tr.get_from_addr(); ACE_TCHAR buf_tmp[MAXHOSTNAMELEN + 1]; ta.addr_to_string (buf_tmp, MAXHOSTNAMELEN); - UdpAddress ra (ACE_TEXT_ALWAYS_CHAR (buf_tmp)); + UdpAddress ra (ACE_TEXT_TO_CHAR_IN (buf_tmp)); tgt_.set_address(ra); diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp index ff6fcb9681f..a633059a08c 100644 --- a/ASNMP/examples/get/get.cpp +++ b/ASNMP/examples/get/get.cpp @@ -67,7 +67,7 @@ class getapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { getapp get(argc, argv); if (get.valid()) @@ -95,22 +95,22 @@ getapp::getapp(int argc, char *argv[]): valid_(0) } ACE_Argv_Type_Converter to_tchar (argc, argv); - ACE_Get_Opt get_opt (argc, - to_tchar.get_TCHAR_argv (), - ACE_TEXT ("o:c:r:t:p:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t:p:")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'o': - req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); if (req.valid() == 0) cout << "ERROR: oid value: " - << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()) + << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()) << "is not valid. using default.\n"; break; case 'c': - community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); target_.set_read_community(community_); break; diff --git a/ASNMP/examples/get/get_async.cpp b/ASNMP/examples/get/get_async.cpp index 8217ffabac1..ee9c9791d39 100644 --- a/ASNMP/examples/get/get_async.cpp +++ b/ASNMP/examples/get/get_async.cpp @@ -67,7 +67,7 @@ class getapp : public Snmp_Result { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { getapp get(argc, argv); if (get.valid()) @@ -95,22 +95,22 @@ getapp::getapp(int argc, char *argv[]): valid_(0) } ACE_Argv_Type_Converter to_tchar (argc, argv); - ACE_Get_Opt get_opt (argc, - to_tchar.get_TCHAR_argv (), - ACE_TEXT ("o:c:r:t:p:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t:p:")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'o': - req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); if (req.valid() == 0) cout << "ERROR: oid value: " - << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()) + << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()) << "is not valid. using default.\n"; break; case 'c': - community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); target_.set_read_community(community_); break; diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp index 7a9a2208ca2..0ec2a7fc945 100644 --- a/ASNMP/examples/next/next.cpp +++ b/ASNMP/examples/next/next.cpp @@ -66,7 +66,7 @@ class nextapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { nextapp get(argc, argv); if (get.valid()) @@ -94,22 +94,22 @@ nextapp::nextapp(int argc, char *argv[]): valid_(0) } ACE_Argv_Type_Converter to_tchar (argc, argv); - ACE_Get_Opt get_opt (argc, - to_tchar.get_TCHAR_argv (), - ACE_TEXT ("o:c:r:t:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t:")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'o': - req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); if (req.valid() == 0) cout << "ERROR: oid value: " - << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()) + << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()) << "is not valid. using default.\n"; break; case 'c': - community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); target_.set_read_community(community_); break; diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp index 39eb447f9a7..938a385c4e2 100644 --- a/ASNMP/examples/set/set.cpp +++ b/ASNMP/examples/set/set.cpp @@ -66,7 +66,7 @@ class set { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { set get(argc, argv); if (get.valid()) @@ -97,22 +97,22 @@ set::set(int argc, char *argv[]): valid_(0) } ACE_Argv_Type_Converter to_tchar (argc, argv); - ACE_Get_Opt get_opt (argc, - to_tchar.get_TCHAR_argv (), - ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'o': - req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); if (req.valid() == 0) cout << "ERROR: oid value: " - << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()) + << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()) << "is not valid. using default.\n"; break; case 'c': - community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); target_.set_write_community(community_); break; @@ -166,14 +166,14 @@ set::set(int argc, char *argv[]): valid_(0) case 'O': // Oid as a variable identifier { - oid_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + oid_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); vb.set_oid(oid_); // when value is set, pdu updated } break; case 'S': // Octet String { - OctetStr o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())); + OctetStr o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); vb.set_value(o); // set the Oid portion of the Vb pdu_ += vb; } @@ -181,7 +181,7 @@ set::set(int argc, char *argv[]): valid_(0) case 'P': // Oid String as a value { - Oid o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())); + Oid o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); vb.set_value(o); // set the Oid portion of the Vb pdu_ += vb; } diff --git a/ASNMP/examples/trap/trap.cpp b/ASNMP/examples/trap/trap.cpp index 59d4f9f25bc..bfba5d3552e 100644 --- a/ASNMP/examples/trap/trap.cpp +++ b/ASNMP/examples/trap/trap.cpp @@ -68,7 +68,7 @@ class trapapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { trapapp get(argc, argv); if (get.valid()) @@ -98,23 +98,23 @@ trapapp::trapapp(int argc, char *argv[]): valid_(0) } ACE_Argv_Type_Converter to_tchar (argc, argv); - ACE_Get_Opt get_opt (argc, - to_tchar.get_TCHAR_argv (), - ACE_TEXT ("c:e:t:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("c:e:t:")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'c': // community string - community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); target_.set_read_community(community_); break; case 'e': // trap oid to send - ent = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + ent = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); break; case 't': // trap oid - trap = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + trap = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); break;; default: diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp index 56fc112fd71..75d62fa66f7 100644 --- a/ASNMP/examples/walk/walk.cpp +++ b/ASNMP/examples/walk/walk.cpp @@ -65,7 +65,7 @@ class walkapp { // main entry point -int main( int argc, char *argv[]) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[]) { walkapp get(argc, argv); if (get.valid()) @@ -94,22 +94,22 @@ walkapp::walkapp(int argc, char *argv[]): valid_(0) } ACE_Argv_Type_Converter to_tchar (argc, argv); - ACE_Get_Opt get_opt (argc, - to_tchar.get_TCHAR_argv (), - ACE_TEXT ("o:c:r:t:")); + ACE_Get_Arg_Opt<char> get_opt (argc, + to_tchar.get_TCHAR_argv (), + ACE_TEXT ("o:c:r:t:")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'o': - req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); if (req.valid() == 0) cout << "ERROR: oid value: " - << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()) + << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()) << "is not valid. using default.\n"; break; case 'c': - community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()); target_.set_read_community(community_); break; diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h index 887fa5cec8a..cd416bafdff 100644 --- a/ASNMP/tests/test_config.h +++ b/ASNMP/tests/test_config.h @@ -99,8 +99,8 @@ do {\ #define ACE_INIT_LOG(NAME) \ char temp[BUFSIZ]; \ ACE_OS::sprintf (temp, "%s%s%s", \ - ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY), \ - ACE_TEXT_ALWAYS_CHAR (ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR)), \ + ACE_TEXT_TO_CHAR_IN (ACE_LOG_DIRECTORY), \ + ACE_TEXT_TO_CHAR_IN (ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR)), \ ".log"); \ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Deleting old log file %C (if any)\n\n"), temp)); \ ACE_OS::unlink (temp); @@ -146,8 +146,8 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. ACE_OS::mkdir (ACE_LOG_DIRECTORY); ACE_OS::sprintf (temp, "%s%s%s", - ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY), - ACE_TEXT_ALWAYS_CHAR (ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)), + ACE_TEXT_TO_CHAR_IN (ACE_LOG_DIRECTORY), + ACE_TEXT_TO_CHAR_IN (ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)), ".log"); this->output_file_.open (temp, ios::out | (append ? ios::app : ios::trunc)); diff --git a/ChangeLog b/ChangeLog index d8488be78a4..1e034adab18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,727 @@ +Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com> + + This entry deals with the refactoring work on the ACE wide char + support. The forces that drove the design are as follows: + + - Provide ACE a singular wchar_t type that can be used in + conjunction with system services. + - Allow CDR to use its own wchar type that can deviate from + wchar_t. + - Keep ACE interfaces consistent and backwards compatible. + - Provide optimized conversion functions for all known use + cases. + + ACE now uses wchar_t on all its wide-char interfaces. The type + wchar_t could be defined by a platform's compiler, system headers, + or the appropriate ACE platform configuration file. The extraneous + wchar types ACE_WCHAR_T, ACE_WCHAR_TYPE, and ACE_OS::WChar have + been removed. ACE_HAS_WCHAR is deprecated. A wchar_t type will + always be defined. + + Since a wchar_t type is always defined we then always expose + ACE's public wchar interfaces regardless of private + implementation. If ACE_LACKS_XXXX defined for a function then + either emulate or return <not supported>. This greatly cleans up the + headers and eliminates the dependency on the symbol ACE_HAS_WCHAR. + + A pattern has been created for the few methods of ACE that CDR + requires. The pattern allows for the compiler to emulate a + function with any wchar type, provide a narrow-char specialization, + a wchar specialization and defaults to the emulator if the wchar + specialization is not possible (due to ACE_LACKS_XXXX). The pattern + can easily be applied to other ACE methods and classes. + + The design and intent of ACE_USES_WCHAR has not been + changed. Many cases of inconsistent use has been fixed. The + fixes included simply changing types of local variables, + expanding an interface to override on char and wchar_t, and + forcing certain classes/functions to be templated and NOT based + on ACE_TCHAR. + + * ACEXML/common/HttpCharStream.cpp: + * ACEXML/common/URL_Addr.cpp: + * ACEXML/common/XML_Types.h: + + * ACEXML/examples/SAXPrint/main.cpp: + + * ASNMP/agent/main.cpp: + * ASNMP/agent/snmp_agent.cpp: + + * ASNMP/asnmp/sagent.cpp: + + * ASNMP/examples/get/get.cpp: + * ASNMP/examples/get/get_async.cpp: + + * ASNMP/examples/next/next.cpp: + + * ASNMP/examples/set/set.cpp: + + * ASNMP/examples/trap/trap.cpp: + + * ASNMP/examples/walk/walk.cpp: + + * ASNMP/tests/test_config.h: + + * Kokyu/tests/EDF/test.cpp: + + * Kokyu/tests/FIFO/test.cpp: + + * ace/ACE.h: + * ace/ACE.inl: + * ace/ACE.cpp: + + * ace/Auto_Event.h: + * ace/Auto_Event.cpp: + + * ace/CE_Screen_Output.cpp: + * ace/Default_Constants.h: + * ace/Dev_Poll_Reactor.cpp: + * ace/Dynamic_Service.h: + * ace/Dynamic_Service.inl: + * ace/Env_Value_T.inl: + * ace/FILE_Connector.cpp: + * ace/Functor.h: + * ace/Functor.inl: + * ace/Functor_String.h: + * ace/Functor_String.inl: + + * ace/Global_Macros.h: + * ace/High_Res_Timer.h: + * ace/High_Res_Timer.cpp: + * ace/INET_Addr.h: + * ace/INET_Addr.inl: + * ace/INET_Addr.cpp: + * ace/Lib_Find.h: + * ace/Lib_Find.cpp: + * ace/Local_Name_Space.h: + * ace/Local_Name_Space.cpp: + * ace/Local_Name_Space_T.cpp: + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + * ace/Log_Msg_UNIX_Syslog.cpp: + * ace/Log_Record.cpp: + * ace/Logging_Strategy.cpp: + * ace/MEM_Connector.cpp: + * ace/Malloc_T.h: + * ace/Malloc_T.cpp: + * ace/Manual_Event.h: + * ace/Manual_Event.cpp: + * ace/Multihomed_INET_Addr.h: + * ace/Multihomed_INET_Addr.cpp: + * ace/Mutex.h: + * ace/NT_Service.h: + * ace/Name_Request_Reply.h: + * ace/Name_Request_Reply.cpp: + * ace/Naming_Context.cpp: + * ace/OS_NS_Thread.h: + * ace/OS_NS_Thread.inl: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_dirent.inl: + + * ace/OS_NS_fcntl.h: + * ace/OS_NS_fcntl.cpp: + * ace/OS_NS_stdio.h: + * ace/OS_NS_stdio.inl: + * ace/OS_NS_stdio.cpp: + + * ace/OS_NS_stdlib.h: + * ace/OS_NS_stdlib.inl: + * ace/OS_NS_stdlib.cpp: + + * ace/OS_NS_strings.h: + * ace/OS_NS_strings.inl: + * ace/OS_NS_sys_mman.inl: + * ace/OS_NS_sys_stat.h: + * ace/OS_NS_sys_stat.inl: + * ace/OS_NS_time.inl: + + * ace/OS_main.cpp: + * ace/Object_Manager.h: + * ace/Object_Manager_Base.cpp: + * ace/Process.h: + * ace/Process.inl: + * ace/Process.cpp: + * ace/Process_Mutex.h: + * ace/Process_Mutex.cpp: + * ace/Process_Semaphore.cpp: + + * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: + + * ace/Registry_Name_Space.cpp: + * ace/Remote_Name_Space.cpp: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + + * ace/SSL/SSL_Asynch_Stream.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Stream.cpp: + + * ace/SString.cpp: + * ace/SStringfwd.h: + * ace/SV_Semaphore_Simple.h: + * ace/SV_Semaphore_Simple.inl: + * ace/SV_Semaphore_Simple.cpp: + * ace/Service_Config.h: + * ace/Service_Config.inl: + * ace/Service_Config.cpp: + * ace/Service_Manager.cpp: + * ace/Shared_Memory_Pool.cpp: + * ace/Singleton.cpp: + * ace/Sock_Connect.cpp: + + * ace/Svc_Conf_y.cpp: + * ace/UNIX_Addr.h: + * ace/UNIX_Addr.inl: + * ace/UNIX_Addr.cpp: + + * ace/os_include/os_stddef.h: + + * apps/FaCE/FaCE.h: + * apps/FaCE/FaCE.cpp: + + * apps/Gateway/Gateway/Config_Files.cpp: + * apps/Gateway/Gateway/Options.cpp: + + * apps/Gateway/Peer/Options.cpp: + + * apps/JAWS/clients/Blobby/Blob_Handler.cpp: + * apps/JAWS/clients/Blobby/Options.cpp: + + * apps/JAWS/clients/Caching/http_client.cpp: + * apps/JAWS/clients/Caching/http_handler.cpp: + * apps/JAWS/clients/Caching/test_URL.cpp: + + * apps/JAWS/server/HTTP_Server.cpp: + * apps/JAWS/server/main.cpp: + + * apps/JAWS/stress_testing/benchd.cpp: + * apps/JAWS/stress_testing/http_tester.cpp: + + * apps/JAWS2/JAWS/Server.cpp: + + * apps/JAWS2/main.cpp: + + * apps/JAWS3/bench/mkfiles.cpp: + * apps/JAWS3/bench/rqfiles.cpp: + + * apps/JAWS3/http/HTTP_Service_Handler.cpp: + + * apps/JAWS3/jaws3/main.cpp: + + * apps/JAWS3/small/SS_Service_Handler.cpp: + + * apps/drwho/Options.cpp: + * apps/drwho/client.cpp: + * apps/drwho/server.cpp: + + * apps/gperf/src/Options.cpp: + * apps/gperf/src/gperf.cpp: + + * apps/soreduce/Library.cpp: + * apps/soreduce/soreduce.cpp: + + * bin/MakeProjectCreator/config/no_wchar.mpb: + + * bin/sandbox.cpp: + + * contrib/utility/Example/CommandLine/Foo/foo.cpp: + + * examples/APG/Config/ARGV_Example.cpp: + * examples/APG/Config/Get_Opt.cpp: + * examples/APG/Config/Get_Opt_Long.cpp: + * examples/APG/Config/HA_Status.cpp: + + * examples/APG/Logging/Callback-2.h: + + * examples/APG/Svc_Config/HA_Status_Dynamic.cpp: + * examples/APG/Svc_Config/HA_Status_Static.cpp: + + * examples/ASX/Event_Server/Event_Server/Options.cpp: + + * examples/ASX/Event_Server/Transceiver/transceiver.cpp: + + * examples/ASX/Message_Queue/buffer_stream.cpp: + + * examples/ASX/UPIPE_Event_Server/Options.cpp: + * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp: + + * examples/C++NPv1/Iterative_Logging_Server.cpp: + * examples/C++NPv1/Logging_Client.cpp: + * examples/C++NPv1/Logging_Handler.cpp: + * examples/C++NPv1/Logging_Server.cpp: + * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: + * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: + * examples/C++NPv1/Reactive_Logging_Server.cpp: + * examples/C++NPv1/Reactive_Logging_Server_Ex.cpp: + * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: + + * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: + * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: + * examples/C++NPv2/Client_Logging_Daemon.cpp: + * examples/C++NPv2/Logging_Event_Handler.cpp: + * examples/C++NPv2/Reactor_Logging_Server.cpp: + * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: + * examples/C++NPv2/Select_Reactor_Logging_Server.cpp: + * examples/C++NPv2/Service_Reporter.cpp: + * examples/C++NPv2/TP_Logging_Server.h: + * examples/C++NPv2/TP_Reactor_Logging_Server.cpp: + * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp: + * examples/C++NPv2/display_logfile.cpp: + + * examples/Connection/blocking/SPIPE-acceptor.cpp: + * examples/Connection/blocking/SPIPE-connector.cpp: + * examples/Connection/blocking/test_spipe_acceptor.cpp: + + * examples/Connection/misc/test_upipe.cpp: + + * examples/Connection/non_blocking/test_tli_acceptor.cpp: + * examples/Connection/non_blocking/test_tli_connector.cpp: + + * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: + + * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-client.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server.cpp: + + * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp: + * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp: + * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: + * examples/IPC_SAP/TLI_SAP/CPP-server.cpp: + * examples/IPC_SAP/TLI_SAP/db-client.cpp: + * examples/IPC_SAP/TLI_SAP/db-server.cpp: + * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: + * examples/IPC_SAP/TLI_SAP/ftp-server.cpp: + + * examples/Logger/Acceptor-server/server_loggerd.cpp: + + * examples/Logger/simple-server/Logging_Handler.cpp: + * examples/Logger/simple-server/server_loggerd.cpp: + + * examples/Mem_Map/IO-tests/test_io.cpp: + + * examples/Misc/test_get_opt.cpp: + + * examples/NT_Service/main.cpp: + + * examples/OS/Process/imore.cpp: + * examples/OS/Process/process.cpp: + + * examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp: + + * examples/QOS/Change_Sender_TSpec/QoS_Util.cpp: + + * examples/QOS/Simple/QoS_Util.cpp: + + * examples/Reactor/Misc/notification.cpp: + * examples/Reactor/Misc/pingpong.cpp: + * examples/Reactor/Misc/test_reactors.cpp: + * examples/Reactor/Misc/test_signals_2.cpp: + * examples/Reactor/Misc/test_time_value.cpp: + + * examples/Reactor/Multicast/Log_Wrapper.cpp: + * examples/Reactor/Multicast/client.cpp: + * examples/Reactor/Multicast/server.cpp: + + * examples/Reactor/Ntalker/ntalker.cpp: + + * examples/Reactor/Proactor/Aio_Platform_Test_C.cpp: + * examples/Reactor/Proactor/post_completions.cpp: + * examples/Reactor/Proactor/simple_test_proactor.cpp: + * examples/Reactor/Proactor/test_aiocb.cpp: + * examples/Reactor/Proactor/test_aiocb_ace.cpp: + * examples/Reactor/Proactor/test_aiosig.cpp: + * examples/Reactor/Proactor/test_aiosig_ace.cpp: + * examples/Reactor/Proactor/test_cancel.cpp: + * examples/Reactor/Proactor/test_end_event_loop.cpp: + * examples/Reactor/Proactor/test_multiple_loops.cpp: + * examples/Reactor/Proactor/test_proactor.cpp: + * examples/Reactor/Proactor/test_proactor2.cpp: + * examples/Reactor/Proactor/test_proactor3.cpp: + * examples/Reactor/Proactor/test_timeout.cpp: + * examples/Reactor/Proactor/test_udp_proactor.cpp: + + * examples/Reactor/WFMO_Reactor/Handle_Close.cpp: + * examples/Reactor/WFMO_Reactor/Multithreading.cpp: + * examples/Reactor/WFMO_Reactor/Talker.cpp: + + * examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp: + * examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp: + + * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i: + * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i: + * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i: + * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i: + * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i: + * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i: + * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i: + * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i: + * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i: + * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: + * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i: + + * examples/Shared_Malloc/Options.cpp: + * examples/Shared_Malloc/test_malloc.cpp: + * examples/Shared_Malloc/test_position_independent_malloc.cpp: + + * examples/Synch/proc_sema.cpp: + + * examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp: + * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: + * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: + + * examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp: + * examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp: + + * examples/TMCast/Member/member.cpp: + + * examples/Threads/process_manager.cpp: + * examples/Threads/reader_writer.cpp: + * examples/Threads/recursive_mutex.cpp: + * examples/Threads/task_one.cpp: + + * examples/Web_Crawler/Command_Processor.cpp: + * examples/Web_Crawler/HTTP_URL.cpp: + * examples/Web_Crawler/Options.cpp: + * examples/Web_Crawler/URL_Addr.cpp: + * examples/Web_Crawler/URL_Visitor.cpp: + + * netsvcs/clients/Naming/Client/Client_Test.cpp: + + * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: + * netsvcs/clients/Naming/Dump_Restore/createfile.cpp: + + * netsvcs/clients/Tokens/collection/collection.cpp: + * netsvcs/clients/Tokens/collection/rw_locks.cpp: + + * netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp: + + * netsvcs/clients/Tokens/invariant/invariant.cpp: + + * netsvcs/clients/Tokens/manual/manual.cpp: + + * netsvcs/clients/Tokens/mutex/test_mutex.cpp: + + * netsvcs/clients/Tokens/rw_lock/rw_locks.cpp: + + * netsvcs/lib/Client_Logging_Handler.cpp: + * netsvcs/lib/Name_Handler.cpp: + * netsvcs/lib/Server_Logging_Handler_T.cpp: + * netsvcs/lib/TS_Clerk_Handler.cpp: + * netsvcs/lib/TS_Server_Handler.cpp: + * netsvcs/lib/Token_Handler.cpp: + + * performance-tests/Misc/basic_perf.cpp: + * performance-tests/Misc/childbirth_time.cpp: + * performance-tests/Misc/context_switch_time.cpp: + * performance-tests/Misc/preempt.cpp: + * performance-tests/Misc/test_guard.cpp: + + * performance-tests/RPC/client.cpp: + + * performance-tests/SCTP/Options_Manager.cpp: + * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp: + * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp: + * performance-tests/SCTP/SOCK_STREAM_clt.cpp: + * performance-tests/SCTP/SOCK_STREAM_srv.cpp: + + * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp: + * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp: + + * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp: + * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp: + + * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp: + + * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp: + * performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp: + + * performance-tests/TCP/tcp_test.cpp: + + * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: + + * performance-tests/TTCP/C/new-ttcp.cpp: + + * performance-tests/UDP/udp_test.cpp: + + * protocols/ace/HTBP/HTBP_Addr.cpp: + * protocols/ace/HTBP/HTBP_ID_Requestor.cpp: + * protocols/ace/HTBP/HTBP_Session.cpp: + + * tests/ACE_Init_Test.cpp: + * tests/ARGV_Test.cpp: + * tests/Aio_Platform_Test.cpp: + * tests/Auto_Event_Test.cpp: + * tests/Basic_Types_Test.cpp: + * tests/Bound_Ptr_Test.cpp: + * tests/CDR_Array_Test.cpp: + * tests/CDR_File_Test.cpp: + * tests/CDR_Test.cpp: + * tests/Cache_Map_Manager_Test.cpp: + * tests/Cached_Accept_Conn_Test.cpp: + * tests/Cached_Conn_Test.cpp: + * tests/Config_Test.cpp: + * tests/Conn_Test.cpp: + * tests/Dirent_Test.cpp: + * tests/Enum_Interfaces_Test.cpp: + * tests/Env_Value_Test.cpp: + * tests/Get_Opt_Test.cpp: + + * tests/HTBP/Reactor_Tests/client.cpp: + * tests/HTBP/Reactor_Tests/test_config.h: + + * tests/HTBP/Send_Large_Msg/client.cpp: + + * tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp: + + * tests/HTBP/ping/client.cpp: + + * tests/Hash_Map_Bucket_Iterator_Test.cpp: + * tests/High_Res_Timer_Test.cpp: + * tests/INET_Addr_Test_IPV6.cpp: + * tests/IOStream_Test.cpp: + * tests/Log_Msg_Test.cpp: + * tests/Logging_Strategy_Test.cpp: + * tests/MEM_Stream_Test.cpp: + * tests/MT_Reactor_Upcall_Test.cpp: + * tests/MT_Reference_Counted_Event_Handler_Test.cpp: + * tests/MT_Reference_Counted_Notify_Test.cpp: + * tests/MT_SOCK_Test.cpp: + * tests/Manual_Event_Test.cpp: + * tests/Message_Block_Test.cpp: + * tests/Multicast_Test.cpp: + * tests/Multicast_Test_IPV6.cpp: + * tests/Multihomed_INET_Addr_Test_IPV6.cpp: + * tests/Network_Adapters_Test.cpp: + * tests/NonBlocking_Conn_Test.cpp: + * tests/Notify_Performance_Test.cpp: + * tests/OS_Test.cpp: + * tests/Pipe_Test.cpp: + * tests/Priority_Reactor_Test.cpp: + * tests/Proactor_Scatter_Gather_Test.cpp: + * tests/Proactor_Test.cpp: + * tests/Proactor_Test_IPV6.cpp: + * tests/Proactor_Timer_Test.cpp: + * tests/Process_Manager_Test.cpp: + * tests/Process_Manual_Event_Test.cpp: + * tests/Process_Mutex_Test.cpp: + * tests/Process_Semaphore_Test.cpp: + * tests/Process_Strategy_Test.cpp: + * tests/Reactor_Dispatch_Order_Test.cpp: + * tests/Reactor_Performance_Test.cpp: + * tests/Reactor_Timer_Test.cpp: + * tests/Reader_Writer_Test.cpp: + * tests/Refcounted_Auto_Ptr_Test.cpp: + * tests/Reference_Counted_Event_Handler_Test.cpp: + * tests/SOCK_Connector_Test.cpp: + * tests/SOCK_Dgram_Bcast_Test.cpp: + * tests/SOCK_Send_Recv_Test.cpp: + * tests/SOCK_Send_Recv_Test_IPV6.cpp: + * tests/SOCK_Test.cpp: + * tests/SOCK_Test_IPv6.cpp: + * tests/SString_Test.cpp: + * tests/Semaphore_Test.cpp: + * tests/Signal_Test.cpp: + * tests/Svc_Handler_Test.cpp: + * tests/TP_Reactor_Test.cpp: + * tests/Test_Output.cpp: + * tests/Thread_Pool_Reactor_Resume_Test.cpp: + * tests/Thread_Pool_Reactor_Test.cpp: + * tests/Timer_Queue_Reference_Counting_Test.cpp: + * tests/Upgradable_RW_Test.cpp: + * apps/mkcsregdb/mkcsregdb.cpp: + + Apply the new conversion macros. + Remove ACE_HAS_WCHAR usage. wchar_t will always get defined. + Using template ACE_Get_Arg_Opt to properly handle argv input. + Replaced main() with ACE_TMAIN(). + Using ACE_Argv_Type_Converter to convert argv to match API declarations. + + + * ace/ARGV.h: + * ace/ARGV.inl: + * ace/ARGV.cpp: + + Convert class ACE_ARGV into template ACE_TARGV + + + * ace/Arg_Shifter.h: + * ace/Arg_Shifter.inl: + * ace/Arg_Shifter.cpp: + + Convert class ACE_Arg_Shifter into template ACE_TArg_Shifter + + + * ace/Argv_Type_Converter.h: + * ace/Argv_Type_Converter.inl: + * ace/Argv_Type_Converter.cpp: + + Use ACE::String_Conversion templates to manage local memory + allocation/deallocation. Use the same for type conversions. Get + rid of macro ACE_USES_WCHAR usage. + + + * ace/Basic_Stats.h: + * ace/Basic_Stats.cpp: + + Add wide variant of method ACE_Basic_Stats::dump_results() + + + * ace/Basic_Types.h: + + Check for ACE_SIZEOF_WCHAR & ACE_WCHAR_MAX to be predefined. This + frees us from making assumptions on the underlying wchar_t type. + + + * ace/CDR_Base.h: + + The requirement for CDR customized wchar type is now isolated to + CDR. ACE_CDR_WCHAR_OVERRIDE is used to force CDR to deviate from + wchar_t. No other services in ACE deviates from wchar_t. + + + * ace/Get_Opt.h: + * ace/Get_Opt.inl: + * ace/Get_Opt.cpp: + + Convert class ACE_Get_Opt into template ACE_Get_Arg_Opt + + + * ace/OS_NS_ctype.h: + * ace/OS_NS_ctype.inl: + * ace/OS_NS_ctype_T.inl: + + Templated most of the functions. Add new file to hold the inlined + template definitions. + + + * ace/OS_NS_dlfcn.inl: + + Use ACE::String_Conversion templates to handle the wide char + conversions across platforms. + + + * ace/OS_NS_stdlib_base.h: + * ace/OS_NS_stdlib_base.inl: + * ace/OS_NS_stdlib_base.cpp: + * ace/OS_NS_string_base.h: + * ace/OS_NS_string_base.inl: + * ace/OS_NS_string_base.cpp: + + Extracted a number of methods from OS_NS_stdlib to maintain + backwards compatibility and have the string conversion classes + reuse exising functions (not reimplement). The string conversion + classes have to be declared in the configuration layer for + backwards compatibility. Users will not have to change/add #include + to access the conversion services. + + + * ace/OS_NS_string.h: + * ace/OS_NS_string.inl: + * ace/OS_NS_string.cpp: + + Define/implement wide variant of functions for platforms that lack them. + + + * ace/OS_NS_unistd.h: + * ace/OS_NS_unistd.inl: + * ace/OS_NS_unistd.cpp: + * ace/OS_NS_unistd_T.inl: + + Templated string_to_argv. Moved definition to new file. + + + * ace/OS_NS_wchar.h: + * ace/OS_NS_wchar.inl: + * ace/OS_NS_wchar.cpp: + + Changed APIs to use type wchar_t instead of WChar. There was no + reason for using another defined type when wchar_t could be used directly. + + + * ace/Stats.h: + * ace/Stats.cpp: + + Define/implement wide variant of dump_results() & dump_throughput() + + + * ace/String_Conversion_T.h: + * ace/String_Conversion_T.inl: + * ace/String_Conversion_T.cpp: + + The new string conversion namespace includes a set of functions + and stack based classes to aid where ACE/TAO has to translate + between char and wchar_t. See the ACE test wchar_conversion for + usage. + + + * ace/ace_wchar.h: + * ace/ace_wchar.inl: + + Configuration level files which include wchar support files or + construct the various wchar types. + + + * ace/ace_wchar_win32_defs.h: + + Support for Windows specific API's. These were mostly if not all + ripped out from ace_wchar.h. ace_wchar.h includes the file. + + + * ace/config-all.h: + * ace/config-borland-common.h: + * ace/config-doxygen.h: + * ace/config-freebsd.h: + * ace/config-hpux-11.00.h: + * ace/config-linux-common.h: + * ace/config-lynxos.h: + * ace/config-macosx-panther.h: + * ace/config-macosx-tiger.h: + * ace/config-macosx.h: + * ace/config-netbsd.h: + * ace/config-pharlap.h: + * ace/config-rtems.h: + * ace/config-tandem-nsk-mips-v2.h: + * ace/config-vxworks5.x.h: + * ace/config-win32-common.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-mingw.h: + * ace/config-win32-msvc-7.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc.h: + * ace/config-win32-visualage.h: + + Added new wchar configurations. The ACE_SIZEOF_WCHAR and + ACE_WCHAR_MAX need to be defined in the configuration files. + + + * apps/gperf/tests/tests.mpc: + + Avoid gperf build when doing a ACE_USES_WCHAR build. + + * tests/WChar_Conversion.cpp: + + wchar conversion test. + + + * tests/tests.mpc: + + Add the wchar conversion test. + Sun May 7 21:03:30 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * ace/Service_Config.{h,cpp}: diff --git a/Kokyu/tests/EDF/test.cpp b/Kokyu/tests/EDF/test.cpp index 0c6939ee613..b6bbe66a35c 100644 --- a/Kokyu/tests/EDF/test.cpp +++ b/Kokyu/tests/EDF/test.cpp @@ -145,7 +145,7 @@ int parse_args (int argc, ACE_TCHAR *argv[]) switch (c) { case 'p': - sched_policy_str = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()); + sched_policy_str = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ()); break; case '?': diff --git a/Kokyu/tests/FIFO/test.cpp b/Kokyu/tests/FIFO/test.cpp index deb25823a3b..fcda380ded6 100644 --- a/Kokyu/tests/FIFO/test.cpp +++ b/Kokyu/tests/FIFO/test.cpp @@ -149,7 +149,7 @@ int parse_args (int argc, ACE_TCHAR *argv[]) switch (c) { case 'p': - sched_policy_str = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()); + sched_policy_str = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ()); break; case '?': diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp index 633697c0641..73348aca4eb 100644 --- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp +++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp @@ -30,7 +30,7 @@ using namespace CCF::CIDL; using namespace CCF::CIDL::SemanticGraph; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/CIAO/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp index 1afeb08b859..d3a1ed91885 100644 --- a/TAO/CIAO/CIDLC/cidlc.cpp +++ b/TAO/CIAO/CIDLC/cidlc.cpp @@ -78,7 +78,7 @@ using namespace CCF::CIDL; using namespace CCF::CIDL::SemanticGraph; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp index 545da80c14b..3dd81859fa5 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp +++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp @@ -26,7 +26,7 @@ namespace CIAO bool parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:np:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:n:p"); int c; while ((c = get_opts ()) != -1) switch (c) @@ -268,7 +268,7 @@ namespace CIAO } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { return CIAO::Execution_Manager::run_main (argc, argv); diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp index 57228b96ed8..26d63d109e9 100644 --- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp +++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp @@ -13,7 +13,7 @@ void print_arg (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp index 5cad11e47b9..d835d8b9ba6 100644 --- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp +++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp @@ -26,7 +26,7 @@ int spawn_delay = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:c:m:s:d:na:p:z:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:m:s:d:na:p:z:"); int c; while ((c = get_opts ()) != -1) @@ -158,7 +158,7 @@ register_with_ns (const char * name_context, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp index 141e1ff7e9a..faa2d6a8eb5 100644 --- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp +++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp @@ -54,7 +54,7 @@ namespace CIAO parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, + ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("p:nk:t:o:i:r:h")); int c; diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp index 86e56f99cb3..2bdc40ffff1 100644 --- a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp +++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp @@ -10,7 +10,7 @@ parse_args (int argc, char *argv[], CIAO::NodeApplication_Task::Options &opts) { - ACE_Get_Opt get_opts (argc, argv, "nk:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "nk:o:"); int c; while ((c = get_opts ()) != -1) @@ -96,7 +96,7 @@ check_supported_priorities (CORBA::ORB_ptr orb) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc index 2cc04a9a18a..81004d6b00d 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc @@ -62,7 +62,7 @@ project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc { } } -project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc, ciao_events_dnc, ciao_server_dnc { +project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc { after += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt sharedname = NodeAppTest_RoundTrip_exec diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp index 21502bb63a6..c371f277a43 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp @@ -18,7 +18,7 @@ int counter = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -47,7 +47,7 @@ int parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { std::vector<NodeAppTest::NodeAppTest_RoundTrip_var> comp_list; //std::vector<NodeAppTest::NodeAppTest_RoundTrip_var>::const_iterator iter; diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp index d984de8860b..90cafe7eee5 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp @@ -11,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,7 +35,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp index 8b6d23887fb..be98bf4ce1c 100644 --- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp +++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp @@ -11,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,7 +35,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp index 330b4419477..4c284e26fb0 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp @@ -17,7 +17,7 @@ const char *unsubscribe_name = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:s:u:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:s:u:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +52,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp index 9332d1a3e0c..3ba0c93cf81 100644 --- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp +++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp @@ -17,7 +17,7 @@ int turn_on = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:r:of"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of"); int c; while ((c = get_opts ()) != -1) @@ -58,7 +58,7 @@ parse_args (int argc, char *argv[]) } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/examples/BasicSP/EC/client.cpp b/TAO/CIAO/examples/BasicSP/EC/client.cpp index 2c2f34118bc..7b3c62c776f 100644 --- a/TAO/CIAO/examples/BasicSP/EC/client.cpp +++ b/TAO/CIAO/examples/BasicSP/EC/client.cpp @@ -16,7 +16,7 @@ #include "ace/OS_NS_unistd.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/examples/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/BasicSP/EC/controller.cpp index d52ac54dba9..0bd9a112e7f 100644 --- a/TAO/CIAO/examples/BasicSP/EC/controller.cpp +++ b/TAO/CIAO/examples/BasicSP/EC/controller.cpp @@ -18,7 +18,7 @@ int turn_on = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:r:of"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of"); int c; while ((c = get_opts ()) != -1) @@ -70,7 +70,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/examples/Display/RateGen/controller.cpp b/TAO/CIAO/examples/Display/RateGen/controller.cpp index f90ee66e797..3f2fa87298f 100644 --- a/TAO/CIAO/examples/Display/RateGen/controller.cpp +++ b/TAO/CIAO/examples/Display/RateGen/controller.cpp @@ -19,7 +19,7 @@ int turn_on = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:r:of"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of"); int c; while ((c = get_opts ()) != -1) @@ -67,7 +67,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/examples/Hello/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp index 7c647ef01dd..3577fcee991 100644 --- a/TAO/CIAO/examples/Hello/Sender/starter.cpp +++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp @@ -11,7 +11,7 @@ const char * message = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:m:"); int c = 0; while ((c = get_opts ()) != -1) @@ -47,7 +47,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/examples/Swapping/Sender/starter.cpp b/TAO/CIAO/examples/Swapping/Sender/starter.cpp index c88771ea568..82005cfe9aa 100644 --- a/TAO/CIAO/examples/Swapping/Sender/starter.cpp +++ b/TAO/CIAO/examples/Swapping/Sender/starter.cpp @@ -11,7 +11,7 @@ const char * message = "starters message"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:m"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:m"); int c = 0; while ((c = get_opts ()) != -1) @@ -48,7 +48,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp index 7eba8595527..4be012c571d 100644 --- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp @@ -25,7 +25,7 @@ const char *ior4 = "file://comp4.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp index 08bd7c111d9..15dc1c5d5ed 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp @@ -30,7 +30,7 @@ int parse_args (int argc, char *argv[]) { //parse arguments - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); char c; while ((c = get_opts ()) != -1) switch (c) @@ -83,7 +83,7 @@ set_priority () int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp index 2df894b41c1..b4b6d285e1b 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp @@ -18,7 +18,7 @@ const char *ior = "file://test.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp index c6f2f81ae0c..8e6b863386a 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp @@ -9,7 +9,7 @@ const char *ior_output_file = "rtserver.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/CIAO/performance-tests/Benchmark/server.cpp b/TAO/CIAO/performance-tests/Benchmark/server.cpp index 345610c1eb2..e76dc23daf9 100644 --- a/TAO/CIAO/performance-tests/Benchmark/server.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/server.cpp @@ -10,7 +10,7 @@ const char *ior_output_file = "test.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp index 2ea3c57a1c3..f88e97c5fe5 100644 --- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp +++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp @@ -29,7 +29,7 @@ static const char *test_type = "PACED"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:"); int c; while ((c = get_opts ()) != -1) @@ -150,7 +150,7 @@ parse_args (int argc, char **argv) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp index 15fabe1f34a..cf31d9bb0b5 100644 --- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp +++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp @@ -16,7 +16,7 @@ static const char *input_file = "BasicSP.cdp"; static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:"); int c; @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) using namespace CIAO::Config_Handlers; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) diff --git a/TAO/CIAO/tools/Config_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/test.cpp index 8c968d1c63f..ba951491409 100644 --- a/TAO/CIAO/tools/Config_Handlers/test.cpp +++ b/TAO/CIAO/tools/Config_Handlers/test.cpp @@ -16,7 +16,7 @@ static const char *input_file = "BasicSP.cdp"; static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:"); int c; @@ -45,7 +45,7 @@ void check_srd (const Deployment::DeploymentPlan &); using namespace CIAO::Config_Handlers; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7e704a6573a..e02102820ed 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,1921 @@ +Fri May 5 15:47:05 2006 Ciju John <john_c@ociweb.com> + + This entry deals with the refactoring work on the ACE wide char + support specifically how it affects the TAO & orbservices. See + entry + Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com> + + The most significant change was the addition of string_dup's + that perform conversion. Much of the char type points of + transition are between narrow TAO services and TCHAR-as-wide Orb + Services. + + The orbservices were NOT redesigned to be specifically char, + wchar, or ACE_TCHAR. Changes were made solely to make + ACE_USES_WCHAR work. Conversions were added in the appropriate + places. All mains are now ACE_TMAINS. + + + * TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp: + + * TAO/CIAO/CIDLC/cidlc.cpp: + + * TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp: + + * TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp: + + * TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp: + + * TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp: + + * TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp: + + * TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: + * TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp: + * TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: + * TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp: + + * TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp: + + * TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp: + + * TAO/CIAO/examples/BasicSP/EC/client.cpp: + * TAO/CIAO/examples/BasicSP/EC/controller.cpp: + + * TAO/CIAO/examples/Display/RateGen/controller.cpp: + + * TAO/CIAO/examples/Hello/Sender/starter.cpp: + + * TAO/CIAO/examples/Swapping/Sender/starter.cpp: + + * TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp: + + * TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp: + + * TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp: + + * TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp: + + * TAO/CIAO/performance-tests/Benchmark/server.cpp: + + * TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp: + + * TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp: + + * TAO/CIAO/tools/Config_Handlers/test.cpp: + + * TAO/TAO_IDL/ast/ast_generator.cpp: + + * TAO/TAO_IDL/fe/fe_init.cpp: + + * TAO/TAO_IDL/tao_idl.mpc: + * TAO/TAO_IDL/tao_idl.cpp: + + * TAO/docs/tutorials/Quoter/AMI/client.cpp: + * TAO/docs/tutorials/Quoter/AMI/server.cpp: + + * TAO/docs/tutorials/Quoter/Event_Service/client.cpp: + * TAO/docs/tutorials/Quoter/Event_Service/server.cpp: + + * TAO/docs/tutorials/Quoter/Naming_Service/client.cpp: + * TAO/docs/tutorials/Quoter/Naming_Service/server.cpp: + + * TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp: + * TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp: + + * TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp: + * TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp: + + * TAO/docs/tutorials/Quoter/Simple/Client/client.cpp: + + * TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp: + * TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp: + + * TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp: + + * TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp: + * TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp: + + * TAO/docs/tutorials/Quoter/Simple/Server/server.cpp: + + * TAO/examples/AMH/Sink_Server/AMH_Servant.cpp: + * TAO/examples/AMH/Sink_Server/Base_Server.cpp: + * TAO/examples/AMH/Sink_Server/Client_Task.cpp: + * TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp: + * TAO/examples/AMH/Sink_Server/client.cpp: + * TAO/examples/AMH/Sink_Server/mt_server.cpp: + * TAO/examples/AMH/Sink_Server/st_server.cpp: + + * TAO/examples/AMI/FL_Callback/peer.cpp: + * TAO/examples/AMI/FL_Callback/progress.cpp: + + * TAO/examples/Advanced/ch_12/client.cpp: + * TAO/examples/Advanced/ch_12/server.cpp: + + * TAO/examples/Advanced/ch_18/client.cpp: + * TAO/examples/Advanced/ch_18/server.cpp: + + * TAO/examples/Advanced/ch_21/client.cpp: + * TAO/examples/Advanced/ch_21/server.cpp: + + * TAO/examples/Advanced/ch_3/client.cpp: + * TAO/examples/Advanced/ch_3/server.cpp: + + * TAO/examples/Advanced/ch_8_and_10/client.cpp: + * TAO/examples/Advanced/ch_8_and_10/server.cpp: + + * TAO/examples/Buffered_AMI/client.cpp: + * TAO/examples/Buffered_AMI/server.cpp: + + * TAO/examples/Buffered_Oneways/client.cpp: + * TAO/examples/Buffered_Oneways/server.cpp: + + * TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp: + + * TAO/examples/Callback_Quoter/Consumer_Handler.cpp: + * TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp: + * TAO/examples/Callback_Quoter/Supplier_i.cpp: + * TAO/examples/Callback_Quoter/consumer.cpp: + * TAO/examples/Callback_Quoter/notifier.cpp: + * TAO/examples/Callback_Quoter/supplier.cpp: + * TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp: + * TAO/examples/Content_Server/AMI_Iterator/client.cpp: + * TAO/examples/Content_Server/AMI_Iterator/server.cpp: + + * TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp: + * TAO/examples/Content_Server/AMI_Observer/client.cpp: + * TAO/examples/Content_Server/AMI_Observer/server.cpp: + + * TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp: + * TAO/examples/Content_Server/SMI_Iterator/client.cpp: + * TAO/examples/Content_Server/SMI_Iterator/server.cpp: + + * TAO/examples/Event_Comm/consumer.cpp: + * TAO/examples/Event_Comm/notifier.cpp: + * TAO/examples/Event_Comm/supplier.cpp: + + * TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h: + * TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp: + + * TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp: + + * TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp: + + * TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp: + * TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp: + + * TAO/examples/Load_Balancing/Identity_Client.cpp: + * TAO/examples/Load_Balancing/Identity_Server.cpp: + * TAO/examples/Load_Balancing/Load_Balancing_Service.cpp: + + * TAO/examples/Load_Balancing_persistent/Identity_Client.cpp: + * TAO/examples/Load_Balancing_persistent/Identity_Server.cpp: + * TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp: + * TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp: + + * TAO/examples/Logging/Logger_i.cpp: + * TAO/examples/Logging/Logging_Service.cpp: + * TAO/examples/Logging/Logging_Service_i.cpp: + * TAO/examples/Logging/Logging_Test.cpp: + * TAO/examples/Logging/Logging_Test_i.cpp: + + * TAO/examples/OBV/Simple_util.cpp: + + * TAO/examples/OBV/Typed_Events/Client_i.cpp: + * TAO/examples/OBV/Typed_Events/client.cpp: + * TAO/examples/OBV/Typed_Events/server.cpp: + + * TAO/examples/POA/Adapter_Activator/server.cpp: + + * TAO/examples/POA/DSI/client.cpp: + * TAO/examples/POA/DSI/server.cpp: + + * TAO/examples/POA/Default_Servant/client.cpp: + * TAO/examples/POA/Default_Servant/server.cpp: + + * TAO/examples/POA/Explicit_Activation/server.cpp: + + * TAO/examples/POA/FindPOA/FindPOA.cpp: + + * TAO/examples/POA/Forwarding/client.cpp: + * TAO/examples/POA/Forwarding/server.cpp: + + * TAO/examples/POA/Generic_Servant/client.cpp: + + * TAO/examples/POA/Loader/Servant_Activator.cpp: + * TAO/examples/POA/Loader/Servant_Locator.cpp: + * TAO/examples/POA/Loader/Server_Manager.cpp: + * TAO/examples/POA/Loader/server.cpp: + + * TAO/examples/POA/NewPOA/NewPOA.cpp: + + * TAO/examples/POA/On_Demand_Activation/server.cpp: + + * TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp: + * TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp: + * TAO/examples/POA/On_Demand_Loading/server.cpp: + + * TAO/examples/POA/POA_BiDir/POA_BiDir.cpp: + + * TAO/examples/POA/Reference_Counted_Servant/server.cpp: + + * TAO/examples/POA/RootPOA/RootPOA.cpp: + + * TAO/examples/POA/TIE/client.cpp: + * TAO/examples/POA/TIE/server.cpp: + + * TAO/examples/Persistent_Grid/Grid_Client_i.cpp: + * TAO/examples/Persistent_Grid/Grid_i.cpp: + * TAO/examples/Persistent_Grid/Persistent_Client_i.cpp: + * TAO/examples/Persistent_Grid/Simple_util.cpp: + * TAO/examples/Persistent_Grid/client.cpp: + * TAO/examples/Persistent_Grid/persistent_client.cpp: + * TAO/examples/Persistent_Grid/server.cpp: + + * TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp: + * TAO/examples/PluggableUDP/tests/Basic/client.cpp: + * TAO/examples/PluggableUDP/tests/Basic/server.cpp: + + * TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp: + * TAO/examples/PluggableUDP/tests/Performance/client.cpp: + * TAO/examples/PluggableUDP/tests/Performance/server.cpp: + + * TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp: + * TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp: + + * TAO/examples/Quoter/Factory_Finder.cpp: + * TAO/examples/Quoter/Generic_Factory.cpp: + * TAO/examples/Quoter/client.cpp: + * TAO/examples/Quoter/server.cpp: + + * TAO/examples/RTCORBA/Activity/Activity.cpp: + * TAO/examples/RTCORBA/Activity/Builder.h: + * TAO/examples/RTCORBA/Activity/Builder.cpp: + * TAO/examples/RTCORBA/Activity/Job_i.h: + * TAO/examples/RTCORBA/Activity/Job_i.cpp: + * TAO/examples/RTCORBA/Activity/POA_Holder.h: + * TAO/examples/RTCORBA/Activity/POA_Holder.cpp: + * TAO/examples/RTCORBA/Activity/Periodic_Task.h: + * TAO/examples/RTCORBA/Activity/Periodic_Task.cpp: + * TAO/examples/RTCORBA/Activity/Task_Stats.h: + * TAO/examples/RTCORBA/Activity/Task_Stats.cpp: + + * TAO/examples/RTScheduling/DT_Creator.h: + * TAO/examples/RTScheduling/DT_Creator.cpp: + + * TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp: + * TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp: + + * TAO/examples/RTScheduling/Job_i.h: + * TAO/examples/RTScheduling/Job_i.cpp: + + * TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp: + * TAO/examples/RTScheduling/MIF_Scheduler/test.cpp: + + * TAO/examples/RTScheduling/POA_Holder.h: + * TAO/examples/RTScheduling/POA_Holder.cpp: + * TAO/examples/RTScheduling/Starter.cpp: + * TAO/examples/RTScheduling/Task_Stats.h: + * TAO/examples/RTScheduling/Task_Stats.cpp: + * TAO/examples/RTScheduling/Thread_Task.cpp: + + * TAO/examples/Simple/Simple_util.cpp: + + * TAO/examples/Simple/bank/client.cpp: + * TAO/examples/Simple/bank/server.cpp: + + * TAO/examples/Simple/chat/Client_i.cpp: + * TAO/examples/Simple/chat/Server_i.cpp: + * TAO/examples/Simple/chat/client.cpp: + * TAO/examples/Simple/chat/server.cpp: + + * TAO/examples/Simple/echo/client.cpp: + * TAO/examples/Simple/echo/server.cpp: + + * TAO/examples/Simple/grid/Grid_Client_i.cpp: + * TAO/examples/Simple/grid/client.cpp: + * TAO/examples/Simple/grid/server.cpp: + + * TAO/examples/Simple/time-date/Time_Date.cpp: + * TAO/examples/Simple/time-date/client.cpp: + * TAO/examples/Simple/time-date/server.cpp: + + * TAO/examples/Simple/time/Time_Client_i.cpp: + * TAO/examples/Simple/time/client.cpp: + * TAO/examples/Simple/time/server.cpp: + + * TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp: + * TAO/examples/Simulator/Event_Supplier/Event_Con.cpp: + * TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp: + * TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp: + + * TAO/examples/TypeCode_Creation/main.cpp: + + * TAO/examples/ior_corbaloc/client.cpp: + * TAO/examples/ior_corbaloc/corbaname_client.cpp: + * TAO/examples/ior_corbaloc/server.cpp: + + * TAO/examples/mfc/client.cpp: + + * TAO/interop-tests/wchar/client.cpp: + * TAO/interop-tests/wchar/server.cpp: + * TAO/interop-tests/wchar/wchar_reference.h: + * TAO/interop-tests/wchar/wchar_reference.cpp: + + * TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h: + * TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp: + + * TAO/orbsvcs/Event_Service/Event_Service.cpp: + + * TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp: + + * TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp: + * TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp: + + * TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp: + + * TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp: + * TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp: + * TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp: + * TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp: + * TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp: + + * TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp: + + * TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp: + + * TAO/orbsvcs/IFR_Service/IFR_Server.cpp: + * TAO/orbsvcs/IFR_Service/IFR_Service.mpc: + + * TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h: + * TAO/orbsvcs/ImplRepo_Service/Activator_Options.h: + * TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp: + + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp: + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h: + * TAO/orbsvcs/ImplRepo_Service/Locator_Options.h: + * TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp: + * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h: + * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp: + * TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h: + * TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp: + * TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h: + * TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp: + + * TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp: + * TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp: + + * TAO/orbsvcs/LoadBalancer/LoadManager.cpp: + * TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp: + + * TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h: + * TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp: + + * TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h: + * TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp: + + * TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h: + * TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp: + + * TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h: + * TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp: + + * TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp: + * TAO/orbsvcs/Naming_Service/NT_Naming_Service.h: + * TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp: + * TAO/orbsvcs/Naming_Service/Naming_Service.cpp: + + * TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp: + * TAO/orbsvcs/Notify_Service/NT_Notify_Service.h: + * TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp: + * TAO/orbsvcs/Notify_Service/Notify_Service.h: + * TAO/orbsvcs/Notify_Service/Notify_Service.cpp: + + * TAO/orbsvcs/PSS/psdl_tao.cpp: + + * TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp: + + * TAO/orbsvcs/Time_Service/Clerk_i.cpp: + * TAO/orbsvcs/Time_Service/Server_i.cpp: + + * TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp: + * TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h: + * TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp: + * TAO/orbsvcs/examples/CosEC/Factory/main.cpp: + + * TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h: + * TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp: + + * TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp: + + * TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h: + * TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp: + * TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h: + * TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp: + * TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h: + * TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp: + + * TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp: + * TAO/orbsvcs/examples/CosEC/Simple/Service.cpp: + * TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp: + + * TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp: + * TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp: + + * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp: + * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp: + + * TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp: + * TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp: + * TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp: + * TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp: + * TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp: + + * TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp: + * TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp: + * TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h: + * TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp: + * TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp: + * TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp: + + * TAO/orbsvcs/examples/LoadBalancing/client.cpp: + * TAO/orbsvcs/examples/LoadBalancing/server.cpp: + + * TAO/orbsvcs/examples/Log/Basic/TLS_Client.h: + * TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp: + * TAO/orbsvcs/examples/Log/Basic/main.cpp: + + * TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp: + * TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp: + + * TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp: + * TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp: + + * TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp: + * TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp: + + * TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: + + * TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp: + + * TAO/orbsvcs/examples/Notify/Filter/Filter.h: + * TAO/orbsvcs/examples/Notify/Filter/Filter.cpp: + * TAO/orbsvcs/examples/Notify/Filter/main.cpp: + + * TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp: + * TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp: + + * TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h: + * TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp: + * TAO/orbsvcs/examples/Notify/Subscribe/main.cpp: + + * TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp: + * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp: + + * TAO/orbsvcs/examples/ORT/client.cpp: + * TAO/orbsvcs/examples/ORT/gateway_server.cpp: + * TAO/orbsvcs/examples/ORT/server.cpp: + + * TAO/orbsvcs/examples/PSS/Simple_Naming.cpp: + * TAO/orbsvcs/examples/PSS/client.cpp: + * TAO/orbsvcs/examples/PSS/server.cpp: + + * TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp: + * TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp: + * TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp: + * TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp: + + * TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp: + + * TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp: + + * TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp: + + * TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp: + * TAO/orbsvcs/examples/RtEC/Simple/Service.cpp: + * TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp: + + * TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp: + * TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp: + + * TAO/orbsvcs/examples/Security/Send_File/client.cpp: + * TAO/orbsvcs/examples/Security/Send_File/server.cpp: + + * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + * TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: + * TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp: + * TAO/orbsvcs/orbsvcs/AV/TCP.cpp: + * TAO/orbsvcs/orbsvcs/AV/UDP.cpp: + + * TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h: + * TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp: + + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp: + + * TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h: + * TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h: + * TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h: + * TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp: + + * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp: + + * TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp: + + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp: + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp: + + * TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl: + * TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp: + + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp: + + * TAO/orbsvcs/orbsvcs/IFRService/Options.cpp: + + * TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp: + + * TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp: + + * TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp: + + * TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp: + * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp: + + * TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp: + * TAO/orbsvcs/orbsvcs/Notify/EventType.cpp: + * TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp: + * TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h: + * TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp: + * TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp: + * TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp: + + * TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h: + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp: + + * TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: + + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h: + * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp: + + * TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp: + + * TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp: + + * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp: + * TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp: + + * TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp: + * TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp: + + * TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp: + * TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp: + + * TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp: + + * TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp: + + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp: + + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp: + + * TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp: + + * TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp: + * TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp: + + * TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h: + * TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp: + + * TAO/orbsvcs/performance-tests/perf.mwc: + + * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp: + * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp: + * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h: + * TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h: + * TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp: + + * TAO/orbsvcs/tests/AVStreams/Latency/control.cpp: + * TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp: + * TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp: + + * TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h: + * TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Multicast/server.h: + * TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp: + + * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h: + * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h: + * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp: + + * TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h: + * TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp: + * TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp: + + * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp: + + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp: + * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp: + + * TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp: + + * TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp: + + * TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp: + + * TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp: + * TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp: + + * TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp: + + * TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp: + + * TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp: + * TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp: + + * TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc: + * TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp: + * TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp: + + * TAO/orbsvcs/tests/Concurrency/CC_client.h: + * TAO/orbsvcs/tests/Concurrency/CC_client.cpp: + + * TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp: + * TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp: + * TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp: + * TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp: + * TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp: + * TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp: + + * TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp: + * TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp: + + * TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp: + * TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp: + * TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp: + + * TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: + + * TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + + * TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp: + * TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp: + * TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp: + * TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp: + * TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: + + * TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp: + * TAO/orbsvcs/tests/Event/Basic/BCast.cpp: + * TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp: + * TAO/orbsvcs/tests/Event/Basic/Complex.cpp: + * TAO/orbsvcs/tests/Event/Basic/Control.cpp: + * TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp: + * TAO/orbsvcs/tests/Event/Basic/Gateway.cpp: + * TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp: + * TAO/orbsvcs/tests/Event/Basic/Negation.cpp: + * TAO/orbsvcs/tests/Event/Basic/Observer.h: + * TAO/orbsvcs/tests/Event/Basic/Observer.cpp: + * TAO/orbsvcs/tests/Event/Basic/Random.cpp: + * TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp: + * TAO/orbsvcs/tests/Event/Basic/Schedule.h: + * TAO/orbsvcs/tests/Event/Basic/Schedule.cpp: + * TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp: + * TAO/orbsvcs/tests/Event/Basic/Timeout.cpp: + * TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp: + + * TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp: + + * TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp: + * TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp: + * TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp: + + * TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp: + * TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp: + * TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp: + + * TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp: + * TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp: + + * TAO/orbsvcs/tests/Event/Performance/Connect.cpp: + * TAO/orbsvcs/tests/Event/Performance/Inversion.cpp: + * TAO/orbsvcs/tests/Event/Performance/Latency.cpp: + * TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp: + * TAO/orbsvcs/tests/Event/Performance/Throughput.cpp: + + * TAO/orbsvcs/tests/Event/lib/Driver.cpp: + + * TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp: + * TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp: + * TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp: + * TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp: + * TAO/orbsvcs/tests/FT_App/FT_Client.cpp: + * TAO/orbsvcs/tests/FT_App/FT_Creator.cpp: + * TAO/orbsvcs/tests/FT_App/FT_Replica.cpp: + * TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp: + * TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp: + * TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp: + * TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp: + * TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp: + * TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp: + * TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp: + * TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp: + * TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp: + + * TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp: + * TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp: + + * TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp: + * TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp: + + * TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp: + + * TAO/orbsvcs/tests/FtRtEvent/consumer.cpp: + * TAO/orbsvcs/tests/FtRtEvent/supplier.cpp: + + * TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/AMI/client.cpp: + * TAO/orbsvcs/tests/HTIOP/AMI/server.cpp: + * TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp: + + * TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp: + * TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp: + + * TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/Hello/client.cpp: + * TAO/orbsvcs/tests/HTIOP/Hello/server.cpp: + + * TAO/orbsvcs/tests/HTIOP/test_config.h: + + * TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc: + * TAO/orbsvcs/tests/IOR_MCast/client.cpp: + * TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp: + * TAO/orbsvcs/tests/IOR_MCast/server.cpp: + * TAO/orbsvcs/tests/IOR_MCast/server_i.cpp: + + * TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc: + + * TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp: + + * TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp: + * TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp: + * TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp: + * TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp: + * TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp: + * TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp: + + * TAO/orbsvcs/tests/ImplRepo/scale/client.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale/server.cpp: + * TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp: + + * TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp: + + * TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp: + + * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp: + + * TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp: + + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp: + * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp: + + * TAO/orbsvcs/tests/Interoperable_Naming/client.cpp: + * TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp: + + * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp: + * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp: + * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp: + + * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp: + * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp: + * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp: + + * TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp: + + * TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp: + + * TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp: + * TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp: + + * TAO/orbsvcs/tests/Miop/McastHello/client.cpp: + * TAO/orbsvcs/tests/Miop/McastHello/server.cpp: + + * TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp: + * TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h: + * TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp: + * TAO/orbsvcs/tests/Notify/Basic/Events.h: + * TAO/orbsvcs/tests/Notify/Basic/Events.cpp: + * TAO/orbsvcs/tests/Notify/Basic/Filter.h: + * TAO/orbsvcs/tests/Notify/Basic/Filter.cpp: + * TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp: + * TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp: + * TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h: + * TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp: + * TAO/orbsvcs/tests/Notify/Basic/Sequence.h: + * TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp: + * TAO/orbsvcs/tests/Notify/Basic/Simple.h: + * TAO/orbsvcs/tests/Notify/Basic/Simple.cpp: + * TAO/orbsvcs/tests/Notify/Basic/Updates.h: + * TAO/orbsvcs/tests/Notify/Basic/Updates.cpp: + * TAO/orbsvcs/tests/Notify/Basic/run_test.pl: + + * TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Destroy/main.cpp: + + * TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp: + * TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Driver/main.cpp: + + * TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp: + * TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp: + + * TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h: + * TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp: + + * TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp: + + * TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp: + + * TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h: + * TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp: + * TAO/orbsvcs/tests/Notify/lib/Application_Command.h: + * TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/Command.h: + * TAO/orbsvcs/tests/Notify/lib/Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/Command_Builder.h: + * TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp: + * TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h: + * TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/Driver.h: + * TAO/orbsvcs/tests/Notify/lib/Driver.cpp: + * TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h: + * TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/Filter_Command.h: + * TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/Name.h: + * TAO/orbsvcs/tests/Notify/lib/Name.cpp: + * TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h: + * TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp: + * TAO/orbsvcs/tests/Notify/lib/Options_Parser.h: + * TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp: + * TAO/orbsvcs/tests/Notify/lib/Peer.h: + * TAO/orbsvcs/tests/Notify/lib/Peer.cpp: + * TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h: + * TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h: + * TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp: + * TAO/orbsvcs/tests/Notify/lib/Task_Stats.h: + * TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp: + + * TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp: + * TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp: + * TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp: + + * TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h: + * TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp: + * TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp: + + * TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h: + * TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: + + * TAO/orbsvcs/tests/Property/client.h: + * TAO/orbsvcs/tests/Property/client.cpp: + * TAO/orbsvcs/tests/Property/main.cpp: + * TAO/orbsvcs/tests/Property/server.cpp: + + * TAO/orbsvcs/tests/RTCosScheduling/client.cpp: + * TAO/orbsvcs/tests/RTCosScheduling/server.cpp: + + * TAO/orbsvcs/tests/Redundant_Naming/client.cpp: + + * TAO/orbsvcs/tests/Sched/DynSched_Test.cpp: + + * TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp: + * TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp: + * TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp: + + * TAO/orbsvcs/tests/Security/BiDirectional/client.cpp: + * TAO/orbsvcs/tests/Security/BiDirectional/server.cpp: + + * TAO/orbsvcs/tests/Security/Big_Request/client.cpp: + * TAO/orbsvcs/tests/Security/Big_Request/server.cpp: + + * TAO/orbsvcs/tests/Security/Callback/client.cpp: + * TAO/orbsvcs/tests/Security/Callback/server.cpp: + + * TAO/orbsvcs/tests/Security/Crash_Test/client.cpp: + * TAO/orbsvcs/tests/Security/Crash_Test/server.cpp: + + * TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp: + * TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp: + + * TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp: + * TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: + * TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp: + + * TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp: + * TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp: + + * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp: + + * TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc: + * TAO/orbsvcs/tests/Simple_Naming/client.cpp: + + * TAO/orbsvcs/tests/Time/Client_i.cpp: + * TAO/orbsvcs/tests/Time/client.cpp: + + * TAO/orbsvcs/tests/Trading/Offer_Importer.cpp: + * TAO/orbsvcs/tests/Trading/TT_Info.h: + * TAO/orbsvcs/tests/Trading/TT_Info.cpp: + * TAO/orbsvcs/tests/Trading/colocated_test.cpp: + * TAO/orbsvcs/tests/Trading/export_test.cpp: + * TAO/orbsvcs/tests/Trading/import_test.cpp: + + * TAO/orbsvcs/tests/ior_corbaname/client.cpp: + * TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp: + * TAO/orbsvcs/tests/ior_corbaname/server.cpp: + + * TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp: + + * TAO/performance-tests/Anyop/anyop.cpp: + + * TAO/performance-tests/Callback/client.cpp: + * TAO/performance-tests/Callback/server.cpp: + + * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp: + + * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp: + * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp: + * TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp: + * TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp: + * TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp: + + * TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp: + * TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: + * TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp: + * TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp: + + * TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp: + * TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp: + + * TAO/performance-tests/Latency/AMI/client.cpp: + * TAO/performance-tests/Latency/AMI/server.cpp: + + * TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp: + + * TAO/performance-tests/Latency/DII/client.cpp: + * TAO/performance-tests/Latency/DII/server.cpp: + + * TAO/performance-tests/Latency/DSI/client.cpp: + * TAO/performance-tests/Latency/DSI/server.cpp: + + * TAO/performance-tests/Latency/Deferred/client.cpp: + * TAO/performance-tests/Latency/Deferred/server.cpp: + + * TAO/performance-tests/Latency/Single_Threaded/client.cpp: + * TAO/performance-tests/Latency/Single_Threaded/server.cpp: + + * TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp: + * TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp: + + * TAO/performance-tests/Latency/Thread_Pool/client.cpp: + * TAO/performance-tests/Latency/Thread_Pool/server.cpp: + + * TAO/performance-tests/Memory/IORsize/client.cpp: + * TAO/performance-tests/Memory/IORsize/server.cpp: + + * TAO/performance-tests/Memory/Single_Threaded/client.cpp: + * TAO/performance-tests/Memory/Single_Threaded/server.cpp: + + * TAO/performance-tests/POA/Create_Reference/create_reference.cpp: + + * TAO/performance-tests/POA/Demux/client.cpp: + * TAO/performance-tests/POA/Demux/demux_stats.cpp: + * TAO/performance-tests/POA/Demux/demux_test_client.cpp: + * TAO/performance-tests/POA/Demux/demux_test_server.cpp: + * TAO/performance-tests/POA/Demux/server.cpp: + * TAO/performance-tests/POA/Demux/write_names.cpp: + + * TAO/performance-tests/POA/Implicit_Activation/client.cpp: + * TAO/performance-tests/POA/Implicit_Activation/collocated.cpp: + * TAO/performance-tests/POA/Implicit_Activation/server.cpp: + + * TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp: + + * TAO/performance-tests/Pluggable/PP_Test_Client.cpp: + * TAO/performance-tests/Pluggable/PP_Test_Server.cpp: + * TAO/performance-tests/Pluggable/client.cpp: + * TAO/performance-tests/Pluggable/server.cpp: + + * TAO/performance-tests/Protocols/distributor.cpp: + * TAO/performance-tests/Protocols/receiver.cpp: + * TAO/performance-tests/Protocols/sender.cpp: + + * TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp: + * TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp: + + * TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp: + * TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp: + + * TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp: + * TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp: + + * TAO/performance-tests/RTCorba/Thread_Pool/client.cpp: + * TAO/performance-tests/RTCorba/Thread_Pool/server.cpp: + + * TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp: + * TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp: + + * TAO/performance-tests/Sequence_Latency/AMI/client.cpp: + * TAO/performance-tests/Sequence_Latency/AMI/server.cpp: + + * TAO/performance-tests/Sequence_Latency/DII/client.cpp: + * TAO/performance-tests/Sequence_Latency/DII/server.cpp: + + * TAO/performance-tests/Sequence_Latency/DSI/client.cpp: + * TAO/performance-tests/Sequence_Latency/DSI/server.cpp: + + * TAO/performance-tests/Sequence_Latency/Deferred/client.cpp: + * TAO/performance-tests/Sequence_Latency/Deferred/server.cpp: + + * TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp: + * TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp: + + * TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp: + * TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp: + + * TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp: + * TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp: + + * TAO/performance-tests/Throughput/client.cpp: + * TAO/performance-tests/Throughput/server.cpp: + + * TAO/performance-tests/perf.mwc: + + * TAO/tao/Acceptor_Registry.cpp: + + * TAO/tao/AnyTypeCode/Any.cpp: + * TAO/tao/AnyTypeCode/NVList.cpp: + + * TAO/tao/CORBALOC_Parser.cpp: + + * TAO/tao/Codeset/Codeset_Descriptor.cpp: + * TAO/tao/Codeset/Codeset_Manager_i.cpp: + + * TAO/tao/Connector_Registry.cpp: + * TAO/tao/DLL_Parser.h: + + * TAO/tao/DynamicAny/DynAny_i.cpp: + * TAO/tao/DynamicAny/DynCommon.cpp: + + * TAO/tao/Environment.cpp: + * TAO/tao/Exception.h: + * TAO/tao/Exception.cpp: + * TAO/tao/FILE_Parser.cpp: + * TAO/tao/GIOP_Message_Base.cpp: + * TAO/tao/GIOP_Message_Lite.cpp: + * TAO/tao/IIOP_Acceptor.cpp: + * TAO/tao/IIOP_Connection_Handler.cpp: + * TAO/tao/IIOP_Connector.cpp: + + * TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp: + + * TAO/tao/ImR_Client/ImR_Client.cpp: + + * TAO/tao/MCAST_Parser.cpp: + * TAO/tao/ORB.cpp: + * TAO/tao/ORB_Core.cpp: + * TAO/tao/Object_Ref_Table.cpp: + + * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp: + * TAO/tao/PortableServer/PortableServer_WFunctions.cpp: + * TAO/tao/PortableServer/Root_POA.cpp: + + * TAO/tao/RTCORBA/RT_ORBInitializer.cpp: + + * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp: + + * TAO/tao/RTScheduling/Request_Interceptor.cpp: + + * TAO/tao/Resume_Handle.cpp: + + * TAO/tao/Strategies/DIOP_Acceptor.cpp: + * TAO/tao/Strategies/DIOP_Connection_Handler.cpp: + * TAO/tao/Strategies/DIOP_Transport.cpp: + * TAO/tao/Strategies/SCIOP_Acceptor.cpp: + * TAO/tao/Strategies/SCIOP_Connection_Handler.cpp: + * TAO/tao/Strategies/SCIOP_Connector.cpp: + * TAO/tao/Strategies/SHMIOP_Acceptor.cpp: + * TAO/tao/Strategies/SHMIOP_Connector.cpp: + * TAO/tao/Strategies/advanced_resource.cpp: + + * TAO/tao/Synch_Invocation.cpp: + * TAO/tao/SystemException.cpp: + * TAO/tao/TAO_Internal.cpp: + * TAO/tao/Transport.cpp: + * TAO/tao/Transport_Connector.cpp: + + * TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp: + + * TAO/tao/default_resource.cpp: + + * TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc: + * TAO/tests/AMH_Exceptions/client.cpp: + * TAO/tests/AMH_Exceptions/server.cpp: + + * TAO/tests/AMH_Oneway/AMH_Oneway.mpc: + * TAO/tests/AMH_Oneway/client.cpp: + * TAO/tests/AMH_Oneway/server.cpp: + + * TAO/tests/AMI/AMI.mpc: + * TAO/tests/AMI/client.cpp: + * TAO/tests/AMI/server.cpp: + * TAO/tests/AMI/simple_client.cpp: + + * TAO/tests/AMI_Buffering/admin.cpp: + * TAO/tests/AMI_Buffering/client.cpp: + * TAO/tests/AMI_Buffering/server.cpp: + + * TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc: + * TAO/tests/AMI_Timeouts/client.cpp: + * TAO/tests/AMI_Timeouts/server.cpp: + + * TAO/tests/Abstract_Interface/client.cpp: + * TAO/tests/Abstract_Interface/server.cpp: + + * TAO/tests/Any/Recursive/client.cpp: + * TAO/tests/Any/Recursive/server.cpp: + + * TAO/tests/BiDirectional/client.cpp: + * TAO/tests/BiDirectional/server.cpp: + + * TAO/tests/BiDirectional_MultipleORB/destroy.cpp: + + * TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc: + * TAO/tests/BiDirectional_NestedUpcall/client.cpp: + * TAO/tests/BiDirectional_NestedUpcall/server.cpp: + + * TAO/tests/Big_AMI/client.cpp: + * TAO/tests/Big_AMI/server.cpp: + + * TAO/tests/Big_Oneways/Big_Oneways.mpc: + * TAO/tests/Big_Oneways/client.cpp: + * TAO/tests/Big_Oneways/server.cpp: + + * TAO/tests/Big_Reply/client.cpp: + * TAO/tests/Big_Reply/server.cpp: + + * TAO/tests/Big_Request_Muxing/client.cpp: + * TAO/tests/Big_Request_Muxing/server.cpp: + + * TAO/tests/Big_Twoways/Big_Twoways.mpc: + * TAO/tests/Big_Twoways/client.cpp: + * TAO/tests/Big_Twoways/server.cpp: + + * TAO/tests/Blocking_Sync_None/client.cpp: + * TAO/tests/Blocking_Sync_None/server.cpp: + + * TAO/tests/Bug_1020_Basic_Regression/client.cpp: + * TAO/tests/Bug_1020_Basic_Regression/server.cpp: + + * TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc: + * TAO/tests/Bug_1020_Regression/client.cpp: + * TAO/tests/Bug_1020_Regression/server.cpp: + + * TAO/tests/Bug_1269_Regression/client.cpp: + * TAO/tests/Bug_1269_Regression/server.cpp: + * TAO/tests/Bug_1269_Regression/shutdown.cpp: + + * TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc: + * TAO/tests/Bug_1270_Regression/client.cpp: + * TAO/tests/Bug_1270_Regression/server.cpp: + * TAO/tests/Bug_1270_Regression/shutdown.cpp: + + * TAO/tests/Bug_1330_Regression/client.cpp: + * TAO/tests/Bug_1330_Regression/server.cpp: + + * TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc: + * TAO/tests/Bug_1361_Regression/client.cpp: + * TAO/tests/Bug_1361_Regression/server.cpp: + * TAO/tests/Bug_1361_Regression/shutdown.cpp: + + * TAO/tests/Bug_1476_Regression/client.cpp: + * TAO/tests/Bug_1476_Regression/server.cpp: + + * TAO/tests/Bug_1482_Regression/client.cpp: + * TAO/tests/Bug_1482_Regression/server.cpp: + + * TAO/tests/Bug_1495_Regression/Server_Task.cpp: + * TAO/tests/Bug_1495_Regression/Threaded_Client.cpp: + * TAO/tests/Bug_1495_Regression/Threaded_Server.cpp: + + * TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp: + + * TAO/tests/Bug_1551_Regression/client.cpp: + * TAO/tests/Bug_1551_Regression/server.cpp: + + * TAO/tests/Bug_1568_Regression/client.cpp: + * TAO/tests/Bug_1568_Regression/server.cpp: + + * TAO/tests/Bug_1627_Regression/client.cpp: + * TAO/tests/Bug_1627_Regression/server.cpp: + + * TAO/tests/Bug_1635_Regression/client.cpp: + + * TAO/tests/Bug_1636_Regression/client.cpp: + + * TAO/tests/Bug_1639_Regression/struct_client.cpp: + + * TAO/tests/Bug_1670_Regression/client.cpp: + * TAO/tests/Bug_1670_Regression/server.cpp: + + * TAO/tests/Bug_1693_Test/client.cpp: + + * TAO/tests/Bug_1812_Regression/test.cpp: + + * TAO/tests/Bug_1813_Regression/test.cpp: + + * TAO/tests/Bug_2122_Regression/test.cpp: + + * TAO/tests/Bug_2124_Regression/test.cpp: + + * TAO/tests/Bug_2126_Regression/test.cpp: + + * TAO/tests/Bug_2144_Regression/test.cpp: + + * TAO/tests/Bug_2174_Regression/client.cpp: + * TAO/tests/Bug_2174_Regression/server.cpp: + + * TAO/tests/Bug_2183_Regression/client.cpp: + * TAO/tests/Bug_2183_Regression/server.cpp: + + * TAO/tests/Bug_2222_Regression/test.cpp: + + * TAO/tests/Bug_2234_Regression/client.cpp: + * TAO/tests/Bug_2234_Regression/server.cpp: + + * TAO/tests/CDR/alignment.cpp: + * TAO/tests/CDR/allocator.cpp: + * TAO/tests/CDR/basic_types.cpp: + * TAO/tests/CDR/growth.cpp: + * TAO/tests/CDR/octet_sequence.cpp: + * TAO/tests/CDR/tc.cpp: + + * TAO/tests/Cache_Growth_Test/client.cpp: + * TAO/tests/Cache_Growth_Test/server.cpp: + + * TAO/tests/CallbackTest/client.cpp: + * TAO/tests/CallbackTest/server.cpp: + + * TAO/tests/Client_Leaks/Process_Factory.cpp: + * TAO/tests/Client_Leaks/child.cpp: + * TAO/tests/Client_Leaks/client.cpp: + * TAO/tests/Client_Leaks/server.cpp: + + * TAO/tests/CodeSets/simple/client.cpp: + * TAO/tests/CodeSets/simple/server.cpp: + + * TAO/tests/Codec/client.cpp: + + * TAO/tests/Collocation/Collocation.cpp: + + * TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp: + * TAO/tests/Collocation_Exception_Test/Server_Task.cpp: + + * TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp: + * TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp: + + * TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp: + + * TAO/tests/Collocation_Tests/Collocated_Test.cpp: + * TAO/tests/Collocation_Tests/Server_Task.cpp: + + * TAO/tests/Connect_Strategy_Test/client.cpp: + * TAO/tests/Connect_Strategy_Test/server.cpp: + + * TAO/tests/Connection_Failure/client.cpp: + + * TAO/tests/Connection_Purging/client.cpp: + * TAO/tests/Connection_Purging/server.cpp: + + * TAO/tests/Connection_Timeout/client.cpp: + + * TAO/tests/Crash_On_Write/client.cpp: + * TAO/tests/Crash_On_Write/server.cpp: + + * TAO/tests/Crashed_Callback/client.cpp: + * TAO/tests/Crashed_Callback/server.cpp: + + * TAO/tests/DLL_ORB/DLL_ORB.mpc: + * TAO/tests/DLL_ORB/Test_Client_Module.h: + * TAO/tests/DLL_ORB/Test_Client_Module.cpp: + * TAO/tests/DLL_ORB/Test_Server_Module.h: + * TAO/tests/DLL_ORB/Test_Server_Module.cpp: + * TAO/tests/DLL_ORB/client.cpp: + * TAO/tests/DLL_ORB/server.cpp: + + * TAO/tests/DSI_Gateway/DSI_Gateway.mpc: + * TAO/tests/DSI_Gateway/client.cpp: + * TAO/tests/DSI_Gateway/gateway.cpp: + * TAO/tests/DSI_Gateway/server.cpp: + + * TAO/tests/DynAny_Test/driver.cpp: + * TAO/tests/DynAny_Test/test_dynsequence.cpp: + * TAO/tests/DynAny_Test/test_dynstruct.cpp: + + * TAO/tests/Explicit_Event_Loop/client.cpp: + * TAO/tests/Explicit_Event_Loop/server.cpp: + + * TAO/tests/Exposed_Policies/Exposed_Policies.mpc: + * TAO/tests/Exposed_Policies/Policy_Tester.cpp: + * TAO/tests/Exposed_Policies/Policy_Verifier.cpp: + * TAO/tests/Exposed_Policies/RT_Properties.cpp: + * TAO/tests/Exposed_Policies/client.cpp: + * TAO/tests/Exposed_Policies/server.cpp: + + * TAO/tests/FL_Cube/client.cpp: + * TAO/tests/FL_Cube/server.cpp: + + * TAO/tests/Faults/Faults.mpc: + * TAO/tests/Faults/client.cpp: + * TAO/tests/Faults/middle.cpp: + * TAO/tests/Faults/ping.cpp: + * TAO/tests/Faults/pong.cpp: + * TAO/tests/Faults/server.cpp: + + * TAO/tests/File_IO/client.cpp: + * TAO/tests/File_IO/server.cpp: + + * TAO/tests/Forwarding/client.cpp: + * TAO/tests/Forwarding/server.cpp: + + * TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp: + + * TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp: + + * TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp: + + * TAO/tests/Hang_Shutdown/client.cpp: + * TAO/tests/Hang_Shutdown/server.cpp: + + * TAO/tests/Hello/client.cpp: + * TAO/tests/Hello/server.cpp: + + * TAO/tests/ICMG_Any_Bug/client.cpp: + * TAO/tests/ICMG_Any_Bug/server.cpp: + + * TAO/tests/IDL_Test/main.cpp: + + * TAO/tests/IORManipulation/IORTest.cpp: + + * TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp: + * TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp: + + * TAO/tests/IPV6/client.cpp: + * TAO/tests/IPV6/server.cpp: + + * TAO/tests/InterOp-Naming/INS_test_client.cpp: + * TAO/tests/InterOp-Naming/INS_test_server.cpp: + * TAO/tests/InterOp-Naming/Server_i.h: + * TAO/tests/InterOp-Naming/Server_i.cpp: + + * TAO/tests/Leader_Followers/client.cpp: + * TAO/tests/Leader_Followers/server.cpp: + + * TAO/tests/LongUpcalls/LongUpcalls.mpc: + * TAO/tests/LongUpcalls/ami_client.cpp: + * TAO/tests/LongUpcalls/ami_server.cpp: + * TAO/tests/LongUpcalls/blocking_client.cpp: + * TAO/tests/LongUpcalls/blocking_server.cpp: + + * TAO/tests/MProfile/client.cpp: + * TAO/tests/MProfile/server.cpp: + + * TAO/tests/MProfile_Connection_Timeout/client.cpp: + * TAO/tests/MProfile_Connection_Timeout/server.cpp: + + * TAO/tests/MProfile_Forwarding/Manager.cpp: + * TAO/tests/MProfile_Forwarding/client.cpp: + * TAO/tests/MProfile_Forwarding/server.cpp: + + * TAO/tests/MT_BiDir/MT_BiDir.mpc: + * TAO/tests/MT_BiDir/client.cpp: + * TAO/tests/MT_BiDir/server.cpp: + + * TAO/tests/MT_Client/client.cpp: + * TAO/tests/MT_Client/orb_creation.cpp: + * TAO/tests/MT_Client/server.cpp: + + * TAO/tests/MT_Server/client.cpp: + * TAO/tests/MT_Server/server.cpp: + + * TAO/tests/MT_Timeout/MT_Timeout.mpc: + * TAO/tests/MT_Timeout/client.cpp: + * TAO/tests/MT_Timeout/server.cpp: + + * TAO/tests/Multiple/Multiple.mpc: + * TAO/tests/Multiple/client.cpp: + * TAO/tests/Multiple/server.cpp: + + * TAO/tests/Multiple_Inheritance/client.cpp: + * TAO/tests/Multiple_Inheritance/server.cpp: + + * TAO/tests/Muxed_GIOP_Versions/client.cpp: + * TAO/tests/Muxed_GIOP_Versions/server.cpp: + + * TAO/tests/Muxing/client.cpp: + * TAO/tests/Muxing/server.cpp: + + * TAO/tests/Native_Exceptions/client.cpp: + * TAO/tests/Native_Exceptions/server.cpp: + + * TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc: + * TAO/tests/NestedUpcall/MT_Client_Test/client.h: + * TAO/tests/NestedUpcall/MT_Client_Test/client.cpp: + * TAO/tests/NestedUpcall/MT_Client_Test/local_server.h: + * TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp: + * TAO/tests/NestedUpcall/MT_Client_Test/server.h: + * TAO/tests/NestedUpcall/MT_Client_Test/server.cpp: + + * TAO/tests/NestedUpcall/Simple/Simple.mpc: + * TAO/tests/NestedUpcall/Simple/client.cpp: + * TAO/tests/NestedUpcall/Simple/server.cpp: + * TAO/tests/NestedUpcall/Simple/simple-client.cpp: + + * TAO/tests/NestedUpcall/Triangle_Test/TT.mpc: + * TAO/tests/NestedUpcall/Triangle_Test/initiator.h: + * TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp: + * TAO/tests/NestedUpcall/Triangle_Test/server_A.h: + * TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp: + * TAO/tests/NestedUpcall/Triangle_Test/server_B.h: + * TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp: + + * TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc: + * TAO/tests/Nested_Event_Loop/client.cpp: + * TAO/tests/Nested_Event_Loop/server.cpp: + + * TAO/tests/Nested_Upcall_Crash/client.cpp: + * TAO/tests/Nested_Upcall_Crash/scavenger.cpp: + * TAO/tests/Nested_Upcall_Crash/server.cpp: + + * TAO/tests/No_Server_MT_Connect_Test/client.cpp: + * TAO/tests/No_Server_MT_Connect_Test/server.cpp: + + * TAO/tests/OBV/Any/OBV_Any.mpc: + * TAO/tests/OBV/Any/client.cpp: + * TAO/tests/OBV/Any/server.cpp: + + * TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp: + * TAO/tests/OBV/Collocated/Forward/Server_Task.cpp: + + * TAO/tests/OBV/Factory/client.cpp: + * TAO/tests/OBV/Factory/server.cpp: + + * TAO/tests/OBV/Forward/client.cpp: + * TAO/tests/OBV/Forward/server.cpp: + + * TAO/tests/OBV/Supports/Supports_Test_impl.h: + * TAO/tests/OBV/Supports/client.cpp: + * TAO/tests/OBV/Supports/server.cpp: + + * TAO/tests/OBV/TC_Alignment/client.cpp: + * TAO/tests/OBV/TC_Alignment/server.cpp: + + * TAO/tests/OBV/ValueBox/client.cpp: + * TAO/tests/OBV/ValueBox/server.cpp: + + * TAO/tests/ORB_destroy/ORB_destroy.cpp: + + * TAO/tests/ORB_init/ORB_init.cpp: + + * TAO/tests/ORB_init/Portspan/server.cpp: + + * TAO/tests/ORB_shutdown/server.cpp: + + * TAO/tests/ORT/ServerRequestInterceptor.cpp: + * TAO/tests/ORT/client.cpp: + * TAO/tests/ORT/server.cpp: + + * TAO/tests/Object_Loader/Loader.h: + * TAO/tests/Object_Loader/Loader.cpp: + * TAO/tests/Object_Loader/Object_Loader.mpc: + * TAO/tests/Object_Loader/driver.cpp: + + * TAO/tests/Objref_Sequence_Test/client.cpp: + * TAO/tests/Objref_Sequence_Test/server.cpp: + + * TAO/tests/OctetSeq/OctetSeq.cpp: + * TAO/tests/OctetSeq/client.cpp: + * TAO/tests/OctetSeq/server.cpp: + + * TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc: + * TAO/tests/Oneway_Buffering/admin.cpp: + * TAO/tests/Oneway_Buffering/client.cpp: + * TAO/tests/Oneway_Buffering/server.cpp: + + * TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc: + * TAO/tests/Oneways_Invoking_Twoways/client.cpp: + * TAO/tests/Oneways_Invoking_Twoways/server.cpp: + + * TAO/tests/POA/Current/Current.cpp: + + * TAO/tests/POA/Deactivate_Object/server.cpp: + + * TAO/tests/POA/Default_Servant/Default_Servant.cpp: + + * TAO/tests/POA/Etherealization/Etherealization.cpp: + + * TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc: + * TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp: + + * TAO/tests/POA/Identity/Identity.cpp: + + * TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp: + * TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc: + + * TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp: + * TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc: + + * TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp: + * TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc: + + * TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp: + * TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc: + + * TAO/tests/POA/POA_Destruction/POA_Destruction.cpp: + * TAO/tests/POA/POA_Destruction/POA_Destruction.mpc: + + * TAO/tests/POA/Persistent_ID/client.cpp: + * TAO/tests/POA/Persistent_ID/server.cpp: + + * TAO/tests/POA/Policies/Policies.cpp: + * TAO/tests/POA/Policies/Policies.mpc: + + * TAO/tests/POA/Reference_Counting/test.cpp: + + * TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc: + * TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp: + + * TAO/tests/POA/wait_for_completion/wait_for_completion.cpp: + + * TAO/tests/Param_Test/anyop.cpp: + * TAO/tests/Param_Test/bd_str_seq.cpp: + * TAO/tests/Param_Test/complex_any.cpp: + * TAO/tests/Param_Test/driver.cpp: + * TAO/tests/Param_Test/helper.cpp: + * TAO/tests/Param_Test/nested_struct.cpp: + * TAO/tests/Param_Test/objref_struct.cpp: + * TAO/tests/Param_Test/options.cpp: + * TAO/tests/Param_Test/param_test_i.cpp: + * TAO/tests/Param_Test/server.cpp: + * TAO/tests/Param_Test/ub_str_seq.cpp: + * TAO/tests/Param_Test/ub_wstring.cpp: + * TAO/tests/Param_Test/var_struct.cpp: + + * TAO/tests/Policies/Manipulation.cpp: + + * TAO/tests/Portable_Interceptors/AMI/client.cpp: + * TAO/tests/Portable_Interceptors/AMI/server.cpp: + + * TAO/tests/Portable_Interceptors/AdvSlot/server.cpp: + + * TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp: + + * TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp: + + * TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp: + * TAO/tests/Portable_Interceptors/Benchmark/client.cpp: + * TAO/tests/Portable_Interceptors/Benchmark/marker.cpp: + * TAO/tests/Portable_Interceptors/Benchmark/server.cpp: + + * TAO/tests/Portable_Interceptors/Bug_1559/client.cpp: + * TAO/tests/Portable_Interceptors/Bug_1559/server.cpp: + + * TAO/tests/Portable_Interceptors/Bug_2088/client.cpp: + + * TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp: + * TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp: + + * TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp: + * TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp: + + * TAO/tests/Portable_Interceptors/Dynamic/client.cpp: + * TAO/tests/Portable_Interceptors/Dynamic/server.cpp: + + * TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp: + * TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp: + * TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp: + + * TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp: + * TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp: + + * TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp: + * TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp: + + * TAO/tests/Portable_Interceptors/PICurrent/client.cpp: + * TAO/tests/Portable_Interceptors/PICurrent/server.cpp: + + * TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp: + + * TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp: + + * TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp: + + * TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp: + * TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp: + + * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp: + * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp: + + * TAO/tests/QtTests/client.h: + * TAO/tests/QtTests/client.cpp: + * TAO/tests/QtTests/server.cpp: + + * TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp: + + * TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp: + + * TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc: + * TAO/tests/RTCORBA/Banded_Connections/client.cpp: + * TAO/tests/RTCORBA/Banded_Connections/server.cpp: + + * TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc: + * TAO/tests/RTCORBA/Client_Propagated/client.cpp: + * TAO/tests/RTCORBA/Client_Propagated/server.cpp: + + * TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc: + * TAO/tests/RTCORBA/Client_Protocol/client.cpp: + * TAO/tests/RTCORBA/Client_Protocol/server.cpp: + + * TAO/tests/RTCORBA/Collocation/Collocation.cpp: + * TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc: + + * TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp: + * TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc: + + * TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc: + * TAO/tests/RTCORBA/Diffserv/client.cpp: + * TAO/tests/RTCORBA/Diffserv/server.cpp: + + * TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc: + + * TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc: + * TAO/tests/RTCORBA/Explicit_Binding/client.cpp: + * TAO/tests/RTCORBA/Explicit_Binding/server.cpp: + + * TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc: + * TAO/tests/RTCORBA/Linear_Priority/client.cpp: + * TAO/tests/RTCORBA/Linear_Priority/server.cpp: + + * TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc: + * TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp: + * TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp: + + * TAO/tests/RTCORBA/ORB_init/ORB_init.cpp: + + * TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc: + * TAO/tests/RTCORBA/Persistent_IOR/client.cpp: + * TAO/tests/RTCORBA/Persistent_IOR/server.cpp: + + * TAO/tests/RTCORBA/Policies/Policies.cpp: + * TAO/tests/RTCORBA/Policies/Policies.mpc: + + * TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc: + * TAO/tests/RTCORBA/Policy_Combinations/client.cpp: + * TAO/tests/RTCORBA/Policy_Combinations/server.cpp: + + * TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc: + * TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp: + * TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp: + + * TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc: + * TAO/tests/RTCORBA/Private_Connection/client.cpp: + * TAO/tests/RTCORBA/Private_Connection/server.cpp: + + * TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc: + * TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp: + * TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp: + + * TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc: + * TAO/tests/RTCORBA/RTMutex/server.cpp: + + * TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc: + * TAO/tests/RTCORBA/Server_Declared/client.cpp: + * TAO/tests/RTCORBA/Server_Declared/server.cpp: + + * TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc: + * TAO/tests/RTCORBA/Server_Protocol/client.cpp: + * TAO/tests/RTCORBA/Server_Protocol/server.cpp: + + * TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc: + * TAO/tests/RTCORBA/Thread_Pool/client.cpp: + * TAO/tests/RTCORBA/Thread_Pool/server.cpp: + + * TAO/tests/RTCORBA/common_args.cpp: + + * TAO/tests/RTScheduling/Current/test.cpp: + + * TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h: + * TAO/tests/RTScheduling/DT_Spawn/test.cpp: + + * TAO/tests/RTScheduling/Scheduler.cpp: + + * TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp: + * TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp: + + * TAO/tests/RTScheduling/Thread_Cancel/test.cpp: + + * TAO/tests/RTScheduling/VoidData/test_client.cpp: + + * TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc: + * TAO/tests/Reliable_Oneways/client.cpp: + * TAO/tests/Reliable_Oneways/server.cpp: + + * TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp: + * TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp: + * TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp: + + * TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc: + * TAO/tests/Servant_To_Reference_Test/server.cpp: + + * TAO/tests/Server_Connection_Purging/client.cpp: + * TAO/tests/Server_Connection_Purging/server.cpp: + + * TAO/tests/Server_Leaks/client.cpp: + * TAO/tests/Server_Leaks/server.cpp: + + * TAO/tests/Server_Port_Zero/server.cpp: + + * TAO/tests/Single_Read/client.cpp: + * TAO/tests/Single_Read/server.cpp: + + * TAO/tests/Smart_Proxies/Benchmark/client.cpp: + * TAO/tests/Smart_Proxies/Benchmark/server.cpp: + + * TAO/tests/Smart_Proxies/Collocation/main.cpp: + + * TAO/tests/Smart_Proxies/On_Demand/client.cpp: + * TAO/tests/Smart_Proxies/On_Demand/server.cpp: + + * TAO/tests/Smart_Proxies/Policy/client.cpp: + * TAO/tests/Smart_Proxies/Policy/server.cpp: + + * TAO/tests/Smart_Proxies/client.cpp: + + * TAO/tests/Smart_Proxies/dtor/client.cpp: + * TAO/tests/Smart_Proxies/dtor/server.cpp: + + * TAO/tests/Smart_Proxies/server.cpp: + + * TAO/tests/Stack_Recursion/client.cpp: + * TAO/tests/Stack_Recursion/server.cpp: + + * TAO/tests/Strategies/client.cpp: + * TAO/tests/Strategies/server.cpp: + + * TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc: + * TAO/tests/Timed_Buffered_Oneways/client.cpp: + * TAO/tests/Timed_Buffered_Oneways/server.cpp: + + * TAO/tests/Timeout/client.cpp: + * TAO/tests/Timeout/server.cpp: + + * TAO/tests/Two_Objects/client.cpp: + * TAO/tests/Two_Objects/server.cpp: + + * TAO/tests/Typedef_String_Array/client.cpp: + * TAO/tests/Typedef_String_Array/server.cpp: + + * TAO/tests/UNKNOWN_Exception/client.cpp: + * TAO/tests/UNKNOWN_Exception/server.cpp: + + * TAO/tests/Xt_Stopwatch/Client.h: + * TAO/tests/Xt_Stopwatch/client.cpp: + * TAO/tests/Xt_Stopwatch/server.cpp: + + * TAO/utils/NamingViewer/BindDialog.cpp: + * TAO/utils/NamingViewer/BindNewContext.cpp: + * TAO/utils/NamingViewer/NamingTreeCtrl.cpp: + * TAO/utils/NamingViewer/NamingViewer.cpp: + * TAO/utils/NamingViewer/NamingViewerDlg.cpp: + * TAO/utils/NamingViewer/ViewIORDialog.cpp: + + * TAO/utils/catior/catior.cpp: + + * TAO/utils/nslist/nsadd.cpp: + * TAO/utils/nslist/nsdel.cpp: + * TAO/utils/nslist/nslist.cpp: + + Apply the new wchar macros. + Remove ACE_HAS_WCHAR usage. wchar_t will always get defined. + Using template ACE_Get_Arg_Opt. + Replaced main() with ACE_TMAIN(). + Using ACE_Argv_Type_Converter to match argv type to varying API. + Mon May 8 15:52:31 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be_visitor_union_branch/cdr_op_cs.cpp (visit_enum): diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index d1ee63b8357..b4f39f33ec5 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -856,7 +856,7 @@ AST_Generator::create_wstring (AST_Expression *ms) AST_String (nt, &n, ms, - sizeof (ACE_OS::WChar)), + sizeof (wchar_t)), 0); return retval; diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index 3dff54991bd..f73ca581725 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -683,7 +683,7 @@ FE_populate (void) void FE_store_env_include_paths (void) { - ACE_Env_Value<char*> incl_paths ("INCLUDE", + ACE_Env_Value<char*> incl_paths (ACE_TEXT("INCLUDE"), (char *) 0); const char *aggr_str = incl_paths; @@ -713,7 +713,7 @@ FE_get_cpp_loc_from_env (void) const char *cpp_loc = 0; // See if TAO_IDL_PREPROCESSOR is defined. - ACE_Env_Value<char*> preprocessor ("TAO_IDL_PREPROCESSOR", + ACE_Env_Value<char*> preprocessor (ACE_TEXT("TAO_IDL_PREPROCESSOR"), (char *) 0); // Set cpp_loc to the built in location, unless it has been overriden by @@ -725,7 +725,7 @@ FE_get_cpp_loc_from_env (void) else { // Check for the deprecated CPP_LOCATION environment variable - ACE_Env_Value<char*> cpp_path ("CPP_LOCATION", + ACE_Env_Value<char*> cpp_path (ACE_TEXT("CPP_LOCATION"), (char *) 0); if (cpp_path != 0) @@ -753,7 +753,7 @@ FE_get_cpp_args_from_env (void) const char *cpp_args = 0; // Added some customizable preprocessor options - ACE_Env_Value<char*> args1 ("TAO_IDL_PREPROCESSOR_ARGS", + ACE_Env_Value<char*> args1 (ACE_TEXT("TAO_IDL_PREPROCESSOR_ARGS"), (char *) 0); if (args1 != 0) @@ -764,7 +764,7 @@ FE_get_cpp_args_from_env (void) { // Check for the deprecated TAO_IDL_DEFAULT_CPP_FLAGS environment // variable. - ACE_Env_Value<char*> args2 ("TAO_IDL_DEFAULT_CPP_FLAGS", + ACE_Env_Value<char*> args2 (ACE_TEXT("TAO_IDL_DEFAULT_CPP_FLAGS"), (char *) 0); if (args2 != 0) diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp index 54ea445086e..b372aa4cfba 100644 --- a/TAO/TAO_IDL/tao_idl.cpp +++ b/TAO/TAO_IDL/tao_idl.cpp @@ -278,7 +278,7 @@ DRV_drive (const char *s) */ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Initialize driver and global variables. int init_status = DRV_init (argc, argv); diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 2fb895074f4..ac4050ec439 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -6,6 +6,7 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile { libs += TAO_IDL_BE TAO_IDL_FE install = $(ACE_ROOT)/bin after += TAO_IDL_BE TAO_IDL_FE gperf + avoids += uses_wchar specific (automake) { includes += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe @@ -54,6 +55,7 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile { libs += TAO_IDL_FE dynamicflags = TAO_IDL_BE_BUILD_DLL after += TAO_IDL_FE + avoids += uses_wchar specific (automake) { includes += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe @@ -82,6 +84,7 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile { project(TAO_IDL_FE) : acelib, conv_lib, tao_output, crosscompile { sharedname = TAO_IDL_FE dynamicflags = TAO_IDL_FE_BUILD_DLL + avoids += uses_wchar specific (automake) { includes += $(srcdir)/include $(srcdir)/fe diff --git a/TAO/docs/tutorials/Quoter/AMI/client.cpp b/TAO/docs/tutorials/Quoter/AMI/client.cpp index fcb8a8f26da..c9b07e860d5 100644 --- a/TAO/docs/tutorials/Quoter/AMI/client.cpp +++ b/TAO/docs/tutorials/Quoter/AMI/client.cpp @@ -5,7 +5,7 @@ #include "Handler_i.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/AMI/server.cpp b/TAO/docs/tutorials/Quoter/AMI/server.cpp index 9d4c01d9a74..fa59ad6bccb 100644 --- a/TAO/docs/tutorials/Quoter/AMI/server.cpp +++ b/TAO/docs/tutorials/Quoter/AMI/server.cpp @@ -5,7 +5,7 @@ #include "Stock_Factory_i.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp index 43abc2992c9..9a238223729 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp @@ -6,7 +6,7 @@ #include <orbsvcs/CosNamingC.h> #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp index 56b0532a42c..6d3bcb46833 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp @@ -7,7 +7,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp index c26cf41b26c..979a2804ede 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp @@ -6,7 +6,7 @@ #include <orbsvcs/CosNamingC.h> #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp index 86d293611bc..56f3f056f9c 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp @@ -6,7 +6,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp index fcb8a8f26da..c9b07e860d5 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp @@ -5,7 +5,7 @@ #include "Handler_i.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp index bf880a31793..dfdeca56f8a 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp @@ -5,7 +5,7 @@ #include "Stock_Factory_Locator_i.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp index 8bdaab076a8..47ed3316ba1 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_string.h" #include "tao/Exception.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp index 3660fc9b82d..60b48e8826b 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp @@ -7,7 +7,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp index 0715a3539fe..32df7968a94 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp @@ -6,7 +6,7 @@ #include "QuoterC.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp index 0715a3539fe..32df7968a94 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp @@ -6,7 +6,7 @@ #include "QuoterC.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp index 096cdc27d7c..3fcffffda6c 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp @@ -18,7 +18,7 @@ #include "tao/IORTable/IORTable.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp index 06692da309e..5b2f841ce9d 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp @@ -6,7 +6,7 @@ #include "Stock_i.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp index 0715a3539fe..32df7968a94 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp @@ -6,7 +6,7 @@ #include "QuoterC.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp index 06f5d6282cb..95cc2869e69 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp @@ -18,7 +18,7 @@ #include "Stock_Factory_i.h" #include "ace/streams.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp index 150b59789bc..1cbcf6cae70 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp @@ -5,7 +5,7 @@ #include "Stock_Factory_i.h" #include "ace/streams.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp index 1bb6f2cbc19..fa1ef36c477 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp @@ -31,7 +31,7 @@ AMH_Servant::parse_args (int &argc, char **argv) { // *** To get correct behaviour, SET POSIXLY_CORECT=1 on Linux // systems!!! *** - ACE_Get_Opt get_opts (argc, argv, "s:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:"); int c; int count_argv = 0; diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index b1a722b18d8..33cb662f799 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -43,7 +43,7 @@ Base_Server::parse_args (void) { // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux // systems!!! *** - ACE_Get_Opt get_opts (this->argc_, this->argv_, "o:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "o:"); int c; int count_argv = 0; @@ -210,7 +210,7 @@ Base_Server::write_ior_to_file (const char * ior) { // If the ior_output_file exists, output the ior to it FILE *output_file = - ACE_OS::fopen (this->ior_output_file_, "w"); + ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp index 9b31627ae37..59fd9c58e81 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp +++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp @@ -21,7 +21,7 @@ Client_Task::Client_Task (int &argc, char **argv) int Client_Task::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "k:n:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp index 43ef2b385cc..2b949f5c373 100644 --- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp @@ -45,7 +45,7 @@ MT_AMH_Server::parse_args (void) ACE_OS::exit (1); } - ACE_Get_Opt get_opts (this->argc_, this->argv_, "n:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "n:"); int c; int count_argv = 0; diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc index 873085457c1..5e7d22fe322 100644 --- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc +++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc @@ -9,6 +9,7 @@ project(*IDL) : taoidldefaults, amh { } project(*st_server): taoexe, strategies, valuetype, amh, portableserver { + exename = st_server after += *IDL Source_Files { st_server.cpp @@ -23,6 +24,7 @@ project(*st_server): taoexe, strategies, valuetype, amh, portableserver { } project(*mt_server): taoexe, strategies, valuetype, amh, portableserver { + exename = mt_server after += *IDL Source_Files { mt_server.cpp @@ -38,6 +40,7 @@ project(*mt_server): taoexe, strategies, valuetype, amh, portableserver { } project(*client): taoexe, strategies, valuetype, amh, portableserver { + exename = client after += *IDL Source_Files { Client_Task.cpp diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp index 8ac228e10f5..f0cdbabc08c 100644 --- a/TAO/examples/AMH/Sink_Server/client.cpp +++ b/TAO/examples/AMH/Sink_Server/client.cpp @@ -3,11 +3,13 @@ // #include "Client_Task.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Client_Task task (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + Client_Task task (convert.get_argc(), convert.get_ASCII_argv()); if (task.parse_args () != 1) { diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp index be36239007c..8176e904a16 100644 --- a/TAO/examples/AMH/Sink_Server/mt_server.cpp +++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp @@ -2,11 +2,13 @@ #include "MT_AMH_Server.h" #include "AMH_Servant.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - MT_AMH_Server amh_server (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + MT_AMH_Server amh_server (convert.get_argc(), convert.get_ASCII_argv()); amh_server.try_RT_scheduling(); amh_server.start_orb_and_poa (); @@ -18,7 +20,7 @@ main (int argc, char *argv[]) AMH_Servant servant (amh_server.orb ()); - if (servant.parse_args (argc, argv) != 1) + if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1) { amh_server.usage ("sleep time unspecified"); ACE_OS::exit (1); diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp index 5983c3cd99f..1986d33f38f 100644 --- a/TAO/examples/AMH/Sink_Server/st_server.cpp +++ b/TAO/examples/AMH/Sink_Server/st_server.cpp @@ -2,6 +2,7 @@ #include "AMH_Servant.h" #include "Base_Server.h" +#include "ace/Argv_Type_Converter.h" void usage (const char *message) @@ -19,9 +20,10 @@ usage (const char *message) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Base_Server amh_server (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + Base_Server amh_server (convert.get_argc(), convert.get_ASCII_argv()); amh_server.try_RT_scheduling(); amh_server.start_orb_and_poa (); @@ -33,7 +35,7 @@ main (int argc, char *argv[]) AMH_Servant servant (amh_server.orb ()); - if (servant.parse_args (argc, argv) != 1) + if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1) { usage ("Sleep time unspecified \n"); ACE_OS::exit (1); diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 529143d03f2..8c9b334590c 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -5,6 +5,7 @@ #include "ace/Task.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (FL_Callback, peer, @@ -17,7 +18,7 @@ int interval = 0; // microseconds int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:t:"); int c; while ((c = get_opts ()) != -1) @@ -71,8 +72,9 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -102,7 +104,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -125,7 +127,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var progress_object = diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp index d5d9556a839..5b267306226 100644 --- a/TAO/examples/AMI/FL_Callback/progress.cpp +++ b/TAO/examples/AMI/FL_Callback/progress.cpp @@ -19,7 +19,7 @@ int n_peers = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:i:"); int c; while ((c = get_opts ()) != -1) @@ -53,7 +53,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { TAO::FlResource_Loader fl_loader; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Advanced/ch_12/client.cpp b/TAO/examples/Advanced/ch_12/client.cpp index d02bccc4c52..271bb80d8b6 100644 --- a/TAO/examples/Advanced/ch_12/client.cpp +++ b/TAO/examples/Advanced/ch_12/client.cpp @@ -136,7 +136,7 @@ set_temp (CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) } int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { CORBA::ULong i = 0; try diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp index 4b745c72953..d3df38508c6 100644 --- a/TAO/examples/Advanced/ch_12/server.cpp +++ b/TAO/examples/Advanced/ch_12/server.cpp @@ -641,7 +641,7 @@ preinvoke (const PortableServer::ObjectId & oid, } int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { CORBA::ORB_var orb; diff --git a/TAO/examples/Advanced/ch_18/client.cpp b/TAO/examples/Advanced/ch_18/client.cpp index 57631ddbb19..314c21f1258 100644 --- a/TAO/examples/Advanced/ch_18/client.cpp +++ b/TAO/examples/Advanced/ch_18/client.cpp @@ -223,7 +223,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { CORBA::ULong i = 0; diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp index 17b74ff11fa..848d6877461 100644 --- a/TAO/examples/Advanced/ch_18/server.cpp +++ b/TAO/examples/Advanced/ch_18/server.cpp @@ -687,7 +687,7 @@ preinvoke ( //---------------------------------------------------------------- int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { CORBA::ORB_var orb; diff --git a/TAO/examples/Advanced/ch_21/client.cpp b/TAO/examples/Advanced/ch_21/client.cpp index 8db73588d82..b85caad10fd 100644 --- a/TAO/examples/Advanced/ch_21/client.cpp +++ b/TAO/examples/Advanced/ch_21/client.cpp @@ -139,7 +139,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { CORBA::ULong i = 0; try { diff --git a/TAO/examples/Advanced/ch_21/server.cpp b/TAO/examples/Advanced/ch_21/server.cpp index 02631e1f536..f2d057d40c2 100644 --- a/TAO/examples/Advanced/ch_21/server.cpp +++ b/TAO/examples/Advanced/ch_21/server.cpp @@ -687,7 +687,7 @@ preinvoke ( //---------------------------------------------------------------- int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { try { // Initialize orb diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp index b8e0b3db2e5..994e668d249 100644 --- a/TAO/examples/Advanced/ch_3/client.cpp +++ b/TAO/examples/Advanced/ch_3/client.cpp @@ -21,29 +21,33 @@ #include "timeC.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" + +#include "tao/Policy_ForwardC.h" // The following header is #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. //#include <iostream.h> int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try + ACE_Argv_Type_Converter convert (argc, argv); + try { // Check arguments - if (argc != 2) + if (argc != 2) { cerr << "Usage: client IOR_string" << endl; throw 0; } // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); // Destringify argv[1] - CORBA::Object_var obj = orb->string_to_object (argv[1]); - if (CORBA::is_nil (obj.in ())) + CORBA::Object_var obj = orb->string_to_object (convert.get_ASCII_argv()[1]); + if (CORBA::is_nil (obj.in ())) { cerr << "Nil Time reference" << endl; throw 0; @@ -52,7 +56,7 @@ main (int argc, char *argv[]) // Narrow Time_var tm = Time::_narrow (obj.in ()); - if (CORBA::is_nil (tm.in ())) + if (CORBA::is_nil (tm.in ())) { cerr << "Argument is not a Time reference" << endl; throw 0; @@ -71,14 +75,14 @@ main (int argc, char *argv[]) << setw (2) << setfill ('0') << tod.minute << ":" << setw (2) << setfill ('0') << tod.second << endl; } - catch (const CORBA::Exception &x) + catch (const CORBA::Exception &x) { ACE_PRINT_EXCEPTION (x, "Who is the culprit \n"); cerr << "Uncaught CORBA exception" << endl; return 1; } - catch (...) + catch (...) { return 1; } diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp index fb8fbd74601..82d603e836a 100644 --- a/TAO/examples/Advanced/ch_3/server.cpp +++ b/TAO/examples/Advanced/ch_3/server.cpp @@ -20,7 +20,12 @@ // ============================================================================ #include "server.h" + +#include "tao/CORBA_String.h" + #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" + // The following headers are #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. @@ -47,12 +52,13 @@ get_gmt (void) throw (CORBA::SystemException) // ______________________________________________________ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try + ACE_Argv_Type_Converter convert (argc, argv); + try { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); // Get reference to Root POA. CORBA::Object_var obj @@ -76,18 +82,10 @@ main (int argc, char *argv[]) // Accept requests orb->run (); } - catch (const CORBA::Exception &) + catch (const CORBA::Exception &) { cerr << "Uncaught CORBA exception" << endl; return 1; } return 0; } - - - - - - - - diff --git a/TAO/examples/Advanced/ch_8_and_10/client.cpp b/TAO/examples/Advanced/ch_8_and_10/client.cpp index 593d3bd28b3..2395847f348 100644 --- a/TAO/examples/Advanced/ch_8_and_10/client.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/client.cpp @@ -135,7 +135,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { try { // Initialize the ORB diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp index e2f6b3093a2..4e2346a12fe 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp @@ -413,7 +413,7 @@ throw(CORBA::SystemException) //---------------------------------------------------------------- int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { try { // Initialize orb diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index f74694e7d6e..9a0f6eaeb6d 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -14,11 +14,15 @@ // ================================================================ #include "testS.h" + +#include "tao/Policy_ForwardC.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/TAOA.h" + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Buffered_AMI, client, @@ -106,7 +110,7 @@ public: static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:k:m:i:t:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:k:m:i:t:x"); int c; while ((c = get_opts ()) != -1) @@ -258,22 +262,22 @@ setup_buffering_constraints (CORBA::ORB_ptr orb } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp index 4049f81222e..fc42ba1afc5 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -1,8 +1,11 @@ // $Id$ +#include "tao/CORBA_String.h" + #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "test_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Buffered_AMI, server, @@ -13,7 +16,7 @@ const char *ior_output_file = "ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,13 +40,13 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index 7851ec8638e..d4af0615cd1 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -19,6 +19,7 @@ #include "tao/AnyTypeCode/TAOA.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Buffered_Oneways, client, "$Id$") @@ -50,7 +51,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:f:c:b:i:z:t:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:f:c:b:i:z:t:x"); int c; while ((c = get_opts ()) != -1) @@ -114,22 +115,22 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 3b900d8f8a3..f286936ffee 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Buffered_Oneways, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,13 +36,13 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -60,7 +61,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -76,7 +77,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp index b55bdff6842..587407e555f 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp @@ -18,7 +18,7 @@ ClientApp::~ClientApp() int ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -32,7 +32,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL) return result; } - CORBA::Object_var obj + CORBA::Object_var obj = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -81,7 +81,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - + } ACE_ENDTRY; } @@ -139,4 +139,3 @@ ClientApp::usage_statement() "\t[-?]\n\n", this->exe_name_.c_str())); } - diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index 4aeab0b4941..8fd1086855f 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -94,7 +94,7 @@ Consumer_Handler::read_ior (char *filename) int Consumer_Handler::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "a:t:d:f:xk:xs"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "a:t:d:f:xk:xs"); int c; int result; diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index 7874c0ef56b..1bbbb931c30 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -99,7 +99,7 @@ Notifier_Input_Handler::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) int Notifier_Input_Handler::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:s "); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:s "); int c; while ((c = get_opts ()) != -1) @@ -110,7 +110,7 @@ Notifier_Input_Handler::parse_args (void) break; case 'f': // output the IOR toi a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index 35bcc26633a..ecce3a44f2e 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -86,7 +86,7 @@ Supplier::read_ior (char *filename) int Supplier::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:f:i:xk:xs"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:f:i:xk:xs"); int c; int result; @@ -335,7 +335,7 @@ Supplier::reactor_used (void) const int Supplier::read_file (char *filename) { - f_ptr_ = ACE_OS::fopen (filename, "r"); + f_ptr_ = ACE_OS::fopen (filename, ACE_TEXT("r")); ACE_DEBUG ((LM_DEBUG, "filename = %s\n",filename)); diff --git a/TAO/examples/Callback_Quoter/consumer.cpp b/TAO/examples/Callback_Quoter/consumer.cpp index 9060eb9ec1d..c56708c331f 100644 --- a/TAO/examples/Callback_Quoter/consumer.cpp +++ b/TAO/examples/Callback_Quoter/consumer.cpp @@ -1,18 +1,20 @@ // $Id$ #include "Consumer_Handler.h" +#include "ace/Argv_Type_Converter.h" // This function runs the Callback Quoter Consumer application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Consumer_Handler consumer; ACE_DEBUG ((LM_DEBUG, "\n\t***Consumer***\n\n")); - if (consumer.init (argc, argv) == -1) + if (consumer.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return consumer.run (); diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp index 44f07d70cd1..fcd8ce876bd 100644 --- a/TAO/examples/Callback_Quoter/notifier.cpp +++ b/TAO/examples/Callback_Quoter/notifier.cpp @@ -1,14 +1,16 @@ // $Id$ #include "Notifier_Input_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(notifier, Callback_Quoter, "$Id$") // This is the main driver program for the Callback Quoter Notifier. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Notifier_Input_Handler notifier; ACE_DEBUG ((LM_DEBUG, @@ -17,7 +19,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int rc = notifier.init (argc, argv ACE_ENV_ARG_PARAMETER); + int rc = notifier.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rc == -1) diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp index 5d746eb0bc9..befb3418fd0 100644 --- a/TAO/examples/Callback_Quoter/supplier.cpp +++ b/TAO/examples/Callback_Quoter/supplier.cpp @@ -1,18 +1,20 @@ // $Id$ #include "Supplier_i.h" +#include "ace/Argv_Type_Converter.h" // This function runs the Callback Quoter Supplier daemon. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { - Supplier supplier; + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; ACE_DEBUG ((LM_DEBUG, "\n\tMarket Status Supplier Daemon\n\n")); - if (supplier.init (argc, argv) == -1) + if (supplier.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return supplier.run (); diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index c5ae00a4544..313893dd39a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -11,7 +11,7 @@ ACE_RCSID (AMI_Iterator, Content_Iterator_i, "$Id$") Content_Iterator_i::Content_Iterator_i (const char *pathname, CORBA::ULong file_size) - : file_ (pathname), + : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)), file_io_ (), file_size_ (file_size), chunk_index_ (1) diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 4f4368cca67..6699b86e461 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "Web_ServerC.h" #include "Iterator_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Iterator, client, @@ -26,8 +27,9 @@ void invoke_requests (int argc, ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -37,8 +39,7 @@ main (int argc, char *argv[]) ACE_TEXT ("[filename ...]\n")), -1); // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -79,8 +80,7 @@ main (int argc, char *argv[]) // completed. int request_count = 0; - ::invoke_requests (argc, - argv, + ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(), &request_count, factory.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index a1c2d6de7e5..73d9548f64e 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -7,20 +7,21 @@ #include "Web_ServerS.h" #include "Iterator_Factory_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Iterator, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp index 832e96b6732..5052e229ce2 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp @@ -11,7 +11,7 @@ ACE_RCSID (AMI_Observer, Callback_Handler, "$Id$") Callback_Handler::Callback_Handler (const char *pathname, Web_Server::Callback_ptr client_callback) - : file_ (pathname), + : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)), file_io_ (), callback_ (Web_Server::Callback::_duplicate (client_callback)), ami_handler_ (), diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 986c828875a..a8d56209ce8 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "Push_Web_ServerC.h" #include "Push_Iterator_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Observer, client, @@ -26,8 +27,9 @@ void invoke_requests (int argc, ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -38,8 +40,7 @@ main (int argc, char *argv[]) -1); // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -80,8 +81,7 @@ main (int argc, char *argv[]) int request_count = 0; // Activate and run the reply handlers. - ::invoke_requests (argc, - argv, + ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(), &request_count, factory.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 83388bc3fb9..39d6de39ef2 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -6,20 +6,21 @@ #include "orbsvcs/CosNamingC.h" #include "Push_Web_ServerS.h" #include "Push_Iterator_Factory_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI_Observer, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index 669ead91a3b..a31b5962d28 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -12,7 +12,7 @@ ACE_RCSID(SMI_Iterator, Content_Iterator_i, "$Id$") Content_Iterator_i::Content_Iterator_i (const char *pathname, CORBA::ULong file_size) - : file_ (pathname), + : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)), file_io_ (), file_size_ (file_size), chunk_index_ (1) diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index dcec6b9a578..7a1e2504d21 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -9,7 +9,7 @@ #include "Web_ServerC.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" - +#include "ace/Argv_Type_Converter.h" ACE_RCSID (SMI_Iterator, client, @@ -32,8 +32,9 @@ int spawn_viewer (const char *content_type, const char *filename); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -43,8 +44,7 @@ main (int argc, char *argv[]) -1); // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -92,7 +92,7 @@ main (int argc, char *argv[]) } // Get a Content_Iterator - const char *pathname = argv[1]; + const char *pathname = convert.get_ASCII_argv()[1]; Web_Server::Content_Iterator_var contents; Web_Server::Metadata_Type_var metadata; factory->get_iterator (pathname, @@ -211,7 +211,7 @@ int retrieve_data (const char *content_type, // Now spawn a view to display the retrieved data. if (::spawn_viewer (content_type, - file_addr.get_path_name ()) != 0) + ACE_TEXT_TO_CHAR_IN(file_addr.get_path_name ())) != 0) return -1; return 0; diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index 701dccbeac0..e140cac77f8 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/CosNamingC.h" #include "Web_ServerS.h" +#include "ace/Argv_Type_Converter.h" #include "Iterator_Factory_i.h" @@ -13,14 +14,14 @@ ACE_RCSID (SMI_Iterator, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Mighty ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp index 55b157feaf0..52af5c5c731 100644 --- a/TAO/examples/Event_Comm/consumer.cpp +++ b/TAO/examples/Event_Comm/consumer.cpp @@ -2,6 +2,7 @@ #include "Consumer_Handler.h" #include "Consumer_Input_Handler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Consumer, consumer, "$Id$") @@ -110,12 +111,13 @@ Consumer::initialize (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Initialize the supplier and consumer object references. Consumer consumer; - if (consumer.initialize (argc, argv) == -1) + if (consumer.initialize (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Consumer init failed\n"), diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp index 8e348b1df5b..d9d365d8d97 100644 --- a/TAO/examples/Event_Comm/notifier.cpp +++ b/TAO/examples/Event_Comm/notifier.cpp @@ -2,6 +2,7 @@ #include "Notifier_Server.h" #include "notifier.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Notifier, notifier, "$Id$") @@ -61,10 +62,11 @@ Notifier::~Notifier (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Initialize server daemon. - Notifier notifier (argc, argv); + Notifier notifier (convert.get_argc(), convert.get_ASCII_argv()); // Loop forever handling events. notifier.run (); diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp index c44b6123b8d..3e665ee8bc8 100644 --- a/TAO/examples/Event_Comm/supplier.cpp +++ b/TAO/examples/Event_Comm/supplier.cpp @@ -3,6 +3,7 @@ #include "Notifier_Handler.h" #include "Supplier_Input_Handler.h" #include "supplier.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Supplier, supplier, "$Id$") Supplier::Supplier (void) @@ -67,12 +68,13 @@ Supplier::init (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Initialize server daemon. Supplier supplier; - if (supplier.init (argc, argv) == -1) + if (supplier.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "supplier init failed"), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp index d7d06da76fd..0db393b8ce1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -57,10 +57,10 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (output_file == 0) { @@ -70,7 +70,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, } // first dump what the caller has to say. - ACE_OS::fprintf (output_file, "%s\n",msg); + ACE_OS::fprintf (output_file, ACE_TEXT("%s\n"),msg); // next, compose and dump what we want to say. ACE_UINT32 val_1; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h index f3d7d4a300f..6519e30c942 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h @@ -61,10 +61,10 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats /// Record a sample int sample (ACE_UINT32 thr_run_time, int thr_count); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 6d3ab90a29b..b9318e79331 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "FP_Scheduler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -52,7 +53,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds"); int c; while ((c = get_opts ()) != -1) @@ -95,8 +96,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Fixed_Priority_Scheduler* scheduler=0; RTScheduling::Current_var current; int prio; @@ -141,10 +143,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp index 839dcd2c9cf..7b134f49a8b 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "FP_Scheduler.h" #include "Task_Stats.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "$Id$") @@ -20,7 +21,7 @@ int enable_yield = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds"); int c; while ((c = get_opts ()) != -1) @@ -80,8 +81,9 @@ private: Task_Stats task_stats; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Fixed_Priority_Scheduler* scheduler=0; RTScheduling::Current_var current; long flags; @@ -98,7 +100,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -118,7 +120,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index 122e2b06881..2640256aff1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "MIF_Scheduler.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -52,7 +53,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds"); int c; while ((c = get_opts ()) != -1) @@ -95,8 +96,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MIF_Scheduler* scheduler=0; RTScheduling::Current_var current; int prio; @@ -141,10 +143,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp index a137b5d45f8..e3e2ac239cd 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "MIF_Scheduler.h" #include "Task_Stats.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "$Id$") @@ -20,7 +21,7 @@ int enable_yield = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds"); int c; while ((c = get_opts ()) != -1) @@ -80,8 +81,9 @@ private: Task_Stats task_stats; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MIF_Scheduler* scheduler=0; RTScheduling::Current_var current; long flags; @@ -98,7 +100,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -118,7 +120,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 81e8d8b0d83..2f1d212ae32 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -8,6 +8,7 @@ #include "testC.h" #include "MUF_Scheduler.h" #include "orbsvcs/Time_Utilities.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -57,7 +58,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds"); int c; while ((c = get_opts ()) != -1) @@ -100,8 +101,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MUF_Scheduler* scheduler=0; RTScheduling::Current_var current; int prio; @@ -146,10 +148,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp index f22355074e1..625df80826e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp @@ -7,6 +7,7 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "MUF_Scheduler.h" #include "Task_Stats.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "$Id$") @@ -20,7 +21,7 @@ int enable_yield = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:ds"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds"); int c; while ((c = get_opts ()) != -1) @@ -80,8 +81,9 @@ private: Task_Stats task_stats; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); MUF_Scheduler* scheduler = 0; RTScheduling::Current_var current; long flags; @@ -98,7 +100,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -118,7 +120,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; if (enable_dynamic_scheduling) @@ -179,7 +181,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index 7948ab73785..2a8d5776792 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -20,6 +20,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" Identity_Client::Identity_Client (void) : group_factory_ior_ (0), @@ -31,7 +32,7 @@ Identity_Client::Identity_Client (void) int Identity_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:n:r"); int c; while ((c = get_opts ()) != -1) @@ -205,12 +206,13 @@ Identity_Client::~Identity_Client (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Client client; - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 638dd1e245b..ef03f6c6357 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -17,6 +17,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Identity_Server::Identity_Server (void) : group_factory_ior_ (0), @@ -28,7 +29,7 @@ Identity_Server::Identity_Server (void) int Identity_Server::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:a:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:a:o:"); int c; while ((c = get_opts ()) != -1) @@ -166,7 +167,7 @@ Identity_Server::create_objects (size_t number_of_objects, // Create an id for this servant. char id[BUFSIZ]; ACE_OS::sprintf (id, - "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER, + "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A, i); // Create and activate a servant. @@ -210,12 +211,13 @@ Identity_Server::~Identity_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Server server; - if (server.init (argc, argv) == -1) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index b2369ebe8b4..3a4dc4c5871 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -17,6 +17,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) @@ -26,7 +27,7 @@ Load_Balancing_Service::Load_Balancing_Service (void) int Load_Balancing_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +38,7 @@ Load_Balancing_Service::parse_args (int argc, char *argv[]) break; case 'o': // outputs object ior to the specified file. this->ior_output_file_ = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -137,12 +138,13 @@ Load_Balancing_Service::~Load_Balancing_Service (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Load_Balancing_Service factory; - if (factory.init (argc, argv) == -1) + if (factory.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 0ffc8625639..d122b750da3 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -19,6 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" +#include "ace/Argv_Type_Converter.h" Identity_Client::Identity_Client (void) : group_factory_ior_ (0), @@ -31,7 +32,7 @@ Identity_Client::Identity_Client (void) int Identity_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:n:k:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:n:k:r"); int c; while ((c = get_opts ()) != -1) @@ -245,12 +246,13 @@ Identity_Client::~Identity_Client (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Client client; - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 772a2092ada..f07a86b7a2b 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -5,6 +5,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Identity_Server::Identity_Server (void) : group_factory_ior_ (0), @@ -16,7 +17,7 @@ Identity_Server::Identity_Server (void) int Identity_Server::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di:a:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:a:o:"); int c; while ((c = get_opts ()) != -1) @@ -208,7 +209,7 @@ Identity_Server::create_objects (size_t number_of_objects, // Create an id for this servant. char id[BUFSIZ]; ACE_OS::sprintf (id, - "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER, + "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A, i); // Create and activate a servant. @@ -268,16 +269,17 @@ Identity_Server::~Identity_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Identity_Server server; - if (server.init (argc, argv) == -1) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Check the non-ORB arguments. - if (server.parse_args (argc, argv) == -1) + if (server.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index f5d171a3b4f..311b6c25c61 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -635,8 +635,8 @@ Object_Group_i::bind (const Load_Balancer::Member & member this->allocator_) == 0) ACE_THROW (Load_Balancer::duplicate_member ()); - size_t id_len = ACE_OS::strlen (member.id) + 1; - size_t ref_len = ACE_OS::strlen (member.obj) + 1; + size_t id_len = ACE_OS::strlen (member.id.in()) + 1; + size_t ref_len = ACE_OS::strlen (member.obj.in()) + 1; char *mem_alloc = (char *)this->allocator_->malloc (id_len + ref_len); diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index ec94198bcc1..62374de6938 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -17,6 +17,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" Load_Balancing_Service::Load_Balancing_Service (void) : ior_output_file_ (0) @@ -26,7 +27,7 @@ Load_Balancing_Service::Load_Balancing_Service (void) int Load_Balancing_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +38,7 @@ Load_Balancing_Service::parse_args (int argc, char *argv[]) break; case 'o': // outputs object ior to the specified file. this->ior_output_file_ = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -174,12 +175,13 @@ Load_Balancing_Service::~Load_Balancing_Service (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); int result = 0; Load_Balancing_Service factory; - if (factory.init (argc, argv) == -1) + if (factory.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 1e425fbd119..4499989e881 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -151,7 +151,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, // Create a temporary buffer for manipulating the logging message, // adding additional space for formatting characters.. - ACE_TCHAR msgbuf [ACE_MAXLOGMSGLEN + 4]; + char msgbuf [ACE_MAXLOGMSGLEN + 4]; // Format the message for proper display. ACE_OS::strcpy (msgbuf, "::"); @@ -162,7 +162,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, ACE_MAXLOGMSGLEN); // Set <ACE_Log_Record.msg_data> to the value stored in <msgbuf>. - rec.msg_data (msgbuf); + rec.msg_data (ACE_TEXT_TO_TCHAR_IN(msgbuf)); CORBA::Long addr = log_rec.host_addr; @@ -172,13 +172,13 @@ Logger_i::logv (const Logger::Log_Record &log_rec, static_cast<ACE_UINT32> (addr)); // Create a buffer and fill it with the host name of the logger - ACE_TCHAR namebuf[MAXHOSTNAMELEN + 1]; + char namebuf[MAXHOSTNAMELEN + 1]; ACE_OS::strncpy (namebuf, addy.get_host_addr (), MAXHOSTNAMELEN); u_long verb_level = this->verbosity_conversion (verbosity); - rec.print (namebuf, + rec.print (ACE_TEXT_TO_TCHAR_IN(namebuf), verb_level, stderr); // Print out the logging message to stderr with the given level of diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp index 51f5062e56e..e338b9524f7 100644 --- a/TAO/examples/Logging/Logging_Service.cpp +++ b/TAO/examples/Logging/Logging_Service.cpp @@ -2,12 +2,14 @@ #include "Logging_Service_i.h" #include "tao/debug.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Logging_Service, Logging_Service, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); // Set TAO_debug_level to 0 to ensure silent running unless // debugging is explicitly invoked TAO_debug_level = 0; @@ -17,7 +19,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int ret = log_server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int ret = log_server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret == -1) return 1; diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index 3b65ab4da94..7332a301d1d 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -14,7 +14,7 @@ Logger_Server::Logger_Server (void) int Logger_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp index f309e54d9e6..3a876c2fc14 100644 --- a/TAO/examples/Logging/Logging_Test.cpp +++ b/TAO/examples/Logging/Logging_Test.cpp @@ -1,20 +1,22 @@ // $Id$ #include "Logging_Test_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Logger, Logging_Test, "$Id$") // This function runs the Logging service test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Logger_Client logger_client; ACE_DEBUG ((LM_DEBUG, "\n \t IDL_Logger: client \n\n")); - if (logger_client.init (argc, argv) == -1) + if (logger_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return logger_client.run (); diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index f82bba200c4..8b9b8780683 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -297,7 +297,7 @@ Logger_Client::run (void) int Logger_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "d"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 979bc54cc79..8e6fc0219ea 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -33,7 +33,7 @@ Server<Servant>::~Server (void) template <class Servant> int Server<Servant>::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:"); int c = 0; while ((c = get_opts ()) != -1) @@ -43,7 +43,7 @@ Server<Servant>::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", @@ -196,7 +196,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename) template <class InterfaceObj, class Var> int Client<InterfaceObj, Var>::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:nk:x"); int c = 0; int result = 0; diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index bbadaefee44..ff2038a0c89 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -14,7 +14,7 @@ Checkpoint_Client_i::run (const char *name, char *argv[]) { // Initialize the client (read ior...). - if (checkpoint.init (name,argc, argv) == -1) + if (checkpoint.init (name, argc, argv) == -1) return -1; // Set random seed diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp index d4e502a26bd..5e18b4bbaf2 100644 --- a/TAO/examples/OBV/Typed_Events/client.cpp +++ b/TAO/examples/OBV/Typed_Events/client.cpp @@ -1,12 +1,14 @@ //$Id$ # include "Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Checkpoint_Client_i client; @@ -14,8 +16,8 @@ main (int argc, char **argv) "\nEvent_Types client\n\n")); if (client.run ("Event_Types_Checkpoint", - argc, - argv) == -1) + convert.get_argc(), + convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp index 2a8bb4802ba..00c2f07f345 100644 --- a/TAO/examples/OBV/Typed_Events/server.cpp +++ b/TAO/examples/OBV/Typed_Events/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Server_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Checkpoint_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Event_Types_Checkpoint", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index 550f5082ff8..cfb17546d95 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -27,6 +27,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #include "tao/PortableServer/AdapterActivatorC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Adapter_Activator, server, "$Id$") @@ -172,7 +173,7 @@ const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -209,9 +210,9 @@ write_iors_to_file (const char *first_ior, ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file); ACE_OS::sprintf (ior_output_file_3, "%s_3", ior_output_file); - FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); - FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); - FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w"); + FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w")); + FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0 || @@ -262,20 +263,20 @@ write_iors_to_file (const char *first_ior, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index f3361796b0b..f6262d78466 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI, client, "$Id$") @@ -31,7 +32,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "xk:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:f:"); int c; while ((c = get_opts ()) != -1) @@ -100,8 +101,9 @@ read_IOR_from_file (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; char str [255]; @@ -110,15 +112,13 @@ main (int argc, char **argv) { ACE_OS::strcpy (str, "CORBA::ORB_init"); - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the location of the // IOR - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; if (IOR == 0) diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp index 2e7bc06fe6e..27d9d8a846f 100644 --- a/TAO/examples/POA/DSI/server.cpp +++ b/TAO/examples/POA/DSI/server.cpp @@ -18,6 +18,7 @@ #include "Database_i.h" #include "ace/Get_Opt.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI, server, "$Id$") @@ -26,7 +27,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +53,7 @@ parse_args (int argc, char **argv) static int write_iors_to_file (const char *first_ior) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n", @@ -78,17 +79,18 @@ write_iors_to_file (const char *first_ior) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp index a1a99766578..2f62f81c7aa 100644 --- a/TAO/examples/POA/Default_Servant/client.cpp +++ b/TAO/examples/POA/Default_Servant/client.cpp @@ -22,6 +22,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Default_Servant, client, "$Id$") @@ -32,7 +33,7 @@ static const char *message = "POA rules!!"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "dk:f:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:f:m:"); int c; while ((c = get_opts ()) != -1) @@ -71,18 +72,19 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); // parse args should catch this, but just in case... if (iorfile == 0) diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp index be45c3a1297..18ffb067100 100644 --- a/TAO/examples/POA/Default_Servant/server.cpp +++ b/TAO/examples/POA/Default_Servant/server.cpp @@ -21,6 +21,7 @@ #include "ace/Get_Opt.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Default_Servant, server, "$Id$") @@ -29,7 +30,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -58,17 +59,18 @@ parse_args (int argc, char **argv) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; @@ -152,7 +154,7 @@ main (int argc, char **argv) ACE_DEBUG ((LM_DEBUG,"%s\n", file_system_ior.in ())); - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc index 60b77c13641..88edaabf756 100644 --- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc +++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp index 924ce3bd0f1..255b27c4e2b 100644 --- a/TAO/examples/POA/Explicit_Activation/server.cpp +++ b/TAO/examples/POA/Explicit_Activation/server.cpp @@ -20,6 +20,7 @@ #include "ace/SString.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Explicit_Activation, server, "$Id$") @@ -28,7 +29,7 @@ const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -65,9 +66,9 @@ write_iors_to_file (const char *first_ior, ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file); ACE_OS::sprintf (ior_output_file_3, "%s_3", ior_output_file); - FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); - FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); - FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w"); + FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w")); + FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0 || @@ -118,21 +119,21 @@ write_iors_to_file (const char *first_ior, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp index 3d811df3b1b..a7e69aafb9a 100644 --- a/TAO/examples/POA/FindPOA/FindPOA.cpp +++ b/TAO/examples/POA/FindPOA/FindPOA.cpp @@ -22,6 +22,7 @@ #include "tao/ORB.h" #include "ace/Log_Msg.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (FindPOA, FindPOA, @@ -57,14 +58,15 @@ find_non_existant_POA (PortableServer::POA_ptr parent, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; // Initialize the ORB ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp index a47f480a36d..de04867761d 100644 --- a/TAO/examples/POA/Forwarding/client.cpp +++ b/TAO/examples/POA/Forwarding/client.cpp @@ -20,6 +20,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "testC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forwarding, client, "$Id$") @@ -30,7 +31,7 @@ static int iterations = 3; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "s:i:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:i:k:"); int c; while ((c = get_opts ()) != -1) @@ -96,19 +97,20 @@ do_calls (test_ptr test int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp index b4a4e26b918..d10cdd520d3 100644 --- a/TAO/examples/POA/Forwarding/server.cpp +++ b/TAO/examples/POA/Forwarding/server.cpp @@ -21,6 +21,7 @@ #include "test_i.h" #include "Servant_Activator.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forwarding, server, "$Id$") @@ -30,7 +31,7 @@ static const char *forward_to_ior = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:o:"); int c; while ((c = get_opts ()) != -1) @@ -161,7 +162,7 @@ create_servant_manager (CORBA::ORB_ptr orb, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR ((LM_ERROR, "Cannot open output file for writing IOR: %s\n", @@ -175,22 +176,22 @@ create_servant_manager (CORBA::ORB_ptr orb, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; diff --git a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc index 3c249a12a2e..802087ae34d 100644 --- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc +++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc @@ -9,6 +9,7 @@ project(*lib): taolib_with_idl, portableserver, minimum_corba { } project(*client): taoexe, portableserver, minimum_corba { + exename = client avoids += ace_for_tao after += *lib libs += Generic_Servant diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp index 901c06ce028..e45bee28678 100644 --- a/TAO/examples/POA/Generic_Servant/client.cpp +++ b/TAO/examples/POA/Generic_Servant/client.cpp @@ -4,6 +4,7 @@ #include "ace/Profile_Timer.h" #include "ace/Read_Buffer.h" #include "testC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Generic_Servant, client, "$Id$") @@ -17,7 +18,7 @@ static int timed_method = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:k:i:T:otx"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:k:i:T:otx"); int c; while ((c = get_opts ()) != -1) @@ -104,23 +105,23 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index 72bf969c798..077b016cab6 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -36,7 +36,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, : orb_ (CORBA::ORB::_duplicate (orb)) { // The dll is opened using the dllname passed. - if (this->dll_.open (dllname) == -1) + if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1) ACE_ERROR ((LM_ERROR, "%p\n", this->dll_.error ())); @@ -46,7 +46,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - void *symbol = this->dll_.symbol (factory_function); + void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function)); long function = reinterpret_cast<long> (symbol); servant_supplier_ = @@ -54,7 +54,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. - symbol = this->dll_.symbol (garbage_collection_function); + symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function)); function = reinterpret_cast<long> (symbol); servant_garbage_collector_ = reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function); diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index 3850c8743ce..d2e154105b1 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -36,7 +36,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, : orb_ (CORBA::ORB::_duplicate (orb)) { // The dll is opened using the dllname passed. - if (this->dll_.open (dllname) == -1) + if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1) ACE_ERROR ((LM_ERROR, "%p", this->dll_.error ())); @@ -48,7 +48,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. // - void *symbol = this->dll_.symbol (factory_function); + void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function)); long function = reinterpret_cast<long> (symbol); servant_supplier_ = @@ -56,7 +56,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. - symbol = this->dll_.symbol (garbage_collection_function); + symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function)); function = reinterpret_cast<long> (symbol); servant_garbage_collector_ = diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp index 287be59afe8..6a205694424 100644 --- a/TAO/examples/POA/Loader/Server_Manager.cpp +++ b/TAO/examples/POA/Loader/Server_Manager.cpp @@ -22,7 +22,7 @@ int Server_i::parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -67,9 +67,9 @@ Server_i::write_iors_to_file (const char *first_ior, ior_output_file_); FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, - "w"); + ACE_TEXT("w")); FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, - "w"); + ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -113,8 +113,7 @@ Server_i::init (int argc, char **argv) ACE_TRY { // Initialize the ORB. - orb_ = CORBA::ORB_init (argc, - argv, + orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/Loader/server.cpp b/TAO/examples/POA/Loader/server.cpp index e705b1ddf93..2d69b4826f1 100644 --- a/TAO/examples/POA/Loader/server.cpp +++ b/TAO/examples/POA/Loader/server.cpp @@ -14,15 +14,17 @@ //============================================================================= #include "Server_Manager.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Loader, server, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Server_i server; - if (server.init (argc, argv) != 0) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) != 0) ACE_ERROR_RETURN ((LM_ERROR, "Failure during Initialisation: init ()\n"), -1); diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp index be4283821ee..1a4293ecc61 100644 --- a/TAO/examples/POA/NewPOA/NewPOA.cpp +++ b/TAO/examples/POA/NewPOA/NewPOA.cpp @@ -27,6 +27,7 @@ #include "ace/SString.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (NewPOA, NewPOA, @@ -78,15 +79,15 @@ print_poa (PortableServer::POA_ptr poa } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // The first step Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc index 7b2742cdd86..7be7d2e4804 100644 --- a/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc +++ b/TAO/examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp index c5aa44a172f..b10183877a0 100644 --- a/TAO/examples/POA/On_Demand_Activation/server.cpp +++ b/TAO/examples/POA/On_Demand_Activation/server.cpp @@ -19,6 +19,7 @@ #include "Servant_Activator.h" #include "Servant_Locator.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(On_Demand_Activation, server, "$Id$") @@ -27,7 +28,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -61,8 +62,8 @@ write_iors_to_file (const char *first_ior, ACE_OS::sprintf (ior_output_file_1, "%s_1", ior_output_file); ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file); - FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); - FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); + FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0) @@ -100,17 +101,19 @@ write_iors_to_file (const char *first_ior, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc index 843c856715b..fff74892921 100644 --- a/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc +++ b/TAO/examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server Source_Files { server.cpp Servant_Activator.cpp diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp index 8564219f925..118c807c2c6 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp @@ -69,7 +69,7 @@ ServantManager_i::obtain_servant (const char *str, "Bind failed"), 0); // Now that the dll name is available we open the dll. - if (dll->open (dllname_.c_str ()) == -1) + if (dll->open (ACE_TEXT_TO_TCHAR_IN(dllname_.c_str ())) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p", dll->error ()), @@ -80,7 +80,7 @@ ServantManager_i::obtain_servant (const char *str, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - void *symbol = dll->symbol (create_symbol_.c_str ()); + void *symbol = dll->symbol (ACE_TEXT_TO_TCHAR_IN(create_symbol_.c_str ())); long function = reinterpret_cast<long> (symbol); SERVANT_FACTORY servant_creator = diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp index c1d6f600d34..8e4724ef153 100644 --- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp @@ -26,7 +26,7 @@ int Server_i::parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -71,9 +71,9 @@ Server_i::write_iors_to_file (const char *first_ior, ior_output_file_); FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, - "w"); + ACE_TEXT("w")); FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, - "w"); + ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -118,8 +118,7 @@ Server_i::init (int argc, char **argv) ACE_TRY { // Initialize the ORB. - orb_ = CORBA::ORB_init (argc, - argv, + orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/On_Demand_Loading/server.cpp b/TAO/examples/POA/On_Demand_Loading/server.cpp index 04ff3faf909..4cadc9b1ee4 100644 --- a/TAO/examples/POA/On_Demand_Loading/server.cpp +++ b/TAO/examples/POA/On_Demand_Loading/server.cpp @@ -14,15 +14,17 @@ //============================================================================= #include "Server_Manager.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(On_Demand_Loading, server, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Server_i server; - if (server.init (argc, argv) != 0) + if (server.init (convert.get_argc(), convert.get_ASCII_argv()) != 0) ACE_ERROR_RETURN ((LM_ERROR, "Failure during Initialisation: init ()\n"), -1); diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp index df22f01b0a9..cfe114ea1ea 100644 --- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp +++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp @@ -24,7 +24,7 @@ #include "tao/ORB.h" #include "ace/SString.h" - +#include "ace/Argv_Type_Converter.h" ACE_RCSID (POA_BiDir, POA_BiDir, @@ -76,15 +76,15 @@ print_poa (PortableServer::POA_ptr poa } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // The first step Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc index 71264867f12..2235cf816f4 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc +++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server libs += Generic_Servant after += POA_Generic_Servant_Lib diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp index 5c3bcb3b2b0..6c5aea2407a 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp +++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp @@ -23,6 +23,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Reference_Counted_Servant, server, "$Id$") @@ -53,7 +54,7 @@ static const char *ior_output_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -80,7 +81,7 @@ parse_args (int argc, char **argv) static int write_iors_to_file (const char *ior) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n", @@ -105,20 +106,20 @@ write_iors_to_file (const char *ior) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp index 687f400c6bb..eb51a43f26b 100644 --- a/TAO/examples/POA/RootPOA/RootPOA.cpp +++ b/TAO/examples/POA/RootPOA/RootPOA.cpp @@ -23,20 +23,22 @@ #include "tao/ORB.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RootPOA, RootPOA, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initilize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Resolve the initial references for the name RootPOA thus getting diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp index 9f29271ff6d..9844c3c8490 100644 --- a/TAO/examples/POA/TIE/client.cpp +++ b/TAO/examples/POA/TIE/client.cpp @@ -19,6 +19,7 @@ #include "ace/Profile_Timer.h" #include "testC.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(TIE, client, "$Id$") @@ -28,7 +29,7 @@ static int iterations = 1; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:f:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:f:i:"); int c; while ((c = get_opts ()) != -1) @@ -172,17 +173,18 @@ public: }; int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp index 1c53b7ebb97..884e170f738 100644 --- a/TAO/examples/POA/TIE/server.cpp +++ b/TAO/examples/POA/TIE/server.cpp @@ -18,12 +18,14 @@ #include "ace/SString.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(TIE, server, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; char str[256]; @@ -33,7 +35,7 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "CORBA::ORB_init"); // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. @@ -175,10 +177,10 @@ main (int argc, char **argv) orb->object_to_string (a_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w"); - FILE *output_file_2 = ACE_OS::fopen ("ior_2", "w"); - FILE *output_file_3 = ACE_OS::fopen ("ior_3", "w"); - FILE *output_file_4 = ACE_OS::fopen ("ior_4", "w"); + FILE *output_file_1 = ACE_OS::fopen ("ior_1", ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen ("ior_2", ACE_TEXT("w")); + FILE *output_file_3 = ACE_OS::fopen ("ior_3", ACE_TEXT("w")); + FILE *output_file_4 = ACE_OS::fopen ("ior_4", ACE_TEXT("w")); if (output_file_1) ACE_OS::fprintf (output_file_1, @@ -214,8 +216,8 @@ main (int argc, char **argv) orb->object_to_string (c_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w"); - FILE *output_file_6 = ACE_OS::fopen ("ior_6", "w"); + FILE *output_file_5 = ACE_OS::fopen ("ior_5", ACE_TEXT("w")); + FILE *output_file_6 = ACE_OS::fopen ("ior_6", ACE_TEXT("w")); if (output_file_5) ACE_OS::fprintf (output_file_5, diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index ab94a8760c1..58aefca32f3 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -29,7 +29,7 @@ Grid_Client_i::parse_args (int argc, char *argv[]) { // Parses some of the options that are specific to this example - ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:v:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "df:nk:xw:h:v:"); int c = 0; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp index fcec899cc6e..7e3951da107 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_i.cpp @@ -185,7 +185,7 @@ Grid_Factory_i::make_grid (CORBA::Short width, // Get a memory pool ACE_NEW_THROW_EX (pool_t_, - pool_t (pool_name_), + pool_t (ACE_TEXT_TO_TCHAR_IN(pool_name_)), CORBA::NO_MEMORY ()); // pool_t_ = new pool_t (pool_name_); diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp index b3b5b0dfd7e..f1ede7ccb23 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp @@ -24,7 +24,7 @@ Persistent_Client_i::parse_args (int argc, char *argv[]) { // Parses some of the options that are specific to this example - ACE_Get_Opt get_opts (argc, argv, "dk:f:xw:h:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:f:xw:h:r"); int c = 0; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index b69f2e4f6f8..acb255facee 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -32,7 +32,7 @@ Server<Servant>::~Server (void) template <class Servant> int Server<Servant>::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:m:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:m:"); int c = 0; while ((c = get_opts ()) != -1) @@ -42,7 +42,7 @@ Server<Servant>::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", @@ -205,7 +205,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename) template <class InterfaceObj, class Var> int Client<InterfaceObj, Var>::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:k:x"); int c = 0; int result = 0; diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp index c67b7b80261..d550dfc97db 100644 --- a/TAO/examples/Persistent_Grid/client.cpp +++ b/TAO/examples/Persistent_Grid/client.cpp @@ -1,18 +1,20 @@ // $Id$ # include "Grid_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Grid_Client_i client; ACE_DEBUG ((LM_DEBUG, "\nGrid client\n\n")); - if (client.run ("Grid", argc, argv) == -1) + if (client.run ("Grid", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Persistent_Grid/persistent_client.cpp b/TAO/examples/Persistent_Grid/persistent_client.cpp index 3bd9a3137e6..40d09ce1ea4 100644 --- a/TAO/examples/Persistent_Grid/persistent_client.cpp +++ b/TAO/examples/Persistent_Grid/persistent_client.cpp @@ -1,19 +1,20 @@ // $Id$ # include "Persistent_Client.h" +#include "ace/Argv_Type_Converter.h" // The "persistent client" program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Persistent_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nGrid client\n\n")); - if (client.run ("grid", argc, argv) == -1) + if (client.run ("grid", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp index 99f007eae7f..1debd6b942a 100644 --- a/TAO/examples/Persistent_Grid/server.cpp +++ b/TAO/examples/Persistent_Grid/server.cpp @@ -2,12 +2,14 @@ #include "Simple_util.h" #include "Grid_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Grid_Factory_i> server; ACE_DEBUG ((LM_DEBUG, @@ -18,8 +20,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Grid", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp index 882b5078c5d..1b0da8ea299 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp @@ -32,7 +32,7 @@ UDP_Client_i::svc (void) { ACE_CString client_name ("UDP"); - ACE_TCHAR pid[256]; + char pid[256]; ACE_OS::sprintf (pid, "%u", static_cast<u_int> (ACE_OS::getpid ())); diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp index f7db9081cbd..0cc01c831e8 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp @@ -25,6 +25,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" // The following include file forces DIOP to be linked into the // executable and initialized for static builds. @@ -39,7 +40,7 @@ unsigned int iterations = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:t:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:t:i:"); int c; while ((c = get_opts ()) != -1) @@ -74,15 +75,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp index ba54736c4d4..bd7f21ffee2 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp @@ -22,6 +22,7 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" // The following include file forces DIOP to be linked into the // executable and initialized for static builds. @@ -34,7 +35,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -60,12 +61,13 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -112,7 +114,7 @@ main (int argc, char *argv[]) policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; UDP_i udp_i; @@ -150,7 +152,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index 77db4ccca0e..dfce99289c6 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -35,7 +35,7 @@ UDP_PerformanceClient::svc () { ACE_CString client_name ("UDP"); - ACE_TCHAR pid[256]; + char pid[256]; ACE_OS::sprintf (pid, "%u", static_cast<u_int> (ACE_OS::getpid ())); diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index 07bb98914ee..b641317ef94 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -19,6 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "UDPC.h" @@ -41,7 +42,7 @@ unsigned char performance_test = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:t:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:t:i:"); int c; while ((c = get_opts ()) != -1) @@ -73,15 +74,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceClient" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "PerformanceClient" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 0a003a08589..b015d29ba63 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -18,6 +18,7 @@ #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" +#include "ace/Argv_Type_Converter.h" #include "UDP_i.h" @@ -34,7 +35,7 @@ int orb_threads = 1; // Number of threads running inside the ORB. int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:"); int c; while ((c = get_opts ()) != -1) @@ -79,12 +80,13 @@ static ACE_THR_FUNC_RETURN svc (void *arg) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceServer" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "PerformanceServer" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -132,7 +134,7 @@ main (int argc, char *argv[]) policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; UDP_i udp_i; @@ -169,7 +171,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 8c5b4c7bd21..0f8f2217a1d 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -19,6 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/High_Res_Timer.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" // The following include file forces DIOP to be linked into the @@ -61,13 +62,13 @@ private: //int testClient (char* orbName, char* iorFile) -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB_Test_Client" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index acc84689614..6fe540360ff 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -18,6 +18,7 @@ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" @@ -33,13 +34,13 @@ const char *ior_output_file = "test.ior"; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB_Test_Server" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -80,7 +81,7 @@ int main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp index f8b7c4a070e..8c3afbbbffe 100644 --- a/TAO/examples/Quoter/Factory_Finder.cpp +++ b/TAO/examples/Quoter/Factory_Finder.cpp @@ -15,6 +15,7 @@ // ============================================================================ #include "Factory_Finder.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Quoter, @@ -189,7 +190,7 @@ Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL) u_int Quoter_Factory_Finder_Server::parse_args (void) { - ACE_Get_Opt get_opt (this->argc_, this->argv_, "?d:"); + ACE_Get_Arg_Opt<char> get_opt (this->argc_, this->argv_, "?d:"); int opt; int exit_code = 0; @@ -220,13 +221,14 @@ Quoter_Factory_Finder_Server::parse_args (void) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Quoter_Factory_Finder_Server quoter_Factory_Finder_Server; ACE_TRY_NEW_ENV { - int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = quoter_Factory_Finder_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index eb1bfe506ab..fca74893051 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -16,6 +16,7 @@ #include "Generic_Factory.h" #include "orbsvcs/LifeCycleServiceC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Quoter, Generic_Factory, @@ -243,7 +244,7 @@ Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL) u_int Quoter_Generic_Factory_Server::parse_args (void) { - ACE_Get_Opt get_opt (this->argc_, this->argv_, "l?d:"); + ACE_Get_Arg_Opt<char> get_opt (this->argc_, this->argv_, "l?d:"); int opt; int exit_code = 0; @@ -278,14 +279,15 @@ Quoter_Generic_Factory_Server::parse_args (void) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Quoter_Generic_Factory_Server quoter_Generic_Factory_Server; ACE_TRY_NEW_ENV { - if (quoter_Generic_Factory_Server.init (argc, - argv + if (quoter_Generic_Factory_Server.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc index a5ed3d19def..159c242befc 100644 --- a/TAO/examples/Quoter/Quoter.mpc +++ b/TAO/examples/Quoter/Quoter.mpc @@ -9,6 +9,7 @@ project(*IDL): taoidldefaults { } project(*server): namingexe, lifecycle, minimum_corba, utils { + exename = server after += *IDL Source_Files { server.cpp @@ -21,6 +22,7 @@ project(*server): namingexe, lifecycle, minimum_corba, utils { } project(*client): namingexe, lifecycle, minimum_corba { + exename = client after += *IDL Source_Files { client.cpp @@ -31,6 +33,7 @@ project(*client): namingexe, lifecycle, minimum_corba { } project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils { + exename = Factory_Finder after += *IDL Source_Files { Factory_Finder.cpp @@ -43,6 +46,7 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils { } project(*Generic Factory): namingexe, lifecycle, minimum_corba, utils { + exename = Generic_Factory after += *IDL Source_Files { Generic_Factory.cpp diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index 7dec1d90a22..1d3482cacd6 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNamingC.h" @@ -42,7 +43,7 @@ Quoter_Client::Quoter_Client (void) int Quoter_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "n:d:lx"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "n:d:lx"); int opt; int exit_code = 0; @@ -372,21 +373,22 @@ Quoter_Client::init (int argc, char **argv) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_Thread_Manager thr_mgr; int i; int threads = 1; for (i = 0; i < argc; i++) - if (ACE_OS::strcmp (argv[i], "-n") == 0) - threads = ACE_OS::atoi(argv[i + 1]); + if (ACE_OS::strcmp (convert.get_ASCII_argv()[i], "-n") == 0) + threads = ACE_OS::atoi(convert.get_ASCII_argv()[i + 1]); Quoter_Task **clients = new Quoter_Task*[threads]; for (i = 0; i < threads; i++) - clients[i] = new Quoter_Task (argc, argv); + clients[i] = new Quoter_Task (convert.get_argc(), convert.get_ASCII_argv()); for (i = 0; i < threads; i++) diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index 973111c3e7e..7b8d054358b 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -15,6 +15,7 @@ #include "server.h" #include "tao/ORB_Core.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Quoter, server, "$Id$") @@ -28,7 +29,7 @@ Quoter_Server::Quoter_Server (void) int Quoter_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d:n:"); int c; while ((c = get_opts ()) != -1) @@ -259,13 +260,14 @@ Quoter_Server::~Quoter_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Quoter_Server quoter_server; ACE_TRY_NEW_ENV { - int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = quoter_server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 4207926db61..f4f40d917a1 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -1,7 +1,9 @@ //$Id$ + + #include "Activity.h" -#include "Thread_Task.h" #include "Job_i.h" +#include "Thread_Task.h" #include "POA_Holder.h" #include "Builder.h" @@ -12,7 +14,7 @@ #include "ace/Barrier.h" #include "ace/Timer_Heap.h" #include "ace/Service_Config.h" -#include "ace/Arg_Shifter.h" +//#include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/Signal.h" @@ -65,10 +67,9 @@ Activity::init (int& argc, char *argv [] ACE_ENV_ARG_DECL) { // Copy command line parameter. - ACE_Argv_Type_Converter command_line(argc, argv); + ACE_Argv_Type_Converter convert(argc, argv); - this->orb_ = CORBA::ORB_init (command_line.get_argc(), - command_line.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -402,13 +403,13 @@ Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL) void Activity::create_started_flag_file (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag")))) + if ((current_arg = arg_shifter.get_the_parameter ("-Started_Flag"))) { FILE *file = ACE_OS::fopen (current_arg, ACE_TEXT("w")); @@ -431,8 +432,9 @@ Activity::create_started_flag_file (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_Builder); ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP); @@ -442,7 +444,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER); + ACTIVITY::instance()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp index 7ef5a89da40..37a99e01305 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.cpp +++ b/TAO/examples/RTCORBA/Activity/Builder.cpp @@ -29,9 +29,9 @@ Builder::~Builder(void) int Builder::init (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; int task_count = 0; int poa_count = 0; diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 20c001a4989..10e77ebc9a3 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -19,12 +19,9 @@ #include "ace/Service_Config.h" #include "ace/Service_Object.h" #include "activity_export.h" +#include "ace/Arg_Shifter.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; -ACE_END_VERSIONED_NAMESPACE_DECL - class Activity; class Periodic_Task; class Job_i; diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index 69320dc5323..98f0fee4a44 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -23,8 +23,11 @@ Job_i::poa (void) } int -Job_i::init (ACE_Arg_Shifter& arg_shifter) +Job_i::init (ACE_TArg_Shifter<char>& arg_shifter) { + int tmpInt = 1; + char ** tmp; + ACE_TArg_Shifter<char> arg_shifter_(tmpInt, tmp); job_name_ = arg_shifter.get_current (); // Read the name of the Job arg_shifter.consume_arg (); diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index 8ca42bb86b5..3594aa49416 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -16,9 +16,10 @@ #include "JobS.h" #include "activity_export.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -34,7 +35,7 @@ class activity_Export Job_i : public POA_Job Job_i (void); /// Init the state of this object. - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// = Accessors const ACE_CString& name (void); diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index 07e3f1e97b8..5c9c4755533 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp @@ -11,9 +11,9 @@ POA_Holder::POA_Holder (void) } int -POA_Holder::init (ACE_Arg_Shifter& arg_shifter) +POA_Holder::init (ACE_TArg_Shifter<char>& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; POA_name_ = arg_shifter.get_current (); // Read the name of the POA arg_shifter.consume_arg (); diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h index 3c056a88fba..1e44b40d6b1 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -17,9 +17,10 @@ #include "tao/PortableServer/PortableServer.h" #include "activity_export.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -35,7 +36,7 @@ class activity_Export POA_Holder POA_Holder (void); /// The arg_shifter options are read in the following manner: -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)* - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// Activate the new POA using the parameters initialized before. void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp index 03a87bb3a6c..870fac04ecc 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp @@ -26,9 +26,9 @@ Periodic_Task::~Periodic_Task () } int -Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter) +Periodic_Task::init_task (ACE_TArg_Shifter<char>& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -101,7 +101,7 @@ Periodic_Task::job (Job_ptr job) } void -Periodic_Task::dump_stats (ACE_TCHAR* msg) +Periodic_Task::dump_stats (char* msg) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s%s", name_.c_str (),".dat"); diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h index ca4c822eeff..3fb8ed12a82 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h @@ -19,10 +19,10 @@ #include "ace/SString.h" #include "JobC.h" #include "activity_export.h" +#include "ace/Arg_Shifter.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; -class ACE_Arg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL class Task_Stats; @@ -41,13 +41,13 @@ class activity_Export Periodic_Task : public ACE_Task <ACE_SYNCH> ~Periodic_Task (); /// Init the state of this object. - int init_task (ACE_Arg_Shifter& arg_shifter); + int init_task (ACE_TArg_Shifter<char>& arg_shifter); /// Activate this task, synch on the given barrier. virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping) = 0; /// Dump the stats collected. - void dump_stats (ACE_TCHAR* msg); + void dump_stats (char* msg); /// = Job get/set /// Returns the name of the Job exec'ed by this Task. diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index bcd6ae53d88..1ef20b42e0b 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -55,10 +55,10 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); // first dump what the caller has to say. ACE_OS::fprintf (output_file, "%s\n",msg); @@ -67,7 +67,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, // calc throughput. - ACE_TCHAR out_msg[BUFSIZ]; + char out_msg[BUFSIZ]; ACE_hrtime_t elapsed_microseconds = (end_time_ - base_time_) / scale_factor; double elapsed_seconds = @@ -99,12 +99,12 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, } void -Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) +Task_Stats::dump_latency_stats (char *out_msg, ACE_UINT32 sf) { if (this->samples_count_ == 0u) { ACE_OS::sprintf (out_msg, - ACE_TEXT ("# no data collected\n")); + "# no data collected\n"); return; } @@ -141,7 +141,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) ACE_UINT32 tmax = ACE_CU64_TO_CU32 (tmax_); ACE_OS::sprintf(out_msg, - ACE_TEXT ("#latency : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"), + "#latency : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n", l_min, this->exec_time_min_at_, l_avg, l_max, this->exec_time_max_at_, diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h index 8252c071c89..dcfb00a145b 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.h +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h @@ -61,10 +61,10 @@ class activity_Export Task_Stats /// Record a sample int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index 4a7db7dd4ab..6a27728be15 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -8,10 +8,12 @@ #include "DT_Creator.h" #include "tao/RTScheduling/Current.h" +#include "ace/Arg_Shifter.h" + ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter; int -DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter) +DT_Creator::dt_task_init (ACE_TArg_Shifter<char>& arg_shifter) { static int dt_index = 0; int start_time = 0; @@ -20,7 +22,7 @@ DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter) int importance = 0; char *job_name = 0; int dist = 0; - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; if (arg_shifter.cur_arg_strncasecmp ("-Importance") == 0) { arg_shifter.consume_arg (); @@ -70,9 +72,9 @@ DT_Creator::init (int argc, char *argv []) active_job_count_ = 0; ACE_NEW_RETURN (log, char*[BUFSIZ * 100],-1); - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; dt_count_ = 0; poa_count_ = 0; @@ -136,7 +138,7 @@ DT_Creator::init (int argc, char *argv []) delete this->job_list_[job_count]; return -1; } - else + else job_count++; } else if ((current_arg = arg_shifter.get_the_parameter ("-OutFile"))) @@ -216,10 +218,10 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Synch Name %s\n", synch_name.c_str ())); - + ACE_NEW (synch_, Synch_i); - + Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -274,7 +276,7 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - + for (int i = 0; i < poa_count_; ++i) { poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in () @@ -454,13 +456,13 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current ACE_DEBUG ((LM_DEBUG, "Waiting to Synch\n")); - + while (!this->synch ()->synched ()) { this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - + CORBA::Policy_var sched_param; sched_param = CORBA::Policy::_duplicate (this->sched_param (100)); const char * name = 0; @@ -587,7 +589,7 @@ DT_Creator::check_ifexit (void) shutdown = 1; - FILE* log_file = ACE_OS::fopen (log_file_name_, "w"); + FILE* log_file = ACE_OS::fopen (log_file_name_, ACE_TEXT("w")); if (log_file != NULL) { diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index b461ab298b2..da03d5b5f3f 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -28,7 +28,7 @@ class DT_Creator : public ACE_Service_Object int init (int argc, char *argv []); - int dt_task_init (ACE_Arg_Shifter& arg_shifter); + int dt_task_init (ACE_TArg_Shifter<char>& arg_shifter); virtual void create_distributable_threads (RTScheduling::Current_ptr current ACE_ENV_ARG_DECL_WITH_DEFAULTS); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 5019ee6ae5d..9b874cefd04 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -213,7 +213,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf char msg [BUFSIZ]; ACE_OS::sprintf (msg, "The Guid is " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", gu_id); DT_TEST::instance ()->dt_creator ()->log_msg (msg); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index 2d328877266..e88c41a27eb 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -8,6 +8,7 @@ #include "../Task_Stats.h" #include "../Synch_i.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" DT_Test::DT_Test (void) { @@ -259,13 +260,14 @@ DT_Test::orb (void) } int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_FP_DT_Creator); - DT_TEST::instance ()->run (argc, argv + DT_TEST::instance ()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp index 6179d1dac37..b8aee4ede56 100644 --- a/TAO/examples/RTScheduling/Job_i.cpp +++ b/TAO/examples/RTScheduling/Job_i.cpp @@ -37,7 +37,7 @@ Job_i::poa (void) } int -Job_i::init (ACE_Arg_Shifter& arg_shifter) +Job_i::init (ACE_TArg_Shifter<char>& arg_shifter) { job_name_ = arg_shifter.get_current (); // Read the name of the Job arg_shifter.consume_arg (); @@ -75,7 +75,7 @@ Job_i::work (CORBA::ULong work, char msg [BUFSIZ]; ACE_OS::sprintf (msg, "Guid is " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", guid_); dt_creator_->log_msg (msg); @@ -137,7 +137,7 @@ Job_i::dump_stats (void) char fname [BUFSIZ]; ACE_OS::sprintf (fname, "Job_" - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A ".dat", guid_); @@ -150,7 +150,7 @@ Job_i::dump_stats (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "#Schedule Output for DT " - ACE_SIZE_T_FORMAT_SPECIFIER, + ACE_SIZE_T_FORMAT_SPECIFIER_A, guid_); task_stats_->dump_samples (fname, diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h index 3aaf9bf3e1b..6b290a7e7a6 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -17,8 +17,10 @@ #include "Task_Stats.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL class DT_Creator; @@ -38,7 +40,7 @@ class Job_i : public POA_Job ~Job_i (void); /// Init the state of this object. - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// = Accessors const ACE_CString& name (void); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index bfb170e19b2..7aca93a7626 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -92,7 +92,7 @@ MIF_Task::perform_task (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "MIF_Task::perform_task " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", count_); dt_creator_->log_msg (msg); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 8ef6d268b8d..ebf9c28cd9d 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -8,6 +8,7 @@ #include "../Thread_Task.h" #include "../Task_Stats.h" #include "../Synch_i.h" +#include "ace/Argv_Type_Converter.h" DT_Test::DT_Test (void) { @@ -155,15 +156,16 @@ DT_Test::current (void) } int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_MIF_DT_Creator); ACE_DEBUG ((LM_DEBUG, "%t\n")); - DT_TEST::instance ()->run (argc, argv + DT_TEST::instance ()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp index 3013a8769f7..61a51a7ff8c 100644 --- a/TAO/examples/RTScheduling/POA_Holder.cpp +++ b/TAO/examples/RTScheduling/POA_Holder.cpp @@ -12,12 +12,12 @@ POA_Holder::POA_Holder (void) } int -POA_Holder::init (ACE_Arg_Shifter& arg_shifter) +POA_Holder::init (ACE_TArg_Shifter<char>& arg_shifter) { ACE_DEBUG ((LM_DEBUG, "Init POA\n")); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; POA_name_ = arg_shifter.get_current (); // Read the name of the POA arg_shifter.consume_arg (); diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h index 28adbd31a18..b155203b515 100644 --- a/TAO/examples/RTScheduling/POA_Holder.h +++ b/TAO/examples/RTScheduling/POA_Holder.h @@ -17,11 +17,12 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -//#include "activity_export.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -38,7 +39,7 @@ public: /// The arg_shifter options are read in the following manner: ///-POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)* - int init (ACE_Arg_Shifter& arg_shifter); + int init (ACE_TArg_Shifter<char>& arg_shifter); /// Activate the new POA using the parameters initialized before. void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp index 3e0b46bca7d..8abff46a9f0 100644 --- a/TAO/examples/RTScheduling/Starter.cpp +++ b/TAO/examples/RTScheduling/Starter.cpp @@ -2,6 +2,7 @@ #include "Starter.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Argv_Type_Converter.h" Starter::Starter (CORBA::ORB_ptr orb) @@ -132,12 +133,13 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 77d364d710d..c3078316775 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -57,11 +57,11 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h index b32f1041bfc..e76f669562f 100644 --- a/TAO/examples/RTScheduling/Task_Stats.h +++ b/TAO/examples/RTScheduling/Task_Stats.h @@ -60,10 +60,10 @@ class Task_Stats /// Record a sample int sample (ACE_UINT32 thr_run_time, int thr_count); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp index e7c3997f565..217f34ed25e 100644 --- a/TAO/examples/RTScheduling/Thread_Task.cpp +++ b/TAO/examples/RTScheduling/Thread_Task.cpp @@ -45,7 +45,7 @@ Thread_Task::svc (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "Thread_Task::svc Imp=%d Guid=" - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", importance_, count_); @@ -112,7 +112,7 @@ Thread_Task::dump_stats (void) char fname [BUFSIZ]; ACE_OS::sprintf (fname, "DT_" - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A ".dat",count_); if (TAO_debug_level > 0) @@ -123,7 +123,7 @@ Thread_Task::dump_stats (void) char msg [BUFSIZ]; ACE_OS::sprintf (msg, "#Schedule Output for DT " - ACE_SIZE_T_FORMAT_SPECIFIER, + ACE_SIZE_T_FORMAT_SPECIFIER_A, count_); task_stats_->dump_samples (fname, diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index 6a1e517f271..afc6751b284 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -34,7 +34,7 @@ Server<Servant>::~Server (void) template <class Servant> int Server<Servant>::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:"); int c = 0; while ((c = get_opts ()) != -1) @@ -44,7 +44,7 @@ Server<Servant>::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", @@ -317,7 +317,7 @@ Client<INTERFACE_OBJECT, Var>::read_ior (char *filename) template <class INTERFACE_OBJECT, class Var> int Client<INTERFACE_OBJECT, Var>::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:nk:x"); int c = 0; int result = 0; diff --git a/TAO/examples/Simple/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp index 0f426992f06..0368a2a9a6b 100644 --- a/TAO/examples/Simple/bank/client.cpp +++ b/TAO/examples/Simple/bank/client.cpp @@ -1,19 +1,20 @@ // $Id$ # include "Bank_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Bank_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nBank client\n\n")); - if (client.run ("Bank",argc, argv) == -1) + if (client.run ("Bank",convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp index 57ded2b1063..e3742560466 100644 --- a/TAO/examples/Simple/bank/server.cpp +++ b/TAO/examples/Simple/bank/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "AccountManager_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<AccountManager_i> server; ACE_DEBUG ((LM_DEBUG, @@ -15,8 +17,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { if (server.init ("Bank", - argc, - argv + convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index 268da16eaeb..a89acd1f4d7 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -45,7 +45,7 @@ Client_i::~Client_i (void) int Client_i::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:f:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index 208a440ad86..bfffd972074 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -35,7 +35,7 @@ Server_i::~Server_i (void) int Server_i::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -109,7 +109,7 @@ int Server_i::write_IOR(const char* ior) { FILE* ior_output_file_ = - ACE_OS::fopen (this->ior_file_name_, "w"); + ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w")); if (ior_output_file_) { diff --git a/TAO/examples/Simple/chat/client.cpp b/TAO/examples/Simple/chat/client.cpp index 7caf6e595a0..310388c23b3 100644 --- a/TAO/examples/Simple/chat/client.cpp +++ b/TAO/examples/Simple/chat/client.cpp @@ -17,15 +17,17 @@ // =========================================================== #include "Client_i.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { Client_i client_i; - if (client_i.init (argc, argv) == -1 + if (client_i.init (convert.get_argc(), convert.get_ASCII_argv()) == -1 || client_i.run () == -1) return -1; diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp index 66937b85a2e..6f418bb94bc 100644 --- a/TAO/examples/Simple/chat/server.cpp +++ b/TAO/examples/Simple/chat/server.cpp @@ -18,16 +18,17 @@ // =========================================================== #include "Server_i.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { Server_i server_i; - int ret = server_i.init (argc, argv ACE_ENV_ARG_PARAMETER); + int ret = server_i.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Simple/echo/client.cpp b/TAO/examples/Simple/echo/client.cpp index f2aa863069b..e684030e64e 100644 --- a/TAO/examples/Simple/echo/client.cpp +++ b/TAO/examples/Simple/echo/client.cpp @@ -1,21 +1,22 @@ //$Id$ # include "Echo_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Echo_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nEcho client\n\n")); if (client.run ("Echo", - argc, - argv) == -1) + convert.get_argc(), + convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index b74d5bc7af6..1d10849bf82 100644 --- a/TAO/examples/Simple/echo/server.cpp +++ b/TAO/examples/Simple/echo/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Echo_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Echo_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Echo", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp index d333682c8dd..0d5abe3d825 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.cpp +++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp @@ -32,7 +32,7 @@ Grid_Client_i::parse_args (int argc, char *argv[]) { // Parses some of the options that are specific to this example - ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:p:q:v:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "df:nk:xw:h:p:q:v:"); int c = 0; while ((c = get_opts ()) != -1) diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp index 4bec0e49dad..e3bfee639d3 100644 --- a/TAO/examples/Simple/grid/client.cpp +++ b/TAO/examples/Simple/grid/client.cpp @@ -1,19 +1,20 @@ // $Id$ # include "Grid_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Grid_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\nGrid client\n\n")); - if (client.run ("Grid", argc, argv) == -1) + if (client.run ("Grid", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp index 6e95c17f2b5..4f871176f8c 100644 --- a/TAO/examples/Simple/grid/server.cpp +++ b/TAO/examples/Simple/grid/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Grid_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Grid_Factory_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Grid", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index 78bd1de184d..8d7359b8eec 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -138,7 +138,7 @@ DLL_ORB::fini (void) int Time_Date_Servant::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dn:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dn:o:"); int c = 0; this->orb_ = "ORB"; @@ -150,7 +150,7 @@ Time_Date_Servant::parse_args (int argc, char *argv[]) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp index 452afbec7fa..2f1f52367c6 100644 --- a/TAO/examples/Simple/time-date/client.cpp +++ b/TAO/examples/Simple/time-date/client.cpp @@ -1,18 +1,20 @@ // $Id$ # include "Time_Date_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Time_Date_Client_i client; ACE_DEBUG ((LM_DEBUG, "\nTime_Date client\n\n")); - if (client.run ("Time_Date", argc, argv) == -1) + if (client.run ("Time_Date", convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/time-date/server.cpp b/TAO/examples/Simple/time-date/server.cpp index f9ddbadc4bb..11282eacc7a 100644 --- a/TAO/examples/Simple/time-date/server.cpp +++ b/TAO/examples/Simple/time-date/server.cpp @@ -21,15 +21,18 @@ #include "ace/Service_Config.h" #include "ace/Reactor.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (time_date, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (ACE_Service_Config::open (argc, argv) == -1 + ACE_Argv_Type_Converter convert (argc, argv); + + if (ACE_Service_Config::open (convert.get_argc(), convert.get_TCHAR_argv()) == -1 && errno != ENOENT) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index ace24d63d6e..c21f21625ef 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -49,7 +49,7 @@ Time_Client_i::run (const char *name, // Print out value // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly // under 64-bit solaris. - ACE_TCHAR ascii_timedate[64] = ""; + ACE_TCHAR ascii_timedate[64] = ACE_TEXT(""); ACE_OS::ctime_r (reinterpret_cast<const time_t *> (&timedate), ascii_timedate, 64); diff --git a/TAO/examples/Simple/time/client.cpp b/TAO/examples/Simple/time/client.cpp index 28eab3cb977..fe1bfe44049 100644 --- a/TAO/examples/Simple/time/client.cpp +++ b/TAO/examples/Simple/time/client.cpp @@ -1,19 +1,20 @@ //$Id$ # include "Time_Client_i.h" +#include "ace/Argv_Type_Converter.h" // The client program for the application. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); Time_Client_i client; - ACE_DEBUG ((LM_DEBUG, "\n\tTime and date client\n\n")); - if (client.run ("Time",argc, argv) == -1) + if (client.run ("Time",convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp index 8c3792e16b5..22587e72d04 100644 --- a/TAO/examples/Simple/time/server.cpp +++ b/TAO/examples/Simple/time/server.cpp @@ -1,12 +1,14 @@ // $Id$ #include "../Simple_util.h" #include "Time_i.h" +#include "ace/Argv_Type_Converter.h" // This is the main driver program for the time and date server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server<Time_i> server; ACE_DEBUG ((LM_DEBUG, @@ -17,8 +19,8 @@ main (int argc, char *argv[]) ACE_TRY { if (server.init ("Time", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 66548bcc92c..008c19f07ba 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -37,6 +37,7 @@ #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event_Supplier, DualEC_Sup, @@ -824,7 +825,7 @@ DualEC_Supplier::load_schedule_data () FILE *input_file; int scan_count = 0; - input_file = ACE_OS::fopen(this->input_file_name_, "r"); + input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r")); if (input_file) { @@ -952,7 +953,7 @@ DualEC_Supplier::load_schedule_data () unsigned int DualEC_Supplier::get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "f:m:b:n:w:dsrp"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:b:n:w:dsrp"); int opt; int temp; @@ -1084,8 +1085,10 @@ DualEC_Supplier::get_options (int argc, char *argv []) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); @@ -1111,8 +1114,8 @@ main (int argc, char *argv []) // Initialize ORB. TAO_ORB_Manager orb_Manager; - orb_Manager.init (argc, - argv + orb_Manager.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1121,7 +1124,7 @@ main (int argc, char *argv []) DualEC_Supplier *event_Supplier_ptr; ACE_NEW_RETURN (event_Supplier_ptr, - DualEC_Supplier(argc, argv), + DualEC_Supplier(convert.get_argc(), convert.get_ASCII_argv()), -1); // Initialize everthing diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index e14e834f16c..2a760e659f3 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -37,6 +37,7 @@ #include "ace/streams.h" #include "ace/os_include/os_limits.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Event_Supplier, Event_Con, "$Id$") @@ -253,7 +254,7 @@ Demo_Consumer::shutdown (void) static unsigned int get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "Oc:djm:s:t:?"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "Oc:djm:s:t:?"); int opt; while ((opt = get_opt ()) != EOF) @@ -289,14 +290,16 @@ get_options (int argc, char *argv []) // function main. int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -334,7 +337,7 @@ main (int argc, char *argv []) ACE_Scheduler_Factory::use_config (naming_context.in ()); - if (get_options (argc, argv)) + if (get_options (convert.get_argc(), convert.get_ASCII_argv())) ACE_OS::exit (-1); // Get the Event Channel. diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 748cc06b360..31a5d91e55c 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -34,6 +34,7 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event_Supplier, Event_Sup, @@ -129,7 +130,7 @@ Event_Supplier::load_schedule_data FILE *input_file; int scan_count = 0; - input_file = ACE_OS::fopen(this->input_file_name_, "r"); + input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r")); if (input_file) { @@ -381,7 +382,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data, unsigned int Event_Supplier::get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "f:m:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:"); int opt; int temp; @@ -443,15 +444,17 @@ Event_Supplier::get_options (int argc, char *argv []) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. TAO_ORB_Manager orb_Manager; - orb_Manager.init (argc, - argv + orb_Manager.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -460,7 +463,7 @@ main (int argc, char *argv []) Event_Supplier *event_Supplier_ptr; ACE_NEW_RETURN (event_Supplier_ptr, - Event_Supplier(argc, argv), + Event_Supplier(convert.get_argc(), convert.get_ASCII_argv()), -1); // Initialize everthing diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index f0d96b78e60..7a5845427cd 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -36,6 +36,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" #include "ace/os_include/os_ctype.h" @@ -137,7 +138,7 @@ Logging_Supplier::load_schedule_data FILE *input_file; int scan_count = 0; - input_file = ACE_OS::fopen(this->input_file_name_, "r"); + input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r")); if (input_file) { @@ -410,7 +411,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, unsigned int Logging_Supplier::get_options (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "f:m:d:s"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:d:s"); int opt; int temp; @@ -489,15 +490,17 @@ Logging_Supplier::get_options (int argc, char *argv []) // function main int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. TAO_ORB_Manager orb_Manager; - orb_Manager.init (argc, - argv + orb_Manager.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -506,7 +509,7 @@ main (int argc, char *argv []) Logging_Supplier *event_Supplier_ptr; ACE_NEW_RETURN (event_Supplier_ptr, - Logging_Supplier(argc, argv), + Logging_Supplier(convert.get_argc(), convert.get_ASCII_argv()), -1); // Initialize everthing diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index b811e0b9aca..37cde53d55f 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -3,15 +3,18 @@ #include "testC.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(TypeCode_Creation, main, "$Id$") -int main(int argc, char *argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/ior_corbaloc/client.cpp b/TAO/examples/ior_corbaloc/client.cpp index 1cbae2ff35e..6c0c946cc87 100644 --- a/TAO/examples/ior_corbaloc/client.cpp +++ b/TAO/examples/ior_corbaloc/client.cpp @@ -18,9 +18,12 @@ // ============================================================================ #include "ior_corbaloc_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -29,7 +32,7 @@ int main (int argc, char *argv []) IOR_corbaloc_Client_i client; int init_result; - init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + init_result = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (init_result == 0) diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp index 80c352cb9fa..a91683c5637 100644 --- a/TAO/examples/ior_corbaloc/corbaname_client.cpp +++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp @@ -14,17 +14,19 @@ #include "corbalocC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); @@ -38,7 +40,7 @@ int main (int argc, char *argv []) // Get an object reference using a corbaname: style URL CORBA::Object_var obj = - orb->string_to_object (argv[1] + orb->string_to_object (convert.get_ASCII_argv()[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp index b5351d69be2..fcf73639625 100644 --- a/TAO/examples/ior_corbaloc/server.cpp +++ b/TAO/examples/ior_corbaloc/server.cpp @@ -4,15 +4,18 @@ #include "status_i.h" #include "tao/PortableServer/PortableServer.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -43,7 +46,7 @@ int main (int argc, char* argv[]) // Create the servant corbaloc_Status_i status_i; - status_i.set_name (argv[1]); + status_i.set_name (convert.get_ASCII_argv()[1]); // Activate it to obtain the reference corbaloc::Status_var status = status_i._this (); diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp index bc4b918404d..a25399ef526 100644 --- a/TAO/examples/mfc/client.cpp +++ b/TAO/examples/mfc/client.cpp @@ -2,19 +2,20 @@ #include "w32_testS.h" #include "ace/streams.h" - +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *orb_name = ""; ACE_DEBUG ((LM_DEBUG, "Initializing the ORB!\n")); - CORBA::ORB_var the_orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var the_orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp index c7ebabb7368..4eef48b2227 100644 --- a/TAO/interop-tests/wchar/client.cpp +++ b/TAO/interop-tests/wchar/client.cpp @@ -269,7 +269,7 @@ run_tests (interop::WChar_Passer_ptr server ACE_ENV_ARG_DECL) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:t:vx")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("k:t:vx")); int c; while ((c = get_opts ()) != -1) switch (c) @@ -329,11 +329,11 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) ACE_Argv_Type_Converter command_line(argc, argv); // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() ); - if (parse_args(argc, argv) == -1) + if (parse_args(command_line.get_argc(), command_line.get_TCHAR_argv()) == -1) return 0; // Destringify ior - CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_ALWAYS_CHAR(ior) ACE_ENV_ARG_PARAMETER); + CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_TO_CHAR_IN(ior) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if( CORBA::is_nil( obj.in() ) ) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp index 8b464c4cbd5..2d1df52feda 100644 --- a/TAO/interop-tests/wchar/server.cpp +++ b/TAO/interop-tests/wchar/server.cpp @@ -27,7 +27,7 @@ int parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:v")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("o:v")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/interop-tests/wchar/wchar_reference.cpp b/TAO/interop-tests/wchar/wchar_reference.cpp index 0ca0384c81b..431517673a2 100644 --- a/TAO/interop-tests/wchar/wchar_reference.cpp +++ b/TAO/interop-tests/wchar/wchar_reference.cpp @@ -23,19 +23,19 @@ #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) -ACE_OS::WChar +wchar_t wchar_reference::ref_wchar[NUM_KEYS] = {1234}; -const ACE_OS::WChar * +const wchar_t * wchar_reference::ref_wstring[NUM_KEYS] = {L"have a nice day"}; -ACE_OS::WChar +wchar_t wchar_reference::ref_warray[NUM_KEYS][10] = { {L'a',L'A',L'!',L'1',L'4',L'[',L'?',L'%',L'X',L'E'} }; -const ACE_OS::WChar * +const wchar_t * wchar_reference::ref_except[NUM_KEYS] = {L"TEST EXCEPTION"}; @@ -50,19 +50,19 @@ wchar_reference::set_verbose(int v) this->verbose_ = v; } -ACE_OS::WChar +wchar_t wchar_reference::get_wchar (short key) { return wchar_reference::ref_wchar[key]; } -const ACE_OS::WChar * +const wchar_t * wchar_reference::get_wstring (short key) { return wchar_reference::ref_wstring[key]; } -ACE_OS::WChar * +wchar_t * wchar_reference::get_warray (short key) { return wchar_reference::ref_warray[key]; @@ -70,22 +70,22 @@ wchar_reference::get_warray (short key) void wchar_reference::assign_warray (short key, - ACE_OS::WChar *warray) + wchar_t *warray) { ACE_OS::memcpy(warray, wchar_reference::ref_warray[key], - 10*(sizeof(ACE_OS::WChar)) + 10*(sizeof(wchar_t)) ); } -const ACE_OS::WChar * +const wchar_t * wchar_reference::get_except (short key) { return wchar_reference::ref_except[key]; } int -wchar_reference::match_wchar (short key, ACE_OS::WChar test) +wchar_reference::match_wchar (short key, wchar_t test) { if (verbose_) ACE_DEBUG ((LM_DEBUG, @@ -95,7 +95,7 @@ wchar_reference::match_wchar (short key, ACE_OS::WChar test) } int -wchar_reference::match_wstring (short key, const ACE_OS::WChar *test) +wchar_reference::match_wstring (short key, const wchar_t *test) { if (key == -1) { @@ -114,7 +114,7 @@ wchar_reference::match_wstring (short key, const ACE_OS::WChar *test) } int -wchar_reference::match_warray (short key, const ACE_OS::WChar *test) +wchar_reference::match_warray (short key, const wchar_t *test) { if (verbose_) ACE_DEBUG ((LM_DEBUG, @@ -133,7 +133,7 @@ wchar_reference::match_warray (short key, const ACE_OS::WChar *test) } int -wchar_reference::match_except(short key, const ACE_OS::WChar *test) +wchar_reference::match_except(short key, const wchar_t *test) { if (verbose_) ACE_DEBUG ((LM_DEBUG, @@ -153,19 +153,19 @@ wchar_reference::set_verbose(int v) this->verbose_ = v; } -ACE_OS::WChar +wchar_t wchar_reference::get_wchar (short ) { return 0; } -const ACE_OS::WChar * +const wchar_t * wchar_reference::get_wstring (short ) { return 0; } -ACE_OS::WChar * +wchar_t * wchar_reference::get_warray (short ) { return 0; @@ -173,30 +173,30 @@ wchar_reference::get_warray (short ) void wchar_reference::assign_warray (short , - ACE_OS::WChar *) + wchar_t *) { } -const ACE_OS::WChar * +const wchar_t * wchar_reference::get_except (short ) { return 0; } int -wchar_reference::match_wchar (short , ACE_OS::WChar ) +wchar_reference::match_wchar (short , wchar_t ) { return 0; } int -wchar_reference::match_wstring (short , const ACE_OS::WChar *) +wchar_reference::match_wstring (short , const wchar_t *) { return 0; } int -wchar_reference::match_warray (short , const ACE_OS::WChar *) +wchar_reference::match_warray (short , const wchar_t *) { return 0; } diff --git a/TAO/interop-tests/wchar/wchar_reference.h b/TAO/interop-tests/wchar/wchar_reference.h index 735eb81563f..d731d60bda1 100644 --- a/TAO/interop-tests/wchar/wchar_reference.h +++ b/TAO/interop-tests/wchar/wchar_reference.h @@ -30,24 +30,24 @@ class wchar_reference public: wchar_reference (int v = 0); void set_verbose (int v); - ACE_OS::WChar get_wchar (short key); - const ACE_OS::WChar *get_wstring (short key); - ACE_OS::WChar *get_warray (short key); - void assign_warray (short key, ACE_OS::WChar *warray); + wchar_t get_wchar (short key); + const wchar_t *get_wstring (short key); + wchar_t *get_warray (short key); + void assign_warray (short key, wchar_t *warray); - const ACE_OS::WChar *get_except (short key); + const wchar_t *get_except (short key); - int match_wchar (short key, ACE_OS::WChar test); - int match_wstring (short key, const ACE_OS::WChar* test); - int match_warray (short key, const ACE_OS::WChar *test); - int match_except (short key, const ACE_OS::WChar *test); + int match_wchar (short key, wchar_t test); + int match_wstring (short key, const wchar_t* test); + int match_warray (short key, const wchar_t *test); + int match_except (short key, const wchar_t *test); private: #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) - static ACE_OS::WChar ref_wchar[NUM_KEYS]; - static const ACE_OS::WChar *ref_wstring[NUM_KEYS]; - static ACE_OS::WChar ref_warray[NUM_KEYS][10]; - static const ACE_OS::WChar *ref_except[NUM_KEYS]; + static wchar_t ref_wchar[NUM_KEYS]; + static const wchar_t *ref_wstring[NUM_KEYS]; + static wchar_t ref_warray[NUM_KEYS][10]; + static const wchar_t *ref_except[NUM_KEYS]; #endif // ACE_HAS_WCHAR int verbose_; }; diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index a3245dae921..e6021aa0f2b 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -31,9 +31,7 @@ ACE_RCSID(Concurrency_Service, // Default Constructor. Concurrency_Service::Concurrency_Service (void) - : use_naming_service_ (1), - ior_file_name_ (0), - pid_file_name_ (0) + : use_naming_service_ (1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Concurrency_Service::Concurrency_Service (void)\n"))); @@ -56,7 +54,7 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Concurrency_Service::parse_args\n"))); - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:p:s")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("do:p:s")); int c; while ((c = get_opts ()) != -1) @@ -66,10 +64,10 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv) TAO_debug_level++; break; case 'o': // output the IOR to a file - this->ior_file_name_ = get_opts.opt_arg(); + this->ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg())); break; case 'p': - this->pid_file_name_ = get_opts.opt_arg(); + this->pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg())); break; case 's': this->use_naming_service_ = 0; @@ -119,16 +117,16 @@ Concurrency_Service::init (int argc, ACE_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", - ACE_TEXT_CHAR_TO_TCHAR(str.in ()))); + ACE_TEXT_TO_TCHAR_IN(str.in ()))); - if (this->ior_file_name_ != 0) + if (this->ior_file_name_.length() != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } @@ -136,9 +134,9 @@ Concurrency_Service::init (int argc, ACE_OS::fclose (iorf); } - if (this->pid_file_name_ != 0) + if (this->pid_file_name_.length() != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h index ccd0fe73930..621ff2fb675 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h @@ -27,6 +27,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Log_Msg.h" +#include "ace/String_Base.h" + #include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Concurrency/Concurrency_Utils.h" #include "orbsvcs/Naming/Naming_Client.h" @@ -74,10 +76,10 @@ private: int use_naming_service_; // Flag to tell wheter the naming service will be used. - const char *ior_file_name_; + ACE_CString ior_file_name_; // The name of the file where we output the IOR. - const char *pid_file_name_; + ACE_CString pid_file_name_; // The name of a file where the process stores its pid. TAO_ORB_Manager orb_manager_; diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index 0ef63352dd9..884745a7b8a 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -265,7 +265,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) if (ACE_OS::strcmp(this->ior_file_name_.c_str(), "") != 0) { FILE *output_file= - ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(this->ior_file_name_.c_str()), + ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(this->ior_file_name_.c_str()), ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -279,7 +279,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) if (ACE_OS::strcmp(this->pid_file_name_.c_str(), "") != 0) { FILE *pidf = - ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(this->pid_file_name_.c_str()), + ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(this->pid_file_name_.c_str()), ACE_TEXT("w")); if (pidf != 0) { @@ -292,7 +292,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The EC IOR is <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(str.in ()))); + ACE_TEXT_TO_TCHAR_IN(str.in ()))); if (bind_to_naming_service_ && !CORBA::is_nil (naming_context.in ())) { @@ -305,7 +305,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%s; running event service\n"), - ACE_TEXT_CHAR_TO_TCHAR(__FILE__))); + ACE_TEXT_TO_TCHAR_IN(__FILE__))); this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -343,7 +343,7 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) // default values... this->service_name_ = "EventService"; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:s:q:bx")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:s:q:bx")); int opt; while ((opt = get_opt ()) != EOF) @@ -351,18 +351,18 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) switch (opt) { case 'n': - this->service_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); + this->service_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()); case 'o': - this->ior_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); + this->ior_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()); break; case 'p': - this->pid_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); + this->pid_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()); break; case 'q': - this->object_id_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); + this->object_id_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()); break; case 'b': diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index add3c0f5153..bf2db753fd0 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -143,7 +143,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) if (n_threads) this->num_threads_ = ACE_OS::atoi(n_threads); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("d:jn:ps:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("d:jn:ps:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index b4febf2f835..fd6725e9b77 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -122,9 +122,9 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( str = process_str; const int ENV_BUF_LEN = 512; - char buf[ENV_BUF_LEN]; + ACE_TCHAR buf[ENV_BUF_LEN]; server_addr.addr_to_string(buf,ENV_BUF_LEN,0); - options.setenv("EventChannelFactoryAddr", buf); + options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf); // extract the object ID from the criteria for (size_t i = 0; i < the_criteria.length(); ++i) @@ -135,10 +135,10 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( const char* id_str = name[0].id.in(); the_criteria[i].val >>= val; if (id_str[0] != '-') // environment variable - options.setenv(id_str, "%s", val); + options.setenv(ACE_TEXT_TO_TCHAR_IN(id_str), "%s", val); else {// command line option - ACE_OS::sprintf(buf, " %s %s", id_str, val); - str += buf; + ACE_OS::sprintf(buf, ACE_TEXT(" %s %s"), id_str, val); + str += ACE_TEXT_TO_CHAR_IN(buf); } } } diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index e2189bb34db..5762af36ef1 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -4,6 +4,7 @@ #include "ace/Task.h" #include "ace/SString.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Factory_Service, FTRTEC_Factory_Service, @@ -13,9 +14,9 @@ namespace { ACE_CString id, kind, output; } -int parse_args(int argc, char* argv[]) +int parse_args(int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:k:o:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:k:o:")); int opt; int result = 0; @@ -24,13 +25,13 @@ int parse_args(int argc, char* argv[]) switch (opt) { case 'i': - id = get_opt.opt_arg (); + id.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ())); break; case 'k': - kind = get_opt.opt_arg (); + kind.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ())); break; case 'o': - output = get_opt.opt_arg (); + output.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ())); break; default: result = -1; @@ -52,16 +53,17 @@ int parse_args(int argc, char* argv[]) return 0; } -int main(int argc, ACE_TCHAR* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - 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; - if (parse_args(argc, argv) == -1) + if (parse_args(convert.get_argc(), convert.get_TCHAR_argv()) == -1) return -1; CORBA::Object_var obj = @@ -125,7 +127,7 @@ int main(int argc, ACE_TCHAR* argv[]) if (ACE_OS::strcmp(output.c_str(), "") != 0) { FILE *output_file= - ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(output.c_str()), + ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(output.c_str()), ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index e431da580ae..2cd95f6e30a 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" /// include this file to statically linked with FT ORB @@ -18,13 +19,13 @@ ACE_RCSID (Gateway_Service, namespace { CORBA::ORB_var orb; FtRtecEventChannelAdmin::EventChannel_var ftec; - ACE_CString ior_file_name; + ACE_TString ior_file_name; } int parse_args(int argc, ACE_TCHAR** argv) { ACE_TRY_NEW_ENV { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:n:o:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:n:o:")); int opt; CosNaming::Name name(1); name.length(1); @@ -36,7 +37,7 @@ int parse_args(int argc, ACE_TCHAR** argv) { case 'i': { - CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg () + CORBA::Object_var obj = orb->string_to_object(ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() @@ -48,7 +49,7 @@ int parse_args(int argc, ACE_TCHAR** argv) name[0].id = CORBA::string_dup(get_opt.opt_arg ()); break; case 'o': - ior_file_name = get_opt.opt_arg (); + ior_file_name.set (get_opt.opt_arg ()); break; } } @@ -79,13 +80,15 @@ int parse_args(int argc, ACE_TCHAR** argv) int main(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; - if (parse_args(argc, argv)==-1) + if (parse_args(convert.get_argc(), convert.get_TCHAR_argv())==-1) return 1; PortableServer::POA_var @@ -115,7 +118,7 @@ int main(int argc, ACE_TCHAR** argv) ACE_TRY_CHECK; FILE *output_file= - ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name.c_str()), + ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(ior_file_name.c_str()), ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 03fc838db47..770d8ef9870 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -70,12 +70,11 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid event type.\n" - "EventType domain: <%s>\n" - "EventType type: <%s>\n" - "EventName: <%s>\n"), + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid event type.\n") + ACE_TEXT ("EventType domain: <%s>\n") + ACE_TEXT ("EventType type: <%s>\n") + ACE_TEXT ("EventName: <%s>\n"), domain_name.in(), type_name.in(), event_name.in() @@ -110,10 +109,9 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid structured event.\n" - "filterable_data[0] must be \"FTDomainId\", not \"%s\"\n"), + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid structured event.\n") + ACE_TEXT ("filterable_data[0] must be \"FTDomainId\", not \"%s\"\n"), event.filterable_data[0].name.in() )); } @@ -125,10 +123,9 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid structured event.\n" - "filterable_data[1] must be \"Location\", not \"%s\"\n"), + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid structured event.\n") + ACE_TEXT ("filterable_data[1] must be \"Location\", not \"%s\"\n"), event.filterable_data[1].name.in() )); } @@ -140,11 +137,10 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type ( if (TAO_debug_level > 6) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_DefaultFaultAnalyzer::validate_event_type: " - "Received invalid structured event.\n" - "There must be at least two name/value pairs in " - "the filterable_data field, for \"FTDomainId\" and \"Location\".\n") + ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ") + ACE_TEXT ("Received invalid structured event.\n") + ACE_TEXT ("There must be at least two name/value pairs in ") + ACE_TEXT ("the filterable_data field, for \"FTDomainId\" and \"Location\".\n") )); } result = -1; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index 5a08f15d6d9..5a6a3043b65 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -145,9 +145,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Disconnecting consumer from FaultNotifier.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Disconnecting consumer from FaultNotifier.\n") )); } @@ -158,9 +157,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Deactivating from POA.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Deactivating from POA.\n") )); } @@ -173,9 +171,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Error disconnecting from notifier (ignored).\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Error disconnecting from notifier (ignored).\n") ); } ACE_ENDTRY; @@ -184,9 +181,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::fini: " - "Setting our object reference to nil.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::fini: ") + ACE_TEXT ("Setting our object reference to nil.\n") )); } @@ -234,9 +230,8 @@ void TAO::FT_FaultConsumer::push_structured_event ( if (TAO_debug_level > 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultConsumer::push_structured_event: " - "Received Fault notification(%d):\n"), + ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") + ACE_TEXT ("Received Fault notification(%d):\n"), static_cast<unsigned int> (this->notifications_) )); } @@ -250,9 +245,8 @@ void TAO::FT_FaultConsumer::push_structured_event ( if (result != 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_FaultConsumer::push_structured_event: " - "Received invalid fault event type.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") + ACE_TEXT ("Received invalid fault event type.\n") )); } } @@ -264,9 +258,8 @@ void TAO::FT_FaultConsumer::push_structured_event ( if (result != 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_FaultConsumer::push_structured_event: " - "Could not analyze fault event.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ") + ACE_TEXT ("Could not analyze fault event.\n") )); } } @@ -295,8 +288,8 @@ void TAO::FT_FaultConsumer::disconnect_structured_push_consumer ( { //TODO: For now, we are just ignoring the disconnect callback. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO::FT_FaultConsumer::disconnect_structured_push_consumer() " - "call ignored.\n") + ACE_TEXT ("TAO::FT_FaultConsumer::disconnect_structured_push_consumer() ") + ACE_TEXT ("call ignored.\n") )); } diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp index 3f101f27dea..ac26ed56e19 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp @@ -51,9 +51,8 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->all_at_location_failed == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "All objects at location <%s> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("All objects at location <%s> failed.\n"), loc_as_string.c_str() )); } @@ -61,9 +60,8 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->all_of_type_at_location_failed == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "All objects of type <%s> at location <%s> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("All objects of type <%s> at location <%s> failed.\n"), this->type_id.in(), loc_as_string.c_str() )); @@ -72,10 +70,9 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->object_at_location_failed == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "Replica of type <%s> with ObjectGroupId <%Q> " - "at location <%s> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("Replica of type <%s> with ObjectGroupId <%Q> ") + ACE_TEXT ("at location <%s> failed.\n"), this->type_id.in(), this->object_group_id, loc_as_string.c_str() @@ -85,9 +82,8 @@ void TAO::FT_FaultEventDescriptor::dump () if (this->object_is_primary == 1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_FaultEventDescriptor::dump: " - "Primary replica of ObjectGroupId <%Q> failed.\n"), + ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ") + ACE_TEXT ("Primary replica of ObjectGroupId <%Q> failed.\n"), this->object_group_id )); } diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index bfc77eb5a46..81c83a7f821 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -95,7 +95,7 @@ TAO::FT_ReplicationManager::~FT_ReplicationManager (void) //public int TAO::FT_ReplicationManager::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:o:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:f:"); int c; while ( (c = get_opts ()) != -1) @@ -208,9 +208,8 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) else { ACE_ERROR_RETURN ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Could not resolve notifier IOR.\n")), + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Could not resolve notifier IOR.\n")), -1); } } @@ -403,9 +402,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (CORBA::is_nil (fault_notifier)) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Bad Fault Notifier object reference provided.\n") + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Bad Fault Notifier object reference provided.\n") )); ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( @@ -437,10 +435,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (analyzer == 0) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Error creating FaultAnalyzer.\n" - ) + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Error creating FaultAnalyzer.\n") )); result = -1; } @@ -457,9 +453,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ( - "TAO::FT_ReplicationManager::register_fault_notifier_i: " - "Error reinitializing FT_FaultConsumer.\n") + ACE_TEXT ("TAO::FT_ReplicationManager::register_fault_notifier_i: ") + ACE_TEXT ("Error reinitializing FT_FaultConsumer.\n") ); result = -1; } @@ -468,9 +463,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (result != 0) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Could not re-initialize FT_FaultConsumer.\n") + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Could not re-initialize FT_FaultConsumer.\n") )); ACE_THROW (CORBA::INTERNAL ( @@ -1076,7 +1070,7 @@ TAO::FT_ReplicationManager::delete_object ( int TAO::FT_ReplicationManager::write_ior () { 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) { CORBA::String_var ior_str = this->orb_->object_to_string ( diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index 4606008727c..5a6788d8cc4 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -68,9 +68,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event ( for (CORBA::ULong n_prop = 0; n_prop < item_count; ++n_prop) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT( - "TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event: " - "Property Name: <%s>\n"), + ACE_TEXT( "TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event: " ) + ACE_TEXT( "Property Name: <%s>\n"), filterable[n_prop].name.in() )); } @@ -160,9 +159,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id ( if ((val >>= type_id_value) == 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id: " - "Could not extract TypeId value from any.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id: " ) + ACE_TEXT( "Could not extract TypeId value from any.\n")), -1); } @@ -179,9 +177,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id ( if ((val >>= temp_id) == 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id: " - "Could not extract ObjectGroupId value from any.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id: ") + ACE_TEXT ("Could not extract ObjectGroupId value from any.\n")), -1); } id = temp_id; @@ -195,9 +192,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_location ( if ((val >>= temp_loc) == 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_location: " - "Could not extract Location value from fault event.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_location: ") + ACE_TEXT ("Could not extract Location value from fault event.\n")), -1); } // Make a deep copy of the Location. @@ -227,9 +223,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style: " - "MembershipStyle is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style: ") + ACE_TEXT ("MembershipStyle is <%d>:\n"), membership_style )); } @@ -258,9 +253,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style: " - "ReplicationStyle is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style: ") + ACE_TEXT ("ReplicationStyle is <%d>:\n"), replication_style )); } @@ -289,9 +283,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members: " - "MinimumNumberMembers is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members: ") + ACE_TEXT ("MinimumNumberMembers is <%d>:\n"), minimum_number_members )); } @@ -320,9 +313,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members: " - "InitialNumberMembers is <%d>:\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members: ") + ACE_TEXT ("InitialNumberMembers is <%d>:\n"), initial_number_members )); } @@ -351,9 +343,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories ( if ((value >>= temp_factories) == 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: " - "Could not extract Factories from properties.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ") + ACE_TEXT ("Could not extract Factories from properties.\n") )); result = -1; } @@ -367,9 +358,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories ( else { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: " - "Could not find Factories property.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ") + ACE_TEXT ("Could not find Factories property.\n") )); result = -1; } @@ -420,9 +410,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( if (CORBA::is_nil (primary_obj.in())) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Could not get primary IOR from IOGR.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Could not get primary IOR from IOGR.\n")), -1); } @@ -434,9 +423,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( if (CORBA::is_nil (failed_obj.in())) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Could not get IOR of failed member from IOGR.\n")), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Could not get IOR of failed member from IOGR.\n")), -1); } @@ -453,9 +441,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( else // primary is not set { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Primary is not set on IOGR.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Primary is not set on IOGR.\n") )); result = -1; } @@ -463,9 +450,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( else // could not get tagged component { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: " - "Could not get tagged component from IOGR.\n") + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ") + ACE_TEXT ("Could not get tagged component from IOGR.\n") )); result = -1; } @@ -505,9 +491,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (CORBA::is_nil (the_object_group.in())) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"), fault_event_desc.object_group_id )); ACE_TRY_THROW (PortableGroup::ObjectGroupNotFound ()); @@ -539,10 +524,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { //@@ it seems a shame to fail here. We should at least remove the failed replica from the group. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract MembershipStyle from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract MembershipStyle from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id), -1); } @@ -552,9 +536,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "MembershipStyleValue = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("MembershipStyleValue = <%d>"), fault_event_desc.membership_style )); } @@ -567,10 +550,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( { //@@ it seems a shame to fail here. We should at least remove the failed replica from the group. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract ReplicationStyle from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract ReplicationStyle from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id), -1); } @@ -580,9 +562,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "ReplicationStyleValue = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("ReplicationStyleValue = <%d>"), fault_event_desc.replication_style )); } @@ -599,10 +580,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 3) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract MinimumNumberMembers from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract MinimumNumberMembers from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id)); } } @@ -612,9 +592,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "MinimumNumberMembers = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("MinimumNumberMembers = <%d>"), fault_event_desc.minimum_number_members )); } @@ -631,10 +610,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 3) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract InitialNumberMembers from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract InitialNumberMembers from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id)); } } @@ -644,9 +622,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "InitialNumberMembers = <%d>"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("InitialNumberMembers = <%d>"), fault_event_desc.initial_number_members )); } @@ -663,10 +640,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 3) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Could not extract Factories from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Could not extract Factories from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id)); } } @@ -675,10 +651,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Got Factories from properties on " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Got Factories from properties on ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id )); } @@ -697,10 +672,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Checking to see if failed replica was the primary for " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Checking to see if failed replica was the primary for ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id )); } @@ -732,10 +706,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: " - "Setting new primary for " - "ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ") + ACE_TEXT ("Setting new primary for ") + ACE_TEXT ("ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id )); } @@ -841,9 +814,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary ( else { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ( - "TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: " - "No locations remaining in ObjectGroup with id <%Q>.\n"), + ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: ") + ACE_TEXT ("No locations remaining in ObjectGroup with id <%Q>.\n"), fault_event_desc.object_group_id), -1); } diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 0efefef03cd..977cd36be76 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -107,7 +107,7 @@ void TAO::FT_FaultDetectorFactory_i::shutdown_i() int TAO::FT_FaultDetectorFactory_i::write_ior() { 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 ()); @@ -128,7 +128,7 @@ int TAO::FT_FaultDetectorFactory_i::write_ior() int TAO::FT_FaultDetectorFactory_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "d:l:o:qr"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "d:l:o:qr"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index e120b9a2cc7..76ed9f3bb32 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -128,7 +128,7 @@ int TAO::FT_FaultNotifier_i::idle(int &result ACE_ENV_ARG_DECL_NOT_USED) int TAO::FT_FaultNotifier_i::write_ior() { 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 ()); @@ -149,7 +149,7 @@ int TAO::FT_FaultNotifier_i::write_ior() int TAO::FT_FaultNotifier_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:rq"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:rq"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp index 505afb05051..5253e99b3ae 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (IFR_Service, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { IFR_Service server; diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc index bb051cebea2..8e4d7c726f8 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc @@ -5,6 +5,7 @@ // necessary to add minimum_corba to 'avoids' here. project(IFR_Service) : orbsvcsexe, core, ifrservice, ifr_client, imr_client, crosscompile { exename = IFR_Service + avoids += uses_wchar IDL_Files { } @@ -22,6 +23,7 @@ project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, minimum_corba libs += TAO_IDL_FE dynamicflags = TAO_IFR_BE_BUILD_DLL includes += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe + avoids += uses_wchar Source_Files { be_global.cpp @@ -48,6 +50,7 @@ project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba { libs += TAO_IFR_BE TAO TAO_IDL_FE includes += $(TAO_ROOT)/orbsvcs/IFR_Service $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe install = $(ACE_ROOT)/bin + avoids += uses_wchar specific(automake) { macros += TAO_IDL_INCLUDE_DIR=\"\\"$(includedir)/tao\\"\" diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h index bde40cf1cd9..d80a7121777 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h @@ -28,9 +28,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -static const char * IMR_ACTIVATOR_SERVICE_NAME = "TAOImRActivator"; -static const char * IMR_ACTIVATOR_DISPLAY_NAME = "TAO Implementation Repository Activator"; -static const char * IMR_ACTIVATOR_DESCRIPTION = "Implementation Repository Activator service for TAO"; +static const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME = +ACE_TEXT("TAOImRActivator"); +static const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME = +ACE_TEXT("TAO Implementation Repository Activator"); +static const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION = +ACE_TEXT("Implementation Repository Activator service for TAO"); /** * @class Activator_NT_Service @@ -61,5 +64,3 @@ typedef ACE_Singleton<Activator_NT_Service, ACE_Mutex> SERVICE; #endif /* ACE_WIN32 */ #endif /* Activator_NT_Service_H */ - - diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index 072ca61ba38..0312d9b86ec 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -33,7 +33,7 @@ Activator_Options::Activator_Options () } int -Activator_Options::parse_args (int &argc, char *argv[]) +Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter shifter (argc, argv); @@ -98,7 +98,7 @@ Activator_Options::parse_args (int &argc, char *argv[]) this->print_usage (); return -1; } - this->ior_output_file_ = shifter.get_current (); + this->ior_output_file_.set (ACE_TEXT_TO_CHAR_IN (shifter.get_current())); } else if (ACE_OS::strcasecmp (shifter.get_current (), ACE_TEXT ("-s")) == 0) @@ -124,7 +124,7 @@ Activator_Options::parse_args (int &argc, char *argv[]) this->print_usage (); return -1; } - this->name_ = shifter.get_current (); + this->name_.set (ACE_TEXT_TO_CHAR_IN (shifter.get_current())); } else if (ACE_OS::strcasecmp (shifter.get_current (), ACE_TEXT ("-l")) == 0) @@ -143,7 +143,7 @@ Activator_Options::parse_args (int &argc, char *argv[]) } int -Activator_Options::init (int argc, char *argv[]) +Activator_Options::init (int argc, ACE_TCHAR *argv[]) { // Make an initial pass through and grab the arguments that we recognize. // This may also run the commands to install or remove the nt service. @@ -154,10 +154,9 @@ Activator_Options::init (int argc, char *argv[]) } for (int i = 0; i < argc; ++i) - { - this->cmdline_ += ACE_CString (argv[i]) + ACE_CString (" "); - } - + { + this->cmdline_ += ACE_TString(argv[i]) + ACE_TEXT(" "); + } return 0; } @@ -194,37 +193,39 @@ Activator_Options::save_registry_options() LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT, SERVICE_REG_PATH, 0, - "", // class + ACE_TEXT(""), // class REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (err != ERROR_SUCCESS) { return -1; } - err = ACE_TEXT_RegSetValueEx (key, "ORBInitOptions", 0, REG_SZ, - (LPBYTE) this->cmdline_.c_str (), this->cmdline_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("ORBInitOptions"), 0, REG_SZ, + (LPBYTE) this->cmdline_.c_str(), this->cmdline_.length() + 1); + ACE_ASSERT(err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx (key, "IORFile", 0, REG_SZ, - (LPBYTE) this->ior_output_file_.c_str (), this->ior_output_file_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("IORFile"), 0, REG_SZ, + (LPBYTE) this->ior_output_file_.c_str(), this->ior_output_file_.length() + 1); + ACE_ASSERT(err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx (key, "DebugLevel", 0, REG_DWORD, - (LPBYTE) &this->debug_ , sizeof (this->debug_)); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("DebugLevel"), 0, REG_DWORD, + (LPBYTE) &this->debug_ , sizeof(this->debug_)); + ACE_ASSERT(err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx( key, "Name", 0, REG_SZ, - (LPBYTE) this->name_.c_str (), this->name_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Name"), 0, REG_SZ, + (LPBYTE) this->name_.c_str(), this->name_.length() + 1); + ACE_ASSERT(err == ERROR_SUCCESS); DWORD tmpint = this->notify_imr_; - err = ACE_TEXT_RegSetValueEx (key, "NotifyImR", 0, REG_DWORD, - (LPBYTE) &tmpint , sizeof (tmpint)); - ACE_ASSERT (err == ERROR_SUCCESS); + + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("NotifyImR"), 0, REG_DWORD, + (LPBYTE) &tmpint , sizeof(tmpint)); + ACE_ASSERT(err == ERROR_SUCCESS); err = ::RegCloseKey (key); ACE_ASSERT (err == ERROR_SUCCESS); @@ -244,16 +245,18 @@ Activator_Options::load_registry_options () KEY_READ, &key ); - if (err != ERROR_SUCCESS) - { - // If there aren't any saved parameters, then that's ok. - return 0; - } - char tmpstr[4096]; - DWORD sz = sizeof (tmpstr); + + if (err != ERROR_SUCCESS) { + // If there aren't any saved parameters, then that's ok. + return 0; + } + ACE_TCHAR tmpstr[4096]; + DWORD sz = sizeof(tmpstr); + DWORD type = 0; - err = ACE_TEXT_RegQueryValueEx (key, "ORBInitOptions", 0, &type, - (LPBYTE) tmpstr, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type, + (LPBYTE) tmpstr, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_SZ); @@ -262,17 +265,19 @@ Activator_Options::load_registry_options () } sz = sizeof(tmpstr); - err = ACE_TEXT_RegQueryValueEx (key, "IORFile", 0, &type, + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("IORFile"), 0, &type, (LPBYTE) tmpstr, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_SZ); - tmpstr[sz - 1] = '\0'; - this->ior_output_file_ = tmpstr; - } + + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_SZ); + tmpstr[sz - 1] = '\0'; + this->ior_output_file_.set (ACE_TEXT_TO_CHAR_IN (tmpstr)); + } sz = sizeof(debug_); - err = ACE_TEXT_RegQueryValueEx (key, "DebugLevel", 0, &type, + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("DebugLevel"), 0, &type, (LPBYTE) &this->debug_ , &sz); if (err == ERROR_SUCCESS) { @@ -280,18 +285,20 @@ Activator_Options::load_registry_options () } sz = sizeof(tmpstr); - err = ACE_TEXT_RegQueryValueEx (key, "Name", 0, &type, + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Name"), 0, &type, (LPBYTE) tmpstr, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_SZ); - tmpstr[sz - 1] = '\0'; - this->name_ = tmpstr; - } + + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_SZ); + tmpstr[sz - 1] = '\0'; + this->name_.set (ACE_TEXT_TO_CHAR_IN (tmpstr)); + } DWORD tmpint = 0; sz = sizeof(tmpint); - err = ACE_TEXT_RegQueryValueEx (key, "NotifyImR", 0, &type, + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("NotifyImR"), 0, &type, (LPBYTE) &tmpint , &sz); if (err == ERROR_SUCCESS) { @@ -335,9 +342,8 @@ Activator_Options::service_command (void) const return this->service_command_; } -const char* -Activator_Options::cmdline (void) const -{ +const ACE_TCHAR* +Activator_Options::cmdline(void) const { return this->cmdline_.c_str (); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h index 45f351a0f44..0c687f5e198 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h @@ -43,7 +43,7 @@ public: Activator_Options (); /// Parse the command-line arguments and initialize the options. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); /// This version should only be used when run as an nt service. int init_from_registry(); @@ -66,13 +66,13 @@ public: /// Save the command line arguments as registry settings. (Windows only) int save_registry_options (); - const char* cmdline(void) const; + const ACE_TCHAR* cmdline(void) const; const ACE_CString& name(void) const; private: /// Parses and pulls out arguments for the ImR - int parse_args (int &argc, char *argv[]); + int parse_args (int &argc, ACE_TCHAR *argv[]); /// Print the usage information. void print_usage (void) const; @@ -83,7 +83,7 @@ private: private: /// Our extra command line arguments - ACE_CString cmdline_; + ACE_TString cmdline_; /// Debug level. unsigned int debug_; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp index 34da1320caf..e40c8e6028a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp @@ -123,11 +123,11 @@ run_service_command (Activator_Options& opts) #if defined (ACE_WIN32) SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME); - if (opts.service_command () == Activator_Options::SC_INSTALL || - opts.service_command () == Activator_Options::SC_INSTALL_NO_LOCATOR) - { - const DWORD MAX_PATH_LENGTH = 4096; - char pathname[MAX_PATH_LENGTH]; + if (opts.service_command() == Activator_Options::SC_INSTALL || + opts.service_command() == Activator_Options::SC_INSTALL_NO_LOCATOR) + { + const DWORD MAX_PATH_LENGTH = 4096; + ACE_TCHAR pathname[MAX_PATH_LENGTH]; DWORD length = ACE_TEXT_GetModuleFileName(NULL, pathname, MAX_PATH_LENGTH); if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s")) @@ -141,7 +141,7 @@ run_service_command (Activator_Options& opts) int ret = -1; if (opts.service_command () == Activator_Options::SC_INSTALL) { - const char* DEPENDS_ON = "TAOImR"; // Must match Locator_NT_Service.h + const ACE_TCHAR* DEPENDS_ON = ACE_TEXT("TAOImR"); // Must match Locator_NT_Service.h ret = SERVICE::instance ()->insert (SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, @@ -192,7 +192,7 @@ run_service_command (Activator_Options& opts) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Activator_Options opts; @@ -213,4 +213,3 @@ main (int argc, char *argv[]) return run_standalone (opts); } - diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index 7017ec1827d..a5bc42325ff 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -11,6 +11,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" #include "ace/os_include/os_netdb.h" +#include "ace/Argv_Type_Converter.h" static ACE_CString getHostName () { @@ -117,35 +118,35 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt { CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_ASSERT (! CORBA::is_nil (obj.in ())); + ACE_ASSERT (! CORBA::is_nil(obj.in())); this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_ASSERT (! CORBA::is_nil(this->root_poa_.in ())); + ACE_ASSERT (! CORBA::is_nil(this->root_poa_.in())); // The activator must use a persistent POA so that it can be started before the // locator in some scenarios, such as when the locator persists its database, and // wants to reconnect to running activators to auto_start some servers. - this->imr_poa_ = createPersistentPOA (this->root_poa_.in (), - "ImR_Activator" ACE_ENV_ARG_PARAMETER); + this->imr_poa_ = createPersistentPOA (this->root_poa_.in(), + "ImR_Activator" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_ASSERT (! CORBA::is_nil(this->imr_poa_.in ())); + ACE_ASSERT (! CORBA::is_nil(this->imr_poa_.in())); // Activate ourself PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_Activator"); - this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER); + this->imr_poa_->activate_object_with_id(id.in(), this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); + obj = this->imr_poa_->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ImplementationRepository::Activator_var activator = - ImplementationRepository::Activator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + ImplementationRepository::Activator::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_ASSERT(! CORBA::is_nil (activator.in ())); + ACE_ASSERT(! CORBA::is_nil(activator.in())); - CORBA::String_var ior = this->orb_->object_to_string (activator.in () ACE_ENV_ARG_PARAMETER); + CORBA::String_var ior = this->orb_->object_to_string(activator.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_ > 0) - ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str ())); + ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str())); // initialize our process manager. // This requires a reactor that has signal handling. @@ -155,11 +156,11 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - "The ACE_Process_Manager didnt get initialized\n"), -1); + "The ACE_Process_Manager didnt get initialized\n"), -1); } } - this->register_with_imr (activator.in ()); // no throw + this->register_with_imr(activator.in()); // no throw PortableServer::POAManager_var poaman = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -170,23 +171,23 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt if (this->debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR Activator: The Activator IOR is: <%s>\n", ior.in ())); + "ImR Activator: The Activator IOR is: <%s>\n", ior.in ())); } // The last thing we do is write out the ior so that a test program can assume // that the activator is ready to go as soon as the ior is written. - if (opts.ior_filename ().length () > 0) + if (opts.ior_filename().length() > 0) { - FILE* fp = ACE_OS::fopen (opts.ior_filename ().c_str (), "w"); + FILE* fp = ACE_OS::fopen(opts.ior_filename().c_str(), ACE_TEXT("w")); if (fp == 0) { ACE_ERROR_RETURN ((LM_ERROR, - "ImR Activator: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1); + "ImR Activator: Could not open file: %s\n", opts.ior_filename().c_str()), -1); } - ACE_OS::fprintf (fp, "%s", ior.in ()); - ACE_OS::fclose (fp); + ACE_OS::fprintf(fp, "%s", ior.in()); + ACE_OS::fclose(fp); } - } + } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb"); @@ -200,15 +201,19 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt int ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL) { - ACE_CString cmdline = opts.cmdline(); + ACE_TString cmdline = opts.cmdline(); // Must use IOR style objrefs, because URLs sometimes get mangled when passed // to ACE_Process::spawn(). - cmdline += "-ORBUseImR 0 -ORBObjRefStyle IOR "; - ACE_ARGV av (cmdline.c_str ()); - int argc = av.argc (); + + cmdline += ACE_TEXT("-ORBUseImR 0 -ORBObjRefStyle IOR "); + ACE_ARGV av(cmdline.c_str()); + int argc = av.argc(); + + ACE_Argv_Type_Converter convert (argc, av.argv()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN(-1); int ret = this->init_with_orb(orb.in (), opts ACE_ENV_ARG_PARAMETER); @@ -315,17 +320,18 @@ ImR_Activator_i::start_server(const char* name, // handles. This includes stdin, stdout, logs, etc. proc_opts.handle_inheritence (0); - proc_opts.setenv ("TAO_USE_IMR", "1"); + proc_opts.setenv(ACE_TEXT("TAO_USE_IMR"), ACE_TEXT("1")); + if (!CORBA::is_nil (this->locator_.in ())) - { - CORBA::String_var ior = orb_->object_to_string (locator_.in ()); - proc_opts.setenv ("ImplRepoServiceIOR", ior.in()); - } + { + CORBA::String_var ior = orb_->object_to_string(locator_.in()); + proc_opts.setenv(ACE_TEXT("ImplRepoServiceIOR"), ior.in()); + } - for (CORBA::ULong i = 0; i < env.length (); ++i) - { - proc_opts.setenv (env[i].name.in (), env[i].value.in ()); - } + for (CORBA::ULong i = 0; i < env.length(); ++i) { + proc_opts.setenv (ACE_TEXT_TO_TCHAR_IN(env[i].name.in()), + ACE_TEXT_TO_TCHAR_IN(env[i].value.in())); + } int pid = this->process_mgr_.spawn (proc_opts); if (pid == ACE_INVALID_PID) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp index 12be58dd8cd..6ee3210d575 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp @@ -125,7 +125,7 @@ run_service_command (Options& opts) if (opts.service_command () == Options::SC_INSTALL) { const DWORD MAX_PATH_LENGTH = 4096; - char pathname[MAX_PATH_LENGTH]; + ACE_TCHAR pathname[MAX_PATH_LENGTH]; DWORD length = ACE_TEXT_GetModuleFileName (NULL, pathname, MAX_PATH_LENGTH); if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s")) @@ -175,7 +175,7 @@ run_service_command (Options& opts) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Options opts; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 7884c6c36c7..63974066cfd 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -17,6 +17,7 @@ #include "ace/ARGV.h" #include "ace/OS_NS_sys_time.h" #include "ace/Vector_T.h" +#include "ace/Argv_Type_Converter.h" static const int DEFAULT_START_LIMIT = 1; @@ -178,17 +179,17 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL ACE_CHECK_RETURN (-1); // We write the ior file last so that the tests can know we are ready. - if (opts.ior_filename ().length () > 0) + if (opts.ior_filename().length() > 0) + { + FILE* fp = ACE_OS::fopen(opts.ior_filename().c_str(), ACE_TEXT("w")); + if (fp == 0) { - FILE* fp = ACE_OS::fopen (opts.ior_filename ().c_str (), "w"); - if (fp == 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - "ImR: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1); - } - ACE_OS::fprintf (fp, "%s", ior.in ()); - ACE_OS::fclose (fp); + ACE_ERROR_RETURN ((LM_ERROR, + "ImR: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1); } + ACE_OS::fprintf (fp, "%s", ior.in ()); + ACE_OS::fclose (fp); + } return 0; } @@ -196,16 +197,20 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL int ImR_Locator_i::init (Options& opts ACE_ENV_ARG_DECL) { - ACE_CString cmdline = opts.cmdline (); - cmdline += " -orbcollocation no -orbuseimr 0"; - ACE_ARGV av (cmdline.c_str ()); - int argc = av.argc (); - char** argv = av.argv (); + ACE_TString cmdline = opts.cmdline(); + cmdline += ACE_TEXT(" -orbcollocation no -orbuseimr 0"); + ACE_ARGV av(cmdline.c_str()); + int argc = av.argc(); + ACE_TCHAR** argv = av.argv(); + + ACE_Argv_Type_Converter convert (argc, argv); + + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), + "TAO_ImR_Locator" ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN(-1); + int err = this->init_with_orb(orb.in(), opts ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN(-1); - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO_ImR_Locator" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - int err = this->init_with_orb (orb.in (), opts ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return err; } @@ -213,22 +218,23 @@ int ImR_Locator_i::run (ACE_ENV_SINGLE_ARG_DECL) { if (debug_ > 0) - { - ACE_DEBUG ((LM_DEBUG, "Implementation Repository: Running\n" - "\tPing Interval : %dms\n" - "\tStartup Timeout : %ds\n" - "\tPersistence : %s\n" - "\tMulticast : %s\n" - "\tDebug : %d\n" - "\tLocked : %s\n\n", - ping_interval_.msec (), - startup_timeout_.sec (), - repository_.repo_mode (), - ior_multicast_.reactor () != 0 ? "Enabled" : "Disabled", - debug (), - read_only_ ? "True" : "False")); - } - this->auto_start_servers (ACE_ENV_SINGLE_ARG_PARAMETER); + { + ACE_DEBUG((LM_DEBUG, "Implementation Repository: Running\n" + "\tPing Interval : %dms\n" + "\tStartup Timeout : %ds\n" + "\tPersistence : %s\n" + "\tMulticast : %s\n" + "\tDebug : %d\n" + "\tLocked : %s\n\n", + ping_interval_.msec(), + startup_timeout_.sec(), + ACE_TEXT_TO_CHAR_IN(repository_.repo_mode()), + ior_multicast_.reactor() != 0 ? "Enabled" : "Disabled", + debug(), + read_only_ ? "True" : "False")); + } + this->auto_start_servers(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (-1); this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h index c2199926f63..a23c5b83302 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h @@ -24,9 +24,11 @@ #include "ace/Synch.h" #include "tao/orbconf.h" -static const char * IMR_LOCATOR_SERVICE_NAME = "TAOImR"; -static const char * IMR_LOCATOR_DISPLAY_NAME = "TAO Implementation Repository"; -static const char * IMR_LOCATOR_DESCRIPTION = "Implementation Repository Locator service for TAO"; +static const ACE_TCHAR * IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR"); +static const ACE_TCHAR * IMR_LOCATOR_DISPLAY_NAME = +ACE_TEXT("TAO Implementation Repository"); +static const ACE_TCHAR * IMR_LOCATOR_DESCRIPTION = +ACE_TEXT("Implementation Repository Locator service for TAO"); /** * @class Locator_NT_Service @@ -58,5 +60,3 @@ typedef ACE_Singleton<Locator_NT_Service, ACE_Mutex> SERVICE; #endif /* ACE_WIN32 */ #endif /* Locator_NT_Service_H */ - - diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 810649d2bb5..cdd4d0939ee 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -42,7 +42,7 @@ Options::Options () } int -Options::parse_args (int &argc, char *argv[]) +Options::parse_args (int &argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter shifter (argc, argv); @@ -209,7 +209,7 @@ Options::parse_args (int &argc, char *argv[]) } int -Options::init (int argc, char *argv[]) +Options::init (int argc, ACE_TCHAR *argv[]) { // Make an initial pass through and grab the arguments that we recognize. // This may also run the commands to install or remove the nt service. @@ -220,9 +220,10 @@ Options::init (int argc, char *argv[]) } for (int i = 0; i < argc; ++i) - { - this->cmdline_ += ACE_CString (argv[i]) + ACE_CString (" "); - } + { + this->cmdline_ += ACE_TString(argv[i]) + ACE_TEXT(" "); + } + return 0; } @@ -264,57 +265,61 @@ Options::save_registry_options () LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT, SERVICE_REG_PATH, 0, - "", // class + ACE_TEXT(""), // class REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, NULL ); - if (err != ERROR_SUCCESS) - { - return -1; - } - err = ACE_TEXT_RegSetValueEx (key, "ORBInitOptions", 0, REG_SZ, - (LPBYTE) this->cmdline_.c_str (), this->cmdline_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx (key, "IORFile", 0, REG_SZ, - (LPBYTE) ior_output_file_.c_str (), ior_output_file_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); + if (err != ERROR_SUCCESS) { + return -1; + } + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("ORBInitOptions"), 0, REG_SZ, + (LPBYTE) this->cmdline_.c_str(), this->cmdline_.length() + 1); + ACE_ASSERT(err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx (key, "DebugLevel", 0, REG_DWORD, - (LPBYTE) &debug_ , sizeof (debug_)); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("IORFile"), 0, REG_SZ, + (LPBYTE) ior_output_file_.c_str(), ior_output_file_.length() + 1); ACE_ASSERT(err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx (key, "PersistFile", 0, REG_SZ, - (LPBYTE) this->persist_file_name_.c_str (), this->persist_file_name_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("DebugLevel"), 0, REG_DWORD, + (LPBYTE) &debug_ , sizeof(debug_)); + ACE_ASSERT(err == ERROR_SUCCESS); - DWORD tmp = this->ping_interval_.msec (); - err = ACE_TEXT_RegSetValueEx (key, "PingInterval", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PersistFile"), 0, REG_SZ, + (LPBYTE) this->persist_file_name_.c_str(), this->persist_file_name_.length() + 1); + ACE_ASSERT(err == ERROR_SUCCESS); + + DWORD tmp = this->ping_interval_.msec(); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PingInterval"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = this->readonly_ ? 1 : 0; - err = ACE_TEXT_RegSetValueEx (key, "Lock", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Lock"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = this->repo_mode_; - err = ACE_TEXT_RegSetValueEx (key, "PersistType", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PersistType"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = this->startup_timeout_.sec(); - err = ACE_TEXT_RegSetValueEx (key, "Timeout", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Timeout"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = multicast_ ? 1 : 0; - err = ACE_TEXT_RegSetValueEx (key, "Multicast", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Multicast"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); err = ::RegCloseKey (key); ACE_ASSERT (err == ERROR_SUCCESS); @@ -342,8 +347,9 @@ Options::load_registry_options () ACE_TCHAR tmpstr[4096]; DWORD sz = sizeof (tmpstr); DWORD type = 0; - err = ACE_TEXT_RegQueryValueEx (key, "ORBInitOptions", 0, &type, - (LPBYTE) tmpstr, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type, + (LPBYTE) tmpstr, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_SZ); @@ -352,8 +358,9 @@ Options::load_registry_options () } sz = sizeof(tmpstr); - err = ACE_TEXT_RegQueryValueEx (key, "IORFile", 0, &type, - (LPBYTE) tmpstr, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("IORFile"), 0, &type, + (LPBYTE) tmpstr, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_SZ); @@ -362,8 +369,9 @@ Options::load_registry_options () } sz = sizeof(debug_); - err = ACE_TEXT_RegQueryValueEx (key, "DebugLevel", 0, &type, - (LPBYTE) &this->debug_ , &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("DebugLevel"), 0, &type, + (LPBYTE) &this->debug_ , &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_DWORD); @@ -371,8 +379,9 @@ Options::load_registry_options () DWORD tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "PingInterval", 0, &type, - (LPBYTE) &tmp, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PingInterval"), 0, &type, + (LPBYTE) &tmp, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_DWORD); @@ -381,8 +390,9 @@ Options::load_registry_options () tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "Lock", 0, &type, - (LPBYTE) &tmp, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Lock"), 0, &type, + (LPBYTE) &tmp, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_DWORD); @@ -390,8 +400,9 @@ Options::load_registry_options () } sz = sizeof(this->repo_mode_); - err = ACE_TEXT_RegQueryValueEx (key, "PersistType", 0, &type, - (LPBYTE) &this->repo_mode_, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistType"), 0, &type, + (LPBYTE) &this->repo_mode_, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_DWORD); @@ -399,8 +410,9 @@ Options::load_registry_options () tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "Timeout", 0, &type, - (LPBYTE) &tmp, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Timeout"), 0, &type, + (LPBYTE) &tmp, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_DWORD); @@ -409,8 +421,9 @@ Options::load_registry_options () tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "Multicast", 0, &type, - (LPBYTE) &tmp, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Multicast"), 0, &type, + (LPBYTE) &tmp, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_DWORD); @@ -418,8 +431,9 @@ Options::load_registry_options () } sz = sizeof(tmpstr); - err = ACE_TEXT_RegQueryValueEx (key, "PersistFile", 0, &type, - (LPBYTE) tmpstr, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistFile"), 0, &type, + (LPBYTE) tmpstr, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_SZ); @@ -445,7 +459,7 @@ Options::debug (void) const return this->debug_; } -const ACE_CString& +const ACE_TString& Options::ior_filename (void) const { return this->ior_output_file_; @@ -463,12 +477,12 @@ Options::service_command(void) const return this->service_command_; } -const char* +const ACE_TCHAR* Options::cmdline(void) const { return this->cmdline_.c_str (); } -const ACE_CString& +const ACE_TString& Options::persist_file_name(void) const { return this->persist_file_name_; } @@ -502,4 +516,3 @@ Options::readonly (void) const { return this->readonly_; } - diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h index 4d7019bccf3..fbbd9077915 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h @@ -51,7 +51,7 @@ public: Options (); /// Parse the command-line arguments and initialize the options. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); /// This version should only be used when run as an nt service. int init_from_registry(); @@ -72,7 +72,7 @@ public: int save_registry_options(); - const char* cmdline(void) const; + const ACE_TCHAR* cmdline(void) const; /// File that contains the activator related information /// that the persistent locator has to save. @@ -96,7 +96,7 @@ public: private: /// Parses and pulls out arguments for the ImR - int parse_args (int &argc, char *argv[]); + int parse_args (int &argc, ACE_TCHAR *argv[]); /// Print the usage information. void print_usage (void) const; @@ -138,7 +138,7 @@ private: SERVICE_COMMAND service_command_; /// Our extra command line arguments - ACE_CString cmdline_; + ACE_TString cmdline_; /// The persistent XML file name. ACE_TString persist_file_name_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index ed44f22f9ad..12331b7ed61 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -11,20 +11,20 @@ ACE_RCSID (ImplRepo_Service, Locator_Repository, "$Id$") -static const char* STARTUP_COMMAND = "StartupCommand"; -static const char* WORKING_DIR = "WorkingDir"; -static const char* ENVIRONMENT = "Environment"; -static const char* ACTIVATION = "Activation"; -static const char* PARTIAL_IOR = "Location"; -static const char* IOR = "IOR"; -static const char* START_LIMIT = "StartLimit"; -static const char* ACTIVATOR = "Activator"; -static const char* SERVERS_ROOT_KEY = "Servers"; -static const char* ACTIVATORS_ROOT_KEY = "Activators"; -static const char* TOKEN = "Token"; + static const ACE_TCHAR* STARTUP_COMMAND = ACE_TEXT("StartupCommand"); +static const ACE_TCHAR* WORKING_DIR = ACE_TEXT("WorkingDir"); +static const ACE_TCHAR* ENVIRONMENT = ACE_TEXT("Environment"); +static const ACE_TCHAR* ACTIVATION = ACE_TEXT("Activation"); +static const ACE_TCHAR* PARTIAL_IOR = ACE_TEXT("Location"); +static const ACE_TCHAR* IOR = ACE_TEXT("IOR"); +static const ACE_TCHAR* START_LIMIT = ACE_TEXT("StartLimit"); +static const ACE_TCHAR* ACTIVATOR = ACE_TEXT("Activator"); +static const ACE_TCHAR* SERVERS_ROOT_KEY = ACE_TEXT("Servers"); +static const ACE_TCHAR* ACTIVATORS_ROOT_KEY = ACE_TEXT("Activators"); +static const ACE_TCHAR* TOKEN = ACE_TEXT("Token"); #if defined (ACE_WIN32) -static const char* WIN32_REG_KEY = "Software\\TAO\\ImplementationRepository"; +static const ACE_TCHAR* WIN32_REG_KEY = ACE_TEXT("Software\\TAO\\ImplementationRepository"); #endif static ACE_CString lcase (const ACE_CString& s) @@ -44,22 +44,26 @@ static void loadActivatorsAsBinary (ACE_Configuration& config, Locator_Repositor if (err == 0) { int index = 0; - ACE_CString name; + ACE_TString name; while (config.enumerate_sections (root, index, name) == 0) { - ACE_CString ior; + ACE_TString ior; u_int token; ACE_Configuration_Section_Key key; // Can't fail, because we're enumerating - config.open_section (root, name.c_str(), 0, key); + config.open_section(root, name.c_str(), 0, key); config.get_string_value (key, IOR, ior); - config.get_integer_value (key, TOKEN, token); - - Activator_Info_Ptr info (new Activator_Info (name, token, ior)); - map.bind (lcase (name), info); + config.get_integer_value(key, TOKEN, token); + + ACE_CString name2(ACE_TEXT_TO_CHAR_IN(name.fast_rep())); + Activator_Info_Ptr info(new Activator_Info( + name2, + token, + ACE_TEXT_TO_CHAR_IN(ior.fast_rep()))); + map.bind (lcase(name2), info); index++; } } @@ -72,17 +76,17 @@ static void loadServersAsBinary(ACE_Configuration& config, Locator_Repository::S if (err == 0) { int index = 0; - ACE_CString name; + ACE_TString name; while (config.enumerate_sections (root, index, name) == 0) { - ACE_CString cmdline, dir, envstr, partial_ior, ior, aname; + ACE_TString cmdline, dir, envstr, partial_ior, ior, aname; u_int amodeint = ImplementationRepository::MANUAL; u_int start_limit; ACE_Configuration_Section_Key key; // Can't fail, because we're enumerating - config.open_section (root, name.c_str (), 0, key); + config.open_section(root, name.c_str(), 0, key); // Ignore any missing values. Server name is enough on its own. config.get_string_value (key, ACTIVATOR, aname); @@ -98,11 +102,19 @@ static void loadServersAsBinary(ACE_Configuration& config, Locator_Repository::S static_cast <ImplementationRepository::ActivationMode> (amodeint); ImplementationRepository::EnvironmentList env_vars = - ImR_Utils::parseEnvList (envstr); - - Server_Info_Ptr info (new Server_Info(name, aname, cmdline, - env_vars, dir, amode, start_limit, partial_ior, ior)); - map.bind (name, info); + ImR_Utils::parseEnvList(ACE_TEXT_TO_CHAR_IN(envstr.fast_rep())); + + ACE_CString name2(ACE_TEXT_TO_CHAR_IN(name.fast_rep())); + Server_Info_Ptr info(new Server_Info( + name2, + ACE_TEXT_TO_CHAR_IN(aname.fast_rep()), + ACE_TEXT_TO_CHAR_IN(cmdline.fast_rep()), + env_vars, + ACE_TEXT_TO_CHAR_IN(dir.fast_rep()), + amode, start_limit, + ACE_TEXT_TO_CHAR_IN(partial_ior.fast_rep()), + ACE_TEXT_TO_CHAR_IN(ior.fast_rep()))); + map.bind (name2, info); index++; } } @@ -136,10 +148,10 @@ public: { } virtual void next_server (const ACE_CString& name, - const ACE_CString& aname, const ACE_CString& cmdline, - const Locator_XMLHandler::EnvList& envlst, const ACE_CString& dir, - const ACE_CString& amodestr, int start_limit, - const ACE_CString& partial_ior, const ACE_CString& ior) + const ACE_CString& aname, const ACE_CString& cmdline, + const Locator_XMLHandler::EnvList& envlst, const ACE_CString& dir, + const ACE_CString& amodestr, int start_limit, + const ACE_CString& partial_ior, const ACE_CString& ior) { ImplementationRepository::ActivationMode amode = ImR_Utils::parseActivationMode (amodestr); @@ -150,13 +162,13 @@ public: int limit = start_limit < 1 ? 1 : start_limit; Server_Info_Ptr si (new Server_Info (name, aname, cmdline, - env_vars, dir, amode, limit, partial_ior, ior)); + env_vars, dir, amode, limit, partial_ior, ior)); this->repo_.servers ().bind (name, si); } virtual void next_activator (const ACE_CString& aname, - long token, - const ACE_CString& ior) + long token, + const ACE_CString& ior) { Activator_Info_Ptr si (new Activator_Info (aname, token, ior)); this->repo_.activators ().bind (lcase (aname), si); @@ -165,11 +177,11 @@ private: Locator_Repository& repo_; }; -static int loadAsXML (const ACE_CString& fname, Locator_Repository& repo) -{ +static int loadAsXML(const ACE_TString& fname, Locator_Repository& repo) { + ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream; // xml input source will take ownership - if (fstm->open (fname.c_str()) != 0) + if (fstm->open(ACE_TEXT_TO_TCHAR_IN(fname.c_str())) != 0) { // This is not a real error. The xml file may not exist yet. delete fstm; @@ -206,9 +218,9 @@ static int loadAsXML (const ACE_CString& fname, Locator_Repository& repo) } // Note : Would pass servers by const&, but ACE hash map const_iterator is broken. -static void saveAsXML (const ACE_CString& fname, Locator_Repository& repo) -{ - FILE* fp = ACE_OS::fopen (fname.c_str (), "w"); +static void saveAsXML(const ACE_TString& fname, Locator_Repository& repo) { + FILE* fp = ACE_OS::fopen (fname.c_str(), ACE_TEXT("w")); + if (fp == 0) { ACE_ERROR ((LM_ERROR, "Couldn't write to file %s\n", fname.c_str())); @@ -219,40 +231,41 @@ static void saveAsXML (const ACE_CString& fname, Locator_Repository& repo) // Save servers Locator_Repository::SIMap::ENTRY* sientry = 0; - Locator_Repository::SIMap::ITERATOR siit (repo.servers ()); - for (; siit.next (sientry); siit.advance() ) + + Locator_Repository::SIMap::ITERATOR siit(repo.servers()); + for (; siit.next(sientry); siit.advance()) { Server_Info_Ptr& info = sientry->int_id_; - ACE_CString name = ACEXML_escape_string (info->name); - ACE_CString activator = ACEXML_escape_string (info->activator); - ACE_CString cmdline = ACEXML_escape_string (info->cmdline); - ACE_CString wdir = ACEXML_escape_string (info->dir); - ACE_CString partial_ior = ACEXML_escape_string (info->partial_ior); - ACE_CString ior = ACEXML_escape_string (info->ior); - - ACE_OS::fprintf (fp,"\t<%s", Locator_XMLHandler::SERVER_INFO_TAG); - ACE_OS::fprintf (fp," name=\"%s\"", name.c_str ()); - ACE_OS::fprintf (fp," activator=\"%s\"", activator.c_str ()); - ACE_OS::fprintf (fp," command_line=\"%s\"", cmdline.c_str ()); - ACE_OS::fprintf (fp," working_dir=\"%s\"", wdir.c_str ()); - ACE_CString amodestr = ImR_Utils::activationModeToString (info->activation_mode); - ACE_OS::fprintf (fp," activation_mode=\"%s\"", amodestr.c_str ()); - ACE_OS::fprintf (fp," start_limit=\"%d\"", info->start_limit); - ACE_OS::fprintf (fp," partial_ior=\"%s\"", partial_ior.c_str ()); - ACE_OS::fprintf (fp," ior=\"%s\"", ior.c_str ()); - ACE_OS::fprintf (fp,">\n"); - - for (CORBA::ULong i = 0; i < info->env_vars.length (); ++i) + ACE_TString name = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->name.fast_rep())); + ACE_TString activator = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->activator.fast_rep())); + ACE_TString cmdline = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->cmdline.fast_rep())); + ACE_TString wdir = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->dir.fast_rep())); + ACE_TString partial_ior = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->partial_ior.fast_rep())); + ACE_TString ior = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->ior.fast_rep())); + + ACE_OS::fprintf(fp,"\t<%s", Locator_XMLHandler::SERVER_INFO_TAG); + ACE_OS::fprintf(fp," name=\"%s\"", name.c_str()); + ACE_OS::fprintf(fp," activator=\"%s\"", activator.c_str()); + ACE_OS::fprintf(fp," command_line=\"%s\"", cmdline.c_str()); + ACE_OS::fprintf(fp," working_dir=\"%s\"", wdir.c_str()); + ACE_CString amodestr = ImR_Utils::activationModeToString(info->activation_mode); + ACE_OS::fprintf(fp," activation_mode=\"%s\"", amodestr.c_str()); + ACE_OS::fprintf(fp," start_limit=\"%d\"", info->start_limit); + ACE_OS::fprintf(fp," partial_ior=\"%s\"", partial_ior.c_str()); + ACE_OS::fprintf(fp," ior=\"%s\"", ior.c_str()); + ACE_OS::fprintf(fp,">\n"); + + for (CORBA::ULong i = 0; i < info->env_vars.length(); ++i) { - ACE_OS::fprintf (fp,"\t\t<%s", Locator_XMLHandler::ENVIRONMENT_TAG); - ACE_OS::fprintf (fp," name=\"%s\"", info->env_vars[i].name.in ()); - ACE_CString val = ACEXML_escape_string (info->env_vars[i].value.in ()); - ACE_OS::fprintf (fp," value=\"%s\"", val.c_str ()); - ACE_OS::fprintf (fp,"/>\n"); + ACE_OS::fprintf(fp,"\t\t<%s", Locator_XMLHandler::ENVIRONMENT_TAG); + ACE_OS::fprintf(fp," name=\"%s\"", info->env_vars[i].name.in()); + ACE_TString val = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->env_vars[i].value.in())); + ACE_OS::fprintf(fp," value=\"%s\"", val.c_str()); + ACE_OS::fprintf(fp,"/>\n"); } - ACE_OS::fprintf (fp,"\t</%s>\n", Locator_XMLHandler::SERVER_INFO_TAG); + ACE_OS::fprintf(fp,ACE_TEXT("\t</%s>\n"), Locator_XMLHandler::SERVER_INFO_TAG); } // Save Activators @@ -274,8 +287,8 @@ static void saveAsXML (const ACE_CString& fname, Locator_Repository& repo) } Locator_Repository::Locator_Repository () -: rmode_ (Options::REPO_NONE) -, config_ (0) + : rmode_ (Options::REPO_NONE) + , config_ (0) { } @@ -295,16 +308,16 @@ Locator_Repository::init(const Options& opts) case Options::REPO_HEAP_FILE: { if (opts.repository_erase ()) - { - ACE_OS::unlink ( this->fname_.c_str () ); - } + { + ACE_OS::unlink ( this->fname_.c_str () ); + } ACE_Configuration_Heap* heap = new ACE_Configuration_Heap (); this->config_.reset (heap); err = heap->open (this->fname_.c_str ()); if (err == 0) - { - loadAsBinary (*this->config_, *this); - } + { + loadAsBinary (*this->config_, *this); + } break; } case Options::REPO_REGISTRY: @@ -314,8 +327,12 @@ Locator_Repository::init(const Options& opts) { ACE_Configuration_Win32Registry config ( HKEY_LOCAL_MACHINE ); ACE_Configuration_Section_Key root; - config.open_section (config.root_section(), "Software\\TAO", 0, root); - config.remove_section (root, "ImplementationRepository", 1); + config.open_section( config.root_section(), ACE_TEXT("Software\\TAO"), 0, root ); + config.remove_section( root, ACE_TEXT("ImplementationRepository"), 1 ); + /* + config.open_section (config.root_section(), "Software\\TAO", 0, root); + config.remove_section (root, "ImplementationRepository", 1); + */ } HKEY root = ACE_Configuration_Win32Registry:: resolve_key (HKEY_LOCAL_MACHINE, WIN32_REG_KEY); @@ -323,7 +340,7 @@ Locator_Repository::init(const Options& opts) loadAsBinary (*this->config_, *this); #else ACE_ERROR ((LM_ERROR, "Registry persistence is only " - "supported on Windows\n")); + "supported on Windows\n")); err = -1; #endif break; @@ -350,19 +367,19 @@ Locator_Repository::init(const Options& opts) int Locator_Repository::add_server (const ACE_CString& name, - const ACE_CString& aname, - const ACE_CString& startup_command, - const ImplementationRepository::EnvironmentList& env_vars, - const ACE_CString& working_dir, - ImplementationRepository::ActivationMode activation, - int start_limit, - const ACE_CString& partial_ior, - const ACE_CString& ior, - ImplementationRepository::ServerObject_ptr svrobj) + const ACE_CString& aname, + const ACE_CString& startup_command, + const ImplementationRepository::EnvironmentList& env_vars, + const ACE_CString& working_dir, + ImplementationRepository::ActivationMode activation, + int start_limit, + const ACE_CString& partial_ior, + const ACE_CString& ior, + ImplementationRepository::ServerObject_ptr svrobj) { int limit = start_limit < 1 ? 1 : start_limit; Server_Info_Ptr info(new Server_Info (name, aname, startup_command, - env_vars, working_dir, activation, limit, partial_ior, ior, svrobj)); + env_vars, working_dir, activation, limit, partial_ior, ior, svrobj)); int err = servers ().bind (name, info); if (err != 0) @@ -375,9 +392,9 @@ Locator_Repository::add_server (const ACE_CString& name, int Locator_Repository::add_activator (const ACE_CString& name, - const CORBA::Long token, - const ACE_CString& ior, - ImplementationRepository::Activator_ptr act) + const CORBA::Long token, + const ACE_CString& ior, + ImplementationRepository::Activator_ptr act) { Activator_Info_Ptr info (new Activator_Info (name, token, ior, act)); @@ -407,7 +424,8 @@ Locator_Repository::update_server (const Server_Info& info) ACE_ERROR ((LM_ERROR, "Unable to open config section:%s\n", SERVERS_ROOT_KEY)); return err; } - err = cfg.open_section (root, info.name.c_str (), 1, key); + + err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key); if (err != 0) { ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str())); @@ -416,19 +434,20 @@ Locator_Repository::update_server (const Server_Info& info) ACE_CString envstr = ImR_Utils::envListToString(info.env_vars); - cfg.set_string_value (key, ACTIVATOR, info.activator.c_str ()); - cfg.set_string_value (key, STARTUP_COMMAND, info.cmdline.c_str ()); - cfg.set_string_value (key, WORKING_DIR, info.dir.c_str ()); - cfg.set_string_value (key, ENVIRONMENT, envstr); + cfg.set_string_value (key, ACTIVATOR, ACE_TEXT_TO_TCHAR_IN(info.activator.c_str())); + cfg.set_string_value (key, STARTUP_COMMAND, ACE_TEXT_TO_TCHAR_IN(info.cmdline.c_str())); + cfg.set_string_value (key, WORKING_DIR, ACE_TEXT_TO_TCHAR_IN(info.dir.c_str())); + cfg.set_string_value (key, ENVIRONMENT, ACE_TEXT_TO_TCHAR_IN(envstr.c_str())); cfg.set_integer_value (key, ACTIVATION, info.activation_mode); cfg.set_integer_value (key, START_LIMIT, info.start_limit); - cfg.set_string_value (key, PARTIAL_IOR, info.partial_ior.c_str ()); - cfg.set_string_value (key, IOR, info.ior.c_str()); + cfg.set_string_value (key, PARTIAL_IOR, ACE_TEXT_TO_TCHAR_IN(info.partial_ior.c_str())); + cfg.set_string_value (key, IOR, ACE_TEXT_TO_TCHAR_IN(info.ior.c_str())); } else if (rmode_ == Options::REPO_XML_FILE) { - saveAsXML (this->fname_, *this); + saveAsXML(this->fname_, *this); } + return 0; } @@ -449,7 +468,8 @@ Locator_Repository::update_activator (const Activator_Info& info) ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", ACTIVATORS_ROOT_KEY)); return err; } - err = cfg.open_section (root, info.name.c_str (), 1, key); + //err = cfg.open_section (root, info.name.c_str (), 1, key); + err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key); if (err != 0) { ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str())); @@ -457,12 +477,13 @@ Locator_Repository::update_activator (const Activator_Info& info) } cfg.set_integer_value (key, TOKEN, info.token); - cfg.set_string_value (key, IOR, info.ior.c_str ()); + cfg.set_string_value (key, IOR, ACE_TEXT_TO_TCHAR_IN(info.ior.c_str())); } else if (rmode_ == Options::REPO_XML_FILE) { - saveAsXML( this->fname_, *this); + saveAsXML(this->fname_, *this); } + return 0; } @@ -508,7 +529,8 @@ Locator_Repository::remove_server (const ACE_CString& name) { return 0; // Already gone. } - ret = cfg.remove_section (root, name.c_str (), 1); + + ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1); } else if (rmode_ == Options::REPO_XML_FILE) { @@ -533,15 +555,16 @@ Locator_Repository::remove_activator (const ACE_CString& name) ACE_Configuration_Section_Key root; int err = cfg.open_section (cfg.root_section (), ACTIVATORS_ROOT_KEY, 0, root); if (err != 0) - { - return 0; // Already gone. - } - ret = cfg.remove_section (root, name.c_str (), 1); + { + return 0; // Already gone. + } + + ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1); } else if (rmode_ == Options::REPO_XML_FILE) - { - saveAsXML (this->fname_, *this); - } + { + saveAsXML (this->fname_, *this); + } return ret; } @@ -557,18 +580,18 @@ Locator_Repository::activators (void) return activator_infos_; } -const char* -Locator_Repository::repo_mode () +const ACE_TCHAR* +Locator_Repository::repo_mode() { switch (rmode_) - { - case Options::REPO_XML_FILE: - case Options::REPO_HEAP_FILE: - return fname_.c_str (); - case Options::REPO_REGISTRY: - return "Registry"; - case Options::REPO_NONE: - return "Disabled"; - } - return "Disabled"; + { + case Options::REPO_XML_FILE: + case Options::REPO_HEAP_FILE: + return fname_.c_str (); + case Options::REPO_REGISTRY: + return ACE_TEXT("Registry"); + case Options::REPO_NONE: + return ACE_TEXT("Disabled"); + } + return ACE_TEXT("Disabled"); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h index 2ef50b5753a..6818638fefe 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h @@ -95,7 +95,7 @@ public: /// Returns the internal hash map containing the activator information. AIMap& activators(void); - const char* repo_mode(); + const ACE_TCHAR* repo_mode(); private: // Type mechanism to use for persistence. @@ -107,7 +107,7 @@ private: // Several rmode_ values require this. ACE_Auto_Ptr<ACE_Configuration> config_; // XML requires the file name - ACE_CString fname_; + ACE_TString fname_; }; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp index a1ddcf0b3d9..ee133fb6a7d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp @@ -5,13 +5,13 @@ ACE_RCSID (ImplRepo_Service,Locator_XMLHandler,"$Id$") -const char* Locator_XMLHandler::ROOT_TAG = "ImplementationRepository"; -const char* Locator_XMLHandler::SERVER_INFO_TAG = "Servers"; -const char* Locator_XMLHandler::ACTIVATOR_INFO_TAG = "Activators"; -const char* Locator_XMLHandler::ENVIRONMENT_TAG = "EnvironmentVariables"; + const ACE_TCHAR* Locator_XMLHandler::ROOT_TAG = ACE_TEXT("ImplementationRepository"); +const ACE_TCHAR* Locator_XMLHandler::SERVER_INFO_TAG = ACE_TEXT("Servers"); +const ACE_TCHAR* Locator_XMLHandler::ACTIVATOR_INFO_TAG = ACE_TEXT("Activators"); +const ACE_TCHAR* Locator_XMLHandler::ENVIRONMENT_TAG = ACE_TEXT("EnvironmentVariables"); Locator_XMLHandler::Locator_XMLHandler (Callback& cb) -: callback_ (cb) + : callback_ (cb) { } @@ -31,37 +31,39 @@ Locator_XMLHandler::startElement (const ACEXML_Char*, if (attrs != 0 && attrs->getLength () == 8) { - this->server_name_ = attrs->getValue ((size_t)0); - this->activator_name_ = attrs->getValue ((size_t)1); - this->command_line_ = attrs->getValue ((size_t)2); - this->working_dir_ = attrs->getValue ((size_t)3); - this->activation_ = attrs->getValue ((size_t)4); - this->env_vars_.clear (); - int limit = ACE_OS::atoi (attrs->getValue ((size_t)5)); + this->server_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0))); + this->activator_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1))); + this->command_line_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)2))); + this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)3))); + this->activation_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)4))); + + this->env_vars_.clear(); + + int limit = ACE_OS::atoi (attrs->getValue((size_t)5)); this->start_limit_ = limit; - this->partial_ior_ = attrs->getValue ((size_t)6); - this->server_object_ior_ = attrs->getValue ((size_t)7); + this->partial_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)6))); + this->server_object_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)7))); } } else if (ACE_OS::strcasecmp (qName, ACTIVATOR_INFO_TAG) == 0) - { - if (attrs != 0 && attrs->getLength () == 3) - { - ACE_CString aname = attrs->getValue ((size_t)0); - ACE_CString token_str = attrs->getValue ((size_t)1); - long token = ACE_OS::atoi (token_str.c_str ()); - ACE_CString ior = attrs->getValue ((size_t)2); - this->callback_.next_activator (aname, token, ior); - } - } + { + if (attrs != 0 && attrs->getLength () == 3) + { + ACE_CString aname (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0))); + ACE_CString token_str (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1))); + long token = ACE_OS::atoi (token_str.c_str()); + ACE_CString ior (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)2))); + this->callback_.next_activator(aname, token, ior); + } + } else if (ACE_OS::strcasecmp (qName, ENVIRONMENT_TAG) == 0) { - if (attrs != 0 && attrs->getLength () == 2) + if (attrs != 0 && attrs->getLength() == 2) { EnvVar ev; - ev.name = attrs->getValue ((size_t)0); - ev.value = attrs->getValue ((size_t)1); - this->env_vars_.push_back (ev); + ev.name.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0))); + ev.value.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1))); + this->env_vars_.push_back(ev); } } } @@ -74,13 +76,13 @@ Locator_XMLHandler::endElement (const ACEXML_Char*, { ACE_ASSERT(qName != 0); if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0 - && this->server_name_.length () > 0) - { - this->callback_.next_server (this->server_name_, - this->activator_name_, this->command_line_, - this->env_vars_, this->working_dir_, this->activation_, - this->start_limit_, this->partial_ior_, this->server_object_ior_); - } + && this->server_name_.length () > 0) + { + this->callback_.next_server (this->server_name_, + this->activator_name_, this->command_line_, + this->env_vars_, this->working_dir_, this->activation_, + this->start_limit_, this->partial_ior_, this->server_object_ior_); + } // activator info is handled in the startElement } @@ -94,4 +96,3 @@ Locator_XMLHandler::EnvVar::operator!= (const EnvVar& rhs) const { return ! (rhs == *this); } - diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h index ff8691d0a78..f63f2fa9d85 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h @@ -28,10 +28,10 @@ class Locator_XMLHandler : public ACEXML_DefaultHandler public: // XML ELEMENT names - static const char* ROOT_TAG; - static const char* SERVER_INFO_TAG; - static const char* ENVIRONMENT_TAG; - static const char* ACTIVATOR_INFO_TAG; + static const ACE_TCHAR* ROOT_TAG; + static const ACE_TCHAR* SERVER_INFO_TAG; + static const ACE_TCHAR* ENVIRONMENT_TAG; + static const ACE_TCHAR* ACTIVATOR_INFO_TAG; struct EnvVar { ACE_CString name; diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 9febb1ae406..c589f6dd3ce 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -12,9 +12,10 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_strings.h" #include "ace/OS.h" +#include "ace/Argv_Type_Converter.h" TAO_IMR_i::TAO_IMR_i (void) -: imr_ (ImplementationRepository::Administration::_nil ()) + : imr_ (ImplementationRepository::Administration::_nil ()) { // Nothing } @@ -36,22 +37,22 @@ TAO_IMR_i::run () } int -TAO_IMR_i::init (int argc, char **argv) +TAO_IMR_i::init (int argc, ACE_TCHAR **argv) { - this->argc_ = argc; - this->argv_ = argv; - const char *exception_message = "Null Message"; + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve the ORB. - this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i" ACE_ENV_ARG_PARAMETER); + this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + "tao_imr_i" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. - if (this->parse_args () == -1) + if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1) return -1; // Get the ImplRepo object @@ -94,29 +95,29 @@ TAO_IMR_i::init (int argc, char **argv) // Go through and figure out which operation we should do. int -TAO_IMR_i::parse_args (void) +TAO_IMR_i::parse_args (int argc, ACE_TCHAR **argv) { // Make sure one command was given - if (this->argc_ < 2) + if (argc < 2) { ACE_ERROR((LM_ERROR, "Error: No operation specified.\n")); this->print_usage (); return -1; } - this->op_.reset (TAO_IMR_Op::make_op (this->argv_[1])); + this->op_.reset(TAO_IMR_Op::make_op (argv[1])); // Check for unrecognized operation - if (this->op_.get () == 0) + if (this->op_.get() == 0) { - ACE_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", this->argv_[1])); + ACE_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", argv[1])); this->print_usage (); return -1; } // Adjust argc and argv so only the command specific args are passed - return this->op_->parse (this->argc_ - 1, this->argv_ + 1); + return this->op_->parse (argc - 1, argv + 1); } @@ -126,18 +127,18 @@ void TAO_IMR_i::print_usage (void) { ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] command [command-arguments]\n" - " where [options] are ORB options\n" - " where command is one of the following:\n" - " start Start a server through the ImR\n" - " add Add an entry to the ImR\n" - " autostart Activates all AUTO_START servers\n" - " ior Creates a simplified IOR\n" - " list List the entries in the ImR\n" - " remove Remove an entry from the ImR\n" - " shutdown Shut down a server through the ImR\n" - " shutdown-repo Shut down the ImR\n" - " update Update an entry in the ImR\n" - " where [command-arguments] depend on the command\n")); + " where [options] are ORB options\n" + " where command is one of the following:\n" + " start Start a server through the ImR\n" + " add Add an entry to the ImR\n" + " autostart Activates all AUTO_START servers\n" + " ior Creates a simplified IOR\n" + " list List the entries in the ImR\n" + " remove Remove an entry from the ImR\n" + " shutdown Shut down a server through the ImR\n" + " shutdown-repo Shut down the ImR\n" + " update Update an entry in the ImR\n" + " where [command-arguments] depend on the command\n")); } @@ -212,22 +213,22 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn } ACE_DEBUG ((LM_DEBUG, - " Activator: %s\n" - " Command Line: %s\n" - " Working Directory: %s\n" - " Activation Mode: %s\n" - " Number of retries: %d\n" - "%s", - info.startup.activator.in (), - info.startup.command_line.in (), - info.startup.working_directory.in (), - act, - limit - 1, - locked_out)); + " Activator: %s\n" + " Command Line: %s\n" + " Working Directory: %s\n" + " Activation Mode: %s\n" + " Number of retries: %d\n" + "%s", + info.startup.activator.in (), + info.startup.command_line.in (), + info.startup.working_directory.in (), + act, + limit - 1, + locked_out)); for (CORBA::ULong i = 0; i < info.startup.environment.length (); ++i) ACE_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s \n", - info.startup.environment[i].name.in (), - info.startup.environment[i].value.in ())); + info.startup.environment[i].name.in (), + info.startup.environment[i].value.in ())); if (info.startup.activation == ImplementationRepository::PER_CLIENT) ACE_DEBUG ((LM_DEBUG, @@ -244,21 +245,21 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn } TAO_IMR_Op_List::TAO_IMR_Op_List (void) -: verbose_server_information_ (0) + : verbose_server_information_ (0) { // Nothing } TAO_IMR_Op_Register::TAO_IMR_Op_Register (bool is_add) -: is_add_ (is_add) -, set_command_line_ (false) -, set_environment_vars_(false) -, set_working_dir_ (false) -, set_activation_ (false) -, activation_(ImplementationRepository::NORMAL) -, set_retry_count_(false) -, retry_count_ (0) -, set_activator_ (false) + : is_add_ (is_add) + , set_command_line_ (false) + , set_environment_vars_(false) + , set_working_dir_ (false) + , set_activation_ (false) + , activation_(ImplementationRepository::NORMAL) + , set_retry_count_(false) + , retry_count_ (0) + , set_activator_ (false) { // Nothing } @@ -267,11 +268,11 @@ void TAO_IMR_Op_Activate::print_usage (void) { ACE_ERROR ((LM_ERROR, "Starts a server using its registered Activator.\n" - "\n" - "Usage: tao_imr [options] start <name>\n" - " where [options] are ORB options\n" - " where <name> is the name of a registered POA.\n" - " -h Displays this\n")); + "\n" + "Usage: tao_imr [options] start <name>\n" + " where [options] are ORB options\n" + " where <name> is the name of a registered POA.\n" + " -h Displays this\n")); } int @@ -285,23 +286,23 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "activate" command - ACE_Get_Opt get_opts (argc, argv, "h"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); - this->server_name_ = argv[1]; + this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; while ((c = get_opts ()) != -1) { switch (c) - { - case 'h': - this->print_usage (); - return -1; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + { + case 'h': + this->print_usage (); + return -1; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; + } } return 0; } @@ -310,30 +311,30 @@ void TAO_IMR_Op_Autostart::print_usage (void) { ACE_ERROR ((LM_ERROR, "Usage: tao_imr [options] autostart\n" - " where [options] are ORB options\n" - " -h Displays this\n")); + " where [options] are ORB options\n" + " -h Displays this\n")); } int TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv) { // Skip the "autostart" command - ACE_Get_Opt get_opts (argc, argv, "h"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); int c; while ((c = get_opts ()) != -1) { switch (c) - { - case 'h': // display help - this->print_usage (); - return -1; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + { + case 'h': // display help + this->print_usage (); + return -1; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; + } } return 0; } @@ -342,15 +343,15 @@ void TAO_IMR_Op_IOR::print_usage (void) { ACE_ERROR ((LM_ERROR, "Creates an IOR for a server that is registered with the IMR and uses\n" - "the InterOperable Naming Service. Please see the documentation for\n" - "more information on which server configurations work with this command.\n" - "\n" - "Usage: tao_imr [options] ior <object_key> [command-arguments]\n" - " where [options] are ORB options\n" - " where <object_key> matches the simple key bound in the server IORTable.\n" - " where [command-arguments] can be\n" - " -f filename filename to output the IOR to\n" - " -h Displays this\n")); + "the InterOperable Naming Service. Please see the documentation for\n" + "more information on which server configurations work with this command.\n" + "\n" + "Usage: tao_imr [options] ior <object_key> [command-arguments]\n" + " where [options] are ORB options\n" + " where <object_key> matches the simple key bound in the server IORTable.\n" + " where [command-arguments] can be\n" + " -f filename filename to output the IOR to\n" + " -h Displays this\n")); } int @@ -364,9 +365,9 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "ior" command - ACE_Get_Opt get_opts (argc, argv, "hf:"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hf:")); - this->server_name_ = argv[1]; + this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); if (this->server_name_.length() == 0 || this->server_name_[0] == '-') { ACE_ERROR((LM_ERROR, "ERROR : name is required.\n")); @@ -379,19 +380,20 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) while ((c = get_opts ()) != -1) { switch (c) - { - case 'f': // File name - this->filename_ = get_opts.opt_arg (); - break; - case 'h': // display help - this->print_usage (); - return -1; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + { + case 'f': // File name + this->filename_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ())); + break; + case 'h': // display help + this->print_usage(); + return -1; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; + } } + return 0; } @@ -399,14 +401,14 @@ void TAO_IMR_Op_List::print_usage (void) { ACE_ERROR ((LM_ERROR, "Lists all or one of the servers in the Implementation Repository\n" - "\n" - "Usage: tao_imr [options] list [name] [command-arguments]\n" - " where [options] are ORB options\n" - " where [name] is the optional server name to search for\n" - " where [command-arguments] can be\n" - " -v Verbose: Displays more info for each server when\n" - " displaying more than one server\n" - " -h Displays this\n")); + "\n" + "Usage: tao_imr [options] list [name] [command-arguments]\n" + " where [options] are ORB options\n" + " where [name] is the optional server name to search for\n" + " where [command-arguments] can be\n" + " -v Verbose: Displays more info for each server when\n" + " displaying more than one server\n" + " -h Displays this\n")); } int @@ -415,31 +417,31 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv) int server_flag = 0; if (argc > 1 && argv[1][0] != '-') - { - this->server_name_ = argv[1]; - server_flag = 2; - } + { + this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); + server_flag = 2; + } // Skip both the program name and the "list" command - ACE_Get_Opt get_opts (argc, argv, "vh", server_flag); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("vh"), server_flag); int c; while ((c = get_opts ()) != -1) { switch (c) - { - case 'v': // verbose server display - this->verbose_server_information_ = 1; - break; - case 'h': // display help - this->print_usage (); - return -1; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + { + case 'v': // verbose server display + this->verbose_server_information_ = 1; + break; + case 'h': // display help + this->print_usage (); + return -1; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; + } } return 0; } @@ -448,11 +450,11 @@ void TAO_IMR_Op_Remove::print_usage (void) { ACE_ERROR ((LM_ERROR, "Removes a server entry\n" - "\n" - "Usage: tao_imr [options] remove <name>\n" - " where [options] are ORB options\n" - " where <name> is the POA name used by the server object\n" - " -h Displays this\n")); + "\n" + "Usage: tao_imr [options] remove <name>\n" + " where [options] are ORB options\n" + " where <name> is the POA name used by the server object\n" + " -h Displays this\n")); } int @@ -466,23 +468,23 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "remove" command - ACE_Get_Opt get_opts (argc, argv, "h"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); - this->server_name_ = argv[1]; + this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; while ((c = get_opts ()) != -1) { switch (c) - { - case 'h': - this->print_usage (); - return -1; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + { + case 'h': + this->print_usage (); + return -1; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; + } } return 0; } @@ -491,11 +493,11 @@ void TAO_IMR_Op_Shutdown::print_usage (void) { ACE_ERROR ((LM_ERROR, "Shuts down a server\n" - "\n" - "Usage: tao_imr [options] shutdown <name>\n" - " where [options] are ORB options\n" - " where <name> is the name of the server object\n" - " -h Displays this\n")); + "\n" + "Usage: tao_imr [options] shutdown <name>\n" + " where [options] are ORB options\n" + " where <name> is the name of the server object\n" + " -h Displays this\n")); } int @@ -509,29 +511,29 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "shutdown" command - ACE_Get_Opt get_opts (argc, argv, "h"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); - this->server_name_ = argv[1]; + this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; while ((c = get_opts ()) != -1) { switch (c) - { - case 'h': - this->print_usage (); - return -1; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + { + case 'h': + this->print_usage (); + return -1; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; + } } return 0; } TAO_IMR_Op_ShutdownRepo::TAO_IMR_Op_ShutdownRepo() -: activators_(false) + : activators_(false) { } @@ -539,11 +541,11 @@ void TAO_IMR_Op_ShutdownRepo::print_usage (void) { ACE_ERROR ((LM_ERROR, "Shuts down the ImR\n" - "\n" - "Usage: tao_imr [options] shutdown-repo [-a]\n" - " where [options] are ORB options\n" - " Specify -a to also shutdown any registered ImR Activators.\n" - " -h Displays this\n")); + "\n" + "Usage: tao_imr [options] shutdown-repo [-a]\n" + " where [options] are ORB options\n" + " Specify -a to also shutdown any registered ImR Activators.\n" + " -h Displays this\n")); } int @@ -557,25 +559,25 @@ TAO_IMR_Op_ShutdownRepo::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "shutdown-repo" command - ACE_Get_Opt get_opts (argc, argv, "ha"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("ha")); int c; while ((c = get_opts ()) != -1) { switch (c) - { - case 'h': - this->print_usage (); - return -1; - case 'a': - activators_ = true; - break; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + { + case 'h': + this->print_usage (); + return -1; + case 'a': + activators_ = true; + break; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; + } } return 0; @@ -587,8 +589,8 @@ TAO_IMR_Op_Register::addenv (ACE_TCHAR *opt) CORBA::ULong length = this->environment_vars_.length (); // Increase the length of the sequence this->environment_vars_.length (length + 1); - ACE_CString tokens (opt); - int index = tokens.find ("="); + ACE_TString tokens (opt); + int index = tokens.find (ACE_TEXT("=")); // Insert at position length since that is our new element this->environment_vars_ [length].name = CORBA::string_dup (tokens.substr (0, index).c_str ()); @@ -600,19 +602,19 @@ void TAO_IMR_Op_Register::print_usage (void) { ACE_ERROR ((LM_ERROR, - "Adds/Updates a server entry\n" - "\n" - "Usage: tao_imr [options] <add|update> <name> [command-arguments]\n" - " where [options] are ORB options\n" - " where <name> is the POA name used by the server object\n" - " where [command-arguments] can be\n" - " -h Displays this\n" - " -l Activator name.\n" - " -c command Startup command\n" - " -w dir Working directory\n" - " -e name=value Set environment variables\n" - " -a mode Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n" - " -r count Set the startup/ping retry count to count\n")); + "Adds/Updates a server entry\n" + "\n" + "Usage: tao_imr [options] <add|update> <name> [command-arguments]\n" + " where [options] are ORB options\n" + " where <name> is the POA name used by the server object\n" + " where [command-arguments] can be\n" + " -h Displays this\n" + " -l Activator name.\n" + " -c command Startup command\n" + " -w dir Working directory\n" + " -e name=value Set environment variables\n" + " -a mode Set activate mode (NORMAL|MANUAL|PER_CLIENT|AUTO_START)\n" + " -r count Set the startup/ping retry count to count\n")); } int @@ -627,64 +629,65 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "update" command - ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:r:R:l:"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hc:w:a:e:r:R:l:")); - this->server_name_ = argv[1]; + this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; while ((c = get_opts ()) != -1) { switch (c) - { - case 'c': // Command line arguments - this->set_command_line_ = true; - this->command_line_ = get_opts.opt_arg (); - break; - case 'e': // set environment variables - this->set_environment_vars_ = true; - this->addenv( get_opts.opt_arg () ); - break; - case 'w': // Working Directory - this->set_working_dir_ = true; - this->working_dir_ = get_opts.opt_arg (); - break; - case 'a': // Activation Mode - this->set_activation_ = true; - if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0) - this->activation_ = ImplementationRepository::NORMAL; - else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0) - this->activation_ = ImplementationRepository::MANUAL; - else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0) - this->activation_ = ImplementationRepository::PER_CLIENT; - else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "AUTO_START") == 0) - this->activation_ = ImplementationRepository::AUTO_START; - else - ACE_ERROR_RETURN ((LM_ERROR, - "Unknown Activation Mode <%s>.\n", - get_opts.opt_arg ()), - -1); - break; - case 'r': - case 'R': // startup/ping Retry Count { - this->set_retry_count_ = true; - int rc = ACE_OS::atoi(get_opts.optarg); - if (rc > 0) - this->retry_count_ = rc; + case 'c': // Command line arguments + this->set_command_line_ = true; + this->command_line_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ())); + break; + case 'e': // set environment variables + this->set_environment_vars_ = true; + this->addenv( get_opts.opt_arg () ); + break; + case 'w': // Working Directory + this->set_working_dir_ = true; + this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ())); + break; + case 'a': // Activation Mode + this->set_activation_ = true; + if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("NORMAL")) == 0) + this->activation_ = ImplementationRepository::NORMAL; + else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("MANUAL")) == 0) + this->activation_ = ImplementationRepository::MANUAL; + else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("PER_CLIENT")) == 0) + this->activation_ = ImplementationRepository::PER_CLIENT; + else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("AUTO_START")) == 0) + this->activation_ = ImplementationRepository::AUTO_START; + else + ACE_ERROR_RETURN ((LM_ERROR, + "Unknown Activation Mode <%s>.\n", + get_opts.opt_arg ()), + -1); + break; + case 'r': + case 'R': // startup/ping Retry Count + { + this->set_retry_count_ = true; + int rc = ACE_OS::atoi(get_opts.optarg); + if (rc > 0) + this->retry_count_ = rc; + } + break; + case 'l': /// hostname of the activator + this->activator_.set (ACE_TEXT_TO_CHAR_IN (get_opts.optarg)); + this->set_activator_ = true; + break; + case 'h': // display help + this->print_usage (); + return -1; + default: + ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); + this->print_usage (); + return -1; } - break; - case 'l': /// hostname of the activator - this->activator_ = get_opts.optarg; - this->set_activator_ = true; - break; - case 'h': // display help - this->print_usage (); - return -1; - default: - ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c)); - this->print_usage (); - return -1; - } + } return 0; } @@ -704,14 +707,14 @@ TAO_IMR_Op_Activate::run (void) this->imr_->activate_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, - "Successfully Activated server <%s>\n", - this->server_name_.c_str ())); + "Successfully Activated server <%s>\n", + this->server_name_.c_str ())); } ACE_CATCH (ImplementationRepository::CannotActivate, ex) { ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n", - this->server_name_.c_str (), - ex.reason.in ())); + this->server_name_.c_str (), + ex.reason.in ())); return TAO_IMR_Op::CANNOT_ACTIVATE; } ACE_CATCH (ImplementationRepository::NotFound, ex) @@ -745,9 +748,9 @@ TAO_IMR_Op_Autostart::run (void) ACE_TRY { this->imr_->list (0, - server_list, - server_iter - ACE_ENV_ARG_PARAMETER); + server_list, + server_iter + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT(CORBA::is_nil (server_iter.in ())); @@ -788,14 +791,14 @@ TAO_IMR_Op_IOR::run (void) ACE_TRY_NEW_ENV { if (CORBA::is_nil (this->imr_) - || !this->imr_->_stubobj () - || !this->imr_->_stubobj ()->profile_in_use ()) - { - ACE_ERROR_RETURN (( - LM_ERROR, - ACE_TEXT ("Invalid ImR IOR.\n") - ), -1); - } + || !this->imr_->_stubobj () + || !this->imr_->_stubobj ()->profile_in_use ()) + { + ACE_ERROR_RETURN (( + LM_ERROR, + ACE_TEXT ("Invalid ImR IOR.\n") + ), -1); + } CORBA::String_var imr_str = this->imr_->_stubobj ()-> @@ -808,24 +811,24 @@ TAO_IMR_Op_IOR::run (void) char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc); if (pos == 0) - { - ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); - } - else - { - pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':'); - pos = ACE_OS::strchr (pos + 1, - this->imr_->_stubobj ()->profile_in_use ()->object_key_delimiter ()); - - if (pos) { - *(pos + 1) = 0; // Crop the string + ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); } - else + else { - ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); + pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':'); + pos = ACE_OS::strchr (pos + 1, + this->imr_->_stubobj ()->profile_in_use ()->object_key_delimiter ()); + + if (pos) + { + *(pos + 1) = 0; // Crop the string + } + else + { + ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1); + } } - } ACE_CString ior (imr_str.in ()); // Add the key @@ -834,20 +837,20 @@ TAO_IMR_Op_IOR::run (void) ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ())); if (this->filename_.length () > 0) - { - FILE *file = ACE_OS::fopen (this->filename_.c_str (), "w"); - - if (file == 0) { - ACE_ERROR_RETURN ((LM_ERROR, - "Error: Unable to open %s for writing: %p\n", - this->filename_.c_str ()), - -1); - } + FILE *file = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT("w")); + + if (file == 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Error: Unable to open %s for writing: %p\n", + this->filename_.c_str ()), + -1); + } - ACE_OS::fprintf (file, "%s", ior.c_str ()); - ACE_OS::fclose (file); - } + ACE_OS::fprintf (file, "%s", ior.c_str ()); + ACE_OS::fclose (file); + } } ACE_CATCHANY { @@ -875,16 +878,16 @@ TAO_IMR_Op_List::run (void) if (this->server_name_.length () == 0) { this->imr_->list (0, - server_list.out(), - server_iter.out() - ACE_ENV_ARG_PARAMETER); + server_list.out(), + server_iter.out() + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (server_list->length() == 0) - { - ACE_DEBUG((LM_DEBUG, "No servers found.\n")); - return TAO_IMR_Op::NORMAL; - } + { + ACE_DEBUG((LM_DEBUG, "No servers found.\n")); + return TAO_IMR_Op::NORMAL; + } for (CORBA::ULong i = 0; i < server_list->length (); i++) this->display_server_information (server_list[i]); @@ -930,12 +933,12 @@ TAO_IMR_Op_Remove::run (void) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n", - this->server_name_.c_str ())); + this->server_name_.c_str ())); } ACE_CATCH (ImplementationRepository::NotFound, ex) { ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", - this->server_name_.c_str ())); + this->server_name_.c_str ())); return TAO_IMR_Op::NOT_FOUND; } ACE_CATCH (CORBA::NO_PERMISSION, ex) @@ -965,7 +968,7 @@ TAO_IMR_Op_Shutdown::run (void) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n", - this->server_name_.c_str ())); + this->server_name_.c_str ())); } ACE_CATCH (ImplementationRepository::NotFound, ex) { @@ -975,7 +978,7 @@ TAO_IMR_Op_Shutdown::run (void) ACE_CATCH(CORBA::TIMEOUT, ex) { ACE_DEBUG ((LM_DEBUG, "Timeout waiting for <%s> to shutdown.\n", - this->server_name_.c_str ())); + this->server_name_.c_str ())); } ACE_CATCHANY { @@ -1028,7 +1031,7 @@ TAO_IMR_Op_Register::run (void) ACE_TRY { this->imr_->find(this->server_name_.c_str (), - server_information.out() ACE_ENV_ARG_PARAMETER); + server_information.out() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (server_name_ == server_information->server.in()) @@ -1043,10 +1046,10 @@ TAO_IMR_Op_Register::run (void) else // not found { if (!is_add_) - { - ACE_DEBUG((LM_DEBUG, "Adding Server <%s> on update command.\n", this->server_name_.c_str ())); - is_add_ = true; - } + { + ACE_DEBUG((LM_DEBUG, "Adding Server <%s> on update command.\n", this->server_name_.c_str ())); + is_add_ = true; + } options = &local; } @@ -1069,13 +1072,13 @@ TAO_IMR_Op_Register::run (void) options->activator = CORBA::string_dup(this->activator_.c_str ()); // If the command line is set, we must have an activator else if (this->set_command_line_ && - (options->activator.in () == 0 || *options->activator.in () == 0)) + (options->activator.in () == 0 || *options->activator.in () == 0)) { char host_name[MAXHOSTNAMELEN + 1]; ACE_OS::hostname (host_name, MAXHOSTNAMELEN); options->activator = CORBA::string_dup (host_name); ACE_DEBUG ((LM_DEBUG, "Updating Server <%s> with default activator of <%s>.\n", - this->server_name_.c_str (), options->activator.in ())); + this->server_name_.c_str (), options->activator.in ())); } this->imr_->add_or_update_server (this->server_name_.c_str (), *options ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h index df728e7002e..ede2567bc5c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h @@ -42,20 +42,14 @@ public: int run (void); /// Initialize the client communication endpoint with server. - int init (int argc, char **argv); + int init (int argc, ACE_TCHAR **argv); private: /// Print out information about all operations. void print_usage (void); /// Parses the arguments passed on the command line. - int parse_args (void); - - /// # of arguments on the command line. - int argc_; - - /// Arguments from command line. - ACE_TCHAR **argv_; + int parse_args (int argc, ACE_TCHAR **argv); /// Remember our orb. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp index 3e2270c5442..4e095a93a6c 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp @@ -73,7 +73,7 @@ Criteria_Evaluator::getCriteriaMember (const char *member_name) i < criteria_.length(); i++) if (ACE_OS::strcmp (member_name, - criteria_[i].name) == 0) + criteria_[i].name.in()) == 0) { CORBA::Any_ptr value_ptr; diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp index 0a3c9a68cf8..0ce00f92d5e 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -88,7 +88,7 @@ Life_Cycle_Service_Server::init (int argc, ACE_CHECK_RETURN (-1); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR(str.in ()))); + ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_TO_TCHAR_IN(str.in ()))); // Register the LifeCycle Service with the Naming Service. ACE_TRY @@ -166,7 +166,7 @@ u_int Life_Cycle_Service_Server::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("?d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("?d:")); int opt; int exit_code = 0; diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index fb4ab4209cb..7b6b3ebe613 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -10,6 +10,8 @@ #include "tao/IORTable/IORTable.h" +#include "ace/Argv_Type_Converter.h" + #if defined (linux) && defined (ACE_HAS_THREADS) # include "ace/Signal.h" #endif /* linux && ACE_HAS_THREADS */ @@ -20,7 +22,7 @@ ACE_RCSID (LoadBalancer, "$Id$") -static const char * lm_ior_file = "lm.ior"; +static ACE_CString lm_ior_file ("lm.ior"); void usage (const ACE_TCHAR * cmd) @@ -43,7 +45,7 @@ parse_args (int argc, int & default_strategy ACE_ENV_ARG_DECL) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:s:h")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT ("o:s:h")); int c = 0; @@ -52,18 +54,18 @@ parse_args (int argc, switch (c) { case 'o': - ::lm_ior_file = get_opts.opt_arg (); + ::lm_ior_file.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ())); break; case 's': if (ACE_OS::strcasecmp (get_opts.opt_arg (), - "RoundRobin") == 0) + ACE_TEXT("RoundRobin")) == 0) default_strategy = 0; else if (ACE_OS::strcasecmp (get_opts.opt_arg (), - "Random") == 0) + ACE_TEXT("Random")) == 0) default_strategy = 1; else if (ACE_OS::strcasecmp (get_opts.opt_arg (), - "LeastLoaded") == 0) + ACE_TEXT("LeastLoaded")) == 0) default_strategy = 2; else ACE_DEBUG ((LM_DEBUG, @@ -120,13 +122,15 @@ TAO_LB_run_load_manager (void * orb_arg) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // The usual server side boilerplate code. - 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; @@ -155,8 +159,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int default_strategy = 1; // Check the non-ORB arguments. - ::parse_args (argc, - argv, + ::parse_args (convert.get_argc(), + convert.get_TCHAR_argv(), default_strategy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -235,7 +239,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) table->bind ("LoadManager", str.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE * lm_ior = ACE_OS::fopen (lm_ior_file, "w"); + FILE * lm_ior = ACE_OS::fopen (lm_ior_file.fast_rep(), ACE_TEXT("w")); ACE_OS::fprintf (lm_ior, "%s", str.in ()); ACE_OS::fclose (lm_ior); diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp index b0bb0a36701..9b159184cc4 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp @@ -10,6 +10,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_main.h" #include "ace/OS_NS_strings.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (LoadBalancer, @@ -17,11 +18,11 @@ ACE_RCSID (LoadBalancer, "$Id$") -static const char * location_id = 0; -static const char * location_kind = 0; -static const char * mtype = "CPU"; -static const char * mstyle = "PUSH"; -static const char * custom_monitor_ior = 0; +static const ACE_TCHAR * location_id = 0; +static const ACE_TCHAR * location_kind = 0; +static const ACE_TCHAR * mtype = ACE_TEXT("CPU"); +static const ACE_TCHAR * mstyle = ACE_TEXT("PUSH"); +static const ACE_TCHAR * custom_monitor_ior = 0; // For the sake of consistency, make default push monitoring interval // the same as the pull monitoring interval. @@ -51,10 +52,10 @@ parse_args (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("l:k:t:s:i:m:h")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT ("l:k:t:s:i:m:h")); int c = 0; - const char * s; + const ACE_TCHAR * s; while ((c = get_opts ()) != -1) { @@ -149,7 +150,7 @@ get_load_monitor (CORBA::ORB_ptr orb, if (::custom_monitor_ior != 0) { CORBA::Object_var obj = - orb->string_to_object (::custom_monitor_ior + orb->string_to_object (ACE_TEXT_TO_CHAR_IN(::custom_monitor_ior) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); @@ -167,12 +168,13 @@ get_load_monitor (CORBA::ORB_ptr orb, poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); - if (ACE_OS::strcasecmp (::mtype, "CPU") == 0) + if (ACE_OS::strcasecmp (::mtype, ACE_TEXT("CPU")) == 0) { TAO_LB_CPU_Load_Average_Monitor * monitor = 0; ACE_NEW_THROW_EX (monitor, - TAO_LB_CPU_Load_Average_Monitor (::location_id, - ::location_kind), + TAO_LB_CPU_Load_Average_Monitor ( + ACE_TEXT_TO_CHAR_IN(::location_id), + ACE_TEXT_TO_CHAR_IN(::location_kind)), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ()); @@ -181,9 +183,9 @@ get_load_monitor (CORBA::ORB_ptr orb, return monitor->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } - else if (ACE_OS::strcasecmp (::mtype, "Disk") == 0 - || ACE_OS::strcasecmp (::mtype, "Memory") == 0 - || ACE_OS::strcasecmp (::mtype, "Network") == 0) + else if (ACE_OS::strcasecmp (::mtype, ACE_TEXT("Disk")) == 0 + || ACE_OS::strcasecmp (::mtype, ACE_TEXT("Memory")) == 0 + || ACE_OS::strcasecmp (::mtype, ACE_TEXT("Network")) == 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: \"%s\" load monitor currently ") @@ -214,7 +216,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, long & timer_id ACE_ENV_ARG_DECL) { - if (ACE_OS::strcasecmp (::mstyle, "PULL") == 0) + if (ACE_OS::strcasecmp (::mstyle, ACE_TEXT("PULL")) == 0) { PortableGroup::Location_var location = monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -225,7 +227,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - else if (ACE_OS::strcasecmp (::mstyle, "PUSH") == 0) + else if (ACE_OS::strcasecmp (::mstyle, ACE_TEXT("PUSH")) == 0) { ACE_Time_Value interval (::push_interval, 0); ACE_Time_Value restart (::push_interval, 0); @@ -257,20 +259,22 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // The usual server side boilerplate code. - 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; // Check the non-ORB arguments. - ::parse_args (argc, - argv + ::parse_args (convert.get_argc(), + convert.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index e782bb204f7..3445e36c823 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -4,6 +4,7 @@ #include "tao/IORTable/IORTable.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Basic_Logging_Service, Basic_Logging_Service, @@ -12,8 +13,6 @@ ACE_RCSID (Basic_Logging_Service, Basic_Logging_Service::Basic_Logging_Service (void) : service_name_ ("BasicLogFactory"), - ior_file_name_ (0), - pid_file_name_ (0), bind_to_naming_service_ (1), nthreads_ (0) { @@ -26,7 +25,7 @@ Basic_Logging_Service::~Basic_Logging_Service (void) } void -Basic_Logging_Service::init_ORB (int& argc, char *argv [] +Basic_Logging_Service::init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, @@ -54,9 +53,9 @@ Basic_Logging_Service::init_ORB (int& argc, char *argv [] } int -Basic_Logging_Service::parse_args (int argc, char *argv[]) +Basic_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; while ((opt = get_opt ()) != EOF) @@ -64,15 +63,15 @@ Basic_Logging_Service::parse_args (int argc, char *argv[]) switch (opt) { case 'n': - service_name_ = get_opt.opt_arg(); + service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 'o': - ior_file_name_ = get_opt.opt_arg(); + ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 'p': - pid_file_name_ = get_opt.opt_arg(); + pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 't': @@ -102,14 +101,16 @@ Basic_Logging_Service::parse_args (int argc, char *argv[]) } int -Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) +Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { + ACE_Argv_Type_Converter convert (argc, argv); + // initalize the ORB. - this->init_ORB (argc, argv + this->init_ORB (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1) return -1; // Activate the basic log factory @@ -140,13 +141,13 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) ACE_CHECK_RETURN (-1); } - if (ior_file_name_ != 0) + if (ior_file_name_.length() != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } @@ -154,9 +155,9 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) ACE_OS::fclose (iorf); } - if (pid_file_name_ != 0) + if (pid_file_name_.length() != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, @@ -177,7 +178,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) CosNaming::Name name (1); name.length (1); - name[0].id = CORBA::string_dup (this->service_name_); + name[0].id = CORBA::string_dup (this->service_name_.fast_rep()); this->naming_->rebind (name, obj.in () @@ -264,7 +265,7 @@ Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) // Unbind from the naming service. CosNaming::Name name (1); name.length (1); - name[0].id = CORBA::string_dup (this->service_name_); + name[0].id = CORBA::string_dup (this->service_name_.fast_rep()); this->naming_->unbind (name ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h index 57066ebf020..077f18aa6ce 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h @@ -18,6 +18,7 @@ #define BASIC_LOGGING_SERVICE_H #include "ace/Task.h" +#include "ace/SString.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/DsLogAdminC.h" #include "orbsvcs/Log/BasicLogFactory_i.h" @@ -39,7 +40,7 @@ class Basic_Logging_Service virtual ~Basic_Logging_Service (void); // Destructor. - int init (int argc, char *argv[] ACE_ENV_ARG_DECL); + int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -52,11 +53,11 @@ class Basic_Logging_Service // Returns 0 on success, -1 on error. protected: - void init_ORB (int& argc, char *argv [] + void init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL); // initialize the ORB. - int parse_args (int argc, char *argv []); + int parse_args (int argc, ACE_TCHAR *argv[]); // Parses the command line arguments. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); @@ -78,13 +79,13 @@ protected: CosNaming::NamingContext_var naming_; // A naming context. - const char* service_name_; + ACE_CString service_name_; // The name we use to bind with the NameService - const char* ior_file_name_; + ACE_CString ior_file_name_; // The name of the file where we output the factory IOR. - const char* pid_file_name_; + ACE_CString pid_file_name_; // The name of the file where we output the process id. int bind_to_naming_service_; diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index be47a102d7c..649fc2e7085 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -5,6 +5,7 @@ #include "tao/IORTable/IORTable.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event_Logging_Service, Event_Logging_Service, @@ -13,8 +14,6 @@ ACE_RCSID (Event_Logging_Service, Event_Logging_Service::Event_Logging_Service (void) : service_name_ ("EventLogFactory"), - ior_file_name_ (0), - pid_file_name_ (0), bind_to_naming_service_ (1), nthreads_ (0) { @@ -27,7 +26,7 @@ Event_Logging_Service::~Event_Logging_Service (void) } void -Event_Logging_Service::init_ORB (int& argc, char *argv [] +Event_Logging_Service::init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, @@ -55,9 +54,9 @@ Event_Logging_Service::init_ORB (int& argc, char *argv [] } int -Event_Logging_Service::parse_args (int argc, char *argv[]) +Event_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; while ((opt = get_opt ()) != EOF) @@ -65,15 +64,15 @@ Event_Logging_Service::parse_args (int argc, char *argv[]) switch (opt) { case 'n': - service_name_ = get_opt.opt_arg(); + service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 'o': - ior_file_name_ = get_opt.opt_arg(); + ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 'p': - pid_file_name_ = get_opt.opt_arg(); + pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 't': @@ -103,14 +102,16 @@ Event_Logging_Service::parse_args (int argc, char *argv[]) } int -Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) +Event_Logging_Service::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { + ACE_Argv_Type_Converter convert (argc, argv); + // initalize the ORB. - this->init_ORB (argc, argv + this->init_ORB (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1) return -1; // Activate the event log factory @@ -145,13 +146,13 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) ACE_CHECK_RETURN (-1); } - if (ior_file_name_ != 0) + if (ior_file_name_.length() != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } @@ -159,9 +160,9 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) ACE_OS::fclose (iorf); } - if (pid_file_name_ != 0) + if (pid_file_name_.length() != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, @@ -182,7 +183,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) CosNaming::Name name (1); name.length (1); - name[0].id = CORBA::string_dup (this->service_name_); + name[0].id = CORBA::string_dup (this->service_name_.fast_rep()); this->naming_->rebind (name, obj.in () @@ -269,7 +270,7 @@ Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) // Unbind from the naming service. CosNaming::Name name (1); name.length (1); - name[0].id = CORBA::string_dup (this->service_name_); + name[0].id = CORBA::string_dup (this->service_name_.fast_rep()); this->naming_->unbind (name ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h index de98deb20f9..17c335f7077 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h @@ -40,7 +40,7 @@ class Event_Logging_Service virtual ~Event_Logging_Service (void); // Destructor. - int init (int argc, char *argv[] ACE_ENV_ARG_DECL); + int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -53,11 +53,11 @@ class Event_Logging_Service // Returns 0 on success, -1 on error. protected: - void init_ORB (int& argc, char *argv [] + void init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL); // initialize the ORB. - int parse_args (int argc, char *argv []); + int parse_args (int argc, ACE_TCHAR *argv[]); // Parses the command line arguments. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); @@ -79,13 +79,13 @@ protected: CosNaming::NamingContext_var naming_; // A naming context. - const char* service_name_; + ACE_CString service_name_; // The name we use to bind with the NameService - const char* ior_file_name_; + ACE_CString ior_file_name_; // The name of the file where we output the factory IOR. - const char* pid_file_name_; + ACE_CString pid_file_name_; // The name of the file where we output the process id. int bind_to_naming_service_; diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index fd898bddc31..287201307d5 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Notify/Service.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify_Logging_Service, Notify_Logging_Service, @@ -14,8 +15,6 @@ ACE_RCSID (Notify_Logging_Service, Notify_Logging_Service::Notify_Logging_Service (void) : service_name_ (NOTIFY_KEY), - ior_file_name_ (0), - pid_file_name_ (0), bind_to_naming_service_ (1), nthreads_ (0) { @@ -28,7 +27,7 @@ Notify_Logging_Service::~Notify_Logging_Service (void) } int -Notify_Logging_Service::init_ORB (int& argc, char *argv [] +Notify_Logging_Service::init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, @@ -71,9 +70,9 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv [] } int -Notify_Logging_Service::parse_args (int argc, char *argv[]) +Notify_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t::x")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:t::x")); int opt; while ((opt = get_opt ()) != EOF) @@ -81,15 +80,15 @@ Notify_Logging_Service::parse_args (int argc, char *argv[]) switch (opt) { case 'n': - service_name_ = get_opt.opt_arg(); + service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 'o': - ior_file_name_ = get_opt.opt_arg(); + ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 'p': - pid_file_name_ = get_opt.opt_arg(); + pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())); break; case 't': @@ -118,15 +117,17 @@ Notify_Logging_Service::parse_args (int argc, char *argv[]) } int -Notify_Logging_Service::init (int argc, char *argv[] +Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { + ACE_Argv_Type_Converter convert (argc, argv); + // initalize the ORB. - if (this->init_ORB (argc, argv + if (this->init_ORB (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) != 0) return -1; - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1) return -1; this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER); @@ -167,14 +168,14 @@ Notify_Logging_Service::init (int argc, char *argv[] ACE_CHECK_RETURN (-1); } - if (ior_file_name_ != 0) + if (ior_file_name_.length() != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } @@ -182,9 +183,9 @@ Notify_Logging_Service::init (int argc, char *argv[] ACE_OS::fclose (iorf); } - if (pid_file_name_ != 0) + if (pid_file_name_.length() != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, @@ -205,7 +206,7 @@ Notify_Logging_Service::init (int argc, char *argv[] CosNaming::Name name (1); name.length (1); - name[0].id = CORBA::string_dup (this->service_name_); + name[0].id = CORBA::string_dup (this->service_name_.fast_rep()); ACE_CHECK_RETURN (-1); this->naming_->rebind (name, @@ -292,7 +293,7 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); - name[0].id = CORBA::string_dup (this->service_name_); + name[0].id = CORBA::string_dup (this->service_name_.fast_rep()); ACE_CHECK; this->naming_->unbind (name diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h index c6d5f3a459b..59e1631b5ce 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h @@ -44,7 +44,7 @@ class Notify_Logging_Service virtual ~Notify_Logging_Service (void); // Destructor. - int init (int argc, char *argv[] ACE_ENV_ARG_DECL); + int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. @@ -57,11 +57,11 @@ class Notify_Logging_Service // Returns 0 on success, -1 on error. protected: - int init_ORB (int& argc, char *argv [] + int init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL); // initialize the ORB. - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); // Parses the command line arguments. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); @@ -89,13 +89,13 @@ protected: CosNaming::NamingContext_var naming_; // A naming context. - const char* service_name_; + ACE_CString service_name_; // The name we use to bind with the NameService - const char* ior_file_name_; + ACE_CString ior_file_name_; // The name of the file where we output the factory IOR. - const char* pid_file_name_; + ACE_CString pid_file_name_; // The name of the file where we output the process id. int bind_to_naming_service_; diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index 02dce835e2e..3eac4191082 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -9,6 +9,7 @@ #include "tao/IORTable/IORTable.h" #include "ace/OS_main.h" #include "ace/OS_NS_strings.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RTEvent_Logging_Service, RTEvent_Logging_Service, @@ -28,9 +29,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) RTEvent_Logging_Service::RTEvent_Logging_Service (void) : sched_impl_ (0), // ec_impl_ (0), - service_name_ (0), - ior_file_name_ (0), - pid_file_name_ (0), global_scheduler_ (0), rtevent_log_factory_name_ ("RTEventLogFactory"), child_poa_name_ ("RTEventLog_ChildPOA"), @@ -47,16 +45,18 @@ RTEvent_Logging_Service::~RTEvent_Logging_Service (void) } int -RTEvent_Logging_Service::run (int argc, char* argv[]) +RTEvent_Logging_Service::run (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. 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; - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1) return 1; ACE_NEW_RETURN (factory_servant_, @@ -220,21 +220,21 @@ RTEvent_Logging_Service::run (int argc, char* argv[]) ACE_CHECK_RETURN (-1); } - if (this->ior_file_name_ != 0) + if (this->ior_file_name_.length() != 0) { - FILE *output_file= ACE_OS::fopen (this->ior_file_name_, "w"); + FILE *output_file= ACE_OS::fopen (this->ior_file_name_.fast_rep(), ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - this->ior_file_name_), + this->ior_file_name_.c_str()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); } - if (this->pid_file_name_ != 0) + if (this->pid_file_name_.length() != 0) { - FILE *pidf = fopen (this->pid_file_name_, "w"); + FILE *pidf = fopen (this->pid_file_name_.fast_rep(), "w"); if (pidf != 0) { ACE_OS::fprintf (pidf, @@ -276,12 +276,12 @@ RTEvent_Logging_Service::run (int argc, char* argv[]) } int -RTEvent_Logging_Service::parse_args (int argc, char *argv []) +RTEvent_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { // default values... this->service_name_ = "EventService"; - ACE_Get_Opt get_opt (argc, argv, "n:o:p:s:"); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:s:")); int opt; while ((opt = get_opt ()) != EOF) @@ -289,15 +289,15 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv []) switch (opt) { case 'n': - this->service_name_ = get_opt.opt_arg (); + this->service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ())); break; case 'o': - this->ior_file_name_ = get_opt.opt_arg (); + this->ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ())); break; case 'p': - this->pid_file_name_ = get_opt.opt_arg (); + this->pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ())); break; case 's': @@ -305,11 +305,11 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv []) // argument, but this is consistent with the EC_Multiple // test and also allows for a runtime scheduling service. - if (ACE_OS::strcasecmp (get_opt.opt_arg (), "global") == 0) + if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("global")) == 0) { this->global_scheduler_ = 1; } - else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "local") == 0) + else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("local")) == 0) { this->global_scheduler_ = 0; } diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h index 629155423b4..baba42815d3 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h @@ -17,6 +17,8 @@ #ifndef RTEVENT_LOGGING_SERVICE_H #define RTEVENT_LOGGING_SERVICE_H +#include "ace/SString.h" + #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/RtecSchedulerS.h" @@ -37,24 +39,24 @@ public: RTEvent_Logging_Service (void); virtual ~RTEvent_Logging_Service (void); - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the event service. private: - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args private: POA_RtecScheduler::Scheduler *sched_impl_; // The Scheduler implementation. - const char* service_name_; + ACE_CString service_name_; // The name we use to bind with the NameService - const char* ior_file_name_; + ACE_CString ior_file_name_; // The name of the file were we output the Event_Service IOR. - const char* pid_file_name_; + ACE_CString pid_file_name_; // The name of a file where the process stores its pid int global_scheduler_; diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index dc1288420cb..9b117727a8c 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -27,7 +27,7 @@ #include "ace/Log_Msg.h" int -main (int, char*[]) +ACE_TMAIN (int, ACE_TCHAR*[]) { ACE_ERROR ((LM_INFO, "This program is only supported " @@ -53,11 +53,11 @@ public: Options (void); ~Options (void); - int run (int argc, char *argv[]); + int run (int argc, ACE_TCHAR *argv[]); private: void parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); void print_usage_and_die (void); private: @@ -112,9 +112,9 @@ Options::print_usage_and_die (void) } void -Options::parse_args (int argc, char *argv[]) +Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "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) @@ -147,7 +147,7 @@ Options::parse_args (int argc, char *argv[]) default: // -i can also be given without a value - if so, it defaults // to defined value. - if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], "-i") == 0) + if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], ACE_TEXT("-i")) == 0) { opt_install = 1; opt_startup = DEFAULT_SERVICE_INIT_STARTUP; @@ -169,13 +169,13 @@ ConsoleHandler (DWORD /* ctrlType */) ACE_NT_SERVICE_DEFINE (service, TAO_NT_Naming_Service, - "TAO NT Naming Service"); + ACE_TEXT("TAO NT Naming Service")); int -Options::run (int argc, char* argv[]) +Options::run (int argc, ACE_TCHAR* argv[]) { - SERVICE::instance ()->name ("TAO_NT_Naming_Service", - "TAO NT Naming Service"); + SERVICE::instance ()->name (ACE_TEXT("TAO_NT_Naming_Service"), + ACE_TEXT("TAO NT Naming Service")); this->parse_args (argc, argv); @@ -220,7 +220,7 @@ Options::run (int argc, char* argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { return OPTIONS::instance ()->run (argc, argv); } diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index 506d38edb32..1a6a3a83d56 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -11,9 +11,9 @@ #include "ace/ARGV.h" #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE -#define TAO_REGISTRY_SUBKEY "SOFTWARE\\ACE\\TAO" -#define TAO_NAMING_SERVICE_OPTS_NAME "TaoNamingServiceOptions" -#define TAO_SERVICE_PARAM_COUNT "TaoServiceParameterCount" +#define TAO_REGISTRY_SUBKEY ACE_TEXT("SOFTWARE\\ACE\\TAO") +#define TAO_NAMING_SERVICE_OPTS_NAME ACE_TEXT("TaoNamingServiceOptions") +#define TAO_SERVICE_PARAM_COUNT ACE_TEXT("TaoServiceParameterCount") AutoFinalizer::AutoFinalizer (TAO_NT_Naming_Service &service) : service_ (service) @@ -95,7 +95,7 @@ TAO_NT_Naming_Service::init (int argc, ACE_TCHAR *argv[]) { HKEY hkey = 0; - BYTE buf[ACE_DEFAULT_ARGV_BUFSIZ]; + ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ]; *buf = '\0'; @@ -119,22 +119,22 @@ TAO_NT_Naming_Service::init (int argc, TAO_NAMING_SERVICE_OPTS_NAME, NULL, &type, - buf, + (LPBYTE)buf, &bufSize); RegCloseKey (hkey); // Add options to the args list (if any). - if (ACE_OS::strlen ((char *) buf) > 0) + if (ACE_OS::strlen (buf) > 0) { - ACE_ARGV args ((const char*) buf); + ACE_ARGV args (buf); // Allocate the internal args list to be one bigger than the // args list passed into the function. We use a 'save' list in // case we use a 'destructive' args list processor - this way we // maintain the correct argv and argc for memory freeing // operations in the destructor. - argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ())); + argv_save_ = (ACE_TCHAR **) ACE_OS::malloc (sizeof (ACE_TCHAR *) * (argc + args.argc ())); // Copy the values into the internal args buffer. int i; diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index 7d0ced9acf7..d6275761bdc 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -64,8 +64,8 @@ private: int argc_save_; // Argument count. - char **argv_; - char **argv_save_; + ACE_TCHAR **argv_; + ACE_TCHAR **argv_save_; // Argument list. friend class ACE_Singleton<TAO_NT_Naming_Service, MUTEX>; diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index 22e055649e3..830063d7b59 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -70,7 +70,7 @@ int TAO_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("-t:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 0b8dfac859c..d7e28eeab37 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -28,7 +28,7 @@ #include "ace/Log_Msg.h" int -main (int, char*[]) +ACE_TMAIN (int, ACE_TCHAR*[]) { ACE_ERROR ((LM_INFO, "This program is only supported " @@ -57,10 +57,10 @@ public: Options (void); ~Options (void); - int run (int argc, char *argv[]); + int run (int argc, ACE_TCHAR *argv[]); private: - void parse_args (int argc, char *argv[]); + void parse_args (int argc, ACE_TCHAR *argv[]); void print_usage_and_die (void); private: @@ -115,9 +115,9 @@ Options::print_usage_and_die (void) } void -Options::parse_args (int argc, char *argv[]) +Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "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) @@ -150,7 +150,7 @@ Options::parse_args (int argc, char *argv[]) default: // -i can also be given without a value - if so, it defaults // to defined value. - if (ACE_OS::strcmp (get_opt.argv_[get_opt.optind-1], "-i") == 0) + if (ACE_OS::strcmp (get_opt.argv_[get_opt.optind-1], ACE_TEXT("-i")) == 0) { opt_install = 1; opt_startup = DEFAULT_SERVICE_INIT_STARTUP; @@ -172,13 +172,13 @@ ConsoleHandler (DWORD /* ctrlType */) ACE_NT_SERVICE_DEFINE (service, TAO_NT_Notify_Service, - "TAO NT Notify Service"); + ACE_TEXT("TAO NT Notify Service")); int -Options::run (int argc, char* argv[]) +Options::run (int argc, ACE_TCHAR* argv[]) { - SERVICE::instance ()->name ("TAO_NT_Notify_Service", - "TAO NT Notify Service"); + SERVICE::instance ()->name (ACE_TEXT("TAO_NT_Notify_Service"), + ACE_TEXT("TAO NT Notify Service")); this->parse_args (argc, argv); @@ -223,7 +223,7 @@ Options::run (int argc, char* argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { return OPTIONS::instance ()->run (argc, argv); } diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp index 57cee4c14ed..48ad22436b7 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp @@ -11,9 +11,9 @@ #include "ace/Reactor.h" #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE -#define TAO_REGISTRY_SUBKEY "SOFTWARE\\ACE\\TAO" -#define TAO_NOTIFY_SERVICE_OPTS_NAME "TaoNotifyServiceOptions" -#define TAO_SERVICE_PARAM_COUNT "TaoServiceParameterCount" +#define TAO_REGISTRY_SUBKEY ACE_TEXT("SOFTWARE\\ACE\\TAO") +#define TAO_NOTIFY_SERVICE_OPTS_NAME ACE_TEXT("TaoNotifyServiceOptions") +#define TAO_SERVICE_PARAM_COUNT ACE_TEXT("TaoServiceParameterCount") TAO_NT_Notify_Service::TAO_NT_Notify_Service (void) : argc_ (0), @@ -60,7 +60,7 @@ TAO_NT_Notify_Service::init (int argc, ACE_TCHAR *argv[]) { HKEY hkey = 0; - BYTE buf[ACE_DEFAULT_ARGV_BUFSIZ]; + ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ]; *buf = '\0'; @@ -84,22 +84,22 @@ TAO_NT_Notify_Service::init (int argc, TAO_NOTIFY_SERVICE_OPTS_NAME, NULL, &type, - buf, + (LPBYTE)buf, &bufSize); RegCloseKey (hkey); // Add options to the args list (if any). - if (ACE_OS::strlen ((char *) buf) > 0) + if (ACE_OS::strlen (buf) > 0) { - ACE_ARGV args ((const char*) buf); + ACE_ARGV args (buf); // Allocate the internal args list to be one bigger than the // args list passed into the function. We use a 'save' list in // case we use a 'destructive' args list processor - this way we // maintain the correct argv and argc for memory freeing // operations in the destructor. - argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ())); + argv_save_ = (ACE_TCHAR **) ACE_OS::malloc (sizeof (ACE_TCHAR *) * (argc + args.argc ())); // Copy the values into the internal args buffer. int i; diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h index 9ec67e151c0..784e8199bdf 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h @@ -64,8 +64,8 @@ private: int argc_save_; // Argument count. - char **argv_; - char **argv_save_; + ACE_TCHAR **argv_; + ACE_TCHAR **argv_save_; // Argument list. friend class ACE_Singleton<TAO_NT_Notify_Service, MUTEX>; diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index e7d95c4dd99..781bb0851b1 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -35,8 +35,8 @@ TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void) } int -TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL) +TAO_Notify_Service_Driver::init_ORB (int& argc, char *argv [] + ACE_ENV_ARG_DECL) { // Copy command line parameter. ACE_Argv_Type_Converter command_line(argc, argv); @@ -76,11 +76,13 @@ int TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { + ACE_Argv_Type_Converter convert (argc, argv); + if (this->parse_args(argc, argv) != 0) return -1; // initalize the ORB. - if (this->init_ORB (argc, argv + if (this->init_ORB (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) != 0) return -1; @@ -315,7 +317,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) { if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory")))) { - this->notify_factory_name_.set (ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->notify_factory_name_.set (ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Boot")) == 0) @@ -350,7 +352,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName")))) { - this->notify_channel_name_.set(ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->notify_channel_name_.set(ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Channel")) == 0) @@ -417,7 +419,7 @@ Worker::svc (void) // just disabling it altogether. It doesn't provide much value, and // makes service startup needlessly more verbose. See bugzilla 2477 // for details. - + ACE_hthread_t current; ACE_Thread::self (current); diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h index a32e6747b2a..33e1c5c86a3 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h @@ -87,7 +87,7 @@ class TAO_Notify_Service_Driver // CosNotifyChannelAdmin::EventChannelFactory_var obj; // protected: - int init_ORB (int& argc, ACE_TCHAR *argv [] + int init_ORB (int& argc, char *argv [] ACE_ENV_ARG_DECL); // initialize the ORB. diff --git a/TAO/orbsvcs/PSS/psdl_tao.cpp b/TAO/orbsvcs/PSS/psdl_tao.cpp index 48491264b97..b0847e4f5b8 100644 --- a/TAO/orbsvcs/PSS/psdl_tao.cpp +++ b/TAO/orbsvcs/PSS/psdl_tao.cpp @@ -4,7 +4,7 @@ #include "PSDL_Extern.h" #include "Dump_Visitor.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { void *result_ptr = 0; diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 83e325bcde7..4cdfde4a14a 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -129,7 +129,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ()))); + ACE_TEXT_TO_TCHAR_IN(scheduler_ior_string.in ()))); // Register the servant with the Naming Context.... CosNaming::Name schedule_name (1); @@ -145,7 +145,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) { ACE_OS::fprintf (iorf, ACE_TEXT("%s\n"), - ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ())); + ACE_TEXT_TO_TCHAR_IN(scheduler_ior_string.in ())); ACE_OS::fclose (iorf); } } @@ -188,7 +188,7 @@ TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL) int TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:p:o:s:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:p:o:s:")); int opt; while ((opt = get_opt ()) != EOF) @@ -196,15 +196,15 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) switch (opt) { case 'n': - this->service_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); + this->service_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()); break; case 'p': - this->pid_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); + this->pid_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()); break; case 'o': - this->ior_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); + this->ior_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()); break; // The templatized method parameters needed by the reconfig scheduler diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index ab42e2787f7..8a5da97ccaa 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -68,7 +68,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("iors -> |%s|\n"), - ACE_TEXT_CHAR_TO_TCHAR(str))); + ACE_TEXT_TO_TCHAR_IN(str))); CORBA::Object_var objref = this->orb_->string_to_object (str @@ -110,7 +110,7 @@ int Clerk_i::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dt:u:f:o:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("dt:u:f:o:")); int c, result; @@ -278,7 +278,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Getting IOR of the server: %s\n\n"), - ACE_TEXT_CHAR_TO_TCHAR(binding->binding_name[0].id.in ()))); + ACE_TEXT_TO_TCHAR_IN(binding->binding_name[0].id.in ()))); CosNaming::Name server_name; server_name.length (1); @@ -352,7 +352,7 @@ Clerk_i::create_clerk (void) // Print the clerk IOR on the console. ACE_DEBUG ((LM_DEBUG, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(objref_clerk.in ()))); + ACE_TEXT_TO_TCHAR_IN(objref_clerk.in ()))); // Print the Time Service clerk IOR to a file. if (this->ior_output_file_) diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index b1c846e398f..9fc1acb43e3 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -31,7 +31,7 @@ int Server_i::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("do:")); int c; while ((c = get_opts ()) != -1) @@ -123,7 +123,7 @@ Server_i::create_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service ") ACE_TEXT("SERVER IOR: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(objref_server.in ()))); + ACE_TEXT_TO_TCHAR_IN(objref_server.in ()))); // Print the IOR to a file. @@ -194,7 +194,7 @@ Server_i::register_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Binding ServerContext -> %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_name[1].id.in ()))); + ACE_TEXT_TO_TCHAR_IN(server_name[1].id.in ()))); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 72c9ebc763b..be9ebfc1a76 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -4,6 +4,7 @@ #include "CosEventChannelFactoryC.h" #include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" class FactoryClient { @@ -21,7 +22,7 @@ public: virtual ~FactoryClient (void); // destructor. - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); @@ -87,7 +88,7 @@ FactoryClient::~FactoryClient (void) void FactoryClient::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, @@ -364,16 +365,17 @@ FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DEBUG ((LM_DEBUG, "The FactoryClient will test the Cos Event Channel Factory\n")); ACE_TRY_NEW_ENV { FactoryClient ft; - ft.init_ORB (argc, - argv + ft.init_ORB (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index 845ee110d77..50a842d3f74 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -19,9 +19,9 @@ FactoryDriver::~FactoryDriver (void) } int -FactoryDriver::parse_args (int argc, char *argv []) +FactoryDriver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dr:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dr:"); int c = 0; while ((c = get_opts ()) != -1) @@ -50,7 +50,7 @@ FactoryDriver::parse_args (int argc, char *argv []) } int -FactoryDriver::start (int argc, char *argv []) +FactoryDriver::start (int argc, char *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h index 97d837a7c2e..adec5218b49 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h @@ -45,14 +45,14 @@ class FactoryDriver ~FactoryDriver (void); // Destructor. - int start (int argc, char *argv []); + int start (int argc, char *argv[]); // Start the driver. int stop (void); //Stop the driver. protected: - int parse_args (int argc, char *argv []); + int parse_args (int argc, char *argv[]); // Parse the command-line arguments and set options. const char* factoryName_; diff --git a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp index 2ca49905292..c2b9a007fbc 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp @@ -3,12 +3,15 @@ #include "FactoryDriver.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); FactoryDriver driver; - driver.start (argc, argv); + driver.start (convert.get_argc(), convert.get_ASCII_argv()); return 0; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index 68f393240e7..cba856ea3b0 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -3,6 +3,7 @@ #include "RtEC_Based_CosEC.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" RtEC_Based_CosEC::RtEC_Based_CosEC (void) : service_name ("CosEventService"), @@ -18,7 +19,7 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void) } void -RtEC_Based_CosEC::init_ORB (int& argc, char *argv [] +RtEC_Based_CosEC::init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, @@ -46,9 +47,9 @@ RtEC_Based_CosEC::init_ORB (int& argc, char *argv [] } int -RtEC_Based_CosEC::parse_args (int argc, char *argv []) +RtEC_Based_CosEC::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "t:n:e:o:p:r"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "t:n:e:o:p:r"); int opt; while ((opt = get_opt ()) != EOF) @@ -276,16 +277,17 @@ RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); RtEC_Based_CosEC service; ACE_TRY_NEW_ENV { - service.startup (argc, - argv + service.startup (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h index 72f1bd8224f..eb9333093c4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h @@ -40,7 +40,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase virtual ~RtEC_Based_CosEC (void); // Destructor. - int parse_args (int argc, char *argv []); + int parse_args (int argc, char *argv[]); // Parses the command line arguments. void startup (int argc, char *argv[] @@ -68,7 +68,7 @@ protected: virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL); // Deactivates the rtec. - void init_ORB (int& argc, char *argv [] + void init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL); // initialize the ORB. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp index bd0b2585f86..976da8ab3b3 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp @@ -3,16 +3,19 @@ #include "Basic.h" #include "CosEvent_Utilities.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Basic basic; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - basic.init (argc, argv ACE_ENV_ARG_PARAMETER); + basic.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; basic.run (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -61,7 +64,7 @@ Basic::init (int argc, char *argv[] } void -Basic::init_ORB (int argc, char *argv [] +Basic::init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp index 9cdb697eff1..1f6d6b73702 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -3,6 +3,7 @@ #include "Consumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" Consumer::Consumer () :event_count_ (1) @@ -11,9 +12,9 @@ Consumer::Consumer () } int -Consumer::parse_args (int argc, char *argv []) +Consumer::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:c:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:"); int opt; while ((opt = get_opt ()) != EOF) @@ -176,11 +177,13 @@ Consumer::init_Consumer (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer cons; - if (cons.init (argc, argv) == -1) + if (cons.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; if (cons.init_Consumer () == -1) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index ce523fed960..651d825a153 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -69,7 +69,7 @@ public: // disconnect the consumer from the EC. // = CosEC_Multiple methods. - virtual int parse_args (int argc, char *argv []); + virtual int parse_args (int argc, char *argv[]); // Parse the command line options. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp index 4af0b93b9aa..a67007ededc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp @@ -37,7 +37,7 @@ Multiple::init (int argc, char *argv[]) } int -Multiple::init_ORB (int argc, char *argv []) +Multiple::init_ORB (int argc, char *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h index 3248946ce78..e0bca0efa5c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h @@ -50,7 +50,7 @@ class Multiple // Closes down the ORB and exits. protected: - virtual int parse_args (int argc, char *argv []) = 0; + virtual int parse_args (int argc, char *argv[]) = 0; // Parse the command line arguments. CosEventChannelAdmin::EventChannel_ptr cos_ec_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp index 7d9a03c9261..0b232a783d4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp @@ -3,6 +3,7 @@ #include "Supplier.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" Supplier::Supplier () : event_count_ (1) @@ -11,9 +12,9 @@ Supplier::Supplier () } int -Supplier::parse_args (int argc, char *argv []) +Supplier::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:c:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:"); int opt; while ((opt = get_opt ()) != EOF) @@ -170,11 +171,13 @@ Supplier::run (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supp; - if (supp.init (argc, argv) == -1) + if (supp.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; supp.run (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index 29b213cd31f..9ef552599ce 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -63,7 +63,7 @@ public: // Sends the events to the EC. // = Multiple methods. - virtual int parse_args (int argc, char *argv []); + virtual int parse_args (int argc, char *argv[]); // Parses the command line arguments. private: CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index bcf4fcfc551..359f25fddcb 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -2,17 +2,20 @@ #include "Consumer.h" #include "orbsvcs/CosEventChannelAdminS.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Examples, Consumer, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index 07a78aea874..cf07d735aea 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Simple, Service, @@ -14,8 +15,10 @@ const char *ior_output_file = "ec.ior"; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -23,10 +26,10 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-o IOR_file_name]\n")); @@ -65,7 +68,7 @@ main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -99,7 +102,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 3886f6d085a..490ab33bf75 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -3,17 +3,20 @@ #include "Supplier.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Examples, Supplier, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index db6437a39bd..1143417a9f0 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -4,21 +4,23 @@ #include "orbsvcs/CosTypedEventChannelAdminC.h" #include "Country_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Examples, Consumer, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization... 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_obj = @@ -79,8 +81,7 @@ main (int argc, char* argv[]) const char* ior_file_name = "Consumer.ior"; FILE *output_file= - ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name), - ACE_LIB_TEXT("w")); + 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/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc index cddcd128801..974ee82d6e3 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { + exename = Consumer requires += ec_typed_events source_files { Consumer.cpp @@ -10,6 +11,7 @@ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { } project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming { + exename = Supplier requires += ec_typed_events after += CosEC_TypedSimple_Consumer idl_files { diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index d384fad33cf..c61ee91be55 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -3,19 +3,21 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/CosTypedEventChannelAdminC.h" #include "CountryC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(CosEC_Examples, Supplier, "$Id:") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // 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; // Obtain the event channel using the Naming Service. diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 7aff9a4a1bd..5e9e7766033 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" // IOR manipulation. #include "tao/IORManipulation/IORManip_Loader.h" @@ -19,7 +20,7 @@ const char *ior2 = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -41,20 +42,21 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) return -1; + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Start out with the first IOR. Interaction with the second // IOR occurs during the various interceptions executed during diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp index 65c0587a9b7..359851764ec 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp @@ -9,13 +9,14 @@ #include "CrashPoint.h" #include "ORB_Initializer.h" #include "tao/ORBInitializer_Registry.h" +#include "ace/Argv_Type_Converter.h" const char *ior_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:"); int c; while ((c = get_opts ()) != -1) @@ -40,12 +41,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - if (::parse_args (argc, argv) != 0) return -1; + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; ORB_Initializer *temp_initializer = 0; ACE_NEW_RETURN (temp_initializer, @@ -60,7 +63,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -101,7 +104,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_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")); if (output_file == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index 9b2da4d88c8..a96a0c6c277 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp @@ -31,7 +31,7 @@ TestClient::~TestClient() int TestClient::parseCommands(int argc, char* argv[]) { - ACE_Get_Opt get_opts(argc, argv, "s:t:i:r:x:e:z:"); + ACE_Get_Arg_Opt<char> get_opts(argc, argv, "s:t:i:r:x:e:z:"); int c; while ((c = get_opts()) != -1) { diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp index 0b01378ccf8..da11974ffca 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp @@ -164,7 +164,7 @@ TestServer::~TestServer() // int TestServer::parseCommands(int argc, char* argv[]) { - ACE_Get_Opt get_opts(argc, argv, "w:e:d:t:o:s:c:a:r:p:n:x:z:q:b:"); + ACE_Get_Arg_Opt<char> get_opts(argc, argv, "w:e:d:t:o:s:c:a:r:p:n:x:z:q:b:"); int c; while ((c = get_opts()) != -1) { diff --git a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp index bcebff9a94f..3714c16935c 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp @@ -2,15 +2,18 @@ #include "TestClient.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" -int main(int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); { - TestClient client(orb.in(), argc, argv); + TestClient client(orb.in(), convert.get_argc(), convert.get_ASCII_argv()); client.run(); } diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp index 6be76baf992..71611cb17b9 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp @@ -3,15 +3,18 @@ #include <ace/Get_Opt.h> #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" -int main(int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { long retryCount = 0; - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); - ACE_Get_Opt get_opts(argc, argv, "r:"); + ACE_Get_Arg_Opt<char> get_opts(convert.get_argc(), convert.get_ASCII_argv(), "r:"); int c; while ((c = get_opts()) != -1) { diff --git a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp index ccf813d0e9c..8ebf26df60d 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp @@ -2,16 +2,19 @@ #include "TestServer.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" -int main(int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { CORBA::ORB_var orb; - orb = CORBA::ORB_init(argc, argv); + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); { - TestServer server(orb.in(), argc, argv); + TestServer server(orb.in(), convert.get_argc(), convert.get_ASCII_argv()); server.run(); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc index fc8803905f7..709b7e60370 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc @@ -32,6 +32,7 @@ project(*Controller) : orbsvcsexe, exceptions { // A client that uses corba to test out basic imr functionality project(*Test) : orbsvcsexe, exceptions { + exename = test after += *IDL source_files { test.cpp @@ -43,6 +44,7 @@ project(*Test) : orbsvcsexe, exceptions { // A server to use with the imr project(*TestServer) : orbsvcsexe, portableserver, iortable, exceptions { + exename = test_server after += *IDL // The gnuace specific portion is to prevent invalid object files from // IDL generated files being compiled simultaneously with parallel builds. diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index 5864e974d00..618fb276e2f 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp @@ -8,7 +8,7 @@ #include "ace/Service_Config.h" #include "ace/streams.h" #include "ace/OS_NS_string.h" - +#include "ace/Argv_Type_Converter.h" using namespace CORBA; using namespace PortableServer; @@ -27,7 +27,7 @@ public: { ACE_ASSERT(s != 0); ACE_ASSERT(ACE_OS::strlen(s) > 0); - return asc_.process_directive(s); + return asc_.process_directive(ACE_TEXT_TO_TCHAR_IN(s)); } virtual void reconfigure() ACE_THROW_SPEC ((CORBA::SystemException)) @@ -36,14 +36,16 @@ public: } }; -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { ACE_Service_Config config; config.open(argc, argv); - ORB_var orb = ORB_init(argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); Object_var obj = orb->resolve_initial_references("RootPOA"); POA_var poa = POA::_narrow(obj.in()); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp index 0bab1bfd6aa..8e2558f12c3 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp @@ -6,6 +6,7 @@ #include <ace/streams.h> #include <ace/SString.h> #include <ace/Log_Msg.h> +#include "ace/Argv_Type_Converter.h" using namespace CORBA; @@ -39,13 +40,15 @@ namespace { } } -int main(int argc, char* argv[]) { +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) +{ + ACE_Argv_Type_Converter convert (argc, argv); try { - ORB_var orb = ORB_init(argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); - if (! parse_args(argc, argv)) { + if (! parse_args(convert.get_argc(), convert.get_ASCII_argv())) { showusage(); return 1; } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 8566023c945..36e08acfd2a 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp @@ -63,7 +63,7 @@ DynServer_Loader::DynServer_Loader(void) } int -DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL) +DynServer_Loader::init (int argc, char* argv[] ACE_ENV_ARG_DECL) { try { diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h index c222ebe531e..9bc066ca4f8 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h @@ -31,7 +31,7 @@ public: // spawns a thread to run an internal orb which has activated // a single DynServer servant. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Allows the service configurator to shutdown the orb virtual int fini (void); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp index 0976425f762..807f4a68a0f 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp @@ -6,9 +6,12 @@ #include "ace/SString.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" + #include <stdexcept> #include <string> + #define assertTrue(CONDITION) \ if (CONDITION == false) { \ ACE_CString str ("Error : "#CONDITION" "__FILE__":"); \ @@ -19,13 +22,13 @@ using namespace CORBA; -int -main (int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { - try + ACE_Argv_Type_Converter convert (argc, argv); + + try { - - ORB_var orb = ORB_init (argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); Object_var obj = orb->resolve_initial_references ("Test"); test_var test = test::_narrow (obj.in ()); @@ -34,12 +37,12 @@ main (int argc, char* argv[]) Long n = test->get (); Long m = test->get (); assertTrue (m == n + 1); - + ACE_DEBUG ((LM_DEBUG, "All tests ran successfully.\n")); return 0; - } - catch (CORBA::Exception& e) + } + catch (CORBA::Exception& e) { ACE_PRINT_EXCEPTION (e, "test:"); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp index a3d821fde70..d9a7fd6804f 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp @@ -9,6 +9,7 @@ #include "ace/streams.h" #include "ace/ARGV.h" +#include "ace/Argv_Type_Converter.h" using namespace CORBA; using namespace PortableServer; @@ -38,11 +39,13 @@ POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poam return poa._retn(); } -int main(int argc, char* argv[]) { +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) +{ + ACE_Argv_Type_Converter convert (argc, argv); try { - ORB_var orb = ORB_init(argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); Object_var obj = orb->resolve_initial_references("RootPOA"); POA_var root_poa = POA::_narrow(obj.in()); diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp index 47508dba78e..d2f13bc1206 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp @@ -1,7 +1,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/streams.h" - +#include "ace/Argv_Type_Converter.h" ACE_RCSID (LoadBalancing, client, @@ -16,7 +16,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:"); int c; while ((c = get_opts ()) != -1) @@ -49,15 +49,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp index 66d41596ce8..591da3c57c0 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp @@ -3,6 +3,7 @@ #include "ORBInitializer.h" #include "RPS_Monitor.h" #include "ace/OS.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Get_Opt.h" @@ -21,7 +22,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -238,8 +239,10 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { ORBInitializer *initializer = 0; @@ -254,7 +257,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -277,7 +280,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -328,7 +331,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index 6c4fd3a47b3..288e3c695af 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -25,7 +25,7 @@ TLS_Client::~TLS_Client () } void -TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +TLS_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -37,7 +37,7 @@ TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL) void TLS_Client::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h index b06ffc65f92..1e9c617cb97 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h @@ -31,14 +31,14 @@ class TLS_Client TLS_Client (void); ~TLS_Client (); - void init (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Init the Client. void run_tests (ACE_ENV_SINGLE_ARG_DECL); // Run the tests.. protected: - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp index 3b5098b43ad..33ac63e3a3c 100644 --- a/TAO/orbsvcs/examples/Log/Basic/main.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp @@ -1,5 +1,6 @@ #include "TLS_Client.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Basic, main, @@ -9,11 +10,13 @@ ACE_RCSID (Basic, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TLS_Client client; // Telecom Log Service Client 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/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 1b102beac2f..b95683ef2a4 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -1,6 +1,7 @@ #include "Event_Consumer.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event, Event_Consumer, @@ -12,9 +13,11 @@ ACE_RCSID (Event, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index f65f4a420e9..390fd1eea30 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -1,6 +1,7 @@ #include "Event_Supplier.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event, Event_Supplier, @@ -16,9 +17,11 @@ ACE_RCSID (Event, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 0d27c8860d3..23db295bd76 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, Notify_Consumer, @@ -20,9 +21,11 @@ ACE_RCSID (Notify, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 86fbfd2be3c..03ffa87f327 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -1,6 +1,7 @@ #include "Notify_Supplier.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, Notify_Supplier, @@ -20,9 +21,11 @@ ACE_RCSID (Notify, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index a9ce5387a62..6dff34ef7b7 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RTEvent, RTEvent_Consumer, @@ -13,9 +14,11 @@ ACE_RCSID (RTEvent, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index 1a2de3ca9b9..7f2286132ff 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RTEvent, RTEvent_Supplier, @@ -18,9 +19,11 @@ ACE_RCSID (RTEvent, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 3e6109e1ee1..b48d70383aa 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -25,6 +25,7 @@ // For in-process Notification Service. // #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Notify/Service.h" #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper. @@ -204,11 +205,13 @@ private: }; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - ORB_var orb (ORB_init (argc, argv)); + ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv())); if (argc < 2) { @@ -287,7 +290,7 @@ main (int argc, char* argv[]) if (argc < 3) space_craft_name = "a"; // Default to spacecraft "a". else - space_craft_name = argv[2]; + space_craft_name = convert.get_ASCII_argv()[2]; // Do a quick mapping to mcast addresses. // @@ -322,7 +325,7 @@ main (int argc, char* argv[]) // Start the agent. // - Agent agent (space_craft_name, argv[1], channel.in ()); + Agent agent (space_craft_name, convert.get_ASCII_argv()[1], channel.in ()); orb->run (); diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp index 2751694dcd7..e858f379b04 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp @@ -17,6 +17,7 @@ // For in-process Notification Service. // #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Notify/Service.h" #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper. @@ -33,11 +34,13 @@ using namespace CosNotification; using namespace CosNotifyChannelAdmin; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - ORB_var orb (ORB_init (argc, argv)); + ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv())); if (argc < 2) { @@ -134,7 +137,7 @@ main (int argc, char* argv[]) ACE_INET_Addr space_craft_addr; char const* space_craft_name = 0; - space_craft_name = argv[1]; + space_craft_name = convert.get_ASCII_argv()[1]; // Do a quick mapping to mcast addresses. // diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index a2aa9dbf434..b65a677e0b8 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -28,7 +28,7 @@ FilterClient::~FilterClient () } void -FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +FilterClient::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -77,7 +77,7 @@ FilterClient::done (void) void FilterClient::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index e7f9cd236a4..5d767320a86 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -40,7 +40,7 @@ class FilterClient ~FilterClient (); // Destructor - void init (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Init the Client. void run (ACE_ENV_SINGLE_ARG_DECL); @@ -50,7 +50,7 @@ class FilterClient // Consumer calls done, We're done. protected: - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp index 845f7ab68f7..0e3641cd299 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp @@ -2,15 +2,18 @@ // $Id$ #include "Filter.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + FilterClient client; 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/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 942d444d0cf..fed61e55a87 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -9,6 +9,7 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_Lanes_Consumer_Client, "$Id$") @@ -26,13 +27,13 @@ TAO_Notify_Lanes_Consumer_Client::~TAO_Notify_Lanes_Consumer_Client () int TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LanePriority")))) // LanePriority + if ((current_arg = arg_shifter.get_the_parameter ("-LanePriority"))) // LanePriority { if (current_arg != 0) { @@ -212,13 +213,14 @@ TAO_Notify_Lanes_Consumer_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - 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; @@ -232,7 +234,7 @@ main (int argc, char *argv []) TAO_Notify_Lanes_Consumer_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 2acb6bcc18b..12dec500064 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -10,6 +10,7 @@ #include "orbsvcs/NotifyExtC.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$") @@ -27,13 +28,13 @@ TAO_Notify_Lanes_Supplier_Client::~TAO_Notify_Lanes_Supplier_Client () int TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. + if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to. { if (current_arg != 0) { @@ -42,7 +43,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to. + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to. { if (current_arg != 0) { @@ -212,13 +213,14 @@ TAO_Notify_Lanes_Supplier_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - 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; @@ -235,7 +237,7 @@ main (int argc, char *argv []) /* Create a Client */ TAO_Notify_Lanes_Supplier_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index a7a0e96183f..a410ae315e7 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -31,7 +31,7 @@ Subscribe::~Subscribe () } void -Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +Subscribe::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -73,11 +73,10 @@ Subscribe::done (void) void Subscribe::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 126b842a4ca..0c06932cf8f 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -35,7 +35,7 @@ class Subscribe Subscribe (void); ~Subscribe (); - void init (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Init the Client. void run (ACE_ENV_SINGLE_ARG_DECL); @@ -45,7 +45,7 @@ class Subscribe // Called when all events we are waiting for have occured. protected: - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp index b817728c231..392669fbb4e 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp @@ -2,15 +2,18 @@ // $Id$ #include "Subscribe.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Subscribe client; 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/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 480dbb5005c..cfed55e07b4 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -9,6 +9,7 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_ThreadPool_Consumer_Client, "$Id$") @@ -28,25 +29,25 @@ TAO_Notify_ThreadPool_Consumer_Client::~TAO_Notify_ThreadPool_Consumer_Client () int TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxySupplier_ThreadPool")))) // Specify a threadpool. + if ((current_arg = arg_shifter.get_the_parameter("-ProxySupplier_ThreadPool"))) // Specify a threadpool. { this->proxy_supplier_thread_count_ = ACE_OS::atoi (arg_shifter.get_current ()); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events + else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events { this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ()); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-Delay")))) // seconds wait in consumer per push. + else if ((current_arg = arg_shifter.get_the_parameter("-Delay"))) // seconds wait in consumer per push. { this->delay_ = ACE_OS::atoi (current_arg); @@ -215,13 +216,14 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - 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; @@ -235,7 +237,7 @@ main (int argc, char *argv []) TAO_Notify_ThreadPool_Consumer_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index fb8dcf0c8ad..9ff3ca8bd3e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -10,6 +10,7 @@ #include "orbsvcs/NotifyExtC.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$") @@ -30,13 +31,13 @@ TAO_Notify_ThreadPool_Supplier_Client::~TAO_Notify_ThreadPool_Supplier_Client () int TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. + if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to. { if (current_arg != 0) { @@ -45,17 +46,17 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-EventChannel_ThreadPool")))) // Specify a threadpool. + else if ((current_arg = arg_shifter.get_the_parameter("-EventChannel_ThreadPool"))) // Specify a threadpool. { this->ec_thread_count_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxyConsumer_ThreadPool")))) // Specify a threadpool. + else if ((current_arg = arg_shifter.get_the_parameter("-ProxyConsumer_ThreadPool"))) // Specify a threadpool. { this->proxy_consumer_thread_count_= ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to. + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to. { if (current_arg != 0) { @@ -64,7 +65,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events + else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events { this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ()); @@ -210,13 +211,14 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - 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; @@ -233,7 +235,7 @@ main (int argc, char *argv []) /* Create a Client */ TAO_Notify_ThreadPool_Supplier_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp index 2ab7caa0a2b..a14758fcaf0 100644 --- a/TAO/orbsvcs/examples/ORT/client.cpp +++ b/TAO/orbsvcs/examples/ORT/client.cpp @@ -2,6 +2,7 @@ #include "sum_serverC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ORT, client, @@ -12,7 +13,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -33,16 +34,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_sum_orb", ACE_TRY_ENV); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + "client_sum_orb", ACE_TRY_ENV); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp index d52bc63f0f2..bc8e494a2c9 100644 --- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp +++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp @@ -5,13 +5,14 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,19 +35,20 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "gateway_server_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; /// Resolve reference to RootPOA @@ -162,7 +164,7 @@ main (int argc, char *argv[]) /// If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing " diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp index 1b76cecb393..f26e69452d6 100644 --- a/TAO/orbsvcs/examples/ORT/server.cpp +++ b/TAO/orbsvcs/examples/ORT/server.cpp @@ -6,13 +6,14 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,8 +36,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -61,13 +64,12 @@ main (int argc, char *argv[]) // The usual initialization stuff // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "server_sum_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Resolve reference to RootPOA @@ -124,7 +126,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing " diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp index 91add5d9900..2f54ef7820e 100644 --- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp +++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp @@ -28,7 +28,7 @@ const char *ior_output_file = "simple_naming.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +52,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp index a634a736993..63299c53c57 100644 --- a/TAO/orbsvcs/examples/PSS/client.cpp +++ b/TAO/orbsvcs/examples/PSS/client.cpp @@ -23,7 +23,7 @@ #include "ServerC.h" #include "Simple_Naming_i.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp index 0f305dfae1d..03162c04a51 100644 --- a/TAO/orbsvcs/examples/PSS/server.cpp +++ b/TAO/orbsvcs/examples/PSS/server.cpp @@ -25,7 +25,7 @@ ACE_RCSID (PSS, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 05b214aabbc..b4c3bf4efd2 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Consumer, @@ -18,11 +19,13 @@ const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -179,7 +182,7 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) int Consumer::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/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index a25e9f67569..8415251c710 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Event/EC_Gateway.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, @@ -16,11 +17,13 @@ ACE_RCSID (EC_Examples, static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC channel; - return channel.run (argc, argv); + return channel.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -138,7 +141,7 @@ EC::run (int argc, char* argv[]) int EC::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/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index c1be767ffd8..f7a3bf17e16 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, @@ -17,11 +18,13 @@ static const char* supplierec = 0; static const char* consumerec = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway gateway; - return gateway.run (argc, argv); + return gateway.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -160,7 +163,7 @@ Gateway::run (int argc, char* argv[]) int Gateway::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/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index aad09c037e8..3fa33011289 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -8,6 +8,7 @@ #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, @@ -19,11 +20,13 @@ const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -174,7 +177,7 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) int Supplier::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/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index 3a01a04e9c0..21baca54cea 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Sched/Reconfig_Scheduler.h" #include "orbsvcs/Runtime_Scheduler.h" //#include "orbsvcs/Event/Module_Factory.h" @@ -42,8 +43,10 @@ typedef TAO_Reconfig_Scheduler<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_M typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_MUF_SCHED_TYPE; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + //TAO_EC_Default_Factory::init_svcs (); TAO_EC_Kokyu_Factory::init_svcs (); @@ -54,10 +57,10 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-o IOR_file_name]\n")); @@ -497,14 +500,14 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "cs:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "cs:"); int c; while ((c = get_opts ()) != -1) switch (c) { case 's': - sched_type = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()); + sched_type = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ()); break; case '?': diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index f61cb958eeb..81bd9b3ab9e 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -14,6 +14,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, MCast, @@ -25,8 +26,10 @@ const char *udp_mcast_address = int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can // simply using the ACE_STATIC_SVC_DEFINE() macro, unfortunately TAO @@ -49,13 +52,13 @@ main (int argc, char* argv[]) // Create the ORB, pass the argv list for parsing. 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; // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the // -ORB options from the command line. - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-m udp_mcast_addr]\n")); @@ -354,7 +357,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "m:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index bb27f0bad68..05e5720ca3e 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -15,6 +15,7 @@ #include "ace/Sched_Params.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_Examples, Service, "$Id$") @@ -25,8 +26,10 @@ int parse_args (int argc, char *argv[]); typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -34,10 +37,10 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-o IOR_file_name]\n")); @@ -383,7 +386,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "c"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index e8af9a77ed8..a2cb57cbef6 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -4,17 +4,20 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Consumer, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index a3bd5e5740d..5085c1cc50e 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -5,6 +5,7 @@ #include "ace/Get_Opt.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Service, @@ -15,8 +16,10 @@ const char *ior_output_file = "ec.ior"; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -24,7 +27,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = @@ -82,7 +85,7 @@ main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -116,7 +119,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 21ced08639e..af29866c0ec 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -5,17 +5,20 @@ #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index b7779c65615..4e82a15ffa4 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -9,7 +9,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -32,7 +32,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 2b39bda82e3..e2550d85d06 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (SecurityLevel1, const char *ior_output_file = 0; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index 507bdde5847..1c930262112 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" ACE_RCSID(Send_File, client, "$Id$") @@ -11,7 +12,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 97a4beace1c..c71c738e8bd 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -4,6 +4,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Send_File, server, "$Id$") @@ -12,7 +13,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -78,7 +81,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 97756114183..1a686da4f39 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -1853,8 +1853,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, for (u_int i=0;i<peer_protocols.length ();i++) { for (u_int j=0;j<this->protocols_.length ();j++) - if (ACE_OS::strcmp (peer_protocols [i], - this->protocols_[j]) == 0) + if (ACE_OS::strcmp (static_cast<const char*>(peer_protocols [i]), + static_cast<const char*>(this->protocols_[j])) == 0) { // we'll agree upon the first protocol that matches. this->protocol_ = CORBA::string_dup (peer_protocols [i]); @@ -2069,7 +2069,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec forward_begin != end; ++forward_begin) { TAO_FlowSpec_Entry *entry = *forward_begin; - if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0) + if (ACE_OS::strcmp (entry->flowname (), static_cast<const char*>(flow_spec [i])) == 0) { // entry->protocol_object ()->start (); if (entry->handler () != 0) @@ -2088,7 +2088,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec reverse_begin != end; ++reverse_begin) { TAO_FlowSpec_Entry *entry = *reverse_begin; - if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0) + if (ACE_OS::strcmp (entry->flowname (), static_cast<const char*>(flow_spec [i])) == 0) { // entry->protocol_object ()->start (); if (entry->handler () != 0) @@ -2624,7 +2624,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name // redefine the "Flows" property AVStreams::flowSpec new_flows (this->flows_.length ()); for (u_int i=0, j=0 ; i <this->flows_.length (); i++) - if (ACE_OS::strcmp (flow_name, this->flows_[i]) != 0) + if (ACE_OS::strcmp (flow_name, static_cast<const char*>(this->flows_[i])) != 0) new_flows[j++] = this->flows_[i]; CORBA::Any flows; @@ -2877,7 +2877,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, if (result == 0) { mcast_addr = dynamic_cast<ACE_INET_Addr *> (entry->address ()); - char str_addr [BUFSIZ]; + ACE_TCHAR str_addr [BUFSIZ]; result = mcast_addr->addr_to_string (str_addr, BUFSIZ); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPointA::multiconnect ::addr_to_string failed\n"), 0); @@ -2902,7 +2902,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, 0); mcast_addr->set (this->mcast_port_, this->mcast_addr_.c_str ()); this->mcast_port_++; - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; mcast_addr->addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", buf)); TAO_Forward_FlowSpec_Entry *new_entry; @@ -3848,7 +3848,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name AVStreams::flowSpec new_flows (this->flows_.length ()); for (u_int i=0, j=0 ; i <this->flows_.length (); i++) - if (ACE_OS::strcmp (flow_name, this->flows_[i]) != 0) + if (ACE_OS::strcmp (flow_name, static_cast<const char*>(this->flows_[i])) != 0) new_flows[j++] = this->flows_[i]; CORBA::Any flows; @@ -4248,7 +4248,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, this->mcast_addr_.c_str () ); - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; mcast_addr.addr_to_string (buf, BUFSIZ); ACE_OS::sprintf (mcast_address, "%s=%s", this->protocol_.in (), buf); } diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 4d15bdd853a..866a1386f9e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -107,11 +107,11 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) -1); // Create a unique semaphore name, using my hostname, and pid. - char sem_str [BUFSIZ]; + ACE_TCHAR sem_str [BUFSIZ]; // create a unique semaphore name ACE_OS::sprintf (sem_str, - "%s:%s:%ld", + ACE_TEXT("%s:%s:%ld"), "TAO_AV_Process_Semaphore", this->host_, static_cast<long int> (this->pid_)); diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 76476dafb8b..772a72b9356 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -206,7 +206,7 @@ TAO_FlowSpec_Entry::set_protocol (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n")); ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s %x\n",buf, inet_addr->get_ip_address ())); @@ -470,16 +470,19 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) { case AF_INET: { - char *buf; + ACE_TCHAR *buf; ACE_NEW_RETURN (buf, - char [BUFSIZ], + ACE_TCHAR [BUFSIZ], 0); ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (this->local_addr_); inet_addr->addr_to_string (buf,BUFSIZ); +#if defined(ACE_USES_WCHAR) + return ACE_TEXT_TO_CHAR_OUT(buf); +#else ACE_CString cstring (buf, 0, 0); - return cstring.rep (); +#endif } default: ACE_ERROR_RETURN ((LM_ERROR,"Address family not supported"),0); @@ -597,7 +600,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) this->delete_peer_addr_ = true; this->peer_addr_ = addr; - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; addr->addr_to_string (buf, BUFSIZ); ACE_DEBUG ((LM_DEBUG, "Peer Address %s \n", @@ -637,7 +640,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) if (this->flowname_.length() == 0) return ""; - char address [BUFSIZ]; + ACE_TCHAR address [BUFSIZ]; ACE_CString address_str; ACE_CString peer_address_str; @@ -664,7 +667,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) default: break; } - ACE_CString cstring (address); + ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address)); address_str = this->carrier_protocol_; address_str += "="; @@ -749,7 +752,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) break; } - ACE_CString cstring (address); + ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address)); //peer_address_str = this->carrier_protocol_; //peer_address_str += "="; @@ -924,7 +927,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) if (this->flowname_.length() == 0) return ""; - char address [BUFSIZ]; + ACE_TCHAR address [BUFSIZ]; ACE_CString address_str; if (this->address_ != 0) { @@ -946,7 +949,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) default: break; } - ACE_CString cstring (address); + ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address)); address_str = this->carrier_protocol_; address_str += "="; diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 19aba484619..57c734d5c9b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -215,61 +215,61 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para i < qos_params.length (); i++) { - if (ACE_OS::strcmp (qos_params [i].property_name, "Service_Type") == 0) + if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Service_Type") == 0) { CORBA::Short type; qos_params [i].property_value >>= type; ace_flow_spec->service_type (type); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Token_Rate") == 0) { CORBA::ULong tok_rate; qos_params [i].property_value >>= tok_rate; ace_flow_spec->token_rate (tok_rate); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Bucket_Size") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Token_Bucket_Size") == 0) { CORBA::ULong tok_buck_size; qos_params [i].property_value >>= tok_buck_size; ace_flow_spec->token_bucket_size (tok_buck_size); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Peak_Bandwidth") == 0) { CORBA::ULong peak_bw; qos_params [i].property_value >>= peak_bw; ace_flow_spec->peak_bandwidth (peak_bw); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Latency") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Latency") == 0) { CORBA::ULong lat; qos_params [i].property_value >>= lat; ace_flow_spec->latency (lat); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Delay_Variation") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Delay_Variation") == 0) { CORBA::ULong delay_var; qos_params [i].property_value >>= delay_var; ace_flow_spec->delay_variation (delay_var); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Max_SDU_Size") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Max_SDU_Size") == 0) { CORBA::ULong max_sdu; qos_params [i].property_value >>= max_sdu; ace_flow_spec->max_sdu_size (max_sdu); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Minimum_Policed_Size") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Minimum_Policed_Size") == 0) { CORBA::ULong min_pol_size; qos_params [i].property_value >>= min_pol_size; ace_flow_spec->minimum_policed_size (min_pol_size); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "TTL") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "TTL") == 0) { CORBA::ULong ttl; qos_params [i].property_value >>= ttl; ace_flow_spec->ttl (ttl); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Priority") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Priority") == 0) { CORBA::ULong priority; qos_params [i].property_value >>= priority; @@ -492,14 +492,14 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) if (TAO_debug_level > 0) { - char buf [BUFSIZ]; - ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address); - remote_addr->addr_to_string (buf, - BUFSIZ); - - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address %s\n", - buf)); + ACE_TCHAR buf [BUFSIZ]; + ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address); + remote_addr->addr_to_string (buf, + BUFSIZ); + + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address %s\n", + buf)); } @@ -704,7 +704,7 @@ TAO_AV_UDP_QoS_Transport::send (const char *buf, ACE_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Transport::send ")); - char addr [BUFSIZ]; + ACE_TCHAR addr [BUFSIZ]; this->peer_addr_.addr_to_string (addr,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -833,7 +833,7 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, ACE_INET_Addr *inet_addr = (ACE_INET_Addr *) entry->address (); // inet_addr->set (inet_addr->get_port_number (), // inet_addr->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); if (TAO_debug_level > 0) @@ -957,7 +957,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) dest_addr.set (local_addr->get_port_number (), local_addr->get_host_name ()); - char dest_buf [BUFSIZ]; + ACE_TCHAR dest_buf [BUFSIZ]; dest_addr.addr_to_string (dest_buf, BUFSIZ); @@ -1061,7 +1061,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (TAO_debug_level > 0) { - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); ACE_DEBUG ((LM_DEBUG, @@ -1241,7 +1241,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, session_addr = inet_addr; } - char sess_buf [BUFSIZ]; + ACE_TCHAR sess_buf [BUFSIZ]; session_addr->addr_to_string (sess_buf, BUFSIZ); @@ -1357,7 +1357,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, if (TAO_debug_level > 0) { - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 24eeb1f0930..10547d39fef 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -535,7 +535,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, inet_addr->set (inet_addr->get_port_number (), inet_addr->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); @@ -596,7 +596,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, address->set (address->get_port_number (), address->get_host_name ()); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; address->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) @@ -661,7 +661,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) if (this->peer ().get_remote_addr (addr) == -1) return -1; - char server[MAXHOSTNAMELEN + 16]; + ACE_TCHAR server[MAXHOSTNAMELEN + 16]; (void) addr.addr_to_string (server, sizeof (server)); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 827079c3c90..8f6953ca8b1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -270,7 +270,7 @@ TAO_AV_UDP_Transport::send (const char *buf, ACE_Time_Value *) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Transport::send ")); - char addr [BUFSIZ]; + ACE_TCHAR addr [BUFSIZ]; this->peer_addr_.addr_to_string (addr,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"to %s\n",addr)); @@ -377,7 +377,7 @@ TAO_AV_UDP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, if (inet_addr != 0) { - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); @@ -544,7 +544,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, this->entry_->control_handler (flow_handler); } - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; local_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -646,7 +646,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, if ((addr = entry->get_peer_addr ()) != 0) { local_addr = dynamic_cast<ACE_INET_Addr*> (addr); - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); } @@ -679,9 +679,10 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, if (local_addr != 0) { - char buf [BUFSIZ]; - ACE_CString addr_str (local_addr->get_host_name ()); - addr_str += ":"; + ACE_TCHAR buf [BUFSIZ]; + local_addr->get_host_name (buf, BUFSIZ); + ACE_TString addr_str (buf); + addr_str += ACE_TEXT(":"); addr_str += ACE_OS::itoa (local_addr->get_port_number () + 1, buf, 10); ACE_NEW_RETURN (local_control_addr, ACE_INET_Addr (addr_str.c_str ()), @@ -750,7 +751,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, transport = flow_handler->transport (); } - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; local_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) @@ -889,7 +890,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, local_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); - char buf [BUFSIZ]; + ACE_TCHAR buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); if (result < 0) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index b12a3a41e57..67f2284ace1 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -15,6 +15,7 @@ #include "orbsvcs/Concurrency/Concurrency_Loader.h" #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$") @@ -29,14 +30,16 @@ TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void) } int -TAO_Concurrency_Loader::init (int argc, char *argv[]) +TAO_Concurrency_Loader::init (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the Concurrency Service @@ -64,7 +67,7 @@ TAO_Concurrency_Loader::fini (void) CORBA::Object_ptr TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb, int /* argc */, - char * /* argv */ [] + ACE_TCHAR * /* argv */ [] ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index b49ae60f6f8..50083e67f28 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -41,7 +41,7 @@ public: /// Called by the Service Configurator framework to initialize the /// Event Service. Defined in <ace/Service_Config.h> - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); /// Called by the Service Configurator framework to remove the /// Event Service. Defined in <ace/Service_Config.h> @@ -50,10 +50,10 @@ public: /// This function call initializes the Concurrency Service given a /// reference to the ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, - int argc, char *argv[] - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - + int argc, + ACE_TCHAR* argv [] + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: /// Instance of the TAO_Concurrency_Server diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index dfd6db30524..57bb93b8fab 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -258,7 +258,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { // Copy argument for later use - this->orbid_ = ACE_OS::strdup(ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ())); + this->orbid_ = ACE_OS::strdup(ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ())); orbid_dupped_ = 1; arg_shifter.consume_arg (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index a627d07245e..2b02ea077fe 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -103,7 +103,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // Parse the options, check if we should bind with the naming // service and under what name... - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd")); int opt; const ACE_TCHAR *service_name = ACE_TEXT("CosEventService"); const ACE_TCHAR *ior_file = 0; @@ -160,10 +160,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TEXT ("-n service_name ") ACE_TEXT ("-o ior_file_name ") ACE_TEXT ("-p pid_file_name ") - ACE_TEXT ("-x [disable naming service bind]") + ACE_TEXT ("-x [disable naming service bind] ") ACE_TEXT ("-r [rebind, no AlreadyBound failures] ") - ACE_TEXT ("-t [enable typed event channel]") - ACE_TEXT ("-d [destroy typed event channelon shutdown] ") + ACE_TEXT ("-t [enable typed event channel] ") + ACE_TEXT ("-d [destroy typed event channel on shutdown] ") ACE_TEXT ("\n"), argv[0])); #else @@ -266,7 +266,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TRY_CHECK; this->channel_name_.length (1); - this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name)); + this->channel_name_[0].id = CORBA::string_dup (service_name); if (use_rebind) { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 723466ea888..d9a82b5fe5a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -115,7 +115,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { - this->address_server_arg_.set (arg_shifter.get_current ()); + this->address_server_arg_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ())); arg_shifter.consume_arg (); } } @@ -166,7 +166,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { - this->nic_.set (arg_shifter.get_current ()); + this->nic_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ())); arg_shifter.consume_arg (); } } @@ -315,7 +315,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) if (this->nic_.length () != 0) { - dgram.set_nic (this->nic_.c_str ()); + dgram.set_nic (ACE_TEXT_TO_TCHAR_IN(this->nic_.c_str ())); } if (this->ttl_value_ > 0) @@ -436,7 +436,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, handler.reset (h); h->reactor (reactor); - if (h->open (address_server_arg, nic) != 0) + if (h->open (address_server_arg, ACE_TEXT_TO_TCHAR_IN(nic)) != 0) return TAO_ECG_Refcounted_Handler (); } @@ -444,7 +444,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, { TAO_ECG_Mcast_EH * h = 0; ACE_NEW_RETURN (h, - TAO_ECG_Mcast_EH (receiver, nic), + TAO_ECG_Mcast_EH (receiver, ACE_TEXT_TO_TCHAR_IN(nic)), handler); handler.reset (h); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index c10cfbbb4cd..b51714d2f4b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -93,7 +93,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0) this->dispatching_ = 1; else - this->unsupported_option_value ("-ECDispatching", opt); + this->unsupported_option_value ("-ECDispatching", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -124,7 +124,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("prefix")) == 0) this->filtering_ = 2; else - this->unsupported_option_value ("-ECFiltering", opt); + this->unsupported_option_value ("-ECFiltering", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -143,7 +143,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("per-supplier")) == 0) this->supplier_filtering_ = 1; else - this->unsupported_option_value ("-ECSupplierFilter", opt); + this->unsupported_option_value ("-ECSupplierFilter", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -158,7 +158,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->timeout_ = 0; else - this->unsupported_option_value ("-ECTimeout", opt); + this->unsupported_option_value ("-ECTimeout", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -177,7 +177,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->observer_ = 2; else - this->unsupported_option_value ("-ECObserver", opt); + this->unsupported_option_value ("-ECObserver", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -194,7 +194,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("group")) == 0) this->scheduling_ = 1; else - this->unsupported_option_value ("-ECScheduling", opt); + this->unsupported_option_value ("-ECScheduling", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -303,7 +303,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->consumer_lock_ = 2; else - this->unsupported_option_value ("-ECProxyConsumerLock", opt); + this->unsupported_option_value ("-ECProxyConsumerLock", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -322,7 +322,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->supplier_lock_ = 2; else - this->unsupported_option_value ("-ECProxySupplierLock", opt); + this->unsupported_option_value ("-ECProxySupplierLock", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -334,7 +334,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { // Save argument for later use - this->orbid_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ()); + this->orbid_ = ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ()); arg_shifter.consume_arg (); } } @@ -351,7 +351,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->consumer_control_ = 1; else - this->unsupported_option_value ("-ECConsumerControl", opt); + this->unsupported_option_value ("-ECConsumerControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -368,7 +368,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->supplier_control_ = 1; else - this->unsupported_option_value ("-ECSupplierControl", opt); + this->unsupported_option_value ("-ECSupplierControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -448,8 +448,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { - const char* opt = arg_shifter.get_current (); - this->queue_full_service_object_name_.set(opt); + const ACE_TCHAR* opt = arg_shifter.get_current (); + this->queue_full_service_object_name_.set (ACE_TEXT_TO_CHAR_IN (opt)); arg_shifter.consume_arg (); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 93b6952aa8d..5c17293ac4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -34,7 +34,7 @@ TAO_EC_Simple_Queue_Full_Action::init_svcs (void) } int -TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[]) +TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[]) { // Here we look at the args and set an internal flag indicating whether // the default action should be to wait for the queue to not be full @@ -47,9 +47,9 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[]) if (argc == 0) break; - if (ACE_OS::strcasecmp ("wait", argv[0]) == 0) + if (ACE_OS::strcasecmp (ACE_TEXT("wait"), argv[0]) == 0) this->queue_full_action_return_value_ = WAIT_TO_EMPTY; - else if (ACE_OS::strcasecmp ("discard", argv[0]) == 0) + else if (ACE_OS::strcasecmp (ACE_TEXT("discard"), argv[0]) == 0) this->queue_full_action_return_value_ = SILENTLY_DISCARD; #if 0 else diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 7aaedd68071..370bc10524a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -65,7 +65,7 @@ public: static int init_svcs (void); // = The Service_Object entry points - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); virtual int queue_full_action (TAO_EC_Dispatching_Task *task, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index ec6b0f935ca..89a9ddb76ee 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -52,7 +52,7 @@ TAO_EC_Gateway_IIOP_Factory::fini (void) } int -TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) +TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[]) { int result = 0; @@ -60,7 +60,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) while (arg_shifter.is_anything_left ()) { - const char *arg = arg_shifter.get_current (); + const ACE_TCHAR *arg = arg_shifter.get_current (); if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPConsumerECControl")) == 0) { @@ -76,7 +76,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reconnect")) == 0) this->consumer_ec_control_ = 2; else - this->unsupported_option_value ("-ECGIIOPConsumerECControl", opt); + this->unsupported_option_value ("-ECGIIOPConsumerECControl", ACE_TEXT_TO_CHAR_IN(opt)); arg_shifter.consume_arg (); } } @@ -113,7 +113,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) if (arg_shifter.is_parameter_next ()) { // Save argument for later use - this->orbid_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ()); + this->orbid_ = ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ()); arg_shifter.consume_arg (); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h index 2a1c30a10a0..1fbd4a03b2c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h @@ -48,7 +48,7 @@ public: /// The Service_Object entry points. //@{ - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); //@} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 087ffc53b03..4e96a5ce513 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -23,7 +23,7 @@ TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void) int -TAO_EC_RTCORBA_Factory::init (int argc, char* argv[]) +TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[]) { return this->body_->init (argc, argv); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h index a76bc59f73d..c85724ed43b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h @@ -46,7 +46,7 @@ public: virtual ~TAO_EC_RTCORBA_Factory (void); // Decorated methods... - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); virtual TAO_EC_Dispatching* create_dispatching (TAO_EC_Event_Channel_Base*); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index c8e822ed5b9..ab1cc0a43f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -36,15 +36,15 @@ TAO_EC_TPC_Factory::init_svcs (void) } int -TAO_EC_TPC_Factory::init (int argc, char* argv[]) +TAO_EC_TPC_Factory::init (int argc, ACE_TCHAR* argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { - const char *arg = arg_shifter.get_current (); + const ACE_TCHAR *arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, "-ECDispatching") == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatching")) == 0) { arg_shifter.consume_arg (); @@ -60,7 +60,7 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[]) arg_shifter.consume_arg (); } } - if (ACE_OS::strcasecmp (arg, "-ECTPCDebug") == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECTPCDebug")) == 0) { arg_shifter.consume_arg (); ++EC_TPC_debug_level; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h index c65e5be61cc..6b17d72660f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h @@ -43,7 +43,7 @@ public: static int init_svcs (void); // = The Service_Object entry points - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); // = The EC_Factory methods virtual TAO_EC_Dispatching* diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 88dedebea60..0739fe2f51d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -111,8 +111,8 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p, that_cdr >> that_group_component; // check if domain id and group id are the same - if ((ACE_OS::strcmp (this_group_component.group_domain_id, - that_group_component.group_domain_id) == 0) && + if ((ACE_OS::strcmp (this_group_component.group_domain_id.in(), + that_group_component.group_domain_id.in()) == 0) && (this_group_component.object_group_id == that_group_component.object_group_id)) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index adac1b323a4..febf8fbe014 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -47,7 +47,7 @@ namespace TAO_FTRT { { curarg++; if (curarg < argc) - transaction_depth = atoi(argv[curarg]); + transaction_depth = ACE_OS::atoi(argv[curarg]); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 0bae38d051d..8dc99941883 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -120,7 +120,7 @@ AMI_Primary_Replication_Strategy::replicate_request( size_t num_backups = backups.length(); if ((size_t)transaction_depth > num_backups) { - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } @@ -167,7 +167,7 @@ AMI_Primary_Replication_Strategy::replicate_request( } ACE_ENDTRY; } - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 50a4a5f4dff..319840261ec 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -32,7 +32,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - TAO_FTRTEC::Log(1 , "check_validity : sequence no = %d\n", sequence_num_); + TAO_FTRTEC::Log(1 , ACE_TEXT("check_validity : sequence no = %d\n"), sequence_num_); if (this->sequence_num_ == 0) { // this is the first set_update received from the primary @@ -45,7 +45,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) // client_interceptor_->sequence_num_--; FTRT::OutOfSequence exception; exception.current = this->sequence_num_; - TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n", this->sequence_num_); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n"), this->sequence_num_); ACE_THROW(FTRT::OutOfSequence(exception)); } else @@ -92,7 +92,7 @@ Basic_Replication_Strategy::replicate_request( if (info_publisher->is_primary()) this->sequence_num_++; - TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_); + TAO_FTRTEC::Log(1, ACE_TEXT("replicate_request : sequence no = %d\n"), sequence_num_); Request_Context_Repository().set_sequence_number(sequence_num_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -114,7 +114,7 @@ Basic_Replication_Strategy::replicate_request( } } else if (transaction_depth > 1) { - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 80c7ba30a06..2b92cb3cf38 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -77,7 +77,7 @@ void TAO_FTEC_Group_Manager::create_group ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "create_group\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("create_group\n")); impl_->info_list = info_list; impl_->my_position = find_by_location(info_list, @@ -117,7 +117,7 @@ void TAO_FTEC_Group_Manager::join_group ( const FTRT::ManagerInfo & info ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "join group\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("join group\n")); if (impl_->my_position == 0) { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); @@ -131,7 +131,7 @@ void TAO_FTEC_Group_Manager::add_member ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "add_member location = <%s>\n", + TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"), (const char*)info.the_location[0].id); auto_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl); @@ -238,14 +238,14 @@ void TAO_FTEC_Group_Manager::add_member ( #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ } - TAO_FTRTEC::Log(2, "Setting state\n"); + TAO_FTRTEC::Log(2, ACE_TEXT("Setting state\n")); info.ior->set_state(s ACE_ENV_ARG_PARAMETER); ACE_CHECK; info.ior->create_group(new_impl->info_list, object_group_ref_version ACE_ENV_ARG_PARAMETER); ACE_CHECK; - TAO_FTRTEC::Log(2, "After create_group\n"); + TAO_FTRTEC::Log(2, ACE_TEXT("After create_group\n")); } // commit the changes @@ -269,7 +269,7 @@ void TAO_FTEC_Group_Manager::replica_crashed ( const FTRT::Location & location ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::replica_crashed\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::replica_crashed\n")); FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); remove_member(location, IOGR_Maker::instance()->get_ref_version()+1 @@ -319,14 +319,14 @@ void TAO_FTEC_Group_Manager::remove_member ( ACE_ENDTRY; } - TAO_FTRTEC::Log(3, "my_position = %d, crashed_pos = %d\n", impl_->my_position, crashed_pos); + TAO_FTRTEC::Log(3, ACE_TEXT("my_position = %d, crashed_pos = %d\n"), impl_->my_position, crashed_pos); if (impl_->my_position == crashed_pos && impl_->my_position > 0) Fault_Detector::instance()->connect(impl_->info_list[impl_->my_position-1].the_location); } void TAO_FTEC_Group_Manager::connection_closed() { - TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::connection_closed\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::connection_closed\n")); ACE_ASSERT(impl_->my_position > 0); // do not use referere here, because the the value pointed by the pointer to diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index a7cc3c7a391..7e225602e4b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -42,7 +42,7 @@ Fault_Detector* Fault_Detector::instance() return detector; } -int Fault_Detector::init(int argc, char** argv) +int Fault_Detector::init(int argc, ACE_TCHAR** argv) { detector = this; if (this->parse_conf(argc, argv)==0 && @@ -67,7 +67,7 @@ void Fault_Detector::set_listener(TAO_FTEC_Fault_Listener* listener) listener_ = listener; } -int Fault_Detector::parse_conf(int , char** ) +int Fault_Detector::parse_conf(int , ACE_TCHAR** ) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp index bcf68ca9e98..573a6cb8464 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp @@ -30,10 +30,16 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::init_acceptor() ACE_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(), listen_addr.get_port_number())); - char* buf = CORBA::string_alloc(MAXHOSTNAMELEN); + + ACE_TCHAR* buf = new ACE_TCHAR[ MAXHOSTNAMELEN + 1 ]; listen_addr.addr_to_string(buf, MAXHOSTNAMELEN, 0); location_.length(1); +#if defined (ACE_USES_WCHAR) + location_[0].id = ACE::String_Conversion::Convert_Out<char>( buf ).c_str(); + delete buf; +#else location_[0].id = buf; +#endif return 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index ee750df8f22..cb23d1aa537 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -192,7 +192,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques // pass a new IOGR if the client use an outdated version IOGR_Maker* maker = IOGR_Maker::instance(); - TAO_FTRTEC::Log(3, "Current GROUP Version = %d, received version = %d\n", + TAO_FTRTEC::Log(3, ACE_TEXT("Current GROUP Version = %d, received version = %d\n"), maker->get_ref_version(), version); if (version < maker->get_ref_version()) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 779396ce1ee..7ff6e8951e4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -224,7 +224,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp(operation.in(), "push") == 0) { - TAO_FTRTEC::Log(3, "Received push command\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Received push command\n")); return; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 63d7801689e..94b7ca5acb7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -153,7 +153,7 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) } if (!CORBA::is_nil(naming_context_.in())) { - TAO_FTRTEC::Log(1, "Registering to the Name Service\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("Registering to the Name Service\n")); ACE_TRY_NEW_ENV { naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(), info->iogr.in() ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index 7b356e36f4d..78fe674a026 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -43,7 +43,7 @@ namespace FTRTEC { --argc; ++argv; if (argv[0][0] == '-') continue; else if (argv[0][0] != '$') { - UUID uuid(argv[0]); + UUID uuid(ACE_TEXT_TO_CHAR_IN (argv[0])); if (!uuid.is_valid()) ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1); object_id_.length(16); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 753cd359248..dacd04341ae 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -68,11 +68,11 @@ namespace FTRTEC Replication_Strategy* strategy; if (ami) { ACE_NEW_RETURN (strategy, AMI_Replication_Strategy(threads() > 1), -1); - TAO_FTRTEC::Log(3, "AMI replication strategy\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("AMI replication strategy\n")); } else { ACE_NEW_RETURN (strategy, Basic_Replication_Strategy(threads() > 1), -1); - TAO_FTRTEC::Log(3, "Basic replication strategy\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Basic replication strategy\n")); } ACE_AUTO_PTR_RESET (replication_strategy, strategy, Replication_Strategy); @@ -108,7 +108,7 @@ namespace FTRTEC void Replication_Service::become_primary() { - TAO_FTRTEC::Log(3, "become_primary\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("become_primary\n")); Replication_Strategy* strategy = replication_strategy->make_primary_strategy(); @@ -170,21 +170,21 @@ namespace FTRTEC int Replication_Service::acquire_read (void) { int r = replication_strategy->acquire_read(); - TAO_FTRTEC::Log(3, "Read Lock acquired %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r); return r; } int Replication_Service::acquire_write (void) { int r= replication_strategy->acquire_write(); - TAO_FTRTEC::Log(3, "Write Lock acqured %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r); return r; } int Replication_Service::release (void) { int r= replication_strategy->release(); - TAO_FTRTEC::Log(3, "Lock Released %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r); return r; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index 6319f696946..44476a3fc23 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -17,7 +17,7 @@ unsigned int Log::log_level_; if (log_level_ >= log_level) { va_list p; va_start(p, format); - char str[1024]; + ACE_TCHAR str[1024]; ACE_OS::vsprintf(str, format, p); ACE_DEBUG((LM_DEBUG, str)); va_end(p); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl index 120a88f6557..7008345edee 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl @@ -22,7 +22,7 @@ namespace TAO_FTRTEC { void Log::hexdump(unsigned int level, const char* buf, size_t len, const char* msg) { if (Log::log_level_ >= level) - ACE_HEX_DUMP((LM_DEBUG, buf, len, msg)); + ACE_HEX_DUMP((LM_DEBUG, buf, len, ACE_TEXT_TO_TCHAR_IN(msg))); } #else // NDEBUG ACE_INLINE diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 8d8cddc96f8..190285b3b0f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -452,7 +452,7 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core, sizeof (char*) * this->endpoint_count_); ACE::HTBP::ID_Requestor req(ht_env_); - this->addrs_[0] = req.get_HTID(); + this->addrs_[0] = ACE::HTBP::Addr(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); return 0; } @@ -542,7 +542,7 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]), this->addrs_[i].get_port_number ())); } } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 00a99a84351..ad4b080297b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -252,8 +252,8 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Listening port [%d] on [%s],[%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()), - ACE_TEXT_CHAR_TO_TCHAR(listen_point.htid.in()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()), + ACE_TEXT_TO_TCHAR_IN(listen_point.htid.in()))); } // Construct an TAO::HTIOP::Endpoint object diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index c2a2dde9735..0cdab0c09ef 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -147,7 +147,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r, ACE::HTBP::Session_Id_t session_id; ACE_INET_Addr *proxy; - ACE_CString proxy_host; + ACE_TString proxy_host; unsigned proxy_port; int port_set = this->ht_env_->get_proxy_port(proxy_port); @@ -156,12 +156,12 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r, host_set != 0) { proxy_port = htiop_endpoint->port(); - proxy_host = htiop_endpoint->host(); + proxy_host.set (ACE_TEXT_TO_TCHAR_IN (htiop_endpoint->host())); } else { ACE::HTBP::ID_Requestor req(ht_env_); - session_id.local_ = req.get_HTID(); + session_id.local_ = ACE::HTBP::Addr(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); } if (proxy_port == 0) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index 8542907269b..9f8d638a5b6 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -80,7 +80,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc, else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT("-inside")) == 0) { if (++i < argc) - this->inside_ = ::atoi (ACE_TEXT_ALWAYS_CHAR(argv[i])); + this->inside_ = ::atoi (ACE_TEXT_TO_CHAR_IN(argv[i])); } } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index 26f71866bfd..cc505817e48 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -27,7 +27,7 @@ Options::~Options () int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:pb:lm:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:pb:lm:r"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 73a947638cf..ea4ae89e71a 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -125,7 +125,7 @@ TAO_IOR_Multicast::common_init (const char *ior, { if (this->mcast_dgram_.subscribe (this->mcast_addr_, 1, - ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_.c_str())) == -1) + ACE_TEXT_TO_TCHAR_IN(this->mcast_nic_.c_str())) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "subscribe"),-1); } else diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 3e6d76a10aa..3e12f2f41e9 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -35,7 +35,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) for (int i = 0; i < argc; ++i) { - if (ACE_OS::strcasecmp (argv[i], "-LBGroup") == 0) + if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBGroup")) == 0) { const CORBA::ULong j = len; ++len; @@ -47,7 +47,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) ++i; // 2 - if (ACE_OS::strcasecmp (argv[i], "-LBTypeId") != 0) + if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBTypeId")) != 0) return -1; ++i; // 3 @@ -55,7 +55,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) repository_ids.length (len); repository_ids[j] = CORBA::string_dup (argv[i]); } - else if (ACE_OS::strcasecmp (argv[i], "-LBTypeId") == 0) + else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBTypeId")) == 0) { const CORBA::ULong j = len; ++len; @@ -67,7 +67,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) ++i; // 2 - if (ACE_OS::strcasecmp (argv[i], "-LBGroup") != 0) + if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBGroup")) != 0) return -1; ++i; // 3 @@ -75,7 +75,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) object_groups.length (len); object_groups[j] = CORBA::string_dup (argv[i]); } - else if (ACE_OS::strcasecmp (argv[i], "-LBLocation") == 0) + else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBLocation")) == 0) { ++i; location = CORBA::string_dup (argv[i]); diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 25354e8328a..4155a5cf494 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -357,7 +357,7 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time, ACE_U64_TO_U32 (from_time)); #else ACE_OS::sprintf (uint64_formating, - ACE_UINT64_FORMAT_SPECIFIER, + ACE_UINT64_FORMAT_SPECIFIER_A, from_time); #endif diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp index 403e105bf7d..c7de112dd11 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp @@ -5,6 +5,7 @@ //----------------------------------------------------------------------------- #include "orbsvcs/Naming/Flat_File_Persistence.h" +#include "ace/config-all.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_unistd.h" @@ -32,7 +33,7 @@ void TAO_NS_FlatFileStream::remove () { ACE_TRACE("remove"); - ACE_OS::unlink(ACE_TEXT_CHAR_TO_TCHAR(file_.c_str())); + ACE_OS::unlink(ACE_TEXT_TO_TCHAR_IN(file_.c_str())); } int @@ -60,21 +61,21 @@ TAO_NS_FlatFileStream::open() if( strchr(mode_.c_str(), 'c') ) flags |= O_CREAT; #ifndef ACE_WIN32 - if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), 0666) != 0 ) + if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_TO_TCHAR_IN(file_.c_str()), 0666) != 0 ) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), errno, ACE_OS::strerror(errno)), -1); #else - if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE ) + if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_TO_TCHAR_IN(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE ) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open file %s for mode %s: (%d) %s\n", file_.c_str(), mode_.c_str(), errno, ACE_OS::strerror(errno)), -1); #endif - this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR(fdmode)); + this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_TO_TCHAR_IN(fdmode)); if (this->fl_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot fdopen file %s for mode %s: (%d) %s\n", @@ -247,9 +248,7 @@ TAO_NS_FlatFileStream::operator >>( return *this; } char *id = new char[bufSize+1]; - //char *id; - //ACE_NEW_RETURN (id, char[bufSize+1], 1); - if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(id), bufSize+1, fl_) == 0 && + if (ACE_OS::fgets(id, bufSize+1, fl_) == 0 && bufSize != 0) { this->setstate (badbit); @@ -270,9 +269,7 @@ TAO_NS_FlatFileStream::operator >>( return *this; } char *kind = new char[bufSize+1]; - //char *kind; - //ACE_NEW (kind, char[bufSize+1]); - if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(kind), bufSize+1, fl_) == 0 && + if (ACE_OS::fgets(kind, bufSize+1, fl_) == 0 && bufSize != 0) { this->setstate (badbit); @@ -294,9 +291,7 @@ TAO_NS_FlatFileStream::operator >>( return *this; } char *ref = new char[bufSize+1]; - //char *ref; - //ACE_NEW(ref, char[bufSize+1]); - if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(ref), bufSize+1, fl_) == 0 && + if (ACE_OS::fgets(ref, bufSize+1, fl_) == 0 && bufSize != 0) { this->setstate (badbit); @@ -354,7 +349,7 @@ TAO_NS_FlatFileFactory::create_stream (const ACE_CString & file, TAO_Storable_Base *stream = 0; ACE_NEW_RETURN (stream, - TAO_NS_FlatFileStream(file, ACE_TEXT_ALWAYS_CHAR (mode)), + TAO_NS_FlatFileStream(file, ACE_TEXT_TO_CHAR_IN (mode)), 0); return stream; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 5ea0c3bbc03..db1876ab5f8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -171,7 +171,7 @@ int TAO_Naming_Server::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:")); int c; int size, result; @@ -208,9 +208,9 @@ TAO_Naming_Server::parse_args (int argc, this->context_size_ = size; break; case 'b': - result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()), + result = ::sscanf (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()), #if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG - ACE_INT64_FORMAT_SPECIFIER, + ACE_UINT64_FORMAT_SPECIFIER_A, #else "%ld", #endif /* ACE_SIZEOF_VOID_P */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 467086d3cd6..3f2c4253a0f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -422,7 +422,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check( file_name += context->name_; // Create the stream - fl_ = context->factory_->create_stream(file_name, ACE_TEXT_CHAR_TO_TCHAR(mode)); + fl_ = context->factory_->create_stream(file_name, ACE_TEXT_TO_TCHAR_IN(mode)); if (TAO_Storable_Naming_Context::redundant_) { if (fl_->open() != 0) @@ -534,7 +534,7 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context ( name_ (poa_id), poa_ (PortableServer::POA::_duplicate (poa)), factory_(factory), - persistence_directory_ (ACE_TEXT_ALWAYS_CHAR(persistence_directory)), + persistence_directory_ (ACE_TEXT_TO_CHAR_IN(persistence_directory)), hash_table_size_(hash_table_size), last_changed_(0) { @@ -725,7 +725,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) poa_id, this->storable_context_->total_size (), this->factory_, - ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()), + ACE_TEXT_TO_TCHAR_IN (this->persistence_directory_.c_str ()), &new_context ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); @@ -1499,8 +1499,8 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( // Now does this already exist on disk? ACE_TString file_name(persistence_directory); file_name += ACE_TEXT("/"); - file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id); - ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("r"))); + file_name += ACE_TEXT_TO_TCHAR_IN(poa_id); + ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("r"))); if (fl->exists()) { // Load the map from disk @@ -1524,7 +1524,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( file_name += ACE_TEXT("_global"); // Create the stream for the counter used to uniquely creat context names - gfl_.reset(factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("crw"))); + gfl_.reset(factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("crw"))); if (gfl_->open() != 0) { delete gfl_.release(); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index b2bb63bf6cf..c37f66d6b8a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -62,8 +62,8 @@ TAO_Storable_Naming_Context_Activator::incarnate ( // Does this already exist on disk? ACE_TString file_name(persistence_directory_); file_name += ACE_TEXT("/"); - file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id.in()); - TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("rw")); + file_name += ACE_TEXT_TO_TCHAR_IN(poa_id.in()); + TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("rw")); if (!fl->exists()) { ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 2128c1852a4..fbea8e9539f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -289,7 +289,6 @@ TAO_CosNotify_Service::builder (void) TAO_END_VERSIONED_NAMESPACE_DECL - /*********************************************************************************************************************/ ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_EMO_Factory_OLD, diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index e86593e9583..3ad1b7d988c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -104,8 +104,8 @@ TAO_Notify_EventType::operator==(const TAO_Notify_EventType& event_type) const if (this->hash () != event_type.hash ()) return false; else // compare the strings - return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) == 0 && - ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) == 0 + return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) == 0 && + ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) == 0 ); } @@ -115,8 +115,8 @@ TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const if (this->hash () != event_type.hash ()) return true; else // compare the strings - return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) != 0 || - ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) != 0 + return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) != 0 || + ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) != 0 ); } @@ -124,12 +124,12 @@ CORBA::Boolean TAO_Notify_EventType::is_special (void) const { if ((this->event_type_.domain_name == 0 || - ACE_OS::strcmp (this->event_type_.domain_name, "") == 0 || - ACE_OS::strcmp (this->event_type_.domain_name, "*") == 0) && + ACE_OS::strcmp (this->event_type_.domain_name.in(), "") == 0 || + ACE_OS::strcmp (this->event_type_.domain_name.in(), "*") == 0) && (this->event_type_.type_name == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "") == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "*") == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "%ALL") == 0)) + ACE_OS::strcmp (this->event_type_.type_name.in(), "") == 0 || + ACE_OS::strcmp (this->event_type_.type_name.in(), "*") == 0 || + ACE_OS::strcmp (this->event_type_.type_name.in(), "%ALL") == 0)) return 1; else return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp index 7d1109eb65e..efda609e5f1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp @@ -64,7 +64,7 @@ namespace TAO_Notify #else ACE_OS::sprintf(buf, ACE_UINT64_FORMAT_SPECIFIER, us); #endif /* ACE_LACKS_LONGLONG_T */ - value = ACE_TEXT_ALWAYS_CHAR (buf); + value = ACE_TEXT_TO_CHAR_IN (buf); } NVP::NVP(const TAO_Notify_Property_Boolean& p) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index 53e825c0939..310b693d2aa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -46,6 +46,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // namespace TAO_Notify { + class Topology_Saver; class Topology_Parent; diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index 7dd33e5deb6..f880fc28ecb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -32,14 +32,16 @@ namespace { CORBA::Long id = 0; for (size_t i = 0; i < attrs->getLength (); ++i) { - const char * name = attrs->getQName (i); - const char * value = attrs->getValue (i); + const ACE_TCHAR * name = attrs->getQName (i); + const ACE_TCHAR * value = attrs->getValue (i); if (ACE_OS::strcmp (name, - TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0) + //TOPOLOGY_ID_NAME) == 0) + TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0) { id = ACE_OS::atoi (value); } - nvp.push_back (NVP (name, value)); + nvp.push_back (NVP (ACE_TEXT_TO_CHAR_IN(name), + ACE_TEXT_TO_CHAR_IN(value))); } return id; } @@ -81,7 +83,7 @@ namespace TAO_Notify ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream; // xml input source will take ownership - if (fstm->open (this->file_name_.c_str ()) == 0) + if (fstm->open (ACE_TEXT_TO_TCHAR_IN(this->file_name_.c_str ())) == 0) { // InputSource takes ownership ACEXML_InputSource input (fstm); @@ -132,7 +134,7 @@ namespace TAO_Notify ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream; // xml input source will take ownership - if (fstm->open (this->file_name_.c_str ()) == 0) + if (fstm->open (ACE_TEXT_TO_TCHAR_IN(this->file_name_.c_str ())) == 0) { // InputSource takes ownership ACEXML_InputSource input (fstm); @@ -194,7 +196,7 @@ namespace TAO_Notify name )); - ACE_CString cname (name); + ACE_CString cname (ACE_TEXT_TO_CHAR_IN(name)); Topology_Object* next = cur->load_child ( cname, id, attrs ACE_ENV_ARG_PARAMETER); ACE_ASSERT(next != 0); @@ -203,7 +205,8 @@ namespace TAO_Notify } ACE_CATCHANY { - ACEXML_THROW (ACEXML_SAXException (ACE_ANY_EXCEPTION._info ().c_str ())); + ACEXML_THROW (ACEXML_SAXException (ACE_TEXT_TO_TCHAR_IN( + ACE_ANY_EXCEPTION._info ().c_str ()))); } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index f6f0864b46f..da7302b66d1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -131,7 +131,7 @@ namespace TAO_Notify #ifdef ACE_LACKS_LONGLONG_T nowus.as_string(nowusstr); #else - ACE_OS::sprintf(nowusstr, ACE_UINT64_FORMAT_SPECIFIER, nowus); + ACE_OS::sprintf(nowusstr, ACE_UINT64_FORMAT_SPECIFIER_A, nowus); #endif /* ACE_LACKS_LONGLONG_T */ attrs.push_back(NVP("version", "1.0")); @@ -173,10 +173,10 @@ namespace TAO_Notify } const size_t BUF_SIZE = 512; - ACE_CString tmp(BUF_SIZE); + ACE_TString tmp(BUF_SIZE); for (size_t idx = 0; idx < attrs.size(); idx++) { - ACEXML_escape_string(attrs[idx].value, tmp); + ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(attrs[idx].value.fast_rep()), tmp); ACE_OS::fprintf (out, "%s%s%s%s%s", " ", attrs[idx].name.c_str (), "=\"", tmp.c_str(), "\""); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp index 8b263987fe8..632ba0f0949 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -68,17 +68,17 @@ namespace TAO_Notify for (int narg = 0; narg < argc; ++narg) { ACE_TCHAR * av = argv[narg]; - if (ACE_OS::strcasecmp (av, "-v") == 0) + if (ACE_OS::strcasecmp (av, ACE_TEXT("-v")) == 0) { verbose = true; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Standard_Event_Persistence: -verbose\n") )); } - else if (ACE_OS::strcasecmp (av, "-base_path") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-base_path")) == 0 && narg + 1 < argc) { - this->save_base_path_ = argv[narg + 1]; - this->load_base_path_ = argv[narg + 1]; + this->save_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); + this->load_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); if (TAO_debug_level > 0 || verbose) { ACE_DEBUG ((LM_DEBUG, @@ -88,9 +88,9 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-save_base_path") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-save_base_path")) == 0 && narg + 1 < argc) { - this->save_base_path_ = argv[narg + 1]; + this->save_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); if (TAO_debug_level > 0 || verbose) { ACE_DEBUG ((LM_DEBUG, @@ -100,9 +100,9 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-load_base_path") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-load_base_path")) == 0 && narg + 1 < argc) { - this->load_base_path_ = argv[narg + 1]; + this->load_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1])); if (TAO_debug_level > 0 || verbose) { ACE_DEBUG ((LM_DEBUG, @@ -112,7 +112,7 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-backup_count") == 0 && narg + 1 < argc) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-backup_count")) == 0 && narg + 1 < argc) { this->backup_count_ = ACE_OS::atoi(argv[narg + 1]); if (TAO_debug_level > 0 || verbose) @@ -124,7 +124,7 @@ namespace TAO_Notify } narg += 1; } - else if (ACE_OS::strcasecmp (av, "-no_timestamp") == 0) + else if (ACE_OS::strcasecmp (av, ACE_TEXT("-no_timestamp")) == 0) { this->timestamp_ = false; if (TAO_debug_level > 0 || verbose) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 330d3984006..8a901db4e19 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -66,7 +66,7 @@ TAO::PG_FactoryRegistry::~PG_FactoryRegistry (void) int TAO::PG_FactoryRegistry::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:q"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:q"); int c; while ((c = get_opts ()) != -1) @@ -714,7 +714,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( int TAO::PG_FactoryRegistry::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/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 73745a4460b..a3515d8cf37 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -172,7 +172,7 @@ TAO_GroupId_Equal_To::operator () ( const PortableGroup::TagGroupTaggedComponent *rhs) const { return - ACE_OS::strcmp (lhs->group_domain_id, rhs->group_domain_id) == 0 + ACE_OS::strcmp (lhs->group_domain_id.in(), rhs->group_domain_id.in()) == 0 && lhs->object_group_id == rhs->object_group_id && lhs->object_group_ref_version == rhs->object_group_ref_version; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index 3f02a649f72..b006f1d1e1e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -58,7 +58,7 @@ TAO_UIPMC_Protocol_Factory::make_acceptor (void) int TAO_UIPMC_Protocol_Factory::init (int /* argc */, - char* /* argv */ []) + ACE_TCHAR* /* argv */ []) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h index 8b7ab75adf2..b914111489e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h @@ -38,7 +38,7 @@ public: // = Service Configurator hooks. /// Dynamic linking hook - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); /// Verify prefix is a match virtual int match_prefix (const ACE_CString &prefix); diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 817d0726b4b..7b0e4d0db2e 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -45,8 +45,8 @@ CosProperty_Hash_Key::CosProperty_Hash_Key (const CosProperty_Hash_Key &src) bool CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const { - return (ACE_OS::strcmp (this->pname_, - hash_key.pname_) == 0); + return (ACE_OS::strcmp (this->pname_.in(), + hash_key.pname_.in()) == 0); } u_long diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 49a369925e7..058f0aebf01 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -118,7 +118,7 @@ TAO::SSLIOP::Protocol_Factory::parse_x509_file (char *arg, int TAO::SSLIOP::Protocol_Factory::init (int argc, - char* argv[]) + ACE_TCHAR* argv[]) { char *certificate_path = 0; char *private_key_path = 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 169e12b7bf2..4ca7a9cf601 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -64,7 +64,7 @@ namespace TAO // = Service Configurator hooks. /// Dynamic linking hook - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); /// Verify prefix is a match virtual int match_prefix (const ACE_CString & prefix); diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 69b1e25ddca..90ec0a81889 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -450,7 +450,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, ACE_ERROR ((LM_ERROR, ACE_TEXT("unrecognized dependency type %d for %s\n"), - d.dependency_type, ACE_TEXT_CHAR_TO_TCHAR(rt_info->entry_point.in ()))); + d.dependency_type, ACE_TEXT_TO_TCHAR_IN(rt_info->entry_point.in ()))); return -1; } @@ -458,7 +458,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, ACE_TEXT("Sched (%t) adding %s dependency to caller: %s\n"), (const ACE_TCHAR *) ((d.dependency_type == RtecBase::TWO_WAY_CALL) ? ACE_TEXT("TWO_WAY") : ACE_TEXT("ONE_WAY")), - ACE_TEXT_CHAR_TO_TCHAR(temp_info->entry_point.in ()))); + ACE_TEXT_TO_TCHAR_IN(temp_info->entry_point.in ()))); RtecScheduler::Dependency_Set& set = temp_info->dependencies; int l = set.length(); @@ -1555,7 +1555,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, (LM_DEBUG, ACE_TEXT("Warning: an operation identified by ") ACE_TEXT("\"%s\" has unresolved remote dependencies.\n"), - ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point))); + ACE_TEXT_TO_TCHAR_IN((const char*)task_entries_ [i].rt_info ()->entry_point))); // Record entry point in list of unresolved remote dependencies ACE_OS::sprintf (string_buffer, "// %s\n", @@ -1572,7 +1572,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, ACE_TEXT("Error: operation \"%s\" does not specify a period or\n") ACE_TEXT("visible threads, and is not called by any other operation.\n") ACE_TEXT("Are there backwards dependencies.\n"), - ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point))); + ACE_TEXT_TO_TCHAR_IN((const char*)task_entries_ [i].rt_info ()->entry_point))); result = ST_UNRESOLVED_LOCAL_DEPENDENCIES; @@ -1657,8 +1657,8 @@ ACE_DynScheduler::check_dependency_cycles_recurse (Task_Entry &entry) // indicate the two tasks are in (the same) dependency cycle ACE_ERROR ((LM_ERROR, ACE_TEXT("Tasks \"%s\" and \"%s\" are part of a call cycle.\n"), - ACE_TEXT_CHAR_TO_TCHAR((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()), - ACE_TEXT_CHAR_TO_TCHAR(entry.rt_info ()->entry_point.in ()))); + ACE_TEXT_TO_TCHAR_IN((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()), + ACE_TEXT_TO_TCHAR_IN(entry.rt_info ()->entry_point.in ()))); // set return status, ignore status returned by recursive call: // we already know there are cycles in the dependencies @@ -1931,7 +1931,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_priorities (file); @@ -1942,7 +1942,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) ACE_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") ACE_TEXT("Could not open schedule file (\"%s\")"), - ACE_TEXT_CHAR_TO_TCHAR(filename))); + ACE_TEXT_TO_TCHAR_IN(filename))); } return status; @@ -2026,7 +2026,7 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_timeline (file); @@ -2151,7 +2151,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_preemption_timeline (file); @@ -2162,7 +2162,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename) ACE_ERROR ((LM_ERROR, ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") ACE_TEXT("Cannot open timeline file (\"%s\")\n"), - ACE_TEXT_CHAR_TO_TCHAR(filename))); + ACE_TEXT_TO_TCHAR_IN(filename))); } return status; @@ -2241,7 +2241,7 @@ ACE_DynScheduler::output_viewer_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_timeline (file); @@ -2370,7 +2370,7 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) if (status == SUCCEEDED) { // open the file - file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); + file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w")); if (! file) { status = UNABLE_TO_OPEN_SCHEDULE_FILE; diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 44ebd3e82b3..a4b7171a697 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -352,7 +352,7 @@ int ACE_Scheduler_Factory::dump_schedule FILE* file = stdout; if (file_name != 0) { - file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(file_name), ACE_TEXT("w")); + file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT("w")); if (file == 0) return -1; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 60513db6b78..6ddef432010 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -333,7 +333,7 @@ lookup_all_subtypes (const char* type, for (CORBA::ULong j = 0; j < num_super_types; j++) { - if (ACE_OS::strcmp (type_struct->super_types[j], type) == 0) + if (ACE_OS::strcmp (static_cast<const char*>(type_struct->super_types[j]), type) == 0) { // Egads, a subtype! This type has the type passed // to query in its list of super_types. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 4de7d0c8638..585519e1ec8 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -908,7 +908,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq, CORBA::ULong i = 0; for (i = 0; i < policy_seq.length (); i++) - if (ACE_OS::strcmp (policy_seq[i].name, + if (ACE_OS::strcmp (policy_seq[i].name.in(), POLICY_NAMES[LINK_FOLLOW_RULE]) == 0) { policy_seq[i].value <<= follow_option; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index b68487ba367..b18f6af0567 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -23,7 +23,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:"); int c; while ((c = get_opts ()) != -1) @@ -71,7 +71,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index ed3756bffbe..b3e4d91970b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -22,7 +22,7 @@ int num_threads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -236,7 +236,7 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index 94221caa7bd..77552424f3b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -23,7 +23,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:"); int c; while ((c = get_opts ()) != -1) @@ -72,7 +72,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index f6ce3d00373..8b4fce4c59a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -26,7 +26,7 @@ const char * strategy = "Random"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -239,7 +239,7 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp index d8ebf631bdc..5df2011a298 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp @@ -41,7 +41,7 @@ load_file (Vector &vector, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Vector X; load_file (X, argv[1]); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp index 280e7ba2efa..993016d8b47 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp @@ -32,7 +32,7 @@ ACE_RCSID(TAO_PERF_RTEC_Colocated_Roundtrip, driver, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index 8720b8bb599..81b2d8a34cc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -69,7 +69,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:l:h:w:v:zr"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:l:h:w:v:zr"); int c; while ((c = get_opts ()) != -1) @@ -128,7 +128,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs(); RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp index 677cf6870f5..c188ce43e8b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp @@ -28,7 +28,7 @@ int use_rt_corba = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:p:n:rd"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:p:n:rd"); int c; while ((c = get_opts ()) != -1) @@ -76,7 +76,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp index a3caafe3b54..ab1160e9c6b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -163,7 +163,7 @@ private: int workload_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp index f82199ba24e..de661a6263b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp @@ -25,7 +25,7 @@ int nthreads = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r"); int c; while ((c = get_opts ()) != -1) @@ -58,7 +58,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 420b6d15b95..f3612f5f197 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -193,7 +193,7 @@ private: int period_in_usecs_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp index 59d0eb001d2..71effbf4fea 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp @@ -28,7 +28,7 @@ int nthreads = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r"); int c; while ((c = get_opts ()) != -1) @@ -61,7 +61,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp index 5e723b3cca5..f9e1d7b1974 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp @@ -29,7 +29,7 @@ ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index 8c7d83af31a..75f79000853 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -30,7 +30,7 @@ int nthreads = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r"); int c; while ((c = get_opts ()) != -1) @@ -63,7 +63,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp index 8c36cbd0349..2186d839335 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp @@ -62,7 +62,7 @@ private: int period_in_usecs_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { RT_Class rt_class; @@ -280,7 +280,7 @@ Measuring_Task::svc () int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "H:L:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "H:L:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp index dcbfac08567..2670a938df5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp @@ -36,7 +36,7 @@ private: ACE_Reactor reactor_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; @@ -165,7 +165,7 @@ Task::svc() int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "h:l:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "h:l:n:r"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp index a48dbed7cda..474470fe48d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp @@ -32,7 +32,7 @@ Client_Options::Client_Options (int &argc, char *argv[]) , funky_supplier_publication (0) , high_priority_is_last (0) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -72,7 +72,7 @@ Client_Options::Client_Options (int &argc, char *argv[]) } int -Client_Options::option (ACE_Arg_Shifter &arg_shifter, +Client_Options::option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value) { @@ -93,7 +93,7 @@ Client_Options::option (ACE_Arg_Shifter &arg_shifter, } int -Client_Options::boolean_option (ACE_Arg_Shifter &arg_shifter, +Client_Options::boolean_option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h index cbffa42aeb7..677d68719d5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h @@ -12,13 +12,14 @@ #include /**/ "ace/pre.h" #include "rtec_perf_export.h" +#include "ace/Arg_Shifter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /// Parse the command-line client_options for the tests. @@ -49,11 +50,11 @@ public: int high_priority_is_last; private: - int option (ACE_Arg_Shifter &arg_shifter, + int option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value); - int boolean_option (ACE_Arg_Shifter &arg_shifter, + int boolean_option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value); }; diff --git a/TAO/orbsvcs/performance-tests/perf.mwc b/TAO/orbsvcs/performance-tests/perf.mwc index dd297256b34..b11bf5da603 100644 --- a/TAO/orbsvcs/performance-tests/perf.mwc +++ b/TAO/orbsvcs/performance-tests/perf.mwc @@ -2,4 +2,6 @@ // $Id$ workspace { + cmdline += -base no_wchar } + diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index a651f3c4ca4..b3cc2fa54f3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -13,7 +13,7 @@ Connection_Manager::~Connection_Manager (void) void Connection_Manager::load_ep_addr (const char* file_name) { - FILE* addr_file = ACE_OS::fopen (file_name, "r"); + FILE* addr_file = ACE_OS::fopen (file_name, ACE_TEXT("r")); if (addr_file == 0) { diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index 34239319d22..de5a4a6b40f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -2,6 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/AV/Protocol_Factory.h" typedef ACE_Unmanaged_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; @@ -112,11 +113,10 @@ Distributer::connection_manager (void) } int -Distributer::parse_args (int argc, - char **argv) +Distributer::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:r:a:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:a:"); int c; while ((c= opts ()) != -1) @@ -233,16 +233,17 @@ Distributer::done (int done) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -273,8 +274,7 @@ main (int argc, // Initialize the Distributer int result = - DISTRIBUTER::instance ()->init (argc, - argv + DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index 437bf6d21b7..f78dd9cb96d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" // File handle of the file into which received data is written. static FILE *output_file = 0; @@ -142,11 +143,10 @@ Receiver::init (int, } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:r:a:"); @@ -184,16 +184,17 @@ Receiver::output_file_name (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -224,15 +225,14 @@ main (int argc, Receiver receiver; int result = - receiver.parse_args (argc, - argv); + receiver.parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (receiver.output_file_name ().c_str (), - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -244,8 +244,7 @@ main (int argc, "File Opened Successfully\n")); result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index e97f210997e..0da39936aff 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -53,11 +54,10 @@ Sender::Sender (void) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:f:r:da:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:da:"); int c; while ((c= opts ()) != -1) @@ -119,7 +119,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -290,14 +290,15 @@ Sender::connection_manager (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -328,8 +329,7 @@ main (int argc, // Initialize the Client. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index 3683e3e7ba2..1c27e3cf8a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" static FILE *output_file = 0; @@ -159,11 +160,10 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); int c; while ((c= opts ()) != -1) @@ -209,7 +209,7 @@ Receiver::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -268,16 +268,17 @@ Receiver::input_file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -306,7 +307,7 @@ main (int argc, // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -318,8 +319,7 @@ main (int argc, "Output File Opened Successfully\n")); int result = - RECEIVER::instance ()->init (argc, - argv + RECEIVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 2e806a208a2..7a471f63f27 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" typedef ACE_Unmanaged_Singleton<Sender, ACE_Null_Mutex> SENDER; @@ -127,11 +128,10 @@ Sender::shutdown (void) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -214,7 +214,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -426,15 +426,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -469,8 +470,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -481,7 +481,7 @@ main (int argc, // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index bcc4f71458d..9aa2db8b1c0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -3,6 +3,7 @@ #include "distributer.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/AV/Protocol_Factory.h" #include "orbsvcs/AV/FlowSpec_Entry.h" @@ -267,11 +268,10 @@ Distributer::connection_manager (void) } int -Distributer::parse_args (int argc, - char **argv) +Distributer::parse_args (int argc, char **argv) { /// Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:r:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:"); int c; while ((c= opts ()) != -1) @@ -426,16 +426,17 @@ Distributer::done (int done) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -466,8 +467,7 @@ main (int argc, /// Initialize the Distributer int result = - DISTRIBUTER::instance ()->init (argc, - argv + DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index 573fdb12f34..b1a6c0ee29a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "tao/Strategies/advanced_resource.h" @@ -222,11 +223,10 @@ Receiver::init (int, } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { /// Parse the command line arguments - ACE_Get_Opt opts (argc, + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:r:"); @@ -285,16 +285,17 @@ Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -325,15 +326,14 @@ main (int argc, Receiver receiver; int result = - receiver.parse_args (argc, - argv); + receiver.parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; /// Make sure we have a valid <output_file> output_file = ACE_OS::fopen (receiver.output_file_name ().c_str (), - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -345,8 +345,7 @@ main (int argc, "File Opened Successfully\n")); result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index 34c878c4584..f5d4bff2bb9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Event_Handler.h" @@ -173,11 +174,10 @@ Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { /// Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:d"); int c; while ((c= opts ()) != -1) @@ -245,7 +245,7 @@ Sender::init (int argc, /// Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -452,14 +452,15 @@ Sender::connection_manager (void) // } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -490,8 +491,7 @@ main (int argc, /// Initialize the Client. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 16d694eb261..012d651f7ea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -102,10 +102,9 @@ FTP_Client_Producer::get_callback (const char *, } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { - ACE_Get_Opt opts (argc,argv,"f:l:a:p:s"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:s"); this->use_sfp_ = 0; int c; @@ -246,7 +245,7 @@ Client::init (int argc,char **argv) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() )); - this->fp_ = ACE_OS::fopen (this->filename_,"r"); + this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r")); if (this->fp_ != 0) { @@ -343,14 +342,15 @@ Client::run (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -365,7 +365,7 @@ main (int argc, int result = 0; - result = CLIENT::instance ()->init (argc,argv); + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h index bb0cfdd19c0..cffb6fbd151 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h @@ -5,6 +5,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Flows_T.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp index 7a7a0686962..98f9d5798b0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "server.h" +#include "ace/Argv_Type_Converter.h" FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void) :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ()) @@ -101,7 +102,7 @@ Server::format (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -183,7 +184,7 @@ Server::run (void) int Server::parse_args (int argc,char **argv) { - ACE_Get_Opt opts (argc,argv,"f:p:"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:"); int c; while ((c = opts ()) != -1) @@ -191,7 +192,7 @@ Server::parse_args (int argc,char **argv) switch (c) { case 'f': - this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w"); + this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -220,16 +221,17 @@ Server::file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -250,7 +252,7 @@ main (int argc, ACE_ENDTRY; ACE_CHECK_RETURN (-1); - result = FTP_SERVER::instance ()->init (argc,argv); + result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"SERVER::init failed\n"),1); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index f88e8ee7c20..5f9483fb1e0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Flows_T.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 07ce3c8e804..dbb3112476b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -6,7 +6,9 @@ #include "tao/Strategies/advanced_resource.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/INET_Addr.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Latency, ping, @@ -23,7 +25,7 @@ int milliseconds = 30000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:g:s:r:t:p:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:g:s:r:t:p:d"); int c; while ((c = get_opts ()) != -1) @@ -77,14 +79,15 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); - parse_args (argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 886394ae9f9..0b4fbcddc1c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -5,6 +5,7 @@ #include "tao/ORB.h" #include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" @@ -28,7 +29,7 @@ ACE_Throughput_Stats recv_latency; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xo:s:r:t:"); int c; while ((c = get_opts ()) != -1) @@ -93,15 +94,16 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -144,7 +146,7 @@ int main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 42979b096e9..20abc49fe83 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -7,6 +7,7 @@ #include "tao/ORB.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" @@ -32,7 +33,7 @@ ACE_Throughput_Stats send_latency; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:b:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xo:s:r:t:b:d"); int c; while ((c = get_opts ()) != -1) @@ -109,16 +110,17 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -160,7 +162,7 @@ int main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index f9dc8ccefca..d0fd2ce12e1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File handle of the file into which received data is written. @@ -218,12 +219,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -244,16 +243,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -283,15 +283,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -304,8 +303,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 5788046dcb9..c1704ef8157 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -90,11 +91,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -177,7 +177,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -371,15 +371,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -410,8 +411,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index ee6b23f62df..07d956ef648 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -124,10 +124,9 @@ Endpoint_Reactive_Strategy::make_stream_endpoint (FTP_Client_StreamEndPoint *&en } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { - ACE_Get_Opt opts (argc,argv,"f:a:p:s"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:s"); this->use_sfp_ = 0; int c; @@ -240,7 +239,7 @@ Client::init (int argc,char **argv) "the TAO_Naming_Client. \n"), -1); - this->fp_ = ACE_OS::fopen (this->filename_,"r"); + this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -347,14 +346,15 @@ Client::run (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -368,7 +368,7 @@ main (int argc, ACE_TRY_CHECK; int result = 0; - result = CLIENT::instance ()->init (argc,argv); + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h index 9cd6cc7e47f..2fae237090a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h @@ -5,6 +5,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Strategies/advanced_resource.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index 343079ff7dd..0f235cfb35e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -64,7 +64,7 @@ Server::Server (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -165,7 +165,7 @@ Server::run (void) int Server::parse_args (int argc,char **argv) { - ACE_Get_Opt opts (argc,argv,"f:p:"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:"); int c; while ((c = opts ()) != -1) @@ -173,7 +173,7 @@ Server::parse_args (int argc,char **argv) switch (c) { case 'f': - this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w"); + this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -196,12 +196,13 @@ Server::file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); ACE_DECLARE_NEW_CORBA_ENV; @@ -227,7 +228,7 @@ main (int argc, ACE_ENDTRY; ACE_CHECK_RETURN (-1); - result = FTP_SERVER::instance ()->init (argc,argv); + result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::init failed\n"),1); result = FTP_SERVER::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h index a92714819df..8ba803f3b57 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Strategies/advanced_resource.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 11a0624b3f4..42b8f4db5be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -100,10 +100,9 @@ FTP_Client_Producer::get_callback (const char *, } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { - ACE_Get_Opt opts (argc,argv,"f:a:p:sd"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:sd"); this->use_sfp_ = 0; int c; @@ -272,7 +271,7 @@ Client::init (int argc,char **argv) "the TAO_Naming_Client. \n"), -1); - this->fp_ = ACE_OS::fopen (this->filename_,"r"); + this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -382,12 +381,12 @@ Client::run (void) } int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, + ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); ACE_DECLARE_NEW_CORBA_ENV; @@ -414,7 +413,7 @@ main (int argc, ACE_CHECK_RETURN (-1); int result = 0; - result = CLIENT::instance ()->init (argc,argv); + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h index acb8081d72d..53721f1e894 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h @@ -5,6 +5,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/PortableServer.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp index a83a5b623da..f554ad095ca 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp @@ -117,7 +117,7 @@ Server::format (void) int Server::init (int argc, - char **argv) + char **argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -211,7 +211,7 @@ Server::run (void) int Server::parse_args (int argc,char **argv) { - ACE_Get_Opt opts (argc,argv,"f:p:"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:"); int c; while ((c = opts ()) != -1) @@ -219,7 +219,7 @@ Server::parse_args (int argc,char **argv) switch (c) { case 'f': - this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w"); + this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w")); if (this->fp_ != 0) { ACE_DEBUG ((LM_DEBUG,"file opened successfully\n")); @@ -243,12 +243,12 @@ Server::file (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -274,7 +274,7 @@ main (int argc, ACE_CHECK_RETURN (-1); int result = 0; - result = FTP_SERVER::instance ()->init (argc,argv); + result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::init failed\n"),1); result = FTP_SERVER::instance ()->run (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index bdd2957c2ec..0f2efc52d0a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Endpoint_Strategy.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index ef33207328f..81365243708 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" int endstream = 0; @@ -57,7 +58,7 @@ Receiver_Callback::flowname (const char* flow_name) // Make sure we have a valid <output_file> this->output_file_ = ACE_OS::fopen (this->flowname_.c_str (), - "w"); + ACE_TEXT("w")); if (this->output_file_ == 0) ACE_ERROR ((LM_DEBUG, "Cannot open output file %s\n", @@ -139,11 +140,10 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) } int -Receiver::parse_args (int argc, - char **argv) +Receiver::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); int c; while ((c= opts ()) != -1) @@ -229,16 +229,17 @@ Receiver::protocol_object (void) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -268,8 +269,7 @@ main (int argc, ACE_TRY_CHECK; int result = - RECEIVER::instance ()->init (argc, - argv + RECEIVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 79169527b6d..e987cbab9be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -70,11 +71,10 @@ Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -157,7 +157,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -367,15 +367,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -406,8 +407,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index d3519e0114f..7aac2982793 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -3,6 +3,7 @@ #include "ftp.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_High_Res_Timer last_frame_sent_time; @@ -58,11 +59,10 @@ Client::set_protocol_object (TAO_AV_Protocol_Object *object) } int -Client::parse_args (int argc, - char **argv) +Client::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc,argv,"f:l:a:p:r:sd"); + ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:r:sd"); this->use_sfp_ = 0; @@ -183,7 +183,7 @@ Client::init (int argc, // Open file to read. this->fp_ = ACE_OS::fopen (this->filename_, - "r"); + ACE_TEXT("r")); if (this->fp_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", @@ -415,14 +415,15 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -454,8 +455,7 @@ main (int argc, // INitialize the Client. int result = 0; - result = CLIENT::instance ()->init (argc, - argv + result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index 4f405b5a9da..c6bcf24e526 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -22,6 +22,7 @@ #define TAO_AV_FTP_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Endpoint_Strategy.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp index db4658830c7..489181ade03 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp @@ -4,6 +4,7 @@ #include "server.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File into which the received data is written. @@ -115,11 +116,9 @@ Server::init (int, int parse_args (int argc, - char **argv) + char **argv) { - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -140,29 +139,29 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -198,8 +197,7 @@ main (int argc, Server server; result = - server.init (argc, - argv + server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index d24c92414ff..0cf85d02a7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_String.h" #include "ace/High_Res_Timer.h" @@ -139,12 +140,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -165,9 +164,11 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -175,8 +176,7 @@ main (int argc, // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -206,15 +206,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -227,8 +226,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 9af1f2ba80b..d67fc2ad4cc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -54,11 +55,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d"); int c; while ((c= opts ()) != -1) @@ -141,7 +141,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -343,9 +343,11 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -353,8 +355,7 @@ main (int argc, ACE_High_Res_Timer::global_scale_factor (); CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -384,8 +385,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index dd2c65abfdd..6b9590bd82d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -2,6 +2,7 @@ #include "distributer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/AV/Protocol_Factory.h" // An Unmanaged_Singleton is used to avoid static object destruction @@ -302,16 +303,17 @@ Distributer::done (int done) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -342,8 +344,7 @@ main (int argc, // Initialize the Distributer int result = - DISTRIBUTER::instance ()->init (argc, - argv + DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp index 7a64da3488c..3f9c8325208 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File handle of the file into which received data is written. @@ -140,12 +141,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -166,16 +165,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -205,15 +205,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -226,8 +225,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 9e766993cf7..69dd9016e78 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -85,11 +86,10 @@ Sender::streamctrl (AVStreams::StreamCtrl_ptr streamctrl) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d"); int c; while ((c= opts ()) != -1) @@ -141,7 +141,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -318,15 +318,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -356,8 +357,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index 31bdd2c32e2..4a5881deaaa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" static FILE *output_file = 0; @@ -88,7 +89,7 @@ Receiver_Callback::dump_samples (const char* file) ACE_DEBUG ((LM_DEBUG, "Dumping Stats.....\n")); - FILE* stats_file = ACE_OS::fopen (file, "w"); + FILE* stats_file = ACE_OS::fopen (file, ACE_TEXT("w")); if (stats_file == 0) { @@ -102,7 +103,7 @@ Receiver_Callback::dump_samples (const char* file) stats_.sample ((ACE_UINT64)stats [i]); } - stats_.dump_results ("Inter Frame Arrival Time Statistics ", + stats_.dump_results (ACE_TEXT("Inter Frame Arrival Time Statistics "), stats_file, 1); // ACE_High_Res_Timer::global_scale_factor ()); @@ -204,12 +205,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:s:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:"); int c; while ((c = opts ()) != -1) @@ -233,16 +232,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -272,15 +272,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -293,8 +292,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index c98b0bed8bb..593430ec374 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" // Create a singleton instance of the Sender. @@ -62,11 +63,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:dl:a:s:b:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:dl:a:s:b:"); int c; while ((c= opts ()) != -1) @@ -195,7 +195,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -434,15 +434,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -472,8 +473,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index 527be2f6f10..0c9727ea0e7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -2,6 +2,7 @@ #include "receiver.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" static FILE *output_file = 0; // File handle of the file into which received data is written. @@ -143,12 +144,10 @@ Receiver::init (int, int parse_args (int argc, - char **argv) + char **argv) { // Parse the command line arguments - ACE_Get_Opt opts (argc, - argv, - "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c = opts ()) != -1) @@ -169,16 +168,17 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -208,15 +208,14 @@ main (int argc, ACE_TRY_CHECK; int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result == -1) return -1; // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", @@ -229,8 +228,7 @@ main (int argc, Receiver receiver; result = - receiver.init (argc, - argv + receiver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 05bc380156d..8479b4394e6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -3,6 +3,7 @@ #include "sender.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" static u_long peak_bandwidth = 18400; @@ -88,11 +89,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::parse_args (int argc, - char **argv) +Sender::parse_args (int argc, char **argv) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:l:a:d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:l:a:d"); int c; while ((c= opts ()) != -1) @@ -246,7 +246,7 @@ Sender::init (int argc, // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), - "r"); + ACE_TEXT("r")); if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -505,15 +505,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); @@ -543,8 +544,7 @@ main (int argc, // Initialize the Sender. int result = 0; - result = SENDER::instance ()->init (argc, - argv + result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc index 1201bb99646..af7410ff1cf 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): namingexe, portableserver, bidir_giop, utils { + exename = TimeServer Source_Files { TimeServer.cpp } diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 23f3ff6baf8..01c18a645e5 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/PolicyList_Destroyer.h" #include "orbsvcs/CosNamingC.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/Argv_Type_Converter.h" class Time_impl : public POA_TimeModule::Time @@ -43,16 +44,17 @@ Time_impl::Shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize orb CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp index 52e3543d1ee..8420fd00355 100644 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp @@ -2,6 +2,7 @@ // $Id$ // #include "tao/corba.h" +#include "ace/Argv_Type_Converter.h" // Attempts to resolve the NameService. // Returns: @@ -9,11 +10,13 @@ // 1 if the NameService could not be resolved // 2 if something else went wrong // -int main( int argc, char *argv[] ) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ; + CORBA::ORB_var orb = CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER ) ; ACE_TRY_CHECK; ACE_TRY_EX (nested) diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index 6a3c7f89e53..a573a085978 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -3,12 +3,15 @@ #include "tao/IFR_Client/IFR_BasicC.h" #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" -int main(int argc, char** argv) +int ACE_TMAIN(int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp index 69909f4e3d5..00158e34bac 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "file://test.ior"; int shutdown_server = 0; @@ -9,7 +10,7 @@ int shutdown_server = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,16 +36,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index 65c1f4c8a2b..161cdd36fdb 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Test_i.h" #include "ace/OS_NS_stdio.h" @@ -9,7 +10,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -32,14 +33,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_i server_impl (orb.in ()); @@ -79,7 +82,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "SERVER (%P): Cannot open output file " diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index 8115122177e..fb387fc28c7 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -6,9 +6,12 @@ #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h" #include "tao/AnyTypeCode/NVList.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_NEW_ENV { @@ -16,7 +19,7 @@ int main (int argc, char* argv[]) // Initialise ORB. // - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER) ; + CORBA::ORB_var orb = CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER) ; ACE_TRY_CHECK; // Find the Interface Repository. diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp index 46148e21dee..2326f722c53 100755 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp @@ -2,6 +2,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" #include "tao/corba.h" #include "tao/PI/PI.h" @@ -11,7 +12,7 @@ CORBA::ORB_var orb = CORBA::ORB::_nil (); int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, ""); int c; while ((c = get_opts ()) != -1) @@ -73,16 +74,18 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::Boolean result = 0; ACE_TRY_NEW_ENV { orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // ep1 is equivalent to no other IORs - it is not an IOGR, and ep2 is a different endpoint. diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc index cfeafb2ed12..a447eee0a74 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc @@ -10,6 +10,7 @@ project(*idl): taoidldefaults { } project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba { + exename = server after += *idl Source_Files { test_i.cpp @@ -22,6 +23,7 @@ project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba } project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, minimum_corba { + exename = Manager after += *idl Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index 74d54ebda92..215f6b349be 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -3,6 +3,7 @@ #include "Client_i.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" @@ -31,7 +32,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:c:sm"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:c:sm"); int c; while ((c = get_opts ()) != -1) @@ -75,9 +76,11 @@ parse_args (int argc, char *argv[]) int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, + ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -85,13 +88,12 @@ main (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -138,8 +140,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -286,7 +287,7 @@ Manager::write_to_file (void) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -360,8 +361,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key) if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -419,8 +420,8 @@ int run_abort_test (Simple_Server_ptr server, if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -470,8 +471,8 @@ int run_shutdown_test (Simple_Server_ptr server, if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -573,8 +574,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp index d597ec0d27d..2ad430ca788 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" const char *ior_output_file = 0; const char *key = 0; @@ -9,7 +10,7 @@ const char *key = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:"); int c; while ((c = get_opts ()) != -1) @@ -37,17 +38,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -109,7 +112,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc index b3ba87fb27c..7f5ddb09532 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc @@ -3,6 +3,7 @@ project(*idl): taoidldefaults { idlflags += -Sc + avoids += uses_wchar IDL_Files { test.idl @@ -14,6 +15,7 @@ project(*idl): taoidldefaults { project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, minimum_corba { after += *idl + avoids += uses_wchar Source_Files { test_i.cpp @@ -32,6 +34,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, minimum_corba { after += *idl + avoids += uses_wchar Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 0d6a828940b..629830580d0 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -3,6 +3,7 @@ #include "Client_i.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "tao/IORManipulation/IORManip_Loader.h" #include "tao/PortableServer/PortableServer.h" @@ -27,7 +28,7 @@ CORBA::Object_var object_secondary = 0; int parse_args (int argc, char* argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:g:h:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:g:h:"); int c; while ((c = get_opts ()) != -1) @@ -69,9 +70,11 @@ parse_args (int argc, char* argv[]) int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { +// This test cannot be run on a wide character build +// ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -79,8 +82,7 @@ main (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -123,8 +125,7 @@ Manager::init (int& argc, char**& argv ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -320,7 +321,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const char* ior_output_file) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -389,8 +390,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -445,8 +446,8 @@ int run_abort_test (Simple_Server_ptr server, if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } @@ -487,8 +488,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index 60f306ac782..7505a81493f 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -4,6 +4,7 @@ #include "Server_Request_Interceptor.h" #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/FaultTolerance/FT_Service_Activate.h" #include "tao/ORBInitializer_Registry.h" @@ -15,7 +16,7 @@ const char *key = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:f:"); int c; while ((c = get_opts ()) != -1) @@ -47,9 +48,9 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -66,11 +67,11 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -132,7 +133,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 93760c93800..0e85c5d7de7 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -90,7 +90,7 @@ CC_Client::read_ior (char *filename) int CC_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dc:sf:k:xbhe:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dc:sf:k:xbhe:"); int c; int result; @@ -180,7 +180,7 @@ CC_Client::run (void) // Open the command file for parsing if the filename!=stdin if(ACE_OS::strcmp(this->script_file_, "stdin")!=0) { - f = ACE_OS::fopen(this->script_file_, "r"); + f = ACE_OS::fopen(this->script_file_, ACE_TEXT("r")); if(f==0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s\n", @@ -453,14 +453,16 @@ CC_Client::init (int argc, char **argv) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + CC_Client cc_client; ACE_DEBUG ((LM_DEBUG, "\n \t CosConcurrencyControl: client \n\n")); - if (cc_client.init (argc, argv) == -1) + if (cc_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_DEBUG ((LM_DEBUG, "Did not initialize correctly\n")); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h index a81df69daa0..44d9d0d1eca 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h @@ -19,6 +19,7 @@ // ============================================================================ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 5e8ce733528..d8485d8ba45 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CEC_Tests, Disconnect, @@ -16,8 +17,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -25,7 +28,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index 0c94a7bdb15..de7a4095f71 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -3,6 +3,7 @@ #include "MT_Disconnect.h" #include "Counting_Consumer.h" #include "Counting_Supplier.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" @@ -16,8 +17,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -25,7 +28,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index abaa9184f9b..c57760a147a 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -5,14 +5,17 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CEC_Tests_Basic, Pull_Push_Event, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -20,7 +23,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 3ff9f720233..627999a0e97 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -5,14 +5,17 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CEC_Tests_Basic, Push_Event, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -20,7 +23,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 0c5aea70a2f..5c6b2ffc431 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" @@ -12,10 +13,12 @@ ACE_RCSID (CEC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + RND_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -55,7 +58,7 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index 85ec4180e9f..642435bb061 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -4,6 +4,7 @@ #include "Counting_Supplier.h" #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID( CEC_Tests_Basic, Shutdown, @@ -14,8 +15,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -23,7 +26,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 7203f01d09c..b16a79ac00e 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -13,6 +13,7 @@ #include "tao/CDR.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -23,10 +24,12 @@ ACE_RCSID (EC_Custom_Marshal, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -90,7 +93,7 @@ Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -310,9 +313,9 @@ Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) } int -Driver::parse_args (int argc, char *argv []) +Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "dc:n:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:n:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index f8dd801aa63..f1f0225126d 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/ACE.h" @@ -81,7 +82,7 @@ ECMS_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -329,9 +330,9 @@ ECMS_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) } int -ECMS_Driver::parse_args (int argc, char *argv []) +ECMS_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "ds:n:t:h:p:b:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:n:t:h:p:b:"); int opt; while ((opt = get_opt ()) != EOF) @@ -522,8 +523,10 @@ Test_Supplier::consumer_proxy (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECMS_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 2ec6c650a2c..a67e826a5e6 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -4,6 +4,7 @@ #include "Consumer.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_MT_Mcast, Consumer, diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 5441a632e0e..c61ffba80fc 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -14,6 +14,7 @@ #include "tao/Strategies/advanced_resource.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (EC_MT_Mcast, @@ -68,8 +69,10 @@ run_orb_within_thread (void *) int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can // simply using the ACE_STATIC_SVC_DEFINE() macro, unfortunately TAO @@ -83,13 +86,13 @@ main (int argc, char* argv[]) // **************** HERE IS THE ORB SETUP // Create the ORB, pass the argv list for parsing. - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the // -ORB options from the command line. - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-m udp_mcast_addr]\n")); @@ -399,7 +402,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "m:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index 0060bd58ed5..102c098053f 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -4,6 +4,7 @@ #include "Supplier.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_MT_Mcast, Supplier, diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 1fcb246b5ea..496e9a257da 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -12,6 +12,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/Read_Buffer.h" @@ -121,7 +122,7 @@ ECM_Driver::run (int argc, char* argv[]) if (this->pid_filename_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_filename_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_filename_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -339,9 +340,9 @@ ECM_Driver::dump_results (void) // **************************************************************** int -ECM_Driver::parse_args (int argc, char *argv []) +ECM_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "l:p:c:n:t:f:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:p:c:n:t:f:"); int opt; while ((opt = get_opt ()) != EOF) @@ -414,7 +415,7 @@ ECM_Driver::parse_config_file (void) { FILE* cfg = 0; if (this->config_filename_ != 0) - cfg = ACE_OS::fopen (this->config_filename_, "r"); + cfg = ACE_OS::fopen (this->config_filename_, ACE_TEXT("r")); else cfg = stdin; @@ -1150,10 +1151,12 @@ ECM_Local_Federation::subscribed_bit (int i) const } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ECM_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 2d064471253..ff62ad6dd1b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -18,6 +18,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -220,7 +221,7 @@ Test_ECG::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -1096,9 +1097,9 @@ Test_ECG::local_source (RtecEventComm::EventSourceID id) const } int -Test_ECG::parse_args (int argc, char *argv []) +Test_ECG::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); int opt; while ((opt = get_opt ()) != EOF) @@ -1595,8 +1596,10 @@ Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Test_ECG *test; // Dynamically allocate the Test_ECG instance so that we don't have @@ -1605,7 +1608,7 @@ main (int argc, char *argv []) Test_ECG, -1); - const int status = test->run (argc, argv); + const int status = test->run (convert.get_argc(), convert.get_ASCII_argv()); delete test; return status; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index ade2d62e17a..9989afbbf97 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 609bf639245..50de18a26e4 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Consumer_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -95,7 +98,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -295,9 +298,9 @@ ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) } int -ECT_Consumer_Driver::parse_args (int argc, char *argv []) +ECT_Consumer_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "xdc:s:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 0d75c42b29b..e4a90ac8900 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index d2350ca9a04..65e8abf658c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Supplier_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -107,7 +110,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -301,9 +304,9 @@ ECT_Supplier_Driver::dump_results (void) } int -ECT_Supplier_Driver::parse_args (int argc, char *argv []) +ECT_Supplier_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "ds:u:n:t:b:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:u:n:t:b:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 8aeb5fbbc40..f0552072ff8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -15,6 +15,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" @@ -26,12 +27,14 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ECT_Throughput driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -136,7 +139,7 @@ ECT_Throughput::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -475,9 +478,9 @@ ECT_Throughput::dump_results (void) } int -ECT_Throughput::parse_args (int argc, char *argv []) +ECT_Throughput::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 6e4b0d31665..3ddb3d7c466 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -4,6 +4,7 @@ #include "Counting_Supplier.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Event_Utilities.h" @@ -18,8 +19,10 @@ const int event_type = 20; const int event_source = 10; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -27,7 +30,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 93e068b6d84..794eed8a11b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "tao/ORB_Core.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/INET_Addr.h" ACE_RCSID (EC_Tests_Basic, @@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_BCast driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -28,12 +31,12 @@ EC_BCast::EC_BCast (void) } int -EC_BCast::parse_args (int& argc, char* argv[]) +EC_BCast::parse_args (int& argc, char **argv) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -85,7 +88,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; // Obtain UDP address in the string format for Gateway initialization. - char address_server_arg [256]; + ACE_TCHAR address_server_arg [256]; ACE_INET_Addr udp_addr; if (udp_addr.set (this->bcast_port_, this->bcast_address_) == -1 || udp_addr.addr_to_string (address_server_arg, 256) == -1) @@ -103,7 +106,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL) TAO_ECG_Mcast_Gateway gateway; if (gateway.init (sub, - address_server_arg, + ACE_TEXT_TO_CHAR_IN(address_server_arg), lAttributes) == -1) return; diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 83ee58c7eb8..4c299497b98 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Bitmask, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -22,7 +25,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 5a021eb4e08..3cb84193bb9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -6,14 +6,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Complex, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -21,7 +24,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index d5e07b61bb9..ce99d63f092 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -9,6 +9,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Control, @@ -18,8 +19,10 @@ const int event_type = 20; const int event_source = 10; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -27,7 +30,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index f0a3aafbcae..8f7708cefec 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Disconnect, @@ -17,8 +18,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -26,7 +29,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc index d18e0dd4515..7e0cca0b454 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -2,90 +2,105 @@ // $Id$ project(*Reconnect): rteventtestexe { + exename = Reconnect Source_Files { Reconnect.cpp } } project(*Shutdown): rteventtestexe { + exename = Shutdown Source_Files { Shutdown.cpp } } project(*Observer): rteventtestexe { + exename = Observer Source_Files { Observer.cpp } } project(*BCast): rteventtestexe { + exename = BCast Source_Files { BCast.cpp } } project(*Timeout): rteventtestexe { + exename = Timeout Source_Files { Timeout.cpp } } project(*Wildcard): rteventtestexe { + exename = Wildcard Source_Files { Wildcard.cpp } } project(*Negation): rteventtestexe { + exename = Negation Source_Files { Negation.cpp } } project(*Disconnect): rteventtestexe { + exename = Disconnect Source_Files { Disconnect.cpp } } project(*MT_Disconnect): rteventtestexe { + exename = MT_Disconnect Source_Files { MT_Disconnect.cpp } } project(*Atomic_Reconnect): rteventtestexe { + exename = Atomic_Reconnect Source_Files { Atomic_Reconnect.cpp } } project(*Bitmask): rteventtestexe { + exename = Bitmask Source_Files { Bitmask.cpp } } project(*Complex): rteventtestexe { + exename = Complex Source_Files { Complex.cpp } } project(*Gateway): rteventtestexe { + exename = Gateway Source_Files { Gateway.cpp } } project(*Control): rteventtestexe { + exename = Control Source_Files { Control.cpp } } project(*Random) : rteventtestexe { + exename = Random Source_Files { Random.cpp } diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 39c750d1a4d..324bda69d55 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Gateway, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -22,7 +25,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 9f91b760a0a..79c8420c310 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, MT_Disconnect, @@ -18,8 +19,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_ARG_DECL); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -27,7 +30,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 37ab5c1fb30..8d4124d1ea7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Negation, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -22,7 +25,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index d58d828573f..ee0756b5de7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_RCSID (EC_Tests_Basic, @@ -13,11 +14,13 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); EC_Master master; - return master.run (argc, argv); + return master.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -192,9 +195,9 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[] } int -EC_Master::parse_args (int &argc, char *argv []) +EC_Master::parse_args (int &argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index bb788c01258..738c8f8d257 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -49,7 +49,7 @@ public: EC_Observer* channel (int i) const; private: - int parse_args (int &argc, char *argv []); + int parse_args (int &argc, char *argv[]); private: /// The seed diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index b9397f997ed..471ea0ab073 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" @@ -14,10 +15,12 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + RND_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -62,7 +65,7 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 1fd8c294029..a00e851f14e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -5,6 +5,7 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_RCSID (EC_Tests_Basic, @@ -12,10 +13,12 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Reconnect driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -33,7 +36,7 @@ EC_Reconnect::parse_args (int& argc, char* argv[]) if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Get_Opt get_opt (argc, argv, "scd:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "scd:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index b06b6e50355..0eca9c96a9d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -14,7 +14,7 @@ ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { EC_Schedule driver; return driver.run (argc, argv); @@ -28,7 +28,7 @@ EC_Schedule::EC_Schedule (void) } int -EC_Schedule::parse_args (int& argc, char* argv[]) +EC_Schedule::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index c139b699227..7fc14197459 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -47,7 +47,7 @@ public: // = The EC_Driver methods /// add some command line args to change the scheduling service to /// use. - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index ea2c18a1743..3ae199c24c0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -3,14 +3,17 @@ #include "Shutdown.h" #include "Consumer.h" #include "Supplier.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Shutdown driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index f00ec8abab4..6a2f80bde09 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Timeout, @@ -15,8 +16,10 @@ ACE_RCSID (EC_Tests, // **************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -24,7 +27,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index af77cc9fcbd..05ad26f5f44 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -6,14 +6,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Wildcard, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -21,7 +24,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index 667ac9e8efb..178d8417b90 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_stdio.h" @@ -26,9 +27,9 @@ Gateway_EC::check_for_nil (CORBA::Object_ptr obj, const char *message) } int -Gateway_EC::parse_args (int argc, char *argv []) +Gateway_EC::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "i:"); int opt; while ((opt = get_opt ()) != EOF) @@ -63,7 +64,7 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb, str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; - FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w"); + FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, ACE_TEXT("w")); if (output_file == 0) { ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 6d81936beb4..9fb285b1fbc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "ace/Argv_Type_Converter.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer @@ -137,16 +138,18 @@ parse_args (int /* argc */, char ** /* argv */) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "", ACE_TRY_ENV); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp index 7ab5ff9b030..6b02f5b9bea 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp @@ -1,12 +1,15 @@ // $Id$ #include "Gateway_EC.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index ab13f1a28ef..314be258b0f 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" void send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer @@ -54,17 +55,19 @@ parse_args (int /*argc*/, char ** /*argv*/) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize ORB and parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 7b95c67318f..81596b248fc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "ace/Argv_Type_Converter.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer @@ -105,16 +106,18 @@ parse_args (int /* argc */, char ** /* argv */) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp index 462f226b0aa..d89047ce037 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp @@ -1,13 +1,16 @@ // $Id$ #include "Gateway_EC.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index d7d0b4f1973..a22424715e1 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" void send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer @@ -44,16 +45,18 @@ parse_args (int /*argc*/, char ** /*argv*/) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB and parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index ce7c85cdd95..c7c7ddc57d3 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -14,6 +14,7 @@ #include "ace/Array_Base.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Reactor.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" @@ -571,7 +572,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message) int parse_args (int argc, char ** argv) { - ACE_Get_Opt get_opt (argc, argv, "d"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "d"); int opt; while ((opt = get_opt ()) != EOF) @@ -597,8 +598,10 @@ parse_args (int argc, char ** argv) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // We may want this to be alive beyond the next block. TAO_EC_Servant_Var<Heartbeat_Application> app; @@ -606,10 +609,10 @@ main (int argc, char *argv[]) { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp index c048843d90b..f6f1bf18f7d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp @@ -1,13 +1,16 @@ // $Id$ #include "Gateway_EC.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 874f96cc737..5cad1a265c6 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -5,6 +5,7 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/OS_NS_strings.h" @@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Performance, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Connect driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -38,7 +41,7 @@ EC_Connect::parse_args (int& argc, char* argv[]) if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index c3c4661d8c2..faccac7ef74 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -7,16 +7,19 @@ #include "orbsvcs/Event_Utilities.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests_Performance, Inversion, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Inversion driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -27,9 +30,9 @@ EC_Inversion::EC_Inversion (void) } int -EC_Inversion::parse_args (int &argc, char *argv []) +EC_Inversion::parse_args (int &argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 2d0cd3903aa..16e4ce2faa1 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Sample_History.h" #include "ace/Basic_Stats.h" #include "ace/Sched_Params.h" @@ -23,8 +24,10 @@ const char *ec_ior = "file://ec.ior"; static int parse_args (int argc, char *argv[]); int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -50,7 +53,7 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -104,7 +107,7 @@ main (int argc, char *argv []) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the event channel object reference @@ -224,7 +227,7 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf)); if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -272,7 +275,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 524d4301164..2ee08132c40 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Sample_History.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -20,8 +21,10 @@ const char *ior_file_name = "ec.ior"; static int parse_args (int argc, char *argv[]); int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); int priority = @@ -49,7 +52,7 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -103,7 +106,7 @@ main (int argc, char *argv []) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -122,7 +125,7 @@ main (int argc, char *argv []) if (ior_file_name != 0) { - FILE *output_file= ACE_OS::fopen (ior_file_name, "w"); + FILE *output_file= ACE_OS::fopen (ior_file_name, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -156,7 +159,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 513434e07f9..9a1336b4d3f 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -5,16 +5,19 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests_Performance, Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Throughput driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index d74d6f76b84..3bf1845cb11 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -13,6 +13,7 @@ #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/OS_NS_errno.h" @@ -106,7 +107,7 @@ EC_Driver::run_init (int &argc, char* argv[] if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -727,9 +728,9 @@ EC_Driver::dump_results (void) } int -EC_Driver::parse_args (int &argc, char *argv []) +EC_Driver::parse_args (int &argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp index 253e373e20b..fe0458110c5 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<StubFaultAnalyzer> server_run("FaultAnalyzer"); return server_run.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp index 131b6daa877..729b18bbb41 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<TAO::PG_FactoryRegistry> server_main("FactoryRegistry"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp index f5e732d47ab..571ae796aea 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<ReplicationManagerFaultConsumerAdapter> server_main("FaultConsumer"); return server_main.run(argc, argv); diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp index 2ae607f7f0f..784a3109c15 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp @@ -18,6 +18,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<StubFaultNotifier> server_main("FaultNotifier"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 2c77a1e7750..728d1e885ac 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -8,6 +8,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" class FTClientMain { @@ -171,7 +172,7 @@ FTClientMain::parse_args (int argc, char *argv[]) // note: dfnkx are simple_util options // include them here so we can detect bad args - ACE_Get_Opt get_opts (argc, argv, "c:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:f:"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -181,7 +182,7 @@ FTClientMain::parse_args (int argc, char *argv[]) case 'c': { this->inFileName_ = get_opts.opt_arg (); - this->inFile_ = ACE_OS::fopen (this->inFileName_, "r"); + this->inFile_ = ACE_OS::fopen (this->inFileName_, ACE_TEXT("r")); if(this->inFile_ && !ferror (this->inFile_)) { ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n", this->inFileName_); @@ -530,7 +531,7 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL) else { ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", this->replica_pos_); } return result; @@ -624,10 +625,12 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + FTClientMain app; - int result = app.parse_args(argc, argv); + int result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { ACE_TRY_NEW_ENV diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 996c2a27fb7..a7d01ca3c28 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -19,6 +19,7 @@ #include <ace/Get_Opt.h> #include <ace/OS_NS_stdio.h> +#include "ace/Argv_Type_Converter.h" FTAPP::FT_Creator::FT_Creator () : creator_ () @@ -43,7 +44,7 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[]) { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "r:ignf:u:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "r:ignf:u:p:"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -255,15 +256,17 @@ int FTAPP::FT_Creator::fini () } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); ACE_TRY_CHECK; FTAPP::FT_Creator app; - result = app.parse_args(argc, argv); + result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { result = app.init (orb.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp index 1fcc2339969..0eb71bf1f77 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp @@ -17,6 +17,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::Utils::Server_Main<FT_ReplicaFactory_i> server_main("TestReplicaFactory"); return server_main.run(argc, argv); } diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index ba8b3d7e58d..0fef5007a56 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -13,6 +13,7 @@ #include "FT_ReplicaFactory_i.h" #include "FT_TestReplica_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/PortableGroupC.h" @@ -141,7 +142,7 @@ void FT_ReplicaFactory_i::shutdown_i() int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, "w"); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); @@ -162,7 +163,7 @@ int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) int FT_ReplicaFactory_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:f:i:l:t:qu"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:f:i:l:t:qu"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 16f1f70eee4..f338e079ecc 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -6,6 +6,7 @@ #include "ace/streams.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" // A simple class for building a client that "controls' the // Replication Manager (right now it just shuts it down). @@ -89,9 +90,8 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[]) if (CORBA::is_nil (this->replication_manager_.in())) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ( - "TAO_FT_ReplicationManagerController::init: " - "Could not get Replication Manager's IOR.\n") + ACE_TEXT ("TAO_FT_ReplicationManagerController::init: ") + ACE_TEXT ("Could not get Replication Manager's IOR.\n") )); result = -1; } @@ -116,7 +116,7 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[]) { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while (result == 0 && (c = get_opts ()) != -1) @@ -186,11 +186,13 @@ int TAO_FT_ReplicationManagerController::run () return result; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; TAO_FT_ReplicationManagerController rmctrl; - result = rmctrl.init (argc, argv); + result = rmctrl.init (convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { result = rmctrl.run (); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index ad89659b3bc..3cd2451a91e 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -451,7 +451,7 @@ void FT_TestReplica_i::request_quit() void FT_TestReplica_i::store(long counter) { - FILE * f = ACE_OS::fopen("Persistent.dat", "w"); + FILE * f = ACE_OS::fopen("Persistent.dat", ACE_TEXT("w")); if(f != 0) { unsigned char* buffer = 0; @@ -472,7 +472,7 @@ void FT_TestReplica_i::store(long counter) long FT_TestReplica_i::load () { long counter = 0; - FILE * f = ACE_OS::fopen("Persistent.dat","r"); + FILE * f = ACE_OS::fopen("Persistent.dat",ACE_TEXT("r")); if(f != 0) { unsigned char buffer[sizeof(long)]; diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 12357cb9297..632de09d56b 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -4,6 +4,7 @@ #include "ReplicationManagerFaultConsumerAdapter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" // FUZZ: disable check_for_streams_include @@ -38,7 +39,7 @@ size_t ReplicationManagerFaultConsumerAdapter::notifications () const int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -335,7 +336,7 @@ int ReplicationManagerFaultConsumerAdapter::init ( // Signal that we are ready to go. if (result == 0 && this->readyFile_ != 0) { - FILE* ready = ACE_OS::fopen (this->readyFile_, "w"); + FILE* ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w")); if (ready) { ACE_OS::fprintf (ready, "ready\n"); diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 6d0e445511f..66c9fd5ab58 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -4,6 +4,7 @@ #include "StubBatchConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index 56731cf5f59..2f1ddc40202 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -4,6 +4,7 @@ #include "StubFaultAnalyzer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -25,7 +26,7 @@ StubFaultAnalyzer::~StubFaultAnalyzer () int StubFaultAnalyzer::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -228,7 +229,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) if (result == 0 && this->readyFile_ != 0) { - FILE *ready = ACE_OS::fopen (this->readyFile_, "w"); + FILE *ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w")); if ( ready ) { ACE_OS::fprintf (ready, "ready\n"); diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 25a2934df15..33731acec0e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -4,6 +4,7 @@ #include "StubFaultConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () @@ -40,7 +41,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[]) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); #else // NO_ARGS_FOR_NOW - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, ""); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 24c320efb8e..4fd2e6b5f0c 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -4,6 +4,7 @@ #include "StubFaultNotifier.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include @@ -35,7 +36,7 @@ PortableServer::ObjectId StubFaultNotifier::objectId()const int StubFaultNotifier::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:"); int c; while ((c = get_opts ()) != -1) { @@ -324,7 +325,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) int StubFaultNotifier::write_ior_file() { int result = -1; - FILE* out = ACE_OS::fopen (this->ior_output_file_, "w"); + FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", this->ior_.in ()); diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 8bb35b960a1..8cbd09b8a6c 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -453,7 +453,7 @@ int TAO::Object_Group_Creator::fini () int TAO::Object_Group_Creator::write_ior_file (const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, "w"); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 58fd3cc610b..6057d7b5a50 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "orbsvcs/FaultTolerance/FT_Service_Activate.h" @@ -14,7 +15,7 @@ const char *ior = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,20 +36,21 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Start out with the first IOR. Interaction with the second diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index ee1bd7e9d0e..574eaa0b00a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" @@ -23,7 +24,7 @@ const char *ior_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -121,8 +122,10 @@ add_ft_prop (CORBA::ORB_ptr o, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -138,7 +141,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -158,7 +161,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::PolicyList policies; // Empty policy list. @@ -236,7 +239,7 @@ main (int argc, char *argv[]) // Write each IOR to a file. // IOR 1 - FILE *output_file= ACE_OS::fopen (ior_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file <%s> for writing " @@ -272,7 +275,7 @@ main (int argc, char *argv[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { return 0; } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc index bdc5ba72437..f2b005ba49f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc @@ -9,6 +9,7 @@ project(*idl): taoidldefaults { } project(*server): portableserver, orbsvcsexe, iormanip, ftorb, messaging { + exename = server after += *idl Source_Files { test_i.cpp @@ -21,6 +22,7 @@ project(*server): portableserver, orbsvcsexe, iormanip, ftorb, messaging { } project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb { + exename = Manager after += *idl Source_Files { testC.cpp diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 543da3eff4f..3d43e3df4e3 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -3,6 +3,7 @@ #include "Client_i.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "tao/IORManipulation/IORManip_Loader.h" #include "tao/PortableServer/PortableServer.h" @@ -27,7 +28,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:"); int c; while ((c = get_opts ()) != -1) @@ -59,9 +60,11 @@ parse_args (int argc, char *argv[]) int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, + ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -69,13 +72,12 @@ main (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -119,8 +121,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -260,7 +261,7 @@ Manager::write_to_file (void) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -311,8 +312,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index ade1a560f4d..e0e15132f9f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -2,13 +2,14 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -32,19 +33,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -79,7 +80,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 72014970c1d..63bd82cd46a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -20,14 +20,16 @@ #include "tao/ORB.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(IOGRManipluation, IOGRTest, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n")); @@ -36,8 +38,7 @@ main (int argc, char *argv[]) ACE_TRY { // Retrieve the ORB. - CORBA::ORB_var orb_ = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp index 45874808c2f..3b86e717032 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "PushConsumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" @@ -23,10 +24,10 @@ CORBA::ORB_var orb; auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; RtecEventChannelAdmin::EventChannel_ptr -get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) +get_event_channel(int argc, char** argv ACE_ENV_ARG_DECL) { FtRtecEventChannelAdmin::EventChannel_var channel; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:n")); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "hi:n"); int opt; int use_gateway = 1; @@ -86,15 +87,17 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) return channel._retn(); } -int main(int argc, ACE_TCHAR** argv) +int ACE_TMAIN(int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init(argc, argv, "" + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel - = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER); + = get_event_channel(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index 9033f5b02c2..229e2350a3f 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/FtRtecEventChannelAdminC.h" #include "PushSupplier.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" @@ -22,10 +23,10 @@ CORBA::ORB_var orb; auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway; RtecEventChannelAdmin::EventChannel_ptr -get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) +get_event_channel(int argc, char** argv ACE_ENV_ARG_DECL) { FtRtecEventChannelAdmin::EventChannel_var channel; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:nt:?")); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "hi:nt:?"); int opt; int use_gateway = 1; @@ -92,17 +93,19 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) } -int main(int argc, ACE_TCHAR** argv) +int ACE_TMAIN(int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - orb = CORBA::ORB_init(argc, argv, "" + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel - = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER); + = get_event_channel(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp index 8ab1d029463..ad74dd300fc 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp @@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index efc9e973701..c4a9c06f609 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -20,6 +20,7 @@ #include "tests/test_config.h" #include "ace/OS_NS_sys_socket.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" #include "ami_testC.h" #include "ami_testS.h" @@ -35,7 +36,7 @@ int number_of_replies = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:n:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:n:i:"); int c; while ((c = get_opts ()) != -1) @@ -175,17 +176,19 @@ public: Handler handler; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_client")); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_OS::socket_init (); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index ee6a7282b5f..2e841274430 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -23,6 +23,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_sys_socket.h" ACE_RCSID(AMI, server, "$Id$") @@ -32,7 +33,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -58,14 +59,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server")); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -85,7 +88,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_OS::socket_init (); @@ -105,7 +108,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 442d7a9356f..e44e2b4a128 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" #include "ami_testC.h" @@ -36,7 +37,7 @@ int debug = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:i:x"); int c; while ((c = get_opts ()) != -1) @@ -155,8 +156,10 @@ public: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_simple_client")); ACE_DECLARE_NEW_CORBA_ENV; @@ -164,7 +167,7 @@ main (int argc, char *argv[]) ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object_var = @@ -182,7 +185,7 @@ main (int argc, char *argv[]) poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // We reuse the object_var smart pointer! diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index 8ab1d029463..ad74dd300fc 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index a9a6dac7d63..48603e5a34f 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -16,7 +17,7 @@ void do_nothing (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -40,15 +41,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb = CORBA::ORB::_nil(); PortableServer::POA_var root_poa = PortableServer::POA::_nil(); Callback_i *servant = 0; ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -102,7 +105,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index acd21da590e..6f03849ab56 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -2,6 +2,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -14,7 +15,7 @@ int no_iterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -100,7 +103,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i *server_impl = new Simple_Server_i (orb.in (), @@ -131,7 +134,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index 8ab1d029463..ad74dd300fc 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index e8d3ff65f68..95ed75b3959 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -4,6 +4,7 @@ #include "tests/test_config.h" #include <ace/Get_Opt.h> +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -37,18 +38,20 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("Hello_client")); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index e3ba7544ee9..aba9078d949 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -5,6 +5,7 @@ #include "tests/test_config.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/IORTable/IORTable.h" #include "orbsvcs/CosNamingC.h" @@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -41,8 +42,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_START_TEST (ACE_TEXT ("Hello_server")); ACE_TRY_NEW_ENV @@ -50,7 +53,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n")); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //------ Get Root POA & POA Manager references @@ -91,7 +94,7 @@ main (int argc, char *argv[]) //-------- Prepare Servant - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -124,7 +127,7 @@ main (int argc, char *argv[]) ior_table->bind("HelloObj", ior.in() ACE_ENV_ARG_PARAMETER); // Output the IOR to the <ior_output_file> - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index c87f7c6ecb4..960ceea80d7 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -43,7 +43,7 @@ #undef ACE_NDEBUG #undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT +#define ACE_TEXT ACE_TEXT #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. @@ -251,7 +251,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc index 01fcb2cd41a..1cab9bda0ea 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc +++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc @@ -2,6 +2,7 @@ // $Id$ project(*idl): taoidldefaults { + avoids += uses_wchar IDL_Files { MCast.idl } @@ -10,6 +11,7 @@ project(*idl): taoidldefaults { project(*server): namingexe, iortable, svc_utils { exename = server + avoids += uses_wchar after += *idl Source_Files { @@ -25,6 +27,7 @@ project(*server): namingexe, iortable, svc_utils { project(*client): namingexe, iortable, svc_utils { exename = client + avoids += uses_wchar after += *idl Source_Files { diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp index 7a79bec47bc..209879f40fd 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp @@ -1,9 +1,11 @@ // $Id$ #include "ior_mcast_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; @@ -13,7 +15,7 @@ int main (int argc, char *argv []) ior_mcast_Client_i client; int init_result; - init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + init_result = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp index 26a0d6c3e12..80087193f30 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp @@ -2,6 +2,7 @@ #include "ior_mcast_client_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" ior_mcast_Client_i::ior_mcast_Client_i (void) @@ -23,8 +24,7 @@ ior_mcast_Client_i::init (int& argc, { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp index be8c6ab97c8..09bfed08ece 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp @@ -1,9 +1,13 @@ // $Id$ #include "server_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { +// This test cannot be run on a wide character build +// ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index e9a12f65dc5..d877a11543c 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" Server_i::Server_i (void) @@ -159,9 +160,9 @@ Server_i::enable_multicast (const char *ior) } int -Server_i::parse_args (int argc, char *argv []) +Server_i::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index 848b239d9ee..70338445b0f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -10,6 +10,7 @@ project(airplane_idl) : taoidldefaults { project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + exename = airplane_server after += airplane_idl IDL_Files { @@ -25,6 +26,7 @@ project(airplane server) : portableserver, orbsvcsexe, minimum_corba, iortable, } project(airplane client) : portableserver, orbsvcsexe, minimum_corba, iortable { + exename = airplane_client after += airplane_idl IDL_Files { @@ -47,6 +49,7 @@ project(nestea_idl): taoidldefaults { } project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + exename = nestea_server avoids += ace_for_tao after += nestea_idl @@ -69,6 +72,7 @@ project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, im } project(nestea client) : portableserver, orbsvcsexe, minimum_corba, iortable { + exename = nestea_client after += nestea_idl IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc index fe939b060c5..04d79b8e063 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc @@ -2,5 +2,5 @@ // $Id$ project: namingexe, minimum_corba { + exename = test } - diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp index b885f1b28ed..1004fb6663b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp @@ -3,14 +3,17 @@ // #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var ns_obj = diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp index 1bee519f70d..61d2f742ff4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp @@ -3,6 +3,7 @@ #include "airplane_client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ImplRepo, airplane_client, @@ -11,13 +12,15 @@ ACE_RCSID (ImplRepo, // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Airplane_Client_i client; ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Client\n\n")); - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; else return client.run (); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index 079c8e9b4e1..9acada3cf81 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -3,6 +3,7 @@ #include "airplane_client_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/ACE.h" @@ -22,7 +23,7 @@ Airplane_Client_i::Airplane_Client_i (void) int Airplane_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp index 45f4bd9bca3..8baba3b2ff9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp @@ -1,14 +1,17 @@ // $Id$ #include "airplane_server_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ImplRepo, airplane_server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Airplane_Server_i server; ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n")); @@ -16,7 +19,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index 92ffd886c0f..751ff4dd604 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/Root_POA.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_time.h" @@ -29,7 +30,7 @@ Airplane_Server_i::Airplane_Server_i (void) int Airplane_Server_i::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +40,7 @@ Airplane_Server_i::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp index 60d05c63a82..0c68b4ad481 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp @@ -3,6 +3,7 @@ #include "nestea_client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ImplRepo, nestea_client, @@ -11,13 +12,15 @@ ACE_RCSID (ImplRepo, // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Nestea_Client_i client; ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Client\n\n")); - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; else return client.run (); diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index a92bf39e6c8..c1793f75d8f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -3,6 +3,7 @@ #include "nestea_client_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/ACE.h" @@ -22,7 +23,7 @@ Nestea_Client_i::Nestea_Client_i (void) int Nestea_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dsn:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dsn:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 4706cf0304d..ebc5e2bdeb9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -118,7 +118,7 @@ Nestea_i::save_data (void) ACE_FILE_Connector connector; if (connector.connect (file, - ACE_FILE_Addr (this->data_filename_), + ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)), 0, ACE_Addr::sap_any) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -144,7 +144,7 @@ Nestea_i::load_data (void) ACE_FILE_Connector connector; if (connector.connect (file, - ACE_FILE_Addr (this->data_filename_), + ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)), 0, ACE_Addr::sap_any) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index 51a8ec71ebe..3d6803e847e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -1,12 +1,15 @@ // $Id$ #include "nestea_server_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(ImplRepo, nestea_server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Nestea_Server_i server; ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n")); @@ -14,7 +17,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index f3278167081..75e00da0cdb 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/Root_POA.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" @@ -36,7 +37,7 @@ Nestea_Server_i::~Nestea_Server_i (void) int Nestea_Server_i::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:"); int c; while ((c = get_opts ()) != -1) @@ -46,7 +47,7 @@ Nestea_Server_i::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp index f5e1e660533..793cec1dfe7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp @@ -4,15 +4,18 @@ #include "testC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" using namespace CORBA; -int main(int argc, char* argv[]) { +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) +{ + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { - ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc index 5e8640bf068..a4c891ef470 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc @@ -8,6 +8,7 @@ project(*idl): taoidldefaults { } project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { + exename = server after += *idl IDL_Files { @@ -22,6 +23,7 @@ project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_clie } project(*client) : portableserver, orbsvcsexe, minimum_corba, iortable { + exename = client after += *idl IDL_Files { diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp index 769d8126ae4..a89c194887d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp @@ -1,16 +1,19 @@ // $Id$ #include "server_i.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Server_i server; - int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index 21edebb203f..a3f9ec7ef1b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -7,6 +7,7 @@ #include "tao/ImR_Client/ImR_Client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/streams.h" @@ -56,7 +57,7 @@ Server_i::~Server_i() int Server_i::parse_args (int argc, char* argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:c:h"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:c:h"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc index 3396f7a98fe..30860084757 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc @@ -2,6 +2,7 @@ // $Id$ project(*server): taoexe, portableserver, ifr_client, minimum_corba { + exename = server Source_Files { test_i.cpp @@ -10,6 +11,7 @@ project(*server): taoexe, portableserver, ifr_client, minimum_corba { } project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba { + exename = client IDL_Files { } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index 3e16668c65b..b759cedf515 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -2,21 +2,23 @@ // $Id$ #include "ifr_dii_client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + IFR_DII_Client client; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - if (client.init (argc, - argv + if (client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index f6dd2238e12..7952549b52f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -3,6 +3,7 @@ #include "ifr_dii_client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, ifr_dii_client, @@ -26,8 +27,7 @@ IFR_DII_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -98,10 +98,9 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL) } int -IFR_DII_Client::parse_args (int argc, - char *argv[]) +IFR_DII_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dn"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "dn"); int c; while ((c = opts ()) != -1) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 7cfe8d9c287..ec921b9cd71 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Application_Test, server, "$Id$") @@ -11,7 +12,7 @@ static const char *ior_output_file = "iorfile"; static int write_ior_to_file (const char *ior) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) { @@ -39,12 +40,13 @@ write_ior_to_file (const char *ior) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp index 410ad1fd4f3..1b1d241038c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp @@ -2,20 +2,22 @@ // $Id$ #include "idl3_client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Test, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + IDL3_Client client; ACE_TRY_NEW_ENV { - if (client.init (argc, - argv + if (client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index 93fa6ae910a..b0652fe8484 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -3,6 +3,7 @@ #include "idl3_client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_string.h" ACE_RCSID (Application_Test, @@ -260,8 +261,7 @@ IDL3_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -341,10 +341,9 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL) } int -IDL3_Client::parse_args (int argc, - char *argv[]) +IDL3_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "d"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "d"); int c; while ((c = opts ()) != -1) @@ -1890,4 +1889,3 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd return 0; } - diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index ef26b0b054d..a1afbad818e 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -7,6 +7,7 @@ #include "tao/CDR.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/SString.h" ACE_RCSID (IFR_Test, @@ -60,14 +61,12 @@ Admin_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) return retval; @@ -152,10 +151,9 @@ Admin_Client::run (void) } int -Admin_Client::parse_args (int argc, - char *argv[]) +Admin_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "di:t:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "di:t:"); int c; int result = 0; CORBA::ULong i = 0; @@ -470,7 +468,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_enum") == 0); if (this->debug_) { @@ -479,7 +477,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->id.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_enum:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->id.in(), "IDL:my_enum:1.0") == 0); if (this->debug_) { @@ -488,7 +486,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->defined_in.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->defined_in, "") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->defined_in.in(), "") == 0); if (this->debug_) { @@ -497,7 +495,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) td->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.0") == 0); CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -566,7 +564,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) str.in ())); } - ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i]) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), static_cast<const char*>(members[i])) == 0); } @@ -606,7 +604,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) tmp)); } - ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0); + ACE_ASSERT (ACE_OS::strcmp (static_cast<const char*>(fellows[i]), static_cast<const char*>(members[i])) == 0); } evar->name ("another_enum" @@ -846,7 +844,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_alias") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_alias") == 0); if (this->debug_) { @@ -855,7 +853,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL) td->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.1") == 0); kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -1085,7 +1083,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) str.in ())); } - ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name.in()) == 0); } CORBA::Contained::Description_var desc = @@ -1102,7 +1100,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_struct") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_struct") == 0); if (this->debug_) { @@ -1111,7 +1109,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) td->id.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_struct:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->id.in(), "IDL:my_struct:1.0") == 0); if (this->debug_) { @@ -1120,7 +1118,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) td->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.0") == 0); members.length (2); members[0].name = CORBA::string_dup ("long_mem"); @@ -1180,13 +1178,13 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) if (i == length - 1) { cmp_result = - ACE_OS::strcmp (out_members[i].name, "my_enum"); + ACE_OS::strcmp (out_members[i].name.in(), "my_enum"); ACE_ASSERT (cmp_result == 0); } else { cmp_result = - ACE_OS::strcmp (out_members[i].name, members[i].name); + ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in()); ACE_ASSERT (cmp_result == 0); } } @@ -1624,7 +1622,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL) } // Multiple labels for first member shifts index by 1. - ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name.in()) == 0); CORBA::Any_var label = tc->member_label (i ACE_ENV_ARG_PARAMETER); @@ -1765,7 +1763,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) str.in ())); } - ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name.in()) == 0); } CORBA::Contained::Description_var desc = @@ -1782,7 +1780,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->name.in(), "my_exception") == 0); if (this->debug_) { @@ -1791,7 +1789,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->id.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->id, "IDL:my_exception:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->id.in(), "IDL:my_exception:1.0") == 0); if (this->debug_) { @@ -1800,7 +1798,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->defined_in.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->defined_in, "") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->defined_in.in(), "") == 0); if (this->debug_) { @@ -1809,7 +1807,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->version.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->version, "1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->version.in(), "1.0") == 0); members.length (2); members[0].name = CORBA::string_dup ("long_mem"); @@ -1872,13 +1870,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) if (i == 2) { cmp_result = - ACE_OS::strcmp (out_members[i].name, "my_enum"); + ACE_OS::strcmp (out_members[i].name.in(), "my_enum"); ACE_ASSERT (cmp_result == 0); } else { cmp_result = - ACE_OS::strcmp (out_members[i].name, members[i].name); + ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in()); ACE_ASSERT (cmp_result == 0); } } @@ -1909,13 +1907,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) if (i == 1) { cmp_result = - ACE_OS::strcmp (out_members[i].name, "my_enum"); + ACE_OS::strcmp (out_members[i].name.in(), "my_enum"); ACE_ASSERT (cmp_result == 0); } else { cmp_result = - ACE_OS::strcmp (out_members[i].name, members[i].name); + ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in()); ACE_ASSERT (cmp_result == 0); } } @@ -2092,7 +2090,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) ed->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0); + ACE_ASSERT (ACE_OS::strcmp (ed->name.in(), "my_exception") == 0); } else { @@ -2122,7 +2120,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) td->name.in ())); } - ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0); + ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_enum") == 0); } } @@ -2524,7 +2522,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL) od->defined_in.in ())); } - ACE_ASSERT (ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0") == 0); + ACE_ASSERT (ACE_OS::strcmp (od->defined_in.in(), "IDL:p_iface:1.0") == 0); CORBA::TypeCode_var result = od->result; CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2986,7 +2984,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL) tmp)); } - ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name.in()) == 0); } CORBA::ContainedSeq_var out_contents = @@ -3050,7 +3048,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL) } else { - ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0); + ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name.in()) == 0); } } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp index aa3af160455..af5265406ed 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp @@ -2,17 +2,19 @@ // $Id$ #include "Admin_Client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (IFR_Test, client, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Admin_Client admin_client; - int retval = admin_client.init (argc, - argv); + int retval = admin_client.init (convert.get_argc(), convert.get_ASCII_argv()); if (retval == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index c29daa4ff2a..33d5a850b02 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -3,6 +3,7 @@ #include "Latency_Query_Client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/Sample_History.h" @@ -30,14 +31,12 @@ Latency_Query_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) { @@ -137,7 +136,7 @@ Latency_Query_Client::run (void) if (this->do_dump_history_) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -162,10 +161,9 @@ Latency_Query_Client::run (void) } int -Latency_Query_Client::parse_args (int argc, - char *argv[]) +Latency_Query_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dhi:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "dhi:"); int c; int result = 0; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc index f2cf973217a..243b151c51f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc @@ -1,4 +1,5 @@ // $Id$ project: ifr_client { + exename = client avoids += ace_for_tao } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index 43c9155ebb1..6364ca7811f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -2,18 +2,20 @@ // $Id$ #include "Latency_Query_Client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Latency__Test, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Latency_Query_Client client; - int retval = client.init (argc, - argv); + int retval = client.init (convert.get_argc(), convert.get_ASCII_argv()); if (retval == -1) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index 10146a9a882..378064b3ac2 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -3,6 +3,7 @@ #include "Ptest.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_string.h" ACE_RCSID(Persistence_Test, Ptest, "$Id$") @@ -18,19 +19,16 @@ Ptest::~Ptest (void) } int -Ptest::init (int argc, - char *argv[]) +Ptest::init (int argc, char *argv[]) { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) return retval; @@ -102,10 +100,9 @@ Ptest::run (void) } int -Ptest::parse_args (int argc, - char *argv[]) +Ptest::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dq"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "dq"); int c; while ((c = opts ()) != -1) @@ -252,11 +249,11 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL) if (i == length - 1) { - ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, "my_enum") == 0); + ACE_ASSERT (ACE_OS::strcmp (out_members[i].name.in(), "my_enum") == 0); } else { - ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, members[i]) == 0); + ACE_ASSERT (ACE_OS::strcmp (out_members[i].name.in(), members[i]) == 0); } } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp index 2155c1c4c36..bbb60bf359c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp @@ -2,17 +2,19 @@ // $Id$ #include "Ptest.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Persistence_Test, test, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Ptest ptest; - int retval = ptest.init (argc, - argv); + int retval = ptest.init (convert.get_argc(), convert.get_ASCII_argv()); if (retval == -1) return 1; diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index a7b13988c33..e841f9d87dc 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -19,9 +19,12 @@ // ============================================================================ #include "ncontextext_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_DECLARE_NEW_CORBA_ENV; @@ -30,7 +33,7 @@ int main (int argc, char *argv []) NContextExt_Client_i client; - if (client.init (argc, argv) != 0) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index 2f6f2d7ad72..aa0a40033b6 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -22,6 +22,7 @@ #include "ncontextext_client_i.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" // FUZZ: disable check_for_streams_include @@ -43,7 +44,7 @@ int NContextExt_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dvs"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dvs"); int c; this->view_ = 1; @@ -322,10 +323,11 @@ NContextExt_Client_i::print_values (CosNaming::Name name, CORBA::String_var url_string) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT ("The first component id is %s," - "The first component kind is %s," - "The second component id is %s," - "The second component kind is %s\n\n"), + ACE_DEBUG((LM_DEBUG, + ACE_TEXT ("The first component id is %s,") + ACE_TEXT ("The first component kind is %s,") + ACE_TEXT ("The second component id is %s,") + ACE_TEXT ("The second component kind is %s\n\n"), name[0].id.in (), name[0].kind.in (), name[1].id.in (), @@ -334,19 +336,21 @@ NContextExt_Client_i::print_values (CosNaming::Name name, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The string form of the input name is: \n%s\n\n"), str_name.in ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The unstringified version of the name components are:," - "The first component id is %s," - "The first component kind is %s," - "The second component id is %s," - "The second component kind is %s\n\n"), + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("The unstringified version of the name components are:,") + ACE_TEXT ("The first component id is %s,") + ACE_TEXT ("The first component kind is %s,") + ACE_TEXT ("The second component id is %s,") + ACE_TEXT ("The second component kind is %s\n\n"), nm[0].id.in (), nm[0].kind.in (), nm[1].id.in (), nm[1].kind.in ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("When the address of the NamingContext is:" - "myhost.555xyz.com:9999" - "and the Object name is \n%s\n"), + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("When the address of the NamingContext is:") + ACE_TEXT ("myhost.555xyz.com:9999") + ACE_TEXT ("and the Object name is \n%s\n"), obj_name.in ())); ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %s\n"), diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc index 91756218ae9..9ecb81cca72 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc @@ -9,6 +9,7 @@ project(*idl): taoidldefaults { } project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { + exename = server after += *idl Source_Files { server.cpp @@ -22,6 +23,7 @@ project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { } project(*client): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils { + exename = client after += *idl Source_Files { client.cpp diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index f112c8a0af6..dda25bc2f2d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -62,7 +62,7 @@ int LB_server::write_ior_to_file (const char *ior) { FILE *output_file = - ACE_OS::fopen ("obj.ior", "w"); + ACE_OS::fopen ("obj.ior", ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp index 3a588d90066..88c05a0f529 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp @@ -1,5 +1,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Controlled, client, @@ -10,7 +11,7 @@ const char *ior = "file://obj.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index 68236f62685..aa6052041ae 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -1,13 +1,16 @@ #include "LB_server.h" #include "Basic.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Application_Controlled, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *location1 = "MyLocation 1"; @@ -17,7 +20,7 @@ main (int argc, char *argv[]) const char *location5 = "MyLocation 5"; const char *location6 = "MyLocation 6"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc index af901a174ec..30f885252d5 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc @@ -7,6 +7,7 @@ project(*idl): taoidldefaults { } project(*Server): loadbalancing { + exename = server after += *idl Source_Files { server.cpp @@ -23,6 +24,7 @@ project(*Server): loadbalancing { } project(*Client): loadbalancing { + exename = client after += *idl Source_Files { TestC.cpp diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index fef78510c70..117895744c3 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -75,7 +75,7 @@ int LB_server::write_ior_to_file (const char *ior) { FILE *output_file = - ACE_OS::fopen ("obj.ior", "w"); + ACE_OS::fopen ("obj.ior", ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp index 8a85b412846..7f15ba73cd1 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp @@ -1,5 +1,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Infrastructure_Controlled, @@ -12,7 +13,7 @@ const char *ior = "file://obj.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -36,15 +37,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp index 735da982dc4..689942f3808 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp @@ -1,18 +1,21 @@ #include "LB_server.h" #include "Factory.h" #include "Simple.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Infrastructure_Controlled, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + const char *location1 = "MyLocation 1"; const char *location2 = "MyLocation 2"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp index 4f4724ab6c6..aa5eaba1146 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -1,19 +1,22 @@ #include "LB_server.h" #include "Basic.h" #include "Simple.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Manage_object_group, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { const char *location1 = "MyLocation 1"; - LB_server lb_server (argc, argv); + LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv()); if (lb_server.start_orb_and_poa () == -1) return 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc index 55c91a8d3df..751fc1454c0 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc @@ -1,4 +1,5 @@ // $Id$ project(*Client): loadbalancing { + exename = client } diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index ccae399abb8..cdbe425b4d6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/CosLoadBalancingC.h" #include "orbsvcs/PortableGroup/PG_Operators.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CPU, @@ -18,7 +19,7 @@ const CosLoadBalancing::LoadId LOAD_ID = CosLoadBalancing::LoadAverage; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "l:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "l:"); int c; @@ -62,14 +63,15 @@ check_loads (const CosLoadBalancing::LoadList & loads } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index d7123478053..a82b7249d71 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -3,6 +3,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" @@ -34,8 +35,7 @@ BasicLog_Test::init (int argc, char *argv[]) ACE_TRY { // Initialize the ORB - orb_ = CORBA::ORB_init (argc, - argv, + orb_ = CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -542,7 +542,7 @@ BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite) int BasicLog_Test::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp index b906b2fb1e5..345e0c82b2f 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp @@ -1,6 +1,7 @@ #include "Basic_Log_Test.h" #include "ace/Log_Msg.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Basic_Log_Test, client, @@ -9,11 +10,13 @@ ACE_RCSID (Basic_Log_Test, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + BasicLog_Test log_test; ACE_DEBUG((LM_DEBUG, "\nBasic Log test \n\n")); - if (log_test.init(argc, argv) == -1) + if (log_test.init(convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR_RETURN((LM_ERROR, "xx - Failed initializing BasicLog_Test.\n"),-1); diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc index 8e9210a7702..09d68e14a1b 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc @@ -9,6 +9,7 @@ project(*idl): taoidldefaults { } project(*server): orbsvcsexe, portablegroup, portableserver { + exename = server after += *idl Source_Files { McastHello.cpp @@ -21,6 +22,7 @@ project(*server): orbsvcsexe, portablegroup, portableserver { } project(*client): orbsvcsexe, portablegroup, portableserver { + exename = client after += *idl Source_Files { TestC.cpp diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index 10180538dbf..7433d1064e7 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Object_T.h" #include "orbsvcs/PortableGroup/MIOP.h" @@ -14,7 +15,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -38,15 +39,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index ecf06638ce2..4856873214d 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -2,6 +2,7 @@ #include "McastHello.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/PortableGroup/MIOP.h" #include "orbsvcs/PortableGroup/GOA.h" @@ -21,7 +22,7 @@ static const char *group_ior = "corbaloc:miop:1.0@1.0-TestDomain-1/224.1.239.2:1 int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -50,12 +51,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -75,7 +78,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the group IOR. @@ -87,7 +90,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Output the Group IOR to the <ior_output_file> - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index 08309efacca..378e9f97e45 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -3,6 +3,7 @@ #include "AdminProperties.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "tao/debug.h" @@ -146,7 +147,7 @@ AdminProperties::~AdminProperties (void) int AdminProperties::parse_args(int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -468,13 +469,15 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + AdminProperties test; ACE_TRY_NEW_ENV { - test.init (argc, argv ACE_ENV_ARG_PARAMETER); + test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index f3087187a05..4ef65ef09cd 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "ConnectDisconnect.h" @@ -142,7 +143,7 @@ ConnectDisconnect::init (int argc, int ConnectDisconnect::parse_args(int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -350,18 +351,20 @@ ConnectDisconnect::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ConnectDisconnect client; - if (client.parse_args (argc, argv) == -1) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - client.init (argc, argv ACE_ENV_ARG_PARAMETER); + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h index a08cd5dd3ad..7648731fe48 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h @@ -73,7 +73,7 @@ public: char *argv[]); int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 58d348d5859..ddaaf415280 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Events.h" @@ -145,10 +146,9 @@ Events::init (int argc, } int -Events::parse_args (int argc, - char *argv[]) +Events::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -322,19 +322,20 @@ Events::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Events events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h index e7493489b67..899c71f5c85 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h @@ -74,7 +74,7 @@ public: char *argv[]) ; int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index 3d54679c307..f256f95c017 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Filter.h" @@ -219,19 +220,20 @@ Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL) //*************************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Filter events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h index 9bd93156d6d..8431336a32c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h @@ -35,7 +35,7 @@ public: virtual ~Filter (void); int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index ebfd98f3df1..e426c722707 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/CosNotifyCommC.h" @@ -24,10 +25,9 @@ IdAssignment::~IdAssignment (void) } int -IdAssignment::parse_args (int argc, - char *argv[]) +IdAssignment::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -83,8 +83,7 @@ IdAssignment::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -458,18 +457,18 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) //******************************************************************************** } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { IdAssignment test; - test.parse_args (argc, - argv); + test.parse_args (convert.get_argc(), convert.get_ASCII_argv()); - test.init (argc, - argv + test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 0bb420600c7..9e86827c5c4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include <orbsvcs/CosNamingC.h> #include <orbsvcs/CosNotifyCommC.h> @@ -23,10 +24,9 @@ LifeCycle::~LifeCycle (void) } int -LifeCycle::parse_args (int argc, - char *argv[]) +LifeCycle::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -65,8 +65,7 @@ LifeCycle::init (int argc, char* argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -242,18 +241,18 @@ LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { LifeCycle test; - test.parse_args (argc, - argv); + test.parse_args (convert.get_argc(), convert.get_ASCII_argv()); - test.init (argc, - argv + test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index f8bb9dd472a..60461e451dc 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "MultiTypes.h" @@ -379,19 +380,20 @@ MultiTypes::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + MultiTypes client; - if (client.parse_args (argc, argv) == -1) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - client.init (argc, - argv + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h index ac2701e61b8..0076aef88e0 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h @@ -108,7 +108,7 @@ public: char *argv[]); int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index 7842be55e57..32918c34390 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "Sequence.h" @@ -147,10 +148,9 @@ Sequence::init (int argc, } int -Sequence::parse_args (int argc, - char *argv[]) +Sequence::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -354,19 +354,20 @@ Sequence::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Sequence events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index 5a8e1138f3b..aed998ddb9e 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -75,7 +75,7 @@ public: char *argv[]) ; int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index fd0dffb4620..ba48eb507c7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Simple.h" @@ -124,10 +125,9 @@ Simple_Test::init (int argc, } int -Simple_Test::parse_args (int argc, - char *argv[]) +Simple_Test::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -238,19 +238,20 @@ Simple_Test::check_results (void) //*************************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Simple_Test events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, - argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index a941fcfb027..b4022839e36 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -75,7 +75,7 @@ public: char *argv[]) ; int init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // initialization. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index 3933aaa37a1..73bb7694a96 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include "Updates.h" @@ -463,14 +464,15 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Updates updates; ACE_TRY_NEW_ENV { - updates.init (argc, - argv + updates.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h index e4c7104f9bf..a2cc8ae170b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h @@ -78,7 +78,7 @@ public: Updates (void); virtual ~Updates (); - int init (int argc, char *argv [] ACE_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // initialization. void run_test (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index 4139898c4ce..1263ca3afb5 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -80,7 +80,7 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service", unlink $namingior; $naming_spawn = $Naming->Spawn (); -if ($naming_spawn != 0) +if ($naming_spawn != 0) { exit 1; } @@ -101,20 +101,20 @@ for $config (@test_configs) "-ORBSvcConf $config"); unlink $notifyior; $Notification->Spawn (); - + if (PerlACE::waitforfile_timed ($notifyior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; $Notification->Kill (); $Naming->Kill (); exit 1; } - + for $name (@tests) { ## The MaxQueueLength and MaxEventsPerConsumer are not supported in the Reactive ## configuration, so we skip this test for now. ## The Notification should actually throw an exception for the property not supported. - if ($name->{name} eq "AdminProperties" + if ($name->{name} eq "AdminProperties" && ($config eq "notify.reactive.conf" || $config eq "notify.rt.conf")) { next; @@ -125,7 +125,7 @@ for $config (@test_configs) "-ORBInitRef NameService=file://$namingior " . "$name->{args} "); $test_spawn = $test->Spawn (); - if ($test_spawn != 0) + if ($test_spawn != 0) { break; } @@ -134,13 +134,13 @@ for $config (@test_configs) (defined $name->{extra} ? $name->{extra} : 0)); - if ($status != 0) + if ($status != 0) { print STDERR "ERROR: $name->{name} returned $status\n"; break; } } - + $Notification->Kill (); } diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index 3e7c1986bb9..95379cf09d0 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -94,8 +94,8 @@ Notify_Structured_Push_Consumer::push_structured_event ( if (this->count_ > this->expected_) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too " - "many events received.\n"))); + ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received.\n"))); } if (this->count_ >= this->expected_) diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index c1ef387256c..2eee91d4016 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -36,7 +37,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:t:"); int c; while ((c = get_opts ()) != -1) @@ -110,14 +111,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status != 0) ACE_ERROR_RETURN ((LM_ERROR, "Error: Client init failed.\n"),1); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 8097361c468..07e30148612 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -6,6 +6,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" @@ -82,7 +83,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -173,14 +174,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -203,7 +206,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp index 09944124843..fd925c0b1ee 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp @@ -3,15 +3,18 @@ #include "../lib/Notify_Test_Client.h" #include "orbsvcs/NotifyExtC.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, char *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the base class. Notify_Test_Client client; - client.init (argc, argv ACE_ENV_ARG_PARAMETER); + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory (); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index f107177b9d5..50e50144748 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -76,8 +76,8 @@ Notify_Structured_Push_Consumer::push_structured_event ( { this->client_.consumer_done (this); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too " - "many events received (%d).\n"), this->count_)); + ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received (%d).\n"), this->count_)); } ACE_ASSERT(ACE_OS::strcmp(event.header.variable_header[0].name.in(), "Id") == 0); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index d357454f33d..8929c89305f 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -37,7 +38,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:"); int c; while ((c = get_opts ()) != -1) @@ -133,14 +134,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index 95d08daca21..cef82710b31 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -96,7 +97,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -207,14 +208,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -243,7 +246,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); ACE_ASSERT(output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index b457324f6ed..631b0e2d8e3 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" @@ -26,7 +27,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -127,14 +128,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 9fee28c5c34..5b1aee259d2 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -87,7 +88,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -188,14 +189,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -224,7 +227,7 @@ int main (int argc, char* argv[]) client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); ACE_ASSERT (output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp index 1ad6142c0d4..6e50d7653df 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp @@ -2,15 +2,18 @@ #include "../lib/Driver.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, char *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_Notify_Tests_Driver driver; ACE_TRY_NEW_ENV { - int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = driver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index 851210f4877..ee409dbf52b 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" @@ -37,7 +38,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:c:f"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:c:f"); int c; while ((c = get_opts ()) != -1) @@ -125,14 +126,16 @@ disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index 4612ff106bf..9bb2820f430 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -84,7 +85,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:fc:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:fc:"); int c; while ((c = get_opts ()) != -1) @@ -194,13 +195,15 @@ disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -221,7 +224,7 @@ int main (int argc, char* argv[]) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index 79f44545167..5a93e714da8 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_stat.h" @@ -27,7 +28,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ok:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ok:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -127,13 +128,15 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index c1d572de8c2..17097320483 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -11,6 +11,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" #include "ace/Auto_Ptr.h" @@ -72,7 +73,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -200,13 +201,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -234,7 +237,7 @@ int main (int argc, char* argv[]) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index d86df34f06b..ffb69a54092 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" static const char* ior = "file://supplier.ior"; @@ -24,7 +25,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ok:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ok:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -122,13 +123,15 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index bda45d89f6c..6970ba38d0c 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -12,6 +12,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/Auto_Ptr.h" @@ -72,7 +73,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d:"); int c; while ((c = get_opts ()) != -1) @@ -197,13 +198,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV { Supplier_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -231,7 +234,7 @@ int main (int argc, char* argv[]) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp index ea040206afc..3d0e525a0e0 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp @@ -61,7 +61,7 @@ namespace { } void setUp() { - ACE_ARGV av; + ACE_TARGV<char> av; int ac = 0; orb = ORB_init(ac, av.argv()); ACE_ASSERT(! is_nil(orb.in())); @@ -80,7 +80,7 @@ namespace { } -int main(int, char**) +int ACE_TMAIN(int, ACE_TCHAR**) { try { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp index 4d9aa177a6c..f4396d74662 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -20,22 +20,22 @@ TAO_Notify_Tests_RT_POA_Command::~TAO_Notify_Tests_RT_POA_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_RT_POA_Command::get_name (void) { return TAO_Notify_Tests_RT_POA_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_RT_POA_Command::name (void) { return TAO_Notify_Tests_Name::poa_command; } void -TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_RT_POA_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h index b5bcb27a825..63b8625eb44 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -42,14 +42,14 @@ public: /// Parse args and populate options. /// The arg_shifter options are read in the following manner: -Create <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)* - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Get the command name. - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: /// Create the POA with the params parsed. diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 43acfd70c38..0d33874b2e2 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -7,6 +7,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_stdio.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$") @@ -163,7 +164,7 @@ StructuredPushConsumer_i::push_structured_event ( } if (notification.filterable_data.length () > 0) { - if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number")) + if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number")) { const CORBA::Any & data = notification.filterable_data[0].value; @@ -189,8 +190,8 @@ StructuredPushConsumer_i::push_structured_event ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") - && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, "")) + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY") + && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), "")) { const CORBA::Any * any; if (notification.remainder_of_body >>= any) @@ -398,7 +399,7 @@ SequencePushConsumer_i::push_structured_events ( const CosNotification::StructuredEvent & notification = notifications[nevent]; if (notification.filterable_data.length () > 0) { - if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number")) + if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number")) { const CORBA::Any & data = notification.filterable_data[0].value; @@ -424,8 +425,8 @@ SequencePushConsumer_i::push_structured_events ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") - && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, "")) + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY") + && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), "")) { CORBA::ULong seq = 0; if (notification.remainder_of_body >>= seq) @@ -619,7 +620,7 @@ AnyPushConsumer_i::push ( { if (notification->filterable_data.length () > 0) { - if (0 == ACE_OS::strcmp (notification->filterable_data[0].name, "serial_number")) + if (0 == ACE_OS::strcmp (notification->filterable_data[0].name.in(), "serial_number")) { const CORBA::Any & data = notification->filterable_data[0].value; @@ -1040,7 +1041,7 @@ void Consumer_Main::save_ids() { FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "w"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("w")); if (idf != 0) { @@ -1064,7 +1065,7 @@ Consumer_Main::load_ids() { bool ok = false; FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "r"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("r")); if (idf != 0) { @@ -1267,7 +1268,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // try to read from it if (!ok && this->channel_file_.length () > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "r"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("r")); if (chf != 0) { char buffer[100]; @@ -1359,7 +1360,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // save channel id if (ok && this->channel_file_.length() > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "w"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("w")); if (chf != 0) { ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_)); @@ -1874,13 +1875,15 @@ int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = -1; Consumer_Main app; ACE_TRY_NEW_ENV { - result = app.init(argc, argv ACE_ENV_ARG_PARAMETER); + result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK if (result == 0) diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc index f04e76917c9..0e4d776fe91 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc @@ -1,12 +1,14 @@ // $Id$ project(*Supplier): notifytest { + exename = Supplier Source_Files { Supplier.cpp } } project(*Consumer): notifytest { + exename = Consumer Source_Files { Consumer.cpp } diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 1bd46703440..3420d2a1be4 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -7,6 +7,7 @@ #include "tao/TimeBaseC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_strings.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify_Tests, Supplier_Main, "$Id$") @@ -220,7 +221,7 @@ Supplier_Main::Supplier_Main () , use_naming_service_ (true) , serial_number_ (0) , disconnect_on_exit_ (false) - , id_file_ (ACE_TEXT ("supplier.ids")) + , id_file_ ("supplier.ids") , pause_ (0) , ec_id_ (0) , sa_id_(0) @@ -276,47 +277,47 @@ int Supplier_Main::parse_single_arg (int argc, char *argv[]) { int consumed = 0; - if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-v")) == 0) + if (ACE_OS::strcasecmp (argv[0], "-v") == 0) { this->verbose_ = true; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-any")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-any") == 0) { this->mode_ = MODE_ANY; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-structured")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-structured") == 0) { this->mode_ = MODE_STRUCTURED; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-sequence")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-sequence") == 0) { this->mode_ = MODE_SEQUENCE; consumed = 1; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-channel")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-channel") == 0) { this->channel_file_= argv[1]; consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-send")) == 0 && argc > 1) + else if (ACE_OS::strcasecmp (argv[0], "-send") == 0 && argc > 1) { this->send_ = ACE_OS::atoi (argv[1]); consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-pause")) == 0 && argc > 1) + else if (ACE_OS::strcasecmp (argv[0], "-pause") == 0 && argc > 1) { this->pause_ = ACE_OS::atoi (argv[1]); consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-serial_number")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-serial_number") == 0) { this->serial_number_= ACE_OS::atoi (argv[1]); consumed = 2; } - else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-nonamesvc")) == 0) + else if (ACE_OS::strcasecmp (argv[0], "-nonamesvc") == 0) { this->use_naming_service_ = false; consumed = 1; @@ -444,7 +445,7 @@ void Supplier_Main::save_ids() { FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "w"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("w")); if (idf != 0) { @@ -468,7 +469,7 @@ Supplier_Main::load_ids() { bool ok = false; FILE *idf = - ACE_OS::fopen (this->id_file_.c_str (), "r"); + ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("r")); if (idf != 0) { @@ -657,7 +658,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // try to read from it if (!ok && this->channel_file_.length () > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "r"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("r")); if (chf != 0) { char buffer[100]; @@ -749,7 +750,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) // save channel id if (ok && this->channel_file_.length() > 0) { - FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "w"); + FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("w")); if (chf != 0) { ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_)); @@ -1286,7 +1287,7 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL) )); } reconnections = this->reconnection_callback_.reconnect_count (); - FILE * pause_file = ACE_OS::fopen ("Supplier.paused", "w"); + FILE * pause_file = ACE_OS::fopen ("Supplier.paused", ACE_TEXT("w")); if (pause_file != 0) { ACE_OS::fputs (ACE_TEXT ("paused\n"), pause_file); @@ -1342,13 +1343,15 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = -1; Supplier_Main app; ACE_TRY_NEW_ENV { - result = app.init(argc, argv ACE_ENV_ARG_PARAMETER); + result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK if (result == 0) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index 9a7df06e215..5c611a89efe 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -72,15 +72,15 @@ Notify_Sequence_Push_Consumer::push_structured_events ( this->count_ += events.length(); if (this->count_ > this->high_) - { - this->client_.consumer_done (this); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too " - "many events received.\n"))); - ACE_THROW (CORBA::INTERNAL ()); - } - else if (this->count_ >= this->low_) - { - this->client_.consumer_done (this); - } + { + this->client_.consumer_done (this); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received.\n"))); + ACE_THROW (CORBA::INTERNAL ()); + } + else if (this->count_ == this->low_) + { + this->client_.consumer_done (this); + } } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index c59a53095fb..642b84cdb30 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -36,7 +37,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:"); int c; while ((c = get_opts ()) != -1) @@ -138,14 +139,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 483a7446f92..1f1fc1236f4 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -83,7 +84,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d"); int c; while ((c = get_opts ()) != -1) @@ -204,14 +205,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -233,7 +236,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index b39323d5890..36cca406978 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -80,8 +80,8 @@ Notify_Sequence_Push_Consumer::push_structured_events( { this->client_.consumer_done (this); ACE_ERROR((LM_ERROR, - ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too " - "many events received.\n"))); + ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ") + ACE_TEXT ("many events received.\n"))); } else if (this->count_ >= this->low_) { diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 5ac22e79b8b..61abb9946ef 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNotifyCommC.h" @@ -37,7 +38,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:c:"); int c; while ((c = get_opts ()) != -1) @@ -114,14 +115,20 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + + int status = 0; + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + //int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + ACE_ASSERT(status == 0); ACE_UNUSED_ARG(status); @@ -163,6 +170,7 @@ int main (int argc, char* argv[]) constraint_list[0].constraint_expr = CORBA::string_dup(constraintString); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; admin->add_filter(filter.in()); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index 30c0a2e2b0d..e6020243c2d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" // FUZZ: disable check_for_streams_include @@ -84,7 +85,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -205,15 +206,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -236,7 +239,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index 7f41538007e..76e2278d1af 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" @@ -30,7 +31,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "fe:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "fe:"); int x; while ((x = get_opts ()) != -1) @@ -69,13 +70,15 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV; { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index 161d3f3e8c4..1c6720afa0c 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -14,6 +14,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" @@ -131,13 +132,15 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV; { Notify_Test_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -166,7 +169,7 @@ int main (int argc, char * argv[]) client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen (ior_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w")); ACE_ASSERT (output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index eb633882bcc..218f66fbb7a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_strings.h" @@ -31,7 +32,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:s:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:s:e:"); int x; while ((x = get_opts ()) != -1) @@ -86,13 +87,15 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Consumer_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status != 0) { diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index 69463ea273a..c7438cb868d 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" @@ -75,7 +76,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "e:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "e:f:"); int x; while ((x = get_opts ()) != -1) @@ -201,13 +202,15 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, ACE_CHECK; } -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; ACE_TRY_NEW_ENV; { Supplier_Client client; - int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -243,7 +246,7 @@ int main (int argc, char * argv[]) client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen (ior_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w")); ACE_ASSERT (output_file != 0); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 07ba1cbfdd9..99e0aaf445c 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -53,7 +53,7 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra // Check Poolid if (ACE_OS::strncmp (constraint_list[i].constraint_expr.in (), PoolId_prefix, poolId_index) == 0) { - if (ACE_OS::strlen (constraint_list[i].constraint_expr) > poolId_index) + if (ACE_OS::strlen (constraint_list[i].constraint_expr.in()) > poolId_index) { this->expected_pool_id_ = ACE_OS::atoi (&constraint_list[i].constraint_expr[poolId_index]); @@ -64,7 +64,7 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra // Check Poolid else if (ACE_OS::strncmp (constraint_list[i].constraint_expr.in (), LaneId_prefix, laneId_index) == 0) { - if (ACE_OS::strlen (constraint_list[i].constraint_expr) > laneId_index) + if (ACE_OS::strlen (constraint_list[i].constraint_expr.in()) > laneId_index) { this->expected_lane_id_ = ACE_OS::atoi (&constraint_list[i].constraint_expr[laneId_index]); diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index 463a3fc9b8d..896da12b065 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Dynamic_Service.h" #include "ace/ARGV.h" +#include "ace/Argv_Type_Converter.h" class TestSupplier : public POA_CosNotifyComm::StructuredPushSupplier @@ -52,8 +53,10 @@ class TestConsumer } }; -int main(int ac, char **av) +int ACE_TMAIN(int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int retval = 1; bool pass1 = false; @@ -64,13 +67,13 @@ int main(int ac, char **av) CORBA::ORB_var orb; PortableServer::POA_var poa; - orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (orb.in ())); - if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0) + if (convert.get_argc() > 2 && ACE_OS::strcmp (convert.get_ASCII_argv()[1], "-pass") == 0) { - int pn = av[2][0] - '0'; + int pn = argv[2][0] - '0'; switch (pn) { case 1: diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 86b477c1bba..757baa0e912 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -34,7 +34,7 @@ TAO_Notify_Tests_Activation_Manager::~TAO_Notify_Tests_Activation_Manager () } int -TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name) +TAO_Notify_Tests_Activation_Manager::ior_output_file (const char *file_name) { this->ior_output_file_ = ACE_OS::fopen (file_name, ACE_TEXT("w")); @@ -45,7 +45,7 @@ TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name } int -TAO_Notify_Tests_Activation_Manager::ior_input_file (const ACE_TCHAR *file_name) +TAO_Notify_Tests_Activation_Manager::ior_input_file (const char *file_name) { this->ior_input_file_ = file_name; return 0; @@ -204,7 +204,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) if (sup_iter.next (sup_entry) != 0) { supplier = sup_entry->int_id_; - supplier->dump_stats (msg, dump_samples); + supplier->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); } } @@ -219,7 +219,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) if (cons_iter.next (cons_entry) != 0) { consumer = cons_entry->int_id_; - consumer->dump_stats (msg, dump_samples); + consumer->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); } } } diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h index 838516b3d64..b52176dbd22 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h @@ -91,10 +91,10 @@ public: void dump_stats (int dump_samples); // Returns 0 if the file could be opened for write. - int ior_output_file (const ACE_TCHAR *file_name); + int ior_output_file (const char *file_name); // Returns 1 if the file could be opened for read. - int ior_input_file (const ACE_TCHAR *file_name); + int ior_input_file (const char *file_name); void write_ior (ACE_ENV_SINGLE_ARG_DECL); void wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 5172ae18620..11f24ede767 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -11,6 +11,8 @@ ACE_RCSID(lib, TAO_Application_Command, "$Id$") #include "Driver_Base.h" #include "Priority_Mapping.h" +#include "ace/Arg_Shifter.h" + TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void) : dump_samples_ (0) { @@ -20,20 +22,20 @@ TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Application_Command::get_name (void) { return TAO_Notify_Tests_Application_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Application_Command::name (void) { return TAO_Notify_Tests_Name::application_command; } void -TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Application_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index ff267fc37a3..89902c795e6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -40,14 +40,14 @@ public: ~TAO_Notify_Tests_Application_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Get the command name. - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: #ifdef HPUX_11 diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 4e63d4ba284..c77c5c9655b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -19,7 +19,7 @@ TAO_Notify_Tests_Command::~TAO_Notify_Tests_Command () } void -TAO_Notify_Tests_Command::init (ACE_Arg_Shifter& /*arg_shifter*/) +TAO_Notify_Tests_Command::init (ACE_TArg_Shifter< ACE_TCHAR >& /*arg_shifter*/) { // default: do nothing. } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index 41f23995f0b..91c9e0c2c33 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -21,6 +21,7 @@ #include "tao/orbconf.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -47,16 +48,16 @@ public: virtual ~TAO_Notify_Tests_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< ACE_TCHAR >& arg_shifter); /// Implement command execution. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Return the name of this command. - virtual const char* get_name (void)= 0; + virtual const ACE_TCHAR* get_name (void)= 0; ///= Each derived type must also implement the following signature: - // static const char* name (void); + // static const ACE_TCHAR* name (void); protected: /// Next command after this one. diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index e95b8ed81b2..0a412cfe89d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -3,6 +3,7 @@ #include "Command_Builder.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Command.h" #include "Command_Factory.h" #include "Name.h" @@ -19,11 +20,11 @@ TAO_Notify_Tests_Command_Builder::~TAO_Notify_Tests_Command_Builder () } int -TAO_Notify_Tests_Command_Builder::init (int argc, char *argv[]) +TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< ACE_TCHAR > arg_shifter (argc, argv); - ACE_CString current_arg; + ACE_TString current_arg; TAO_Notify_Tests_Command_Factory* factory = 0; if (arg_shifter.is_anything_left ()) @@ -65,7 +66,7 @@ TAO_Notify_Tests_Command_Builder::fini (void) } void -TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory) +TAO_Notify_Tests_Command_Builder::_register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory) { if (this->factory_map_.bind (command_factory_name, command_factory) == -1) ACE_DEBUG ((LM_DEBUG, "Failed to register command factory for %s\n", command_factory_name.c_str ())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h index 7ca63765dbe..a29bd93e7d3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h @@ -46,11 +46,11 @@ public: ~TAO_Notify_Tests_Command_Builder (); /// = Service_Object virtual method overloads. - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int fini (void); /// Register the factory against the name of the factory. - void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); + void _register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); /// Execute the <start_command_>. void execute (ACE_ENV_SINGLE_ARG_DECL); @@ -63,7 +63,7 @@ protected: TAO_Notify_Tests_Command* last_command_; /// The factory map. - ACE_Hash_Map_Manager <ACE_CString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_; + ACE_Hash_Map_Manager <ACE_TString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_NOTIFY_TEST, TAO_Notify_Tests_Command_Builder) diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 2965bc0094c..2b7e3020db7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -17,13 +17,13 @@ TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void) { return TAO_Notify_Tests_ConsumerAdmin_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_ConsumerAdmin_Command::name (void) { return TAO_Notify_Tests_Name::consumer_admin_command; @@ -96,7 +96,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_N } void -TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index a94146e47bc..dcc6b8aeea2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -39,14 +39,14 @@ public: ~TAO_Notify_Tests_ConsumerAdmin_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 8985aa6f772..6fb6f16accf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -186,13 +186,13 @@ TAO_Notify_Tests_Driver::~TAO_Notify_Tests_Driver () int TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Timeout")))) // -Timeout timeout_period_S + if ((current_arg = arg_shifter.get_the_parameter ("-Timeout"))) // -Timeout timeout_period_S { if (current_arg != 0) { @@ -201,7 +201,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // -IORoutput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // -IORoutput file_name { if (this->activation_manager_->ior_output_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -210,7 +210,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORinput")))) // -IORinput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORinput"))) // -IORinput file_name { if (this->activation_manager_->ior_input_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -235,17 +235,17 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) } int -TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) +TAO_Notify_Tests_Driver::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - ACE_Argv_Type_Converter command_line(argc, argv); + ACE_Argv_Type_Converter convert(argc, argv); - this->orb_ = CORBA::ORB_init (command_line.get_argc(), - command_line.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index 610e6b02e79..f909a8ed2a0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -107,7 +107,7 @@ public: ~TAO_Notify_Tests_Driver (); /// Init - int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); /// Execute the commands. void run (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index 519fee9fc45..76842ecce19 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -20,20 +20,20 @@ TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_EventChannel_Command::get_name (void) { return TAO_Notify_Tests_EventChannel_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_EventChannel_Command::name (void) { return TAO_Notify_Tests_Name::event_channel_command; } void -TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_EventChannel_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index 35a2baa4bb0..368b1963b0c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -44,14 +44,14 @@ public: virtual ~TAO_Notify_Tests_EventChannel_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: ///= Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 2bb7bb716b4..4832672fe07 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -16,20 +16,20 @@ TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Filter_Command::get_name (void) { return TAO_Notify_Tests_Filter_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Filter_Command::name (void) { return TAO_Notify_Tests_Name::filter_command; } void -TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Filter_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 2678b6c4437..24d1b9dfb43 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -39,14 +39,14 @@ public: ~TAO_Notify_Tests_Filter_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp index 87e0c004674..532fa99954a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp @@ -5,33 +5,36 @@ ACE_RCSID(lib, TAO_Name, "$Id$") #define TAO_Notify_Tests_DECLARE_NAME(target, name) \ -const char* const TAO_Notify_Tests_Name::target = ACE_TEXT (name); +const ACE_TCHAR* const TAO_Notify_Tests_Name::target = name; -TAO_Notify_Tests_DECLARE_NAME (command_builder,"Command_Builder") -TAO_Notify_Tests_DECLARE_NAME (root_poa,"RootPOA") -TAO_Notify_Tests_DECLARE_NAME (event_channel_factory,"NotifyEventChannelFactory") -TAO_Notify_Tests_DECLARE_NAME (naming_service,"NameService") +#define TAO_Notify_Tests_DECLARE_NAME_A(target, name) \ +const char* const TAO_Notify_Tests_Name::target = name; -TAO_Notify_Tests_DECLARE_NAME (application_command,"Application") -TAO_Notify_Tests_DECLARE_NAME (application_command_factory,"Application_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (command_builder, ACE_TEXT("Command_Builder")) +TAO_Notify_Tests_DECLARE_NAME_A (root_poa, "RootPOA") +TAO_Notify_Tests_DECLARE_NAME_A (event_channel_factory, "NotifyEventChannelFactory") +TAO_Notify_Tests_DECLARE_NAME_A (naming_service, "NameService") -TAO_Notify_Tests_DECLARE_NAME (event_channel_command,"EventChannel") -TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory,"EventChannel_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (application_command, ACE_TEXT("Application")) +TAO_Notify_Tests_DECLARE_NAME (application_command_factory, ACE_TEXT("Application_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command,"ConsumerAdmin") -TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory,"ConsumerAdmin_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (event_channel_command, ACE_TEXT("EventChannel")) +TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory, ACE_TEXT("EventChannel_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command,"SupplierAdmin") -TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory,"SupplierAdmin_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command, ACE_TEXT("ConsumerAdmin")) +TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory, ACE_TEXT("ConsumerAdmin_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, "PeriodicSupplier") -TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, "PeriodicSupplier_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command, ACE_TEXT("SupplierAdmin")) +TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory, ACE_TEXT("SupplierAdmin_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, "PeriodicConsumer") -TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, "PeriodicConsumer_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, ACE_TEXT("PeriodicSupplier")) +TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, ACE_TEXT("PeriodicSupplier_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (poa_command, "POA") -TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, "POA_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, ACE_TEXT("PeriodicConsumer")) +TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, ACE_TEXT("PeriodicConsumer_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (filter_command, "Filter") -TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, "Filter_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (poa_command, ACE_TEXT("POA")) +TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, ACE_TEXT("POA_Command_Factory")) + +TAO_Notify_Tests_DECLARE_NAME (filter_command, ACE_TEXT("Filter")) +TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, ACE_TEXT("Filter_Command_Factory")) diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.h b/TAO/orbsvcs/tests/Notify/lib/Name.h index 602f3d1e6de..188eb6113c0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.h +++ b/TAO/orbsvcs/tests/Notify/lib/Name.h @@ -32,31 +32,31 @@ public: static const char* const event_channel_factory; static const char* const naming_service; - static const char* const command_builder; + static const ACE_TCHAR* const command_builder; - static const char* const application_command_factory; - static const char* const application_command; + static const ACE_TCHAR* const application_command_factory; + static const ACE_TCHAR* const application_command; - static const char* const event_channel_command_factory; - static const char* const event_channel_command; + static const ACE_TCHAR* const event_channel_command_factory; + static const ACE_TCHAR* const event_channel_command; - static const char* const supplier_admin_command_factory; - static const char* const supplier_admin_command; + static const ACE_TCHAR* const supplier_admin_command_factory; + static const ACE_TCHAR* const supplier_admin_command; - static const char* const consumer_admin_command_factory; - static const char* const consumer_admin_command; + static const ACE_TCHAR* const consumer_admin_command_factory; + static const ACE_TCHAR* const consumer_admin_command; - static const char* const periodic_supplier_command; - static const char* const periodic_supplier_command_factory; + static const ACE_TCHAR* const periodic_supplier_command; + static const ACE_TCHAR* const periodic_supplier_command_factory; - static const char* const periodic_consumer_command; - static const char* const periodic_consumer_command_factory; + static const ACE_TCHAR* const periodic_consumer_command; + static const ACE_TCHAR* const periodic_consumer_command_factory; - static const char* const poa_command; - static const char* const poa_command_factory; + static const ACE_TCHAR* const poa_command; + static const ACE_TCHAR* const poa_command_factory; - static const char* const filter_command; - static const char* const filter_command_factory; + static const ACE_TCHAR* const filter_command; + static const ACE_TCHAR* const filter_command_factory; }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index cd6a689acfa..30ac0894ea3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -34,7 +34,7 @@ Notify_Test_Client::~Notify_Test_Client () } int -Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +Notify_Test_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -57,11 +57,10 @@ Notify_Test_Client::parse_args (int /*argc*/, char** /*argv*/) int Notify_Test_Client::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 39bbed208fe..493d4144c7e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -37,7 +37,7 @@ public: Notify_Test_Client (void); virtual ~Notify_Test_Client (); - virtual int init (int argc, char *argv [] ACE_ENV_ARG_DECL); + virtual int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // starts the orb and resolves the notify factory via a naming service. virtual int parse_args (int argc, char* argv[]); @@ -76,7 +76,7 @@ public: protected: int init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index 2685d1bfd5b..847cfaba864 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -21,9 +21,9 @@ TAO_Notify_Tests_Options_Parser::~TAO_Notify_Tests_Options_Parser () } void -TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_TArg_Shifter< char >& arg_shifter) { - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -52,9 +52,9 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, } void -TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_TArg_Shifter< char >& arg_shifter) { - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; int default_priority = ACE_DEFAULT_THREAD_PRIORITY; if (arg_shifter.cur_arg_strncasecmp ("-ThreadPool") == 0) // -ThreadPool [-Threads static_threads] [-Priority default_priority] diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h index cecfce11495..7bbc3c3588c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h @@ -21,8 +21,10 @@ #include "orbsvcs/CosNotificationC.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter< char >; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -41,10 +43,10 @@ public: ~TAO_Notify_Tests_Options_Parser (); /// Populates <qos> with options apecified in <arg_shifter> - void execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter); + void execute (CosNotification::QoSProperties& qos, ACE_TArg_Shifter< char >& arg_shifter); /// Populates <added> and <removed> with options apecified in <arg_shifter> - void execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter); + void execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_TArg_Shifter< char >& arg_shifter); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp index 293218f1ae5..0c2f8934212 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -11,6 +11,7 @@ ACE_RCSID (lib, "$Id$") #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" @@ -33,7 +34,7 @@ TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL_NOT_U } int -TAO_Notify_Tests_Peer::init_state (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Peer::init_state (ACE_TArg_Shifter< char >& arg_shifter) { while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h index b1f93a4b815..d9a3c8185da 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -23,8 +23,10 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//template <typename> ACE_TArg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL /** @@ -46,7 +48,7 @@ public: void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL_NOT_USED); /// Init this object. - virtual int init_state (ACE_Arg_Shifter& arg_shifter); + virtual int init_state (ACE_TArg_Shifter< char >& arg_shifter); /// Set POA void set_poa (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 556d11fb0f0..c62df60ac6b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -10,6 +10,7 @@ ACE_RCSID (Notify, "$Id$") #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "Name.h" #include "LookupManager.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index a718deb73bf..e524f2537ad 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -3,6 +3,7 @@ #include "Periodic_Consumer.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Task.h" #include "tao/debug.h" @@ -41,13 +42,13 @@ TAO_Notify_Tests_Periodic_Consumer::task_callback (TAO_Notify_Tests_Task_Callbac } int -TAO_Notify_Tests_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Consumer::init_state (ACE_TArg_Shifter< char >& arg_shifter) { // First, let the base class look for options. if (TAO_Notify_Tests_StructuredPushConsumer::init_state (arg_shifter) == -1) return -1; - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -257,7 +258,7 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification } void -TAO_Notify_Tests_Periodic_Consumer::dump_stats (ACE_TCHAR* msg, int dump_samples) +TAO_Notify_Tests_Periodic_Consumer::dump_stats (const ACE_TCHAR* msg, int dump_samples) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h index de06aa31135..8858c155029 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h @@ -22,9 +22,11 @@ #include "Task_Stats.h" #include "Notify_StructuredPushConsumer.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter< char >; ACE_END_VERSIONED_NAMESPACE_DECL class TAO_Notify_Tests_Task_Callback; @@ -48,10 +50,10 @@ public: void task_callback(TAO_Notify_Tests_Task_Callback* client); /// Init the state of this object. - virtual int init_state (ACE_Arg_Shifter& arg_shifter); + virtual int init_state (ACE_TArg_Shifter< char >& arg_shifter); /// dump stats - void dump_stats (ACE_TCHAR* msg, int dump_samples); + void dump_stats (const ACE_TCHAR* msg, int dump_samples); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index cfda2e788f8..12871ea3eb0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -23,20 +23,20 @@ TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_ { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void) { return TAO_Notify_Tests_Periodic_Consumer_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Consumer_Command::name (void) { return TAO_Notify_Tests_Name::periodic_consumer_command; } void -TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index d258c7e2e8a..f61cdcaf201 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -41,14 +41,14 @@ public: ~TAO_Notify_Tests_Periodic_Consumer_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: ///= Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index b2aea30f498..901964d7b1d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -3,6 +3,7 @@ #include "Periodic_Supplier.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Barrier.h" #include "ace/OS_NS_unistd.h" @@ -45,13 +46,13 @@ TAO_Notify_Tests_Periodic_Supplier::task_callback(TAO_Notify_Tests_Task_Callback } int -TAO_Notify_Tests_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Supplier::init_state (ACE_TArg_Shifter< char >& arg_shifter) { // First, let the base class look for options. if (TAO_Notify_Tests_StructuredPushSupplier::init_state (arg_shifter) == -1) return -1; - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { @@ -340,7 +341,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void) } void -TAO_Notify_Tests_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples) +TAO_Notify_Tests_Periodic_Supplier::dump_stats (const ACE_TCHAR* msg, int dump_samples) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index 969f07cb4ec..906197cf38f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -25,9 +25,11 @@ #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/Arg_Shifter.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Barrier; -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter< char >; ACE_END_VERSIONED_NAMESPACE_DECL class TAO_Notify_Tests_Task_Callback; @@ -51,7 +53,7 @@ public: void task_callback(TAO_Notify_Tests_Task_Callback* client); /// Init the state of this object. - int init_state (ACE_Arg_Shifter& arg_shifter); + int init_state (ACE_TArg_Shifter< char >& arg_shifter); /// Activate this task, synch on the given barrier. virtual int activate_task (ACE_Barrier* barrier); @@ -60,7 +62,7 @@ public: virtual int svc (void); /// Dump stats. - void dump_stats (ACE_TCHAR* msg, int dump_samples); + void dump_stats (const ACE_TCHAR* msg, int dump_samples); /// Get the name of the proxy const char* proxy_name (void); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 9cdfaccbb51..f771ee167ba 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -22,20 +22,20 @@ TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_ { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void) { return TAO_Notify_Tests_Periodic_Supplier_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Supplier_Command::name (void) { return TAO_Notify_Tests_Name::periodic_supplier_command; } void -TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 726d7cd0ddd..c30ba056992 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -41,14 +41,14 @@ public: ~TAO_Notify_Tests_Periodic_Supplier_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index 5adaa65c92c..c2a47b86e34 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -17,20 +17,20 @@ TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_SupplierAdmin_Command::get_name (void) { return TAO_Notify_Tests_SupplierAdmin_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_SupplierAdmin_Command::name (void) { return TAO_Notify_Tests_Name::supplier_admin_command; } void -TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) +TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_TArg_Shifter< char >& arg_shifter) { if (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index fbed3172551..ed73819a9b0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -39,14 +39,14 @@ public: ~TAO_Notify_Tests_SupplierAdmin_Command (); /// Parse args and populate options. - virtual void init (ACE_Arg_Shifter& arg_shifter); + virtual void init (ACE_TArg_Shifter< char >& arg_shifter); /// Execute the command. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp index 3669f3987a1..7d2ae5888cd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp @@ -55,10 +55,20 @@ Task_Stats::end_time (ACE_UINT64 time) end_time_ = time; } +void Task_Stats::dump_samples (const char *file_name, const char *msg, int dump_samples) +{ + dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); +} + +void Task_Stats::dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples) +{ + dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); +} + void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples) +Task_Stats::dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); // first dump what the caller has to say. ACE_OS::fprintf (output_file, "%s\n",msg); diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h index cc4d7190887..6de23f231f4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h @@ -70,9 +70,13 @@ class TAO_NOTIFY_TEST_Export Task_Stats /// Record a sample int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples); + void dump_samples (const char *file_name, const char *msg, int dump_samples); + + void dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples); + + private: + void dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples); - protected: /// Base and end times ACE_UINT64 base_time_; ACE_UINT64 end_time_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index 8d284b588a5..0430a25e7a5 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" @@ -41,7 +42,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:c:e:f"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:c:e:f"); int c; while ((c = get_opts ()) != -1) @@ -151,14 +152,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index 7b7df800ca5..76033fa9aed 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -83,7 +84,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -184,15 +185,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -215,7 +218,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index a45be86190f..594e97b06f3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" @@ -39,7 +40,7 @@ public: int Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:c:f"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:c:f"); int c; while ((c = get_opts ()) != -1) @@ -150,14 +151,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_TRY_NEW_ENV { Consumer_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index f89028a58c1..8d701e5062b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "tao/ORB_Core.h" @@ -83,7 +84,7 @@ public: int Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -179,14 +180,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, // Main Section // ****************************************************************** -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Auto_Ptr< sig_i > sig_impl; int status = 0; ACE_TRY_NEW_ENV { Supplier_Client client; - status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); + status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == 0) @@ -209,7 +212,7 @@ int main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for " diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 38d260bc9ba..9190355728b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -3,6 +3,7 @@ #include "RedGreen_Test.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" #include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" @@ -29,7 +30,7 @@ int RedGreen_Test::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -106,7 +107,7 @@ RedGreen_Test::~RedGreen_Test () void RedGreen_Test::init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->init_ORB (argc, @@ -169,11 +170,10 @@ RedGreen_Test::done (void) void RedGreen_Test::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 03e74861531..a5541fef2e2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -76,7 +76,7 @@ class RedGreen_Test void dump_results (void); void init (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initialize the Client. @@ -92,7 +92,7 @@ class RedGreen_Test protected: void init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp index 8d41fd8fe15..2a8b628db00 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -2,19 +2,22 @@ // $Id$ #include "RedGreen_Test.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_High_Res_Timer::calibrate (); RedGreen_Test client; - client.parse_args (argc, argv); + client.parse_args (convert.get_argc(), convert.get_ASCII_argv()); ACE_TRY_NEW_ENV { - client.init (argc, argv + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 020b750ffa5..9d3b137620d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -4,6 +4,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Synch.h" #include "ace/OS.h" #include "ace/Dynamic_Service.h" @@ -332,9 +333,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) int Notify_Throughput::parse_args(int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); - const ACE_TCHAR* current_arg = 0; + const char* current_arg = 0; while (arg_shifter.is_anything_left ()) { if (arg_shifter.cur_arg_strncasecmp ("-collocated_ec") == 0) @@ -589,20 +590,22 @@ Notify_Throughput::dump_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_High_Res_Timer::calibrate (); Notify_Throughput events; - if (events.parse_args (argc, argv) == -1) + if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return 1; } ACE_TRY_NEW_ENV { - events.init (argc, argv + events.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index 802054bd6cf..a22ed8b7a2b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -141,7 +141,7 @@ public: int parse_args(int argc, char *argv[]) ; - int init (int argc, char *argv [] ACE_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // initialization. void run_test (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index 6e8b8e678f8..91e52a15a7a 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -2,12 +2,14 @@ // $Id$ project(*server): namingexe, property_serv, utils { + exename = server Source_Files { server.cpp } } project(*client): namingexe, property, utils { + exename = client Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index bfc5efa2dd0..59af0166de4 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -728,16 +728,17 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Client client; - if (client.init (argc, - argv + if (client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 2d0f0760c99..58538e78535 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -29,6 +29,7 @@ #include "ace/Task.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp index d9e9a9f2a3e..c9c5608e701 100644 --- a/TAO/orbsvcs/tests/Property/main.cpp +++ b/TAO/orbsvcs/tests/Property/main.cpp @@ -468,7 +468,7 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY { diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index bcaeae71a5f..dac8f86c02a 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -17,14 +17,17 @@ // ============================================================================ #include "server.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(CosPropertyService, server, "$Id$") // Main program int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -32,8 +35,7 @@ main (int argc, char ** argv) TAO_ORB_Manager m; // Initialize the ORB. - m.init_child_poa (argc, - argv, + m.init_child_poa (convert.get_argc(), convert.get_ASCII_argv(), "child_poa" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index c89d3699c52..f07344f66c6 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -72,7 +72,7 @@ parse_args (int argc, char *argv[]) { /// We set the '-' flag for getopts because we have to do this /// parsing before the ORB does it's parsing, and we'd confuse it to reorder - ACE_Get_Opt get_opts (argc, argv, "-B:R:A:X:N:C:F:T:?:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "-B:R:A:X:N:C:F:T:?:"); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp index dbc60e82c6f..91d37266902 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp @@ -73,7 +73,7 @@ parse_args (int argc, char *argv[]) // We set the '-' flag for getopts because we have to do // this parsing before the ORB does it's //parsing, and we'd confuse it to reorder - ACE_Get_Opt get_opts (argc, argv, "-:N:F:S:T:A:X:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "-:N:F:S:T:A:X:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 9e767cc7dad..ca0e631d11f 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -21,6 +21,7 @@ #include "orbsvcs/Naming/Naming_Server.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" ACE_RCSID (Simple_Naming, @@ -83,15 +84,17 @@ My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED) // This function runs the test. int -main (int argc, ACE_TCHAR **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int c_breath = 4; int c_depth = 4; int o_breath = 4; - ACE_TCHAR *ns1ref = 0; - ACE_TCHAR *ns2ref = 0; + char *ns1ref = 0; + char *ns2ref = 0; - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("b:d:o:p:q:")); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "b:d:o:p:q:"); int c; int i; @@ -153,7 +156,7 @@ main (int argc, ACE_TCHAR **argv) ACE_TRY_EX(bl_a) { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); // ior's are specified for the name servers through a commandline // option or a file. @@ -161,7 +164,7 @@ main (int argc, ACE_TCHAR **argv) // Resolve the first name server CORBA::Object_var ns1obj = orb->string_to_object ( - ACE_TEXT_ALWAYS_CHAR (ns1ref) ACE_ENV_ARG_PARAMETER); + ACE_TEXT_TO_CHAR_IN (ns1ref) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_a); if (CORBA::is_nil (ns1obj.in ())) @@ -177,7 +180,7 @@ main (int argc, ACE_TCHAR **argv) // Resolve the second name server CORBA::Object_var ns2obj = orb->string_to_object ( - ACE_TEXT_ALWAYS_CHAR (ns2ref) ACE_ENV_ARG_PARAMETER); + ACE_TEXT_TO_CHAR_IN (ns2ref) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_a); if (CORBA::is_nil (ns2obj.in ())) diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index fe06daf6ba8..8199cfe0c7f 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/Sched/Strategy_Scheduler.h" #include "orbsvcs/Time_Utilities.h" +#include "ace/Argv_Type_Converter.h" #if defined (ACE_HAS_QUANTIFY) # include <quantify.h> #endif /* ACE_HAS_QUANTIFY */ @@ -258,7 +259,7 @@ DynSched_Test::run_schedule (ACE_Scheduler_Strategy &strategy, } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { int result = 0; diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index a856587a8f7..527949071a1 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -5,6 +5,7 @@ #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Scheduler_Factory.h" @@ -24,9 +25,9 @@ const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, " "static_cast<RtecScheduler::Info_Type_t> (%d)}\n"; int -parse_args (int argc, char *argv []) +parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:"); int opt; while ((opt = get_opt ()) != EOF) @@ -51,9 +52,10 @@ parse_args (int argc, char *argv []) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, argv) != 0) + ACE_Argv_Type_Converter convert (argc, argv); + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -340,7 +342,7 @@ main (int argc, char *argv[]) { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index 23d60c3709c..632c061cae2 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -22,9 +22,9 @@ const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, " "static_cast<RtecScheduler::Info_Type_t> (%d)}\n"; int -parse_args (int argc, char *argv []) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:"); int opt; while ((opt = get_opt ()) != EOF) @@ -49,7 +49,7 @@ parse_args (int argc, char *argv []) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) { diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp index 12692c53c26..ad13b636c01 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp @@ -19,7 +19,7 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index fb15517f37e..fa6d82bf742 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -20,7 +21,7 @@ void do_nothing (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -44,12 +45,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -103,7 +106,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index 44ddec21390..8a706f06f28 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" @@ -14,7 +15,7 @@ int no_iterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -100,7 +103,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in (), @@ -128,7 +131,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp index 44eeca19e7d..aa6a0effa62 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp @@ -14,7 +14,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp index a2a09539439..3813f86c837 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp @@ -15,7 +15,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp index 2ddfbc0be3d..9a26c5a4ce4 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Callback, const char *cert_file = "cacert.pem"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp index 881d7d2ca58..bdeaa4ad187 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Callback, const char *cert_file = "cacert.pem"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index dd70e280f98..b4c60648b3f 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -19,7 +19,7 @@ int wait_time = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "sk:w:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "sk:w:"); int c; while ((c = get_opts ()) != -1) @@ -48,7 +48,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index c880f1e4858..610aa4d47b1 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -16,7 +16,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index 5da628db89d..e2d5cfe92d7 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Client_Worker.h" @@ -12,7 +13,7 @@ int nthreads = 5; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x"); int c; while ((c = get_opts ()) != -1) @@ -51,17 +52,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get Object Reference using IOR file diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp index 29c53ecb7b8..14e591bbd70 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp @@ -10,7 +10,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp index 8ef6242213a..fd07ed0acba 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp @@ -14,7 +14,7 @@ int nthreads = 5; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x"); int c; while ((c = get_opts ()) != -1) @@ -53,7 +53,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl index 0bdb4fe461c..d1480fd47d1 100755 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl @@ -1,3 +1,4 @@ + eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp index b05e356507c..72cea2af0f2 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp @@ -14,7 +14,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:n:"); int c; while ((c = get_opts ()) != -1) @@ -60,7 +60,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index 40877b8871f..e9d4bfbeb79 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "FooC.h" #include "orbsvcs/SecurityC.h" @@ -112,7 +113,7 @@ secure_invocation_test (CORBA::Object_ptr object int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -135,19 +136,21 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - ACE_TString env ("SSL_CERT_FILE="); - env += cert_file; + ACE_TString env (ACE_TEXT("SSL_CERT_FILE=")); + env += ACE_TEXT_TO_TCHAR_IN(cert_file); ACE_OS::putenv (env.c_str ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp index 8b7ff656577..e5f3b2f6af5 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp @@ -15,7 +15,7 @@ const char *cert_file = "cacert.pem"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index 904a68a489b..a81edd2f705 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -21,6 +21,7 @@ #include "client.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple_Naming, client, "$Id$") @@ -90,7 +91,7 @@ CosNaming_Client::CosNaming_Client (void) int CosNaming_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "p:dstieym:c:"); int c; while ((c = get_opts ()) != -1) @@ -146,7 +147,7 @@ CosNaming_Client::parse_args (void) if (this->test_ == 0) { FILE * ior_output_file = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (ior_output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -1268,11 +1269,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + CosNaming_Client cosnaming_client; - if (cosnaming_client.init (argc, argv) == -1) + if (cosnaming_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return cosnaming_client.run (); diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index 0a4a4f0b63a..059cd8a60cc 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Client) : namingexe, utils, portableserver { + exename = client Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 904a68a489b..a81edd2f705 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -21,6 +21,7 @@ #include "client.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple_Naming, client, "$Id$") @@ -90,7 +91,7 @@ CosNaming_Client::CosNaming_Client (void) int CosNaming_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "p:dstieym:c:"); int c; while ((c = get_opts ()) != -1) @@ -146,7 +147,7 @@ CosNaming_Client::parse_args (void) if (this->test_ == 0) { FILE * ior_output_file = - ACE_OS::fopen (get_opts.opt_arg (), "w"); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (ior_output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -1268,11 +1269,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + CosNaming_Client cosnaming_client; - if (cosnaming_client.init (argc, argv) == -1) + if (cosnaming_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return cosnaming_client.run (); diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 9a8d23a4996..12979b67653 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -5,6 +5,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" @@ -248,7 +249,7 @@ Client_i::read_ior (char *filename) int Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:f:xk:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:f:xk:"); int c; int result; diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index 690b329a7d7..2eb9ac6be6f 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -2,20 +2,23 @@ #include "Client_i.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Time, client, "$Id$") // This function runs the Time Service client test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Client_i client; ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Time Service Client\n")); - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; else return client.run (); diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 13f5084d1f6..201d04d92df 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -99,7 +99,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL) CORBA::ULong length = link_name_seq2->length (); for (i = 0; i < length; i++) { - if (ACE_OS::strcmp (link_name_seq2[i], "Bootstrap") != 0) + if (ACE_OS::strcmp (static_cast<const char*>(link_name_seq2[i]), "Bootstrap") != 0) break; } diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index e13b3b0766b..b56bf53f635 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -272,7 +272,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv) quiet_ (0), ior_ (0) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -299,7 +299,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv) if (arg_shifter.is_parameter_next ()) { const char* file_name = arg_shifter.get_current (); - ior_file = ACE_OS::fopen (file_name, "r"); + ior_file = ACE_OS::fopen (file_name, ACE_TEXT("r")); if (ior_file == 0) ACE_ERROR ((LM_ERROR, @@ -309,7 +309,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv) arg_shifter.consume_arg (); } else - ior_file = ACE_OS::fdopen (ACE_STDIN, "r"); + ior_file = ACE_OS::fdopen (ACE_STDIN, ACE_TEXT("r")); if (ior_file != 0) { diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index de4935df75c..fdda73a79c3 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -5,6 +5,7 @@ #include "TTestS.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "orbsvcs/CosTradingC.h" #include "orbsvcs/CosTradingReposC.h" diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index 008ef7449a7..ef1fa9fec52 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -24,6 +24,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, utils, pi, codecfactory { } project(*export test): namingexe, trading_serv, utils { + exename = export_test after += Trading_Test_Lib libs += TTest @@ -36,6 +37,7 @@ project(*export test): namingexe, trading_serv, utils { } project(*import test): namingexe, trading_serv, utils { + exename = import_test after += Trading_Test_Lib libs += TTest @@ -48,6 +50,7 @@ project(*import test): namingexe, trading_serv, utils { } project(*colocated test): namingexe, trading_serv, utils { + exename = colocated_test after += Trading_Test_Lib libs += TTest diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 67d9232a315..965cead51a2 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -2,6 +2,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Utils/ORB_Manager.h" #include "Offer_Exporter.h" #include "Offer_Importer.h" @@ -18,7 +19,7 @@ parse_args (int argc, char *argv[], CORBA::Boolean& verbose) { int opt; - ACE_Get_Opt get_opt (argc, argv, "fq"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "fq"); verbose = 1; while ((opt = get_opt ()) != EOF) @@ -29,17 +30,19 @@ parse_args (int argc, char *argv[], } int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. CORBA::Boolean verbose = 0; - ::parse_args (argc, argv, verbose); + ::parse_args (convert.get_argc(), convert.get_ASCII_argv(), verbose); // Initialize ORB. CORBA::ORB_var orb = orb_manager.orb (); diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 9078aa74b23..eeaa244912a 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -13,16 +13,18 @@ ACE_RCSID (Trading, "$Id$") int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. - TT_Parse_Args parse_args (argc, argv); + TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv()); // Init the orb and bootstrap to the trading service. CORBA::ORB_var orb = orb_manager.orb (); @@ -129,14 +131,14 @@ main (int argc, char** argv) size_t offset = 0; char file[1024]; - ACE_OS::strcpy(file, argv[0]); + ACE_OS::string_copy(file, argv[0], sizeof(file)/sizeof(file[0])); if ((offset = (size_t)ACE_OS::strrchr(file, '/')) != 0) { offset -= ((size_t)file - 1); } ACE_OS::strcpy(file + offset, "export_test_ready"); FILE *ready_file = - ACE_OS::fopen (file, "w"); + ACE_OS::fopen (file, ACE_TEXT("w")); if (ready_file != 0) { ACE_OS::fprintf (ready_file, "The export test is ready\n"); ACE_OS::fclose (ready_file); diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index f303d292998..0d21623d5f8 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -6,16 +6,18 @@ ACE_RCSID(Trading, import_test, "$Id$") int -main (int argc, char** argv) +ACE_TMAIN (int argc, ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. - TT_Parse_Args parse_args (argc, argv); + TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv()); // Initialize the ORB and bootstrap to the Lookup interface. CORBA::ORB_var orb = orb_manager.orb (); diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 54eb5f996f4..9a1f221c92b 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -20,16 +20,18 @@ // ============================================================================ #include "ior_corbaname_client_i.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { IOR_corbaname_Client_i client; - if (client.init (argc, argv) == -1) + if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; else { diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp index d183b4ff8a9..c3dc6049385 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp @@ -21,6 +21,7 @@ #include "ior_corbaname_client_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Read_Buffer.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index 4582f0445a0..aefa18b60be 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -2,16 +2,19 @@ #include "status_i.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" /* the ORB name, it can be anything! */ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index f4f3d3311c2..67dacf5f7d6 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -29,6 +29,7 @@ #include "ace/Service_Config.h" #include "ace/Log_Msg.h" #include "ace/CORBA_macros.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (tests_svc_loader, @@ -36,15 +37,16 @@ ACE_RCSID (tests_svc_loader, "$Id$") -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // There must be at least one argument, the file that has to be @@ -60,7 +62,7 @@ int main (int argc, char *argv []) // Use the first argument to create the object reference. CORBA::Object_var object = - orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); + orb->string_to_object (convert.get_ASCII_argv()[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if this object reference is a valid one.. diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp index 3777b0ed92e..efe1d379bcf 100644 --- a/TAO/performance-tests/Anyop/anyop.cpp +++ b/TAO/performance-tests/Anyop/anyop.cpp @@ -34,7 +34,7 @@ ACE_RCSID (Anyop, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -55,7 +55,7 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_Get_Opt get_opt (argc, argv, "dien:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dien:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index ef0f50f3cc3..91ffb75cdac 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -48,7 +48,7 @@ private: }; int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -214,7 +214,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp index 81ae5c39bd0..17a66239fe4 100644 --- a/TAO/performance-tests/Callback/server.cpp +++ b/TAO/performance-tests/Callback/server.cpp @@ -17,7 +17,7 @@ const char *ior_file_name = "test.ior"; static int parse_args (int argc, char *argv[]); int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -144,7 +144,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index a5db0ce0523..05185538e7d 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -261,7 +261,7 @@ DII_Cubit_Client::init (int argc, char **argv) int DII_Cubit_Client::parse_args (void) { - ACE_Get_Opt opts (argc_, argv_, "dn:i:f:x"); + ACE_Get_Arg_Opt<char> opts (argc_, argv_, "dn:i:f:x"); int c; int result; @@ -849,7 +849,7 @@ DII_Cubit_Client::run (void) // Start the test. -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { DII_Cubit_Client cubit_client; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index a1cb973c59d..fc622198ec4 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -216,7 +216,7 @@ Cubit_Client::read_ior (const char *filename) int Cubit_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "b:t:z:ovdn:f:k:xsq"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "b:t:z:ovdn:f:k:xsq"); int c = 0; int result = 0; u_int test_mask = 0; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp index 2d7ef27249d..da89e69eb6c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp @@ -20,7 +20,7 @@ Cubit_Server::Cubit_Server (void) int Cubit_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc index fb8d3c5430a..4cdf7d539b9 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc @@ -11,6 +11,7 @@ project(*IDL): taoidldefaults, strategies { } project(*Server): taoexe, utils, portableserver, strategies { + exename = server after += *IDL Source_Files { @@ -28,6 +29,7 @@ project(*Server): taoexe, utils, portableserver, strategies { } project(*client): taoexe, portableserver, strategies { + exename = client after += *IDL Source_Files { diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp index 16fad32ff86..f00701de174 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp @@ -19,7 +19,7 @@ ACE_RCSID(IDL_Cubit, client, "$Id$") // This function runs the client test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp index 389f51d958d..740b4ae7174 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -73,9 +73,9 @@ svr_worker (void *arg) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "s:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:"); int c = -1; const char *client_cmd = 0; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp index f28cd411ef0..896f08a847c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp @@ -25,7 +25,7 @@ ACE_RCSID(IDL_Cubit, server, "$Id$") // This runs the server test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = ACE_THR_PRI_FIFO_DEF; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp index c8408545aac..dbc9deab6d7 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp @@ -26,7 +26,7 @@ Globals::Globals (void) int Globals::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "e:t:f:rm"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "e:t:f:rm"); int c; while ((c = opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc index d5cc27cdc06..8faec28172a 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc @@ -9,6 +9,7 @@ project(*IDL): taoidldefaults, strategies { } project(*server): taoexe, utils, portableserver, strategies { + exename = server after += *IDL Source_Files { @@ -26,6 +27,7 @@ project(*server): taoexe, utils, portableserver, strategies { } project(*client): taoexe, utils, portableserver, strategies { + exename = client after += *IDL Source_Files { diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index 876035b66dc..5f05114936d 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -59,7 +59,7 @@ Task_State::Task_State (void) int Task_State::parse_args (int argc,char *argv[]) { - ACE_Get_Opt opts (argc, argv, "mu:n:t:d:rxof:g:1cl"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "mu:n:t:d:rxof:g:1cl"); int c; while ((c = opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp index e0d97da8166..334d9a5e43d 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp @@ -840,7 +840,7 @@ Client_i::do_thread_per_rate_test (void) // metrics and print them. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::LOGGER); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp index 9235f275e82..e134d0daa3c 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp @@ -370,7 +370,7 @@ Server::start_servants (void) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int result; diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp index 00a51f7de75..37fbacfd3b7 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp @@ -20,7 +20,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index ac678fc1a15..5ce43c9feb8 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -19,7 +19,7 @@ int niterations = 1000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:"); int c; while ((c = get_opts ()) != -1) @@ -50,7 +50,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp index 9aefa38f531..e32ae697223 100644 --- a/TAO/performance-tests/Latency/AMI/server.cpp +++ b/TAO/performance-tests/Latency/AMI/server.cpp @@ -16,7 +16,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -45,7 +45,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp index f4c6d4c2719..deb43edaebc 100644 --- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp +++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp @@ -14,7 +14,7 @@ int niterations = 250000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,7 @@ set_priority() } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { //Use Real-time Scheduling class if possible set_priority(); diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index 7bc5b0b292f..6ea7ad4547c 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -24,7 +24,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -62,7 +62,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index e4460d924b3..f7f6f6e1bc2 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -20,7 +20,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -58,7 +58,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp index e986310ab43..967c3737022 100644 --- a/TAO/performance-tests/Latency/DSI/server.cpp +++ b/TAO/performance-tests/Latency/DSI/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index e7bd528901c..abf63e338ce 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -30,7 +30,7 @@ int do_dump_history = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:b:"); int c; while ((c = get_opts ()) != -1) @@ -74,7 +74,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp index 00a51f7de75..37fbacfd3b7 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp @@ -20,7 +20,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp index fcc91075b87..76995b229bd 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp @@ -18,7 +18,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +52,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 26f9ed145c8..3b08c934984 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp index bb830e88a0f..9053276eed0 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp @@ -18,7 +18,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +52,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index 11acf78a42d..8bd983e6f69 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -15,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp index f883c9d7749..87b90e674b6 100644 --- a/TAO/performance-tests/Memory/IORsize/client.cpp +++ b/TAO/performance-tests/Memory/IORsize/client.cpp @@ -12,7 +12,7 @@ static int n = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp index 712dafdf097..305de0b1de3 100644 --- a/TAO/performance-tests/Memory/IORsize/server.cpp +++ b/TAO/performance-tests/Memory/IORsize/server.cpp @@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp index 50c39fc24fd..f5b2b16f7da 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp @@ -10,7 +10,7 @@ static int n = 100; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp index 712dafdf097..305de0b1de3 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp @@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 356f3c6ecbb..58860694521 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -21,7 +21,7 @@ ACE_UINT32 gsf; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:"); int c; while ((c = get_opts ()) != -1) @@ -131,7 +131,7 @@ object_creation_test (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { set_rt_scheduling (); diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp index 9a013dadf0b..7ad8fd35061 100644 --- a/TAO/performance-tests/POA/Demux/client.cpp +++ b/TAO/performance-tests/POA/Demux/client.cpp @@ -22,7 +22,7 @@ ACE_RCSID(CodeGen, client, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Set TAO_debug_level to 0 to ensure silent running unless diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp index fae7f9c0d20..d20dc2d7401 100644 --- a/TAO/performance-tests/POA/Demux/demux_stats.cpp +++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp @@ -46,7 +46,7 @@ int Demux_Stats::parse_args (int argc_, char * argv_ []) { - ACE_Get_Opt get_opts (argc_, argv_, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "i:"); int c; iterations = 0; @@ -337,7 +337,7 @@ if (iterations == 0) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Demux_Stats demux_stats; diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index 13816186585..dee326e1312 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -145,7 +145,7 @@ int Demux_Test_Client::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 308a59127c6..2518046b95f 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -385,7 +385,7 @@ int Demux_Test_Server::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:o:p:ut"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:o:p:ut"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp index 629bb31cf5f..b45ccf5b9cd 100644 --- a/TAO/performance-tests/POA/Demux/server.cpp +++ b/TAO/performance-tests/POA/Demux/server.cpp @@ -22,7 +22,7 @@ ACE_RCSID(CodeGen, server, "$Id$") -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Set TAO_debug_level to 0 to ensure silent running unless // debugging is explicitly invoked diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp index c5c9c8bfc77..9b7478779c9 100644 --- a/TAO/performance-tests/POA/Demux/write_names.cpp +++ b/TAO/performance-tests/POA/Demux/write_names.cpp @@ -2,7 +2,7 @@ #include <stdio.h> int -main(int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { for(int i=0; i<1000; i++) diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index d3b7ab3d1e0..60cae56fe58 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -18,7 +18,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -56,7 +56,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 562e77540ef..9e83b5ff22c 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -17,7 +17,7 @@ int do_dump_history = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:"); int c; while ((c = get_opts ()) != -1) @@ -46,7 +46,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 9f3699650df..e593e3c78e7 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index c3a276474ba..776bdcec6cf 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -80,7 +80,7 @@ static u_long iterations = 1000; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "i:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:r"); int c; while ((c = get_opts ()) != -1) @@ -340,7 +340,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp index 11b369339f8..b9d1906a487 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp @@ -109,7 +109,7 @@ PP_Test_Client::read_ior (char *filename) int PP_Test_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "ovdn:f:k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "ovdn:f:k:x"); int c; int result; diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp index 593a4d3bdb7..e202209bab9 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp @@ -15,7 +15,7 @@ PP_Test_Server::PP_Test_Server (void) int PP_Test_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Pluggable/client.cpp b/TAO/performance-tests/Pluggable/client.cpp index 40dabed1023..e59d5a9d1e0 100644 --- a/TAO/performance-tests/Pluggable/client.cpp +++ b/TAO/performance-tests/Pluggable/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(IDL_Cubit, client, "$Id$") // This function runs the client test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { PP_Test_Client pp_test_client; diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp index 6d781f12420..25bf5d42b94 100644 --- a/TAO/performance-tests/Pluggable/server.cpp +++ b/TAO/performance-tests/Pluggable/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(IDL_Cubit, server, "$Id$") // This runs the server test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { PP_Test_Server pp_test_server; diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc index f5a235aa7de..184699b9899 100644 --- a/TAO/performance-tests/Protocols/Protocols.mpc +++ b/TAO/performance-tests/Protocols/Protocols.mpc @@ -36,6 +36,7 @@ project(*Distributor): rt_server { project(*Sender): rt_client { avoids += ace_for_tao after += *IDL + exename = sender specific (automake ) { includes += $(srcdir)/../../tests/RTCORBA/Diffserv diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp index 5a7ad1c1735..0792320bad5 100644 --- a/TAO/performance-tests/Protocols/distributor.cpp +++ b/TAO/performance-tests/Protocols/distributor.cpp @@ -16,7 +16,7 @@ static int number_of_connection_attempts = 20; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:k:"); int c; while ((c = get_opts ()) != -1) @@ -348,7 +348,7 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp index 586fab9059b..42ff72185b2 100644 --- a/TAO/performance-tests/Protocols/receiver.cpp +++ b/TAO/performance-tests/Protocols/receiver.cpp @@ -17,7 +17,7 @@ static ACE_UINT32 gsf = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "d:f:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "d:f:m:"); int c; while ((c = get_opts ()) != -1) @@ -343,7 +343,7 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { gsf = ACE_High_Res_Timer::global_scale_factor (); diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp index 5558f0abcee..6079f66f602 100644 --- a/TAO/performance-tests/Protocols/sender.cpp +++ b/TAO/performance-tests/Protocols/sender.cpp @@ -45,7 +45,7 @@ static Test_Type test_type = PACED; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:"); int c; while ((c = get_opts ()) != -1) @@ -678,7 +678,7 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { gsf = ACE_High_Res_Timer::global_scale_factor (); diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index 5a1b5a0af83..b6db32627d8 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -75,7 +75,7 @@ int priorities[MAX_THREADS]; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:t:n:p:"); int c; while ((c = get_opts ()) != -1) @@ -114,7 +114,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int flags = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index d163ae4de46..e519cf3c333 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -52,7 +52,7 @@ const char *ior_output_file_base = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:t:"); int c; while ((c = get_opts ()) != -1) @@ -83,7 +83,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int flags = THR_NEW_LWP|THR_JOINABLE|THR_SCHED_FIFO|THR_BOUND; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index d8094de1d7a..18823b9f315 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -75,7 +75,7 @@ int priorities[MAX_THREADS]; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:t:n:p:"); int c; while ((c = get_opts ()) != -1) @@ -114,7 +114,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int flags = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index a21dc9dc0c4..0093dab42d9 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -11,7 +11,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,7 +35,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int priority = diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc index a05388566f9..81e994c44a9 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc @@ -8,6 +8,7 @@ project(*oneways idl RT): taoidldefaults { } project(*oneways server RT): rt_server, messaging, minimum_corba { + exename = server after += *oneways_idl_RT Source_Files { test_i.cpp @@ -20,6 +21,7 @@ project(*oneways server RT): rt_server, messaging, minimum_corba { } project(*oneways client RT): rt_client, messaging, minimum_corba { + exename = client after += *oneways_idl_RT Source_Files { testC.cpp diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index f09a8e1343b..f2e8e93ba08 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -279,7 +279,7 @@ oneway_payload_test (Test_ptr server static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ps:k:i:t:l:m:w:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ps:k:i:t:l:m:w:x"); int error = 0; int c; @@ -421,7 +421,7 @@ set_rt_mode (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int result = set_rt_mode (); if (result != 0) diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index f4b4b02b8d1..5876bf9db6f 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -14,7 +14,7 @@ static const char *ior_output_file = "test.ior"; static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -85,7 +85,7 @@ set_rt_mode (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int result = set_rt_mode (); if (result != 0) diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index d64f68b5139..e6d7516d49a 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -64,7 +64,7 @@ struct Synchronizers int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:e:g:hi:k:m:p:q:r:t:u:v:w:x:y:z:" //client options "b:f:hl:n:o:s:" // server options ); @@ -1161,7 +1161,7 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index 07f49bbd3e0..aa644912fe9 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -87,7 +87,7 @@ static const char *lanes_file = "empty-file"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:f:hl:n:o:s:" // server options "c:e:g:hi:j:k:m:p:q:r:t:u:v:w:x:y:z:" // client options ); @@ -419,7 +419,7 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index 18946dca23f..12b23ba0dfe 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -23,7 +23,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -340,7 +340,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index c1343244eab..ca8fe52c671 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -27,7 +27,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:k:i:"); int c; while ((c = get_opts ()) != -1) @@ -373,7 +373,7 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip, // Main function starts below int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp index 9aefa38f531..e32ae697223 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp @@ -16,7 +16,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -45,7 +45,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp index 624c7ddfb6b..fe091c21188 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp @@ -30,7 +30,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -391,7 +391,7 @@ test_longlong_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL) // The main() function starts here int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp index f7ce55b8577..aba45587714 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index 8298ea4930b..e961019a151 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -25,7 +25,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -349,7 +349,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp index e986310ab43..967c3737022 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index b93bbd8ffbd..42218309dbc 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -32,7 +32,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:b:"); int c; while ((c = get_opts ()) != -1) @@ -537,7 +537,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) // The main() function starts here int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp index 20ea98c2655..986dba26367 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp index 2352cf06b92..0b5161cd427 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp @@ -23,7 +23,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ht:xs:k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ht:xs:k:i:"); int c; while ((c = get_opts ()) != -1) @@ -344,7 +344,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index b3f4e9e135d..6fbf15575e6 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp index af752262c0d..ea6bf756aef 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp @@ -21,7 +21,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -74,7 +74,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 26f9ed145c8..3b08c934984 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp index f12757f7de8..2bb99cb12fe 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp @@ -21,7 +21,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -73,7 +73,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 2f0ba140ea3..590c5046486 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -15,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp index 9d879e772d0..f690c2cdff7 100644 --- a/TAO/performance-tests/Throughput/client.cpp +++ b/TAO/performance-tests/Throughput/client.cpp @@ -16,7 +16,7 @@ int do_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:b:i:n:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:b:i:n:x"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index 68afc375a0d..2470b9d4492 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -11,7 +11,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,7 +34,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/perf.mwc b/TAO/performance-tests/perf.mwc index dd297256b34..c4f1602ccc3 100644 --- a/TAO/performance-tests/perf.mwc +++ b/TAO/performance-tests/perf.mwc @@ -2,4 +2,5 @@ // $Id$ workspace { + cmdline += -base no_wchar } diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 4be1b0d7920..838013e48dc 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -164,7 +164,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Invalid endpoint ") ACE_TEXT ("specification: <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (iop.c_str ()))); } ACE_THROW_RETURN (CORBA::BAD_PARAM ( @@ -253,7 +253,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Invalid endpoint ") ACE_TEXT ("specification: <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (iop.c_str ()))); } ACE_THROW_RETURN (CORBA::BAD_PARAM ( @@ -392,7 +392,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*i)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*i)->protocol_name ().c_str ()) )); } @@ -433,7 +433,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*i)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*i)->protocol_name ().c_str ()) )); } @@ -562,7 +562,7 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ()) )); } @@ -603,7 +603,7 @@ TAO_Acceptor_Registry::open_default_i (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to open ") ACE_TEXT ("default acceptor for <%s>%p\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()), + ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ()), ACE_TEXT ("") )); } @@ -764,7 +764,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ()) )); } @@ -858,7 +858,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("unable to open acceptor ") ACE_TEXT ("for <%s>%p\n"), - ACE_TEXT_CHAR_TO_TCHAR (address.c_str ()), + ACE_TEXT_TO_TCHAR_IN (address.c_str ()), ACE_TEXT (""))); } @@ -880,7 +880,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (address.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (address.c_str ()))); } ACE_THROW_RETURN (CORBA::NO_MEMORY ( diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 57bf9f564dc..588a45691e3 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -357,7 +357,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_string s) void CORBA::Any::operator<<= (CORBA::Any::from_wstring ws) { - if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_) + if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::strlen (ws.val_) > ws.bound_) { return; } diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index b07e186305c..c7a98213742 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -362,7 +362,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (arg))); + ACE_TEXT_TO_TCHAR_IN (arg))); } CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode (); (void) TAO_Marshal_Object::perform_append (tc, @@ -433,7 +433,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" ))); + ACE_TEXT_TO_TCHAR_IN (nv->name ()? nv->name () : "(no name given)" ))); } CORBA::Any_ptr any = nv->value (); diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index d3b8fbb84a7..92369055416 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -180,7 +180,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, ACE_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ") ACE_TEXT("could not parse from %s"), - ACE_TEXT_CHAR_TO_TCHAR(ior))); + ACE_TEXT_TO_TCHAR_IN(ior))); ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO), CORBA::Object::_nil ()); @@ -212,7 +212,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, ACE_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ") ACE_TEXT("could not parse from %s"), - ACE_TEXT_CHAR_TO_TCHAR(ior))); + ACE_TEXT_TO_TCHAR_IN(ior))); ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO), CORBA::Object::_nil ()); diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index 89e687db0d4..1ad750f966e 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -57,10 +57,10 @@ TAO_Codeset_Descriptor::ncs (const ACE_TCHAR *name) { ACE_CDR::ULong n = 0; if (ACE_Codeset_Registry::locale_to_registry - (ACE_TEXT_ALWAYS_CHAR(name), n) == 0) + (ACE_TEXT_TO_CHAR_IN(name), n) == 0) { char **endPtr =0; - n = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(name), + n = ACE_OS::strtoul(ACE_TEXT_TO_CHAR_IN(name), endPtr, 0); } this->ncs(n); diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 98664b6f60e..3d26ac2e423 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -419,7 +419,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, { tlist->translator_factory_ = ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>::instance - (ACE_TEXT_ALWAYS_CHAR (tlist->name_)); + (ACE_TEXT_TO_CHAR_IN (tlist->name_)); if (tlist->translator_factory_ == 0) { diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 16db7f30129..06ae5f23460 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -81,7 +81,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to open connector for ") ACE_TEXT ("<%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())), + ACE_TEXT_TO_TCHAR_IN((*factory)->protocol_name ().c_str ())), -1); } diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h index 926b52958c1..b63130c2e56 100644 --- a/TAO/tao/DLL_Parser.h +++ b/TAO/tao/DLL_Parser.h @@ -52,7 +52,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * Such an application could be written as follows: * - * int main (int argc, char* argv) + * int ACE_TMAIN (int argc, char* argv) * { * CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); * diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 796cc529bd3..e414c793964 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -513,7 +513,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs } } - return ACE_OS::wscmp (rhs_v, lhs_v) == 0; + return ACE_OS::strcmp (rhs_v, lhs_v) == 0; } default: break; // Cannot happen... diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index b4f5f05dfb5..c2f82a05cca 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -731,7 +731,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (bound > 0 && bound < ACE_OS::wslen (value)) + if (bound > 0 && bound < ACE_OS::strlen (value)) { ACE_THROW (DynamicAny::DynAny::InvalidValue ()); } diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 62b2ef0b142..a8c13eaa997 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -189,7 +189,7 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (info))); + ACE_TEXT_TO_TCHAR_IN (info))); CORBA::SystemException *x2 = CORBA::SystemException::_downcast (this->exception_); @@ -202,11 +202,11 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"), - ACE_TEXT_CHAR_TO_TCHAR (id))); + ACE_TEXT_TO_TCHAR_IN (id))); } else ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info))); + ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_TO_TCHAR_IN (info))); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 16f65716ead..e3e1deb2d4e 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -94,21 +94,19 @@ CORBA::Exception::_tao_print_exception (const char *user_provided_info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) EXCEPTION, %s\n") ACE_TEXT ("%s\n"), - ACE_TEXT_CHAR_TO_TCHAR (user_provided_info), - ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN (user_provided_info), + ACE_TEXT_TO_TCHAR_IN (this->_info ().c_str ()))); } -#if defined (ACE_USES_WCHAR) void -CORBA::Exception::_tao_print_exception (const ACE_WCHAR_T *info, +CORBA::Exception::_tao_print_exception (const wchar_t *info, FILE *f) const { // Even though this call causes additional type conversions, this is // better for the maintenance. Plus, this will occur only on // exception anyway. - this->_tao_print_exception (ACE_TEXT_ALWAYS_CHAR (info), f); + this->_tao_print_exception (ACE_TEXT_TO_CHAR_IN (info), f); } -#endif // ACE_USES_WCHAR void CORBA::Exception::_tao_any_destructor (void *x) diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 08c631d3521..430b6242339 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -139,15 +139,11 @@ namespace CORBA */ void _tao_print_exception (const char *info, FILE *f = stdout) const; - -#if defined (ACE_USES_WCHAR) - /// ACE_WCHAR_T version of _tao_print_exception. /** * @note This method is TAO-specific. */ - void _tao_print_exception (const ACE_WCHAR_T *info, + void _tao_print_exception (const wchar_t *info, FILE *f = stdout) const; -#endif // ACE_USES_WCHAR /// Returns a string containing information about the exception. This /// function is not CORBA compliant. diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index b092eea96be..b297b933f86 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -46,7 +46,7 @@ TAO_FILE_Parser::parse_string (const char *ior, const char *filename = ior + sizeof (::file_prefix)+1; - FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR (filename), + FILE* file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN (filename), ACE_TEXT("r")); if (file == 0) diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 626e432684a..552931d090f 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1630,12 +1630,12 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, "TAO (%P|%t) - GIOP_Message_Base::dump_msg, " "%s GIOP v%c.%c msg, %d data bytes, %s endian, " "Type %s[%u]\n", - ACE_TEXT_CHAR_TO_TCHAR (label), + ACE_TEXT_TO_TCHAR_IN (label), digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]], digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]], len - TAO_GIOP_MESSAGE_HEADER_LEN , (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"), - ACE_TEXT_CHAR_TO_TCHAR(message_name), + ACE_TEXT_TO_TCHAR_IN(message_name), *id)); if (TAO_debug_level >= 10) diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index a3c30058d59..80336ad5680 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1653,10 +1653,10 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P | %t):%s GIOP lite msg, ") ACE_TEXT ("%d data bytes, %s endian, <%s = %d> \n"), - ACE_TEXT_CHAR_TO_TCHAR(label), + ACE_TEXT_TO_TCHAR_IN(label), len - TAO_GIOP_LITE_HEADER_LEN, (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"), - ACE_TEXT_CHAR_TO_TCHAR (message_name), + ACE_TEXT_TO_TCHAR_IN (message_name), *id)); if (TAO_debug_level >= 10) diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 8663c1118c3..11c2d1ccafb 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -468,7 +468,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, ") ACE_TEXT ("Overriding address in IOR with %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->hostname_in_ior_))); + ACE_TEXT_TO_TCHAR_IN (this->hostname_in_ior_))); } specified_hostname = this->hostname_in_ior_; } @@ -677,7 +677,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -1130,7 +1130,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR(argv[i]->c_str ())), + ACE_TEXT_TO_TCHAR_IN(argv[i]->c_str ())), -1); ACE_CString name = argv[i]->substring (0, slot); diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index d65d0ae017d..ddfda1fdb1b 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -398,7 +398,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( ACE_TEXT("process_listen_point_list, ") ACE_TEXT("Listening port [%d] on [%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()))); } // Construct an IIOP_Endpoint object using the host as provided diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index cd32ff04f90..0c2e7d070ad 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -317,7 +317,7 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::begin_connection, ") ACE_TEXT ("to <%s:%d> which should %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()), + ACE_TEXT_TO_TCHAR_IN(iiop_endpoint->host()), iiop_endpoint->port(), r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index 4b9bc703257..00a00383fd6 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -109,7 +109,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( ACE_DEBUG ((LM_WARNING, "(%P|%t) Exception thrown while processing " "IORInterceptor \"%s\">\n", - ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); + ACE_TEXT_TO_TCHAR_IN (name.in ()))); } ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION, diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 47fc9c960fe..42be4db0bec 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -124,7 +124,7 @@ namespace TAO if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Informing IMR that we are running at: %s\n", - ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str()))); + ACE_TEXT_TO_TCHAR_IN (partial_ior.c_str()))); ACE_TRY { diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 6d182f8846b..67daf563367 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -190,7 +190,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, else { // Set NIC - dgram.set_nic (ACE_TEXT_CHAR_TO_TCHAR (mcast_nic), + dgram.set_nic (ACE_TEXT_TO_TCHAR_IN (mcast_nic), multicast_addr.get_type ()); // Set TTL @@ -329,7 +329,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, else if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%N: service resolved to IOR <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (buf))); + ACE_TEXT_TO_TCHAR_IN (buf))); } } } @@ -339,7 +339,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, { ACE_ERROR ((LM_ERROR, ACE_TEXT("\nmulticast discovery of %s failed.\n"), - ACE_TEXT_CHAR_TO_TCHAR (service_name))); + ACE_TEXT_TO_TCHAR_IN (service_name))); if (ACE_OS::strcasecmp (service_name, "NameService") == 0) diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index e25baaaa44a..98bb700a342 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -190,7 +190,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("CORBA::ORB::destroy() called on ORB <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ()))); + ACE_TEXT_TO_TCHAR_IN (this->orb_core ()->orbid ()))); } this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1422,7 +1422,7 @@ CORBA::ORB_init (int &argc, if (arg_shifter.is_parameter_next ()) { orbid_string = - ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ()); + ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()); arg_shifter.consume_arg (); } } @@ -1434,9 +1434,9 @@ CORBA::ORB_init (int &argc, // but we should skip an optional space... if (current_arg[orbid_len] == ' ') orbid_string = - ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len + 1); + ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len + 1); else - orbid_string = ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len); + orbid_string = ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len); } else arg_shifter.ignore_arg (); @@ -1555,7 +1555,7 @@ CORBA::ORB_init (int &argc, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) created new ORB <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (orbid_string.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (orbid_string.c_str ()))); } // Before returning remember to store the ORB into the table... diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 1aaee6f79cc..f7cf9ca0caf 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -140,7 +140,7 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void) valuetype_adapter_factory_name_ ("valuetype_Adapter_Factory"), poa_factory_name_ ("TAO_Object_Adapter_Factory"), poa_factory_directive_ - (ACE_TEXT_ALWAYS_CHAR + (ACE_TEXT_TO_CHAR_IN (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "TAO_PortableServer", "_make_TAO_Object_Adapter_Factory", @@ -464,7 +464,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // If there is a '@' also, it means that the network // interface name is specified. this->orb_params ()->mcast_discovery_endpoint ( - ACE_TEXT_ALWAYS_CHAR(current_arg)); + ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } @@ -616,7 +616,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) (ACE_TEXT("-ORBPreferredInterfaces")))) { if (this->orb_params ()->preferred_interfaces ( - ACE_TEXT_ALWAYS_CHAR (current_arg)) == false) + ACE_TEXT_TO_CHAR_IN (current_arg)) == false) ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_ORB_CORE_INIT_LOCATION_CODE, @@ -689,9 +689,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::COMPLETED_NO), -1); } - ACE_CString object_id (ACE_TEXT_ALWAYS_CHAR(current_arg), + ACE_CString object_id (ACE_TEXT_TO_CHAR_IN(current_arg), pos - current_arg); - ACE_CString IOR (ACE_TEXT_ALWAYS_CHAR(pos + 1)); + ACE_CString IOR (ACE_TEXT_TO_CHAR_IN(pos + 1)); if (!this->init_ref_map_.insert ( std::make_pair (InitRefMap::key_type (object_id), InitRefMap::data_type (IOR))).second) @@ -713,8 +713,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) (ACE_TEXT("-ORBDefaultInitRef")))) { // Set the list of prefixes from -ORBDefaultInitRef. - this->orb_params ()->default_init_ref - (ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->orb_params ()->default_init_ref (ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } @@ -773,8 +772,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (-1); - output_stream->open (ACE_TEXT_ALWAYS_CHAR (file_name), - ios::out | ios::app); + output_stream->open (ACE_TEXT_TO_CHAR_IN (file_name), ios::out | ios::app); if (!output_stream->bad ()) { @@ -852,7 +850,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // The this->server_id_ is to uniquely identify a server to // an IMR. // Fill in later. - this->server_id_.set(ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->server_id_.set(ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } @@ -886,7 +884,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // All endpoint strings should be of the above form(s). this->set_endpoint_helper (TAO_DEFAULT_LANE, - ACE_TEXT_ALWAYS_CHAR (current_arg) + ACE_TEXT_TO_CHAR_IN (current_arg) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -901,7 +899,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // used. this->set_endpoint_helper (TAO_DEFAULT_LANE, - ACE_TEXT_ALWAYS_CHAR (current_arg) + ACE_TEXT_TO_CHAR_IN (current_arg) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -918,14 +916,13 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) if (arg_shifter.is_option_next ()) return -1; - ACE_CString lane (ACE_TEXT_ALWAYS_CHAR (current_arg)); + ACE_CString lane (ACE_TEXT_TO_CHAR_IN (current_arg)); arg_shifter.consume_arg (); if (arg_shifter.is_option_next ()) return -1; - ACE_CString endpoints (ACE_TEXT_ALWAYS_CHAR - (arg_shifter.get_current ())); + ACE_CString endpoints (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ())); arg_shifter.consume_arg (); this->set_endpoint_helper (lane, @@ -1336,7 +1333,7 @@ TAO_ORB_Core::fini (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Destroying ORB <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->orbid_))); + ACE_TEXT_TO_TCHAR_IN (this->orbid_))); } // Finalize lane resources. @@ -1782,8 +1779,7 @@ TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL) if (factory == 0) { - this->configuration()->process_directive ( - ACE_TEXT_CHAR_TO_TCHAR ( + this->configuration()->process_directive (ACE_TEXT_TO_TCHAR_IN ( static_resources->poa_factory_directive_.c_str())); factory = @@ -2622,7 +2618,7 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane, ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)\n") ACE_TEXT ("Invalid endpoint(s) specified:\n%s\n"), - ACE_TEXT_CHAR_TO_TCHAR(endpoints.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(endpoints.c_str ()))); ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( TAO_ORB_CORE_INIT_LOCATION_CODE, diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index f5071ad0466..22de5e5fa4f 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -57,7 +57,7 @@ TAO_Object_Ref_Table::bind (const char *id, ACE_TEXT ("bind:") ACE_TEXT (" Could not register duplicate object <%s> ") ACE_TEXT ("with the ORB\n"), - ACE_TEXT_CHAR_TO_TCHAR (id))); + ACE_TEXT_TO_TCHAR_IN (id))); } return -1; diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index c0b75b8b6fe..d4a44d9cb18 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -51,7 +51,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%s' (length=%d) failed\n"), - ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length), + ACE_TEXT_TO_TCHAR_IN (opname ? opname : "<null string>"), length), -1); } @@ -77,7 +77,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%s' (length=%d) failed\n"), - ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length), + ACE_TEXT_TO_TCHAR_IN (opname ? opname : "<null string>"), length), -1); } diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp index d980f303b74..db6f88df047 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp @@ -18,7 +18,7 @@ namespace PortableServer // We DO NOT include the zero terminator, as this is simply an // artifact of the way strings are stored in C. // - u_int string_length = ACE_OS::wslen (string); + u_int string_length = ACE_OS::strlen (string); CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar); diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 686e4759d51..1ec42159b3c 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -2163,7 +2163,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "IMR IOR = \n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ()))); + ACE_TEXT_TO_TCHAR_IN (imr_str.in ()))); // Search for "corbaloc:" alone, without the protocol. This code // should be protocol neutral. @@ -2196,7 +2196,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "ImR-ified IOR = \n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (ior.c_str ()))); obj = this->orb_core_.orb ()->string_to_object (ior.c_str () diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 464c35660aa..8e49acb273c 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -89,7 +89,7 @@ TAO_RT_ORBInitializer::pre_init ( // If the application resolves the root POA, make sure we load the RT POA. TAO_ORB_Core::set_poa_factory (rt_poa_factory_name, - ACE_TEXT_ALWAYS_CHAR (rt_poa_factory_directive)); + ACE_TEXT_TO_CHAR_IN (rt_poa_factory_directive)); // Create the initial priority mapping instance. TAO_Priority_Mapping *pm = 0; diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 25b735ea832..fc64eb1e52c 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -173,8 +173,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("(%P|%t): %s processing using %s ") ACE_TEXT ("original thread CORBA/native priority %d/%d ") ACE_TEXT ("not changed\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_)); @@ -186,8 +186,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("(%P|%t): %s processing using %s ") ACE_TEXT ("original thread CORBA/native priority ") ACE_TEXT ("not changed\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id))); + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id))); #endif /* ACE_HAS_THREADS */ @@ -227,8 +227,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_, target_priority, @@ -244,8 +244,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("is the same as the target priority\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_)); } diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index d0a8fc4c313..7157b3d84c4 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -203,7 +203,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Received Exception %s\n", - ACE_TEXT_CHAR_TO_TCHAR (id))); + ACE_TEXT_TO_TCHAR_IN (id))); // If the remote host threw a THREAD_CANCELLED diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp index 6ce7297a70f..34f0cd5ab2e 100644 --- a/TAO/tao/Resume_Handle.cpp +++ b/TAO/tao/Resume_Handle.cpp @@ -1,6 +1,5 @@ #include "tao/Resume_Handle.h" #include "tao/ORB_Core.h" -#include "debug.h" #include "ace/Reactor.h" @@ -47,35 +46,35 @@ TAO_Resume_Handle::handle_input_return_value_hook (int& return_value) this->orb_core_ && this->orb_core_->reactor ()->resumable_handler () && this->handle_ != ACE_INVALID_HANDLE) - { - // a return value of "1" means "call me back immediately; - // but we can't "call me back immediately" on an - // already-resumed handle - return_value = 0; - - if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + // a return value of "1" means "call me back immediately; + // but we can't "call me back immediately" on an + // already-resumed handle + return_value = 0; + + if (TAO_debug_level > 6) + { + ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " - "overriding return value of 1 with retval = %d\n", - return_value)); + "overriding return value of 1 with retval = %d\n", + return_value)); + } } - } else if ( return_value == -1 ) - { - // this covers the "connection close" case, where you want - // to leave the handle suspended if you're return -1 to - // remove the handle from the Reactor. (See ChangeLog entry - // Fri Dec 16 14:40:54 2005) - this->flag_ = TAO_HANDLE_LEAVE_SUSPENDED; - - if (TAO_debug_level > 6) { - ACE_DEBUG ((LM_DEBUG, + // this covers the "connection close" case, where you want + // to leave the handle suspended if you're return -1 to + // remove the handle from the Reactor. (See ChangeLog entry + // Fri Dec 16 14:40:54 2005) + this->flag_ = TAO_HANDLE_LEAVE_SUSPENDED; + + if (TAO_debug_level > 6) + { + ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " - "handle_input returning -1, so handle is not resumed.\n")); + "handle_input returning -1, so handle is not resumed.\n")); + } } - } } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 2e527cea8ec..5eddfd095cc 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -437,7 +437,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN (this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -721,7 +721,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())), + ACE_TEXT_TO_TCHAR_IN (opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -743,7 +743,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())), + ACE_TEXT_TO_TCHAR_IN (name.c_str ())), -1); } } diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 335567bc4e1..0048e52484c 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -157,7 +157,7 @@ TAO_DIOP_Connection_Handler::open (void*) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -") ACE_TEXT("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number ())); } @@ -182,7 +182,7 @@ TAO_DIOP_Connection_Handler::open_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open_server -") ACE_TEXT("listening on %s:%d\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number () )); } diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index 22de0661c8a..58c02996213 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -122,7 +122,7 @@ TAO_DIOP_Transport::recv (char *buf, ACE_DEBUG ((LM_DEBUG, "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n", n, - ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (from_addr.get_host_name ()), from_addr.get_port_number (), errno)); } diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 393e1204a71..bedde8420cb 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -610,7 +610,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) SCIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]), this->addrs_[i].get_port_number ())); } } diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index dd83f2fac6e..981c049ea49 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -317,7 +317,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list ( ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Listening port [%d] on [%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()))); } // Construct an SCIOP_Endpoint object diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index 663bccdb60a..bb196a5d761 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -162,7 +162,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " "to <%s:%d> which should %s\n", - ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()), + ACE_TEXT_TO_TCHAR_IN(sciop_endpoint->host()), sciop_endpoint->port(), r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 5de6670b1a1..1d3e6134afb 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -206,7 +206,7 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core, return -1; // Port number must consist of digits if (port) - this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port)); + this->address_.set (ACE_TEXT_TO_TCHAR_IN(port)); return this->open_i (orb_core, reactor); @@ -331,7 +331,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_TEXT ("cannot cache hostname\n"))); return -1; } - this->host_ = ACE_TEXT_ALWAYS_CHAR(tmp_host); + this->host_ = ACE_TEXT_TO_CHAR_OUT(tmp_host); } // This avoids having child processes acquire the listen socket thereby @@ -344,7 +344,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ") ACE_TEXT ("listening on : <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->host_.c_str ()), + ACE_TEXT_TO_TCHAR_IN(this->host_.c_str ()), this->address_.get_port_number ())); } return 0; @@ -478,7 +478,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SHMIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR(opt.c_str ())), + ACE_TEXT_TO_TCHAR_IN(opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -500,7 +500,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), + ACE_TEXT_TO_TCHAR_IN(name.c_str ())), -1); } } diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index adba9338dc1..362fe65f8e2 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -146,7 +146,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "making a new connection to <%s:%d>\n", - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port ())); // Get the right synch options @@ -182,7 +182,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ") ACE_TEXT ("connection to <%s:%u> failed (%p)\n"), - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port (), ACE_TEXT ("errno"))); } @@ -196,7 +196,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "new connection to <%s:%d> on Transport[%d]\n", - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port (), svc_handler->peer ().get_handle ())); diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index dc6c0a5886f..427eda74eaa 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -384,7 +384,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -447,7 +447,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -510,7 +510,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -573,7 +573,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -606,7 +606,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to load ") ACE_TEXT("protocol <%s>, %m\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), + ACE_TEXT_TO_TCHAR_IN(name.c_str ())), -1); } @@ -614,7 +614,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) Loaded protocol <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(name.c_str ()))); } } return 0; diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index bff4141a033..b4a1fa1bfec 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -550,7 +550,7 @@ namespace TAO ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("handle_user_exception - ") ACE_TEXT ("raising exception %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (buf.in ()))); + ACE_TEXT_TO_TCHAR_IN (buf.in ()))); } mon.set_status (TAO_INVOKE_USER_EXCEPTION); diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index a55e9cc3b6a..c8954819592 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -225,7 +225,7 @@ CORBA::SystemException::_tao_print_system_exception (FILE *) const { ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%P|%t) system exception, ID '%s'\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN (this->_info ().c_str ()))); } ACE_CString diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 753a0697424..08a03b5f59a 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -152,7 +152,7 @@ TAO::ORB::open_services (ACE_Service_Gestalt* pcfg, if (argc > 0 && argv != 0) { - argv0 = ACE_TEXT_ALWAYS_CHAR (argv[0]); + argv0 = ACE_TEXT_TO_CHAR_OUT (argv[0]); } svc_config_argv.length (1); @@ -214,8 +214,8 @@ TAO::ORB::open_services (ACE_Service_Gestalt* pcfg, { if (TAO_debug_level > 0) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("TAO (%P|%t) Failed to ") - ACE_LIB_TEXT("open orb service configuration\n")), + ACE_TEXT ("TAO (%P|%t) Failed to ") + ACE_TEXT("open orb service configuration\n")), -1); return -1; } diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 7b730df42a9..3c130b10691 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -55,7 +55,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("sending %d buffers\n"), - id, ACE_TEXT_CHAR_TO_TCHAR (location), iovcnt)); + id, ACE_TEXT_TO_TCHAR_IN (location), iovcnt)); for (int i = 0; i != iovcnt && 0 < current_transfer; ++i) { @@ -70,7 +70,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("buffer %d/%d has %d bytes\n"), - id, ACE_TEXT_CHAR_TO_TCHAR(location), + id, ACE_TEXT_TO_TCHAR_IN(location), i, iovcnt, iov_len)); @@ -107,7 +107,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("end of data\n"), - id, ACE_TEXT_CHAR_TO_TCHAR(location))); + id, ACE_TEXT_TO_TCHAR_IN(location))); ACE_Log_Msg::instance ()->release (); } @@ -1068,9 +1068,9 @@ TAO_Transport::report_invalid_event_handler (const char *caller) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::report_invalid_event_handler") - ACE_TEXT ("(%s) no longer associated with handler [tag=%d]\n"), - this->id (), ACE_TEXT_CHAR_TO_TCHAR (caller), this->tag_)); + "TAO (%P|%t) - Transport[%d]::report_invalid_event_handler" + "(%s) no longer associated with handler [tag=%d]\n", + this->id (), ACE_TEXT_TO_TCHAR_IN (caller), this->tag_)); } } diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index f7a742a87f4..0b2b433813d 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -108,7 +108,7 @@ TAO_Connector::make_mprofile (const char *string, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ") ACE_TEXT ("<%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (string))); + ACE_TEXT_TO_TCHAR_IN (string))); } ACE_CString ior; diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index d1e918736c7..66169ee26f6 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -204,7 +204,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( { // Is this a duplicate case label? If so, we have to adjust // the 'length' we encode - a member gets encoded only once. - if (ACE_OS::strcmp (member_name, members[i - 1].name) == 0) + if (ACE_OS::strcmp (member_name, members[i - 1].name.in()) == 0) { CORBA::Boolean const equiv = member.type.in ()->equivalent (members[i - 1].type.in () @@ -333,8 +333,8 @@ TAO_TypeCodeFactory_i::create_union_tc ( { // Is this a duplicate case label? If so, skip it - a member // goes into the TypeCode only once. - if (ACE_OS::strcmp (member.name, - members[index - 1].name) == 0) + if (ACE_OS::strcmp (member.name.in(), + members[index - 1].name.in()) == 0) { continue; } diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 3986ee1e040..4f86a01f5cc 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -173,7 +173,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { TAO_Protocol_Item *item = 0; ACE_NEW_RETURN (item, - TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])), + TAO_Protocol_Item (ACE_TEXT_TO_CHAR_IN(argv[curarg])), -1); if (pset->insert (item) == -1) ACE_ERROR ((LM_ERROR, @@ -329,7 +329,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (curarg < argc) { - this->add_to_ior_parser_names (ACE_TEXT_ALWAYS_CHAR(argv[curarg])); + this->add_to_ior_parser_names (ACE_TEXT_TO_CHAR_IN(argv[curarg])); } } @@ -643,7 +643,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to add ") ACE_TEXT ("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR (item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN (item->protocol_name ().c_str ()))); delete item; @@ -686,7 +686,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to load ") ACE_TEXT ("protocol <%s>, %p\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()), + ACE_TEXT_TO_TCHAR_IN(name.c_str ()), ACE_TEXT ("")), -1); } @@ -695,7 +695,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(name.c_str ()))); } } diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc index 5188e4a669b..a48d4e74789 100644 --- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc +++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): taoserver, amh, strategies { + exename = server Source_Files { server.cpp } } project(*Client): taoexe, amh, portableserver, strategies { + exename = client after += *Server Source_Files { client.cpp diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 9ff92b2933d..ebc75580c11 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -1,17 +1,20 @@ // $Id$ #include "TestC.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "file://test.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int received_expected_exception = 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; CORBA::Object_var object = diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 05d82934074..c9a412e2c5d 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -3,6 +3,7 @@ #include "ace/OS_NS_stdio.h" #include "TestS.h" +#include "ace/Argv_Type_Converter.h" /***************************/ /*** Servant Declaration ***/ @@ -209,7 +210,7 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior) { // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ST_AMH_Server::ior_output_file_, - "w"); + ACE_TEXT("w")); if (output_file == 0) { ACE_ERROR ((LM_ERROR, @@ -225,9 +226,12 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ST_AMH_Server amh_server (&argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + + int& argc2 = convert.get_argc(); + ST_AMH_Server amh_server (&argc2, convert.get_ASCII_argv()); amh_server.start_orb_and_poa (); diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc index a0a1fbb883e..c92c1f28233 100644 --- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc +++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc @@ -2,12 +2,14 @@ // $Id$ project(*client) : taoexe, portableserver, amh { + exename = client source_files { client.cpp } } project(*server) : taoserver, amh, strategies { + exename = server after += *client source_files { server.cpp diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp index ade35e5e386..ba950a012da 100644 --- a/TAO/tests/AMH_Oneway/client.cpp +++ b/TAO/tests/AMH_Oneway/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "TestC.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "file://test.ior"; int num_calls = 10; @@ -9,7 +10,8 @@ int num_calls = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "n:"); int c; while ((c = get_opts ()) != -1) @@ -25,15 +27,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index 7d75444d7fb..f9825491ecf 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -4,6 +4,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "TestS.h" int num_calls = 10; // total calls client is going to make @@ -15,7 +16,8 @@ int calls_received = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "n:"); int c; while ((c = get_opts ()) != -1) @@ -232,7 +234,7 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior) { // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ST_AMH_Server::ior_output_file_, - "w"); + ACE_TEXT("w")); if (output_file == 0) { ACE_ERROR ((LM_ERROR, @@ -248,12 +250,15 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, argv) != 0) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; - ST_AMH_Server amh_server (&argc, argv); + int& argc2 = convert.get_argc(); + ST_AMH_Server amh_server (&argc2, convert.get_ASCII_argv()); amh_server.start_orb_and_poa (); diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc index 894442827ba..d5cc81dffb3 100644 --- a/TAO/tests/AMI/AMI.mpc +++ b/TAO/tests/AMI/AMI.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, messaging, ami { + exename = server Source_Files { ami_test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): taoserver, messaging, ami { } project(*Client): messaging, taoexe, portableserver, ami { + exename = client after += *Server Source_Files { client.cpp @@ -16,6 +18,7 @@ project(*Client): messaging, taoexe, portableserver, ami { } project(*Simple Client): messaging, taoexe, portableserver, ami { + exename = simple_client after += *Server Source_Files { simple_client.cpp diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index dfebe21b163..4440087c003 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -16,6 +16,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "ami_testS.h" ACE_RCSID (AMI, @@ -31,7 +32,8 @@ int number_of_replies = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:n:i:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "dk:n:i:"); int c; while ((c = get_opts ()) != -1) @@ -188,16 +190,18 @@ public: Handler handler; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index b2868cd1e58..96b638cb837 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -18,6 +18,7 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(AMI, server, "$Id$") @@ -26,7 +27,8 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:d"); int c; while ((c = get_opts ()) != -1) @@ -52,13 +54,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -78,7 +82,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; AMI_Test_i ami_test_i (orb.in ()); @@ -96,7 +100,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 2a22d5164ed..8ef9d036c8e 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -16,6 +16,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "ami_testS.h" @@ -31,7 +32,8 @@ int debug = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:i:x"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "dk:i:x"); int c; while ((c = get_opts ()) != -1) @@ -166,15 +168,16 @@ public: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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 = @@ -192,7 +195,7 @@ main (int argc, char *argv[]) poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // We reuse the object_var smart pointer! diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index 9c883a1d3f5..4d5dd7deb5a 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -3,6 +3,7 @@ #include "AMI_Buffering_Admin.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(AMI_Buffering, admin, "$Id$") @@ -11,7 +12,8 @@ const char *ior_output_file = "admin.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +37,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +64,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; AMI_Buffering_Admin *AMI_buffering_admin_impl; @@ -78,7 +82,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index 6ec3f9364f6..b6a585f75c8 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -7,6 +7,7 @@ #include "tao/AnyTypeCode/TAOA.h" #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(AMI_Buffering, client, "$Id$") @@ -40,7 +41,8 @@ const double GIOP_OVERHEAD = 0.9; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:a:i:ctbr"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "k:a:i:ctbr"); int c; while ((c = get_opts ()) != -1) @@ -114,13 +116,15 @@ run_buffer_size (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int test_failed = 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; CORBA::Object_var poa_object = @@ -143,7 +147,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index ba5fa487943..625f5f461dc 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -3,6 +3,7 @@ #include "AMI_Buffering.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(AMI_Buffering, server, "$Id$") @@ -12,7 +13,8 @@ const char *ior = "file://admin.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:k:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +43,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -66,7 +70,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = @@ -101,7 +105,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc index bf72e8baca6..0ef13442a37 100644 --- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc +++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, ami { + exename = server Source_Files { timeout_i.cpp timeout_client.cpp diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index e483bc5d871..8bc203a6169 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -18,6 +18,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI, client, @@ -29,7 +30,8 @@ unsigned int msec = 50; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:t:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "dk:t:"); int c; while ((c = get_opts ()) != -1) @@ -60,16 +62,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index b26f765296d..d022b89fcf5 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -16,6 +16,7 @@ #include "timeout_client.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (AMI, server, @@ -26,7 +27,8 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:d"); int c; while ((c = get_opts ()) != -1) @@ -52,13 +54,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -78,7 +82,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Timeout_i timeout_i (orb.in ()); @@ -96,7 +100,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp index 0a26fb84775..13ca7568315 100644 --- a/TAO/tests/Abstract_Interface/client.cpp +++ b/TAO/tests/Abstract_Interface/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Abstract_Interface, client, @@ -23,7 +24,7 @@ test_select which_test = TEST_ALL; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:dsoe"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:dsoe"); int c; while ((c = get_opts ()) != -1) @@ -184,19 +185,22 @@ test_exception (base_ptr abs } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::String_var retval; 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; - if (parse_args (argc, argv) != 0) + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp index 6a3c9034587..b8087ab8195 100644 --- a/TAO/tests/Abstract_Interface/server.cpp +++ b/TAO/tests/Abstract_Interface/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Abstract_Interface, server, @@ -13,7 +14,8 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +39,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -104,7 +108,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -126,7 +130,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp index 6bb78f5ed62..8cdcb55c56b 100644 --- a/TAO/tests/Any/Recursive/client.cpp +++ b/TAO/tests/Any/Recursive/client.cpp @@ -5,6 +5,7 @@ #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include <algorithm> #include <functional> @@ -20,7 +21,8 @@ const char * ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "k:"); int c; while ((c = get_opts ()) != -1) @@ -411,15 +413,17 @@ struct Caller : public std::unary_function<T, void> }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp index 177aad4d1d8..b9b071c2cee 100644 --- a/TAO/tests/Any/Recursive/server.cpp +++ b/TAO/tests/Any/Recursive/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Hello, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index d775aabc942..47e5dcbda8b 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -16,7 +17,7 @@ void do_nothing (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -40,12 +41,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -99,7 +102,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp index 02f3a672f43..d72ee7a91d3 100644 --- a/TAO/tests/BiDirectional/server.cpp +++ b/TAO/tests/BiDirectional/server.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" @@ -14,7 +15,7 @@ int no_iterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -100,7 +103,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in (), @@ -128,7 +131,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index d4b0af3a3b9..8bd145f9aa8 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -21,6 +21,7 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/AnyTypeCode/Any.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(BiDir_Multiple_ORB, destroy, "$Id$") @@ -107,16 +108,18 @@ test_with_bidir_poa (int argc, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; for (int i=0; i<10; i++) { - result = test_with_bidir_poa (argc, argv, "poa_1", 1); + result = test_with_bidir_poa (convert.get_argc(), convert.get_ASCII_argv(), "poa_1", 1); ACE_ASSERT (result == 0); - result = test_with_bidir_poa (argc, argv, "poa_2", 1); + result = test_with_bidir_poa (convert.get_argc(), convert.get_ASCII_argv(), "poa_2", 1); ACE_ASSERT (result == 0); } ACE_DEBUG ((LM_DEBUG, "Completed OK\n")); diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc index abcf650df1b..7f324b598d8 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc +++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, minimum_corba, bidir_giop { + exename = server Source_Files { test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): taoserver, minimum_corba, bidir_giop { } project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { + exename = client after += *Server Source_Files { test_i.cpp diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 184e7ebda37..a0ca3000ed9 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "ace/High_Res_Timer.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" @@ -17,7 +18,7 @@ void do_nothing (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -100,7 +103,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp index ef4c284f576..89a3aab8725 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.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" @@ -14,7 +15,7 @@ int no_iterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -100,7 +103,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i *server_impl = 0; @@ -133,7 +136,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 23391b5b797..1c27642a634 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -14,6 +14,7 @@ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" #include "ami_testS.h" @@ -31,7 +32,7 @@ CORBA::ULong payload_size = 128000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "db:k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "db:k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -126,15 +127,16 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object_var = @@ -152,7 +154,7 @@ main (int argc, char *argv[]) poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // We reuse the object_var smart pointer! diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp index b2868cd1e58..f8ab2c52740 100644 --- a/TAO/tests/Big_AMI/server.cpp +++ b/TAO/tests/Big_AMI/server.cpp @@ -18,6 +18,7 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(AMI, server, "$Id$") @@ -26,7 +27,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -52,13 +53,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -78,7 +81,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; AMI_Test_i ami_test_i (orb.in ()); @@ -96,7 +99,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc index 5cf458a0b1e..ae6312f5186 100644 --- a/TAO/tests/Big_Oneways/Big_Oneways.mpc +++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver { + exename = server Source_Files { Coordinator.cpp Session_Control.cpp @@ -10,6 +11,7 @@ project(*Server): taoserver { } project(*Client): taoexe, portableserver { + exename = client after += *Server Source_Files { Peer.cpp diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index 13465fab43c..2ba99b1d8a8 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/client.cpp @@ -3,6 +3,7 @@ #include "Peer.h" #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Oneways, client, "$Id$") @@ -11,7 +12,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 9aa9d7a7522..7105cc2c1fc 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -4,6 +4,7 @@ #include "Session_Control.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Oneways, server, "$Id$") @@ -16,7 +17,7 @@ CORBA::ULong thread_count = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:b:i:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:b:i:n:"); int c; while ((c = get_opts ()) != -1) @@ -60,12 +61,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -85,7 +88,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Coordinator *coordinator_impl = 0; @@ -102,7 +105,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index 05651121792..b8fcc5f09d9 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -2,6 +2,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Muxing, client, "$Id$") @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -33,15 +34,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index b09fbd74a0b..0cf62983ea1 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "Big_Reply_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Reply, server, "$Id$") @@ -15,7 +16,7 @@ const CORBA::ULong data_size = 4000000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:"); int c; while ((c = get_opts ()) != -1) @@ -39,14 +40,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DEBUG ((LM_DEBUG, "Starting server\n")); 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 = @@ -67,7 +70,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Big_Reply_i *big_reply_gen; @@ -90,7 +93,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp index eea6aab06f8..23ebddfd0e2 100644 --- a/TAO/tests/Big_Request_Muxing/client.cpp +++ b/TAO/tests/Big_Request_Muxing/client.cpp @@ -2,6 +2,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Messaging/Messaging.h" ACE_RCSID(Muxing, client, "$Id$") @@ -17,7 +18,7 @@ static const int MSG_SIZE = 4096; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -41,17 +42,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DEBUG ((LM_DEBUG, "Starting client\n")); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 49e88b06fa6..8a9c4f89ea9 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Request_Muxing, server, "$Id$") @@ -13,7 +14,7 @@ static int expected = 600; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -39,14 +40,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DEBUG ((LM_DEBUG, "Starting server\n")); 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 = @@ -66,7 +69,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Payload_Receiver *payload_receiver_impl; @@ -84,7 +87,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc index 5cf458a0b1e..ae6312f5186 100644 --- a/TAO/tests/Big_Twoways/Big_Twoways.mpc +++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver { + exename = server Source_Files { Coordinator.cpp Session_Control.cpp @@ -10,6 +11,7 @@ project(*Server): taoserver { } project(*Client): taoexe, portableserver { + exename = client after += *Server Source_Files { Peer.cpp diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index 48013a64c34..53785b9c77b 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -3,6 +3,7 @@ #include "Peer.h" #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Oneways, client, "$Id$") @@ -11,7 +12,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index 55ba8b87c95..ba78958212e 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -4,6 +4,7 @@ #include "Session_Control.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Oneways, server, "$Id$") @@ -16,7 +17,7 @@ CORBA::ULong thread_count = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:b:i:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:b:i:n:"); int c; while ((c = get_opts ()) != -1) @@ -60,12 +61,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -85,7 +88,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Coordinator *coordinator_impl; @@ -102,7 +105,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp index 2bff1936b7b..bdcce3dfbeb 100644 --- a/TAO/tests/Blocking_Sync_None/client.cpp +++ b/TAO/tests/Blocking_Sync_None/client.cpp @@ -5,6 +5,7 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Blocking_Sync_None, client, "$Id$") @@ -14,7 +15,7 @@ int iterations = 1000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:"); int c; while ((c = get_opts ()) != -1) @@ -43,15 +44,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index a774b6cdf83..938fee7bd19 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -3,6 +3,7 @@ #include "Blocking_Sync_None.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Blocking_Sync_None, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Blocking_Sync_None *blocking_sync_none_impl; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index 7deb646b538..c76cf2a854f 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -6,6 +6,7 @@ #include "ace/Get_Opt.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Bug_1020_Basic_Regression, client, @@ -16,7 +17,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -104,7 +107,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo> impl; diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index 4f62134a66f..722a3727516 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp @@ -4,6 +4,7 @@ #include "tao/ORB_Core.h" #include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1020_Basic_Regression, server, @@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,12 +40,14 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -67,7 +70,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo_Caller> impl; @@ -93,7 +96,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc index 02b8056c191..2f7e5b311f4 100644 --- a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc +++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, messaging { + exename = server Source_Files { ORB_Task.cpp Server_i.cpp @@ -11,6 +12,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoexe, messaging { + exename = client Source_Files { Echo.cpp ORB_Task.cpp diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index 63209f90483..02932c19709 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -8,6 +8,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1230_Regression, client, "$Id$") @@ -26,12 +27,14 @@ public: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -84,7 +87,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo> impl; @@ -168,7 +171,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index e1b7ee43a48..bdef526458d 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -6,6 +6,7 @@ #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Bug_1230_Regression, server, @@ -17,12 +18,14 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -49,7 +52,7 @@ main (int argc, char *argv[]) orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Server> impl; @@ -75,7 +78,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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", @@ -115,7 +118,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index 50b19d24f84..60669529b57 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -7,6 +7,7 @@ #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1269_Regression, client, "$Id$") @@ -16,12 +17,14 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -74,7 +77,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo> impl; @@ -146,7 +149,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp index 2e89b271b31..e741e86a8e3 100644 --- a/TAO/tests/Bug_1269_Regression/server.cpp +++ b/TAO/tests/Bug_1269_Regression/server.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1269_Regression, server, "$Id$") @@ -14,12 +15,14 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -46,7 +49,7 @@ main (int argc, char *argv[]) orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo_Caller> impl; @@ -72,7 +75,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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", @@ -110,7 +113,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp index e48142df37f..a71d5dd6611 100644 --- a/TAO/tests/Bug_1269_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1269_Regression, shutdown, "$Id$") @@ -11,16 +12,18 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = @@ -61,7 +64,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc index 146c41a5026..2e0973d1359 100644 --- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc +++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, messaging { + exename = server Source_Files { Echo_Caller.cpp Server_Timer.cpp @@ -10,6 +11,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + exename = client after += *Server Source_Files { Echo.cpp @@ -18,6 +20,7 @@ project(*Client): taoclient, messaging { } project(*Shutdown): taoexe, messaging { + exename = shutdown after += *Client Source_Files { shutdown.cpp diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index 8405b2d1c0c..9604b06e19f 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -8,6 +8,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1270_Regression, client, "$Id$") @@ -17,12 +18,14 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -75,7 +78,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo> impl; @@ -147,7 +150,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp index 361b06dd275..a25cdfdb5e4 100644 --- a/TAO/tests/Bug_1270_Regression/server.cpp +++ b/TAO/tests/Bug_1270_Regression/server.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1270_Regression, server, "$Id$") @@ -14,12 +15,14 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -46,7 +49,7 @@ main (int argc, char *argv[]) orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo_Caller> impl; @@ -72,7 +75,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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", @@ -110,7 +113,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp index 68026a71eec..36e09239c80 100644 --- a/TAO/tests/Bug_1270_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1270_Regression, shutdown, "$Id$") @@ -11,16 +12,18 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = @@ -61,7 +64,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp index f317731aeae..3308e1ecef0 100644 --- a/TAO/tests/Bug_1330_Regression/client.cpp +++ b/TAO/tests/Bug_1330_Regression/client.cpp @@ -3,6 +3,7 @@ // #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens"; int shutdown_server = 0; @@ -10,7 +11,7 @@ int shutdown_server = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -36,16 +37,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp index 63308e1c36c..213bcede6ac 100644 --- a/TAO/tests/Bug_1330_Regression/server.cpp +++ b/TAO/tests/Bug_1330_Regression/server.cpp @@ -3,6 +3,7 @@ // #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "Test_i.h" #include "tao/IORTable/IORTable.h" @@ -12,7 +13,7 @@ const char *object_key = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,14 +36,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_i server_impl; @@ -91,7 +94,7 @@ main (int argc, char *argv[]) adapter->bind("Name-with-hyphens", ior.in()); - FILE *output_file= ACE_OS::fopen ("server.ior", "w"); + FILE *output_file= ACE_OS::fopen ("server.ior", ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "SERVER (%P): Cannot open output file " diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc index f0247d4c080..9a84c2185cf 100644 --- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc +++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, messaging { + exename = server Source_Files { Server_Thread_Pool.cpp Echo_Caller.cpp @@ -11,6 +12,7 @@ project(*Server): taoserver, messaging { } project(*Client): taoclient, messaging { + exename = client after += *Server Source_Files { Echo.cpp @@ -20,6 +22,7 @@ project(*Client): taoclient, messaging { } project(*Shutdown): taoexe, messaging { + exename = shutdown after += *Client Source_Files { shutdown.cpp diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index 76b98781048..0650e70dd99 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -8,6 +8,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1270_Regression, client, "$Id$") @@ -49,12 +50,14 @@ public: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -107,7 +110,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Echo> impl; @@ -199,7 +202,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:t:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index 5b09f46aa76..66686d9a6b8 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Server_Thread_Pool.h" #include "ORB_Task.h" @@ -16,12 +17,14 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -49,7 +52,7 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_Thread_Manager mymanager; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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", @@ -125,7 +128,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp index ba1eb1160f0..416b7099fb6 100644 --- a/TAO/tests/Bug_1361_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -14,18 +15,20 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DEBUG ((LM_DEBUG, "Starting shutdown\n")); ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = @@ -66,7 +69,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp index f08edccd51d..366cef09eab 100644 --- a/TAO/tests/Bug_1476_Regression/client.cpp +++ b/TAO/tests/Bug_1476_Regression/client.cpp @@ -3,6 +3,7 @@ #include "Client_Task.h" #include "Server_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Messaging/Messaging.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Transport.h" @@ -20,7 +21,7 @@ int number_of_client_tasks = 2; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:c:"); int c; while ((c = get_opts ()) != -1) @@ -51,12 +52,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -105,7 +108,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the sender reference.. diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp index b65d5e2333c..71c2912b544 100644 --- a/TAO/tests/Bug_1476_Regression/server.cpp +++ b/TAO/tests/Bug_1476_Regression/server.cpp @@ -4,6 +4,7 @@ #include "Server_Task.h" #include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$") @@ -13,7 +14,7 @@ int number_of_oneways = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,12 +40,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -64,7 +67,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Sender_i *sender_impl; @@ -82,7 +85,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp index 78a8635a4e5..e75f546d1ba 100644 --- a/TAO/tests/Bug_1482_Regression/client.cpp +++ b/TAO/tests/Bug_1482_Regression/client.cpp @@ -3,6 +3,7 @@ #include "TestS.h" #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/AnyTypeCode/Any.h" ACE_RCSID(Hello, client, "$Id$") @@ -12,7 +13,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -36,15 +37,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index 2204fc213da..39b52cc8afe 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -2,6 +2,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Server_Task.h" ACE_RCSID (LongUpcall_Crash_Test, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp index acaf0e35779..1d9720583cd 100644 --- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp @@ -70,7 +70,7 @@ Server_Task::svc (void) if (output_ != 0) { - FILE *output_file = ACE_OS::fopen (output_, "w"); + FILE *output_file = ACE_OS::fopen (output_, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp index 99bb3239dfc..ac880e471dd 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp @@ -22,6 +22,7 @@ #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/Manual_Event.h" +#include "ace/Argv_Type_Converter.h" const char *ior_input_file = "file://test.ior"; const char *ior_output_file = "thr_server.ior"; @@ -29,7 +30,7 @@ const char *ior_output_file = "thr_server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:"); int c; while ((c = get_opts ()) != -1) @@ -56,10 +57,12 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Parse command line - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { return -1; } @@ -67,11 +70,10 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_Argv_Type_Converter main_args_s (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (main_args_s.get_argc (), - main_args_s.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "Server_ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -92,11 +94,9 @@ main (int argc, char *argv[]) // Wait for the server task to activate. me.wait (); - ACE_Argv_Type_Converter main_args_c (argc, argv); - CORBA::ORB_var corb = - CORBA::ORB_init (main_args_c.get_argc (), - main_args_c.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "Client_ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp index 95cd68db7e7..fca9f2b82c6 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "server_interceptor.h" #include "Server_ORBInitializer.h" @@ -17,7 +18,7 @@ const char *ior_input_file = "file://thr_server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:"); int c; @@ -45,8 +46,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Create the ORB initializer. @@ -63,7 +66,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Now initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Remote_Server_ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -89,7 +92,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -146,7 +149,7 @@ main (int argc, char *argv[]) // Output the server IOR to a 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) { diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp index 1bec57c8fde..4d25d9756f4 100644 --- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp +++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/RIR_Narrow.h" #include "tao/Utils/PolicyList_Destroyer.h" #include "tao/Utils/Servant_Var.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Bug_1535_Regression, bug_1535_regression, @@ -177,15 +178,17 @@ test_create_object_before_POA_reactivation( } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp index a898cdb3398..2dad76c9f7e 100644 --- a/TAO/tests/Bug_1551_Regression/client.cpp +++ b/TAO/tests/Bug_1551_Regression/client.cpp @@ -5,6 +5,7 @@ #include "TestS.h" #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/AnyTypeCode/Any.h" ACE_RCSID(Hello, client, "$Id$") @@ -16,7 +17,7 @@ int nthreads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:k:"); int c; while ((c = get_opts ()) != -1) @@ -44,17 +45,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int retval = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index 5adc91117fd..7c287a4e7e7 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -4,6 +4,7 @@ #include "Server_Task.h" #include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Bug_1XXX_Regression, server, "$Id$") @@ -16,7 +17,7 @@ int nthreads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xn:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xn:o:"); int c; while ((c = get_opts ()) != -1) @@ -50,12 +51,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -75,7 +78,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Hello> hello_impl( @@ -90,7 +93,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp index 44edda43ee7..5b68f4dc1e7 100644 --- a/TAO/tests/Bug_1568_Regression/client.cpp +++ b/TAO/tests/Bug_1568_Regression/client.cpp @@ -9,6 +9,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1568_Regression, client, "$Id$") @@ -17,7 +18,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -41,15 +42,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index fce73b267a5..a06917fea9b 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -12,6 +12,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1568_Regression, server, "$Id$") @@ -100,7 +101,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -124,12 +125,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -149,7 +152,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Simple_C> simple_c_impl( @@ -164,7 +167,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp index f317731aeae..3308e1ecef0 100644 --- a/TAO/tests/Bug_1627_Regression/client.cpp +++ b/TAO/tests/Bug_1627_Regression/client.cpp @@ -3,6 +3,7 @@ // #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens"; int shutdown_server = 0; @@ -10,7 +11,7 @@ int shutdown_server = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -36,16 +37,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp index 63308e1c36c..213bcede6ac 100644 --- a/TAO/tests/Bug_1627_Regression/server.cpp +++ b/TAO/tests/Bug_1627_Regression/server.cpp @@ -3,6 +3,7 @@ // #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "Test_i.h" #include "tao/IORTable/IORTable.h" @@ -12,7 +13,7 @@ const char *object_key = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,14 +36,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_i server_impl; @@ -91,7 +94,7 @@ main (int argc, char *argv[]) adapter->bind("Name-with-hyphens", ior.in()); - FILE *output_file= ACE_OS::fopen ("server.ior", "w"); + FILE *output_file= ACE_OS::fopen ("server.ior", ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "SERVER (%P): Cannot open output file " diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp index 9db84a9a4f5..b5cece3cd35 100644 --- a/TAO/tests/Bug_1635_Regression/client.cpp +++ b/TAO/tests/Bug_1635_Regression/client.cpp @@ -2,16 +2,19 @@ // $Id$ // #include "tao/ORB.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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_CATCHANY diff --git a/TAO/tests/Bug_1636_Regression/client.cpp b/TAO/tests/Bug_1636_Regression/client.cpp index 51a28417346..28ae7804af1 100644 --- a/TAO/tests/Bug_1636_Regression/client.cpp +++ b/TAO/tests/Bug_1636_Regression/client.cpp @@ -3,15 +3,18 @@ // #include "tao/DynamicInterface/Request.h" #include "tao/DynamicAny/DynAnyFactory.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_NEW_ENV { 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/tests/Bug_1639_Regression/struct_client.cpp b/TAO/tests/Bug_1639_Regression/struct_client.cpp index 16ba27452ea..7e330f72993 100644 --- a/TAO/tests/Bug_1639_Regression/struct_client.cpp +++ b/TAO/tests/Bug_1639_Regression/struct_client.cpp @@ -4,14 +4,16 @@ #include "tao/DynamicAny/DynAnyFactory.h" #include "structC.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" using namespace StructTest; using namespace DynamicAny; //-------------------------------------------------------------------- -int main (int argc, char * argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) //-------------------------------------------------------------------- { + ACE_Argv_Type_Converter convert (argc, argv); // Generic catch handler try { @@ -20,7 +22,7 @@ int main (int argc, char * argv[]) // ------------------ CORBA::ORB_var orb; // _var, so we don't need/may not CORBA::release(orb) try { - orb = CORBA::ORB_init (argc, argv); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); } catch (...) { cerr << "Cannot initialize ORB" << endl; throw; diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp index bf5e3b6385c..a21c37f39be 100644 --- a/TAO/tests/Bug_1670_Regression/client.cpp +++ b/TAO/tests/Bug_1670_Regression/client.cpp @@ -9,6 +9,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1670_Regression, client, "$Id$") @@ -17,7 +18,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -41,15 +42,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index ca6e5d7aebb..8ff6c8633d5 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -12,6 +12,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_1670_Regression, server, "$Id$") @@ -100,7 +101,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -124,12 +125,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -149,7 +152,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TAO::Utils::Servant_Var<Simple_C> simple_c_impl( @@ -164,7 +167,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp index d95a5916742..44ba0bb5ff6 100644 --- a/TAO/tests/Bug_1693_Test/client.cpp +++ b/TAO/tests/Bug_1693_Test/client.cpp @@ -3,20 +3,22 @@ #include "tao/CodecFactory/CodecFactory.h" #include "testC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Codec, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "my_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp index d3b463ab1f1..62d9335d9cd 100755 --- a/TAO/tests/Bug_1812_Regression/test.cpp +++ b/TAO/tests/Bug_1812_Regression/test.cpp @@ -6,7 +6,7 @@ * This test does not run - successful compile and link == successful test. */ int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { return 0; } diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp index d3b463ab1f1..62d9335d9cd 100755 --- a/TAO/tests/Bug_1813_Regression/test.cpp +++ b/TAO/tests/Bug_1813_Regression/test.cpp @@ -6,7 +6,7 @@ * This test does not run - successful compile and link == successful test. */ int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { return 0; } diff --git a/TAO/tests/Bug_2122_Regression/test.cpp b/TAO/tests/Bug_2122_Regression/test.cpp index 6002cf0c9e9..1bd647775d1 100644 --- a/TAO/tests/Bug_2122_Regression/test.cpp +++ b/TAO/tests/Bug_2122_Regression/test.cpp @@ -6,7 +6,7 @@ #include "TestC.h" -int main( int argc, char* argv[] ) +int ACE_TMAIN( int argc, ACE_TCHAR* argv[] ) { ACE_UNUSED_ARG( argc ) ; ACE_UNUSED_ARG( argv ) ; diff --git a/TAO/tests/Bug_2124_Regression/test.cpp b/TAO/tests/Bug_2124_Regression/test.cpp index 6002cf0c9e9..1bd647775d1 100644 --- a/TAO/tests/Bug_2124_Regression/test.cpp +++ b/TAO/tests/Bug_2124_Regression/test.cpp @@ -6,7 +6,7 @@ #include "TestC.h" -int main( int argc, char* argv[] ) +int ACE_TMAIN( int argc, ACE_TCHAR* argv[] ) { ACE_UNUSED_ARG( argc ) ; ACE_UNUSED_ARG( argv ) ; diff --git a/TAO/tests/Bug_2126_Regression/test.cpp b/TAO/tests/Bug_2126_Regression/test.cpp index 6002cf0c9e9..1bd647775d1 100644 --- a/TAO/tests/Bug_2126_Regression/test.cpp +++ b/TAO/tests/Bug_2126_Regression/test.cpp @@ -6,7 +6,7 @@ #include "TestC.h" -int main( int argc, char* argv[] ) +int ACE_TMAIN( int argc, ACE_TCHAR* argv[] ) { ACE_UNUSED_ARG( argc ) ; ACE_UNUSED_ARG( argv ) ; diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp index c7b795b0d04..b8c200f122b 100755 --- a/TAO/tests/Bug_2144_Regression/test.cpp +++ b/TAO/tests/Bug_2144_Regression/test.cpp @@ -2,7 +2,7 @@ #include "testC.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp index dc0b7923d30..9c46c96981b 100644 --- a/TAO/tests/Bug_2174_Regression/client.cpp +++ b/TAO/tests/Bug_2174_Regression/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_2174_Regression, client, "$Id$") @@ -12,7 +13,7 @@ int max_timeout = 20; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:"); int c; while ((c = get_opts ()) != -1) @@ -42,15 +43,17 @@ int result = 1; // 4 : CORBA::OBJECT_NOT_EXIST exception // 5 : CORBA::TRANSIENT exception -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp index bc39027c4ac..29733de3adb 100644 --- a/TAO/tests/Bug_2174_Regression/server.cpp +++ b/TAO/tests/Bug_2174_Regression/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Bug_2174_Regression, server, "$Id$") @@ -12,7 +13,7 @@ bool remove_object = false; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r"); int c; while ((c = get_opts ()) != -1) @@ -41,15 +42,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = @@ -95,7 +98,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp index 913d3153ae9..5f78dfb98eb 100755 --- a/TAO/tests/Bug_2183_Regression/client.cpp +++ b/TAO/tests/Bug_2183_Regression/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp") @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 4853611a134..05f42b04d89 100755 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Strategies/advanced_resource.h" ACE_RCSID (Hello, @@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,12 +39,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -63,7 +66,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -81,7 +84,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp index 8e6a7bec7ff..95a11764105 100755 --- a/TAO/tests/Bug_2222_Regression/test.cpp +++ b/TAO/tests/Bug_2222_Regression/test.cpp @@ -6,7 +6,7 @@ * This test does not run - successful compile and link == successful test. */ int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { Array_Typedef_slice* body3 = Array_Typedef_alloc(); Array_Typedef_slice* body31 = Array_Typedef_dup (body3); diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp index 52180b29d5a..6540444e194 100644 --- a/TAO/tests/Bug_2234_Regression/client.cpp +++ b/TAO/tests/Bug_2234_Regression/client.cpp @@ -6,12 +6,15 @@ #include "TestC.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" int -main( +ACE_TMAIN( int argc, - char** argv) + ACE_TCHAR** argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; CORBA::Boolean testFailed= 0; @@ -19,7 +22,7 @@ main( ACE_TRY { CORBA::ORB_var - orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ); + orb= CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA::Object_var object= orb->string_to_object( "file://server.ior" ACE_ENV_ARG_PARAMETER ); @@ -105,13 +108,13 @@ main( rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s: ", aVS->val.in(), bVS->val.in(), cVS->val.in(), rVS->val.in()) ); - if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) { + if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val.in(), "1"))) { ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;} - else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val, "2"))) { + else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val.in(), "2"))) { ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;} - else if ((0 != *cVS->val) && (0 != ACE_OS::strcmp(cVS->val, "4"))) { + else if ((0 != *cVS->val) && (0 != ACE_OS::strcmp(cVS->val.in(), "4"))) { ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;} - else if ((0 != *rVS->val) && (0 != ACE_OS::strcmp(rVS->val, "7"))) { + else if ((0 != *rVS->val) && (0 != ACE_OS::strcmp(rVS->val.in(), "7"))) { ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;} else ACE_DEBUG( (LM_INFO, "OK\n") ); diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp index deb065f016f..24b0e949b42 100644 --- a/TAO/tests/Bug_2234_Regression/server.cpp +++ b/TAO/tests/Bug_2234_Regression/server.cpp @@ -18,6 +18,7 @@ #include "tao/PI_Server/PI_Server.h" #include "tao/ORBInitializer_Registry.h" #include "tao/PortableServer/Root_POA.h" +#include "ace/Argv_Type_Converter.h" CORBA::ORB_ptr orb; @@ -676,8 +677,10 @@ private: AnInterceptor *interceptor_; }; -int main( int argc, char *argv[] ) +int ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { ACE_DEBUG( (LM_INFO, "Server start\n") ); @@ -690,7 +693,7 @@ int main( int argc, char *argv[] ) initialiser= initialiser_p; PortableInterceptor::register_orb_initializer( initialiser.in() ); - orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ); + orb= CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA::Object_var Object = orb->resolve_initial_references( "RootPOA" ACE_ENV_ARG_PARAMETER ); diff --git a/TAO/tests/CDR/alignment.cpp b/TAO/tests/CDR/alignment.cpp index 70cbd85c629..ba5d61fb1a3 100644 --- a/TAO/tests/CDR/alignment.cpp +++ b/TAO/tests/CDR/alignment.cpp @@ -21,7 +21,7 @@ #include "ace/Log_Msg.h" -int main(int, char*[]) +int ACE_TMAIN(int, ACE_TCHAR*[]) { int status = 0; @@ -76,13 +76,13 @@ int main(int, char*[]) ACE_HEX_DUMP ((LM_DEBUG, j->rd_ptr (), j->length (), - "Output CDR stream")); + ACE_TEXT("Output CDR stream"))); } TAO_InputCDR debug (cdr); ACE_HEX_DUMP ((LM_DEBUG, debug.rd_ptr (), debug.length (), - "Input CDR stream")); + ACE_TEXT("Input CDR stream"))); } } diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp index dfbae63cc44..1ddb772e30c 100644 --- a/TAO/tests/CDR/allocator.cpp +++ b/TAO/tests/CDR/allocator.cpp @@ -26,6 +26,7 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(CDR, allocator, "$Id$") @@ -65,10 +66,12 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); int tss = 0; int iterations = 500; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) int quiet = 0; ACE_RANDR_TYPE seed = time(0); - ACE_Get_Opt get_opt (argc, argv, "tn:f:m:s:a:b:r:q"); + ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "tn:f:m:s:a:b:r:q"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index a1035e4c150..f5e57706dea 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -24,6 +24,7 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CDR, basic_types, @@ -212,17 +213,19 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_Get_Opt get_opt (argc, argv, "dn:l:"); + ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "dn:l:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp index cc70e4ea277..755a6d03eb1 100644 --- a/TAO/tests/CDR/growth.cpp +++ b/TAO/tests/CDR/growth.cpp @@ -20,6 +20,7 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB.h" #include "tao/debug.h" @@ -63,15 +64,17 @@ test_read (TAO_InputCDR &cdr, int n) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int n = 100; int low = 64; int hi = 4096; int s = 4; int quiet = 0; - ACE_Get_Opt get_opt (argc, argv, "dn:l:h:s:q"); + ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "dn:l:h:s:q"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/tests/CDR/octet_sequence.cpp b/TAO/tests/CDR/octet_sequence.cpp index fd8a8026ab5..5f8d00bd1b0 100644 --- a/TAO/tests/CDR/octet_sequence.cpp +++ b/TAO/tests/CDR/octet_sequence.cpp @@ -40,7 +40,7 @@ void dump(const char * msg) m3->data_block()->reference_count())); } -int main(int, char*[]) +int ACE_TMAIN(int, ACE_TCHAR*[]) { // setup mb's char buf[1024]; diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index 0b814f3d523..bf7965fff35 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -24,6 +24,7 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CDR, @@ -34,12 +35,14 @@ ACE_RCSID (CDR, // verify that CDR offers the services needed for Typecode... int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp index 167a3e08b27..34aa000975b 100644 --- a/TAO/tests/Cache_Growth_Test/client.cpp +++ b/TAO/tests/Cache_Growth_Test/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -11,7 +12,7 @@ int do_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while ((c = get_opts ()) != -1) @@ -40,15 +41,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index ef867fc77aa..90a69070b33 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp index c83089e148d..22cddc5edb9 100644 --- a/TAO/tests/CallbackTest/client.cpp +++ b/TAO/tests/CallbackTest/client.cpp @@ -5,6 +5,7 @@ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Crashed_Callback, client, "$Id$") @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -36,12 +37,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -94,7 +97,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; } - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp index 07c1e010f40..3663887055e 100644 --- a/TAO/tests/CallbackTest/server.cpp +++ b/TAO/tests/CallbackTest/server.cpp @@ -6,6 +6,7 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Crashed_Callback, server, "$Id$") @@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -95,7 +98,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; } - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Service *service_impl; @@ -113,7 +116,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index f1039150d26..055556764e8 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -39,9 +39,11 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL) this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Test::Process::_nil ()); - const char* argv[3] = { - "child", - ior.in (), + ACE::String_Conversion::Convert_In<ACE_TCHAR, ACE_ANTI_TCHAR > tchar_ior( ior.in () ); + + const ACE_TCHAR* argv[3] = { + ACE_TEXT("child"), + tchar_ior.c_str (), 0}; ACE_Process_Options options; diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp index 4ee5c104d0b..a3fd2feee89 100644 --- a/TAO/tests/Client_Leaks/child.cpp +++ b/TAO/tests/Client_Leaks/child.cpp @@ -2,16 +2,19 @@ #include "Process.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Client_Leaks, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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 (argc < 2) @@ -27,7 +30,7 @@ main (int argc, char *argv[]) } CORBA::Object_var object = - orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ACE_TEXT_TO_CHAR_IN(argv[1]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Startup_Callback_var startup_callback = Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp index a06c49b3e8a..a0f4eef3b79 100644 --- a/TAO/tests/Client_Leaks/client.cpp +++ b/TAO/tests/Client_Leaks/client.cpp @@ -2,6 +2,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Client_Leaks, client, "$Id$") @@ -12,7 +13,7 @@ int threads = 12; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:n:"); int c; while ((c = get_opts ()) != -1) @@ -46,15 +47,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index 4260fbfd963..84ffa7a213b 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -3,6 +3,7 @@ #include "Process_Factory.h" #include "Server_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Client_Leaks, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Process_Factory *process_factory_impl; @@ -77,7 +80,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp index edf6a3ab091..5042f8ce86f 100644 --- a/TAO/tests/CodeSets/simple/client.cpp +++ b/TAO/tests/CodeSets/simple/client.cpp @@ -25,6 +25,7 @@ #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" wchar_t * make_wstring (const char *str) @@ -50,16 +51,18 @@ make_wstring (const char *str) // ------------------------------------------------------------ // Client // ------------------------------------------------------------ -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + char buf[1000]; int error_count = 0; ACE_TRY_NEW_ENV { // Init 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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -71,7 +74,7 @@ int main (int argc, char *argv[]) } else { - ACE_OS::strcpy (buf, argv[1]); + ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN(argv[1])); } // The first arg should be the IOR @@ -118,8 +121,9 @@ int main (int argc, char *argv[]) { ++error_count; } + #if defined (ACE_HAS_WCHAR) - wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT_ALWAYS_WCHAR ("Wide String")); + wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT_TO_WCHAR_IN ("Wide String")); wchar_t *wide_reply = server->op2 (wide_string); ACE_DEBUG ((LM_DEBUG, "sent %W, got %W\n", wide_string, wide_reply)); diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index d8a23526773..c2a5b4409f1 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -24,6 +24,7 @@ #include "ace/streams.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" // ------------------------------------------------------------ // Servant for associated CORBA object @@ -67,14 +68,15 @@ public: // ------------------------------------------------------------ // Main routine // ------------------------------------------------------------ -int main(int argc, char *argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { // Init 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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -119,7 +121,7 @@ int main(int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen ("server.ior", "w"); + FILE *output_file= ACE_OS::fopen ("server.ior", ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp index a5d874386e6..cd11d6f6d01 100644 --- a/TAO/tests/Codec/client.cpp +++ b/TAO/tests/Codec/client.cpp @@ -4,6 +4,7 @@ #include "tao/Codeset/Codeset.h" #include "testC.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" @@ -64,8 +65,8 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted) if (original->A != extracted->A || original->B != extracted->B || original->C != extracted->C - || (ACE_OS::strcmp (original->D, extracted->D) != 0) - || (ACE_OS::strcmp (original->E, extracted->E) != 0)) + || (ACE_OS::strcmp (original->D.in(), extracted->D.in()) != 0) + || (ACE_OS::strcmp (original->E.in(), extracted->E.in()) != 0)) return -1; return 0; @@ -182,15 +183,19 @@ test_codec (IOP::Codec_ptr codec) } int -main (int argc, char *argv[]) +//main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int retval = 0; + 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(), "my_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp index 19bd6433a70..97b96e9b207 100644 --- a/TAO/tests/Collocation/Collocation.cpp +++ b/TAO/tests/Collocation/Collocation.cpp @@ -2,16 +2,19 @@ #include "Collocation_Tester.h" #include "tao/Strategies/advanced_resource.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Collocation, main, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Collocation_Test coll_test; - coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); + coll_test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp index f4e4a6b9615..82ef56a5b5c 100644 --- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp @@ -16,7 +16,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n:"); int c; while ((c = get_opts ()) != -1) @@ -43,19 +43,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -76,10 +76,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index 746c3ff7758..9e6a33cc62c 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -66,7 +66,7 @@ Server_Task::svc (void) // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp index f36e0cd48f9..deddc432a54 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp @@ -18,7 +18,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o:n:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n:m:"); int c; while ((c = get_opts ()) != -1) @@ -68,19 +68,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -101,10 +101,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp index 746c3ff7758..9e6a33cc62c 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp @@ -66,7 +66,7 @@ Server_Task::svc (void) // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 28aa663f7aa..4e1784befd7 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -2,6 +2,7 @@ #include "testS.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/Object_Adapter.h" #include "tao/PortableServer/POA_Current.h" #include "tao/PortableServer/POA_Current_Impl.h" @@ -136,13 +137,15 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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; diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Tests/Collocated_Test.cpp index f807f7bf5b3..4bb7e2021a9 100644 --- a/TAO/tests/Collocation_Tests/Collocated_Test.cpp +++ b/TAO/tests/Collocation_Tests/Collocated_Test.cpp @@ -14,7 +14,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o:n"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n"); int c; while ((c = get_opts ()) != -1) @@ -41,19 +41,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -74,10 +74,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp index 85d842d34a0..db0c583eea3 100644 --- a/TAO/tests/Collocation_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Tests/Server_Task.cpp @@ -66,7 +66,7 @@ Server_Task::svc (void) // Output the IOR to the <this->output_> FILE *output_file= ACE_OS::fopen (this->output_, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp index 07d0572d547..0db98cfb3cd 100644 --- a/TAO/tests/Connect_Strategy_Test/client.cpp +++ b/TAO/tests/Connect_Strategy_Test/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Connect_Strategy_Test, client, @@ -12,7 +13,7 @@ int do_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:x:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x:"); int c; while ((c = get_opts ()) != -1) @@ -39,15 +40,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp index acd62195b16..770744b45c8 100644 --- a/TAO/tests/Connect_Strategy_Test/server.cpp +++ b/TAO/tests/Connect_Strategy_Test/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Connect_Strategy_Test, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp index c9759652961..f650c3c2540 100644 --- a/TAO/tests/Connection_Failure/client.cpp +++ b/TAO/tests/Connection_Failure/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "tao/SystemException.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" @@ -13,12 +14,14 @@ const char *ior = "corbaloc:iiop:192.3.47/10007/RandomObject"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var tmp = diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index 3ef97cea443..8dcbc9f0559 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -4,13 +4,14 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" #include "tao/Strategies/advanced_resource.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; int done = 0; diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index 0a9c8394ebf..a4c7201b235 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -3,13 +3,14 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "tao/Strategies/advanced_resource.h" +#include "ace/Argv_Type_Converter.h" const char *ior_output_file = "server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -33,12 +34,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -58,7 +61,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; test_i *test_impl; @@ -76,7 +79,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp index d1bab792c95..07d91311a93 100644 --- a/TAO/tests/Connection_Timeout/client.cpp +++ b/TAO/tests/Connection_Timeout/client.cpp @@ -3,6 +3,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/Profile_Timer.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" @@ -17,7 +18,7 @@ TimeBase::TimeT timeout_period = 1000000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -107,17 +108,19 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int retval = 1; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp index 92fc7daaf0b..e12430079d2 100644 --- a/TAO/tests/Crash_On_Write/client.cpp +++ b/TAO/tests/Crash_On_Write/client.cpp @@ -3,6 +3,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Crash_On_Write, client, "$Id$") @@ -12,7 +13,7 @@ int iterations = 2000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:"); int c; while ((c = get_opts ()) != -1) @@ -60,15 +61,17 @@ single_iteration (Test::Oneway_Receiver_ptr oneway_receiver } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index 8c25517be99..1f5668c42ff 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -3,6 +3,7 @@ #include "Oneway_Receiver.h" #include "Crash_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Crash_On_Write, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Oneway_Receiver *oneway_receiver_impl; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index 4f020c7d89c..f7db7164d1d 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -5,6 +5,7 @@ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Crashed_Callback, client, "$Id$") @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -36,12 +37,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -94,7 +97,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; } - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index 11b8a975a14..1f81584fba8 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -6,6 +6,7 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Crashed_Callback, server, "$Id$") @@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -95,7 +98,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; } - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Service *service_impl; @@ -113,7 +116,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc index 34ed08c9359..1bc4173271c 100644 --- a/TAO/tests/DLL_ORB/DLL_ORB.mpc +++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc @@ -33,6 +33,7 @@ project(*Server) : taoexe { } project(*Client): taoexe { + exename = client IDL_Files { } diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index f6cd461b12e..0408425d5b4 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -5,6 +5,7 @@ #include "tao/StringSeqC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (DLL_ORB, Test_Client_Module, @@ -16,7 +17,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +40,7 @@ parse_args (int argc, char *argv[]) int -Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) +Test_Client_Module::init (int argc, char *argv[]) { // ----------------------------------------------------------------- // Pre-ORB initialization steps necessary for proper DLL ORB diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.h b/TAO/tests/DLL_ORB/Test_Client_Module.h index bd649692068..38f1638da5b 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.h +++ b/TAO/tests/DLL_ORB/Test_Client_Module.h @@ -40,7 +40,7 @@ class Test_Client_Module_Export Test_Client_Module : public ACE_Task_Base public: /// Initializes object when dynamic linking occurs. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); /// Terminates object when dynamic unlinking occurs. virtual int fini (void); diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 2bb64be76df..bb590b53b1e 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -11,6 +11,7 @@ ACE_RCSID (DLL_ORB, "$Id$") #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior_file = "test.ior"; @@ -18,7 +19,7 @@ const char *ior_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +40,7 @@ parse_args (int argc, char *argv[]) } int -Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) +Test_Server_Module::init (int argc, char *argv[]) { // ----------------------------------------------------------------- // Pre-ORB initialization steps necessary for proper DLL ORB @@ -131,7 +132,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) ior.in ())); // Write IOR to a file. - 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/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h index f525f46716b..d1faee6c35d 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.h +++ b/TAO/tests/DLL_ORB/Test_Server_Module.h @@ -40,7 +40,7 @@ class Test_Server_Module_Export Test_Server_Module : public ACE_Task_Base public: /// Initializes object when dynamic linking occurs. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); /// Terminates object when dynamic unlinking occurs. virtual int fini (void); diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp index 3ba5a6ded57..029f6520d55 100644 --- a/TAO/tests/DLL_ORB/client.cpp +++ b/TAO/tests/DLL_ORB/client.cpp @@ -15,7 +15,7 @@ #include "ace/Thread_Manager.h" int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { // Process a Service Configurator directive that will cause the test // client module to be dynamically loaded. diff --git a/TAO/tests/DLL_ORB/server.cpp b/TAO/tests/DLL_ORB/server.cpp index c54ec7f983a..bcdd71b484d 100644 --- a/TAO/tests/DLL_ORB/server.cpp +++ b/TAO/tests/DLL_ORB/server.cpp @@ -15,7 +15,7 @@ #include "ace/Thread_Manager.h" int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { // Process a Service Configurator directive that will cause the test // server module to be dynamically loaded. diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc index c5deacad25b..c05d06349bb 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc +++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, messaging, minimum_corba, dynamicinterface { + exename = server Source_Files { test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): taoserver, messaging, minimum_corba, dynamicinterface { } project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { + exename = client after += *Server Source_Files { testC.cpp @@ -17,6 +19,7 @@ project(*Client): taoclient, messaging, minimum_corba, dynamicinterface { } project(*Gateway): taoexe, portableserver, messaging, minimum_corba, dynamicinterface { + exename = gateway after += *Client Source_Files { test_dsi.cpp diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index 4919809f944..bd74da8d4df 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI_Gateway, client, "$Id$") @@ -16,7 +17,7 @@ int test_system_exception = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xusk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xusk:i:"); int c; while ((c = get_opts ()) != -1) @@ -61,15 +62,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp index 4aade2c1f03..6cc2ae79484 100644 --- a/TAO/tests/DSI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_Gateway/gateway.cpp @@ -3,6 +3,7 @@ #include "test_dsi.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI_Gateway, server, "$Id$") @@ -14,7 +15,7 @@ const char *ior_output_file = "gateway.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:o:"); int c; while ((c = get_opts ()) != -1) @@ -54,12 +55,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -84,7 +87,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -115,7 +118,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp index dfe1919fe78..a0ecf51d0af 100644 --- a/TAO/tests/DSI_Gateway/server.cpp +++ b/TAO/tests/DSI_Gateway/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI_Gateway, server, "$Id$") @@ -13,7 +14,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -68,7 +71,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -88,7 +91,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index 5eae425f78a..cbea23a5fef 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -24,13 +24,16 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Driver driver; // initialize the driver - if (driver.init (argc, argv) == -1) + if (driver.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) driver.cpp - " "Driver initialization failed\n"), @@ -106,7 +109,7 @@ Driver::parse_args (int argc, char* argv[]) argv [0]), -1); - ACE_Get_Opt get_opts (argc, argv, "t:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:d"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index ce68f01c925..afd281c6225 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -248,7 +248,7 @@ Test_DynSequence::run_test (void) DynAnyTests::test_seq *ts_out; out_any1.in () >>= ts_out; - if (!ACE_OS::strcmp ((*ts_out)[0U], data.m_string1)) + if (!ACE_OS::strcmp (static_cast<const char *>((*ts_out)[0U]), data.m_string1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index c5d5d9780e8..2960758f42e 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -375,7 +375,7 @@ Test_DynStruct::run_test (void) CORBA::ULong index = 2; - if (ACE_OS::strcmp (gm[index].id, "es")) + if (ACE_OS::strcmp (gm[index].id.in(), "es")) { ++this->error_count_; } diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp index 174fa2dc97c..bb3c9fa085e 100644 --- a/TAO/tests/Explicit_Event_Loop/client.cpp +++ b/TAO/tests/Explicit_Event_Loop/client.cpp @@ -22,6 +22,7 @@ #include "timeC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" // The following header is #included automatically by ACE+TAO. // Therefore, they don't need to be included explicitly. @@ -29,14 +30,16 @@ //#include <iomanip.h> int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -50,7 +53,7 @@ main (int argc, char *argv[]) } // Destringify argv[1]. - CORBA::Object_var obj = orb->string_to_object (argv[1] + CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_TO_CHAR_IN(argv[1]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index 498c465ec22..c7c60d65c57 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -24,6 +24,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" const char *ior_output_file = "server.ior"; int done = 0; @@ -31,7 +32,7 @@ int done = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -83,19 +84,21 @@ void do_something_else() } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -136,7 +139,7 @@ main (int argc, char *argv[]) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc index 6e9c5283fe0..d2301e822c1 100644 --- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc +++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): strategies, rt_server { + exename = server Source_Files { Policy_Tester.cpp Policy_Verifier.cpp diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp index 217eacdae41..8918ae6cc86 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp @@ -69,7 +69,7 @@ Policy_Tester::init (int argc, // Here we parse the command line paramether passed // to the application. - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -138,7 +138,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object, { if (CORBA::is_nil (object)) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (msg))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT_TO_TCHAR_IN (msg))); return 0; } return 1; @@ -233,7 +233,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated as <%s>\n"), ior.in ())); - FILE *output_file = ACE_OS::fopen (this->rt_poa_properties_->ior_source (), "w"); + FILE *output_file = ACE_OS::fopen (this->rt_poa_properties_->ior_source (), ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Cannot open output file for writing IOR: %s"), @@ -278,7 +278,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Activated as <%s>\n"), o_ior.in ())); - output_file = ACE_OS::fopen (this->rt_object_properties_->ior_source (), "w"); + output_file = ACE_OS::fopen (this->rt_object_properties_->ior_source (), ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 4541f43613c..280217d99a9 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -26,7 +26,7 @@ Policy_Verifier::init (int argc, CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (false); - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -260,7 +260,7 @@ Policy_Verifier::check_reference (CORBA::Object_ptr object, { if (CORBA::is_nil (object)) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (msg))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT_TO_TCHAR_IN (msg))); return 0; } return 1; diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp index 4a23c92f0f5..fd4523b3b31 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -24,7 +24,7 @@ RT_Properties * RT_Properties::read_from (const char *file_name ACE_ENV_ARG_DECL) { - FILE *fp = ACE_OS::fopen (file_name, "r"); + FILE *fp = ACE_OS::fopen (file_name, ACE_TEXT("r")); RT_Properties *rt_properties; diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp index 80bc23f24f3..b8df1e7a00b 100644 --- a/TAO/tests/Exposed_Policies/client.cpp +++ b/TAO/tests/Exposed_Policies/client.cpp @@ -8,12 +8,15 @@ #include "Policy_Verifier.h" #include "tao/Strategies/advanced_resource.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(tao, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_DECLARE_NEW_CORBA_ENV; @@ -21,7 +24,7 @@ main (int argc, char *argv[]) { Policy_Verifier policy_verifier; - bool retval = policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER); + bool retval = policy_verifier.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval) diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp index ecc7d20d022..c8582a8fb27 100644 --- a/TAO/tests/Exposed_Policies/server.cpp +++ b/TAO/tests/Exposed_Policies/server.cpp @@ -14,20 +14,23 @@ #include "Policy_Tester.h" #include "tao/Strategies/advanced_resource.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(tao, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Policy_Tester policy_tester; - int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER); + int result = policy_tester.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp index 3d6b5a7abdf..ea6d1e66b09 100644 --- a/TAO/tests/FL_Cube/client.cpp +++ b/TAO/tests/FL_Cube/client.cpp @@ -2,6 +2,7 @@ #include "tao/FlResource_Loader.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(FL_Cube, client, "$Id$") @@ -27,7 +28,7 @@ public: void show (void); // Call show on all the window objects - void parse_args (int argc, char *argv[] + void parse_args (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); private: @@ -51,14 +52,16 @@ private: // The server. }; -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO::FlResource_Loader fl_loader; 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; Fl_Window window (300, 100); @@ -71,7 +74,7 @@ int main (int argc, char* argv[]) client.show (); - client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); + client.parse_args (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Fl::run (); @@ -166,12 +169,12 @@ Client::y_changed (void) } void -Client::parse_args (int argc, char *argv[] +Client::parse_args (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) { const char *ior = "file://test.ior"; - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index f3c3a235446..eaaddbdcac2 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/FlResource_Loader.h" ACE_RCSID(FL_Cube, server, "$Id$") @@ -13,7 +14,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,8 +38,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Fl_Window window(300, 300); TAO::FlResource_Loader fl_loader; @@ -51,10 +54,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; char* targv[] = { argv[0] }; @@ -94,7 +97,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc index 0bc0ae29bce..498ef9fcaea 100644 --- a/TAO/tests/Faults/Faults.mpc +++ b/TAO/tests/Faults/Faults.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, minimum_corba { + exename = server IDL_Files { test.idl } @@ -15,6 +16,7 @@ project(*Server): taoserver, minimum_corba { } project(*Middle): taoexe, portableserver, minimum_corba { + exename = middle after += *Server IDL_Files { test.idl @@ -29,6 +31,7 @@ project(*Middle): taoexe, portableserver, minimum_corba { } project(*Client): taoexe, portableserver, minimum_corba { + exename = client after += *Middle IDL_Files { test.idl @@ -43,6 +46,7 @@ project(*Client): taoexe, portableserver, minimum_corba { } project(*Ping): taoexe, portableserver, minimum_corba { + exename = ping IDL_Files { ping.idl } @@ -56,6 +60,7 @@ project(*Ping): taoexe, portableserver, minimum_corba { } project(*Pong): taoexe, portableserver, minimum_corba { + exename = pong after += *Ping IDL_Files { ping.idl diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index d7f4cf4e6e0..efc1e3c6fad 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" ACE_RCSID(Failure, client, "$Id$") @@ -16,7 +17,7 @@ int do_crash = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "acszxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "acszxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -66,12 +67,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -94,7 +97,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 8791dfa0c45..6244e071191 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Failure, middle, "$Id$") @@ -13,7 +14,7 @@ int niterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:i:"); int c; while ((c = get_opts ()) != -1) @@ -47,12 +48,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -75,7 +78,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = @@ -115,7 +118,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index d113c4a8a84..b9a2e3038c0 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ping_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Faults, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "ping.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -86,7 +89,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; PingObject_i *server_impl = 0; @@ -110,7 +113,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index fbc0b86a42f..4bfc38f4c3a 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Faults, server, "$Id$") @@ -15,7 +16,7 @@ const char* ior = "file://ping.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:p:k:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:p:k:t:"); int c; while ((c = get_opts ()) != -1) @@ -111,12 +112,14 @@ run_client (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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 = @@ -161,7 +164,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp index 530af043ca7..e044871662f 100644 --- a/TAO/tests/Faults/server.cpp +++ b/TAO/tests/Faults/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Failure, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -63,7 +66,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i *server_impl; @@ -89,7 +92,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index 189a81e3d59..71ba4ae5186 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -22,6 +22,7 @@ #include "ace/OS.h" #include "ace/SString.h" #include "ace/Thread_Manager.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Default_Servant, client, "client.cpp,v 1.8 2001/03/26 21:16:52 coryan Exp") @@ -36,7 +37,7 @@ static CORBA::ORB_var orb; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "t:dk:f:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:dk:f:i:"); int c; while ((c = get_opts ()) != -1) @@ -166,18 +167,20 @@ MTTEST (void *args) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); // parse args should catch this, but just in case... if (iorfile == 0) diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index 7d73730e5dc..d3581a7a951 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -7,6 +7,7 @@ #include "ace/Task.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (File_IO, server, @@ -40,7 +41,7 @@ private: static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d"); int c; while ((c = get_opts ()) != -1) @@ -69,8 +70,10 @@ parse_args (int argc, char **argv) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_HANDLE handle = ACE_OS::open ("big.txt", O_RDWR | O_CREAT, ACE_DEFAULT_FILE_PERMS); @@ -83,10 +86,10 @@ main (int argc, char *argv[]) ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; @@ -173,7 +176,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG,"%s\n", file_system_ior.in ())); - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index 7d6eee99bb3..c7e570001a6 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forwarding, client, "$Id$") @@ -14,7 +15,7 @@ int do_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -64,15 +65,17 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Worker worker (orb.in ()); diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp index 788a56c975a..3fb553b5c32 100644 --- a/TAO/tests/Forwarding/server.cpp +++ b/TAO/tests/Forwarding/server.cpp @@ -4,6 +4,7 @@ #include "tao/IORTable/IORTable.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forwarding, server, "$Id$") @@ -12,7 +13,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -36,12 +37,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -89,7 +92,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp index e900b46cdc1..4c4115929bf 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp @@ -2,6 +2,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Muxing, client, "$Id$") @@ -11,7 +12,7 @@ static size_t nthreads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -38,15 +39,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp index cbe3a65d928..3e4ecbd082f 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp @@ -3,6 +3,7 @@ #include "Payload_Receiver.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Request_Muxing, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,13 +35,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_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 = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Payload_Receiver *payload_receiver_impl; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp index 166b514f35c..772d50d03e7 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp @@ -3,6 +3,7 @@ #include "Payload_Receiver.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Request_Muxing, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,13 +35,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_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 = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; PortableServer::LifespanPolicy_var lifespan = @@ -96,7 +99,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index 066461f895a..fa225b32d6a 100644 --- a/TAO/tests/Hang_Shutdown/client.cpp +++ b/TAO/tests/Hang_Shutdown/client.cpp @@ -5,6 +5,7 @@ #include "ace/OS.h" #include "ace/Task.h" #include "ace/Profile_Timer.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -12,29 +13,29 @@ namespace Test { const char *ior = "file://server.ior"; - ACE_Profile_Timer profile_timer; - bool blocked = false; + ACE_Profile_Timer profile_timer; + bool blocked = false; - bool - parse_args (int argc, char *argv[]) - { - ACE_Get_Opt get_opts (argc, argv, "b:k:"); - int c; + bool + parse_args (int argc, char *argv[]) + { + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:k:"); + int c; - while ((c = get_opts ()) != -1) - switch (c) - { - case 'b': + while ((c = get_opts ()) != -1) + switch (c) { - int tmp = - ACE_OS::atoi (get_opts.opt_arg ()); + case 'b': + { + int tmp = + ACE_OS::atoi (get_opts.opt_arg ()); - if (tmp) - blocked = true; - else - blocked = false; - } - break; + if (tmp) + blocked = true; + else + blocked = false; + } + break; case 'k': { ior = get_opts.opt_arg (); @@ -261,7 +262,9 @@ namespace Test } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - return Test::try_main (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + + return Test::try_main (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index 4f17562b879..3861c135ba1 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" namespace Test { @@ -39,8 +40,7 @@ namespace Test 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); test_i *test_impl; ACE_NEW_RETURN (test_impl, @@ -49,8 +49,7 @@ namespace Test PortableServer::ServantBase_var owner_transfer (test_impl); Hang_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () @@ -58,7 +57,7 @@ namespace Test ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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", @@ -98,7 +97,9 @@ namespace Test } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - return Test::try_main (argc, argv); + ACE_Argv_Type_Converter convert (argc, argv); + + return Test::try_main (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp index f85722246b5..3aa48460088 100644 --- a/TAO/tests/Hello/client.cpp +++ b/TAO/tests/Hello/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp index 177aad4d1d8..b9b071c2cee 100644 --- a/TAO/tests/Hello/server.cpp +++ b/TAO/tests/Hello/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Hello, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp index 3457c09156a..fb34f948f97 100755 --- a/TAO/tests/ICMG_Any_Bug/client.cpp +++ b/TAO/tests/ICMG_Any_Bug/client.cpp @@ -4,6 +4,7 @@ #include "TestC.h" #include "tao/ORB.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include <string> ACE_RCSID (ICMG_Any_Bug, @@ -15,7 +16,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -39,15 +40,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index e32f495349a..255b2b423d7 100755 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ICMG_Any_Bug, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp index 2c39344eabf..3cf1d731fdb 100644 --- a/TAO/tests/IDL_Test/main.cpp +++ b/TAO/tests/IDL_Test/main.cpp @@ -26,6 +26,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" #include "tao/AnyTypeCode/Any.h" class hello_i : public virtual POA_hello @@ -85,14 +86,16 @@ struct something_handler : public POA_bug_1985_c::d::AMI_somethingHandler }; int -main (int argc , char *argv[]) +ACE_TMAIN (int argc , ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int error_count = 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_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp index 29313aad9b1..098c4411bb4 100644 --- a/TAO/tests/IORManipulation/IORTest.cpp +++ b/TAO/tests/IORManipulation/IORTest.cpp @@ -13,6 +13,7 @@ #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/IORManipulation/IORManip_Loader.h" @@ -23,8 +24,10 @@ ACE_RCSID (IORManipluation, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // The variable is declared volatile because, some compilers // optimizes this the wrong way. A case is point is the CC compiler // on IRIX. @@ -37,8 +40,8 @@ main (int argc, char *argv[]) ACE_TRY { // Retrieve the ORB. - CORBA::ORB_var orb_ = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb_ = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp index b4058e4deef..49601f81dca 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp @@ -6,17 +6,20 @@ #include "tao/corba.h" #include "tao/PortableServer/PortableServer.h" +#include "ace/Argv_Type_Converter.h" #include "bogus_i.h" ACE_RCSID (IOR_Endpoint_Hostnames, generate_ior, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - 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 poa_object = diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp index c6f463d08bf..efd40b3bf20 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp @@ -13,7 +13,7 @@ ACE_RCSID (IOR_Endpoint_Hostnames, list_interfaces, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp index 77a6ec4190b..1f736d6527d 100644 --- a/TAO/tests/IPV6/client.cpp +++ b/TAO/tests/IPV6/client.cpp @@ -3,6 +3,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -13,7 +14,7 @@ bool expect_error = false; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while ((c = get_opts ()) != -1) @@ -41,15 +42,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp index 177aad4d1d8..b9b071c2cee 100644 --- a/TAO/tests/IPV6/server.cpp +++ b/TAO/tests/IPV6/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Hello, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp index 374ab158593..d22fb76e4a1 100644 --- a/TAO/tests/InterOp-Naming/INS_test_client.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp @@ -7,18 +7,21 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int i = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve a reference to 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; @@ -34,7 +37,7 @@ main (int argc, char *argv[]) for (i = 1; i < argc; ++i) { - if (ACE_OS::strcmp (argv[i], "-l") == 0) + if (ACE_OS::strcmp (argv[i], ACE_TEXT("-l")) == 0) { // List initial services CORBA::ORB::ObjectIdList_var list = @@ -69,7 +72,7 @@ main (int argc, char *argv[]) } else { - objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER); + objref = orb->resolve_initial_references (ACE_TEXT_TO_CHAR_IN(argv[i]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (objref.in ())) diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp index c45f732a26f..f0d12921979 100644 --- a/TAO/tests/InterOp-Naming/INS_test_server.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp @@ -5,8 +5,9 @@ // This is the main driver program for the INS test server. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); Server_i server; @@ -15,8 +16,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - if (server.init (argc, - argv + if (server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp index ec60caff7ea..343dd6d4835 100644 --- a/TAO/tests/InterOp-Naming/Server_i.cpp +++ b/TAO/tests/InterOp-Naming/Server_i.cpp @@ -25,7 +25,7 @@ Server_i::~Server_i (void) int Server_i::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:"); int c = 0; while ((c = get_opts ()) != -1) @@ -35,7 +35,7 @@ Server_i::parse_args (void) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h index 7df2f070c41..62abca27e44 100644 --- a/TAO/tests/InterOp-Naming/Server_i.h +++ b/TAO/tests/InterOp-Naming/Server_i.h @@ -22,6 +22,7 @@ #include "tao/Utils/ORB_Manager.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "INS_i.h" class Server_i diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index 1711b12b175..a25eb1a6a08 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -17,6 +17,7 @@ #include "ace/Read_Buffer.h" #include "ace/Task.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/Strategies/advanced_resource.h" @@ -45,7 +46,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:c:e:w:t:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:c:e:w:t:x"); int c; while ((c = get_opts ()) != -1) @@ -236,22 +237,24 @@ private: }; int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 42575677363..492e3ad5a04 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/Strategies/advanced_resource.h" @@ -15,7 +16,7 @@ int number_of_event_loop_threads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "e:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "e:o:"); int c; while ((c = get_opts ()) != -1) @@ -80,13 +81,15 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -108,7 +111,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -124,7 +127,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc index 13a0c026057..9c55b31078d 100644 --- a/TAO/tests/LongUpcalls/LongUpcalls.mpc +++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc @@ -10,6 +10,7 @@ project(*Server): taoserver, messaging, ami { } project(*Client): messaging, taoexe, portableserver, ami { + exename = blocking_client after += *Server Source_Files { Controller.cpp @@ -27,6 +28,7 @@ project(*AMI_Server): taoserver, messaging, ami { } project(*AMI_Client): messaging, taoexe, portableserver, ami { + exename = ami_client after += *AMI_Server Source_Files { Controller.cpp diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index e22153a203d..db3afd7db23 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Controller.h" #include "Manager_Handler.h" @@ -11,7 +12,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Controller controller_impl; diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index ed7307129f9..5946477e568 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "AMI_Manager.h" ACE_RCSID(LongUpcalls, ami_server, "$Id$") @@ -10,7 +11,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -33,12 +34,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -58,7 +61,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; AMI_Manager manager_impl (orb.in ()); @@ -72,7 +75,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index b914c957950..6eda0fc867d 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Controller.h" ACE_RCSID(LongUpcalls, blocking_client, "$Id$") @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -33,12 +34,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = @@ -58,7 +61,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Controller controller_impl; diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index eb5c55c3bf0..2fb3ea014f1 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Manager.h" ACE_RCSID(LongUpcalls, blocking_server, "$Id$") @@ -10,7 +11,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -33,12 +34,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -58,7 +61,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Manager manager_impl (orb.in ()); @@ -72,7 +75,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index b25b828894c..46e8d32920d 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -4,6 +4,7 @@ #include "ace/SString.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -16,7 +17,7 @@ const char *name = "file://amba.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:m:"); int c; while ((c = get_opts ()) != -1) @@ -53,17 +54,19 @@ run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Primary server diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp index 12aea589a09..66753633013 100644 --- a/TAO/tests/MProfile/server.cpp +++ b/TAO/tests/MProfile/server.cpp @@ -4,6 +4,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client, server, "$Id$") @@ -12,7 +13,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -64,7 +67,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -82,7 +85,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index 5425b2e0ddd..0152c2d6a75 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -3,6 +3,7 @@ #include "tao/IORManipulation/IORManip_Loader.h" #include "ace/SString.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/TimeBaseC.h" #include "tao/Messaging/Messaging.h" @@ -21,7 +22,7 @@ TimeBase::TimeT timeout_period = 1000000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:m:"); int c; while ((c = get_opts ()) != -1) @@ -58,17 +59,19 @@ run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Primary server diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp index 9daac4d75f7..a8e06ff8f47 100644 --- a/TAO/tests/MProfile_Connection_Timeout/server.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp @@ -1,8 +1,9 @@ // $Id$ -#include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" +#include "ace/Get_Opt.h" ACE_RCSID(MProfile_Connection_Timeout, server, @@ -13,7 +14,7 @@ int orb_run = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r"); int c; while ((c = get_opts ()) != -1) @@ -39,12 +40,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -68,7 +71,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -86,7 +89,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp index 7336bc42523..625b9c8c052 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.cpp +++ b/TAO/tests/MProfile_Forwarding/Manager.cpp @@ -6,6 +6,7 @@ #include "ace/SString.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char *first_ior = 0; const char *second_ior = 0; @@ -15,7 +16,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -50,9 +51,11 @@ parse_args (int argc, char *argv[]) int -main (int argc, - char *argv[]) +ACE_TMAIN (int argc, + ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -60,12 +63,11 @@ main (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; manager.activate_servant (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -280,7 +282,7 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL) 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/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp index 610899838a9..31c2d829d59 100644 --- a/TAO/tests/MProfile_Forwarding/client.cpp +++ b/TAO/tests/MProfile_Forwarding/client.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" #include "testC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -12,7 +13,7 @@ const char *ior_input_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,17 +40,19 @@ run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; CORBA::Object_var objref = diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 04c27ae739f..0c473d95b42 100755 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp @@ -4,6 +4,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client, server, "$Id$") @@ -12,7 +13,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -64,7 +67,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -82,7 +85,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc index ab023c419a3..3a47c4c1882 100644 --- a/TAO/tests/MT_BiDir/MT_BiDir.mpc +++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba, bidir_giop { + exename = server Source_Files { ReceiverC.cpp SenderC.cpp @@ -13,6 +14,7 @@ project(*Server): taoexe, portableserver, minimum_corba, bidir_giop { } project(*Client): taoexe, portableserver, minimum_corba, bidir_giop { + exename = client after += *Server Source_Files { ReceiverC.cpp diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 23566a7d242..afe9c19c52b 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Receiver_i.h" #include "SenderC.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" @@ -14,7 +15,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -37,17 +38,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp index 7aeeeecdbc8..d5c3ae6d26f 100644 --- a/TAO/tests/MT_BiDir/server.cpp +++ b/TAO/tests/MT_BiDir/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Sender_i.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" @@ -23,7 +24,7 @@ static int no_clients = 2; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:c:"); int c; while ((c = get_opts ()) != -1) @@ -55,15 +56,17 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = @@ -149,7 +152,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index aaab6575632..0bbd22344ac 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client, client, "$Id$") @@ -15,7 +16,7 @@ int server_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x"); int c; while ((c = get_opts ()) != -1) @@ -76,15 +77,17 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 6a6f1db233d..afeb58353a0 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Task.h" ACE_RCSID(MT_Client, orb_creation, "$Id$") @@ -14,7 +15,7 @@ int niterations = 5; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:"); int c; while ((c = get_opts ()) != -1) @@ -69,15 +70,17 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, ""); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = @@ -144,7 +147,7 @@ Client::svc (void) CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv"); char* argv[1] = { argv0.inout () }; 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/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp index bf5e6312642..ee5ece94ffa 100644 --- a/TAO/tests/MT_Client/server.cpp +++ b/TAO/tests/MT_Client/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -77,7 +80,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp index 3948231f376..b84f7d4ff82 100644 --- a/TAO/tests/MT_Server/client.cpp +++ b/TAO/tests/MT_Server/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" ACE_RCSID(MT_Server, client, "$Id$") @@ -13,7 +14,7 @@ int do_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -46,15 +47,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index 982fc2cbc28..9fafa11b188 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "$Id$") @@ -13,7 +14,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -61,12 +62,14 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -86,7 +89,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -104,7 +107,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc index 634030e4814..c7cd2964fbe 100644 --- a/TAO/tests/MT_Timeout/MT_Timeout.mpc +++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): messaging, taoserver { + exename = server Source_Files { Sleep_Service.cpp Server_Task.cpp @@ -10,6 +11,7 @@ project(*Server): messaging, taoserver { } project(*Client): messaging, taoexe, portableserver { + exename = client after += *Server Source_Files { TestC.cpp diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index 21262fc921d..d00712c2a34 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -2,6 +2,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Client_Leaks, client, "$Id$") @@ -12,7 +13,7 @@ int threads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:n:"); int c; while ((c = get_opts ()) != -1) @@ -46,15 +47,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index c3a5b91ae3e..a584d9dc134 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -3,6 +3,7 @@ #include "Sleep_Service.h" #include "Server_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Timeout, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Sleep_Service *sleep_service_impl; @@ -77,7 +80,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc index 47b388a8e0f..bbb9570df52 100644 --- a/TAO/tests/Multiple/Multiple.mpc +++ b/TAO/tests/Multiple/Multiple.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver { + exename = server idlflags += -Gd Source_Files { @@ -12,6 +13,7 @@ project(*Server): taoserver { } project(*Client): taoexe, portableserver { + exename = client idlflags += -Gd after += *Server diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp index 8a2d499abce..37dadd157cf 100644 --- a/TAO/tests/Multiple/client.cpp +++ b/TAO/tests/Multiple/client.cpp @@ -1,17 +1,20 @@ // $Id$ # include "Collocation_Tester.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (tests, client, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB Initialization - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "TAO" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object; diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp index fcaa75221f3..0b251b2bfd6 100644 --- a/TAO/tests/Multiple/server.cpp +++ b/TAO/tests/Multiple/server.cpp @@ -2,18 +2,20 @@ #include "Multiple_Impl.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (tests, server, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Orb Initialization - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "TAO" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object; @@ -49,7 +51,7 @@ int main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen ("s.ior", "w"); + FILE *output_file= ACE_OS::fopen ("s.ior", ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp index 8406386f614..9d9ef382b00 100644 --- a/TAO/tests/Multiple_Inheritance/client.cpp +++ b/TAO/tests/Multiple_Inheritance/client.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Multiple_Inheritance, client, "$Id$") @@ -30,7 +31,7 @@ static char *ior_input_file = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:f:"); int c; while ((c = get_opts ()) != -1) @@ -69,18 +70,20 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); // If ior_input_file exists, Read the file, and get the IOR // else, it must have been specified on the command line diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index d29978c9163..87645cb5598 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/ORB_Manager.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Multiple_Inheritance, server, "$Id$") @@ -20,7 +21,7 @@ Multiple_Inheritance_i::Multiple_Inheritance_i (void) int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -44,8 +45,10 @@ parse_args (int argc, char **argv) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + Multiple_Inheritance_i servant; TAO_ORB_Manager orb_manager; @@ -53,13 +56,12 @@ main (int argc, char **argv) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - orb_manager.init_child_poa (argc, - argv, + orb_manager.init_child_poa (convert.get_argc(), convert.get_ASCII_argv(), "child_poa" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::String_var ior = @@ -74,7 +76,7 @@ main (int argc, char **argv) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index 6a9cb60d163..0440c4eb180 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client, client, "client.cpp,v 1.16 2002/01/29 20:21:08 okellogg Exp") @@ -16,7 +17,7 @@ int server_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "l:k:n:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "l:k:n:i:x"); int c; while ((c = get_opts ()) != -1) @@ -80,15 +81,17 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index e911f5aa83c..26137e62112 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Synch_T.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Server, server, "server.cpp,v 1.7 2002/01/29 20:21:08 okellogg Exp") @@ -17,7 +18,7 @@ int nclient_threads = nthreads; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "c:l:i:o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:l:i:o:n:"); int c; while ((c = get_opts ()) != -1) @@ -120,12 +121,14 @@ private: /***************************************************/ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -145,7 +148,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i *server_impl = 0; @@ -168,7 +171,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index 01e0b962d78..9b1be08b07a 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -2,6 +2,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Muxing, client, "$Id$") @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -33,15 +34,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index 06a120b2183..c467615ebdb 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -3,6 +3,7 @@ #include "Receiver.h" #include "Server_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Muxing, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Receiver *receiver_impl; @@ -77,7 +80,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp index 67811435ae2..7f7d110f6ca 100644 --- a/TAO/tests/Native_Exceptions/client.cpp +++ b/TAO/tests/Native_Exceptions/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" ACE_RCSID(Native_Exceptions, client, "$Id$") @@ -11,7 +12,7 @@ int niterations = 100; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:"); int c; while ((c = get_opts ()) != -1) @@ -40,14 +41,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, ""); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""); - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp index 6e41137344e..5df8a0576f6 100644 --- a/TAO/tests/Native_Exceptions/server.cpp +++ b/TAO/tests/Native_Exceptions/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Native_Exceptions, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, ""); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""); CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); @@ -51,7 +54,7 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -67,7 +70,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc index 35e6a89edfd..17842e4aca5 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Nested_Upcall_Server): taoserver, utils { + exename = server Source_Files { MT_Object_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Nested_Upcall_Server): taoserver, utils { } project(*Nested_Upcall_Client): taoexe, utils, portableserver { + exename = client after += *Nested_Upcall_Server Source_Files { MT_Object_i.cpp diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index ba1c615cd55..59ba502b682 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -25,6 +25,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client_Test, client, "$Id$") @@ -87,7 +88,7 @@ MT_Client::read_ior (char *filename) int MT_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:g:h:i:n:s:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:g:h:i:n:s:"); int c; int result; @@ -285,15 +286,16 @@ MT_Client::init (int argc, char **argv, // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ORB_Manager orb_manager; - int r = orb_manager.init (argc, - argv + int r = orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -308,15 +310,15 @@ main (int argc, char **argv) int threads = 1; for (i = 0; i < argc; i++) - if (ACE_OS::strcmp (argv[i], "-n") == 0) + if (ACE_OS::strcmp (argv[i], ACE_TEXT("-n")) == 0) threads = ACE_OS::atoi(argv[i + 1]); // create a separate server thread ACE_Thread_Manager server_thr_mgr; // starting the server thread MT_Server_Task *server = new MT_Server_Task (&server_thr_mgr, - argc, - argv, + convert.get_argc(), + convert.get_ASCII_argv(), &orb_manager); if (server->activate () != 0) { @@ -331,7 +333,7 @@ main (int argc, char **argv) MT_Client_Task **clients = new MT_Client_Task*[threads]; for (i = 0; i < threads; i++) - clients[i] = new MT_Client_Task (argc, argv, i); + clients[i] = new MT_Client_Task (convert.get_argc(), convert.get_ASCII_argv(), i); for (i = 0; i < threads; i++) if (clients[i]->activate () != 0) diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h index 0422ed8d7aa..482c71c2f2b 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h @@ -21,6 +21,7 @@ #define MT_CLIENT_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 36e81ffa7c3..078ced7852a 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -87,7 +87,7 @@ MT_Server::read_ior (char *filename) int MT_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "d:f:g:h:i:n:s:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d:f:g:h:i:n:s:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index 01c4d33b760..588d3ba157f 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -30,6 +30,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Manager; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index c3e0377bee6..3a8020259a5 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -31,7 +31,7 @@ MT_Object_Server::MT_Object_Server (void) int MT_Object_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "do:m"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:m"); int c; while ((c = get_opts ()) != -1) @@ -41,7 +41,7 @@ MT_Object_Server::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", @@ -124,8 +124,10 @@ MT_Object_Server::~MT_Object_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + MT_Object_Server MT_Object_Server; ACE_DEBUG ((LM_DEBUG, @@ -134,7 +136,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); + int r = MT_Object_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index 8d57cc0d23e..37d4369c2e4 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -22,6 +22,7 @@ #define MT_CLIENT_TEST_MT_OBJECT_SERVER_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc index 766f62db832..b60735cafc3 100644 --- a/TAO/tests/NestedUpcall/Simple/Simple.mpc +++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Nested_Upcall_Server): taoexe, portableserver { + exename = server Source_Files { server_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Nested_Upcall_Server): taoexe, portableserver { } project(*Nested_Upcall_Client): taoexe, portableserver { + exename = client after += *Nested_Upcall_Server Source_Files { client_i.cpp diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 33dc4890f6a..22e8ce0c447 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -3,6 +3,7 @@ #include "client_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple, client, "$Id$") @@ -67,7 +68,7 @@ static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "qxn:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "qxn:k:"); int c; while ((c = get_opts ()) != -1) @@ -113,19 +114,20 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, - argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index f9f3763ca91..95db8076d74 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -3,6 +3,7 @@ #include "server_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple, server, "$Id$") @@ -50,7 +51,7 @@ Server_Task::svc (void) static int write_ior_to_file (const char *ior) { - 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 files for writing IOR: %s\n", @@ -79,7 +80,7 @@ static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "q:f:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "q:f:t:"); int c; while ((c = get_opts ()) != -1) @@ -113,19 +114,20 @@ parse_args (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, - argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index a014035dc5e..49096c9d7a9 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -3,6 +3,7 @@ #include "client_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple, client, "$Id$") @@ -72,7 +73,7 @@ static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "qxn:k:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "qxn:k:t:"); int c; while ((c = get_opts ()) != -1) @@ -122,19 +123,20 @@ parse_args (int argc, } int -main (int argc, +ACE_TMAIN (int argc, char **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(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, - argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc index e8b0864ecd5..102dbc4ecce 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc +++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Nested_Upcall_Server_A): taoexe, utils, portableserver { + exename = server_A Source_Files { Object_A_i.cpp server_A.cpp @@ -9,6 +10,7 @@ project(*Nested_Upcall_Server_A): taoexe, utils, portableserver { } project(*Nested_Upcall_Server_B): taoexe, utils, portableserver { + exename = server_B after += *Nested_Upcal_Server_A Source_Files { Object_B_i.cpp @@ -17,6 +19,7 @@ project(*Nested_Upcall_Server_B): taoexe, utils, portableserver { } project(*Nested_Upcall_Initiator): taoexe, utils, portableserver { + exename = initiator after += *Nested_Upcall_Server_B Source_Files { Initiator_i.cpp diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 6e653ca4040..75baea08e6a 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -76,7 +76,7 @@ Initiator_Server::read_ior (char *filename, unsigned int A_B) int Initiator_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:g:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:g:"); int c, result; while ((c = get_opts ()) != -1) @@ -289,8 +289,10 @@ Initiator_Server::~Initiator_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n")); @@ -300,7 +302,7 @@ main (int argc, char *argv[]) Initiator_Server initiator_Server; int retval = - initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); + initiator_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index 137f31e0dc6..6767a94dc09 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -22,6 +22,7 @@ #define _TRIANGLE_TEST_INITITATOR_SERVER_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index 8ab9fe10dfe..038f5d4cc04 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -31,7 +31,7 @@ Object_A_Server::Object_A_Server (void) int Object_A_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:"); int c; while ((c = get_opts ()) != -1) @@ -41,7 +41,7 @@ Object_A_Server::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", @@ -118,8 +118,10 @@ Object_A_Server::~Object_A_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Object_A_Server object_A_Server; ACE_DEBUG ((LM_DEBUG, @@ -129,7 +131,7 @@ main (int argc, char *argv[]) ACE_TRY { int retval = - object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); + object_A_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index 842cae01b00..1cbe49354d1 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -22,6 +22,7 @@ #define _TRIANGLE_TEST_OBJECT_A_SERVER_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index 47837342aaa..617c682e34b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -31,7 +31,7 @@ Object_B_Server::Object_B_Server (void) int Object_B_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:"); int c; while ((c = get_opts ()) != -1) @@ -41,7 +41,7 @@ Object_B_Server::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", @@ -118,8 +118,10 @@ Object_B_Server::~Object_B_Server (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Object_B_Server object_B_Server; ACE_DEBUG ((LM_DEBUG, @@ -128,7 +130,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); + int retval = object_B_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index 3661f99bd71..95424f009b8 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -22,6 +22,7 @@ #define _TRIANGLE_TEST_OBJECT_B_SERVER_H #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc index 50ef58ea252..53c8bf07c5f 100644 --- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc +++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): strategies, taoexe, portableserver { + exename = server Source_Files { test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): strategies, taoexe, portableserver { } project(*Client): strategies, taoexe, portableserver { + exename = client after += *Server Source_Files { test_i.cpp diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index ac198b31bd6..52984478707 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/Strategies/advanced_resource.h" @@ -24,7 +25,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:d:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:d:i:x"); int c; while ((c = get_opts ()) != -1) @@ -68,22 +69,24 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 134bd31f46a..581c618b7bd 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "tao/Strategies/advanced_resource.h" @@ -12,7 +13,7 @@ const char *ior_output_file = "ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -36,13 +37,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -61,7 +64,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; server_i servant (orb.in ()); @@ -77,7 +80,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index 0bafc403012..da732aee0c2 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Nested_Upcall_Crash, client, "$Id$") @@ -30,12 +31,14 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -88,7 +91,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Client_Peer *impl; @@ -155,7 +158,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp index d2b7c7d3981..5091945dbde 100644 --- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp @@ -5,6 +5,7 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Nested_Upcall_Crash, scavenger, "$Id$") @@ -14,14 +15,16 @@ int parse_args (int argc, char *argv[]); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int ret_val = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -57,7 +60,7 @@ main (int argc, char *argv[]) policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = @@ -104,7 +107,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index 0b7eb0628fe..c1a244f1615 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -8,6 +8,7 @@ #include "ace/Get_Opt.h" #include "ace/Reactor.h" #include "ace/OS_NS_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Nested_Upcall_Crash, server, @@ -33,12 +34,14 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -94,7 +97,7 @@ main (int argc, char *argv[]) seed = (ACE_RANDR_TYPE) ACE_OS::gethrtime (); - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_DEBUG ((LM_DEBUG, "SEED = %u\n", seed)); @@ -115,7 +118,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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", @@ -161,7 +164,7 @@ main (int argc, char *argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:b:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index 4034e1245c9..b9eb181f305 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client, client, "$Id$") @@ -15,7 +16,7 @@ int server_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x"); int c; while ((c = get_opts ()) != -1) @@ -72,15 +73,17 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp index bf5e6312642..ee5ece94ffa 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(MT_Client, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -77,7 +80,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc index d49a9b37b23..f08b7f3a878 100644 --- a/TAO/tests/OBV/Any/OBV_Any.mpc +++ b/TAO/tests/OBV/Any/OBV_Any.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, valuetype { + exename = server Source_Files { AnyS_impl.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): taoexe, portableserver, valuetype { } project(*Client): taoexe, valuetype { + exename = client after += *Server Source_Files { AnyC.cpp diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp index 9f03f474b9e..35e8b528ad6 100644 --- a/TAO/tests/OBV/Any/client.cpp +++ b/TAO/tests/OBV/Any/client.cpp @@ -2,6 +2,7 @@ #include "AnyC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Any, client, "$Id$") @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,18 +35,20 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\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; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Create and register factories. diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp index aadb21d4cd5..f16fe8a83a0 100644 --- a/TAO/tests/OBV/Any/server.cpp +++ b/TAO/tests/OBV/Any/server.cpp @@ -3,6 +3,7 @@ #include "AnyS_impl.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Any, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_impl *test_impl; @@ -79,7 +82,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp index be09bb0c6db..a95296343b2 100644 --- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp @@ -14,7 +14,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o:n"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n"); int c; while ((c = get_opts ()) != -1) @@ -41,19 +41,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -74,10 +74,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp index 79efb6141fb..a7f1f49e0dc 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp @@ -98,7 +98,7 @@ Server_Task::svc (void) ACE_TRY_CHECK; // If the this->output_ exists, output the ior to it - FILE *output_file= ACE_OS::fopen (this->output_, "w"); + FILE *output_file= ACE_OS::fopen (this->output_, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp index 2b6a232470a..6e512583d7d 100644 --- a/TAO/tests/OBV/Factory/client.cpp +++ b/TAO/tests/OBV/Factory/client.cpp @@ -3,6 +3,7 @@ #include "FactoryC.h" #include "FactoryC_impl.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Factory, client, "$Id$") @@ -11,7 +12,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -68,15 +69,17 @@ no_factory (OBV_FactoryTest::Test_ptr test) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Obtain reference to the object diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp index 5f6788e57d4..abca3cf7603 100644 --- a/TAO/tests/OBV/Factory/server.cpp +++ b/TAO/tests/OBV/Factory/server.cpp @@ -3,6 +3,7 @@ #include "FactoryS_impl.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Factory, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_impl *test_impl; @@ -79,7 +82,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp index b61d1544147..6bc42eb9311 100644 --- a/TAO/tests/OBV/Forward/client.cpp +++ b/TAO/tests/OBV/Forward/client.cpp @@ -6,6 +6,7 @@ #include "TreeNodeC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forward, client, "$Id$") @@ -14,7 +15,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -80,15 +81,17 @@ dump_tree (TreeController *tc) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // All factories are kindly provided by diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index bf17c26cc87..74ddd5cdfd2 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -7,6 +7,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Forward, server, "$Id$") @@ -15,7 +16,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,12 +40,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // All factories are kindly provided by @@ -105,7 +108,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_impl *test_impl; @@ -123,7 +126,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index 9d0932b1d87..8fed369a9ab 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -5,6 +5,7 @@ #include "Supports_TestS.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" /** * \class node_impl diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp index 076d397dfa4..b04321e8fb7 100644 --- a/TAO/tests/OBV/Supports/client.cpp +++ b/TAO/tests/OBV/Supports/client.cpp @@ -9,7 +9,7 @@ int id = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:i:"); int c; while ((c = get_opts ()) != -1) @@ -37,15 +37,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp index f92eee137c5..189dbdc8da8 100644 --- a/TAO/tests/OBV/Supports/server.cpp +++ b/TAO/tests/OBV/Supports/server.cpp @@ -6,12 +6,14 @@ const char * ior_output_file = "test.ior"; int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" 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 poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -62,7 +64,7 @@ main (int argc, char * argv[]) CORBA::String_var ior = orb->object_to_string (a_test 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")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", ior_output_file), 1); diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp index 25da5405c51..6dddb8bb67d 100644 --- a/TAO/tests/OBV/TC_Alignment/client.cpp +++ b/TAO/tests/OBV/TC_Alignment/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (TC_Alignment, client, @@ -126,7 +127,7 @@ run_test (test_ptr objref, int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:x"); int c; while ((c = get_opts ()) != -1) @@ -160,17 +161,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - 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; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp index ba59b23fa58..7f1cc43354d 100644 --- a/TAO/tests/OBV/TC_Alignment/server.cpp +++ b/TAO/tests/OBV/TC_Alignment/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (TC_Alignment, server, @@ -10,13 +11,15 @@ ACE_RCSID (TC_Alignment, const char *ior_output_file = "test.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -60,7 +63,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 27e63f25ec2..647da046fa1 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -2,6 +2,7 @@ #include "valueboxC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(ValueBox, client, @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -1440,19 +1441,20 @@ int test_boxed_union_invocations (Test * test_object) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Test_var test_object; CORBA::ORB_var orb; - ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_EX (init) { - 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_EX (init); - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Obtain reference to the object. diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index 4eaa84c6db0..a3b3911538f 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(ValueBox, server, @@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,12 +39,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -63,7 +66,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_impl *test_impl; @@ -81,7 +84,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index a1d4a89b03e..fa42a5dc9b5 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -20,6 +20,7 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(ORB_destroy, ORB_destroy, "$Id$") @@ -136,66 +137,68 @@ test_with_funky_poa_manager (int argc, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int result = 0; - result = test_with_regular_poa_manager (argc, argv, + result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_nothing_with_poa_manager", 0, 0); ACE_ASSERT (result == 0); - result = test_with_regular_poa_manager (argc, argv, + result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_poa_with_poa_manager", 0, 1); ACE_ASSERT (result == 0); - result = test_with_regular_poa_manager (argc, argv, + result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_orb_with_poa_manager", 1, 0); ACE_ASSERT (result == 0); - result = test_with_regular_poa_manager (argc, argv, + result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_poa_and_orb_with_poa_manager", 1, 1); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_nothing_without_poa_manager", 0, 0, 0); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_poa_without_poa_manager", 0, 1, 0); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_orb_without_poa_manager", 1, 0, 0); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_poa_and_orb_without_poa_manager", 1, 1, 0); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_nothing_with_funky_poa_manager", 0, 0, 1); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_poa_with_funky_poa_manager", 0, 1, 1); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_orb_with_funky_poa_manager", 1, 0, 1); ACE_ASSERT (result == 0); - result = test_with_funky_poa_manager (argc, argv, + result = test_with_funky_poa_manager (convert.get_argc(), convert.get_ASCII_argv(), "destroy_poa_and_orb_with_funky_poa_manager", 1, 1, 1); ACE_ASSERT (result == 0); diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp index 345f699a8eb..a64fe55a4b2 100644 --- a/TAO/tests/ORB_init/ORB_init.cpp +++ b/TAO/tests/ORB_init/ORB_init.cpp @@ -6,6 +6,7 @@ #include "tao/SystemException.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ORB_init, ORB_init, @@ -19,8 +20,10 @@ static const char IOR[] = "IOR:010000001600000049444c3a43756269745f466163746f72793a312e30000000010000000000000090000000010102cd14000000616e647572696c2e6563652e7563692e6564750057fecdcd2d00000014010f004e5550000000130000000001000000006368696c645f706f61000000000001000000666163746f7279cdcdcd03000000000000000800000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000004f41540400000001cd0000"; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; ACE_DECLARE_NEW_CORBA_ENV; @@ -31,7 +34,7 @@ main (int argc, char *argv[]) CORBA::ORB_ptr my_orb = CORBA::ORB::_nil(); { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; my_orb = orb.in (); @@ -48,7 +51,7 @@ main (int argc, char *argv[]) // used in that scope. // ------------------------------------------------------------- - orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a @@ -86,7 +89,7 @@ main (int argc, char *argv[]) orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a @@ -131,11 +134,11 @@ main (int argc, char *argv[]) // clean-up. // ------------------------------------------------------------- CORBA::ORB_var orb2 = - CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB number 2" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb3 = - CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB number 3" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ------------------------------------------------------------- diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp index e93543879ed..91c160c3fec 100644 --- a/TAO/tests/ORB_init/Portspan/server.cpp +++ b/TAO/tests/ORB_init/Portspan/server.cpp @@ -1,14 +1,17 @@ // $Id$ #include "simpleI.h" +#include "ace/Argv_Type_Converter.h" int -main( int argc, char *argv[] ) +ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - 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/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp index 1ab5469ae50..3b76f18f439 100644 --- a/TAO/tests/ORB_shutdown/server.cpp +++ b/TAO/tests/ORB_shutdown/server.cpp @@ -3,18 +3,21 @@ #include "Foo_Bar.h" #include "ace/Time_Value.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Hello, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp index 904b4bda66f..41d68f18ff0 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.cpp +++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp @@ -115,7 +115,7 @@ ServerRequestInterceptor::receive_request ( // Make sure the name of the RootPOA is the first in the AdapterName // sequence. - ACE_ASSERT (ACE_OS::strcmp ("RootPOA", name[(CORBA::ULong) 0]) == 0); + ACE_ASSERT (ACE_OS::strcmp ("RootPOA", static_cast<const char*>(name[(CORBA::ULong) 0])) == 0); CORBA::String_var orb_id = ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp index a1f0d2219a7..3c883a87b1a 100644 --- a/TAO/tests/ORT/client.cpp +++ b/TAO/tests/ORT/client.cpp @@ -3,6 +3,7 @@ #include "ORT_testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ORT, client, @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,16 +35,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "client_sum_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var obj = diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp index d8656cc7c94..373f1dbbb05 100644 --- a/TAO/tests/ORT/server.cpp +++ b/TAO/tests/ORT/server.cpp @@ -5,6 +5,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ORT, server, @@ -16,7 +17,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,8 +40,10 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -57,13 +60,13 @@ int main (int argc, char *argv[]) ACE_TRY_CHECK; // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "ORT Test ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::Object_var obj = @@ -144,7 +147,7 @@ int main (int argc, char *argv[]) // Dump it to a 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 " diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 73ae41e115f..6b1ae9300b5 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -12,7 +12,7 @@ Loader::Loader (void) CORBA::Object_ptr Loader::create_object (CORBA::ORB_ptr orb, int, - char * [] + ACE_TCHAR * [] ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h index 73b4c5708f4..f9620f082da 100644 --- a/TAO/tests/Object_Loader/Loader.h +++ b/TAO/tests/Object_Loader/Loader.h @@ -32,7 +32,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - char *argv [] + ACE_TCHAR *argv [] ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Create a new instance diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc index a008ebf89a3..4f1da93c018 100644 --- a/TAO/tests/Object_Loader/Object_Loader.mpc +++ b/TAO/tests/Object_Loader/Object_Loader.mpc @@ -12,6 +12,7 @@ project(*Test): taolib_with_idl, portableserver { } project(*Driver): taoexe, portableserver { + exename = driver after += *Test Source_Files { TestC.cpp diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp index e7e9b391e0d..36a4ed78746 100644 --- a/TAO/tests/Object_Loader/driver.cpp +++ b/TAO/tests/Object_Loader/driver.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_stdio.h" int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { int niterations = 10; int norbs = 10; diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index 3fb96a60ce4..470d3ae3616 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -1,13 +1,14 @@ //$Id$ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -32,22 +33,22 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - + ACE_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; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Connect to the server diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 3890ff162fb..f4c918d9e64 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -2,6 +2,7 @@ #include "TestS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" /// Implement the Server Interface class ServerServant : @@ -123,7 +124,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -147,20 +148,20 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv []) - +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_TRY { // Initialize the broker 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; @@ -205,7 +206,7 @@ main (int argc, char *argv []) ACE_TRY_CHECK; // 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/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp index 995499aca20..666cce2c1e6 100644 --- a/TAO/tests/OctetSeq/OctetSeq.cpp +++ b/TAO/tests/OctetSeq/OctetSeq.cpp @@ -20,6 +20,7 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB.h" #include "tao/CDR.h" @@ -161,13 +162,15 @@ run (char* buf, size_t bufsize, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -179,7 +182,8 @@ main (int argc, char *argv[]) int quiet = 0; - ACE_Get_Opt get_opt (argc, argv, "qn:l:h:s:"); + ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), + convert.get_ASCII_argv(), "qn:l:h:s:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index e781734a4b2..f6be23d2614 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -5,6 +5,7 @@ #include "testC.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(OctetSeq, client, "$Id$") @@ -16,7 +17,7 @@ int verbose = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "vk:i:s:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "vk:i:s:"); int c; while ((c = get_opts ()) != -1) @@ -55,15 +56,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index 59e56b30f2d..e4d125e7c8d 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (OctetSeq, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -36,12 +37,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -61,7 +64,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; { @@ -81,7 +84,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc index ee95112f143..f2366c94233 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): messaging, taoexe, portableserver { + exename = server Source_Files { Oneway_Buffering.cpp server.cpp @@ -17,6 +18,7 @@ project(*Server): messaging, taoexe, portableserver { // only one process is allowed to compile Test.idl and thus the build // succeeds. project(*Client): messaging, taoexe, portableserver { + exename = client requires += corba_messaging after += *Server @@ -27,6 +29,7 @@ project(*Client): messaging, taoexe, portableserver { } project(*Admin): messaging, taoexe, portableserver { + exename = admin after += *Client Source_Files { Oneway_Buffering_Admin.cpp diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index 4ab858a5e46..a78e49916a6 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -3,6 +3,7 @@ #include "Oneway_Buffering_Admin.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Oneway_Buffering, admin, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "admin.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Oneway_Buffering_Admin *oneway_buffering_admin_impl; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp index ca1b240ca78..c4a059307a2 100644 --- a/TAO/tests/Oneway_Buffering/client.cpp +++ b/TAO/tests/Oneway_Buffering/client.cpp @@ -7,6 +7,7 @@ #include "tao/AnyTypeCode/TAOA.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Oneway_Buffering, client, "$Id$") @@ -37,7 +38,7 @@ const double GIOP_OVERHEAD = 0.9; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:a:i:ctbr"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:a:i:ctbr"); int c; while ((c = get_opts ()) != -1) @@ -112,16 +113,18 @@ run_buffer_size (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int test_failed = 0; ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index 6997308857d..b154924c82d 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -3,6 +3,7 @@ #include "Oneway_Buffering.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Oneway_Buffering, server, "$Id$") @@ -12,7 +13,7 @@ const char *ior = "file://admin.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:"); int c; while ((c = get_opts ()) != -1) @@ -41,12 +42,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -66,7 +69,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = @@ -101,7 +104,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc index bd6dfbc4ff5..975c0107dde 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc +++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver { + exename = server Source_Files { Server_Task.cpp Sender_i.cpp @@ -10,6 +11,7 @@ project(*Server): taoserver { } project(*Client): taoexe, portableserver { + exename = client after += *Server Source_Files { Client_Task.cpp diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index 9d2b4cc90e8..5d8f4ccfb3a 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -4,6 +4,7 @@ #include "Client_Task.h" #include "Server_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Muxing, client, "$Id$") @@ -12,7 +13,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the sender reference.. diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index 2c3131b2cda..7a492e3a9cb 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -3,6 +3,7 @@ #include "Sender_i.h" #include "Server_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Sender_i *sender_impl; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index cfb3e541f38..af24e291645 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -21,18 +21,21 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // 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; diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp index 13749603e33..bcebec6eda2 100644 --- a/TAO/tests/POA/Deactivate_Object/server.cpp +++ b/TAO/tests/POA/Deactivate_Object/server.cpp @@ -2,18 +2,21 @@ #include "Hello.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Hello, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp index d0de0aad007..32b5fc7a95e 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp +++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp @@ -19,6 +19,7 @@ #include "testS.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/ServantManagerC.h" class test_i : public POA_test @@ -148,15 +149,17 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 1471f38f8b3..5a81ea19892 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -19,6 +19,7 @@ #include "testS.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/ServantActivatorC.h" class test_i : public POA_test @@ -117,15 +118,17 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB 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; diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 7880507c3fa..211c3874891 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -20,6 +20,7 @@ //========================================================================= #include "testS.h" +#include "ace/Argv_Type_Converter.h" class test_i : public POA_test { @@ -170,15 +171,16 @@ test_object_deactivation (PortableServer::POA_ptr poa, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // 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; diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc index 8b143029fd2..bcab555ddf1 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver { + exename = Excessive_Object_Deactivations } diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 1f3265ec6c4..17e6339a4cf 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -18,6 +18,7 @@ #include "testS.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Identity, Identity, "$Id$") @@ -694,13 +695,15 @@ test_poas (CORBA::ORB_ptr orb, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 + 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/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 11d740642cd..59ede0a423d 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -20,6 +20,7 @@ #include "testS.h" #include "ace/Task.h" #include "ace/Auto_Event.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/ServantLocatorC.h" #include "tao/CDR.h" @@ -246,15 +247,17 @@ overwrite_servant_manager (PortableServer::POA_ptr poa) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + int retval = 0; ACE_TRY_NEW_ENV { 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; diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc index 6443ce82a36..49a846609ec 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver, minimum_corba { + exename = MT_Servant_Locator } diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 70b54317789..d834e09eb39 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -20,6 +20,7 @@ #include "testS.h" #include "ace/Task.h" #include "ace/Auto_Event.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/ServantActivatorC.h" class test_i : @@ -217,13 +218,15 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc index 6443ce82a36..a0b684ecb1f 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver, minimum_corba { + exename = Nested_Non_Servant_Upcalls } diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index 11aa293619d..1814d839680 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -20,6 +20,7 @@ //========================================================================= #include "testS.h" +#include "ace/Argv_Type_Converter.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -74,13 +75,15 @@ test_i::~test_i (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc index 8b143029fd2..b6fc4129004 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver { + exename = Non_Servant_Upcalls } diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 0c5c38a7ddf..01c8588bb8d 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -23,13 +23,14 @@ #include "ace/SString.h" #include "ace/Auto_Event.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" static int debug = 1; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "d:"); int c; while ((c = get_opts ()) != -1) @@ -211,21 +212,23 @@ Deactivator::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc index 8b143029fd2..b3f7ae78c53 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver { + exename = Object_Reactivation } diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index a35208aa000..952869c6d6f 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -18,6 +18,7 @@ //========================================================================= #include "testS.h" +#include "ace/Argv_Type_Converter.h" class test_i : public POA_test { @@ -42,15 +43,16 @@ test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc index 8b143029fd2..dc930661995 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver { + exename = POA_Destruction } diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp index 45519fdd154..1188073b165 100644 --- a/TAO/tests/POA/Persistent_ID/client.cpp +++ b/TAO/tests/POA/Persistent_ID/client.cpp @@ -17,6 +17,7 @@ #include "ace/Get_Opt.h" #include "testC.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Generic_Servant, client, "$Id$") @@ -26,7 +27,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while ((c = get_opts ()) != -1) @@ -59,21 +60,23 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 15f8272c1a9..dffcbf892da 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -21,6 +21,7 @@ #include "testS.h" #include "ace/OS_NS_stdio.h" #include "tao/PortableServer/PortableServer.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Explicit_Activation, server, "$Id$") @@ -181,7 +182,7 @@ const char *ior_file = "ior"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -208,7 +209,7 @@ static int write_ior_to_file (const char *ior) { FILE *output_file = - ACE_OS::fopen (ior_file, "w"); + ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n", @@ -233,20 +234,22 @@ write_ior_to_file (const char *ior) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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; - int result = parse_args (argc, argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index 095c1dca356..1fdf375e3ea 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -24,18 +24,22 @@ #include "tao/PI_Server/PI_Server.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // 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; diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc index 49fcc0fc6a3..7b1e60a0a01 100644 --- a/TAO/tests/POA/Policies/Policies.mpc +++ b/TAO/tests/POA/Policies/Policies.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver, pi_server { + exename = Policies } diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp index bd7b83a4082..015b2c47415 100644 --- a/TAO/tests/POA/Reference_Counting/test.cpp +++ b/TAO/tests/POA/Reference_Counting/test.cpp @@ -1,6 +1,7 @@ // $Id$ #include "HelloS.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Reference_Counting, test, @@ -37,12 +38,14 @@ getRefCount (PortableServer::ServantBase * sb ACE_ENV_ARG_DECL) } int -main (int argc, char * argv[]) +ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index f841fcdfdfd..35e01a574f4 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -22,6 +22,7 @@ #include "testS.h" #include "ace/Task.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" class test_i : public virtual POA_test { @@ -111,13 +112,15 @@ Worker::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc index 6443ce82a36..6384c0fa9d4 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc @@ -2,4 +2,5 @@ // $Id$ project(POA*): taoexe, portableserver, minimum_corba { + exename = Single_Threaded_POA } diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index 8b945a68c1b..d970ca71dad 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -17,6 +17,7 @@ //========================================================================= #include "testS.h" +#include "ace/Argv_Type_Converter.h" class test_i : public POA_test { @@ -84,23 +85,23 @@ init_orb (int argc, } int -main (int argc, - char **argv) +ACE_TMAIN (int argc, + ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { PortableServer::POA_var first_poa = - init_orb (argc, - argv, + init_orb (convert.get_argc(), convert.get_ASCII_argv(), "first ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var second_poa = - init_orb (argc, - argv, + init_orb (convert.get_argc(), convert.get_ASCII_argv(), "second ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index c15ba6afd10..886a06bd0ff 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -25,25 +25,28 @@ #include "tao/Object_T.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Param_Test, anyop, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int n = 1024; 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(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_Get_Opt get_opt (argc, argv, "dn:"); + ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "dn:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index 5d542556fa8..03e59233e46 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -19,8 +19,8 @@ #include "helper.h" #include "bd_str_seq.h" -ACE_RCSID (Param_Test, - bd_str_seq, +ACE_RCSID (Param_Test, + bd_str_seq, "$Id$") // ************************************************************************ @@ -150,9 +150,9 @@ Test_Bounded_String_Sequence::check_validity (void) // lengths are same. Now compare the contents for (CORBA::ULong i=0; i < this->in_->length () && flag; i++) { - if (ACE_OS::strcmp(this->in_[i], this->inout_[i]) || - ACE_OS::strcmp(this->in_[i], this->out_[i]) || - ACE_OS::strcmp(this->in_[i], this->ret_[i])) + if (ACE_OS::strcmp (&*(this->in_[i]), &*(this->inout_[i])) || + ACE_OS::strcmp (&*(this->in_[i]), &*(this->out_[i])) || + ACE_OS::strcmp (&*(this->in_[i]), &*(this->ret_[i]))) // not equal flag = 0; } diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 0dd6c1199fe..6f1d268c760 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -257,8 +257,8 @@ Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq, if (!((*level3_test_seq)[j] >>= level4_test_struct)) return 0; - if (ACE_OS::strcmp (level4_in_struct->level5_string, - level4_test_struct->level5_string)) + if (ACE_OS::strcmp (level4_in_struct->level5_string.in(), + level4_test_struct->level5_string.in())) { ACE_DEBUG ((LM_DEBUG, "mismatch of level 5 string values\n")); @@ -288,8 +288,8 @@ Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq, if (!((*level7_test_any) >>= level8_test_struct)) return 0; - if (ACE_OS::strcmp (level8_in_struct->level9_string, - level8_test_struct->level9_string)) + if (ACE_OS::strcmp (level8_in_struct->level9_string.in(), + level8_test_struct->level9_string.in())) { ACE_DEBUG ((LM_DEBUG, "mismatch of level 9 string values\n")); diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp index 45a45f49b38..6a2152ffc86 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -21,6 +21,7 @@ #include "results.h" #include "tests.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Param_Test, driver, @@ -28,13 +29,15 @@ ACE_RCSID (Param_Test, // This function runs the test (main program) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + // get an instance of the driver object Driver drv; // initialize the driver - if (drv.init (argc, argv) == -1) + if (drv.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) driver.cpp - " "Driver initialization failed\n"), diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp index 3018a60ed1f..f058f0d4181 100644 --- a/TAO/tests/Param_Test/helper.cpp +++ b/TAO/tests/Param_Test/helper.cpp @@ -85,8 +85,11 @@ Generator::gen_wstring (int max_length) CORBA::ULong len = (CORBA::ULong) (::ACE_OS::rand () % max_length); CORBA::WChar *buf = CORBA::wstring_alloc (len); CORBA::ULong i = 0; - CORBA::WChar limit = - ACE_OutputCDR::wchar_maxbytes() == 1 ? ACE_OCTET_MAX : ACE_WCHAR_MAX; + + CORBA::WChar limit = 1; + limit <<= ACE_OutputCDR::wchar_maxbytes()*8; + limit--; + while (i < len) { CORBA::WChar wc = ACE_OS::rand () % limit; diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index b48b8ef65ed..ea9e8d26328 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -20,7 +20,7 @@ #include "nested_struct.h" ACE_RCSID (Param_Test, - nested_struct, + nested_struct, "$Id$") // ************************************************************************ @@ -168,9 +168,9 @@ Test_Nested_Struct::check_validity (void) // lengths are same. Now compare the contents for (CORBA::ULong i=0; i < this->in_.vs.seq.length () && flag; i++) { - if (ACE_OS::strcmp (this->in_.vs.seq[i], this->inout_->vs.seq[i]) || - ACE_OS::strcmp (this->in_.vs.seq[i], this->out_->vs.seq[i]) || - ACE_OS::strcmp (this->in_.vs.seq[i], this->ret_->vs.seq[i])) + if (ACE_OS::strcmp ( &*(this->in_.vs.seq[i]), &*(this->inout_->vs.seq[i])) || + ACE_OS::strcmp ( &*(this->in_.vs.seq[i]), &*(this->out_->vs.seq[i])) || + ACE_OS::strcmp ( &*(this->in_.vs.seq[i]), &*(this->ret_->vs.seq[i]))) // not equal flag = 0; } diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp index c299f461a8a..7c4e4079c52 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -194,9 +194,9 @@ Test_Objref_Struct::check_validity (void) Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (ACE_OS::strcmp (s_in->name, s_out->name) != 0 - || ACE_OS::strcmp (s_in->name, s_inout->name) != 0 - || ACE_OS::strcmp (s_in->name, s_ret->name) != 0 ) + if (ACE_OS::strcmp (s_in->name.in(), s_out->name.in()) != 0 + || ACE_OS::strcmp (s_in->name.in(), s_inout->name.in()) != 0 + || ACE_OS::strcmp (s_in->name.in(), s_ret->name.in()) != 0 ) { return 0; } diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index e295371820b..af30c16083f 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -22,6 +22,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_fcntl.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Param_Test, options, @@ -47,7 +48,7 @@ Options::~Options (void) int Options::parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "xdn:f:i:t:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xdn:f:i:t:k:"); int c; int result; diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index b90cdaeaaf4..16c244bf217 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -21,7 +21,7 @@ #include "ace/OS_NS_string.h" ACE_RCSID (Param_Test, - param_test_i, + param_test_i, "$Id$") // ********* class Coffee_i **************** diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index c66e703967f..4b610be96fd 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -18,6 +18,7 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Param_Test, server, @@ -30,7 +31,7 @@ static const char *ior_output_filename = "test.ior"; static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:"); int c; while ((c = get_opts ()) != -1) @@ -56,8 +57,10 @@ parse_args (int argc, char *argv[]) // Standard command line parsing utilities used. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + PortableServer::POA_var oa_ptr; Param_Test_i *param_test = 0; @@ -66,7 +69,7 @@ main (int argc, char *argv[]) { const char *orb_name = ""; CORBA::ORB_var orb_ptr = - CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var temp; // holder for the myriad of times we get @@ -112,7 +115,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Parse remaining command line and verify parameters. - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); // initialize a param_test target object and register it with the object // adapter @@ -149,7 +152,7 @@ main (int argc, char *argv[]) str.in ())); } - ior_output_file = ACE_OS::fopen (ior_output_filename, "w"); + ior_output_file = ACE_OS::fopen (ior_output_filename, ACE_TEXT("w")); if (ior_output_file == 0) { diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 730701506f0..a0a57c707a3 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -20,7 +20,7 @@ #include "ub_str_seq.h" ACE_RCSID (Param_Test, - ub_str_seq, + ub_str_seq, "$Id$") // ************************************************************************ @@ -152,9 +152,9 @@ Test_String_Sequence::check_validity (void) // lengths are same. Now compare the contents for (CORBA::ULong i=0; i < this->in_->length () && flag; i++) { - if (ACE_OS::strcmp(this->in_[i], this->inout_[i]) || - ACE_OS::strcmp(this->in_[i], this->out_[i]) || - ACE_OS::strcmp(this->in_[i], this->ret_[i])) + if (ACE_OS::strcmp( &*(this->in_[i]), &*(this->inout_[i])) || + ACE_OS::strcmp( &*(this->in_[i]), &*(this->out_[i])) || + ACE_OS::strcmp( &*(this->in_[i]), &*(this->ret_[i]))) // not equal flag = 0; } diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index a74134ff06b..7ac7eb15958 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -21,7 +21,7 @@ #include "ace/OS_NS_wchar.h" ACE_RCSID (Param_Test, - ub_wstring, + ub_wstring, "$Id$") // ************************************************************************ @@ -107,7 +107,9 @@ Test_Unbounded_WString::init_parameters (Param_Test_ptr this->ret_ = 0; this->in_ = gen->gen_wstring (); + this->inout_ = CORBA::wstring_dup (this->in_); + return 0; } diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index 679ed7b3db3..3332013fd21 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -20,7 +20,7 @@ #include "var_struct.h" ACE_RCSID (Param_Test, - var_struct, + var_struct, "$Id$") // ************************************************************************ @@ -166,15 +166,15 @@ Test_Var_Struct::check_validity (void) if (this->in_.dbl == this->inout_->dbl && this->in_.dbl == this->out_->dbl && this->in_.dbl == this->ret_->dbl && - (!ACE_OS::strcmp (this->in_.dummy1, this->inout_->dummy1)) && - (!ACE_OS::strcmp (this->in_.dummy1, this->out_->dummy1)) && - (!ACE_OS::strcmp (this->in_.dummy1, this->ret_->dummy1)) && + (!ACE_OS::strcmp (this->in_.dummy1.in(), this->inout_->dummy1.in())) && + (!ACE_OS::strcmp (this->in_.dummy1.in(), this->out_->dummy1.in())) && + (!ACE_OS::strcmp (this->in_.dummy1.in(), this->ret_->dummy1.in())) && this->in_.boole == this->inout_->boole && this->in_.boole == this->out_->boole && this->in_.boole == this->ret_->boole && - (!ACE_OS::strcmp (this->in_.dummy2, this->inout_->dummy2)) && - (!ACE_OS::strcmp (this->in_.dummy2, this->out_->dummy2)) && - (!ACE_OS::strcmp (this->in_.dummy2, this->ret_->dummy2)) && + (!ACE_OS::strcmp (this->in_.dummy2.in(), this->inout_->dummy2.in())) && + (!ACE_OS::strcmp (this->in_.dummy2.in(), this->out_->dummy2.in())) && + (!ACE_OS::strcmp (this->in_.dummy2.in(), this->ret_->dummy2.in())) && this->in_.shrt == this->inout_->shrt && this->in_.shrt == this->out_->shrt && this->in_.shrt == this->ret_->shrt && @@ -186,9 +186,9 @@ Test_Var_Struct::check_validity (void) // lengths are same. Now compare the contents for (CORBA::ULong i=0; i < this->in_.seq.length () && flag; i++) { - if (ACE_OS::strcmp (this->in_.seq[i], this->inout_->seq[i]) || - ACE_OS::strcmp (this->in_.seq[i], this->out_->seq[i]) || - ACE_OS::strcmp (this->in_.seq[i], this->ret_->seq[i])) + if (ACE_OS::strcmp ( &*(this->in_.seq[i]), &*(this->inout_->seq[i])) || + ACE_OS::strcmp ( &*(this->in_.seq[i]), &*(this->out_->seq[i])) || + ACE_OS::strcmp ( &*(this->in_.seq[i]), &*(this->ret_->seq[i]))) // not equal flag = 0; } diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index d3f78ece1b0..28cb1b58941 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -10,6 +10,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/OS_NS_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Policies, Manipulation, "$Id$") @@ -19,7 +20,7 @@ int niterations = 100; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:i:"); int c; while ((c = get_opts ()) != -1) @@ -81,15 +82,17 @@ private: }; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp index 571ccf476a0..dce0f615d48 100644 --- a/TAO/tests/Portable_Interceptors/AMI/client.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp @@ -6,6 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" #include <iostream> ACE_RCSID (AMI, @@ -20,7 +21,7 @@ const unsigned long ITERATIONS = 100; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -50,8 +51,10 @@ static void test_ami (CORBA::ORB_ptr orb, Test::Echo_ptr echo ACE_ENV_ARG_DECL); int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { { @@ -63,10 +66,10 @@ main (int argc, char *argv[]) } CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp index 0c52ac89b18..3b3d86fec08 100644 --- a/TAO/tests/Portable_Interceptors/AMI/server.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp @@ -5,6 +5,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Portable_Interceptors, @@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -41,8 +42,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { { @@ -54,7 +57,7 @@ main (int argc, char *argv[]) } 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 = @@ -74,7 +77,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Echo *echo_impl; @@ -92,7 +95,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp index 6c5f5825295..d1453ff16a4 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp @@ -6,6 +6,7 @@ #include "tao/PI/PI.h" #include "tao/PI_Server/PI_Server.h" +#include "tao/CORBA_String.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp index 729804b2872..e2e9aa6acf8 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp @@ -8,6 +8,7 @@ #include "tao/LocalObject.h" #include "tao/ORBInitializer_Registry.h" +#include "tao/CORBA_String.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp index 1a1256f6ad7..bebf68e6c26 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -6,6 +6,7 @@ #include "tao/PI/PI.h" #include "tao/PI_Server/PI_Server.h" +#include "tao/CORBA_String.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp index 4d79250c2cb..1f6c8ba7482 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp @@ -16,13 +16,13 @@ void get_interceptor_type (int argc, char *argv[], { if (ACE_OS_String::strcmp (argv[i], "-r") == 0) { - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("none")) == 0) + if (ACE_OS_String::strcmp (argv[i+1], "none") == 0) interceptor_type = IT_NONE; - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("noop")) == 0) + if (ACE_OS_String::strcmp (argv[i+1], "noop") == 0) interceptor_type = IT_NOOP; - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("context")) == 0) + if (ACE_OS_String::strcmp (argv[i+1], "context") == 0) interceptor_type = IT_CONTEXT; - if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("dynamic")) == 0) + if (ACE_OS_String::strcmp (argv[i+1], "dynamic") == 0) interceptor_type = IT_DYNAMIC; } } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index a874f7d3121..fe89e466e8b 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -10,6 +10,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Benchmark, client, @@ -22,7 +23,7 @@ int register_interceptor = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ef:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:n:"); int c; while ((c = get_opts ()) != -1) @@ -158,8 +159,10 @@ run_test (Test_Interceptors::Secure_Vault_ptr server int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -181,7 +184,7 @@ main (int argc, char *argv[]) } int interceptor_type; - get_interceptor_type (argc, argv, interceptor_type); + get_interceptor_type (convert.get_argc(), convert.get_ASCII_argv(), interceptor_type); ACE_TRY_NEW_ENV { @@ -198,10 +201,10 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp index dda5ff3c73b..1f4be34e3e7 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp @@ -30,13 +30,13 @@ Marker::dump_stats (const char* msg, switch (which_method) { case 1: // method ready - this->throughput_method_ready_.dump_results (msg, gsf); + this->throughput_method_ready_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf); break; case 2: // method authentciate - this->throughput_method_authenticate_.dump_results (msg, gsf); + this->throughput_method_authenticate_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf); break; case 3: // method update_records - this->throughput_method_update_records_.dump_results (msg, gsf); + this->throughput_method_update_records_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf); break; default: break; diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index c556aed2940..03cb740a662 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -8,6 +8,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Benchmark, server, "$Id$") @@ -17,7 +18,7 @@ int register_interceptor = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -40,10 +41,12 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int interceptor_type; - get_interceptor_type (argc, argv, interceptor_type); + get_interceptor_type (convert.get_argc(), convert.get_ASCII_argv(), interceptor_type); ACE_TRY_NEW_ENV { @@ -60,10 +63,10 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = @@ -113,7 +116,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp index 09231faacf2..0f94ba59f5c 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" @@ -12,7 +13,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ef:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:"); int c; while ((c = get_opts ()) != -1) @@ -76,8 +77,10 @@ run_test (Test_Interceptors::Visual_ptr server } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -93,10 +96,10 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp index 35f0c3ada75..81e0b7e9aee 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "Server_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" @@ -15,7 +16,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,8 +39,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { Server_ORBInitializer * temp_initializer = 0; @@ -56,7 +59,7 @@ main (int argc, char *argv[]) // Now we can create 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; CORBA::Object_var poa_object = @@ -79,7 +82,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Visual_i server_impl (orb.in ()); @@ -136,7 +139,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp index 2b3ff3f6fbb..934d4d279d9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp @@ -1,14 +1,17 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" ACE_RCSID(Interceptors, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Client_ORBInitializer* initializer1 = 0; Client_ORBInitializer* initializer2 = 0; bool caught_exception = false; @@ -38,7 +41,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 1aaceae2c8c..e2bb8dc1d6a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -9,6 +9,7 @@ #include "ace/Argv_Type_Converter.h" #include "ace/SString.h" #include "ace/Manual_Event.h" +#include "ace/Argv_Type_Converter.h" const char *output = "test.ior"; const char *input = "file://test.ior"; @@ -17,7 +18,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o"); int c; while ((c = get_opts ()) != -1) @@ -39,10 +40,11 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; server_orb.set ("server_orb"); @@ -64,10 +66,9 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -88,10 +89,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index a9db6a71b8a..b8ad135337f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -76,7 +76,7 @@ Server_Task::svc (void) // If the ior_output_file exists, output the ior to it if (output_ != 0) { - FILE *output_file= ACE_OS::fopen (this->output_, "w"); + FILE *output_file= ACE_OS::fopen (this->output_, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp index 27644baab31..5f337e514d2 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp @@ -7,6 +7,7 @@ #include "ace/Argv_Type_Converter.h" #include "ace/SString.h" #include "ace/Manual_Event.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "interceptors.h" #include "Collocated_ORBInitializer.h" @@ -19,7 +20,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o"); int c; while ((c = get_opts ()) != -1) @@ -41,10 +42,11 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; server_orb.set ("server_orb"); @@ -65,11 +67,9 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_Argv_Type_Converter satc (argc, argv); - CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -91,10 +91,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp index 1133217c973..69e1e5cb96b 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp @@ -69,7 +69,7 @@ Server_Task::svc (void) // If the ior_output_file exists, output the ior to it if (output_ != 0) { - FILE *output_file= ACE_OS::fopen (output_, "w"); + FILE *output_file= ACE_OS::fopen (output_, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c3d906faeb3..d506f6b6adc 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "Echo_Client_ORBInitializer.h" @@ -16,7 +17,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ef:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:"); int c; while ((c = get_opts ()) != -1) @@ -97,8 +98,10 @@ run_test (Test_Interceptors::Visual_ptr server } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { #if TAO_HAS_INTERCEPTORS == 1 @@ -117,10 +120,10 @@ main (int argc, char *argv[]) #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 2197bc560bb..16795ae9459 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "Echo_Server_ORBInitializer.h" #include "ace/OS_NS_stdio.h" @@ -16,7 +17,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,8 +40,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { #if TAO_HAS_INTERCEPTORS == 1 @@ -59,7 +62,7 @@ main (int argc, char *argv[]) #endif /* TAO_HAS_INTERCEPTORS == 1 */ 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 = @@ -82,7 +85,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Visual_i server_impl (orb.in ()); @@ -111,7 +114,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index 4845a04bed7..6db30b8116c 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -39,7 +39,7 @@ Client_ORBInitializer::post_init ( // Extract the last forward reference from the argument list. CORBA::ULong args_len = args->length (); for (CORBA::ULong i = 0; i < args_len; ++i) - if (ACE_OS::strcmp ("-k", args[i]) == 0 + if (ACE_OS::strcmp ("-k", static_cast<const char*>(args[i])) == 0 && i < (args_len - 1)) forward_str = args[i + 1]; diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp index c04cfbaf890..1fea9ed48aa 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "Client_ORBInitializer.h" @@ -22,7 +23,7 @@ parse_args (int argc, char *argv[]) "Wrong number of arguments.\n"), -1); - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -48,8 +49,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_DECLARE_NEW_CORBA_ENV; @@ -70,13 +73,13 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Start out with the first IOR. Interaction with the second diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index 286a18b98c0..22b93a566d1 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "Server_ORBInitializer.h" @@ -24,7 +25,7 @@ parse_args (int argc, char *argv[]) "Wrong number of arguments.\n"), -1); - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; int ior_count = 1; @@ -58,8 +59,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -77,7 +80,7 @@ main (int argc, char *argv[]) #endif /* TAO_HAS_INTERCEPTORS == 1 */ 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 = @@ -97,7 +100,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::PolicyList policies; // Empty policy list. @@ -186,7 +189,7 @@ main (int argc, char *argv[]) // Write each IOR to a file. // IOR 1 - FILE *output_file= ACE_OS::fopen (ior1_file, "w"); + FILE *output_file= ACE_OS::fopen (ior1_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file <%s> for writing " @@ -197,7 +200,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // IOR 2 - output_file= ACE_OS::fopen (ior2_file, "w"); + output_file= ACE_OS::fopen (ior2_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/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index a482b81963e..dd87bbcbc9a 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "FOO_Client_ORBInitializer.h" @@ -16,7 +17,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -37,8 +38,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -58,10 +61,10 @@ main (int argc, char *argv[]) #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "client_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var obj = diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index a91cf021548..92c607cbf00 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "FOO_IORInterceptor_ORBInitializer.h" @@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -40,8 +41,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -61,8 +64,8 @@ main (int argc, char *argv[]) #endif /* TAO_HAS_INTERCEPTORS == 1 */ - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "test_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -88,7 +91,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i server_impl (orb.in ()); @@ -115,7 +118,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing " diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp index ca70543c315..be930e9932e 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" @@ -15,7 +16,7 @@ const char *ior = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -39,18 +40,20 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::Object_var object = diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 000fda92d76..ce7eff2c135 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -1,4 +1,5 @@ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "Server_ORBInitializer.h" @@ -18,7 +19,7 @@ const char *ior_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,8 +40,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -60,7 +63,7 @@ main (int argc, char *argv[]) #endif /* TAO_HAS_INTERCEPTORS == 1 */ 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 = @@ -83,7 +86,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -102,7 +105,7 @@ main (int argc, char *argv[]) ior.in ())); // Write IOR to a file. - 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/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 4325478fd98..ec44721b6da 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "ClientORBInitializer.h" @@ -17,7 +18,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -38,8 +39,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -57,13 +60,13 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "client_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Get the PICurrent object. diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 3e0b650480f..8c0943196de 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "ServerORBInitializer.h" @@ -20,7 +21,7 @@ extern PortableInterceptor::SlotId slot_id; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -43,8 +44,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -61,8 +64,8 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "test_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -88,7 +91,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); @@ -130,7 +133,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing " diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp index 1a52aa6b982..5023dabe538 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp @@ -7,14 +7,17 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (PolicyFactory, server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -31,8 +34,8 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "test_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp index 9f716e09ada..086c11dab54 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp @@ -2,14 +2,17 @@ #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Recursive_ORBInitializer, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Client_ORBInitializer* initializer1 = 0; Client_ORBInitializer* initializer2 = 0; @@ -34,11 +37,11 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb2 = - CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "SecondORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp index efac5ba2c36..dc86ff0da19 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp @@ -3,6 +3,7 @@ #include "Server_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" #include "test_i.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Recursive_ORBInitializer, server, @@ -107,8 +108,10 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Server_ORBInitializer *initializer = 0; int retval = 0; @@ -122,7 +125,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; retval = test_orb (orb.in () ACE_ENV_ARG_PARAMETER); @@ -133,7 +136,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var second_orb = - CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "SecondORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 52caf89e452..fc04648f4d0 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "Client_ORBInitializer.h" @@ -21,7 +22,7 @@ parse_args (int argc, char *argv[]) "Wrong number of arguments.\n"), -1); - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -154,8 +155,10 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -172,13 +175,13 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::Object_var object = diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index 6e4fa0d21d3..96db670ab05 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "Server_ORBInitializer.h" @@ -21,7 +22,7 @@ parse_args (int argc, char *argv[]) "Wrong number of arguments.\n"), -1); - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -44,8 +45,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -61,7 +64,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -81,7 +84,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -101,7 +104,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Write IOR to a file. - 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/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index 80c6cfad678..aa55664e5fe 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "Client_ORBInitializer.h" @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ef:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:"); int c; while ((c = get_opts ()) != -1) @@ -77,8 +78,10 @@ run_test (Test_Interceptors::Visual_ptr server } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -94,10 +97,10 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index bb361528705..e425cd68c56 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "test_i.h" #include "Server_ORBInitializer.h" @@ -16,7 +17,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,8 +40,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -57,7 +60,7 @@ main (int argc, char *argv[]) // Now we can create 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; CORBA::Object_var poa_object = @@ -80,7 +83,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Visual_i server_impl (orb.in ()); @@ -111,7 +114,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 165651a0181..607144fa3d4 100755 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/QtResource_Loader.h" ACE_RCSID(QtTests, client, "$Id$") @@ -9,8 +10,10 @@ ACE_RCSID(QtTests, client, "$Id$") #include "client.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + QApplication app (argc, argv); TAO::QtResource_Loader qt_resources (&app); @@ -19,12 +22,12 @@ main (int argc, char *argv[]) ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Client client (orb.in (), app); - client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); + client.parse_args (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creates the Qt widgets @@ -69,7 +72,7 @@ Client::parse_args (int argc, { const char *ior = "file://test.ior"; - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index e4b50c40a70..7982dc17fff 100755 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h @@ -40,7 +40,7 @@ public: void show (void); - void parse_args (int argc, char *argv[] + void parse_args (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); QVBox box_; diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 718c1947c7c..5aa794dd458 100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (QtTests, server, "$Id$") @@ -21,7 +22,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -47,10 +48,12 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Qt specific stuff for running with TAO... @@ -61,7 +64,7 @@ main (int argc, char *argv[]) ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -117,7 +120,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp index 077d93b4596..2fdd31ec451 100644 --- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp @@ -16,6 +16,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_stdlib.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (tests, Queued_Message_Test, @@ -88,9 +89,8 @@ static void del_message (TAO_Queued_Message *&head, } int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { - // Initialize a random seed to get better coverage. // @@ The random seed and default values should be configurable // using command line options. diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp index 8dd1103b673..5e4f933adbb 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp @@ -21,7 +21,7 @@ public: }; -int main(int, char**) +int ACE_TMAIN(int, ACE_TCHAR**) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc index b62ff14a3d9..68097115ebf 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc +++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): rt_server { + exename = server Source_Files { server.cpp } } project(*Client): rt_client { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 248fb4b0f2e..db79df757f8 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/ORB_Core.h" #include "../check_supported_priorities.cpp" @@ -14,7 +15,7 @@ const char *ior2 = "file://test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:"); int c; while ((c = get_opts ()) != -1) @@ -314,22 +315,23 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; // Parse arguments. int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index b45fef9cba9..deac22c02b8 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" @@ -134,7 +135,7 @@ const char *ior_output_file2 = "test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "b:o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:o:n:"); int c; while ((c = get_opts ()) != -1) @@ -174,7 +175,7 @@ get_priority_bands (RTCORBA::PriorityBands &bands) // Read bands from a file. // FILE* file = - ACE_OS::fopen (bands_file, "r"); + ACE_OS::fopen (bands_file, ACE_TEXT("r")); if (file == 0) return -1; @@ -257,7 +258,7 @@ create_object (PortableServer::POA_ptr poa, if (filename != 0) { FILE *output_file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -344,24 +345,25 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; ACE_TRY_NEW_ENV { // Initialize ORB. orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index 9f0ce92c6ea..13c18c8b5e7 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): rt_server { + exename = server Source_Files { server.cpp } } project(*Client): rt_client, interceptors { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index dc1fe8657cd..26baadf06fb 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -8,6 +8,7 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "../check_supported_priorities.cpp" const char *ior = "file://test.ior"; @@ -15,7 +16,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -188,8 +189,10 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Register the interceptors to check for the RTCORBA @@ -208,10 +211,10 @@ main (int argc, char *argv[]) // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 463429c1312..c2e235e93b3 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -85,7 +86,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -200,7 +201,7 @@ Task::svc (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", @@ -253,18 +254,20 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Standard initialization: // parse arguments and get all the references (ORB, // RootPOA, RTORB, RTCurrent, POAManager). CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc index e51a077e7fe..3c22533e9b5 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc +++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): strategies, rt_server { + exename = server Source_Files { server.cpp } } project(*Client): strategies, rt_client { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index 2ef31055c8f..f72f52a5388 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/Strategies/advanced_resource.h" @@ -14,7 +15,7 @@ CORBA::ULong protocol_type = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "s:c:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:p:"); int c, result; while ((c = get_opts ()) != -1) @@ -87,19 +88,21 @@ exception_test (Test_ptr server, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index 6b4cc59125f..d8d8a93df56 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -2,6 +2,7 @@ #include "testS.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/RT_Policy_i.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -59,7 +60,7 @@ CORBA::ULong protocol_type = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "s:c:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:p:"); int c, result; while ((c = get_opts ()) != -1) @@ -137,7 +138,7 @@ create_object (PortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -151,17 +152,19 @@ create_object (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index fa40bd0ca34..4d0803b8e08 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/Array_Base.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" #include "testS.h" @@ -916,13 +917,15 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc index 0c4c76959e1..27bae90ed76 100644 --- a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc +++ b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc @@ -2,6 +2,5 @@ // $Id$ project(*Server): rt_server { + exename=Collocation } - - diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp index ed68835f061..3f5810bc95b 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB.h" #include "tao/RTCORBA/RTCORBA.h" @@ -19,7 +20,7 @@ static int iterations = 5; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:"); int c; while ((c = get_opts ()) != -1) @@ -89,13 +90,15 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -125,7 +128,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc index 0c4c76959e1..a54ec7ddcee 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc @@ -2,6 +2,5 @@ // $Id$ project(*Server): rt_server { + exename=Destroy_Thread_Pool } - - diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc index 85cadf3219a..aac4623c0f3 100644 --- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc +++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc @@ -2,6 +2,7 @@ // $Id$ project(*client) : taoexe, portableserver, rtcorba, minimum_corba { + exename = client source_files { client.cpp Custom_Network_Priority_Mapping.cpp @@ -9,6 +10,7 @@ project(*client) : taoexe, portableserver, rtcorba, minimum_corba { } project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba { + exename = server after += *client source_files { server.cpp diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp index 1956eb1e5ac..a7c39a1d357 100644 --- a/TAO/tests/RTCORBA/Diffserv/client.cpp +++ b/TAO/tests/RTCORBA/Diffserv/client.cpp @@ -6,6 +6,7 @@ #include "tao/RTCORBA/Network_Priority_Mapping.h" #include "Custom_Network_Priority_Mapping.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Policy_Manager.h" static const char *ior = "file://simple_servant.ior"; @@ -130,7 +131,7 @@ change_network_priority (int enable_network_priority, int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:p:x:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:p:x:"); int c; while ((c = get_opts ()) != -1) @@ -183,15 +184,17 @@ toggle (int &i) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Initialize and obtain reference to the Test object. diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp index cee01e1b4f7..6acc390f714 100644 --- a/TAO/tests/RTCORBA/Diffserv/server.cpp +++ b/TAO/tests/RTCORBA/Diffserv/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" @@ -52,7 +53,7 @@ static RTCORBA::Priority corba_priority = RTCORBA::minPriority; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:"); int c; while ((c = get_opts ()) != -1) @@ -97,26 +98,28 @@ create_object (PortableServer::POA_ptr poa, orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::Object_var object; // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RootPOA. diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc index ebf79370785..8986a5c4db4 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): strategies, rt_server, minimum_corba { + exename = server Source_Files { test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index a77351b5090..afd4a72f8ef 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): strategies, rt_server, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): strategies, rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp index 25e0135f39b..108318bbe63 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Strategies/advanced_resource.h" #include "tao/RTCORBA/RTCORBA.h" @@ -11,7 +12,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -46,19 +47,21 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, parse arguments, and resolve references. // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index 7c434d0c2e5..0a02b151a7f 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -2,6 +2,7 @@ #include "testS.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Strategies/advanced_resource.h" #include "tao/RTCORBA/RTCORBA.h" @@ -56,7 +57,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -119,7 +120,7 @@ create_object (PortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -133,17 +134,19 @@ create_object (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RootPOA. diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc index 87178218057..cfd4ad1ed70 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc +++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): rt_server, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 6588b34f7a4..b2fd947d35c 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/ORB_Core.h" @@ -20,7 +21,7 @@ static const char *bands_file = "empty_file"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:p:k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:p:k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -320,19 +321,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 9129c0f3ee9..9b43e744902 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "testS.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -79,7 +80,7 @@ static const char *lanes_file = "lanes"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:l:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:l:"); int c; while ((c = get_opts ()) != -1) @@ -119,7 +120,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ENV_ARG_DECL) { FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -285,19 +286,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc index a77351b5090..afd4a72f8ef 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): strategies, rt_server, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): strategies, rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index de8d374edf7..a57ced26bb6 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -6,6 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "../check_supported_priorities.cpp" #include "tao/Strategies/advanced_resource.h" @@ -56,7 +57,7 @@ CORBA::ULong protocol2 = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:a:b:e:f:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:a:b:e:f:n:"); int c, result; while ((c = get_opts ()) != -1) @@ -291,19 +292,21 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 893dbddf688..9886dd12c91 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -56,7 +57,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -178,7 +179,7 @@ Task::svc (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", @@ -210,17 +211,19 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp index 9277febd56e..3bd37675c75 100644 --- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp +++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp @@ -4,6 +4,7 @@ #include "tao/ORB.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" int test_multiple_orbs (const char *test_name, @@ -77,16 +78,17 @@ test_multiple_orbs (const char *test_name, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int iterations = 5; int rt_orb = 0; int destroy = 0; int result = test_multiple_orbs ("non-RT ORBs, disable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); @@ -97,8 +99,7 @@ main (int argc, char *argv[]) result = test_multiple_orbs ("non-RT ORBs, enable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); @@ -109,8 +110,7 @@ main (int argc, char *argv[]) result = test_multiple_orbs ("RT ORBs, disable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); @@ -121,8 +121,7 @@ main (int argc, char *argv[]) result = test_multiple_orbs ("RT ORBs, enable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 87178218057..cfd4ad1ed70 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): rt_server, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp index 6e9b26cbec7..60696914f2b 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" static int iterations = 5; @@ -11,7 +12,7 @@ static const char *ior = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -50,19 +51,21 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index d75fb4a6afd..36b3636782e 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testS.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "ace/OS_NS_stdio.h" @@ -76,7 +77,7 @@ static CORBA::ULong max_request_buffer_size = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:p:t:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:p:t:d:"); int c; while ((c = get_opts ()) != -1) @@ -122,7 +123,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ENV_ARG_DECL) { FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -341,19 +342,21 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp index 63d97ab4717..8f7fb12eda8 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.cpp +++ b/TAO/tests/RTCORBA/Policies/Policies.cpp @@ -23,18 +23,21 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // 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; diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc index 1e97eefaee4..e0a13ad8078 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.mpc +++ b/TAO/tests/RTCORBA/Policies/Policies.mpc @@ -2,4 +2,5 @@ // $Id$ project(RTCORBA Policies Server): rt_server, minimum_corba { + exename = Policies } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc index c7a5f0c3229..c751c00b2f0 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): rt_server, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): rt_client { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index 56f29a399f9..a09d06cec4d 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" @@ -15,7 +16,7 @@ static RTCORBA::Priority default_thread_priority; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -140,19 +141,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index db378d994bd..38c44df730a 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testS.h" #include "tao/ORB_Core.h" #include "ace/Task.h" @@ -115,7 +116,7 @@ static CORBA::Boolean allow_borrowing = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "s:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:"); int c; while ((c = get_opts ()) != -1) @@ -150,7 +151,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ENV_ARG_DECL) { FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -906,19 +907,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc index ebf79370785..8986a5c4db4 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): strategies, rt_server, minimum_corba { + exename = server Source_Files { test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index d33a71f3f25..e4e15b61b13 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/ORB_Core.h" @@ -17,7 +18,7 @@ static int make_banded_invocations = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "b:k:i:w:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:k:i:w:"); int c; while ((c = get_opts ()) != -1) @@ -193,16 +194,18 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index e8259069e76..f20c8f967db 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "ace/Task.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -19,7 +20,7 @@ static RTCORBA::Priority high_priority; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:d:t:"); int c; while ((c = get_opts ()) != -1) @@ -74,7 +75,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, FILE *output_file = ACE_OS::fopen (filename, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -320,19 +321,20 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc index 87178218057..cfd4ad1ed70 100644 --- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc +++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): rt_server, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index a1b7369b55d..7d06914f2cb 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "tao/RTCORBA/RTCORBA.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior1 = "file://test1.ior"; const char *ior2 = "file://test2.ior"; @@ -10,7 +11,7 @@ const char *ior2 = "file://test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:"); int c; while ((c = get_opts ()) != -1) @@ -49,19 +50,21 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 07a844b3abb..b6b1b2a6b3d 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -5,6 +5,7 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" class Test_i : public POA_Test { @@ -56,7 +57,7 @@ const char *ior_output_file2 = "test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:"); int c; while ((c = get_opts ()) != -1) @@ -124,7 +125,7 @@ create_object (PortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -138,17 +139,19 @@ create_object (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RootPOA. diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc index 4d9a96b12f0..73faac92a8c 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc @@ -1,11 +1,13 @@ // $Id$ project(*Server): rt_server, strategies, portableserver, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): rt_client, strategies, portableserver, minimum_corba { + exename = client after += *Server Source_Files { client.cpp diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 61acf71eab9..854d6424214 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -16,6 +16,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/Strategies/advanced_resource.h" @@ -36,7 +37,7 @@ static const char *bands_file = "empty_file"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:i:k:p:t:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:i:k:p:t:x"); int c; while ((c = get_opts ()) != -1) @@ -559,21 +560,23 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 234e6d3ef58..45f83161426 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -98,7 +99,7 @@ test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:l:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:l:o:"); int c; while ((c = get_opts ()) != -1) @@ -151,7 +152,7 @@ write_iors_to_file (CORBA::Object_ptr object, ior_file_count++; FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -390,19 +391,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc index 2d55bc96c4f..96b88495689 100644 --- a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc +++ b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc @@ -2,4 +2,5 @@ // $Id$ project(*Server): rt_server { + exename = server } diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp index 425db1603fb..ea53f988992 100644 --- a/TAO/tests/RTCORBA/RTMutex/server.cpp +++ b/TAO/tests/RTCORBA/RTMutex/server.cpp @@ -6,6 +6,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" static int test_try_lock_flag = #if defined (ACE_HAS_MUTEX_TIMEOUTS) && !defined (ACE_HAS_WTHREADS) @@ -23,7 +24,7 @@ static int test_try_lock_flag = static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t"); int c; while ((c = get_opts ()) != -1) @@ -498,16 +499,18 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) #endif /* ACE_HAS_THREADS */ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc index b62ff14a3d9..68097115ebf 100644 --- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc +++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): rt_server { + exename = server Source_Files { server.cpp } } project(*Client): rt_client { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index 9ac3ce834d6..e8d5090c754 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" const char *ior1 = "file://test1.ior"; @@ -10,7 +11,7 @@ const char *ior2 = "file://test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:o:"); int c; while ((c = get_opts ()) != -1) @@ -77,19 +78,21 @@ check_policy (Test_ptr server } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Test object 1. diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 6594427f846..adb805bb7df 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "tao/ORB_Core.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" @@ -87,7 +88,7 @@ CORBA::Short object_priority = -1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:o:a:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:o:a:b:"); int c, result; while ((c = get_opts ()) != -1) @@ -191,7 +192,7 @@ create_object (RTPortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -325,17 +326,19 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // 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; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc index a77351b5090..afd4a72f8ef 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -2,12 +2,14 @@ // $Id$ project(*Server): strategies, rt_server, minimum_corba { + exename = server Source_Files { server.cpp } } project(*Client): strategies, rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index 7dd24cdb9b5..71c63370691 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/Strategies/advanced_resource.h" @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -33,16 +34,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::Object_var object = diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 5ca5342d11e..459bb286b5a 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Core.h" #include "tao/Policy_Set.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/Root_POA.h" class Test_i : public POA_Test @@ -50,7 +51,7 @@ CORBA::ULong protocol_type = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:"); int c, result; while ((c = get_opts ()) != -1) @@ -240,15 +241,17 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::Object_var object = @@ -340,7 +343,7 @@ main (int argc, char *argv[]) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc index ebf79370785..8986a5c4db4 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): strategies, rt_server, minimum_corba { + exename = server Source_Files { test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index 727015a2353..5797909b3e5 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -6,6 +6,7 @@ #include "tao/ORB_Core.h" #include "ace/Task.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "../check_supported_priorities.cpp" ACE_RCSID(Thread_Pool, client, "$Id$") @@ -17,7 +18,7 @@ int shutdown_server = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -118,16 +119,18 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 5dd811de9bd..f652cb7c279 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -5,6 +5,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/ORB_Core.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" @@ -19,7 +20,7 @@ long nap_time = 1000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:d:t:"); int c; while ((c = get_opts ()) != -1) @@ -76,7 +77,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, FILE *output_file = ACE_OS::fopen (filename, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -329,19 +330,21 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp index 3085aa72bcb..73d51851c4e 100644 --- a/TAO/tests/RTCORBA/common_args.cpp +++ b/TAO/tests/RTCORBA/common_args.cpp @@ -20,7 +20,7 @@ get_priority_bands (const char *test_type, // Read bands from a file. // FILE* file = - ACE_OS::fopen (bands_file, "r"); + ACE_OS::fopen (bands_file, ACE_TEXT("r")); if (file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -119,7 +119,7 @@ get_values (const char *test_type, // Read lanes from a file. // FILE* file = - ACE_OS::fopen (file_name, "r"); + ACE_OS::fopen (file_name, ACE_TEXT("r")); if (file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp index ffcf6dbf8a3..481fe5eaebd 100644 --- a/TAO/tests/RTScheduling/Current/test.cpp +++ b/TAO/tests/RTScheduling/Current/test.cpp @@ -3,15 +3,18 @@ #include "Thread_Task.h" #include "../Scheduler.h" #include "tao/RTScheduling/RTScheduler_Manager.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { 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/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h index 37da9a5de01..873abdd819a 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h +++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h @@ -7,6 +7,8 @@ #include "ace/OS_NS_string.h" #include "ace/SString.h" +#include "tao/RTScheduling/RTSchedulerC.h" + class Data { public: diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp index fab57bcd8ce..bfbb4a96681 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp +++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp @@ -5,10 +5,13 @@ #include "Thread_Action.h" #include "ace/Thread_Manager.h" #include "ace/SString.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; RTScheduling::Current_var current; @@ -20,8 +23,8 @@ main (int argc, char* 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/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp index 885e7ba2fd7..5e9ac4bf9e0 100644 --- a/TAO/tests/RTScheduling/Scheduler.cpp +++ b/TAO/tests/RTScheduling/Scheduler.cpp @@ -3,8 +3,11 @@ #include "Scheduler.h" #include "tao/ORB.h" #include "ace/Atomic_Op.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTScheduling/Request_Interceptor.h" +#include "tao/IOP_IORC.h" + TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) { CORBA::Object_var current_obj = diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp index 14c947939fb..a1d655029af 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp @@ -3,16 +3,17 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/SString.h" ACE_CString ior = "file://test.ior"; int parse_args (int argc, - ACE_TCHAR* argv []) + char* argv []) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c= opts ()) != -1) @@ -21,7 +22,7 @@ parse_args (int argc, { case 'f': ior = "file://"; - ior += opts.opt_arg (); + ior += ACE_TEXT_TO_CHAR_IN(opts.opt_arg ()); break; default: ACE_DEBUG ((LM_DEBUG, "Unknown Option\n")); @@ -36,8 +37,10 @@ parse_args (int argc, #endif /* THREAD_CANCELLED */ int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; test_var server; RTScheduling::Scheduler_var safe_scheduler; @@ -45,13 +48,13 @@ main (int argc, char* 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; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return (-1); CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp index 73e333552ca..3cb3f08da75 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp @@ -4,7 +4,9 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testS.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char* filename = "test.ior"; @@ -60,10 +62,10 @@ private: int parse_args (int argc, - ACE_TCHAR* argv []) + char* argv []) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c= opts ()) != -1) @@ -82,18 +84,20 @@ parse_args (int argc, } int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" @@ -169,7 +173,7 @@ main (int argc, char* argv[]) // Print ior to the file. if (filename != 0) { - FILE* output_file = ACE_OS::fopen (filename, "w"); + FILE* output_file = ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp index 42a390c4b01..51e136dffd5 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp @@ -5,15 +5,18 @@ #include "../Scheduler.h" #include "tao/RTScheduling/RTScheduler_Manager.h" #include "tao/ORB_Core.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp index 087080ddbba..fdfb092a483 100644 --- a/TAO/tests/RTScheduling/VoidData/test_client.cpp +++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp @@ -2,15 +2,18 @@ #include "tao/RTScheduling/RTScheduler.h" #include "testC.h" #include "test.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; 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/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc index 2141f3040f5..cd4fd1a1342 100644 --- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc +++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoserver, messaging { + exename = server Source_Files { Oneway_Receiver.cpp Shutdown_Helper.cpp @@ -10,6 +11,7 @@ project(*Server): taoserver, messaging { } project(*Client): messaging, taoexe, portableserver { + exename = client after += *Server Source_Files { TestC.cpp diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp index 259e1be4ea6..409878116e0 100644 --- a/TAO/tests/Reliable_Oneways/client.cpp +++ b/TAO/tests/Reliable_Oneways/client.cpp @@ -5,6 +5,7 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Reliable_Oneways, client, "$Id$") @@ -26,7 +27,7 @@ int failed_calls = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:ntsr"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:ntsr"); int c; while ((c = get_opts ()) != -1) @@ -81,15 +82,17 @@ void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index a278c9a515b..7b12832e874 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -3,6 +3,7 @@ #include "Oneway_Receiver.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Reliable_Oneways, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Oneway_Receiver *oneway_receiver_impl; @@ -78,7 +81,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp index 2532701858e..f8d3b4e0193 100644 --- a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp @@ -18,7 +18,7 @@ struct Foo CORBA::ULong const TEST_INT_MAX = 32; CORBA::ULong const TEST_FOO_MAX = 64; -int main(int,char*[]) +int ACE_TMAIN(int,ACE_TCHAR*[]) { typedef TAO::bounded_value_sequence<int,TEST_INT_MAX> int_sequence; diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp index 8f0bc9e45ef..0c250a584fe 100644 --- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp @@ -14,7 +14,7 @@ CORBA::ULong const MAXIMUM = 42; typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence; -int main(int,char*[]) +int ACE_TMAIN(int,ACE_TCHAR*[]) { s_sequence a; s_sequence b(a); diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp index 30082a9d4c9..19741a165f2 100644 --- a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp @@ -15,7 +15,7 @@ struct Foo int x; }; -int main(int,char*[]) +int ACE_TMAIN(int,ACE_TCHAR*[]) { typedef TAO::unbounded_value_sequence<int> int_sequence; diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc index 9c240b72452..935755a7543 100644 --- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc +++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): taoexe, portableserver, minimum_corba { + exename = server Source_Files { server.cpp Test_i.cpp diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp index 65139d0cd63..fa92caadb7f 100644 --- a/TAO/tests/Servant_To_Reference_Test/server.cpp +++ b/TAO/tests/Servant_To_Reference_Test/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Hello, server, @@ -75,7 +76,7 @@ MT_Task::svc (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -99,12 +100,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -124,7 +127,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; One_Impl *one_impl; diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp index 80d03ad751b..f6307a02c90 100644 --- a/TAO/tests/Server_Connection_Purging/client.cpp +++ b/TAO/tests/Server_Connection_Purging/client.cpp @@ -4,6 +4,7 @@ #include "ace/SOCK_Connector.h" #include "ace/TP_Reactor.h" #include "ace/Reactor.h" +#include "ace/Argv_Type_Converter.h" const char *host = "localhost"; static int port = 10008; @@ -13,7 +14,7 @@ int purged_handles = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "h:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "h:p:"); int c; while ((c = get_opts ()) != -1) @@ -70,9 +71,11 @@ Purging_Handler::handle_close (ACE_HANDLE h, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; ACE_Select_Reactor sr; diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index 52c7b5e6395..431410e2ee5 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -3,13 +3,14 @@ #include "Test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char *ior_output_file = "server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, ""); int c; while ((c = get_opts ()) != -1) @@ -28,14 +29,16 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -55,7 +58,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; test_i *test_impl; @@ -73,7 +76,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp index c8263903192..aee5f7f75b7 100644 --- a/TAO/tests/Server_Leaks/client.cpp +++ b/TAO/tests/Server_Leaks/client.cpp @@ -2,6 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Server_Leaks, client, "$Id$") @@ -11,7 +12,7 @@ int do_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while ((c = get_opts ()) != -1) @@ -40,15 +41,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index 0a037cdb95d..dd1e9ca6d17 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -3,6 +3,7 @@ #include "Ping_Service.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Server_Leaks, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Ping_Service *ping_service_impl; @@ -77,7 +80,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp index 4375a5c4b06..4b151115b64 100644 --- a/TAO/tests/Server_Port_Zero/server.cpp +++ b/TAO/tests/Server_Port_Zero/server.cpp @@ -3,6 +3,7 @@ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Server_Port_Zero, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +38,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -62,7 +65,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // 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/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp index 7e69d9350cf..7e50c036384 100644 --- a/TAO/tests/Single_Read/client.cpp +++ b/TAO/tests/Single_Read/client.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$") @@ -23,7 +24,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:i:d:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:d:x"); int c; while ((c = get_opts ()) != -1) @@ -69,22 +70,24 @@ parse_args (int argc, char **argv) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index 20af40930ea..7726dbc073a 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,13 +36,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -76,7 +79,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 34732cdac90..9be492b2cf3 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -25,6 +25,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Benchmark, client, @@ -47,7 +48,7 @@ class Marker ACE_UINT32 gsf) { // Print stats - this->throughput_.dump_results (msg, gsf); + this->throughput_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf); } void sample (ACE_hrtime_t throughput_diff, ACE_hrtime_t latency_diff) @@ -66,7 +67,7 @@ class Marker int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:n:r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:n:r:"); int c; while ((c = get_opts ()) != -1) @@ -95,8 +96,10 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -120,13 +123,13 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index ca2acbcbec2..53416a8fc49 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -19,6 +19,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Benchmark, server, "$Id$") @@ -76,7 +77,7 @@ static const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -99,17 +100,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; - 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; @@ -145,7 +148,7 @@ main (int argc, char *argv[]) if (ior_output_file != 0) { FILE *output_file = - ACE_OS::fopen (ior_output_file, "w"); + ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp index dff11cb451f..d0b32c908a6 100644 --- a/TAO/tests/Smart_Proxies/Collocation/main.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp @@ -2,16 +2,19 @@ #include "Coll_Tester.h" #include "tao/Strategies/advanced_resource.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Collocation, main, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Collocation_Test coll_test; ACE_TRY_NEW_ENV { - coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER); + coll_test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp index 2ba4e74ca80..953737c9b28 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp @@ -20,6 +20,7 @@ #include "ace/Get_Opt.h" #include "testC.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Smart_Proxy, client, "$Id$") @@ -28,7 +29,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:"); int c; while ((c = get_opts ()) != -1) @@ -51,18 +52,20 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 5f0ebde1ffa..ba4cf4591d8 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -19,6 +19,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Smart_Proxy, server, "$Id$") @@ -74,7 +75,7 @@ static const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -97,17 +98,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; - 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; @@ -143,7 +146,7 @@ main (int argc, char *argv[]) if (ior_output_file != 0) { FILE *output_file = - ACE_OS::fopen (ior_output_file, "w"); + ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp index a54fa3856f3..04331a0df03 100644 --- a/TAO/tests/Smart_Proxies/Policy/client.cpp +++ b/TAO/tests/Smart_Proxies/Policy/client.cpp @@ -20,6 +20,7 @@ #include "ace/OS_NS_string.h" #include "testC.h" #include "Smart_Proxy_Impl.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Smart_Proxy, client, "$Id$") @@ -30,7 +31,7 @@ int one_shot_factory = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:j:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:j:f:"); int c; while ((c = get_opts ()) != -1) @@ -105,18 +106,20 @@ return 0; } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // To use the smart proxy it is necessary to allocate the diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 7e000c323d3..aa32dd1a5b3 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -19,6 +19,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Smart_Proxy, server, "$Id$") @@ -74,7 +75,7 @@ static const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -97,17 +98,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; - 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; @@ -143,7 +146,7 @@ main (int argc, char *argv[]) if (ior_output_file != 0) { FILE *output_file = - ACE_OS::fopen (ior_output_file, "w"); + ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index 74b28effab2..312191a87f5 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -21,6 +21,7 @@ #include "Smart_Proxy_Impl.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Smart_Proxy, client, "$Id$") @@ -29,7 +30,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:"); int c; while ((c = get_opts ()) != -1) @@ -52,18 +53,20 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp index 47c2c88884b..73afdac32dc 100644 --- a/TAO/tests/Smart_Proxies/dtor/client.cpp +++ b/TAO/tests/Smart_Proxies/dtor/client.cpp @@ -3,6 +3,7 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "Smart_Proxy_Impl.h" @@ -12,7 +13,7 @@ bool dtor_called; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:"); int c; while ((c = get_opts ()) != -1) @@ -33,17 +34,19 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var obj = orb->string_to_object (ior diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index fa9eadf988b..d37451d330e 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" class Test_i: public virtual POA_Test { @@ -45,7 +46,7 @@ static const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -67,19 +68,21 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Obtain RootPOA. @@ -120,7 +123,7 @@ int main (int argc, char* argv[]) if (ior_output_file != 0) { FILE *output_file = - ACE_OS::fopen (ior_output_file, "w"); + ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index 0fc44b24f0f..1e8efa70908 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -19,6 +19,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Smart_Proxy, server, "$Id$") @@ -74,7 +75,7 @@ static const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -97,19 +98,21 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_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(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Test_i servant (orb.in ()); @@ -143,7 +146,7 @@ main (int argc, char *argv[]) if (ior_output_file != 0) { FILE *output_file = - ACE_OS::fopen (ior_output_file, "w"); + ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp index b9db252871c..d5525d9bae9 100644 --- a/TAO/tests/Stack_Recursion/client.cpp +++ b/TAO/tests/Stack_Recursion/client.cpp @@ -2,6 +2,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Stack_Recursion, client, @@ -12,7 +13,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -35,15 +36,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp index 03dc154d085..0295980af7c 100644 --- a/TAO/tests/Stack_Recursion/server.cpp +++ b/TAO/tests/Stack_Recursion/server.cpp @@ -3,6 +3,7 @@ #include "Sender.h" #include "Server_Task.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Stack_Recursion, server, @@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -36,12 +37,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -61,7 +64,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Sender *sender_impl; @@ -80,7 +83,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index a554f94fea5..5cf2094c1a7 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "simple_testC.h" ACE_RCSID(tests, client, "$Id$") @@ -12,7 +13,7 @@ int server_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x"); int c; while ((c = get_opts ()) != -1) @@ -62,15 +63,17 @@ Client::Client () } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp index 9e1de742de4..06c4a905ae0 100644 --- a/TAO/tests/Strategies/server.cpp +++ b/TAO/tests/Strategies/server.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "simple_test_i.h" ACE_RCSID(tests, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -77,7 +80,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc index 1bd7978c70a..16b944f7142 100644 --- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc +++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server): messaging, taoexe, portableserver { + exename = server Source_Files { test_i.cpp server.cpp @@ -9,6 +10,7 @@ project(*Server): messaging, taoexe, portableserver { } project(*Client): messaging, taoexe, portableserver { + exename = client after += *Server Source_Files { testC.cpp diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index 9878f57d8b8..f4720bbfd22 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -23,6 +23,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$") @@ -54,7 +55,7 @@ static int shutdown_server = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "ek:i:d:t:w:z:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ek:i:d:t:w:z:x"); int c; while ((c = get_opts ()) != -1) @@ -237,22 +238,24 @@ setup_buffering_constraints (CORBA::ORB_ptr orb } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. - int parse_args_result = parse_args (argc, argv); + int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index 20af40930ea..7726dbc073a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,13 +36,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; test_i servant (orb.in ()); @@ -76,7 +79,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index 7d0ff876ea7..f07ee0b618a 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -5,6 +5,7 @@ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Timeout, client, "$Id$") @@ -15,7 +16,7 @@ int max_timeout = 20; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:"); int c; while ((c = get_opts ()) != -1) @@ -86,15 +87,17 @@ send_echo (CORBA::ORB_ptr orb, } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp index 3fd05a6c9db..2c5a8ebf7d6 100644 --- a/TAO/tests/Timeout/server.cpp +++ b/TAO/tests/Timeout/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Timeout, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -36,15 +37,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = @@ -79,7 +82,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp index d93a387409a..2a0d3b7a888 100644 --- a/TAO/tests/Two_Objects/client.cpp +++ b/TAO/tests/Two_Objects/client.cpp @@ -2,6 +2,7 @@ #include "Two_ObjectsC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Test, client, "$Id$") @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "r:"); int c; while ((c = get_opts ()) != -1) @@ -34,8 +35,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Used to declare the CORBA::Environment variable ACE_DECLARE_NEW_CORBA_ENV; @@ -43,11 +46,11 @@ main (int argc, char *argv[]) { // 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; // Parse the arguments - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; // Convert the ior string to an object reference. diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index 639cb344ab8..b05eaea3dca 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -4,6 +4,7 @@ #include "Object_Factory_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Test, server, "$Id$") @@ -16,7 +17,7 @@ int timeout = 30; //default timeout for ORB is 30 sec int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:l:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:l:t:"); int c; while ((c = get_opts ()) != -1) @@ -55,13 +56,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize 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; // Get initial reference to the Root POA @@ -85,7 +88,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Parse the arguments - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; ACE_DEBUG(( LM_DEBUG, "ior file = %s\t#threads = %d\t" @@ -111,7 +114,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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, diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp index 4637dc4b943..2579a631234 100644 --- a/TAO/tests/Typedef_String_Array/client.cpp +++ b/TAO/tests/Typedef_String_Array/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(StringArray, client, "$Id$") @@ -10,7 +11,7 @@ const char *ior = "file://server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp index 51f5f7792af..646f695570c 100644 --- a/TAO/tests/Typedef_String_Array/server.cpp +++ b/TAO/tests/Typedef_String_Array/server.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "testImpl.h" ACE_RCSID(MT_Client, server, "$Id$") @@ -11,7 +12,7 @@ const char *ior_output_file = "server.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,12 +35,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -59,7 +62,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; TestImpl test_impl (orb.in ()); @@ -76,7 +79,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp index 548b4b99e94..5735c1278ff 100644 --- a/TAO/tests/UNKNOWN_Exception/client.cpp +++ b/TAO/tests/UNKNOWN_Exception/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" ACE_RCSID (UNKNOWN_Exception, client, "$Id$") @@ -11,7 +12,7 @@ static int shutdown_server = 1; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:x:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x:"); int c; while ((c = get_opts ()) != -1) @@ -42,17 +43,19 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0); int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 2beb08f85fa..0d5321adee3 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testS.h" #include "tao/PortableServer/Root_POA.h" #include "ace/OS_NS_stdio.h" @@ -160,7 +161,7 @@ test_factory_i::shutdown (void) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -184,13 +185,15 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), ""); CORBA::Object_var poa_object = @@ -202,7 +205,7 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; { @@ -218,7 +221,7 @@ main (int argc, char *argv[]) CORBA::String_var ior = orb->object_to_string (test_factory.in ()); - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h index 978e0f3c3b1..69f573d0d52 100644 --- a/TAO/tests/Xt_Stopwatch/Client.h +++ b/TAO/tests/Xt_Stopwatch/Client.h @@ -47,7 +47,7 @@ public: void add_callback (Control &); // Adds the callbacks to the GUI underneath..... - void parse_args (int argc, char *argv[] + void parse_args (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); private: diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp index 713ddb68f84..e1a40aeb2b1 100644 --- a/TAO/tests/Xt_Stopwatch/client.cpp +++ b/TAO/tests/Xt_Stopwatch/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Xt_Stopwatch, client, "$Id$") @@ -10,8 +11,10 @@ ACE_RCSID(Xt_Stopwatch, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + XtAppContext app; Widget toplevel = XtAppInitialize (&app, "Start & Stop", @@ -32,12 +35,12 @@ main (int argc, char *argv[]) ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Client client (orb.in ()); - client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER); + client.parse_args (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; client.add_callback (control); @@ -72,7 +75,7 @@ Client::parse_args (int argc, { const char *ior = "file://test.ior"; - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp index 374dcb368f0..0301e39050d 100644 --- a/TAO/tests/Xt_Stopwatch/server.cpp +++ b/TAO/tests/Xt_Stopwatch/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Xt_Stopwatch, server, @@ -18,7 +19,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -42,10 +43,12 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; XtAppContext app; @@ -68,7 +71,7 @@ main (int argc, char *argv[]) ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -108,7 +111,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/utils/NamingViewer/BindDialog.cpp b/TAO/utils/NamingViewer/BindDialog.cpp index a7a0c2b7cdb..7d0af9359eb 100644 --- a/TAO/utils/NamingViewer/BindDialog.cpp +++ b/TAO/utils/NamingViewer/BindDialog.cpp @@ -54,11 +54,11 @@ void CBindDialog::OnViewior() try { UpdateData(); - m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR)); + m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR)); } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); return; } ViewIORDialog Dialog(m_pORB, m_Object); @@ -87,15 +87,15 @@ void CBindDialog::OnOK() // TODO: Add extra validation here UpdateData(); m_Name.length(1); - m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID)); - m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind)); + m_Name[0].id = CORBA::string_dup(m_ID); + m_Name[0].kind = CORBA::string_dup(m_Kind); try { - m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR)); + m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR)); } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("Invalid IOR")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("Invalid IOR")); return; } CDialog::OnOK(); diff --git a/TAO/utils/NamingViewer/BindNewContext.cpp b/TAO/utils/NamingViewer/BindNewContext.cpp index a846fa6cf3c..f0deb874b4e 100644 --- a/TAO/utils/NamingViewer/BindNewContext.cpp +++ b/TAO/utils/NamingViewer/BindNewContext.cpp @@ -48,7 +48,7 @@ void CBindNewContext::OnOK() // TODO: Add extra validation here UpdateData(); m_Name.length(1); - m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID)); - m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind)); + m_Name[0].id = CORBA::string_dup(m_ID); + m_Name[0].kind = CORBA::string_dup(m_Kind); CDialog::OnOK(); } diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp index 112d769ee01..fcbbb7e3903 100644 --- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp +++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp @@ -186,7 +186,7 @@ void CNamingTreeCtrl::ListContext(HTREEITEM hItem) } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -237,7 +237,7 @@ void CNamingTreeCtrl::OnContextPopupUnbind() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -286,7 +286,7 @@ void CNamingTreeCtrl::OnContextPopupDestroy() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -317,7 +317,7 @@ void CNamingTreeCtrl::OnContextPopupBindContext() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -343,7 +343,7 @@ void CNamingTreeCtrl::OnContextPopupBindobject() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -381,7 +381,7 @@ void CNamingTreeCtrl::OnContextpopupBindnewcontext() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -418,7 +418,7 @@ void CNamingTreeCtrl::OnCopy() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -461,7 +461,7 @@ void CNamingTreeCtrl::OnObjectpopupUnbind() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } @@ -513,7 +513,7 @@ void CNamingTreeCtrl::ListBindingList(HTREEITEM hItem, CosNaming::NamingContext_ } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp index 2f86a0d3a4a..d5025fc2186 100644 --- a/TAO/utils/NamingViewer/NamingViewer.cpp +++ b/TAO/utils/NamingViewer/NamingViewer.cpp @@ -57,7 +57,7 @@ BOOL CNamingViewerApp::InitInstance() #endif // Parse command line arguments so we can initialize ORB with them - ACE_ARGV Argv(ACE_TEXT_CHAR_TO_TCHAR(m_lpCmdLine)); + ACE_ARGV Argv(ACE_TEXT_TO_TCHAR_IN(m_lpCmdLine)); ACE::init(); { diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp index 0e7520cf8db..2a27722a583 100644 --- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp +++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp @@ -219,7 +219,7 @@ void CNamingViewerDlg::OnSelectNs() } try { - CORBA::Object_var Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (Dialog.GetIOR())); + CORBA::Object_var Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (Dialog.GetIOR())); m_RootContext = CosNaming::NamingContext::_narrow(Object); m_Server = Dialog.GetName(); UpdateData(FALSE); @@ -227,7 +227,7 @@ void CNamingViewerDlg::OnSelectNs() } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } diff --git a/TAO/utils/NamingViewer/ViewIORDialog.cpp b/TAO/utils/NamingViewer/ViewIORDialog.cpp index f7724f02d70..4c9cfc22537 100644 --- a/TAO/utils/NamingViewer/ViewIORDialog.cpp +++ b/TAO/utils/NamingViewer/ViewIORDialog.cpp @@ -69,12 +69,12 @@ void ViewIORDialog::OnApply() UpdateData(); try { - m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR)); + m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR)); DecodeIOR(); } catch(CORBA::Exception& ex) { - MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); + MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception")); } } diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index 4a53e5683d3..7003d10b704 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -460,7 +460,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) CORBA::Boolean have_argument = 0; int opt; - ACE_Get_Opt get_opt (argcon.get_argc (), argcon.get_TCHAR_argv (), + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argcon.get_argc (), argcon.get_TCHAR_argv (), ACE_TEXT ("f:n:x")); while ((opt = get_opt ()) != EOF) @@ -650,7 +650,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) get_opt.opt_arg ())); #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - ifstream ifstr (get_opt.opt_arg ()); + ifstream ifstr (ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ())); if (!ifstr.good ()) { diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp index 1394726c5d2..f69511d3d0a 100644 --- a/TAO/utils/nslist/nsadd.cpp +++ b/TAO/utils/nslist/nsadd.cpp @@ -104,7 +104,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) CORBA::Object_var obj; if (ior) { - obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior) ACE_ENV_ARG_PARAMETER); + obj = orb->string_to_object (ACE_TEXT_TO_CHAR_IN (ior) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -122,7 +122,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) return 1; } char buf[BUFSIZ]; - ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name)); + ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN (name)); char *bp = &buf[0]; char *cp = 0; int ntoks = 0; diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp index 48add17f564..886ce591fb8 100644 --- a/TAO/utils/nslist/nsdel.cpp +++ b/TAO/utils/nslist/nsdel.cpp @@ -84,7 +84,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) // make a copy char buf[BUFSIZ]; - ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name)); + ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN (name)); char *bp = &buf[0]; char *cp = 0; int ntoks = 0; diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp index 80dabc861b4..d305fee2971 100644 --- a/TAO/utils/nslist/nslist.cpp +++ b/TAO/utils/nslist/nslist.cpp @@ -117,7 +117,7 @@ show_chunk (CosNaming::NamingContext_ptr nc, "", bl[i].binding_name[0].id.in ())); - if (ACE_OS::strlen (bl[i].binding_name[0].kind) > 0) + if (ACE_OS::strlen (bl[i].binding_name[0].kind.in()) > 0) ACE_DEBUG ((LM_DEBUG, "(%s)", bl[i].binding_name[0].kind.in ())); diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 872e4dfed74..058c5ba1051 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -354,7 +354,6 @@ ACE::hash_pjw (const char *str) return ACE::hash_pjw (str, ACE_OS::strlen (str)); } -#if defined (ACE_HAS_WCHAR) u_long ACE::hash_pjw (const wchar_t *str, size_t len) { @@ -384,7 +383,6 @@ ACE::hash_pjw (const wchar_t *str) { return ACE::hash_pjw (str, ACE_OS::strlen (str)); } -#endif /* ACE_HAS_WCHAR */ #if !defined (ACE_HAS_WINCE) ACE_TCHAR * @@ -3331,7 +3329,6 @@ ACE::strndup (const char *str, size_t n) return ACE_OS::strsncpy (s, str, len + 1); } -#if defined (ACE_HAS_WCHAR) wchar_t * ACE::strndup (const wchar_t *str, size_t n) { @@ -3353,7 +3350,6 @@ ACE::strndup (const wchar_t *str, size_t n) 0); return ACE_OS::strsncpy (s, str, len + 1); } -#endif /* ACE_HAS_WCHAR */ char * ACE::strnnew (const char *str, size_t n) @@ -3376,7 +3372,6 @@ ACE::strnnew (const char *str, size_t n) return ACE_OS::strsncpy (s, str, len + 1); } -#if defined (ACE_HAS_WCHAR) wchar_t * ACE::strnnew (const wchar_t *str, size_t n) { @@ -3397,7 +3392,6 @@ ACE::strnnew (const wchar_t *str, size_t n) 0); return ACE_OS::strsncpy (s, str, len + 1); } -#endif /* ACE_HAS_WCHAR */ const char * ACE::strend (const char *s) @@ -3408,7 +3402,6 @@ ACE::strend (const char *s) return s; } -#if defined ACE_HAS_WCHAR const wchar_t * ACE::strend (const wchar_t *s) { @@ -3417,7 +3410,6 @@ ACE::strend (const wchar_t *s) return s; } -#endif char * ACE::strnew (const char *s) @@ -3434,7 +3426,6 @@ ACE::strnew (const char *s) return ACE_OS::strcpy (t, s); } -#if defined (ACE_HAS_WCHAR) wchar_t * ACE::strnew (const wchar_t *s) { @@ -3449,7 +3440,6 @@ ACE::strnew (const wchar_t *s) else return ACE_OS::strcpy (t, s); } -#endif /* ACE_HAS_WCHAR */ inline static bool equal_char(char a, char b, bool case_sensitive) { diff --git a/ace/ACE.h b/ace/ACE.h index ecafe8a3c36..581d239c41e 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -427,7 +427,6 @@ namespace ACE /// @c ACE_OS::malloc to allocate the new string. extern ACE_Export char *strnnew (const char *str, size_t n); -#if defined (ACE_HAS_WCHAR) extern ACE_Export const wchar_t *strend (const wchar_t *s); extern ACE_Export wchar_t *strnew (const wchar_t *s); @@ -438,8 +437,6 @@ namespace ACE extern ACE_Export wchar_t *strnnew (const wchar_t *str, size_t n); -#endif /* ACE_HAS_WCHAR */ - /** * On Windows, determines if a specified pathname ends with ".exe" * (not case sensitive). If on Windows and there is no ".exe" suffix, @@ -536,13 +533,11 @@ namespace ACE /// Computes the hash value of {str} using the "Hash PJW" routine. extern ACE_Export u_long hash_pjw (const char *str, size_t len); -#if defined (ACE_HAS_WCHAR) /// Computes the hash value of {str} using the "Hash PJW" routine. extern ACE_Export u_long hash_pjw (const wchar_t *str); /// Computes the hash value of {str} using the "Hash PJW" routine. extern ACE_Export u_long hash_pjw (const wchar_t *str, size_t len); -#endif /* ACE_HAS_WCHAR */ /// Computes CRC-CCITT for the string. extern ACE_Export ACE_UINT16 crc_ccitt(const char *str); @@ -632,7 +627,7 @@ namespace ACE ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num); /// Hex conversion utility. - ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR nibble2hex (u_int n); + ACE_NAMESPACE_INLINE_FUNCTION char nibble2hex (u_int n); /// Convert a hex character to its byte representation. ACE_NAMESPACE_INLINE_FUNCTION u_char hex2byte (ACE_TCHAR c); diff --git a/ace/ACE.inl b/ace/ACE.inl index f4e3c2e0cb2..a755557fe5c 100644 --- a/ace/ACE.inl +++ b/ace/ACE.inl @@ -303,7 +303,7 @@ ACE::log2 (u_long num) return log; } -ACE_INLINE ACE_TCHAR +ACE_INLINE char ACE::nibble2hex (u_int n) { // Hexadecimal characters. @@ -312,9 +312,9 @@ ACE::nibble2hex (u_int n) // loads of warnings when inlining. // problem (incorrect warning leftover from older GNU) has been reported as // TSR to Windriver. - const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef"); + const char hex_chars[] = "0123456789abcdef"; #else - static const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef"); + static const char hex_chars[] = "0123456789abcdef"; #endif // @@ UNICODE does this work? diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp index 7ea5dd93694..72436de20d4 100644 --- a/ace/ARGV.cpp +++ b/ace/ARGV.cpp @@ -8,285 +8,16 @@ #include "ace/ARGV.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" -#include "ace/OS_NS_unistd.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_Memory.h" - ACE_RCSID(ace, ARGV, "$Id$") // Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_ALLOC_HOOK_DEFINE (ACE_ARGV) - -void -ACE_ARGV::dump (void) const -{ -#if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_ARGV::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("argc_ = %d"), this->argc_)); - - ACE_ARGV *this_obj = const_cast<ACE_ARGV *> (this); - - for (int i = 0; i < this->argc_; i++) - ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nargv_[%i] = %s"), - i, - this_obj->argv ()[i])); - - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -#endif /* ACE_HAS_DUMP */ -} - -// Creates this->argv_ out of this->buf_. New memory is allocated for -// each element of the array. This is used by the array-to-string -// style constructor and for creating this->argv_ when in iterative -// mode. - -int -ACE_ARGV::string_to_argv (void) -{ - ACE_TRACE ("ACE_ARGV::string_to_argv"); - - return ACE_OS::string_to_argv (this->buf_, - this->argc_, - this->argv_, - this->substitute_env_args_); -} - -int -ACE_ARGV::argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf) -{ - return ACE_OS::argv_to_string (argv, buf); -} - -ACE_ARGV::ACE_ARGV (const ACE_TCHAR buf[], - bool substitute_env_args) - : substitute_env_args_ (substitute_env_args), - iterative_ (false), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR[] to ACE_TCHAR *[]"); - - if (buf == 0 || buf[0] == 0) - return; - - // Make an internal copy of the string. - ACE_NEW (this->buf_, - ACE_TCHAR[ACE_OS::strlen (buf) + 1]); - ACE_OS::strcpy (this->buf_, buf); - - // Create this->argv_. - if (this->string_to_argv () == -1) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("string_to_argv"))); -} - -ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[], - bool substitute_env_args) - : substitute_env_args_ (substitute_env_args), - iterative_ (false), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] to ACE_TCHAR[]"); - - if (argv == 0 || argv[0] == 0) - return; - - this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args); -} - -ACE_ARGV::ACE_ARGV (ACE_TCHAR *first_argv[], - ACE_TCHAR *second_argv[], - bool substitute_env_args) - : substitute_env_args_ (substitute_env_args), - iterative_ (false), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] + ACE_TCHAR *[] to ACE_TCHAR[]"); - - int first_argc; - int second_argc; - - ACE_TCHAR *first_buf; - ACE_TCHAR *second_buf; - - // convert the first argv to a string - first_argc = this->argv_to_string (first_argv, first_buf); - - // convert the second argv to a string - second_argc = this->argv_to_string (second_argv, second_buf); - - // Add the number of arguments in both the argvs. - this->argc_ = first_argc + second_argc; - - size_t buf_len = - ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1; - - // Allocate memory to the lenght of the combined argv string. - ACE_NEW (this->buf_, - ACE_TCHAR[buf_len + 1]); - - // copy the first argv string to the buffer - ACE_OS::strcpy (this->buf_, first_buf); - - // concatenate the second argv string to the buffer - ACE_OS::strcat (this->buf_, second_buf); - - // Delete the first and second buffers - - delete [] first_buf; - - delete [] second_buf; -} - - -ACE_ARGV::ACE_ARGV (bool substitute_env_args) - : substitute_env_args_ (substitute_env_args), - iterative_ (true), - argc_ (0), - argv_ (0), - buf_ (0), - length_ (0), - queue_ () -{ - ACE_TRACE ("ACE_ARGV::ACE_ARGV Iterative"); - - // Nothing to do yet -- the user puts in arguments via add () -} - -int -ACE_ARGV::add (const ACE_TCHAR *next_arg) -{ - // Only allow this to work in the "iterative" verion -- the - // ACE_ARGVs created with the one argument constructor. - if (!this->iterative_) - { - errno = EINVAL; - return -1; - } - - // Put the new argument at the end of the queue. - if (this->queue_.enqueue_tail (const_cast <ACE_TCHAR *> (next_arg)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Can't add more to ARGV queue")), - -1); - - this->length_ += ACE_OS::strlen (next_arg); - - this->argc_++; - - // Wipe argv_ and buf_ away so that they will be recreated if the - // user calls argv () or buf (). - if (this->argv_ != 0) - { - for (int i = 0; this->argv_[i] != 0; i++) - ACE_OS::free ((void *) this->argv_[i]); - - delete [] this->argv_; - this->argv_ = 0; - } - - delete [] this->buf_; - this->buf_ = 0; - - return 0; -} - -int -ACE_ARGV::add (ACE_TCHAR *argv[]) -{ - for (int i = 0; argv[i] != 0; i++) - if (this->add (argv[i]) == -1) - return -1; - - return 0; -} - -// Free up argv_ and buf_ - -ACE_ARGV::~ACE_ARGV (void) -{ - ACE_TRACE ("ACE_ARGV::~ACE_ARGV"); - - if (this->argv_ != 0) - for (int i = 0; this->argv_[i] != 0; i++) - ACE_OS::free ((void *) this->argv_[i]); - - delete [] this->argv_; - delete [] this->buf_; -} - -// Create buf_ out of the queue_. This is only used in the -// "iterative" mode. - -int -ACE_ARGV::create_buf_from_queue (void) -{ - ACE_TRACE ("ACE_ARGV::create_buf_from_queue"); - - // If the are no arguments, don't do anything - if (this->argc_ <= 0) - return -1; - - delete [] this->buf_; - - ACE_NEW_RETURN (this->buf_, - ACE_TCHAR[this->length_ + this->argc_], - -1); - - // Get an iterator over the queue - ACE_Unbounded_Queue_Iterator<ACE_TCHAR *> iter (this->queue_); - - ACE_TCHAR **arg = 0; - ACE_TCHAR *ptr = this->buf_; - size_t len; - int more = 0; - - while (!iter.done ()) - { - // Get next argument from the queue. - iter.next (arg); - - more = iter.advance (); - - len = ACE_OS::strlen (*arg); - - // Copy the argument into buf_ - ACE_OS::memcpy ((void *) ptr, - (const void *) (*arg), - len * sizeof (ACE_TCHAR)); - // Move the pointer down. - ptr += len; - - // Put in an argument separating space. - if (more != 0) - *ptr++ = ' '; - } - - // Put in the NUL terminator - *ptr = '\0'; +ACE_RCSID(ace, ARGV, "$Id$") - return 0; -} +#if !defined (__ACE_INLINE__) +template class ACE_TARGV<ACE_TCHAR>; +#endif /* __ACE_INLINE__ */ // Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/ARGV.h b/ace/ARGV.h index 1f3350fd24e..f7ea995b62b 100644 --- a/ace/ARGV.h +++ b/ace/ARGV.h @@ -27,7 +27,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** - * @class ACE_ARGV + * @class ACE_TARGV * * @brief Builds a counted argument vector (ala argc/argv) from either * a string or a set of separate tokens. This class preserves whitespace @@ -43,7 +43,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * For example, @c $HOME/file will not substitute the value of the HOME * environment variable. */ -class ACE_Export ACE_ARGV +template < typename CHAR_TYPE = char > +class ACE_Export ACE_TARGV { public: // = Initialization and termination. @@ -60,7 +61,7 @@ public: * its environment variable value in the resultant vector * in place of the environment variable name. */ - ACE_ARGV (const ACE_TCHAR buf[], + ACE_TARGV (const CHAR_TYPE buf[], bool substitute_env_args = true); /** @@ -79,7 +80,7 @@ public: * its environment variable value in the resultant vector * in place of the environment variable name. */ - ACE_ARGV (ACE_TCHAR *argv[], + ACE_TARGV (CHAR_TYPE *argv[], bool substitute_env_args = true); /** @@ -96,8 +97,8 @@ public: * variable value in the resultant vector in place * of the environment variable name. */ - ACE_ARGV (ACE_TCHAR *first_argv[], - ACE_TCHAR *second_argv[], + ACE_TARGV (CHAR_TYPE *first_argv[], + CHAR_TYPE *second_argv[], bool substitute_env_args = true); /** @@ -105,10 +106,10 @@ public: * of the add methods. This is referred to as the @i iterative method * of adding arguments to this object. */ - ACE_ARGV (bool substitute_env_args = true); + ACE_TARGV (bool substitute_env_args = true); /// Destructor. - ~ACE_ARGV (void); + ~ACE_TARGV (void); /** @name Accessor methods * @@ -123,14 +124,14 @@ public: * @retval Pointer to the indexed string. * @retval 0 if @a index is out of bounds. */ - const ACE_TCHAR *operator[] (size_t index); + const CHAR_TYPE *operator[] (size_t index); /** * Returns the current argument vector. The returned pointers are to data * maintained internally to this class. Do not change or delete either the * pointers or the memory to which they refer. */ - ACE_TCHAR **argv (void); + CHAR_TYPE **argv (void); /// Returns the current number of arguments. int argc (void) const; @@ -140,7 +141,7 @@ public: * pointer refers to memory maintained internally to this class. Do not * change or delete it. */ - const ACE_TCHAR *buf (void); + const CHAR_TYPE *buf (void); //@} @@ -164,7 +165,7 @@ public: * - EINVAL: This object is not in iterative mode. * - ENOMEM: Not enough memory available to save @a next_arg. */ - int add (const ACE_TCHAR *next_arg); + int add (const CHAR_TYPE *next_arg); /** * Add an array of arguments. This only works in the iterative mode. @@ -181,24 +182,24 @@ public: * - EINVAL: This object is not in iterative mode. * - ENOMEM: Not enough memory available to save @a next_arg. */ - int add (ACE_TCHAR *argv[]); + int add (CHAR_TYPE *argv[]); private: - /// Copy constructor not implemented. - ACE_ARGV (const ACE_ARGV&); + /// Copy Constructor not implemented + ACE_TARGV (const ACE_TARGV&); - /// Assignment operator not implemented. - ACE_ARGV operator= (const ACE_ARGV&); + /// Assignment '=' operator not implemented + ACE_TARGV operator= (const ACE_TARGV&); /// Creates buf_ from the queue of added args, deletes previous buf_. int create_buf_from_queue (void); - /// Converts buf_ into the ACE_TCHAR *argv[] format. + /// Converts buf_ into the CHAR_TYPE *argv[] format. int string_to_argv (void); /// Returns the string created from argv in buf and /// returns the number of arguments. - int argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf); + int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf); /// Replace args with environment variable values? bool substitute_env_args_; @@ -209,10 +210,10 @@ private: int argc_; /// The array of string arguments. - ACE_TCHAR **argv_; + CHAR_TYPE **argv_; /// Buffer containing the <argv> contents. - ACE_TCHAR *buf_; + CHAR_TYPE *buf_; /// Total length of the arguments in the queue, not counting /// separating spaces @@ -220,9 +221,11 @@ private: /// Queue which keeps user supplied arguments. This is only /// active in the "iterative" mode. - ACE_Unbounded_Queue<ACE_TCHAR *> queue_; + ACE_Unbounded_Queue<CHAR_TYPE *> queue_; }; +typedef ACE_TARGV<ACE_TCHAR> ACE_ARGV; + // Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL @@ -230,5 +233,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/ARGV.inl" #endif /* __ACE_INLINE__ */ + #include /**/ "ace/post.h" #endif /* ACE_ARGUMENT_VECTOR_H */ diff --git a/ace/ARGV.inl b/ace/ARGV.inl index 599b1193e0d..88893fefe8b 100644 --- a/ace/ARGV.inl +++ b/ace/ARGV.inl @@ -2,36 +2,311 @@ // $Id$ #include "ace/Global_Macros.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" // Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL +template < typename CHAR_TYPE > void +ACE_TARGV<CHAR_TYPE>::dump (void) const +{ +#if defined (ACE_HAS_DUMP) + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::dump"); + + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("argc_ = %d"), this->argc_)); + + ACE_TARGV *this_obj = const_cast<ACE_TARGV *> (this); + + for (int i = 0; i < this->argc_; i++) + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("\nargv_[%i] = %s"), + i, + this_obj->argv ()[i])); + + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); +#endif /* ACE_HAS_DUMP */ +} + +// Creates this->argv_ out of this->buf_. New memory is allocated for +// each element of the array. This is used by the array-to-string +// style constructor and for creating this->argv_ when in iterative +// mode. + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::string_to_argv (void) +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::string_to_argv"); + + return ACE_OS::string_to_argv (this->buf_, + this->argc_, + this->argv_, + this->substitute_env_args_); +} + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf) +{ + return ACE_OS::argv_to_string (argv, buf); +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (const CHAR_TYPE buf[], + bool substitute_env_args) + : substitute_env_args_ (substitute_env_args), + iterative_ (false), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE[] to CHAR_TYPE *[]"); + + if (buf == 0 || buf[0] == 0) + return; + + // Make an internal copy of the string. + ACE_NEW (this->buf_, + CHAR_TYPE[ACE_OS::strlen (buf) + 1]); + ACE_OS::strcpy (this->buf_, buf); + + // Create this->argv_. + if (this->string_to_argv () == -1) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("string_to_argv"))); +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (CHAR_TYPE *argv[], + bool substitute_env_args) + : substitute_env_args_ (substitute_env_args), + iterative_ (false), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE*[] to CHAR_TYPE[]"); + + if (argv == 0 || argv[0] == 0) + return; + + this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args); +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (CHAR_TYPE *first_argv[], + CHAR_TYPE *second_argv[], + bool substitute_env_args) + : substitute_env_args_ (substitute_env_args), + iterative_ (false), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE*[] + CHAR_TYPE *[] to CHAR_TYPE[]"); + + int first_argc; + int second_argc; + + CHAR_TYPE *first_buf; + CHAR_TYPE *second_buf; + + // convert the first argv to a string + first_argc = this->argv_to_string (first_argv, first_buf); + + // convert the second argv to a string + second_argc = this->argv_to_string (second_argv, second_buf); + + // Add the number of arguments in both the argvs. + this->argc_ = first_argc + second_argc; + + size_t buf_len = + ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1; + + // Allocate memory to the lenght of the combined argv string. + ACE_NEW (this->buf_, + CHAR_TYPE[buf_len + 1]); + + // copy the first argv string to the buffer + ACE_OS::strcpy (this->buf_, first_buf); + + // concatenate the second argv string to the buffer + ACE_OS::strcat (this->buf_, second_buf); + + // Delete the first and second buffers + + delete [] first_buf; + + delete [] second_buf; +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (bool substitute_env_args) + : substitute_env_args_ (substitute_env_args), + iterative_ (true), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV Iterative"); + + // Nothing to do yet -- the user puts in arguments via add () +} + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::add (const CHAR_TYPE *next_arg) +{ + // Only allow this to work in the "iterative" verion -- the + // ACE_TARGVs created with the one argument constructor. + if (!this->iterative_) + { + errno = EINVAL; + return -1; + } + + // Put the new argument at the end of the queue. + if (this->queue_.enqueue_tail (const_cast <CHAR_TYPE *> (next_arg)) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_LIB_TEXT ("Can't add more to ARGV queue")), + -1); + + this->length_ += ACE_OS::strlen (next_arg); + + this->argc_++; + + // Wipe argv_ and buf_ away so that they will be recreated if the + // user calls argv () or buf (). + if (this->argv_ != 0) + { + for (int i = 0; this->argv_[i] != 0; i++) + ACE_OS::free ((void *) this->argv_[i]); + + delete [] this->argv_; + this->argv_ = 0; + } + + delete [] this->buf_; + this->buf_ = 0; + + return 0; +} + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::add (CHAR_TYPE *argv[]) +{ + for (int i = 0; argv[i] != 0; i++) + if (this->add (argv[i]) == -1) + return -1; + + return 0; +} + +// Free up argv_ and buf_ +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::~ACE_TARGV (void) +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::~ACE_TARGV"); + + if (this->argv_ != 0) + for (int i = 0; this->argv_[i] != 0; i++) + ACE_OS::free ((void *) this->argv_[i]); + + delete [] this->argv_; + delete [] this->buf_; +} + +// Create buf_ out of the queue_. This is only used in the +// "iterative" mode. + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::create_buf_from_queue (void) +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::create_buf_from_queue"); + + // If the are no arguments, don't do anything + if (this->argc_ <= 0) + return -1; + + delete [] this->buf_; + + ACE_NEW_RETURN (this->buf_, + CHAR_TYPE[this->length_ + this->argc_], + -1); + + // Get an iterator over the queue + ACE_Unbounded_Queue_Iterator<CHAR_TYPE *> iter (this->queue_); + + CHAR_TYPE **arg; + CHAR_TYPE *ptr = this->buf_; + size_t len; + int more = 0; + + while (!iter.done ()) + { + // Get next argument from the queue. + iter.next (arg); + + more = iter.advance (); + + len = ACE_OS::strlen (*arg); + + // Copy the argument into buf_ + ACE_OS::memcpy ((void *) ptr, + (const void *) (*arg), + len * sizeof (CHAR_TYPE)); + // Move the pointer down. + ptr += len; + + // Put in an argument separating space. + if (more != 0) + *ptr++ = ' '; + } + + // Put in the NUL terminator + *ptr = '\0'; + + return 0; +} + // Return the number of args -ACE_INLINE int -ACE_ARGV::argc (void) const +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::argc (void) const { - ACE_TRACE ("ACE_ARGV::argc"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::argc"); return this->argc_; } // Return the arguments in a space-separated string -ACE_INLINE const ACE_TCHAR * -ACE_ARGV::buf (void) +template < typename CHAR_TYPE > const CHAR_TYPE * +ACE_TARGV<CHAR_TYPE>::buf (void) { - ACE_TRACE ("ACE_ARGV::buf"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::buf"); if (this->buf_ == 0 && this->iterative_) this->create_buf_from_queue (); - return (const ACE_TCHAR *) this->buf_; + return (const CHAR_TYPE *) this->buf_; } // Return the arguments in an entry-per-argument array -ACE_INLINE ACE_TCHAR ** -ACE_ARGV::argv (void) +template < typename CHAR_TYPE > CHAR_TYPE ** +ACE_TARGV<CHAR_TYPE>::argv (void) { - ACE_TRACE ("ACE_ARGV::argv"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::argv"); // Try to create the argv_ if it isn't there if (this->argv_ == 0) @@ -41,24 +316,24 @@ ACE_ARGV::argv (void) // Convert buf_ to argv_ if (this->string_to_argv () == -1) - return (ACE_TCHAR **) 0; + return (CHAR_TYPE **) 0; } - return (ACE_TCHAR **) this->argv_; + return (CHAR_TYPE **) this->argv_; } // Subscript operator. -ACE_INLINE const ACE_TCHAR * -ACE_ARGV::operator[] (size_t i) +template < typename CHAR_TYPE > const CHAR_TYPE * +ACE_TARGV<CHAR_TYPE>::operator[] (size_t i) { - ACE_TRACE ("ACE_ARGV::operator[]"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::operator[]"); // Don't go out of bounds. if (i >= static_cast<size_t> (this->argc_)) return 0; - return (const ACE_TCHAR *) this->argv ()[i]; + return (const CHAR_TYPE *) this->argv ()[i]; } // Close versioned namespace, if enabled by the user. diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp index 3c2ebd9fe08..f29f2522ca7 100644 --- a/ace/Arg_Shifter.cpp +++ b/ace/Arg_Shifter.cpp @@ -1,212 +1,14 @@ #include "ace/Arg_Shifter.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_strings.h" -#include "ace/OS_Errno.h" -#include "ace/OS_Memory.h" + +#if !defined (__ACE_INLINE__) +#include "ace/Arg_Shifter.inl" +#endif /* __ACE_INLINE__ */ + ACE_RCSID (ace, Arg_Shifter, "$Id$") - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -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_; -} - -ACE_END_VERSIONED_NAMESPACE_DECL +#if !defined (__ACE_INLINE__) +template class ACE_TArg_Shifter< ACE_TCHAR >; +#endif /* __ACE_INLINE__ */ diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h index b75537a1338..32345386f44 100644 --- a/ace/Arg_Shifter.h +++ b/ace/Arg_Shifter.h @@ -39,7 +39,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * 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_Export ACE_TArg_Shifter { public: // = Initialization and termination methods. @@ -57,28 +58,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 @@ -112,7 +113,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> @@ -143,7 +144,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. @@ -169,10 +170,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); @@ -184,10 +185,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_; @@ -201,8 +202,15 @@ private: int front_; }; +typedef ACE_TArg_Shifter< ACE_TCHAR > ACE_Arg_Shifter; + ACE_END_VERSIONED_NAMESPACE_DECL +#if defined (__ACE_INLINE__) +#include "ace/Arg_Shifter.inl" +#endif /* __ACE_INLINE__ */ + + #include /**/ "ace/post.h" #endif /* ACE_ARG_SHIFTER_H */ diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp index 2fca97a0671..78d2788c331 100644 --- a/ace/Argv_Type_Converter.cpp +++ b/ace/Argv_Type_Converter.cpp @@ -15,55 +15,47 @@ ACE_RCSID (ace, ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_USES_WCHAR) ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, wchar_t** argv) - : saved_argc_ (argc) - , char_argv_ (0) - , wchar_argv_ (argv) - , before_pass_argc_ (argc) - , original_type_ (1) - , wchar_passed_ (0) - , char_passed_ (0) +: saved_argc_ (argc) +, char_argv_ (0) +, wchar_argv_ (argv) +, before_pass_argc_ (argc) +, original_type_wchar_ (true) +, wchar_passed_ (false) +, char_passed_ (false) { this->initialize (); for (int i = 0; i < argc; ++i) { this->char_argv_[i] = - ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (argv[i])); + ACE::String_Conversion::Convert_Out< char >( argv[i] ).c_str(); } } -#endif // ACE_USES_WCHAR ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char** argv) - : saved_argc_(argc) - , char_argv_(argv) -#if defined (ACE_USES_WCHAR) - , wchar_argv_(0) - , before_pass_argc_(argc) - , original_type_(0) - , wchar_passed_(0) - , char_passed_(0) +: saved_argc_(argc) +, char_argv_(argv) +, wchar_argv_(false) +, before_pass_argc_(argc) +, original_type_wchar_(false) +, wchar_passed_(false) +, char_passed_(false) { this->initialize(); for (int i = 0; i < argc; ++i) { this->wchar_argv_[i] = - ACE_OS::strdup (ACE_TEXT_ANTI_TO_TCHAR (argv[i])); + ACE::String_Conversion::Convert_Out< wchar_t >( argv[i] ).c_str(); } } -#else -{ -} -#endif // ACE_USES_WCHAR ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void) { -#if defined (ACE_USES_WCHAR) // selectively delete the 'copy' of argv - if (this->original_type_) + if (this->original_type_wchar_) { // if original type is wchar_t if (this->char_passed_) @@ -72,7 +64,7 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void) } for (int i = 0; i < this->before_pass_argc_; ++i) { - ACE_OS::free (this->char_argv_[i]); + ACE::String_Conversion::Convert_Out<char>::free( this->char_argv_[i] ); } delete [] this->char_argv_; } @@ -84,18 +76,16 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void) } for (int i = 0; i < this->before_pass_argc_; ++i) { - ACE_OS::free (this->wchar_argv_[i]); + ACE::String_Conversion::Convert_Out<wchar_t>::free( this->wchar_argv_[i] ); } delete [] this->wchar_argv_; } -#endif // ACE_USES_WCHAR } -#if defined (ACE_USES_WCHAR) void ACE_Argv_Type_Converter::initialize (void) { - if (this->original_type_) + if (this->original_type_wchar_) { // make a copy of argv in 'char' type // Create one more argv entry than original argc for the NULL. ACE_NEW (char_argv_, char*[this->saved_argc_ + 1]); @@ -120,14 +110,14 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) { // if n'th entries of both argv lists are different if (ACE_OS::strcmp(this->char_argv_[wchar_argv_index], - ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0) + ACE_TEXT_TO_CHAR_IN (match_argv)) != 0) { // loop through the wchar argv list entries that are after // wchar_argv_index for (int i = wchar_argv_index + 1; i < before_pass_argc_; ++i) { if (ACE_OS::strcmp (this->char_argv_[i], - ACE_TEXT_ALWAYS_CHAR (match_argv)) + ACE_TEXT_TO_CHAR_IN (match_argv)) == 0) { // swap the pointers in the char argv list @@ -156,7 +146,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) { // if n'th entries of both argv lists are different if (ACE_OS::strcmp ( - ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]), + ACE_TEXT_TO_CHAR_IN (this->wchar_argv_[char_argv_index]), match_argv) != 0) { // loop through the wchar argv list entries that are after @@ -164,7 +154,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) for (int i = char_argv_index + 1; i < this->before_pass_argc_; ++i) { if (ACE_OS::strcmp ( - ACE_TEXT_ALWAYS_CHAR(this->wchar_argv_[i]), + ACE_TEXT_TO_CHAR_IN(this->wchar_argv_[i]), match_argv) == 0) { // swap the pointers in the char argv list wchar_t* temp = this->wchar_argv_[char_argv_index]; @@ -188,23 +178,22 @@ ACE_Argv_Type_Converter::cleanup (void) for (int i = this->saved_argc_; i < this->before_pass_argc_; ++i) { // Check whether it's ours to delete. - if (original_type_ == 1) + if (original_type_wchar_ == true) { - ACE_OS::free (this->char_argv_[i]); + ACE::String_Conversion::Convert_Out<char>::free( this->char_argv_[i] ); this->char_argv_[i] = 0; } else { - ACE_OS::free (this->wchar_argv_[i]); + ACE::String_Conversion::Convert_Out<wchar_t>::free( this->wchar_argv_[i] ); this->wchar_argv_[i] = 0; } } this->before_pass_argc_ = this->saved_argc_; - this->wchar_passed_ = 0; - this->char_passed_ = 0; + this->wchar_passed_ = false; + this->char_passed_ = false; } -#endif // ACE_USES_WCHAR ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h index 89ba35c6220..381448af6ab 100644 --- a/ace/Argv_Type_Converter.h +++ b/ace/Argv_Type_Converter.h @@ -42,15 +42,16 @@ public: ACE_Argv_Type_Converter (int &argc, char** argv); -#if defined (ACE_USES_WCHAR) ACE_Argv_Type_Converter (int &argc, wchar_t** argv); -#endif // ACE_USES_WCHAR ~ACE_Argv_Type_Converter (void); /// Returns the pointer of converted command line. ACE_TCHAR** get_TCHAR_argv (void); + /// Returns the pointer of converted command line. + wchar_t** get_Wide_argv (void); + /// Returns the pointer of ASCII (char) command line. char** get_ASCII_argv (void); @@ -65,8 +66,6 @@ private: /// Assignment '=' operator should not be used. ACE_Argv_Type_Converter operator= (const ACE_Argv_Type_Converter&); -#if defined (ACE_USES_WCHAR) - /// Perform common initialization for two Ctor's. void initialize (void); @@ -80,17 +79,15 @@ private: /// Clean up removed (comsumed) argv entries and reset the pass flags. void cleanup (void); -#endif // ACE_USES_WCHAR private: /// Original number of input paramter, same as 'argc'. int &saved_argc_; - /// Data member pointer that contains converted argv in ACE_ANTI_TCHAR. + /// Data member pointer that contains converted argv in char. char** char_argv_; -#if defined (ACE_USES_WCHAR) - /// Data member pointer that contains converted argv in ACE_TCHAR. + /// Data member pointer that contains converted argv in wchar_t. wchar_t** wchar_argv_; /// argc value before any argv has been passed. @@ -98,14 +95,13 @@ private: /// FALSE represents original argv passed in is char, and TRUE /// represents wchar_t. - const int original_type_; + const bool original_type_wchar_; /// TRUE indicates wchar_t type argv has been passed. - int wchar_passed_; + bool wchar_passed_; /// TRUE indicates char type argv has been passed. - int char_passed_; -#endif /* ACE_USES_WCHAR */ + bool char_passed_; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Argv_Type_Converter.inl b/ace/Argv_Type_Converter.inl index f56c83146b3..54b9ed2dfc1 100644 --- a/ace/Argv_Type_Converter.inl +++ b/ace/Argv_Type_Converter.inl @@ -8,6 +8,15 @@ ACE_INLINE ACE_TCHAR** ACE_Argv_Type_Converter::get_TCHAR_argv (void) { #if defined (ACE_USES_WCHAR) + return get_Wide_argv (); +#else + return get_ASCII_argv (); +#endif +} + +ACE_INLINE wchar_t** +ACE_Argv_Type_Converter::get_Wide_argv (void) +{ if (this->char_passed_) { this->align_wchar_with_char (); @@ -15,22 +24,17 @@ ACE_Argv_Type_Converter::get_TCHAR_argv (void) this->wchar_passed_ = true; return this->wchar_argv_; -#else - return this->char_argv_; -#endif // ACE_USES_WCHAR } ACE_INLINE char** ACE_Argv_Type_Converter::get_ASCII_argv (void) { -#if defined (ACE_USES_WCHAR) if (this->wchar_passed_) { this->align_char_with_wchar (); } - this->char_passed_ = 1; -#endif // ACE_USES_WCHAR + this->char_passed_ = true; return this->char_argv_; } diff --git a/ace/Auto_Event.cpp b/ace/Auto_Event.cpp index 9e106ac8119..456ac2a4890 100644 --- a/ace/Auto_Event.cpp +++ b/ace/Auto_Event.cpp @@ -19,12 +19,11 @@ ACE_Auto_Event::ACE_Auto_Event (int initial_state, : ACE_Event (0, initial_state, type, - ACE_TEXT_CHAR_TO_TCHAR (name), + ACE_TEXT_TO_TCHAR_IN (name), arg) { } -#if defined (ACE_HAS_WCHAR) ACE_Auto_Event::ACE_Auto_Event (int initial_state, int type, const wchar_t *name, @@ -32,11 +31,10 @@ ACE_Auto_Event::ACE_Auto_Event (int initial_state, : ACE_Event (0, initial_state, type, - ACE_TEXT_WCHAR_TO_TCHAR (name), + ACE_TEXT_TO_TCHAR_IN (name), arg) { } -#endif /* ACE_HAS_WCHAR */ void ACE_Auto_Event::dump (void) const diff --git a/ace/Auto_Event.h b/ace/Auto_Event.h index d7279a13150..db1a834e9c0 100644 --- a/ace/Auto_Event.h +++ b/ace/Auto_Event.h @@ -45,13 +45,11 @@ public: const char *name = 0, void *arg = 0); -#if defined (ACE_HAS_WCHAR) /// Constructor which will create auto event (wchar_t version) ACE_Auto_Event (int initial_state, int type, const wchar_t *name, void *arg = 0); -#endif /* ACE_HAS_WCHAR */ /// Default dtor. ~ACE_Auto_Event (void); diff --git a/ace/Basic_Stats.cpp b/ace/Basic_Stats.cpp index f81b29bfcaa..e727d1c8224 100644 --- a/ace/Basic_Stats.cpp +++ b/ace/Basic_Stats.cpp @@ -46,7 +46,35 @@ 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 + if (this->samples_count () == 0u) + { + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("%s : no data collected\n"), msg)); + return; + } + + ACE_UINT64 avg = this->sum_ / this->samples_count_; + + ACE_UINT64 l_min = this->min_ / sf; + ACE_UINT64 l_max = this->max_ / sf; + ACE_UINT64 l_avg = avg / sf; + + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("%s latency : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"), + msg, + l_min, this->min_at_, + l_avg, + l_max, this->max_at_)); + +#endif /* ACE_NLOGGING */ +} + +void +ACE_Basic_Stats::dump_results (const wchar_t *msg, ACE_UINT32 sf) const { #ifndef ACE_NLOGGING diff --git a/ace/Basic_Stats.h b/ace/Basic_Stats.h index 2dc50694e63..f0c8a0f3b38 100644 --- a/ace/Basic_Stats.h +++ b/ace/Basic_Stats.h @@ -55,7 +55,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/Basic_Types.h b/ace/Basic_Types.h index abde82d342c..c3ee616356e 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -14,7 +14,6 @@ * * Sizes of built-in types: * - ACE_SIZEOF_CHAR - * - ACE_SIZEOF_WCHAR * - ACE_SIZEOF_SHORT * - ACE_SIZEOF_INT * - ACE_SIZEOF_LONG @@ -83,23 +82,6 @@ // A char always has 1 byte, by definition. # define ACE_SIZEOF_CHAR 1 -// Unfortunately, there isn't a portable way to determine the size of a wchar. -// So we just define them on a platform basis. If the platform doesn't -// define it and it's an XPG4 system, assume wchar_t is 4 bytes. Some code -// uses ACE_SIZEOF_WCHAR in preprocessor statements, so sizeof() isn't valid. -// If the platform config doesn't set this, and this guess is wrong, -// Basic_Types_Test should catch the inconsistency. -# if defined (ACE_HAS_WCHAR) -# if !defined (ACE_SIZEOF_WCHAR) -# if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) -# define ACE_SIZEOF_WCHAR 4 -# else -// 0 so the Basic_Types test will catch this. -# define ACE_SIZEOF_WCHAR 0 -# endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */ -# endif /* !ACE_SIZEOF_WCHAR */ -# endif /* ACE_HAS_WCHAR */ - // The number of bytes in a short. # if !defined (ACE_SIZEOF_SHORT) # if (USHRT_MAX) == 255U @@ -271,17 +253,6 @@ typedef ACE_UINT16 ACE_USHORT16; // @@ Backward compatibility. // Define a generic byte for use in codecs typedef unsigned char ACE_Byte; -// Define a pseudo wide character type when wchar is not supported so we -// can support basic wide character string operations. - -# if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) -# define ACE_WINT_T wint_t -# define ACE_WCHAR_T wchar_t -# else -# define ACE_WINT_T ACE_UINT16 -# define ACE_WCHAR_T ACE_UINT16 -# endif /* ACE_HAS_WCHAR */ - // The number of bytes in a void *. # ifndef ACE_SIZEOF_VOID_P # define ACE_SIZEOF_VOID_P ACE_SIZEOF_LONG @@ -684,27 +655,34 @@ ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (ACE_UINT64_FORMAT_SPECIFIER) # if defined (PRIu64) -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRIu64) +# define ACE_UINT64_FORMAT_SPECIFIER_A "%" PRIu64 +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) # elif ACE_SIZEOF_LONG == 8 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER_A "%lu" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) # else -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu") +# define ACE_UINT64_FORMAT_SPECIFIER_A "%llu" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) # endif /* defined (PRIu64) */ #endif /* ACE_UINT64_FORMAT_SPECIFIER */ #if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) # if defined (ACE_WIN64) -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%I64d" +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) # else -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%d" +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) # endif /* ACE_WIN64 */ #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ #if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) # if defined (ACE_WIN64) -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%I64u" +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) # else -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%u" +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) # endif /* ACE_WIN64 */ #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ @@ -772,7 +750,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #define ACE_INT16_MAX 0x7FFF #define ACE_INT16_MIN -(ACE_INT16_MAX)-1 #define ACE_UINT16_MAX 0xFFFF -#define ACE_WCHAR_MAX ACE_UINT16_MAX #define ACE_INT32_MAX 0x7FFFFFFF #define ACE_INT32_MIN -(ACE_INT32_MAX)-1 #define ACE_UINT32_MAX 0xFFFFFFFF diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h index eb0bedb5f15..10f88a7144e 100644 --- a/ace/CDR_Base.h +++ b/ace/CDR_Base.h @@ -167,10 +167,16 @@ public: * avoid complaints from all compilers is to define them all. */ //@{ + +# if !defined (ACE_CDR_WCHAR_OVERRIDE) || defined(ACE_USES_WCHAR) +# undef ACE_CDR_WCHAR_OVERRIDE +# define ACE_CDR_WCHAR_OVERRIDE wchar_t +# endif + typedef bool Boolean; typedef unsigned char Octet; typedef char Char; - typedef ACE_WCHAR_T WChar; + typedef ACE_CDR_WCHAR_OVERRIDE WChar; typedef ACE_INT16 Short; typedef ACE_UINT16 UShort; typedef ACE_INT32 Long; diff --git a/ace/CE_Screen_Output.cpp b/ace/CE_Screen_Output.cpp index 3afc5325d9a..8a477b97a85 100644 --- a/ace/CE_Screen_Output.cpp +++ b/ace/CE_Screen_Output.cpp @@ -77,13 +77,13 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_TCHAR* output ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_ANTI_TCHAR* output) { - *this << ACE_TEXT_CHAR_TO_TCHAR(output); + *this << ACE_TEXT_TO_TCHAR_IN(output); return *this; } ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_ANTI_TCHAR* output) { - *this << ACE_TEXT_CHAR_TO_TCHAR(output); + *this << ACE_TEXT_TO_TCHAR_IN(output); return *this; } diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h index 59087649661..22d51fe8296 100644 --- a/ace/Default_Constants.h +++ b/ace/Default_Constants.h @@ -51,7 +51,8 @@ #endif /* ACE_DEFAULT_PAGEFILE_POOL_CHUNK */ #if !defined (ACE_DEFAULT_PAGEFILE_POOL_NAME) -#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT ("Default_ACE_Pagefile_Memory_Pool") +#define ACE_DEFAULT_PAGEFILE_POOL_NAME_A "Default_ACE_Pagefile_Memory_Pool" +#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT (ACE_DEFAULT_PAGEFILE_POOL_NAME_A) #endif /* ACE_DEFAULT_PAGEFILE_POOL_NAME */ #if !defined (ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY) @@ -124,7 +125,8 @@ # endif /* ACE_DEFAULT_MAX_SOCKET_BUFSIZ */ # if !defined (ACE_DEFAULT_SERVER_PORT_STR) -# define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT("20002") +# define ACE_DEFAULT_SERVER_PORT_STR_A "20002" +# define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT(ACE_DEFAULT_SERVER_PORT_STR_A) # endif /* ACE_DEFAULT_SERVER_PORT_STR */ // Used for the Service_Directory test @@ -199,9 +201,11 @@ // Used by the FIFO tests and the Client_Logging_Handler netsvc. # if !defined (ACE_DEFAULT_RENDEZVOUS) # if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("/tmp/fifo.ace") +# define ACE_DEFAULT_RENDEZVOUS_A "/tmp/fifo.ace" +# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT(ACE_DEFAULT_RENDEZVOUS_A) # else -# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("localhost:20010") +# define ACE_DEFAULT_RENDEZVOUS_A "localhost:20010" +# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT(ACE_DEFAULT_RENDEZVOUS_A) # endif /* ACE_HAS_STREAM_PIPES */ # endif /* ACE_DEFAULT_RENDEZVOUS */ @@ -213,23 +217,27 @@ # if !defined (ACE_DEFAULT_LOGGER_KEY) # if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon") +# define ACE_DEFAULT_LOGGER_KEY_A "/tmp/server_daemon" +# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT (ACE_DEFAULT_LOGGER_KEY_A) # else -# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("localhost:20012") +# define ACE_DEFAULT_LOGGER_KEY_A "localhost:20012" +# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT (ACE_DEFAULT_LOGGER_KEY_A) # endif /* ACE_HAS_STREAM_PIPES */ # endif /* ACE_DEFAULT_LOGGER_KEY */ // The way to specify the local host for loopback IP. This is usually // "localhost" but it may need changing on some platforms. # if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST ACE_LIB_TEXT ("localhost") +# define ACE_LOCALHOST_A "localhost" +# define ACE_LOCALHOST ACE_LIB_TEXT (ACE_LOCALHOST_A) # endif // This specification for an IPv6 localhost should work on all platforms // supporting IPv6 # if defined (ACE_HAS_IPV6) # if !defined (ACE_IPV6_LOCALHOST) -# define ACE_IPV6_LOCALHOST ACE_LIB_TEXT ("::1") +# define ACE_IPV6_LOCALHOST_A "::1" +# define ACE_IPV6_LOCALHOST ACE_LIB_TEXT (ACE_IPV6_LOCALHOST_A) # endif /* ACE_IPV6_LOCALHOST*/ #endif /* ACE_HAS_IPV6 */ @@ -237,14 +245,17 @@ // supporting IPv6 # if defined (ACE_HAS_IPV6) # if !defined (ACE_IPV6_ANY) -# define ACE_IPV6_ANY ACE_LIB_TEXT ("::") +# define ACE_IPV6_ANY_A "::" +# define ACE_IPV6_ANY ACE_LIB_TEXT (ACE_IPV6_ANY_A) # endif /* ACE_IPV6_ANY*/ #endif /* ACE_HAS_IPV6 */ # if !defined (ACE_DEFAULT_SERVER_HOST) # if defined (ACE_HAS_IPV6) +# define ACE_DEFAULT_SERVER_HOST_A ACE_IPV6_LOCALHOST_A # define ACE_DEFAULT_SERVER_HOST ACE_IPV6_LOCALHOST # else /*ACE_HAS_IPV6*/ +# define ACE_DEFAULT_SERVER_HOST_A ACE_LOCALHOST_A # define ACE_DEFAULT_SERVER_HOST ACE_LOCALHOST # endif /*ACE_HAS_IPV6*/ # endif /* ACE_DEFAULT_SERVER_HOST */ @@ -435,10 +446,8 @@ #endif /* ACE_WIN32 */ // Define the Wide character and normal versions of some of the string macros -#if defined (ACE_HAS_WCHAR) # define ACE_DIRECTORY_SEPARATOR_STR_W ACE_TEXT_WIDE(ACE_DIRECTORY_SEPARATOR_STR_A) # define ACE_DIRECTORY_SEPARATOR_CHAR_W ACE_TEXT_WIDE(ACE_DIRECTORY_SEPARATOR_CHAR_A) -#endif /* ACE_HAS_WCHAR */ #define ACE_DIRECTORY_SEPARATOR_STR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_STR_A) #define ACE_DIRECTORY_SEPARATOR_CHAR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A) @@ -471,10 +480,8 @@ #endif /* ACE_WIN32 */ // Define the Wide character and normal versions of some of the string macros -#if defined (ACE_HAS_WCHAR) # define ACE_PLATFORM_W ACE_TEXT_WIDE(ACE_PLATFORM_A) # define ACE_PLATFORM_EXE_SUFFIX_W ACE_TEXT_WIDE(ACE_PLATFORM_EXE_SUFFIX_A) -#endif /* ACE_HAS_WCHAR */ #define ACE_PLATFORM ACE_LIB_TEXT (ACE_PLATFORM_A) #define ACE_PLATFORM_EXE_SUFFIX ACE_LIB_TEXT (ACE_PLATFORM_EXE_SUFFIX_A) @@ -490,7 +497,8 @@ # endif /* __MINGW32__ */ #else /* !ACE_WIN32 */ # if !defined (ACE_LD_SEARCH_PATH) -# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("LD_LIBRARY_PATH") +# define ACE_LD_SEARCH_PATH_A "LD_LIBRARY_PATH" +# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT (ACE_LD_SEARCH_PATH_A) # endif /* ACE_LD_SEARCH_PATH */ # if !defined (ACE_LD_SEARCH_PATH_SEPARATOR_STR) # define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_LIB_TEXT (":") @@ -509,9 +517,11 @@ // Used for dynamic linking # if !defined (ACE_DEFAULT_SVC_CONF) # if (ACE_USES_CLASSIC_SVC_CONF == 1) -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf") +# define ACE_DEFAULT_SVC_CONF_A ".\\svc.conf" +# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A) # else -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf.xml") +# define ACE_DEFAULT_SVC_CONF_A ".\\svc.conf.xml" +# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A) # endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */ # endif /* ACE_DEFAULT_SVC_CONF */ #endif /* ACE_WIN32 */ @@ -519,14 +529,17 @@ // Used for dynamic linking. #if !defined (ACE_DEFAULT_SVC_CONF) # if (ACE_USES_CLASSIC_SVC_CONF == 1) -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf") +# define ACE_DEFAULT_SVC_CONF_A "./svc.conf" +# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A) # else -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf.xml") +# define ACE_DEFAULT_SVC_CONF_A "./svc.conf.xml" +# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A) # endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */ #endif /* ACE_DEFAULT_SVC_CONF */ #if !defined (ACE_LOGGER_KEY) -# define ACE_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon") +# define ACE_LOGGER_KEY_A "/tmp/server_daemon" +# define ACE_LOGGER_KEY ACE_LIB_TEXT (ACE_LOGGER_KEY_A) #endif /* ACE_LOGGER_KEY */ // Theses defines are used by the ACE Name Server. @@ -546,16 +559,12 @@ # else /* ACE_WIN32 */ # define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp" # endif /* ACE_WIN32 */ -# if defined (ACE_HAS_WCHAR) # define ACE_DEFAULT_NAMESPACE_DIR_W ACE_TEXT_WIDE(ACE_DEFAULT_NAMESPACE_DIR_A) -# endif /* ACE_HAS_WCHAR */ # define ACE_DEFAULT_NAMESPACE_DIR ACE_LIB_TEXT(ACE_DEFAULT_NAMESPACE_DIR_A) #endif /* ACE_LEGACY_MODE */ -#if defined (ACE_HAS_WCHAR) # define ACE_DEFAULT_LOCALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_LOCALNAME_A) # define ACE_DEFAULT_GLOBALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_GLOBALNAME_A) -#endif /* ACE_HAS_WCHAR */ #define ACE_DEFAULT_LOCALNAME ACE_LIB_TEXT (ACE_DEFAULT_LOCALNAME_A) #define ACE_DEFAULT_GLOBALNAME ACE_LIB_TEXT (ACE_DEFAULT_GLOBALNAME_A) diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp index fa61f2ae6c5..e5a783d938c 100644 --- a/ace/Dev_Poll_Reactor.cpp +++ b/ace/Dev_Poll_Reactor.cpp @@ -1384,7 +1384,7 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), handle, revents)); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), handle, revents)); // ACE_ASSERT (0); } diff --git a/ace/Dynamic_Service.inl b/ace/Dynamic_Service.inl index 3980038ef3f..21fb05215e8 100644 --- a/ace/Dynamic_Service.inl +++ b/ace/Dynamic_Service.inl @@ -9,7 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class TYPE> ACE_INLINE TYPE * ACE_Dynamic_Service<TYPE>::instance (const ACE_ANTI_TCHAR *name) { - return instance (ACE_TEXT_CHAR_TO_TCHAR (name)); + return instance (ACE_TEXT_TO_TCHAR_IN (name)); } template <class TYPE> ACE_INLINE TYPE * diff --git a/ace/Env_Value_T.inl b/ace/Env_Value_T.inl index 63fe8df1f29..1af0296cf91 100644 --- a/ace/Env_Value_T.inl +++ b/ace/Env_Value_T.inl @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -35,15 +36,9 @@ ACE_Env_Value<T>::open (const ACE_TCHAR *varname, template <class T> ACE_INLINE void ACE_Env_Value<T>::fetch_value (void) { -#if defined (ACE_WIN32) const ACE_TCHAR *env = ACE_OS::getenv (this->varname_); if (env != 0) ACE_Convert (env, value_); -#else - char *nenv = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (this->varname_)); - if (nenv != 0) - ACE_Convert (ACE_TEXT_CHAR_TO_TCHAR (nenv), this->value_); -#endif } template <class T> ACE_INLINE const ACE_TCHAR* diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp index c3991c309ea..cc471d5ce24 100644 --- a/ace/FILE_Connector.cpp +++ b/ace/FILE_Connector.cpp @@ -67,7 +67,7 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io, handle = ACE_OS::mkstemp (filename); // mkstemp() replaces "XXXXXX" if (handle == ACE_INVALID_HANDLE - || new_io.addr_.set (ACE_TEXT_CHAR_TO_TCHAR (filename)) != 0) + || new_io.addr_.set (ACE_TEXT_TO_TCHAR_IN (filename)) != 0) return -1; new_io.set_handle (handle); diff --git a/ace/Functor.h b/ace/Functor.h index 01967e5f977..9cf8f200336 100644 --- a/ace/Functor.h +++ b/ace/Functor.h @@ -480,9 +480,7 @@ public: const char *rhs) const; }; -#if defined (ACE_HAS_WCHAR) - -# if ! defined (ACE_LACKS_NATIVE_WCHAR_T) +# if ! defined (ACE_LACKS_BUILTIN_WCHAR_T) /** * @class ACE_Hash<wchar_t> * @@ -495,7 +493,7 @@ public: /// Simply returns t unsigned long operator () (wchar_t t) const; }; -# endif /* ACE_LACKS_NATIVE_WCHAR_T */ +# endif /* ACE_LACKS_BUILTIN_WCHAR_T */ /** * @class ACE_Hash<const wchar_t *> * @@ -581,7 +579,6 @@ public: const wchar_t *rhs) const; }; -#endif // ACE_HAS_WCHAR ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Functor.inl b/ace/Functor.inl index 84e38313b02..c505ed328b3 100644 --- a/ace/Functor.inl +++ b/ace/Functor.inl @@ -56,13 +56,13 @@ ACE_Hash<char>::operator () (char t) const return t; } -#if defined (ACE_HAS_WCHAR) && ! defined (ACE_LACKS_NATIVE_WCHAR_T) +#if !defined (ACE_LACKS_BUILTIN_WCHAR_T) ACE_INLINE unsigned long ACE_Hash<wchar_t>::operator () (wchar_t t) const { return t; } -#endif /* ACE_HAS_WCHAR && ! ACE_LACKS_NATIVE_WCHAR_T */ +#endif /* ACE_LACKS_BUILTIN_WCHAR_T */ ACE_INLINE unsigned long ACE_Hash<signed char>::operator () (signed char t) const @@ -243,9 +243,6 @@ ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } - -#if defined (ACE_HAS_WCHAR) - ACE_INLINE unsigned long ACE_Hash<const wchar_t *>::operator () (const wchar_t *t) const { @@ -284,6 +281,5 @@ ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) c return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } -#endif // ACE_HAS_WCHAR ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Functor_String.h b/ace/Functor_String.h index 6c68b026bd1..4becd6c4cf0 100644 --- a/ace/Functor_String.h +++ b/ace/Functor_String.h @@ -83,9 +83,6 @@ public: const ACE_CString &rhs) const; }; - -#if defined (ACE_USES_WCHAR) - /** * @class ACE_Equal_To<ACE_WString> * @@ -129,7 +126,6 @@ public: const ACE_WString &rhs) const; }; -#endif /*ACE_USES_WCHAR*/ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Functor_String.inl b/ace/Functor_String.inl index 82e8775a718..a9d5f0597d6 100644 --- a/ace/Functor_String.inl +++ b/ace/Functor_String.inl @@ -29,7 +29,6 @@ ACE_Less_Than<ACE_CString>::operator () (const ACE_CString &lhs, } -#if defined (ACE_USES_WCHAR) ACE_INLINE unsigned long ACE_Hash<ACE_WString>::operator () (const ACE_WString &t) const { @@ -51,6 +50,5 @@ ACE_Less_Than<ACE_WString>::operator () (const ACE_WString &lhs, return (lhs < rhs); } -#endif /*ACE_USES_WCHAR*/ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp index db472fbbdd6..50e6d4fa07b 100644 --- a/ace/Get_Opt.cpp +++ b/ace/Get_Opt.cpp @@ -6,14 +6,6 @@ #include "ace/Get_Opt.inl" #endif /* __ACE_INLINE__ */ -#include "ace/ACE.h" -#include "ace/Log_Msg.h" -#include "ace/SString.h" -#include "ace/OS_Memory.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_ctype.h" -#include "ace/OS_NS_stdlib.h" - ACE_RCSID (ace, Get_Opt, "$Id$") @@ -87,652 +79,17 @@ ACE_RCSID (ace, * POSSIBILITY OF SUCH DAMAGE. */ +// Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_ALLOC_HOOK_DEFINE(ACE_Get_Opt) - -ACE_Get_Opt::ACE_Get_Opt (int argc, - ACE_TCHAR **argv, - const ACE_TCHAR *optstring, - int skip, - int report_errors, - int ordering, - int long_only) - : argc_ (argc), - argv_ (argv), - optind (skip), - opterr (report_errors), - optarg (0), - optstring_ (0), - long_only_ (long_only), - has_colon_ (0), - last_option_ (0), - nextchar_ (0), - optopt_ (0), - ordering_ (ordering), - nonopt_start_ (optind), - nonopt_end_ (optind), - long_option_ (0) -{ - ACE_TRACE ("ACE_Get_Opt::ACE_Get_Opt"); - - ACE_NEW (this->optstring_, ACE_TString (optstring)); - ACE_NEW (this->last_option_, ACE_TString (ACE_LIB_TEXT (""))); - - // First check to see if POSIXLY_CORRECT was set. - // Win32 is the only platform capable of wide-char env var. -#if defined (ACE_WIN32) - const ACE_TCHAR *env_check = ACE_LIB_TEXT ("POSIXLY_CORRECT"); -#else - const char *env_check = "POSIXLY_CORRECT"; -#endif - if (ACE_OS::getenv (env_check) != 0) - this->ordering_ = REQUIRE_ORDER; - - // Now, check to see if any or the following were passed at - // the begining of optstring: '+' same as POSIXLY_CORRECT; - // '-' turns off POSIXLY_CORRECT; or ':' which signifies we - // should return ':' if a parameter is missing for an option. - // We use a loop here, since a combination of "{+|-}:" in any - // order should be legal. - int done = 0; - int offset = 0; - while (!done) - { - switch (optstring[offset++]) - { - case '+': - this->ordering_ = REQUIRE_ORDER; - break; - case '-': - this->ordering_ = RETURN_IN_ORDER; - break; - case ':': - this->has_colon_ = 1; - break; - default: - // Quit as soon as we see something else... - done = 1; - break; - } - } -} - -ACE_Get_Opt::~ACE_Get_Opt (void) -{ - ACE_TRACE ("ACE_Get_Opt::~ACE_Get_Opt"); - - size_t i = 0; - size_t size = this->long_opts_.size (); - ACE_Get_Opt_Long_Option *option = 0; - for (i = 0; i < size; ++i) - { - int retval = this->long_opts_.get (option, i); - if (retval != 0) - { - // Should never happen. - retval = 0; - continue; - } - if (option) - { - delete option; - option = 0; - } - } - delete this->optstring_; - delete this->last_option_; -} - -int -ACE_Get_Opt::nextchar_i (void) -{ - ACE_TRACE ("ACE_Get_Opt::nextchar_i"); - - if (this->ordering_ == PERMUTE_ARGS) - if (this->permute () == EOF) - return EOF; - - // Update scanning pointer. - if (this->optind >= this->argc_) - { - // We're done... - this->nextchar_ = 0; - return EOF; - } - else if (*(this->nextchar_ = this->argv_[this->optind]) != '-' - || this->nextchar_[1] == '\0') - { - // We didn't get an option. - - if (this->ordering_ == REQUIRE_ORDER - || this->ordering_ == PERMUTE_ARGS) - // If we permuted or require the options to be in order, we're done. - return EOF; - - // It must be RETURN_IN_ORDER... - this->optarg = this->argv_[this->optind++]; - this->nextchar_ = 0; - return 1; - } - else if (this->nextchar_[1] != 0 - && *++this->nextchar_ == '-' - && this->nextchar_[1] == 0) - { - // Found "--" so we're done... - ++this->optind; - this->nextchar_ = 0; - return EOF; - } - - // If it's a long option, and we allow long options advance nextchar_. - if (*this->nextchar_ == '-' && this->long_opts_.size () != 0) - this->nextchar_++; - - return 0; -} - -int -ACE_Get_Opt::long_option_i (void) -{ - ACE_TRACE ("ACE_Get_Opt::long_option_i"); - - ACE_Get_Opt_Long_Option *p; - ACE_TCHAR *s = this->nextchar_; - int hits = 0; - int exact = 0; - ACE_Get_Opt_Long_Option *pfound = 0; - int indfound = 0; - - // Advance to the end of the long option name so we can use - // it to get the length for a string compare. - while (*s && *s != '=') - s++; - - size_t len = s - this->nextchar_; - // set last_option_ to nextchar_, up to the '='. - this->last_option (ACE_TString (this->nextchar_, len)); - - size_t size = this->long_opts_.size (); - u_int option_index = 0; - for (option_index = 0; option_index < size ; option_index++) - { - p = this->long_opts_[option_index]; - ACE_ASSERT (p); - - if (!ACE_OS::strncmp (p->name_, this->nextchar_, len)) - { - // Got at least a partial match. - pfound = p; - indfound = option_index; - hits += 1; - if (len == ACE_OS::strlen(p->name_)) - { - // And in fact, it's an exact match, so let's use it. - exact = 1; - break; - } - } - } - - if ((hits > 1) && !exact) - { - // Great, we found a match, but unfortunately we found more than - // one and it wasn't exact. - if (this->opterr) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: option `%s' is ambiguous\n"), - this->argv_[0], this->argv_[this->optind])); - this->nextchar_ = 0; - this->optind++; - return '?'; - } - - if (pfound != 0) - { - // Okay, we found a good one (either a single hit or an exact match). - option_index = indfound; - this->optind++; - if (*s) - { - // s must point to '=' which means there's an argument (well - // close enough). - if (pfound->has_arg_ != NO_ARG) - // Good, we want an argument and here it is. - this->optarg = ++s; - else - { - // Whoops, we've got what looks like an argument, but we - // don't want one. - if (this->opterr) - ACE_ERROR - ((LM_ERROR, - ACE_LIB_TEXT ("%s: long option `--%s' doesn't allow ") - ACE_LIB_TEXT ("an argument\n"), - this->argv_[0], pfound->name_)); - // The spec doesn't cover this, so we keep going and the program - // doesn't know we ignored an argument if opt_err is off!!! - } - } - else if (pfound->has_arg_ == ARG_REQUIRED) - { - // s didn't help us, but we need an argument. Note that - // optional arguments for long options must use the "=" syntax, - // so we won't get here in that case. - if (this->optind < this->argc_) - // We still have some elements left, so use the next one. - this->optarg = this->argv_[this->optind++]; - else - { - // All out of elements, so we have to punt... - if (this->opterr) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: long option '--%s' requires ") - ACE_LIB_TEXT ("an argument\n"), - this->argv_[0], pfound->name_)); - this->nextchar_ = 0; - this->optopt_ = pfound->val_; // Remember matching short equiv - return this->has_colon_ ? ':' : '?'; - } - } - this->nextchar_ = 0; - this->long_option_ = pfound; - // Since val_ has to be either a valid short option or 0, this works - // great. If the user really wants to know if a long option was passed. - this->optopt_ = pfound->val_; - return pfound->val_; - } - if (!this->long_only_ || this->argv_[this->optind][1] == '-' - || this->optstring_->find (*this->nextchar_) == ACE_TString::npos) - { - // Okay, we couldn't find a long option. If it isn't long_only (which - // means try the long first, and if not found try the short) or a long - // signature was passed, e.g. "--", or it's not a short (not sure when - // this could happen) it's an error. - if (this->opterr) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: illegal long option '--%s'\n"), - this->argv_[0], this->nextchar_)); - this->nextchar_ = 0; - this->optind++; - return '?'; - } - return this->short_option_i (); -} - -int -ACE_Get_Opt::short_option_i (void) -{ - ACE_TRACE ("ACE_Get_Opt::short_option_i"); - - /* Look at and handle the next option-character. */ - ACE_TCHAR opt = *this->nextchar_++; - // Set last_option_ to opt - this->last_option (opt); - - ACE_TCHAR *oli = 0; - oli = - const_cast<ACE_TCHAR*> (ACE_OS::strchr (this->optstring_->c_str (), opt)); - - /* Increment `optind' when we start to process its last character. */ - if (*this->nextchar_ == '\0') - ++this->optind; - - if (oli == 0 || opt == ':') - { - if (this->opterr) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: illegal short option -- %c\n"), - this->argv_[0], opt)); - return '?'; - } - if (opt == 'W' && oli[1] == ';') - { - if (this->nextchar_[0] == 0) - this->nextchar_ = this->argv_[this->optind]; - return long_option_i (); - } - this->optopt_ = oli[0]; // Remember the option that matched - if (oli[1] == ':') - { - if (oli[2] == ':') - { - // Takes an optional argument, and since short option args must - // must follow directly in the same argument, a NULL nextchar_ - // means we didn't get one. - if (*this->nextchar_ != '\0') - { - this->optarg = this->nextchar_; - this->optind++; - } - else - this->optarg = 0; - this->nextchar_ = 0; - } - else - { - // Takes a required argument. - if (*this->nextchar_ != '\0') - { - // Found argument in same argv-element. - this->optarg = this->nextchar_; - this->optind++; - } - else if (this->optind == this->argc_) - { - // Ran out of arguments before finding required argument. - if (this->opterr) - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: short option requires ") - ACE_LIB_TEXT ("an argument -- %c\n"), - this->argv_[0], opt)); - opt = this->has_colon_ ? ':' : '?'; - } - else - // Use the next argv-element as the argument. - this->optarg = this->argv_[this->optind++]; - this->nextchar_ = 0; - } - } - return opt; -} - -int -ACE_Get_Opt::operator () (void) -{ - ACE_TRACE ("ACE_Get_Opt_Long::operator"); - - // First of all, make sure we reinitialize any pointers.. - this->optarg = 0; - this->long_option_ = 0; - - if (this->argv_ == 0) - { - // It can happen, e.g., on VxWorks. - this->optind = 0; - return -1; - } - - // We check this because we can string short options together if the - // preceding one doesn't take an argument. - if (this->nextchar_ == 0 || *this->nextchar_ == '\0') - { - int retval = this->nextchar_i (); - if (retval != 0) - return retval; - } - - if (((this->argv_[this->optind][0] == '-') - && (this->argv_[this->optind][1] == '-')) || this->long_only_) - return this->long_option_i (); - - return this->short_option_i (); -} - -int -ACE_Get_Opt::long_option (const ACE_TCHAR *name, - OPTION_ARG_MODE has_arg) -{ - ACE_TRACE ("ACE_Get_Opt::long_option (const ACE_TCHAR *name, OPTION_ARG_MODE has_arg)"); - return this->long_option (name, 0, has_arg); -} - -int -ACE_Get_Opt::long_option (const ACE_TCHAR *name, - int short_option, - OPTION_ARG_MODE has_arg) -{ - ACE_TRACE ("ACE_Get_Opt::long_option (const ACE_TCHAR *name, int short_option, OPTION_ARG_MODE has_arg)"); - - // We only allow valid alpha-numeric characters as short options. - // If short_options is not a valid alpha-numeric, we can still return it - // when the long option is found, but won't allow the caller to pass it on - // the command line (how could they?). The special case is 0, but since - // we always return it, we let the caller worry about that. -#if defined (_MSC_VER) && (_MSC_VER >= 1300) - // For MSVC 7.x, we need to prevent "illegal" character getting into - // isalnum, otherwise, it will crash the program. - if (short_option > 0 && - short_option < 256 && - ACE_OS::ace_isalnum (static_cast<char> (short_option)) != 0) -#else - if (ACE_OS::ace_isalnum (short_option) != 0) -#endif /* _MSC_VER && _MSC_VER >= 1300 */ - { - // If the short_option already exists, make sure it matches, otherwise - // add it. - ACE_TCHAR *s = 0; - if ((s = const_cast<ACE_TCHAR*> ( - ACE_OS::strchr (this->optstring_->c_str (), - short_option))) != 0) - { - // Short option exists, so verify the argument options - if (s[1] == ':') - { - if (s[2] == ':') - { - if (has_arg != ARG_OPTIONAL) - { - if (this->opterr) - ACE_ERROR - ((LM_ERROR, - ACE_LIB_TEXT ("Existing short option '%c' takes ") - ACE_LIB_TEXT ("optional argument; adding %s ") - ACE_LIB_TEXT ("requires ARG_OPTIONAL\n"), - short_option, name)); - return -1; - } - } - else - if (has_arg != ARG_REQUIRED) - { - if (this->opterr) - ACE_ERROR - ((LM_ERROR, - ACE_LIB_TEXT ("Existing short option '%c' requires ") - ACE_LIB_TEXT ("an argument; adding %s ") - ACE_LIB_TEXT ("requires ARG_REQUIRED\n"), - short_option, name)); - return -1; - } - } - else if (has_arg != NO_ARG) - { - if (this->opterr) - ACE_ERROR - ((LM_ERROR, - ACE_LIB_TEXT ("Existing short option '%c' does not ") - ACE_LIB_TEXT ("accept an argument; adding %s ") - ACE_LIB_TEXT ("requires NO_ARG\n"), - short_option, name)); - return -1; - } - } - else - { - // Didn't find short option, so add it... - *this->optstring_ += (ACE_TCHAR) short_option; - if (has_arg == ARG_REQUIRED) - *this->optstring_ += ACE_LIB_TEXT (":"); - else if (has_arg == ARG_OPTIONAL) - *this->optstring_ += ACE_LIB_TEXT ("::"); - } - } - - ACE_Get_Opt_Long_Option *option = - new ACE_Get_Opt_Long_Option (name, has_arg, short_option); - - if (!option) - return -1; - - // Add to array - size_t size = this->long_opts_.size (); - if (this->long_opts_.size (size + 1) != 0 - || this->long_opts_.set (option, size) != 0) - { - delete option; - ACE_ERROR_RETURN - ((LM_ERROR, ACE_LIB_TEXT ("Could not add long option to array.\n")), - -1); - } - return 0; -} - -const ACE_TCHAR* -ACE_Get_Opt::long_option (void) const -{ - ACE_TRACE ("ACE_Get_Opt::long_option (void)"); - if (this->long_option_) - return this->long_option_->name_; - return 0; -} - -const ACE_TCHAR* -ACE_Get_Opt::last_option (void) const -{ - return this->last_option_->c_str (); -} - -void -ACE_Get_Opt::last_option (const ACE_TString &last_option) -{ - *this->last_option_ = last_option; -} - -void -ACE_Get_Opt::dump (void) const -{ -#if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Get_Opt::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") - ACE_LIB_TEXT ("opstring_ = %s\n") - ACE_LIB_TEXT ("long_only_ = %d\n") - ACE_LIB_TEXT ("has_colon_ = %d\n") - ACE_LIB_TEXT ("last_option_ = %s\n") - ACE_LIB_TEXT ("nextchar_ = %s\n") - ACE_LIB_TEXT ("optopt_ = %c\n") - ACE_LIB_TEXT ("ordering_ = %d\n"), - this->optstring_->c_str (), - this->long_only_, - this->has_colon_, - this->last_option_->c_str (), - this->nextchar_, - this->optopt_, - this->ordering_)); - - // now loop through the - size_t size = this->long_opts_.size (); - for (u_int i = 0; i < size ; ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") - ACE_LIB_TEXT ("long_option name_ = %s\n") - ACE_LIB_TEXT ("has_arg_ = %d\n") - ACE_LIB_TEXT ("val_ = %d\n"), - this->long_opts_[i]->name_, - this->long_opts_[i]->has_arg_, - this->long_opts_[i]->val_)); - } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -#endif /* ACE_HAS_DUMP */ -} - -void -ACE_Get_Opt::permute_args (void) -{ - ACE_TRACE ("ACE_Get_Opt::permute_args"); - - u_long cyclelen, i, j, ncycle, nnonopts, nopts; - u_long opt_end = this->optind; - int cstart, pos = 0; - ACE_TCHAR *swap = 0; - - nnonopts = this->nonopt_end_ - this->nonopt_start_; - nopts = opt_end - this->nonopt_end_; - ncycle = ACE::gcd (nnonopts, nopts); - cyclelen = (opt_end - this->nonopt_start_) / ncycle; - - this->optind = this->optind - nnonopts; - - for (i = 0; i < ncycle; i++) - { - cstart = this->nonopt_end_ + i; - pos = cstart; - for (j = 0; j < cyclelen; j++) - { - if (pos >= this->nonopt_end_) - pos -= nnonopts; - else - pos += nopts; - swap = this->argv_[pos]; - - ((ACE_TCHAR **)this->argv_)[pos] = argv_[cstart]; - - ((ACE_TCHAR **)this->argv_)[cstart] = swap; - } - } -} - -int -ACE_Get_Opt::permute (void) -{ - ACE_TRACE ("ACE_Get_Opt::permute"); - - if (this->nonopt_start_ != this->nonopt_end_ - && this->nonopt_start_ != this->optind) - this->permute_args (); - - this->nonopt_start_ = this->optind; - - // Skip over args untill we find the next option. - while (this->optind < this->argc_ - && (this->argv_[this->optind][0] != '-' - || this->argv_[this->optind][1] == '\0')) - this->optind++; - - // Got an option, so mark this as the end of the non options. - this->nonopt_end_ = this->optind; - - if (this->optind != this->argc_ - && ACE_OS::strcmp (this->argv_[this->optind], - ACE_LIB_TEXT ("--")) == 0) - { - // We found the marker for the end of the options. - this->optind++; - - if (this->nonopt_start_ != this->nonopt_end_ - && this->nonopt_end_ != this->optind) - this->permute_args (); - } - - if (this->optind == this->argc_) - { - if (this->nonopt_start_ != this->nonopt_end_) - this->optind = this->nonopt_start_; - return EOF; - } - return 0; -} - -const ACE_TCHAR * -ACE_Get_Opt::optstring (void) const -{ - return this->optstring_->c_str (); -} - -ACE_Get_Opt::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option ( - const ACE_TCHAR *name, - int has_arg, - int val) - : name_ (ACE::strnew (name)), - has_arg_ (has_arg), - val_ (val) -{} - -ACE_Get_Opt::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void) -{ - delete [] this->name_; -} +/** + * Templates cannot be exported. Only explicit instances can. + * This is also a way to restrict what instances will be + * publicly available. + */ +#if !defined (__ACE_INLINE__) + template class ACE_Get_Arg_Opt< ACE_TCHAR >; +#endif /* __ACE_INLINE__ */ +// Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h index 73a18f6a051..2237dd412f9 100644 --- a/ace/Get_Opt.h +++ b/ace/Get_Opt.h @@ -30,20 +30,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /* * These definitions are for backward compatibility with previous versions. - * of ACE_Get_Opt. + * of ACE_Get_Arg_Opt. */ /** - * @class ACE_Get_Opt + * @class ACE_Get_Arg_Opt * * @brief Iterator for parsing command-line arguments. * * This is a C++ wrapper for getopt(3c) and getopt_long(3c). */ -class ACE_Export ACE_Get_Opt +template < typename CHAR_TYPE = char > +class ACE_Export ACE_Get_Arg_Opt { public: + typedef CHAR_TYPE Char; + typedef ACE_String_Base<Char> String; + /// Mutually exclusive ordering values. enum { @@ -169,16 +173,16 @@ public: * xxx" will only find "xxx" as the argument for @e c if @a optstring is * specified as @c "abc:" not @c "abc::". */ - ACE_Get_Opt (int argc, - ACE_TCHAR **argv, - const ACE_TCHAR *optstring = ACE_LIB_TEXT (""), + ACE_Get_Arg_Opt (int argc, + Char **argv, + const Char *optstring = 0, int skip_args = 1, int report_errors = 0, int ordering = PERMUTE_ARGS, int long_only = 0); /// Default dtor. - ~ACE_Get_Opt (void); + ~ACE_Get_Arg_Opt (void); /** * Scan elements of @a argv (whose length is @a argc) for short option @@ -218,12 +222,14 @@ public: */ int operator () (void); + static int eof(); + /** * For communication from @c operator() to the caller. When * @c operator() finds an option that takes an argument, the argument * value is returned from this method, otherwise it returns 0. */ - ACE_TCHAR *opt_arg (void) const; + Char *opt_arg (void) const; /** * Returns the most recently matched option character. Especially @@ -231,7 +237,7 @@ public: * that's required, since this allows the caller to learn what option * was specified without its required argument. */ - int opt_opt (void); + Char opt_opt (void); /** * Index in @a argv of the next element to be scanned. This is used @@ -258,7 +264,7 @@ public: * @retval 0 Success * @retval -1 The long option can not be added. */ - int long_option (const ACE_TCHAR *name, + int long_option (const Char *name, OPTION_ARG_MODE has_arg = NO_ARG); /// Adds a long option with a corresponding short option. @@ -275,32 +281,32 @@ public: * @retval 0 Success * @retval -1 The long option can not be added. */ - int long_option (const ACE_TCHAR *name, + int long_option (const Char *name, int short_option, OPTION_ARG_MODE has_arg = NO_ARG); /// Returns the name of the long option found on the last call to /// @c operator() or 0 if none was found. - const ACE_TCHAR *long_option (void) const; + const Char *long_option (void) const; /// The number of arguments in the internal @c argv_. int argc (void) const; /// Accessor for the internal @c argv_ pointer. - ACE_TCHAR **argv (void) const; + Char **argv (void) const; /// Accessor for the @c last_option that was processed. This allows /// applications to know if the found option was a short or long /// option, and is especially useful in cases where it was invalid /// and the caller wants to print out the invalid value. - const ACE_TCHAR *last_option (void) const; + const Char *last_option (void) const; /// Dump the state of an object. void dump (void) const; /// Return the @a optstring. This is handy to verify that calls to /// long_option added short options as expected. - const ACE_TCHAR *optstring (void) const; + const Char *optstring (void) const; public: /* @@ -325,7 +331,7 @@ public: * write code that relies on this member being public; use the * @c argv() accessor method instead. */ - ACE_TCHAR **argv_; + Char **argv_; /// Index in @c argv_ of the next element to be scanned. /** @@ -354,18 +360,18 @@ public: * write code that relies on this member being public; use the * @c opt_arg() accessor method instead. */ - ACE_TCHAR *optarg; + Char *optarg; private: /** * @class ACE_Get_Opt_Long_Option This class is for internal use - * in the ACE_Get_Opt class, and is inaccessible to users. + * in the ACE_Get_Arg_Opt class, and is inaccessible to users. */ class ACE_Get_Opt_Long_Option { public: /// ctor - ACE_Get_Opt_Long_Option (const ACE_TCHAR *name, + ACE_Get_Opt_Long_Option (const Char *name, int has_arg, int val = 0); @@ -375,7 +381,7 @@ private: bool operator < (const ACE_Get_Opt_Long_Option &rhs); /// Long option name. - const ACE_TCHAR *name_; + const Char *name_; /// Contains value for <OPTION_ARG_MODE>. int has_arg_; @@ -390,7 +396,7 @@ private: }; /// Updates nextchar_. - int nextchar_i (void); + Char nextchar_i (void); /// Handles long options. int long_option_i (void); @@ -407,16 +413,12 @@ private: int permute (void); /// Set last_option. - void last_option (const ACE_TString &s); - - // Disallow copying and assignment. - ACE_Get_Opt (const ACE_Get_Opt &); - ACE_Get_Opt &operator= (const ACE_Get_Opt &); + void last_option (const String &s); private: /// Holds the option string. - ACE_TString *optstring_; + String *optstring_; /// Treat all options as long options. int long_only_; @@ -428,7 +430,7 @@ private: /// This is the last option, short or long, that was processed. This /// is handy to have in cases where the option passed was invalid. - ACE_TString *last_option_; + String *last_option_; /** * The next char to be scanned in the option-element in which the @@ -437,7 +439,7 @@ private: * If this is zero, or a null string, it means resume the scan * by advancing to the next <argv>-element. */ - ACE_TCHAR *nextchar_; + Char *nextchar_; /// Most recently matched short option character. int optopt_; @@ -462,13 +464,19 @@ private: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; + // Disallow copying and assignment. + ACE_UNIMPLEMENTED_FUNC (ACE_Get_Arg_Opt (const ACE_Get_Arg_Opt<CHAR_TYPE> &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Get_Arg_Opt &operator= (const ACE_Get_Arg_Opt<CHAR_TYPE> &)) }; +typedef ACE_Get_Arg_Opt< ACE_TCHAR > ACE_Get_Opt; + ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "ace/Get_Opt.inl" #endif /* __ACE_INLINE__ */ + #include /**/ "ace/post.h" #endif /* ACE_GET_OPT_H */ diff --git a/ace/Get_Opt.inl b/ace/Get_Opt.inl index cbe5f167e55..f22ce8ec987 100644 --- a/ace/Get_Opt.inl +++ b/ace/Get_Opt.inl @@ -2,40 +2,738 @@ // // $Id$ +#include "ace/ACE.h" +#include "ace/Log_Msg.h" +#include "ace/SString.h" +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_ctype.h" +#include "ace/OS_NS_stdlib.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE bool -ACE_Get_Opt::ACE_Get_Opt_Long_Option::operator < (const ACE_Get_Opt_Long_Option &rhs) +ACE_ALLOC_HOOK_DEFINE(ACE_Get_Arg_Opt) + +template < typename CHAR_TYPE > +ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Arg_Opt (int argc, + Char **argv, + const Char *optstring, + int skip, + int report_errors, + int ordering, + int long_only) + : argc_ (argc), + argv_ (argv), + optind (skip), + opterr (report_errors), + optarg (0), + optstring_ (0), + long_only_ (long_only), + has_colon_ (0), + last_option_ (0), + nextchar_ (0), + optopt_ (0), + ordering_ (ordering), + nonopt_start_ (optind), + nonopt_end_ (optind), + long_option_ (0) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::ACE_Get_Arg_Opt"); + + if ( optstring != 0 ) + ACE_NEW (this->optstring_, String (optstring)); + else + ACE_NEW (this->optstring_, String); + ACE_NEW (this->last_option_, String); + + // First check to see if POSIXLY_CORRECT was set. + // Win32 is the only platform capable of wide-char env var. +#if defined (ACE_WIN32) + const ACE_TCHAR *env_check = ACE_LIB_TEXT ("POSIXLY_CORRECT"); +#else + const char *env_check = "POSIXLY_CORRECT"; +#endif + if (ACE_OS::getenv (env_check) != 0) + this->ordering_ = REQUIRE_ORDER; + + // Now, check to see if any or the following were passed at + // the begining of optstring: '+' same as POSIXLY_CORRECT; + // '-' turns off POSIXLY_CORRECT; or ':' which signifies we + // should return ':' if a parameter is missing for an option. + // We use a loop here, since a combination of "{+|-}:" in any + // order should be legal. + int done = 0; + int offset = 0; + while (!done) + { + switch (optstring[offset++]) + { + case ACE_LIB_TEXT('+'): + this->ordering_ = REQUIRE_ORDER; + break; + case ACE_LIB_TEXT('-'): + this->ordering_ = RETURN_IN_ORDER; + break; + case ACE_LIB_TEXT(':'): + this->has_colon_ = 1; + break; + default: + // Quit as soon as we see something else... + done = 1; + break; + } + } +} + +template < typename CHAR_TYPE > +ACE_Get_Arg_Opt<CHAR_TYPE>::~ACE_Get_Arg_Opt (void) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::~ACE_Get_Arg_Opt"); + + size_t i = 0; + size_t size = this->long_opts_.size (); + ACE_Get_Opt_Long_Option *option = 0; + for (i = 0; i < size; ++i) + { + int retval = this->long_opts_.get (option, i); + if (retval != 0) + { + // Should never happen. + retval = 0; + continue; + } + if (option) + { + delete option; + option = 0; + } + } + delete this->optstring_; + delete this->last_option_; +} + +template < typename CHAR_TYPE > +typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char +ACE_Get_Arg_Opt<CHAR_TYPE>::nextchar_i (void) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::nextchar_i"); + + if (this->ordering_ == PERMUTE_ARGS) + if (this->permute () == eof()) + return eof(); + + // Update scanning pointer. + if (this->optind >= this->argc_) + { + // We're done... + this->nextchar_ = 0; + return eof(); + } + else if (*(this->nextchar_ = this->argv_[this->optind]) != ACE_LIB_TEXT('-') + || this->nextchar_[1] == ACE_LIB_TEXT('\0')) + { + // We didn't get an option. + + if (this->ordering_ == REQUIRE_ORDER + || this->ordering_ == PERMUTE_ARGS) + // If we permuted or require the options to be in order, we're done. + return eof(); + + // It must be RETURN_IN_ORDER... + this->optarg = this->argv_[this->optind++]; + this->nextchar_ = 0; + return 1; + } + else if (this->nextchar_[1] != 0 + && *++this->nextchar_ == ACE_LIB_TEXT('-') + && this->nextchar_[1] == ACE_LIB_TEXT('\0')) + { + // Found "--" so we're done... + ++this->optind; + this->nextchar_ = 0; + return eof(); + } + + // If it's a long option, and we allow long options advance nextchar_. + if (*this->nextchar_ == ACE_LIB_TEXT('-') && this->long_opts_.size () != 0) + this->nextchar_++; + + return ACE_LIB_TEXT('\0'); +} + +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::long_option_i (void) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::long_option_i"); + + ACE_Get_Opt_Long_Option *p; + Char *s = this->nextchar_; + int hits = 0; + int exact = 0; + ACE_Get_Opt_Long_Option *pfound = 0; + int indfound = 0; + + // Advance to the end of the long option name so we can use + // it to get the length for a string compare. + while (*s && *s != ACE_LIB_TEXT('=')) + s++; + + size_t len = s - this->nextchar_; + // set last_option_ to nextchar_, up to the '='. + this->last_option (String (this->nextchar_, len)); + + size_t size = this->long_opts_.size (); + u_int option_index = 0; + for (option_index = 0; option_index < size ; option_index++) + { + p = this->long_opts_[option_index]; + ACE_ASSERT (p); + + if (!ACE_OS::strncmp (p->name_, this->nextchar_, len)) + { + // Got at least a partial match. + pfound = p; + indfound = option_index; + hits += 1; + if (len == ACE_OS::strlen(p->name_)) + { + // And in fact, it's an exact match, so let's use it. + exact = 1; + break; + } + } + } + + if ((hits > 1) && !exact) + { + // Great, we found a match, but unfortunately we found more than + // one and it wasn't exact. + if (this->opterr) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%s: option `%s' is ambiguous\n"), + this->argv_[0], this->argv_[this->optind])); + this->nextchar_ = 0; + this->optind++; + return ACE_LIB_TEXT('?'); + } + + if (pfound != 0) + { + // Okay, we found a good one (either a single hit or an exact match). + option_index = indfound; + this->optind++; + if (*s) + { + // s must point to '=' which means there's an argument (well + // close enough). + if (pfound->has_arg_ != NO_ARG) + // Good, we want an argument and here it is. + this->optarg = ++s; + else + { + // Whoops, we've got what looks like an argument, but we + // don't want one. + if (this->opterr) + ACE_ERROR + ((LM_ERROR, + ACE_LIB_TEXT ("%s: long option `--%s' doesn't allow ") + ACE_LIB_TEXT ("an argument\n"), + this->argv_[0], pfound->name_)); + // The spec doesn't cover this, so we keep going and the program + // doesn't know we ignored an argument if opt_err is off!!! + } + } + else if (pfound->has_arg_ == ARG_REQUIRED) + { + // s didn't help us, but we need an argument. Note that + // optional arguments for long options must use the "=" syntax, + // so we won't get here in that case. + if (this->optind < this->argc_) + // We still have some elements left, so use the next one. + this->optarg = this->argv_[this->optind++]; + else + { + // All out of elements, so we have to punt... + if (this->opterr) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%s: long option '--%s' requires ") + ACE_LIB_TEXT ("an argument\n"), + this->argv_[0], pfound->name_)); + this->nextchar_ = 0; + this->optopt_ = pfound->val_; // Remember matching short equiv + return this->has_colon_ ? ACE_LIB_TEXT(':') : ACE_LIB_TEXT('?'); + } + } + this->nextchar_ = 0; + this->long_option_ = pfound; + // Since val_ has to be either a valid short option or 0, this works + // great. If the user really wants to know if a long option was passed. + this->optopt_ = pfound->val_; + return pfound->val_; + } + if (!this->long_only_ || this->argv_[this->optind][1] == ACE_LIB_TEXT('-') + || this->optstring_->find (*this->nextchar_) == String::npos) + { + // Okay, we couldn't find a long option. If it isn't long_only (which + // means try the long first, and if not found try the short) or a long + // signature was passed, e.g. "--", or it's not a short (not sure when + // this could happen) it's an error. + if (this->opterr) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%s: illegal long option '--%s'\n"), + this->argv_[0], this->nextchar_)); + this->nextchar_ = 0; + this->optind++; + return ACE_LIB_TEXT('?'); + } + return this->short_option_i (); +} + +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::short_option_i (void) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::short_option_i"); + + /* Look at and handle the next option-character. */ + Char opt = *this->nextchar_++; + // Set last_option_ to opt + this->last_option (opt); + + Char *oli = 0; + oli = + const_cast<Char*> (ACE_OS::strchr (this->optstring_->c_str (), opt)); + + /* Increment `optind' when we start to process its last character. */ + if (*this->nextchar_ == ACE_LIB_TEXT('\0')) + ++this->optind; + + if (oli == 0 || opt == ACE_LIB_TEXT(':')) + { + if (this->opterr) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%s: illegal short option -- %c\n"), + this->argv_[0], opt)); + return ACE_LIB_TEXT('?'); + } + if (opt == ACE_LIB_TEXT('W') && oli[1] == ACE_LIB_TEXT(';')) + { + if (this->nextchar_[0] == 0) + this->nextchar_ = this->argv_[this->optind]; + return long_option_i (); + } + this->optopt_ = oli[0]; // Remember the option that matched + if (oli[1] == ACE_LIB_TEXT(':')) + { + if (oli[2] == ACE_LIB_TEXT(':')) + { + // Takes an optional argument, and since short option args must + // must follow directly in the same argument, a NULL nextchar_ + // means we didn't get one. + if (*this->nextchar_ != ACE_LIB_TEXT('\0')) + { + this->optarg = this->nextchar_; + this->optind++; + } + else + this->optarg = 0; + this->nextchar_ = 0; + } + else + { + // Takes a required argument. + if (*this->nextchar_ != ACE_LIB_TEXT('\0')) + { + // Found argument in same argv-element. + this->optarg = this->nextchar_; + this->optind++; + } + else if (this->optind == this->argc_) + { + // Ran out of arguments before finding required argument. + if (this->opterr) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%s: short option requires ") + ACE_LIB_TEXT ("an argument -- %c\n"), + this->argv_[0], opt)); + opt = this->has_colon_ ? ACE_LIB_TEXT(':') : ACE_LIB_TEXT('?'); + } + else + // Use the next argv-element as the argument. + this->optarg = this->argv_[this->optind++]; + this->nextchar_ = 0; + } + } + return opt; +} + +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::operator () (void) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::operator"); + + // First of all, make sure we reinitialize any pointers.. + this->optarg = 0; + this->long_option_ = 0; + + if (this->argv_ == 0) + { + // It can happen, e.g., on VxWorks. + this->optind = 0; + return -1; + } + + // We check this because we can string short options together if the + // preceding one doesn't take an argument. + if (this->nextchar_ == 0 || *this->nextchar_ == ACE_LIB_TEXT('\0')) + { + int retval = this->nextchar_i (); + if (retval != 0) + return retval; + } + + if (((this->argv_[this->optind][0] == ACE_LIB_TEXT('-')) + && (this->argv_[this->optind][1] == ACE_LIB_TEXT('-'))) || this->long_only_) + return this->long_option_i (); + + return this->short_option_i (); +} + +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::long_option (const Char *name, + OPTION_ARG_MODE has_arg) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::long_option (const Char *name, OPTION_ARG_MODE has_arg)"); + return this->long_option (name, 0, has_arg); +} + +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::long_option (const Char *name, + int short_option, + OPTION_ARG_MODE has_arg) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::long_option (const Char *name, int short_option, OPTION_ARG_MODE has_arg)"); + + // We only allow valid alpha-numeric characters as short options. + // If short_options is not a valid alpha-numeric, we can still return it + // when the long option is found, but won't allow the caller to pass it on + // the command line (how could they?). The special case is 0, but since + // we always return it, we let the caller worry about that. +#if defined (_MSC_VER) && (_MSC_VER >= 1300) + // For MSVC 7.x, we need to prevent "illegal" character getting into + // isalnum, otherwise, it will crash the program. + if (short_option > 0 && + short_option < 256 && + ACE_OS::ace_isalnum (short_option) != 0) +#else + if (ACE_OS::ace_isalnum (short_option) != 0) +#endif /* _MSC_VER && _MSC_VER >= 1300 */ + { + // If the short_option already exists, make sure it matches, otherwise + // add it. + Char *s = 0; + if ((s = const_cast<Char*> ( + ACE_OS::strchr (this->optstring_->c_str (), + short_option))) != 0) + { + // Short option exists, so verify the argument options + if (s[1] == ACE_LIB_TEXT(':')) + { + if (s[2] == ACE_LIB_TEXT(':')) + { + if (has_arg != ARG_OPTIONAL) + { + if (this->opterr) + ACE_ERROR + ((LM_ERROR, + ACE_LIB_TEXT ("Existing short option '%c' takes ") + ACE_LIB_TEXT ("optional argument; adding %s ") + ACE_LIB_TEXT ("requires ARG_OPTIONAL\n"), + short_option, name)); + return -1; + } + } + else + if (has_arg != ARG_REQUIRED) + { + if (this->opterr) + ACE_ERROR + ((LM_ERROR, + ACE_LIB_TEXT ("Existing short option '%c' requires ") + ACE_LIB_TEXT ("an argument; adding %s ") + ACE_LIB_TEXT ("requires ARG_REQUIRED\n"), + short_option, name)); + return -1; + } + } + else if (has_arg != NO_ARG) + { + if (this->opterr) + ACE_ERROR + ((LM_ERROR, + ACE_LIB_TEXT ("Existing short option '%c' does not ") + ACE_LIB_TEXT ("accept an argument; adding %s ") + ACE_LIB_TEXT ("requires NO_ARG\n"), + short_option, name)); + return -1; + } + } + else + { + // Didn't find short option, so add it... + *this->optstring_ += (Char) short_option; + if (has_arg == ARG_REQUIRED) + { + Char delim[3] = { ':', '\0' }; + *this->optstring_ += delim; + } + else if (has_arg == ARG_OPTIONAL) + { + Char delim[3] = { ':', ':', '\0' }; + *this->optstring_ += delim; + } + } + } + + ACE_Get_Opt_Long_Option *option = + new ACE_Get_Opt_Long_Option (name, has_arg, short_option); + + if (!option) + return -1; + + // Add to array + size_t size = this->long_opts_.size (); + if (this->long_opts_.size (size + 1) != 0 + || this->long_opts_.set (option, size) != 0) + { + delete option; + ACE_ERROR_RETURN + ((LM_ERROR, ACE_LIB_TEXT ("Could not add long option to array.\n")), + -1); + } + return 0; +} + +template < typename CHAR_TYPE > +const typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char* +ACE_Get_Arg_Opt<CHAR_TYPE>::long_option (void) const +{ + ACE_TRACE ("ACE_Get_Arg_Opt::long_option (void)"); + if (this->long_option_) + return this->long_option_->name_; + return 0; +} + +template < typename CHAR_TYPE > +const typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char* +ACE_Get_Arg_Opt<CHAR_TYPE>::last_option (void) const +{ + return this->last_option_->c_str (); +} + +template < typename CHAR_TYPE > +void +ACE_Get_Arg_Opt<CHAR_TYPE>::last_option (const typename ACE_Get_Arg_Opt<CHAR_TYPE>::String &last_option) +{ + *this->last_option_ = last_option; +} + +template < typename CHAR_TYPE > +void +ACE_Get_Arg_Opt<CHAR_TYPE>::dump (void) const +{ +#if defined (ACE_HAS_DUMP) + ACE_TRACE ("ACE_Get_Arg_Opt::dump"); + + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") + ACE_LIB_TEXT ("opstring_ = %s\n") + ACE_LIB_TEXT ("long_only_ = %d\n") + ACE_LIB_TEXT ("has_colon_ = %d\n") + ACE_LIB_TEXT ("last_option_ = %s\n") + ACE_LIB_TEXT ("nextchar_ = %s\n") + ACE_LIB_TEXT ("optopt_ = %c\n") + ACE_LIB_TEXT ("ordering_ = %d\n"), + this->optstring_->c_str (), + this->long_only_, + this->has_colon_, + this->last_option_->c_str (), + this->nextchar_, + this->optopt_, + this->ordering_)); + + // now loop through the + size_t size = this->long_opts_.size (); + for (u_int i = 0; i < size ; ++i) + { + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") + ACE_LIB_TEXT ("long_option name_ = %s\n") + ACE_LIB_TEXT ("has_arg_ = %d\n") + ACE_LIB_TEXT ("val_ = %d\n"), + this->long_opts_[i]->name_, + this->long_opts_[i]->has_arg_, + this->long_opts_[i]->val_)); + } + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); +#endif /* ACE_HAS_DUMP */ +} + +template < typename CHAR_TYPE > +void +ACE_Get_Arg_Opt<CHAR_TYPE>::permute_args (void) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::permute_args"); + + int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; + Char *swap; + int opt_end = this->optind; + + nnonopts = this->nonopt_end_ - this->nonopt_start_; + nopts = opt_end - this->nonopt_end_; + ncycle = ACE::gcd (nnonopts, nopts); + cyclelen = (opt_end - this->nonopt_start_) / ncycle; + + this->optind = this->optind - nnonopts; + + for (i = 0; i < ncycle; i++) + { + cstart = this->nonopt_end_ + i; + pos = cstart; + for (j = 0; j < cyclelen; j++) + { + if (pos >= this->nonopt_end_) + pos -= nnonopts; + else + pos += nopts; + swap = this->argv_[pos]; + + ((Char **)this->argv_)[pos] = argv_[cstart]; + + ((Char **)this->argv_)[cstart] = swap; + } + } +} + +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::permute (void) +{ + ACE_TRACE ("ACE_Get_Arg_Opt::permute"); + + if (this->nonopt_start_ != this->nonopt_end_ + && this->nonopt_start_ != this->optind) + this->permute_args (); + + this->nonopt_start_ = this->optind; + + // Skip over args untill we find the next option. + while (this->optind < this->argc_ + && (this->argv_[this->optind][0] != ACE_LIB_TEXT('-') + || this->argv_[this->optind][1] == ACE_LIB_TEXT('\0'))) + this->optind++; + + // Got an option, so mark this as the end of the non options. + this->nonopt_end_ = this->optind; + + const Char doubleDash[] = { '-', '-', 0 }; + if (this->optind != this->argc_ + && ACE_OS::strcmp (this->argv_[this->optind], + doubleDash) == 0) + { + // We found the marker for the end of the options. + this->optind++; + + if (this->nonopt_start_ != this->nonopt_end_ + && this->nonopt_end_ != this->optind) + this->permute_args (); + } + + if (this->optind == this->argc_) + { + if (this->nonopt_start_ != this->nonopt_end_) + this->optind = this->nonopt_start_; + return eof(); + } + return 0; +} + +template < typename CHAR_TYPE > +const typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char * +ACE_Get_Arg_Opt<CHAR_TYPE>::optstring (void) const +{ + return this->optstring_->c_str (); +} + +template < typename CHAR_TYPE > +ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option ( + const Char *name, + int has_arg, + int val) + : name_ (ACE::strnew (name)), + has_arg_ (has_arg), + val_ (val) +{} + +template < typename CHAR_TYPE > +ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void) +{ + delete [] this->name_; +} + +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::eof() +{ + // Since EOF may or may not be -1, + // we have to use EOF to maintain + // backwards compatibility. + return EOF; +} + +// Accessors + +template < typename CHAR_TYPE > +bool +ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Opt_Long_Option::operator < (const ACE_Get_Opt_Long_Option &rhs) { return this->name_ < rhs.name_; } -ACE_INLINE int -ACE_Get_Opt::argc (void) const +template < typename CHAR_TYPE > +int +ACE_Get_Arg_Opt<CHAR_TYPE>::argc (void) const { return this->argc_; } -ACE_INLINE ACE_TCHAR ** -ACE_Get_Opt::argv (void) const +template < typename CHAR_TYPE > +typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char ** +ACE_Get_Arg_Opt<CHAR_TYPE>::argv (void) const { return this->argv_; } -ACE_INLINE ACE_TCHAR* -ACE_Get_Opt::opt_arg (void) const +template < typename CHAR_TYPE > +typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char* +ACE_Get_Arg_Opt<CHAR_TYPE>::opt_arg (void) const { return this->optarg; } -ACE_INLINE int -ACE_Get_Opt::opt_opt (void) +template < typename CHAR_TYPE > +typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char +ACE_Get_Arg_Opt<CHAR_TYPE>::opt_opt (void) { return this->optopt_; } -ACE_INLINE int & -ACE_Get_Opt::opt_ind (void) +template < typename CHAR_TYPE > +int & +ACE_Get_Arg_Opt<CHAR_TYPE>::opt_ind (void) { return this->optind; } diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h index 0dce353fa83..2f24a1c3646 100644 --- a/ace/Global_Macros.h +++ b/ace/Global_Macros.h @@ -78,7 +78,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_ITOA(X) #X // Create a string of a server address with a "host:port" format. -# define ACE_SERVER_ADDRESS(H,P) H ACE_TEXT(":") P +# define ACE_SERVER_ADDRESS(H,P) H ACE_LIB_TEXT(":") P // A couple useful inline functions for checking whether bits are // enabled or disabled. diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index 7bfd15db279..e83c6573c9c 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -521,12 +521,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 char *env_value = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (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 4e1bd89cf43..5359ddc70d3 100644 --- a/ace/High_Res_Timer.h +++ b/ace/High_Res_Timer.h @@ -138,8 +138,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/INET_Addr.cpp b/ace/INET_Addr.cpp index 78e0557c9a5..bde2a17ae8e 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -51,7 +51,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], { ACE_OS::sprintf (s, ACE_LIB_TEXT ("%s:%d"), - 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 ()); @@ -220,7 +220,6 @@ ACE_INET_Addr::ACE_INET_Addr (const char address[]) this->set (address); } -#if defined (ACE_HAS_WCHAR) ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[]) : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { @@ -229,8 +228,6 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[]) this->set (address); } -#endif /* ACE_HAS_WCHAR */ - // Copy constructor. ACE_INET_Addr::ACE_INET_Addr (const ACE_INET_Addr &sa) @@ -411,7 +408,7 @@ ACE_INET_Addr::set (const char port_name[], int address_family = PF_UNSPEC; # if defined (ACE_HAS_IPV6) - if (ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(protocol), ACE_LIB_TEXT ("tcp6")) == 0) + if (ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(protocol), ACE_LIB_TEXT ("tcp6")) == 0) address_family = AF_INET6; # endif /* ACE_HAS_IPV6 */ @@ -463,12 +460,11 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), - ACE_TEXT_CHAR_TO_TCHAR ((host_name == 0) ? + ACE_TEXT_TO_TCHAR_IN ((host_name == 0) ? "<unknown>" : host_name))); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ } -#if defined (ACE_HAS_WCHAR) ACE_INET_Addr::ACE_INET_Addr (u_short port_number, const wchar_t host_name[], int address_family) @@ -489,12 +485,11 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), - ACE_TEXT_WCHAR_TO_TCHAR ((host_name == 0) ? + ACE_TEXT_TO_TCHAR_IN ((host_name == 0) ? ACE_TEXT_WIDE ("<unknown>") : host_name))); #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ } -#endif /* ACE_HAS_WCHAR */ // Creates a ACE_INET_Addr from a sockaddr_in structure. @@ -617,7 +612,6 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } -#if defined (ACE_HAS_WCHAR) ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], const wchar_t host_name[], const wchar_t protocol[]) @@ -631,7 +625,6 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } -#endif /* ACE_HAS_WCHAR */ // Creates a ACE_INET_Addr from a PORT_NAME and an Internet address. @@ -649,7 +642,6 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } -#if defined (ACE_HAS_WCHAR) ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], ACE_UINT32 inet_address, const wchar_t protocol[]) @@ -663,7 +655,6 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } -#endif /* ACE_HAS_WCHAR */ ACE_INET_Addr::~ACE_INET_Addr (void) { @@ -702,7 +693,6 @@ ACE_INET_Addr::get_host_name (char hostname[], return result; } -#if defined (ACE_HAS_WCHAR) int ACE_INET_Addr::get_host_name (wchar_t hostname[], size_t len) const @@ -720,12 +710,10 @@ ACE_INET_Addr::get_host_name (wchar_t hostname[], // And copy it over, if successful if (result == 0) - ACE_OS::strcpy (hostname, - ACE_Ascii_To_Wide (char_hostname).wchar_rep ()); + ACE_OS::string_copy( hostname, char_hostname, MAXHOSTNAMELEN + 1 ); return result; } -#endif /* ACE_HAS_WCHAR */ // Return the character representation of the hostname. diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h index 5dbc2e2274c..ab74a1bb276 100644 --- a/ace/INET_Addr.h +++ b/ace/INET_Addr.h @@ -90,7 +90,6 @@ public: ACE_UINT32 ip_addr, const char protocol[] = "tcp"); -#if defined (ACE_HAS_WCHAR) ACE_INET_Addr (u_short port_number, const wchar_t host_name[], int address_family = AF_UNSPEC); @@ -104,7 +103,6 @@ public: ACE_INET_Addr (const wchar_t port_name[], ACE_UINT32 ip_addr, const wchar_t protocol[] = ACE_TEXT_WIDE ("tcp")); -#endif /* ACE_HAS_WCHAR */ /// Default dtor. ~ACE_INET_Addr (void); @@ -172,7 +170,6 @@ public: int set (const sockaddr_in *, int len); -#if defined (ACE_HAS_WCHAR) int set (u_short port_number, const wchar_t host_name[], int encode = 1, @@ -187,7 +184,6 @@ public: const wchar_t protocol[] = ACE_TEXT_WIDE ("tcp")); int set (const wchar_t addr[]); -#endif /* ACE_HAS_WCHAR */ /// Return a pointer to the underlying network address. virtual void *get_addr (void) const; @@ -222,12 +218,6 @@ public: */ virtual int string_to_addr (const char address[]); -#if defined (ACE_HAS_WCHAR) - /* - virtual int string_to_addr (const char address[]); - */ -#endif /* ACE_HAS_WCHAR */ - /** * Sets the port number without affecting the host name. If * <encode> is enabled then <port_number> is converted into network @@ -273,10 +263,8 @@ public: int get_host_name (char hostname[], size_t hostnamelen) const; -#if defined (ACE_HAS_WCHAR) int get_host_name (wchar_t hostname[], size_t hostnamelen) const; -#endif /* ACE_HAS_WCHAR */ /** * Return the character representation of the hostname (this version diff --git a/ace/INET_Addr.inl b/ace/INET_Addr.inl index 583f3a8747e..3fa5c778e5a 100644 --- a/ace/INET_Addr.inl +++ b/ace/INET_Addr.inl @@ -120,7 +120,6 @@ ACE_INET_Addr::operator < (const ACE_INET_Addr &rhs) const && this->get_port_number () < rhs.get_port_number ()); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_INET_Addr::set (u_short port_number, const wchar_t host_name[], @@ -128,7 +127,7 @@ ACE_INET_Addr::set (u_short port_number, int address_family) { return this->set (port_number, - ACE_Wide_To_Ascii (host_name).char_rep (), + ACE_TEXT_TO_CHAR_IN (host_name), encode, address_family); } @@ -138,9 +137,9 @@ ACE_INET_Addr::set (const wchar_t port_name[], const wchar_t host_name[], const wchar_t protocol[]) { - return this->set (ACE_Wide_To_Ascii (port_name).char_rep (), - ACE_Wide_To_Ascii (host_name).char_rep (), - ACE_Wide_To_Ascii (protocol).char_rep ()); + return this->set (ACE_TEXT_TO_CHAR_IN (port_name), + ACE_TEXT_TO_CHAR_IN (host_name), + ACE_TEXT_TO_CHAR_IN (protocol)); } ACE_INLINE int @@ -148,19 +147,17 @@ ACE_INET_Addr::set (const wchar_t port_name[], ACE_UINT32 ip_addr, const wchar_t protocol[]) { - return this->set (ACE_Wide_To_Ascii (port_name).char_rep (), + return this->set (ACE_TEXT_TO_CHAR_IN (port_name), ip_addr, - ACE_Wide_To_Ascii (protocol).char_rep ()); + ACE_TEXT_TO_CHAR_IN (protocol)); } ACE_INLINE int ACE_INET_Addr::set (const wchar_t addr[]) { - return this->set (ACE_Wide_To_Ascii (addr).char_rep ()); + return this->set (ACE_TEXT_TO_CHAR_IN (addr)); } -#endif /* ACE_HAS_WCHAR */ - // Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY. ACE_INLINE bool ACE_INET_Addr::is_any (void) const diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp index 1d3929f710a..b0e4ddfdf2a 100644 --- a/ace/Lib_Find.cpp +++ b/ace/Lib_Find.cpp @@ -319,9 +319,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_Ascii_To_Wide wide_ldpath - (ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (ACE_LD_SEARCH_PATH))); - ld_path = wide_ldpath.wchar_rep (); + 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 */ @@ -562,7 +561,7 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len) } else { - ACE_OS::strcpy (buffer, ACE_TEXT_CHAR_TO_TCHAR (tmpdir)); + ACE_OS::string_copy (buffer, tmpdir, buffer_len); // Add a trailing slash because we cannot assume there is already one // at the end. And having an extra one should not cause problems. @@ -652,7 +651,6 @@ ACE::strsplit_r (char *str, return result; } -#if defined (ACE_HAS_WCHAR) wchar_t * ACE::strsplit_r (wchar_t *str, const wchar_t *token, @@ -702,6 +700,6 @@ ACE::strrepl (wchar_t *s, wchar_t search, wchar_t replace) return replaced; } -#endif /* ACE_HAS_WCHAR */ + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h index 418de3751de..8ca34d44367 100644 --- a/ace/Lib_Find.h +++ b/ace/Lib_Find.h @@ -88,7 +88,6 @@ namespace ACE const char *token, char *&next_start); -#if defined (ACE_HAS_WCHAR) /// As strrepl, but for wide characters. extern ACE_Export size_t strrepl (wchar_t *s, wchar_t search, @@ -98,7 +97,6 @@ namespace ACE extern ACE_Export wchar_t *strsplit_r (wchar_t *s, const wchar_t *token, wchar_t *&next_start); -#endif /* ACE_HAS_WCHAR */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp index 2263d90cb46..1c58e14ae19 100644 --- a/ace/Local_Name_Space.cpp +++ b/ace/Local_Name_Space.cpp @@ -16,7 +16,7 @@ ACE_NS_String::~ACE_NS_String (void) delete [] this->rep_; } -ACE_WCHAR_T * +wchar_t * ACE_NS_String::fast_rep (void) const { ACE_TRACE ("ACE_NS_String::fast_rep"); @@ -27,7 +27,7 @@ ACE_NS_String::operator ACE_NS_WString () const { ACE_TRACE ("ACE_NS_String::operator ACE_NS_WString"); return ACE_NS_WString (this->rep_, - (this->len_ / sizeof (ACE_WCHAR_T)) - 1); + (this->len_ / sizeof (wchar_t)) - 1); } size_t @@ -42,7 +42,7 @@ ACE_NS_String::char_rep (void) const { ACE_TRACE ("ACE_NS_String::char_rep"); ACE_NS_WString w_string (this->rep_, - (this->len_ / sizeof (ACE_WCHAR_T)) - 1); + (this->len_ / sizeof (wchar_t)) - 1); return w_string.char_rep (); } @@ -55,7 +55,7 @@ ACE_NS_String::ACE_NS_String (void) } ACE_NS_String::ACE_NS_String (const ACE_NS_WString &s) - : len_ ((s.length () + 1) * sizeof (ACE_WCHAR_T)), + : len_ ((s.length () + 1) * sizeof (wchar_t)), rep_ (s.rep ()), delete_rep_ (1) { @@ -76,8 +76,8 @@ ACE_NS_String::strstr (const ACE_NS_String &s) const else { // They're smaller than we are... - const size_t len = (this->len_ - s.len_) / sizeof (ACE_WCHAR_T); - const size_t pat_len = s.len_ / sizeof (ACE_WCHAR_T) - 1; + const size_t len = (this->len_ - s.len_) / sizeof (wchar_t); + const size_t pat_len = s.len_ / sizeof (wchar_t) - 1; for (size_t i = 0; i <= len; ++i) { @@ -112,8 +112,8 @@ ACE_NS_String::operator != (const ACE_NS_String &s) const return !this->operator == (s); } -ACE_NS_String::ACE_NS_String (ACE_WCHAR_T *dst, - const ACE_WCHAR_T *src, +ACE_NS_String::ACE_NS_String (wchar_t *dst, + const wchar_t *src, size_t bytes) : len_ (bytes), rep_ (dst), @@ -127,7 +127,7 @@ u_long ACE_NS_String::hash (void) const { return ACE::hash_pjw - (reinterpret_cast<char *> (const_cast<ACE_WCHAR_T *> (this->rep_)), + (reinterpret_cast<char *> (const_cast<wchar_t *> (this->rep_)), this->len_); } diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h index 728ac8afb1c..fbb837824c8 100644 --- a/ace/Local_Name_Space.h +++ b/ace/Local_Name_Space.h @@ -44,8 +44,8 @@ public: ACE_NS_String (void); /// Initialization method. - ACE_NS_String (ACE_WCHAR_T *dst, - const ACE_WCHAR_T *src, + ACE_NS_String (wchar_t *dst, + const wchar_t *src, size_t len); /// Converts an ACE_NS_WString to an ACE_NS_String; @@ -73,7 +73,7 @@ public: size_t len (void) const; /// Returns the underlying representation. - ACE_WCHAR_T *fast_rep (void) const; + wchar_t *fast_rep (void) const; /// Returns a hash value for this string. u_long hash (void) const; @@ -83,7 +83,7 @@ private: size_t len_; /// This actually points into shared/persistent memory. - ACE_WCHAR_T *rep_; + wchar_t *rep_; /// Should rep_ be deleted when destructed (only used /// for WString conversions) diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp index b626f990dbb..87f5e51362e 100644 --- a/ace/Local_Name_Space_T.cpp +++ b/ace/Local_Name_Space_T.cpp @@ -138,8 +138,8 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i ( { ACE_TRACE ("ACE_Local_Name_Space::shared_bind_i"); - const size_t name_len = (name.length () + 1) * sizeof (ACE_WCHAR_T); - const size_t value_len = (value.length () + 1) * sizeof (ACE_WCHAR_T); + const size_t name_len = (name.length () + 1) * sizeof (wchar_t); + const size_t value_len = (value.length () + 1) * sizeof (wchar_t); const size_t type_len = ACE_OS::strlen (type) + 1; const size_t total_len = name_len + value_len + type_len; char *ptr = (char *) this->allocator_->malloc (total_len); @@ -150,12 +150,12 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i ( { // Note that the value_rep *must* come first to make sure we can // retrieve this pointer later on in unbind(). - ACE_WCHAR_T *value_rep = (ACE_WCHAR_T *) (ptr); - ACE_WCHAR_T *name_rep = (ACE_WCHAR_T *) (ptr + value_len); + wchar_t *value_rep = (wchar_t *) (ptr); + wchar_t *name_rep = (wchar_t *) (ptr + value_len); char *new_type = (char *) (ptr + value_len + name_len); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ()); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> value_urep (value.rep ()); ACE_NS_String new_name (name_rep, name_urep.get (), name_len); ACE_NS_String new_value (value_rep, value_urep.get (), value_len); @@ -324,7 +324,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i ( value = nbc_string; // Gets type and then the actual reprsentation which is a - // ACE_WCHAR_T + // wchar_t const char *temp = ns_internal.type (); size_t len = ACE_OS::strlen (ns_internal.type ()); @@ -817,7 +817,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const #endif /* ! ACE_NLOGGING */ ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key=%s\nvalue=%s\ntype=%s\n"), - ACE_TEXT_CHAR_TO_TCHAR (key), ACE_TEXT_CHAR_TO_TCHAR (value), ACE_TEXT_CHAR_TO_TCHAR (type))); + ACE_TEXT_TO_TCHAR_IN (key), ACE_TEXT_TO_TCHAR_IN (value), ACE_TEXT_TO_TCHAR_IN (type))); // We need to delete key and value since char_rep allocates // memory for them delete [] key; diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 6939a455acc..31d32bb6ca4 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -919,8 +919,8 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name, * 'X': print as a hex number * 'w': print a wide character * 'W': print out a wide character string. - * 'z': print an ACE_OS::WChar character - * 'Z': print an ACE_OS::WChar character string + * 'z': print an wchar_t character + * 'Z': print an wchar_t character string * '%': format a single percent sign, '%' */ ssize_t @@ -942,7 +942,6 @@ ACE_Log_Msg::log (ACE_Log_Priority log_priority, return result; } -#if defined (ACE_HAS_WCHAR) /** * Since this is the ANTI_TCHAR version, we need to convert * the format string over. @@ -958,14 +957,13 @@ ACE_Log_Msg::log (ACE_Log_Priority log_priority, va_start (argp, format_str); - ssize_t result = this->log (ACE_TEXT_ANTI_TO_TCHAR (format_str), + ssize_t result = this->log (ACE_TEXT_TO_TCHAR_IN (format_str), log_priority, argp); va_end (argp); return result; } -#endif /* ACE_HAS_WCHAR */ ssize_t ACE_Log_Msg::log (const ACE_TCHAR *format_str, @@ -1200,12 +1198,12 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, this->file () ? - ACE_TEXT_CHAR_TO_TCHAR (this->file ()) + ACE_TEXT_TO_TCHAR_IN (this->file ()) : ACE_LIB_TEXT ("<unknown file>")); else this_len = ACE_OS::sprintf (bp, format, this->file () ? - ACE_TEXT_CHAR_TO_TCHAR (this->file ()) + ACE_TEXT_TO_TCHAR_IN (this->file ()) : ACE_LIB_TEXT ("<unknown file>")); ACE_UPDATE_COUNT (bspace, this_len); break; @@ -1261,11 +1259,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, ACE_TCHAR *), - ACE_TEXT_CHAR_TO_TCHAR (msg)); + ACE_TEXT_TO_TCHAR_IN (msg)); else this_len = ACE_OS::sprintf (bp, format, va_arg (argp, ACE_TCHAR *), - ACE_TEXT_CHAR_TO_TCHAR (msg)); + ACE_TEXT_TO_TCHAR_IN (msg)); #if defined (ACE_WIN32) } else @@ -1369,10 +1367,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #endif if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, format, ACE_TEXT_CHAR_TO_TCHAR (msg)); + (bp, bspace, format, ACE_TEXT_TO_TCHAR_IN (msg)); else this_len = ACE_OS::sprintf - (bp, format, ACE_TEXT_CHAR_TO_TCHAR (msg)); + (bp, format, ACE_TEXT_TO_TCHAR_IN (msg)); #if defined (ACE_WIN32) } else @@ -1716,26 +1714,30 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # else /* ACE_USES_WCHAR */ ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); # endif /* ACE_USES_WCHAR */ + if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wstr ? wstr : ACE_LIB_TEXT ("(null)")); else this_len = ACE_OS::sprintf (bp, format, wstr ? wstr : ACE_LIB_TEXT ("(null)")); -#elif defined (ACE_HAS_WCHAR) + +#else wchar_t *wchar_str = va_arg (argp, wchar_t *); + # if defined (HPUX) ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); # else ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); # endif /* HPUX */ + if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wchar_str); else this_len = ACE_OS::sprintf (bp, format, wchar_str); -#endif /* ACE_WIN32 / ACE_HAS_WCHAR */ +#endif /* ACE_WIN32 */ ACE_UPDATE_COUNT (bspace, this_len); } break; @@ -1777,7 +1779,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_UPDATE_COUNT (bspace, this_len); break; - case 'z': // ACE_OS::WChar character + case 'z': // wchar_t character { // On some platforms sizeof (wchar_t) can be 2 // on the others 4 ... @@ -1806,14 +1808,14 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; } - case 'Z': // ACE_OS::WChar character string + case 'Z': // wchar_t character string { - ACE_OS::WChar *wchar_str = va_arg (argp, ACE_OS::WChar*); + wchar_t *wchar_str = va_arg (argp, wchar_t*); if (wchar_str == 0) break; wchar_t *wchar_t_str = 0; - if (sizeof (ACE_OS::WChar) != sizeof (wchar_t)) + if (sizeof (wchar_t) != sizeof (wchar_t)) { size_t len = ACE_OS::wslen (wchar_str) + 1; ACE_NEW_NORETURN(wchar_t_str, wchar_t[len]); @@ -1836,19 +1838,19 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # else /* ACE_USES_WCHAR */ ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); # endif /* ACE_USES_WCHAR */ -#elif defined (ACE_HAS_WCHAR) +#else # if defined (HPUX) ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); # else ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); # endif /* HPUX */ -#endif /* ACE_WIN32 / ACE_HAS_WCHAR */ +#endif /* ACE_WIN32 */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wchar_t_str); else this_len = ACE_OS::sprintf (bp, format, wchar_t_str); - if(sizeof(ACE_OS::WChar) != sizeof(wchar_t)) + if(sizeof(wchar_t) != sizeof(wchar_t)) { delete wchar_t_str; } @@ -2581,7 +2583,6 @@ ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority, return this->log_priority_enabled (log_priority); } -#if defined (ACE_USES_WCHAR) int ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority, const wchar_t *, @@ -2589,7 +2590,6 @@ ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority, { return this->log_priority_enabled (log_priority); } -#endif /* ACE_USES_WCHAR */ // **************************************************************** diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index d1adb4cdc20..40811d66d99 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -425,7 +425,6 @@ public: const char *, ...); -#if defined (ACE_USES_WCHAR) // We are not using ACE_TCHAR for this since ACE_HEX_DUMP // doesn't take in a ACE_TCHAR. log_hexdump takes in a char // string, so this must be able to take in a char string even @@ -434,7 +433,6 @@ public: int log_priority_enabled (ACE_Log_Priority log_priority, const wchar_t *, ...); -#endif /* ACE_USES_WCHAR */ /// Optimize reading of the pid (avoids a system call if the value is /// cached...). @@ -504,15 +502,13 @@ public: * - 'W': print a wide character string * - 'x': print as a hex number * - 'X': print as a hex number - * - 'z': print an ACE_OS::WChar character - * - 'Z': print an ACE_OS::WChar character string + * - 'z': print an wchar_t character + * - 'Z': print an wchar_t character string * - '%': print out a single percent sign, '%' */ - ssize_t log (ACE_Log_Priority priority, const ACE_TCHAR *format, ...); + ssize_t log (ACE_Log_Priority priority, const char *format, ...); -#if defined (ACE_HAS_WCHAR) - ssize_t log (ACE_Log_Priority priority, const ACE_ANTI_TCHAR *format, ...); -#endif /* ACE_HAS_WCHAR */ + ssize_t log (ACE_Log_Priority priority, const wchar_t *format, ...); /** * An alternative logging mechanism that makes it possible to diff --git a/ace/Log_Msg_UNIX_Syslog.cpp b/ace/Log_Msg_UNIX_Syslog.cpp index 23b90ef3c34..55adf75791b 100644 --- a/ace/Log_Msg_UNIX_Syslog.cpp +++ b/ace/Log_Msg_UNIX_Syslog.cpp @@ -43,15 +43,10 @@ ACE_Log_Msg_UNIX_Syslog::open (const ACE_TCHAR * logger_key) // options LOG_CONS and LOG_PID to be set. There really should be a // logging strategy option to control the syslog log options, // however, we'll take the easy way out for now. -#if defined (ACE_USES_WCHAR) - openlog (ACE_TEXT_ALWAYS_CHAR (logger_key), + // const_cast? + ::openlog (const_cast<char *>(ACE_TEXT_TO_CHAR_IN(logger_key)), LOG_CONS|LOG_PID, ACE_DEFAULT_SYSLOG_FACILITY); -#else - openlog (const_cast<char *> (logger_key), - LOG_CONS|LOG_PID, - ACE_DEFAULT_SYSLOG_FACILITY); -#endif /* ACE_USES_WCHAR */ // Enable logging of all syslog priorities. If logging of all // priorities is not desired, use the ACE_Log_Msg::priority_mask() @@ -117,12 +112,12 @@ ACE_Log_Msg_UNIX_Syslog::log (ACE_Log_Record &log_record) ACE_Log_Record::priority_name(ACE_Log_Priority(log_record.type())); syslog (syslog_priority, "%s: %s: %s", - ACE_TEXT_ALWAYS_CHAR (date_and_time), - ACE_TEXT_ALWAYS_CHAR (prio_name), - ACE_TEXT_ALWAYS_CHAR (line)); + ACE_TEXT_TO_CHAR_IN (date_and_time), + ACE_TEXT_TO_CHAR_IN (prio_name), + ACE_TEXT_TO_CHAR_IN (line)); } else // No formatting required. - syslog (syslog_priority, "%s", ACE_TEXT_ALWAYS_CHAR (line)); + syslog (syslog_priority, "%s", ACE_TEXT_TO_CHAR_IN (line)); } return 0; diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index 3239252a00e..2fed56760da 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -299,7 +299,7 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[], if (result == 0) { // Since ostream expects only chars, we cannot pass wchar_t's - s << ACE_TEXT_ALWAYS_CHAR (verbose_msg); + s << ACE_TEXT_TO_CHAR_IN (verbose_msg); s.flush (); } diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp index 8e393a81e31..36033e2d60e 100644 --- a/ace/Logging_Strategy.cpp +++ b/ace/Logging_Strategy.cpp @@ -154,7 +154,7 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[]) this->interval_ = ACE_DEFAULT_LOGFILE_POLL_INTERVAL; this->max_size_ = 0; - ACE_Get_Opt get_opt (argc, argv, + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_LIB_TEXT ("f:i:k:m:n:N:op:s:t:w"), 0); for (int c; (c = get_opt ()) != -1; ) @@ -346,7 +346,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[]) { ACE_NEW_RETURN (output_file, - ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_)), + ofstream (ACE_TEXT_TO_CHAR_IN (this->filename_)), -1); delete_ostream = 1; } @@ -354,7 +354,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[]) { ACE_NEW_RETURN (output_file, - ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_), + ofstream (ACE_TEXT_TO_CHAR_IN (this->filename_), ios::app | ios::out), -1); delete_ostream = 1; @@ -439,7 +439,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, this->log_msg_->msg_ostream (output_file); #else - output_file->open (ACE_TEXT_ALWAYS_CHAR (this->filename_), + output_file->open (ACE_TEXT_TO_CHAR_IN (this->filename_), ios::out); #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ @@ -532,7 +532,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, this->log_msg_->msg_ostream (output_file); #else - output_file->open (ACE_TEXT_ALWAYS_CHAR (this->filename_), + output_file->open (ACE_TEXT_TO_CHAR_IN (this->filename_), ios::out); #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp index a2e33cedc81..f5155b9d961 100644 --- a/ace/MEM_Connector.cpp +++ b/ace/MEM_Connector.cpp @@ -73,9 +73,9 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, ACE_LIB_TEXT ("(%P|%t) MEM_Connector can't connect ") ACE_LIB_TEXT ("to %s:%d which is not a local endpoint ") ACE_LIB_TEXT ("(local address is %s:%d)\n"), - ACE_TEXT_CHAR_TO_TCHAR (remote_sap.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (remote_sap.get_host_name ()), remote_sap.get_port_number (), - ACE_TEXT_CHAR_TO_TCHAR (this->address_.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (this->address_.get_host_name ()), this->address_.get_port_number ()), -1); else diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index d59436ac2b6..86560f5cea8 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -294,19 +294,17 @@ ACE_Allocator_Adapter<MALLOC>::protect (void *addr, size_t len, int flags) template <class MALLOC> ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const char *pool_name) - : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name)) + : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name)) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } -#if defined (ACE_HAS_WCHAR) template <class MALLOC> ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const wchar_t *pool_name) - : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name)) + : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name)) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } -#endif /* ACE_HAS_WCHAR */ template <class MALLOC> ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void) diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index 021a13c2e58..79c92dfe99e 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -238,14 +238,13 @@ public: ACE_Allocator_Adapter (const char *pool_name, const char *lock_name, MEMORY_POOL_OPTIONS options = 0) - : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name), - ACE_TEXT_CHAR_TO_TCHAR (lock_name), + : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name), + ACE_TEXT_TO_TCHAR_IN (lock_name), options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } -#if defined (ACE_HAS_WCHAR) /** * Note that @a pool_name should be located in * a directory with the appropriate visibility and protection so @@ -261,13 +260,12 @@ public: ACE_Allocator_Adapter (const wchar_t *pool_name, const wchar_t *lock_name, MEMORY_POOL_OPTIONS options = 0) - : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name), - ACE_TEXT_WCHAR_TO_TCHAR (lock_name), + : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name), + ACE_TEXT_TO_TCHAR_IN (lock_name), options) { ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } -#endif /* ACE_HAS_WCHAR */ /// Destructor. virtual ~ACE_Allocator_Adapter (void); diff --git a/ace/Manual_Event.cpp b/ace/Manual_Event.cpp index 57543a6d840..5acefac1109 100644 --- a/ace/Manual_Event.cpp +++ b/ace/Manual_Event.cpp @@ -18,12 +18,11 @@ ACE_Manual_Event::ACE_Manual_Event (int initial_state, : ACE_Event (1, initial_state, type, - ACE_TEXT_CHAR_TO_TCHAR (name), + ACE_TEXT_TO_TCHAR_IN (name), arg) { } -#if defined (ACE_HAS_WCHAR) ACE_Manual_Event::ACE_Manual_Event (int initial_state, int type, const wchar_t *name, @@ -31,11 +30,10 @@ ACE_Manual_Event::ACE_Manual_Event (int initial_state, : ACE_Event (1, initial_state, type, - ACE_TEXT_WCHAR_TO_TCHAR (name), + ACE_TEXT_TO_TCHAR_IN (name), arg) { } -#endif /* ACE_HAS_WCHAR */ void ACE_Manual_Event::dump (void) const diff --git a/ace/Manual_Event.h b/ace/Manual_Event.h index 77de173788e..fd3b5743188 100644 --- a/ace/Manual_Event.h +++ b/ace/Manual_Event.h @@ -45,13 +45,11 @@ public: const char *name = 0, void *arg = 0); -#if defined (ACE_HAS_WCHAR) /// constructor which will create manual event (wchar_t version) ACE_Manual_Event (int initial_state, int type, const wchar_t *name, void *arg = 0); -#endif /* ACE_HAS_WCHAR */ /// Default dtor. ~ACE_Manual_Event (void); diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp index 152127daeb4..a24f98957e3 100644 --- a/ace/Multihomed_INET_Addr.cpp +++ b/ace/Multihomed_INET_Addr.cpp @@ -55,7 +55,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, if (ret) { ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), - ACE_TEXT_CHAR_TO_TCHAR (secondary_host_names[i]), port_number)); + ACE_TEXT_TO_TCHAR_IN (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } else @@ -66,7 +66,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, return; } -#if defined (ACE_HAS_WCHAR) ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, const wchar_t host_name[], int encode, @@ -91,7 +90,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, if (ret) { ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), - ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number)); + ACE_TEXT_TO_TCHAR_IN (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } else @@ -101,7 +100,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, return; } -#endif /* ACE_HAS_WCHAR */ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, ACE_UINT32 primary_ip_addr, @@ -162,7 +160,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, return ACE_INET_Addr::set(port_number, host_name, encode, address_family); } -#if defined (ACE_HAS_WCHAR) // // WCHAR version of ::set // @@ -189,7 +186,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, return ACE_INET_Addr::set(port_number, host_name, encode, address_family); } -#endif /* ACE_HAS_WCHAR */ int ACE_Multihomed_INET_Addr::set (u_short port_number, diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h index a7a838395db..75799cf0077 100644 --- a/ace/Multihomed_INET_Addr.h +++ b/ace/Multihomed_INET_Addr.h @@ -81,7 +81,6 @@ public: const ACE_UINT32 *secondary_ip_addrs = 0, size_t size = 0); -#if defined (ACE_HAS_WCHAR) /** * WCHAR versions of the methods that take char's as arguments. */ @@ -98,8 +97,6 @@ public: const wchar_t *(secondary_host_names[]) = 0, size_t size = 0); -#endif /* ACE_HAS_WCHAR */ - /// Use compiler-generated copy constructor. /// Use compiler-generated assignment operator. diff --git a/ace/Mutex.h b/ace/Mutex.h index 278e0a9ab9d..61d4db02491 100644 --- a/ace/Mutex.h +++ b/ace/Mutex.h @@ -29,10 +29,7 @@ # define ACE_DEFAULT_MUTEX_A "ACE_MUTEX" # endif /* ACE_DEFAULT_MUTEX_A */ -# if defined (ACE_HAS_WCHAR) -# define ACE_DEFAULT_MUTEX_W ACE_TEXT_WIDE(ACE_DEFAULT_MUTEX_A) -# endif /* ACE_HAS_WCHAR */ - +# define ACE_DEFAULT_MUTEX_W ACE_TEXT_WIDE(ACE_DEFAULT_MUTEX_A) # define ACE_DEFAULT_MUTEX ACE_LIB_TEXT (ACE_DEFAULT_MUTEX_A) ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ace/NT_Service.h b/ace/NT_Service.h index 6eba99986a4..99fc0f1f2ec 100644 --- a/ace/NT_Service.h +++ b/ace/NT_Service.h @@ -420,7 +420,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ #define ACE_NT_SERVICE_RUN(SVCNAME, SVCINSTANCE, RET) \ ACE_TEXT_SERVICE_TABLE_ENTRY _ace_nt_svc_table[2] = \ { \ - ACE_NT_SERVICE_ENTRY(ACE_TEXT (#SVCNAME), SVCNAME), \ + ACE_NT_SERVICE_ENTRY(ACE_LIB_TEXT (#SVCNAME), SVCNAME), \ { 0, 0 } \ }; \ _ace_nt_svc_obj_##SVCNAME = SVCINSTANCE; \ diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp index f92bbf3c15d..7cee855d644 100644 --- a/ace/Name_Request_Reply.cpp +++ b/ace/Name_Request_Reply.cpp @@ -21,9 +21,9 @@ ACE_Name_Request::ACE_Name_Request (void) ACE_Name_Request::ACE_Name_Request ( ACE_INT32 t, // Type of request. - const ACE_WCHAR_T name[], // Name + const wchar_t name[], // Name const ACE_UINT32 name_length, // size in bytes - const ACE_WCHAR_T value[], // + const wchar_t value[], // const ACE_UINT32 value_length, // size in bytes const char type[], // const ACE_UINT32 type_length, // size in bytes @@ -52,8 +52,8 @@ ACE_Name_Request::ACE_Name_Request ( // Set up pointers and copy name value and type into request. this->name_ = this->transfer_.data_; - this->value_ = &this->name_[name_length / sizeof (ACE_WCHAR_T) ]; - this->type_ = (char *)(&this->value_[value_length / sizeof (ACE_WCHAR_T)]); // + this->value_ = &this->name_[name_length / sizeof (wchar_t) ]; + this->type_ = (char *)(&this->value_[value_length / sizeof (wchar_t)]); // (void) ACE_OS::memcpy (this->name_, name, @@ -199,7 +199,7 @@ ACE_Name_Request::timeout (const ACE_Time_Value timeout) // = Set/get the name -const ACE_WCHAR_T * +const wchar_t * ACE_Name_Request::name (void) const { ACE_TRACE ("ACE_Name_Request::name"); @@ -207,7 +207,7 @@ ACE_Name_Request::name (void) const } void -ACE_Name_Request::name (const ACE_WCHAR_T *t) +ACE_Name_Request::name (const wchar_t *t) { ACE_TRACE ("ACE_Name_Request::name"); (void) ACE_OS::memcpy (this->name_, @@ -217,7 +217,7 @@ ACE_Name_Request::name (const ACE_WCHAR_T *t) // = Set/get the value -const ACE_WCHAR_T * +const wchar_t * ACE_Name_Request::value (void) const { ACE_TRACE ("ACE_Name_Request::value"); @@ -225,7 +225,7 @@ ACE_Name_Request::value (void) const } void -ACE_Name_Request::value (const ACE_WCHAR_T *c) +ACE_Name_Request::value (const wchar_t *c) { ACE_TRACE ("ACE_Name_Request::value"); @@ -265,7 +265,7 @@ ACE_Name_Request::encode (void *&buf) size_t nv_data_len = (this->transfer_.name_len_ + this->transfer_.value_len_) - / sizeof (ACE_WCHAR_T); + / sizeof (wchar_t); for (size_t i = 0; i < nv_data_len; i++) this->transfer_.data_[i] = @@ -303,15 +303,15 @@ ACE_Name_Request::decode (void) size_t nv_data_len = (this->transfer_.name_len_ + this->transfer_.value_len_) - / sizeof (ACE_WCHAR_T); + / sizeof (wchar_t); for (size_t i = 0; i < nv_data_len; i++) this->transfer_.data_[i] = ntohs (this->transfer_.data_[i]); this->name_ = this->transfer_.data_; - this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (ACE_WCHAR_T)]; - this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (ACE_WCHAR_T)]); + this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (wchar_t)]; + this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (wchar_t)]); this->type_[this->transfer_.type_len_] = '\0'; // Decode the variable-sized portion. diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h index 07e4b61d95b..cb9173cd7bc 100644 --- a/ace/Name_Request_Reply.h +++ b/ace/Name_Request_Reply.h @@ -73,9 +73,9 @@ public: /// Create a ACE_Name_Request message. ACE_Name_Request (ACE_INT32 msg_type, // Type of request. - const ACE_WCHAR_T name[], // + const wchar_t name[], // const ACE_UINT32 name_length, - const ACE_WCHAR_T value[], + const wchar_t value[], const ACE_UINT32 value_length, const char type[], const ACE_UINT32 type_length, @@ -102,12 +102,12 @@ public: void timeout (const ACE_Time_Value timeout); // = Set/get the name - const ACE_WCHAR_T *name (void) const; - void name (const ACE_WCHAR_T *); + const wchar_t *name (void) const; + void name (const wchar_t *); // = Set/get the value - const ACE_WCHAR_T *value (void) const; - void value (const ACE_WCHAR_T *); + const wchar_t *value (void) const; + void value (const wchar_t *); // = Set/get the type const char *type (void) const; @@ -169,17 +169,17 @@ private: /// The data portion contains the <name_> /// followed by the <value_> /// followed by the <type_>. - ACE_WCHAR_T data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2]; + wchar_t data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2]; }; /// Transfer buffer. Transfer transfer_; /// Pointer to the beginning of the name in this->data_. - ACE_WCHAR_T *name_; + wchar_t *name_; /// Pointer to the beginning of the value in this->data_; - ACE_WCHAR_T *value_; + wchar_t *value_; /// Pointer to the beginning of the type in this->data_; char *type_; diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index 596d4aa3aed..b7ad702ac54 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -600,7 +600,7 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) // clean it up in the destructor). this->database (this->process_name ()); - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("b:c:dh:l:P:p:s:T:vr")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_LIB_TEXT ("b:c:dh:l:P:p:s:T:vr")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp index c855adb7729..e3452744928 100644 --- a/ace/OS_NS_Thread.cpp +++ b/ace/OS_NS_Thread.cpp @@ -1318,7 +1318,6 @@ ACE_OS::cond_init (ACE_cond_t *cv, ACE_OS::cond_init (cv, static_cast<short> (attributes.type), name, arg); } -# if defined (ACE_HAS_WCHAR) int ACE_OS::cond_init (ACE_cond_t *cv, ACE_condattr_t &attributes, @@ -1327,7 +1326,6 @@ ACE_OS::cond_init (ACE_cond_t *cv, return ACE_OS::cond_init (cv, static_cast<short> (attributes.type), name, arg); } -# endif /* ACE_HAS_WCHAR */ int ACE_OS::cond_init (ACE_cond_t *cv, short type, const char *name, void *arg) @@ -1358,7 +1356,6 @@ ACE_OS::cond_init (ACE_cond_t *cv, short type, const char *name, void *arg) # endif /* ACE_HAS_THREADS */ } -# if defined (ACE_HAS_WCHAR) int ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg) { @@ -1387,7 +1384,6 @@ ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg) ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_THREADS */ } -# endif /* ACE_HAS_WCHAR */ int ACE_OS::cond_signal (ACE_cond_t *cv) @@ -1999,7 +1995,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ::CreateMutexW (ACE_OS::default_win32_security_attributes_r (sa, &sa_buffer, &sd_buffer), FALSE, - ACE_Ascii_To_Wide (name).wchar_rep ()); + ACE_TEXT_TO_WCHAR_IN (name)); # else /* ACE_HAS_WINCE */ m->proc_mutex_ = ::CreateMutexA (ACE_OS::default_win32_security_attributes_r @@ -2152,7 +2148,6 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m) #endif /* ACE_HAS_THREADS */ } -#if defined (ACE_HAS_WCHAR) int ACE_OS::mutex_init (ACE_mutex_t *m, int lock_scope, @@ -2189,13 +2184,12 @@ ACE_OS::mutex_init (ACE_mutex_t *m, #else /* ACE_HAS_THREADS && ACE_HAS_WTHREADS */ return ACE_OS::mutex_init (m, lock_scope, - ACE_Wide_To_Ascii (name).char_rep (), + ACE_TEXT_TO_CHAR_IN (name), attributes, sa, lock_type); #endif /* ACE_HAS_THREADS && ACE_HAS_WTHREADS */ } -#endif /* ACE_HAS_WCHAR */ int ACE_OS::mutex_lock (ACE_mutex_t *m) @@ -2663,7 +2657,7 @@ ACE_OS::event_destroy (ACE_event_t *event) # endif ACE_OS::munmap (event->eventdata_, sizeof (ACE_eventdata_t)); - ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR(event->name_)); + ACE_OS::shm_unlink (ACE_TEXT_TO_TCHAR_IN(event->name_)); ACE_OS::free (event->name_); return r1 != 0 || r2 != 0 ? -1 : 0; } @@ -2752,7 +2746,7 @@ ACE_OS::event_init (ACE_event_t *event, (sa, &sa_buffer, &sd_buffer), manual_reset, initial_state, - ACE_Ascii_To_Wide (name).wchar_rep ()); + ACE_TEXT_TO_WCHAR_IN (name)); # else /* ACE_HAS_WINCE */ *event = ::CreateEventA (ACE_OS::default_win32_security_attributes_r (sa, &sa_buffer, &sd_buffer), @@ -2773,13 +2767,13 @@ ACE_OS::event_init (ACE_event_t *event, { int owner = 0; // Let's see if the shared memory entity already exists. - ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name), + ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN (name), O_RDWR | O_CREAT | O_EXCL, ACE_DEFAULT_FILE_PERMS); if (fd == ACE_INVALID_HANDLE) { if (errno == EEXIST) - fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name), + fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN (name), O_RDWR | O_CREAT, ACE_DEFAULT_FILE_PERMS); if (fd == ACE_INVALID_HANDLE) // Still can't get it. @@ -2807,7 +2801,7 @@ ACE_OS::event_init (ACE_event_t *event, if (evtdata == MAP_FAILED) { if (owner) - ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name)); + ACE_OS::shm_unlink (ACE_TEXT_TO_TCHAR_IN (name)); return -1; } @@ -2816,7 +2810,7 @@ ACE_OS::event_init (ACE_event_t *event, event->name_ = ACE_OS::strdup (name); if (event->name_ == 0) { - ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name)); + ACE_OS::shm_unlink (ACE_TEXT_TO_TCHAR_IN (name)); return -1; } event->eventdata_ = evtdata; @@ -5540,7 +5534,6 @@ ACE_OS::unique_name (const void *object, length); } -#if defined (ACE_USES_WCHAR) void ACE_OS::unique_name (const void *object, wchar_t *name, @@ -5553,14 +5546,13 @@ ACE_OS::unique_name (const void *object, // <object>. wchar_t temp_name[ACE_UNIQUE_NAME_LEN]; ACE_OS::sprintf (temp_name, - ACE_LIB_TEXT ("%p%d"), + ACE_TEXT_WIDE ("%p%d"), object, static_cast <int> (ACE_OS::getpid ())); ACE_OS::strsncpy (name, temp_name, length); } -#endif ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h index db28de9ae00..9274b5212a7 100644 --- a/ace/OS_NS_Thread.h +++ b/ace/OS_NS_Thread.h @@ -1272,7 +1272,6 @@ namespace ACE_OS { const char *name = 0, void *arg = 0); -# if defined (ACE_HAS_WCHAR) # if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS) extern ACE_Export # else @@ -1292,7 +1291,6 @@ namespace ACE_OS { ACE_condattr_t &attributes, const wchar_t *name, void *arg = 0); -# endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS) extern ACE_Export @@ -1351,7 +1349,6 @@ namespace ACE_OS { void *arg = 0, LPSECURITY_ATTRIBUTES sa = 0); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int event_init (ACE_event_t *event, int manual_reset, @@ -1360,7 +1357,6 @@ namespace ACE_OS { const wchar_t *name, void *arg = 0, LPSECURITY_ATTRIBUTES sa = 0); -# endif /* ACE_HAS_WCHAR */ extern ACE_Export int event_pulse (ACE_event_t *event); @@ -1401,7 +1397,6 @@ namespace ACE_OS { LPSECURITY_ATTRIBUTES sa = 0, int lock_type = 0); -#if defined (ACE_HAS_WCHAR) extern ACE_Export int mutex_init (ACE_mutex_t *m, int lock_scope, @@ -1409,7 +1404,6 @@ namespace ACE_OS { ACE_mutexattr_t *arg = 0, LPSECURITY_ATTRIBUTES sa = 0, int lock_type = 0); -#endif /* ACE_HAS_WCHAR */ /// Win32 note: Abandoned mutexes are not treated differently. 0 is /// returned since the calling thread does get the ownership. @@ -1566,7 +1560,6 @@ namespace ACE_OS { int max = 0x7fffffff, LPSECURITY_ATTRIBUTES sa = 0); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int sema_init (ACE_sema_t *s, u_int count, @@ -1575,7 +1568,6 @@ namespace ACE_OS { void *arg = 0, int max = 0x7fffffff, LPSECURITY_ATTRIBUTES sa = 0); -# endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int sema_post (ACE_sema_t *s); @@ -1887,13 +1879,11 @@ namespace ACE_OS { const char *name = 0, ACE_mutexattr_t *arg = 0); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int thread_mutex_init (ACE_thread_mutex_t *m, int lock_type, const wchar_t *name, ACE_mutexattr_t *arg = 0); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int thread_mutex_lock (ACE_thread_mutex_t *m); @@ -1926,12 +1916,12 @@ namespace ACE_OS { void unique_name (const void *object, char *name, size_t length); -#if defined (ACE_USES_WCHAR) + extern ACE_Export void unique_name (const void *object, wchar_t *name, size_t length); -#endif /* ACE_USES_WCHAR */ + } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl index b839a53ce94..581e5166ee5 100644 --- a/ace/OS_NS_Thread.inl +++ b/ace/OS_NS_Thread.inl @@ -331,24 +331,20 @@ ACE_OS::cond_init (ACE_cond_t *cv, # endif /* ACE_HAS_THREADS */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::cond_init (ACE_cond_t *cv, ACE_condattr_t &attributes, const wchar_t *name, void *arg) { - return ACE_OS::cond_init (cv, attributes, ACE_Wide_To_Ascii (name).char_rep (), arg); + return ACE_OS::cond_init (cv, attributes, ACE_TEXT_TO_CHAR_IN (name), arg); } -#endif /* ACE_HAS_WCHAR */ -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg) { - return ACE_OS::cond_init (cv, type, ACE_Wide_To_Ascii (name).char_rep (), arg); + return ACE_OS::cond_init (cv, type, ACE_TEXT_TO_CHAR_IN (name), arg); } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::cond_signal (ACE_cond_t *cv) @@ -525,7 +521,6 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, return timeout == 0 ? ACE_OS::mutex_lock (m) : ACE_OS::mutex_lock (m, *timeout); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::event_init (ACE_event_t *event, int manual_reset, @@ -554,12 +549,11 @@ ACE_OS::event_init (ACE_event_t *event, manual_reset, initial_state, type, - ACE_Wide_To_Ascii (name).char_rep (), + ACE_TEXT_TO_CHAR_IN (name), arg, sa); #endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE long ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t identifier, int cmd, void *arg) @@ -1466,13 +1460,13 @@ ACE_OS::sema_init (ACE_sema_t *s, if (type == USYNC_PROCESS) { // Let's see if it already exists. - ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name), + ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN(name), O_RDWR | O_CREAT | O_EXCL, ACE_DEFAULT_FILE_PERMS); if (fd == ACE_INVALID_HANDLE) { if (errno == EEXIST) - fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name), + fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN(name), O_RDWR | O_CREAT, ACE_DEFAULT_FILE_PERMS); else @@ -1581,7 +1575,7 @@ ACE_OS::sema_init (ACE_sema_t *s, s->fd_[0] = s->fd_[1] = ACE_INVALID_HANDLE; bool creator = false; - if (ACE_OS::mkfifo (ACE_TEXT_CHAR_TO_TCHAR (name), mode) < 0) + if (ACE_OS::mkfifo (ACE_TEXT_TO_TCHAR_IN(name), mode) < 0) { if (errno != EEXIST) /* already exists OK else ERR */ return -1; @@ -1759,7 +1753,6 @@ ACE_OS::sema_init (ACE_sema_t *s, #endif /* ACE_HAS_POSIX_SEM */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::sema_init (ACE_sema_t *s, u_int count, @@ -1824,10 +1817,9 @@ ACE_OS::sema_init (ACE_sema_t *s, # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # else /* ACE_HAS_WTHREADS */ // Just call the normal char version. - return ACE_OS::sema_init (s, count, type, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa); + return ACE_OS::sema_init (s, count, type, ACE_TEXT_TO_CHAR_IN (name), arg, max, sa); # endif /* ACE_HAS_WTHREADS */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::sema_post (ACE_sema_t *s) @@ -3603,7 +3595,6 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, #endif /* ACE_HAS_THREADS */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, int lock_type, @@ -3637,7 +3628,6 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, #endif /* ACE_HAS_THREADS */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m) diff --git a/ace/OS_NS_ctype.h b/ace/OS_NS_ctype.h index 32abbe0e053..cb1719ee9c6 100644 --- a/ace/OS_NS_ctype.h +++ b/ace/OS_NS_ctype.h @@ -49,68 +49,64 @@ namespace ACE_OS { //@{ /// Returns true if the character is an alphanumeric character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isalnum (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isalnum (CHAR_TYPE c); /// Returns true if the character is an alphabetic character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isalpha (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isalpha (CHAR_TYPE c); /// Returns true if the character is a control character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_iscntrl (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_iscntrl (CHAR_TYPE c); /// Returns true if the character is a decimal-digit character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isdigit (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isdigit (CHAR_TYPE c); /// Returns true if the character is a printable character other than a space. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isgraph (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isgraph (CHAR_TYPE c); /// Returns true if the character is a lowercase character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_islower (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_islower (CHAR_TYPE c); /// Returns true if the character is a printable character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isprint (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isprint (CHAR_TYPE c); /// Returns true if the character is a punctuation character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_ispunct (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_ispunct (CHAR_TYPE c); /// Returns true if the character is a space character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isspace (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isspace (CHAR_TYPE c); /// Returns true if the character is an uppercase character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isupper (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isupper (CHAR_TYPE c); /// Returns true if the character is a hexadecimal-digit character. - ACE_NAMESPACE_INLINE_FUNCTION - int ace_isxdigit (ACE_TCHAR c); + template <typename CHAR_TYPE> inline + int ace_isxdigit (CHAR_TYPE c); /// Converts a character to lower case (char version). ACE_NAMESPACE_INLINE_FUNCTION int ace_tolower (int c); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER) /// Converts a character to lower case (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wint_t ace_towlower (wint_t c); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWLOWER */ /// Converts a character to upper case (char version). ACE_NAMESPACE_INLINE_FUNCTION int ace_toupper (int c); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWUPPER) /// Converts a character to upper case (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wint_t ace_towupper (wint_t c); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */ //@} @@ -126,5 +122,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/OS_NS_ctype.inl" # endif /* ACE_HAS_INLINED_OSCALLS */ +#include "ace/OS_NS_ctype_T.inl" + # include /**/ "ace/post.h" #endif /* ACE_OS_NS_CTYPE_H */ diff --git a/ace/OS_NS_ctype.inl b/ace/OS_NS_ctype.inl index e7199338653..dbda1f48c2b 100644 --- a/ace/OS_NS_ctype.inl +++ b/ace/OS_NS_ctype.inl @@ -3,121 +3,10 @@ // $Id$ #include "ace/os_include/os_ctype.h" -#if defined ACE_HAS_WCHAR -# include "ace/os_include/os_wctype.h" -#endif /* ACE_HAS_WCHAR */ +#include "ace/os_include/os_wctype.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE int -ACE_OS::ace_isalnum (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswalnum (c); -#else /* ACE_USES_WCHAR */ - return isalnum ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_isalpha (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswalpha (c); -#else /* ACE_USES_WCHAR */ - return isalpha ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_iscntrl (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswcntrl (c); -#else /* ACE_USES_WCHAR */ - return iscntrl ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_isdigit (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswdigit (c); -#else /* ACE_USES_WCHAR */ - return isdigit ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_isgraph (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswgraph (c); -#else /* ACE_USES_WCHAR */ - return isgraph ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_islower (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswlower (c); -#else /* ACE_USES_WCHAR */ - return islower ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_isprint (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswprint (c); -#else /* ACE_USES_WCHAR */ - return isprint ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_ispunct (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswpunct (c); -#else /* ACE_USES_WCHAR */ - return ispunct ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_isspace (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswspace (c); -#else /* ACE_USES_WCHAR */ - return isspace ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_isupper (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswupper (c); -#else /* ACE_USES_WCHAR */ - return isupper ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} - -ACE_INLINE int -ACE_OS::ace_isxdigit (ACE_TCHAR c) -{ -#if defined (ACE_USES_WCHAR) - return iswxdigit (c); -#else /* ACE_USES_WCHAR */ - return isxdigit ((unsigned char) c); -#endif /* ACE_USES_WCHAR */ -} ACE_INLINE int ACE_OS::ace_tolower (int c) @@ -125,13 +14,16 @@ ACE_OS::ace_tolower (int c) return tolower (c); } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER) ACE_INLINE wint_t ACE_OS::ace_towlower (wint_t c) { - return towlower (c); + #if !defined (ACE_LACKS_TOWLOWER) + return towlower (c); + #else + ACE_UNUSED_ARG( c ); + ACE_NOTSUP_RETURN (0); + #endif } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWLOWER */ ACE_INLINE int ACE_OS::ace_toupper (int c) @@ -139,12 +31,16 @@ ACE_OS::ace_toupper (int c) return toupper (c); } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWUPPER) ACE_INLINE wint_t ACE_OS::ace_towupper (wint_t c) { - return towupper (c); + #if !defined (ACE_LACKS_TOWUPPER) + return towupper (c); + #else + ACE_UNUSED_ARG( c ); + ACE_NOTSUP_RETURN (0); + #endif } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */ + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl index ff562717cb9..6864e7a949d 100644 --- a/ace/OS_NS_dirent.inl +++ b/ace/OS_NS_dirent.inl @@ -64,7 +64,7 @@ opendir (const ACE_TCHAR *filename) # elif defined (ACE_HAS_NONCONST_OPENDIR) return ::opendir (const_cast<char *> (filename)); # else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */ - return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename)); + return ::opendir (ACE_TEXT_TO_CHAR_IN (filename)); # endif /* ACE_WIN32 && ACE_LACKS_OPENDIR */ # endif /* ACE_PSOS */ #else @@ -182,7 +182,7 @@ scandir (const ACE_TCHAR *dirname, const struct ACE_DIRENT **f2)) { #if defined (ACE_HAS_SCANDIR) - return ::scandir (ACE_TEXT_ALWAYS_CHAR (dirname), + return ::scandir (ACE_TEXT_TO_CHAR_IN (dirname), namelist, selector, # if defined (ACE_SCANDIR_CMP_USES_VOIDPTR) diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl index 6c4caeaf3e8..74a2159107c 100644 --- a/ace/OS_NS_dlfcn.inl +++ b/ace/OS_NS_dlfcn.inl @@ -89,7 +89,7 @@ ACE_OS::dlerror (void) # if defined (ACE_USES_WCHAR) const size_t BufLen = 256; static wchar_t buf[BufLen]; - ACE_OS::strncpy (buf, ACE_TEXT_CHAR_TO_TCHAR (err), BufLen); + ACE_OS::string_copy (buf, err, BufLen); return buf; # else return const_cast <char *> (err); @@ -125,13 +125,13 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, void *handle; # if defined (ACE_HAS_SGIDLADD) ACE_OSCALL - (::sgidladd (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle); + (::sgidladd (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle); # elif defined (_M_UNIX) ACE_OSCALL - (::_dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle); + (::_dlopen (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle); # else ACE_OSCALL - (::dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle); + (::dlopen (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle); # endif /* ACE_HAS_SGIDLADD */ # if !defined (ACE_HAS_AUTOMATIC_INIT_FINI) if (handle != 0) @@ -210,24 +210,15 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, #endif /* ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE */ // Get the correct OS type. + // Define symbolname #if defined (ACE_HAS_WINCE) - // CE (at least thru Pocket PC 2003) offers GetProcAddressW, not ...A, so - // we always need a wide-char string. - const wchar_t *symbolname = 0; -# if defined (ACE_USES_WCHAR) - symbolname = sname; -# else - ACE_Ascii_To_Wide sname_xlate (sname); - symbolname = sname_xlate.wchar_rep (); -# endif /* ACE_USES_WCHAR */ -#elif defined (ACE_USES_WCHAR) - // WinCE is WCHAR always; other platforms need a char * symbol name - ACE_Wide_To_Ascii w_sname (sname); - char *symbolname = w_sname.char_rep (); -#elif defined (ACE_VXWORKS) - char *symbolname = const_cast<char *> (sname); + // WinCE expects a wchar + ACE::String_Conversion::Convert_In< wchar_t, char > convert (sname); + const wchar_t *symbolname = convert.c_str(); #else - const char *symbolname = sname; + // Otherwise we make certain we have an ANSI char version + ACE::String_Conversion::Convert_In< char, wchar_t > convert (sname); + const char *symbolname = convert.c_str(); #endif /* ACE_HAS_WINCE */ # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) diff --git a/ace/OS_NS_fcntl.cpp b/ace/OS_NS_fcntl.cpp index bd3cbba647d..79bf7c99fe4 100644 --- a/ace/OS_NS_fcntl.cpp +++ b/ace/OS_NS_fcntl.cpp @@ -81,7 +81,7 @@ ACE_OS::open (const char *filename, SECURITY_DESCRIPTOR sd_buffer; #if defined (ACE_HAS_WINCE) - ACE_HANDLE h = ::CreateFileW (ACE_Ascii_To_Wide (filename).wchar_rep (), + ACE_HANDLE h = ::CreateFileW (ACE_TEXT_TO_WCHAR_IN (filename), access, shared_mode, ACE_OS::default_win32_security_attributes_r @@ -128,7 +128,6 @@ ACE_OS::open (const char *filename, #endif /* ACE_WIN32 */ } -#if defined (ACE_HAS_WCHAR) ACE_HANDLE ACE_OS::open (const wchar_t *filename, int mode, @@ -220,12 +219,11 @@ ACE_OS::open (const wchar_t *filename, return h; #else /* ACE_WIN32 */ // Just emulate with ascii version - return ACE_OS::open (ACE_Wide_To_Ascii (filename).char_rep (), + return ACE_OS::open (ACE_TEXT_TO_CHAR_IN (filename), mode, perms, sa); #endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_fcntl.h b/ace/OS_NS_fcntl.h index 9334a1a075e..ac48e0e13e1 100644 --- a/ace/OS_NS_fcntl.h +++ b/ace/OS_NS_fcntl.h @@ -71,14 +71,12 @@ namespace ACE_OS { int mode, int perms = ACE_DEFAULT_OPEN_PERMS, LPSECURITY_ATTRIBUTES sa = 0); -#if defined (ACE_HAS_WCHAR) + extern ACE_Export ACE_HANDLE open (const wchar_t *filename, int mode, int perms = ACE_DEFAULT_OPEN_PERMS, LPSECURITY_ATTRIBUTES sa = 0); -#endif /* ACE_HAS_WCHAR */ - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp index 46b30ef5fdb..475abea4487 100644 --- a/ace/OS_NS_stdio.cpp +++ b/ace/OS_NS_stdio.cpp @@ -159,7 +159,6 @@ ACE_OS::fopen (const char *filename, return 0; } -#if defined (ACE_HAS_WCHAR) FILE * ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode) @@ -206,7 +205,6 @@ ACE_OS::fopen (const wchar_t *filename, } return 0; } -#endif /* ACE_HAS_WCHAR */ #endif /* ACE_WIN32 */ @@ -222,7 +220,6 @@ ACE_OS::fprintf (FILE *fp, const char *format, ...) return result; } -#if defined (ACE_HAS_WCHAR) int ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...) { @@ -243,7 +240,6 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...) # endif /* ACE_HAS_VFWPRINTF */ } -#endif /* ACE_HAS_WCHAR */ // The following *printf functions aren't inline because @@ -302,8 +298,6 @@ ACE_OS::snprintf (char *buf, size_t maxlen, const char *format, ...) #endif /* ACE_HAS_SNPRINTF */ } -#if defined (ACE_HAS_WCHAR) - int ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) { @@ -347,7 +341,6 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAS_SNPRINTF */ } -#endif /* ACE_HAS_WCHAR */ int ACE_OS::sprintf (char *buf, const char *format, ...) @@ -362,7 +355,6 @@ ACE_OS::sprintf (char *buf, const char *format, ...) return result; } -#if defined (ACE_HAS_WCHAR) int ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...) { @@ -401,6 +393,6 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...) # endif /* XPG5 || ACE_HAS_DINKUM_STL */ } -#endif /* ACE_HAS_WCHAR */ + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_stdio.h b/ace/OS_NS_stdio.h index c2ad103bc5c..450b7ce2ced 100644 --- a/ace/OS_NS_stdio.h +++ b/ace/OS_NS_stdio.h @@ -151,11 +151,10 @@ namespace ACE_OS { char *cuserid (char *user, size_t maxlen = ACE_MAX_USERID); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wchar_t *cuserid (wchar_t *user, size_t maxlen = ACE_MAX_USERID); -# endif /* ACE_HAS_WCHAR */ + # endif /* ACE_LACKS_CUSERID */ //@} @@ -181,10 +180,8 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION char *fgets (char *buf, int size, FILE *fp); -# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS) ACE_NAMESPACE_INLINE_FUNCTION wchar_t *fgets (wchar_t *buf, int size, FILE *fp); -# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */ //@{ @name A set of wrappers for file locks. @@ -245,14 +242,12 @@ namespace ACE_OS { #endif /* ACE_WIN32 */ FILE *fopen (const char *filename, const ACE_TCHAR *mode); -#if defined (ACE_HAS_WCHAR) #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) extern ACE_Export #else ACE_NAMESPACE_INLINE_FUNCTION #endif /* ACE_WIN32 */ FILE *fopen (const wchar_t *filename, const ACE_TCHAR *mode); -#endif /* ACE_HAS_WCHAR */ #if defined (ACE_WIN32) /// Default Win32 Security Attributes definition. @@ -295,20 +290,16 @@ namespace ACE_OS { extern ACE_Export int fprintf (FILE *fp, const char *format, ...); -# if defined (ACE_HAS_WCHAR) extern ACE_Export int fprintf (FILE *fp, const wchar_t *format, ...); -# endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int fputs (const char *s, FILE *stream); -# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS) ACE_NAMESPACE_INLINE_FUNCTION int fputs (const wchar_t *s, FILE *stream); -# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */ ACE_NAMESPACE_INLINE_FUNCTION size_t fread (void *ptr, @@ -341,10 +332,8 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION void perror (const char *s); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION void perror (const wchar_t *s); -#endif /* ACE_HAS_WCHAR */ extern ACE_Export int printf (const char *format, ...); @@ -352,22 +341,18 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int puts (const char *s); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int puts (const wchar_t *s); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int rename (const char *old_name, const char *new_name, int flags = -1); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int rename (const wchar_t *old_name, const wchar_t *new_name, int flags = -1); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION void rewind (FILE *fp); @@ -375,28 +360,22 @@ namespace ACE_OS { extern ACE_Export int snprintf (char *buf, size_t maxlen, const char *format, ...); -# if defined (ACE_HAS_WCHAR) extern ACE_Export int snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format,...); -# endif /* ACE_HAS_WCHAR */ extern ACE_Export int sprintf (char *buf, const char *format, ...); -# if defined (ACE_HAS_WCHAR) extern ACE_Export int sprintf (wchar_t *buf, const wchar_t *format, ...); -# endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION char *tempnam (const char *dir = 0, const char *pfx = 0); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wchar_t *tempnam (const wchar_t *dir, const wchar_t *pfx = 0); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int vsprintf (char *buffer, const char *format, va_list argptr); @@ -404,13 +383,11 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int vsnprintf (char *buffer, size_t maxlen, const char *format, va_list argptr); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr); ACE_NAMESPACE_INLINE_FUNCTION int vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_list argptr); -# endif /* ACE_HAS_WCHAR */ } /* namespace ACE_OS */ diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl index d3f2c08c99e..0f4a460723b 100644 --- a/ace/OS_NS_stdio.inl +++ b/ace/OS_NS_stdio.inl @@ -589,7 +589,6 @@ ACE_OS::cuserid (char *user, size_t maxlen) #endif /* VXWORKS */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::cuserid (wchar_t *user, size_t maxlen) { @@ -600,14 +599,14 @@ ACE_OS::cuserid (wchar_t *user, size_t maxlen) else return user; # else /* ACE_WIN32 */ - char *char_user; + char *char_user = 0; wchar_t *result = 0; ACE_NEW_RETURN (char_user, char[maxlen + 1], 0); if (ACE_OS::cuserid (char_user, maxlen)) { - ACE_OS::strcpy (user, ACE_Ascii_To_Wide (char_user).wchar_rep ()); + ACE_OS::string_copy (user, char_user, maxlen + 1); result = user; } @@ -616,7 +615,6 @@ ACE_OS::cuserid (wchar_t *user, size_t maxlen) return result; # endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ #endif /* ACE_LACKS_CUSERID */ ACE_INLINE int @@ -631,9 +629,9 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fdopen"); # if defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)), - FILE*, - 0); + ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_TO_WCHAR_IN (mode)), + FILE*, + 0); # elif defined (ACE_WIN32) // kernel file handle -> FILE* conversion... // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost @@ -678,7 +676,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) ACE_NOTSUP_RETURN (0); # else ACE_OSCALL_RETURN - (::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *, 0); + (::fdopen (handle, ACE_TEXT_TO_CHAR_IN (mode)), FILE *, 0); # endif /* ACE_HAS_WINCE */ } @@ -716,14 +714,19 @@ ACE_OS::fgets (char *buf, int size, FILE *fp) ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *, 0); } -#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS) ACE_INLINE wchar_t * ACE_OS::fgets (wchar_t *buf, int size, FILE *fp) { +#if !defined(ACE_LACKS_FGETWS) ACE_OS_TRACE ("ACE_OS::fgets"); ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetws (buf, size, fp), wchar_t *, 0); +#else + ACE_UNUSED_ARG( buf ); + ACE_UNUSED_ARG( size ); + ACE_UNUSED_ARG( fp ); + ACE_NOTSUP_RETURN (0); +#endif } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */ #if !(defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. @@ -732,25 +735,23 @@ ACE_OS::fopen (const char *filename, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); ACE_OSCALL_RETURN - (::fopen (filename, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *, 0); + (::fopen (filename, ACE_TEXT_TO_CHAR_IN (mode)), FILE *, 0); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE FILE * ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); #if defined (ACE_HAS_WINCE) ACE_OSCALL_RETURN - (::_wfopen (filename, ACE_TEXT_ALWAYS_WCHAR (mode)), FILE *, 0); + (::_wfopen (filename, ACE_TEXT_TO_WCHAR_IN (mode)), FILE *, 0); #else // Non-Windows doesn't use wchar_t file systems. - ACE_Wide_To_Ascii n_filename (filename); ACE_OSCALL_RETURN - (::fopen (n_filename.char_rep (), ACE_TEXT_ALWAYS_CHAR (mode)), FILE*, 0); + (::fopen (ACE_TEXT_TO_CHAR_IN (filename), + ACE_TEXT_TO_CHAR_IN (mode)), FILE*, 0); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ #endif /* ACE_WIN32 */ @@ -761,14 +762,18 @@ ACE_OS::fputs (const char *s, FILE *stream) ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int, -1); } -#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS) ACE_INLINE int ACE_OS::fputs (const wchar_t *s, FILE *stream) { +#if !defined(ACE_LACKS_FPUTWS) ACE_OS_TRACE ("ACE_OS::fputs"); ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputws (s, stream), int, -1); +#else + ACE_UNUSED_ARG( s ); + ACE_UNUSED_ARG( stream ); + ACE_NOTSUP_RETURN (-1); +#endif } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */ ACE_INLINE size_t ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp) @@ -784,14 +789,14 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) { ACE_OS_TRACE ("ACE_OS::freopen"); #if defined (ACE_WIN32) && (defined(ACE_USES_WCHAR) || defined(ACE_HAS_WINCE)) - ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename), - ACE_TEXT_ALWAYS_WCHAR (mode), - stream), - FILE *, 0); + ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_TO_WCHAR_IN (filename), + ACE_TEXT_TO_WCHAR_IN (mode), + stream), + FILE *, 0); #else ACE_OSCALL_RETURN - (ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename), - ACE_TEXT_ALWAYS_CHAR (mode), + (ACE_STD_NAMESPACE::freopen (ACE_TEXT_TO_CHAR_IN (filename), + ACE_TEXT_TO_CHAR_IN (mode), stream), FILE *, 0); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ @@ -856,7 +861,6 @@ ACE_OS::perror (const char *s) #endif /* ACE_HAS_WINCE */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE void ACE_OS::perror (const wchar_t *s) { @@ -867,11 +871,9 @@ ACE_OS::perror (const wchar_t *s) #elif defined (ACE_WIN32) ::_wperror (s); #else - ACE_Wide_To_Ascii n_s (s); - ::perror (n_s.char_rep ()); + ::perror (ACE_TEXT_TO_CHAR_IN (s)); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::puts (const char *s) @@ -880,7 +882,6 @@ ACE_OS::puts (const char *s) ACE_OSCALL_RETURN (::puts (s), int, -1); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::puts (const wchar_t *s) { @@ -889,11 +890,9 @@ ACE_OS::puts (const wchar_t *s) ACE_OSCALL_RETURN (::_putws (s), int, -1); #else /* ACE_WIN32 */ // There's no putws()... - ACE_Wide_To_Ascii n_s (s); - ACE_OSCALL_RETURN (::puts (n_s.char_rep ()), int, -1); + ACE_OSCALL_RETURN (::puts (ACE_TEXT_TO_CHAR_IN (s)), int, -1); #endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::rename (const char *old_name, @@ -908,8 +907,8 @@ ACE_OS::rename (const char *old_name, # elif defined (ACE_HAS_WINCE) // Win CE is always wide-char. ACE_UNUSED_ARG (flags); - if (0 != MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name), - ACE_TEXT_CHAR_TO_TCHAR (new_name))) + if (0 != MoveFile (ACE_TEXT_TO_TCHAR_IN (old_name), + ACE_TEXT_TO_TCHAR_IN (new_name))) ACE_FAIL_RETURN (-1); return 0; # elif defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1) @@ -928,7 +927,6 @@ ACE_OS::rename (const char *old_name, # endif /* ACE_LACKS_RENAME */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::rename (const wchar_t *old_name, const wchar_t *new_name, @@ -958,12 +956,10 @@ ACE_OS::rename (const wchar_t *old_name, ACE_UNUSED_ARG (flags); ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int, -1); # else /* ACE_LACKS_RENAME */ - ACE_Wide_To_Ascii nold_name (old_name); - ACE_Wide_To_Ascii nnew_name (new_name); - return ACE_OS::rename (nold_name.char_rep (), nnew_name.char_rep (), flags); + return ACE_OS::rename (ACE_TEXT_TO_CHAR_IN (old_name), + ACE_TEXT_TO_CHAR_IN (new_name), flags); # endif /* ACE_LACKS_RENAME */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE void ACE_OS::rewind (FILE *fp) @@ -973,7 +969,7 @@ ACE_OS::rewind (FILE *fp) ::rewind (fp); #else // This isn't perfect since it doesn't reset EOF, but it's probably - // the closest we can get on WINCE. + // the closest we can get on WINCE. (void) fseek (fp, 0L, SEEK_SET); #endif /* ACE_HAS_WINCE */ } @@ -997,7 +993,6 @@ ACE_OS::tempnam (const char *dir, const char *pfx) #endif /* ACE_LACKS_TEMPNAM */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx) { @@ -1011,28 +1006,21 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx) ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0); # else ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0); -# endif /* __BORLANDC__ */ -#else /* ACE_LACKS_TEMPNAM */ +# endif // __BORLANDC__ +#else // ACE_LACKS_TEMPNAM // No native wide-char support; convert to narrow and call the char* variant. - char *ndir = ACE_Wide_To_Ascii (dir).char_rep (); - char *npfx = ACE_Wide_To_Ascii (pfx).char_rep (); - char *name = ACE_OS::tempnam (ndir, npfx); + char *name = ACE_OS::tempnam (ACE_TEXT_TO_CHAR_IN (dir), + ACE_TEXT_TO_CHAR_IN (pfx)); // ACE_OS::tempnam returns a pointer to a malloc()-allocated space. // Convert that string to wide-char and free() the original. - wchar_t *wname = 0; if (name != 0) { - size_t namelen = ACE_OS::strlen (name) + 1; - wname = reinterpret_cast<wchar_t *> - (ACE_OS::malloc (namelen * sizeof (wchar_t))); - if (wname != 0) - ACE_OS::strcpy (wname, ACE_Ascii_To_Wide (name).wchar_rep ()); - ACE_OS::free (name); + ::free( name ); + return ACE_TEXT_TO_MALLOC_WCHAR_OUT( name ); } - return wname; + return 0; #endif /* ACE_LACKS_TEMPNAM */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr) @@ -1074,7 +1062,6 @@ ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap) #endif /* ACE_HAS_SNPRINTF */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) { @@ -1103,9 +1090,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) # endif /* XPG5 || ACE_HAS_DINKUM_STL */ } -#endif /* ACE_HAS_WCHAR */ -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_list ap) { @@ -1141,7 +1126,6 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis # endif /* platforms with a variant of vswprintf */ } -#endif /* ACE_HAS_WCHAR */ #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) #if defined (ACE_WIN32) diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp index 9a0370921f5..0da4241875c 100644 --- a/ace/OS_NS_stdlib.cpp +++ b/ace/OS_NS_stdlib.cpp @@ -159,7 +159,7 @@ ACE_OS::itoa_emulation (int value, char *string, int radix) } #endif /* !ACE_HAS_ITOA */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_ITOW) +#if defined (ACE_LACKS_ITOW) wchar_t * ACE_OS::itow_emulation (int value, wchar_t *string, int radix) { @@ -209,7 +209,7 @@ ACE_OS::itow_emulation (int value, wchar_t *string, int radix) return string; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_ITOW */ +#endif /* ACE_LACKS_ITOW */ void * ACE_OS::malloc (size_t nbytes) diff --git a/ace/OS_NS_stdlib.h b/ace/OS_NS_stdlib.h index 8e0747b7ffd..1209dce8cf4 100644 --- a/ace/OS_NS_stdlib.h +++ b/ace/OS_NS_stdlib.h @@ -74,10 +74,8 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int atoi (const char *s); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int atoi (const wchar_t *s); -# endif /* ACE_HAS_WCHAR */ // atop not in spec # if defined (atop) @@ -87,10 +85,8 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION void *atop (const char *s); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION void *atop (const wchar_t *s); -# endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION void *bsearch (const void *key, @@ -111,10 +107,8 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION char *getenv (const char *symbol); -# if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) ACE_NAMESPACE_INLINE_FUNCTION wchar_t *getenv (const wchar_t *symbol); -# endif /* ACE_HAS_WCHAR && ACE_WIN32 */ // not in spec extern ACE_Export @@ -125,11 +119,9 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION char *itoa (int value, char *string, int radix); -#if defined (ACE_HAS_WCHAR) /// Converts an integer to a string. ACE_NAMESPACE_INLINE_FUNCTION wchar_t *itoa (int value, wchar_t *string, int radix); -#endif /* ACE_HAS_WCHAR */ #if !defined (ACE_HAS_ITOA) /// Emulated itoa - Converts an integer to a string. @@ -137,11 +129,11 @@ namespace ACE_OS { char *itoa_emulation (int value, char *string, int radix); #endif /* !ACE_HAS_ITOA */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_ITOW) +#if defined (ACE_LACKS_ITOW) /// Emulated itow - Converts an integer to a string. extern ACE_Export wchar_t *itow_emulation (int value, wchar_t *string, int radix); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_ITOW */ +#endif /* ACE_LACKS_ITOW */ extern ACE_Export void *malloc (size_t); @@ -149,40 +141,31 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE mkstemp (char *s); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE mkstemp (wchar_t *s); -# endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_MKSTEMP) extern ACE_Export ACE_HANDLE mkstemp_emulation (ACE_TCHAR * s); #endif /* ACE_LACKS_MKSTEMP */ -#if !defined (ACE_LACKS_MKTEMP) ACE_NAMESPACE_INLINE_FUNCTION char *mktemp (char *s); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wchar_t *mktemp (wchar_t *s); -# endif /* ACE_HAS_WCHAR */ -#else - extern ACE_Export - ACE_TCHAR *mktemp (ACE_TCHAR *s); -#endif /* !ACE_LACKS_MSTEMP */ ACE_NAMESPACE_INLINE_FUNCTION int putenv (const char *string); -#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) +#if defined (ACE_WIN32) // Windows is the only platform that supports a wchar_t environment. // Since other platforms make @a string part of the environment, it's // a certain memory leak to copy and transform wchar_t to char for // emulating this, so it's not attempted. ACE_NAMESPACE_INLINE_FUNCTION int putenv (const wchar_t *string); -#endif /* ACE_HAS_WCHAR && ACE_WIN32 */ +#endif /* ACE_WIN32 */ ACE_NAMESPACE_INLINE_FUNCTION void qsort (void *base, @@ -207,10 +190,8 @@ namespace ACE_OS { # endif /* !ACE_LACKS_REALPATH */ char *realpath (const char *file_name, char *resolved_name); -# if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wchar_t *realpath (const wchar_t *file_name, wchar_t *resolved_name); -# endif /* ACE_HAS_WCHAR */ #endif /* ACE_HAS_WINCE */ // exit_hook and set_exit_hook not in spec @@ -234,21 +215,17 @@ namespace ACE_OS { double strtod (const char *s, char **endptr); #endif /* !ACE_LACKS_STRTOD */ -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD) /// Converts a string to a double value (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION double strtod (const wchar_t *s, wchar_t **endptr); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOD */ /// Converts a string to a long value (char version). ACE_NAMESPACE_INLINE_FUNCTION long strtol (const char *s, char **ptr, int base); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL) /// Converts a string to a long value (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION long strtol (const wchar_t *s, wchar_t **ptr, int base); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */ #if defined (ACE_LACKS_STRTOL) extern ACE_Export @@ -259,11 +236,9 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION unsigned long strtoul (const char *s, char **ptr, int base); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL) /// Converts a string to an unsigned long value (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION unsigned long strtoul (const wchar_t *s, wchar_t **ptr, int base); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */ #if defined (ACE_LACKS_STRTOUL) extern ACE_Export @@ -279,6 +254,8 @@ namespace ACE_OS { ACE_END_VERSIONED_NAMESPACE_DECL +#include "ace/OS_NS_stdlib_base.inl" + # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl index 0762d7443f5..6f6ca83c71f 100644 --- a/ace/OS_NS_stdlib.inl +++ b/ace/OS_NS_stdlib.inl @@ -8,6 +8,8 @@ #include "ace/Global_Macros.h" #include "ace/os_include/os_errno.h" #include "ace/os_include/os_search.h" +#include "ace/os_include/os_limits.h" +//#include "ace/TSS_T.h" #if defined(ACE_WCHAR_IN_STD_NAMESPACE) # define ACE_WCHAR_STD_NAMESPACE std @@ -65,17 +67,15 @@ ACE_OS::atoi (const char *s) ACE_OSCALL_RETURN (::atoi (s), int, -1); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::atoi (const wchar_t *s) { #if defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wtoi (s), int, -1); #else /* ACE_WIN32 */ - return ACE_OS::atoi (ACE_Wide_To_Ascii(s).char_rep()); + return ACE_OS::atoi (ACE_TEXT_TO_CHAR_IN (s)); #endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ #if defined (atop) # undef atop @@ -98,7 +98,6 @@ ACE_OS::atop (const char *s) return p; } -#if defined (ACE_HAS_WCHAR) ACE_INLINE void * ACE_OS::atop (const wchar_t *s) { @@ -110,7 +109,6 @@ ACE_OS::atop (const wchar_t *s) void *p = reinterpret_cast<void *> (ip); return p; } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE void * ACE_OS::bsearch (const void *key, @@ -143,18 +141,31 @@ ACE_OS::getenv (const char *symbol) #endif /* ACE_LACKS_ENV */ } -#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) ACE_INLINE wchar_t * ACE_OS::getenv (const wchar_t *symbol) { #if defined (ACE_LACKS_ENV) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); -#else +#elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0); +#else +// Including ACE_TSS_T.h causes error! +/* + wchar_t* init = 0; + static ACE_TSS< wchar_t* > wvalue (&init); + ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wvalue); + *wvalue.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT ( + ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (symbol))); + return *wvalue; +*/ + static wchar_t* wvalue = 0; + ACE::String_Conversion::Allocator_malloc<wchar_t>().free(wvalue); + wvalue = ACE_TEXT_TO_MALLOC_WCHAR_OUT ( + ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (symbol))); + return wvalue; #endif /* ACE_LACKS_ENV */ } -#endif /* ACE_HAS_WCHAR && ACE_WIN32 */ ACE_INLINE char * ACE_OS::itoa (int value, char *string, int radix) @@ -168,7 +179,6 @@ ACE_OS::itoa (int value, char *string, int radix) #endif /* !ACE_HAS_ITOA */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::itoa (int value, wchar_t *string, int radix) { @@ -178,7 +188,6 @@ ACE_OS::itoa (int value, wchar_t *string, int radix) return ::_itow (value, string, radix); #endif /* ACE_LACKS_ITOW */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE ACE_HANDLE ACE_OS::mkstemp (char *s) @@ -186,54 +195,56 @@ ACE_OS::mkstemp (char *s) #if !defined (ACE_LACKS_MKSTEMP) return ::mkstemp (s); #else - return ACE_OS::mkstemp_emulation (ACE_TEXT_CHAR_TO_TCHAR (s)); + return ACE_OS::mkstemp_emulation (ACE_TEXT_TO_TCHAR_INOUT (s) ); #endif /* !ACE_LACKS_MKSTEMP */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE ACE_HANDLE ACE_OS::mkstemp (wchar_t *s) { + s[0] = 0; # if !defined (ACE_LACKS_MKSTEMP) - return ::mkstemp (ACE_TEXT_WCHAR_TO_TCHAR (ACE_TEXT_ALWAYS_CHAR (s))); + ACE::String_Conversion::Convert_InOut<char, wchar_t> convert( s, PATH_MAX ); + return ::mkstemp (convert.c_str()); # else - return ACE_OS::mkstemp_emulation (ACE_TEXT_WCHAR_TO_TCHAR (s)); + ACE::String_Conversion::Convert_InOut<ACE_TCHAR, ACE_ANTI_TCHAR> convert( s, PATH_MAX ); + return ACE_OS::mkstemp_emulation (convert.c_str()); # endif /* !ACE_LACKS_MKSTEMP */ } -#endif /* ACE_HAS_WCHAR */ -#if !defined (ACE_LACKS_MKTEMP) + ACE_INLINE char * ACE_OS::mktemp (char *s) { # if defined (ACE_WIN32) return ::_mktemp (s); -# else /* ACE_WIN32 */ +# elif !defined (ACE_LACKS_MKTEMP) return ::mktemp (s); -# endif /* ACE_WIN32 */ +# else + ACE_UNUSED_ARG( s ); + ACE_NOTSUP_RETURN (0); +# endif } -# if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::mktemp (wchar_t *s) { -# if defined (ACE_WIN32) +#if defined (ACE_LACKS_MKTEMP) + ACE_UNUSED_ARG( s ); + ACE_NOTSUP_RETURN (0); +#elif defined (ACE_WIN32) return ::_wmktemp (s); -# else +#else // 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. - ACE_Wide_To_Ascii narrow_s (s); - if (::mktemp (narrow_s.char_rep ()) == 0) + s[0] = 0; + ACE::String_Conversion::Convert_InOut<char, wchar_t> convert( s, PATH_MAX ); + if (::mktemp (convert.c_str()) == 0) return 0; - ACE_Ascii_To_Wide wide_s (narrow_s.char_rep ()); - ACE_OS::strcpy (s, wide_s.wchar_rep ()); return s; -# endif +#endif } -# endif /* ACE_HAS_WCHAR */ - -#endif /* !ACE_LACKS_MKTEMP */ #if defined(INTEGRITY) extern "C" { @@ -257,7 +268,7 @@ ACE_OS::putenv (const char *string) #endif /* ACE_HAS_WINCE */ } -#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) +#if defined (ACE_WIN32) ACE_INLINE int ACE_OS::putenv (const wchar_t *string) { @@ -270,7 +281,7 @@ ACE_OS::putenv (const wchar_t *string) ACE_OSCALL_RETURN (::_wputenv (string), int, -1); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR && ACE_WIN32 */ +#endif /* ACE_WIN32 */ ACE_INLINE void ACE_OS::qsort (void *base, @@ -357,7 +368,6 @@ ACE_OS::realpath (const char *file_name, } # endif /* !ACE_LACKS_REALPATH */ -# if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::realpath (const wchar_t *file_name, wchar_t *resolved_name) @@ -365,18 +375,15 @@ ACE_OS::realpath (const wchar_t *file_name, # if defined (ACE_WIN32) return ::_wfullpath (resolved_name, file_name, PATH_MAX); # else /* ACE_WIN32 */ - ACE_Wide_To_Ascii n_file_name (file_name); char n_resolved[PATH_MAX]; - if (0 != ACE_OS::realpath (n_file_name.char_rep (), n_resolved)) + if (0 != ACE_OS::realpath ( ACE_TEXT_TO_CHAR_IN (file_name), n_resolved)) { - ACE_Ascii_To_Wide w_resolved (n_resolved); - ACE_OS::strcpy (resolved_name, w_resolved.wchar_rep ()); + ACE_OS::string_copy (resolved_name, n_resolved, PATH_MAX); return resolved_name; } return 0; # endif /* ! ACE_WIN32 */ } -# endif /* ACE_HAS_WCHAR */ #endif /* ACE_HAS_WINCE */ ACE_INLINE ACE_EXIT_HOOK @@ -419,8 +426,8 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) # else // Use char * for environment on non-Windows. char *temp = 0; - if ((temp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&str[1]))) != 0) - return ACE_OS::strdup (ACE_TEXT_CHAR_TO_TCHAR (temp)); + 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); } @@ -437,13 +444,16 @@ ACE_OS::strtod (const char *s, char **endptr) } #endif /* !ACE_LACKS_STRTOD */ -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD) ACE_INLINE double ACE_OS::strtod (const wchar_t *s, wchar_t **endptr) { - return ACE_WCHAR_STD_NAMESPACE::wcstod (s, endptr); + #if !defined (ACE_LACKS_WCSTOD) + return ACE_WCHAR_STD_NAMESPACE::wcstod (s, endptr); + #else + ACE_UNUSED_ARG( s ); + ACE_NOTSUP_RETURN (0); + #endif } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOD */ ACE_INLINE long ACE_OS::strtol (const char *s, char **ptr, int base) @@ -455,13 +465,18 @@ ACE_OS::strtol (const char *s, char **ptr, int base) #endif /* ACE_LACKS_STRTOL */ } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL) ACE_INLINE long ACE_OS::strtol (const wchar_t *s, wchar_t **ptr, int base) { +#if !defined (ACE_LACKS_WCSTOL) return ACE_WCHAR_STD_NAMESPACE::wcstol (s, ptr, base); +#else + ACE_UNUSED_ARG( s ); + ACE_UNUSED_ARG( ptr ); + ACE_UNUSED_ARG( base ); + ACE_NOTSUP_RETURN (0); +#endif } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */ ACE_INLINE unsigned long ACE_OS::strtoul (const char *s, char **ptr, int base) @@ -473,13 +488,18 @@ ACE_OS::strtoul (const char *s, char **ptr, int base) #endif /* ACE_LACKS_STRTOUL */ } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL) ACE_INLINE unsigned long ACE_OS::strtoul (const wchar_t *s, wchar_t **ptr, int base) { +#if !defined (ACE_LACKS_WCSTOUL) return ACE_WCHAR_STD_NAMESPACE::wcstoul (s, ptr, base); +#else + ACE_UNUSED_ARG( s ); + ACE_UNUSED_ARG( ptr ); + ACE_UNUSED_ARG( base ); + ACE_NOTSUP_RETURN (0); +#endif } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */ ACE_INLINE int ACE_OS::system (const ACE_TCHAR *s) @@ -493,7 +513,7 @@ ACE_OS::system (const ACE_TCHAR *s) #elif defined(ACE_TANDEM_T1248_PTHREADS) ACE_OSCALL_RETURN (::spt_system (s), int, -1); #else - ACE_OSCALL_RETURN (::system (ACE_TEXT_ALWAYS_CHAR (s)), int, -1); + ACE_OSCALL_RETURN (::system (ACE_TEXT_TO_CHAR_IN (s)), int, -1); #endif /* ACE_LACKS_SYSTEM */ } diff --git a/ace/OS_NS_string.cpp b/ace/OS_NS_string.cpp index 098bc3ceae0..e0622063a52 100644 --- a/ace/OS_NS_string.cpp +++ b/ace/OS_NS_string.cpp @@ -12,9 +12,7 @@ ACE_RCSID (ace, # include "ace/OS_NS_string.inl" #endif /* ACE_HAS_INLINED_OS_CALLS */ -#if defined (ACE_HAS_WCHAR) # include "ace/OS_NS_stdlib.h" -#endif /* ACE_HAS_WCHAR */ #if !defined (ACE_LACKS_STRERROR) # include "ace/OS_NS_stdio.h" @@ -39,25 +37,24 @@ ACE_OS::memchr_emulation (const void *s, int c, size_t len) } #endif /*ACE_HAS_MEMCHR*/ -#if (defined (ACE_LACKS_STRDUP) && !defined (ACE_STRDUP_EQUIVALENT)) \ - || defined (ACE_HAS_STRDUP_EMULATION) char * -ACE_OS::strdup_emulation (const char *s) +ACE_OS::strdup (const char *s) { +#if defined (ACE_HAS_STRDUP_EMULATION) char *t = (char *) ACE_OS::malloc (ACE_OS::strlen (s) + 1); if (t == 0) return 0; return ACE_OS::strcpy (t, s); +#else + return ACE_STD_NAMESPACE::strdup (s); +#endif /* ACE_HAS_STRDUP_EMULATION */ } -#endif /* (ACE_LACKS_STRDUP && !ACE_STRDUP_EQUIVALENT) || ... */ -#if defined (ACE_HAS_WCHAR) -#if (defined (ACE_LACKS_WCSDUP) && !defined (ACE_WCSDUP_EQUIVALENT)) \ - || defined (ACE_HAS_WCSDUP_EMULATION) wchar_t * -ACE_OS::strdup_emulation (const wchar_t *s) +ACE_OS::strdup (const wchar_t *s) { +# if defined (ACE_LACKS_WCSDUP) wchar_t *buffer = (wchar_t *) ACE_OS::malloc ((ACE_OS::strlen (s) + 1) * sizeof (wchar_t)); @@ -65,9 +62,16 @@ ACE_OS::strdup_emulation (const wchar_t *s) return 0; return ACE_OS::strcpy (buffer, s); +# elif defined (ACE_WCSDUP_EQUIVALENT) + return ACE_WCSDUP_EQUIVALENT (s); +# else /* ACE_LACKS_WCSDUP */ +# if defined (__MINGW32__) + return ::wcsdup (const_cast<wchar_t*> (s)); +# else /* __MINGW32__ */ + return ::wcsdup (s); +# endif /* __MINGW32__ */ +# endif /* ACE_LACKS_WCSDUP */ } -#endif /* (ACE_LACKS_WCSDUP && !ACE_WCSDUP_EQUIVALENT) || ... */ -#endif /* ACE_HAS_WCHAR */ char * ACE_OS::strecpy (char *s, const char *t) @@ -81,7 +85,6 @@ ACE_OS::strecpy (char *s, const char *t) return dscan; } -#if defined (ACE_HAS_WCHAR) wchar_t * ACE_OS::strecpy (wchar_t *s, const wchar_t *t) { @@ -93,7 +96,6 @@ ACE_OS::strecpy (wchar_t *s, const wchar_t *t) return dscan; } -#endif /* ACE_HAS_WCHAR */ char * ACE_OS::strerror (int errnum) @@ -103,9 +105,7 @@ ACE_OS::strerror (int errnum) if (ACE::is_sock_error (errnum)) { const ACE_TCHAR *errortext = ACE::sock_error (errnum); - ACE_OS::strncpy (ret_errortext, - ACE_TEXT_ALWAYS_CHAR (errortext), - sizeof (ret_errortext)); + ACE_OS::string_copy (ret_errortext, errortext, sizeof (ret_errortext)); return ret_errortext; } #if defined (ACE_LACKS_STRERROR) @@ -158,11 +158,11 @@ ACE_OS::strnchr (const char *s, int c, size_t len) return 0; } -const ACE_WCHAR_T * -ACE_OS::strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len) +const wchar_t * +ACE_OS::strnchr (const wchar_t *s, wint_t c, size_t len) { for (size_t i = 0; i < len; ++i) - if (s[i] == c) + if (s[i] == static_cast<wchar_t> (c)) return s + i; return 0; @@ -191,8 +191,8 @@ ACE_OS::strnstr (const char *s1, const char *s2, size_t len2) return 0; } -const ACE_WCHAR_T * -ACE_OS::strnstr (const ACE_WCHAR_T *s1, const ACE_WCHAR_T *s2, size_t len2) +const wchar_t * +ACE_OS::strnstr (const wchar_t *s1, const wchar_t *s2, size_t len2) { // Substring length const size_t len1 = ACE_OS::strlen (s1); @@ -206,7 +206,7 @@ ACE_OS::strnstr (const ACE_WCHAR_T *s1, const ACE_WCHAR_T *s2, size_t len2) for (size_t i = 0; i <= len; i++) { - if (ACE_OS::memcmp (s1 + i, s2, len2 * sizeof (ACE_WCHAR_T)) == 0) + if (ACE_OS::memcmp (s1 + i, s2, len2 * sizeof (wchar_t)) == 0) // Found a match! Return the index. return s1 + i; } @@ -318,11 +318,11 @@ ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen) return dst; } -ACE_WCHAR_T * -ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen) +wchar_t * +ACE_OS::strsncpy (wchar_t *dst, const wchar_t *src, size_t maxlen) { - register ACE_WCHAR_T *rdst = dst; - register const ACE_WCHAR_T *rsrc = src; + register wchar_t *rdst = dst; + register const wchar_t *rsrc = src; register size_t rmaxlen = maxlen; if (rmaxlen > 0) @@ -384,11 +384,11 @@ ACE_OS::strtok_r_emulation (char *s, const char *tokens, char **lasts) } #endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ -# if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSTOK) +# if defined (ACE_LACKS_WCSTOK) wchar_t* -ACE_OS::strtok_r_emulation (ACE_WCHAR_T *s, - const ACE_WCHAR_T *tokens, - ACE_WCHAR_T **lasts) +ACE_OS::strtok_r_emulation (wchar_t *s, + const wchar_t *tokens, + wchar_t **lasts) { if (s == 0) s = *lasts; @@ -407,6 +407,7 @@ ACE_OS::strtok_r_emulation (ACE_WCHAR_T *s, *lasts = s + l_sub; return s ; } -# endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSTOK */ +# endif /* ACE_LACKS_WCSTOK */ + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h index 5e4da3db673..8751b39b89a 100644 --- a/ace/OS_NS_string.h +++ b/ace/OS_NS_string.h @@ -24,9 +24,6 @@ # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Basic_Types.h" // to get ACE_WCHAR_T, - // should be in os_stddef.h or not used like this. #include "ace/ACE_export.h" #if defined (ACE_EXPORT_MACRO) @@ -91,97 +88,74 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION char *strcat (char *s, const char *t); -#if defined (ACE_HAS_WCHAR) /// Appends a string to another string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strcat (wchar_t *s, const wchar_t *t); -#endif /* ACE_HAS_WCHAR */ /// Finds the first occurance of a character in a string (const char /// version). ACE_NAMESPACE_INLINE_FUNCTION const char *strchr (const char *s, int c); -#if defined (ACE_HAS_WCHAR) /// Finds the first occurance of a character in a string (const wchar_t /// version). ACE_NAMESPACE_INLINE_FUNCTION + const wchar_t *strchr (const wchar_t *s, wchar_t c); -#endif /* ACE_HAS_WCHAR */ /// Finds the first occurance of a character in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strchr (char *s, int c); -#if defined (ACE_HAS_WCHAR) /// Finds the first occurance of a character in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION - wchar_t *strchr (wchar_t *s, wchar_t c); -#endif /* ACE_HAS_WCHAR */ - - /// Compares two strings (char version). - ACE_NAMESPACE_INLINE_FUNCTION - int strcmp (const char *s, const char *t); - /// Compares two strings (wchar_t version). - ACE_NAMESPACE_INLINE_FUNCTION - int strcmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t); + wchar_t *strchr (wchar_t *s, wchar_t c); /// Copies a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strcpy (char *s, const char *t); -#if defined (ACE_HAS_WCHAR) /// Copies a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strcpy (wchar_t *s, const wchar_t *t); -#endif /* ACE_HAS_WCHAR */ /// Searches for the first substring without any of the specified /// characters and returns the size of the substring (char version). ACE_NAMESPACE_INLINE_FUNCTION size_t strcspn (const char *s, const char *reject); -#if defined (ACE_HAS_WCHAR) /// Searches for the first substring without any of the specified /// characters and returns the size of the substring (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION size_t strcspn (const wchar_t *s, const wchar_t *reject); -#endif /* ACE_HAS_WCHAR */ /// Returns a malloced duplicated string (char version). - ACE_NAMESPACE_INLINE_FUNCTION - char *strdup (const char *s); - -#if (defined (ACE_LACKS_STRDUP) && !defined(ACE_STRDUP_EQUIVALENT)) \ - || defined (ACE_HAS_STRDUP_EMULATION) + //ACE_NAMESPACE_INLINE_FUNCTION extern ACE_Export - char *strdup_emulation (const char *s); -#endif + char *strdup (const char *s); + /* + #if (defined (ACE_LACKS_STRDUP) && !defined(ACE_STRDUP_EQUIVALENT)) \ + || defined (ACE_HAS_STRDUP_EMULATION) + extern ACE_Export + char *strdup_emulation (const char *s); + #endif + */ -#if defined (ACE_HAS_WCHAR) /// Returns a malloced duplicated string (wchar_t version). - ACE_NAMESPACE_INLINE_FUNCTION - wchar_t *strdup (const wchar_t *s); - -#if (defined (ACE_LACKS_WCSDUP) && !defined(ACE_WCSDUP_EQUIVALENT)) \ - || defined (ACE_HAS_WCSDUP_EMULATION) + //ACE_NAMESPACE_INLINE_FUNCTION extern ACE_Export - wchar_t *strdup_emulation (const wchar_t *s); -#endif -#endif /* ACE_HAS_WCHAR */ + wchar_t *strdup (const wchar_t *s); /// Copies a string, but returns a pointer to the end of the /// copied region (char version). extern ACE_Export char *strecpy (char *des, const char *src); -#if defined (ACE_HAS_WCHAR) /// Copies a string, but returns a pointer to the end of the /// copied region (wchar_t version). extern ACE_Export wchar_t *strecpy (wchar_t *s, const wchar_t *t); -#endif /* ACE_HAS_WCHAR */ /* ** Returns a system error message. If the supplied errnum is out of range, @@ -197,39 +171,33 @@ namespace ACE_OS { char *strerror_emulation (int errnum); #endif /* ACE_LACKS_STRERROR */ - /// Finds the length of a string (char version). - ACE_NAMESPACE_INLINE_FUNCTION - size_t strlen (const char *s); - - /// Finds the length of a string (ACE_WCHAR_T version). - ACE_NAMESPACE_INLINE_FUNCTION - size_t strlen (const ACE_WCHAR_T *s); - /// Appends part of a string to another string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strncat (char *s, const char *t, size_t len); /// Appends part of a string to another string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION - ACE_WCHAR_T *strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); + wchar_t *strncat (wchar_t *s, const wchar_t *t, size_t len); /// Finds the first occurance of a character in an array (const char /// version). extern ACE_Export const char *strnchr (const char *s, int c, size_t len); - /// Finds the first occurance of a character in an array (const ACE_WCHAR_T + /// Finds the first occurance of a character in an array (const wchar_t /// version). extern ACE_Export - const ACE_WCHAR_T *strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len); + + const wchar_t *strnchr (const wchar_t *s, wint_t c, size_t len); /// Finds the first occurance of a character in an array (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strnchr (char *s, int c, size_t len); - /// Finds the first occurance of a character in an array (ACE_WCHAR_T version). + /// Finds the first occurance of a character in an array (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION - ACE_WCHAR_T *strnchr (ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len); + + wchar_t *strnchr (wchar_t *s, wint_t c, size_t len); /// Compares two arrays (char version). ACE_NAMESPACE_INLINE_FUNCTION @@ -237,15 +205,7 @@ namespace ACE_OS { /// Compares two arrays (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION - int strncmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); - - /// Copies an array (char version) - ACE_NAMESPACE_INLINE_FUNCTION - char *strncpy (char *s, const char *t, size_t len); - - /// Copies an array (ACE_WCHAR_T version) - ACE_NAMESPACE_INLINE_FUNCTION - ACE_WCHAR_T *strncpy (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); + int strncmp (const wchar_t *s, const wchar_t *t, size_t len); /// Finds the length of a limited-length string (char version). /** @@ -259,7 +219,7 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION size_t strnlen (const char *s, size_t maxlen); - /// Finds the length of a limited-length string (ACE_WCHAR_T version). + /// Finds the length of a limited-length string (wchar_t version). /** * @param s The character string to find the length of. * @param maxlen The maximum number of characters that will be @@ -269,7 +229,7 @@ namespace ACE_OS { * is located, else @arg maxlen. */ ACE_NAMESPACE_INLINE_FUNCTION - size_t strnlen (const ACE_WCHAR_T *s, size_t maxlen); + size_t strnlen (const wchar_t *s, size_t maxlen); /// Finds the first occurance of a substring in an array (const char /// version). @@ -279,8 +239,8 @@ namespace ACE_OS { /// Finds the first occurance of a substring in an array (const wchar_t /// version). extern ACE_Export - const ACE_WCHAR_T *strnstr (const ACE_WCHAR_T *s, - const ACE_WCHAR_T *t, + const wchar_t *strnstr (const wchar_t *s, + const wchar_t *t, size_t len); /// Finds the first occurance of a substring in an array (char version). @@ -289,27 +249,23 @@ namespace ACE_OS { /// Finds the first occurance of a substring in an array (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION - ACE_WCHAR_T *strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len); + wchar_t *strnstr (wchar_t *s, const wchar_t *t, size_t len); /// Searches for characters in a string (const char version). ACE_NAMESPACE_INLINE_FUNCTION const char *strpbrk (const char *s1, const char *s2); -#if defined (ACE_HAS_WCHAR) /// Searches for characters in a string (const wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION const wchar_t *strpbrk (const wchar_t *s1, const wchar_t *s2); -#endif /* ACE_HAS_WCHAR */ /// Searches for characters in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strpbrk (char *s1, const char *s2); -#if defined (ACE_HAS_WCHAR) /// Searches for characters in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strpbrk (wchar_t *s1, const wchar_t *s2); -#endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_STRPBRK) /// Emulated strpbrk - Searches for characters in a string. @@ -323,22 +279,20 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION const char *strrchr (const char *s, int c); -#if defined (ACE_HAS_WCHAR) /// Finds the last occurance of a character in a string (const wchar_t /// version). ACE_NAMESPACE_INLINE_FUNCTION + const wchar_t *strrchr (const wchar_t *s, wchar_t c); -#endif /* ACE_HAS_WCHAR */ /// Finds the last occurance of a character in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strrchr (char *s, int c); -#if defined (ACE_HAS_WCHAR) /// Finds the last occurance of a character in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION + wchar_t *strrchr (wchar_t *s, wchar_t c); -#endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_STRRCHR) /// Emulated strrchr (char version) - Finds the last occurance of a @@ -390,8 +344,8 @@ namespace ACE_OS { * strncpy() is needed. */ extern ACE_Export - ACE_WCHAR_T *strsncpy (ACE_WCHAR_T *dst, - const ACE_WCHAR_T *src, + wchar_t *strsncpy (wchar_t *dst, + const wchar_t *src, size_t maxlen); /// Searches for the first substring containing only the specified @@ -399,12 +353,10 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION size_t strspn (const char *s1, const char *s2); -#if defined (ACE_HAS_WCHAR) /// Searches for the first substring containing only the specified /// characters and returns the size of the substring (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION size_t strspn (const wchar_t *s1, const wchar_t *s2); -#endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_STRSPN) /// Emulated wcsspn. @@ -418,32 +370,26 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION const char *strstr (const char *s, const char *t); -#if defined (ACE_HAS_WCHAR) /// Finds the first occurance of a substring in a string (const wchar_t /// version). ACE_NAMESPACE_INLINE_FUNCTION const wchar_t *strstr (const wchar_t *s, const wchar_t *t); -#endif /* ACE_HAS_WCHAR */ /// Finds the first occurance of a substring in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strstr (char *s, const char *t); -#if defined (ACE_HAS_WCHAR) /// Finds the first occurance of a substring in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strstr (wchar_t *s, const wchar_t *t); -#endif /* ACE_HAS_WCHAR */ /// Finds the next token in a string (char version). ACE_NAMESPACE_INLINE_FUNCTION char *strtok (char *s, const char *tokens); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOK) /// Finds the next token in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION wchar_t *strtok (wchar_t *s, const wchar_t *tokens); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOK */ //@} @@ -451,11 +397,9 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION char *strtok_r (char *s, const char *tokens, char **lasts); -#if defined (ACE_HAS_WCHAR) /// Finds the next token in a string (wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION - wchar_t *strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts); -#endif // ACE_HAS_WCHAR + wchar_t *strtok_r (wchar_t *s, const wchar_t *tokens, wchar_t **lasts); #if !defined (ACE_HAS_REENTRANT_FUNCTIONS) /// Emulated strtok_r. @@ -463,14 +407,15 @@ namespace ACE_OS { char *strtok_r_emulation (char *s, const char *tokens, char **lasts); #endif /* !ACE_HAS_REENTRANT_FUNCTIONS */ -# if defined (ACE_HAS_WCHAR) && defined(ACE_LACKS_WCSTOK) +# if defined(ACE_LACKS_WCSTOK) /// Emulated strtok_r (wchar_t version). extern ACE_Export - wchar_t *strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts); -# endif // ACE_HAS_WCHAR && ACE_LACKS_WCSTOK + wchar_t *strtok_r_emulation (wchar_t *s, const wchar_t *tokens, wchar_t **lasts); +# endif // ACE_LACKS_WCSTOK } /* namespace ACE_OS */ + ACE_END_VERSIONED_NAMESPACE_DECL # if defined (ACE_HAS_INLINED_OSCALLS) diff --git a/ace/OS_NS_string.inl b/ace/OS_NS_string.inl index 38e42378157..557dd7e0d27 100644 --- a/ace/OS_NS_string.inl +++ b/ace/OS_NS_string.inl @@ -61,7 +61,6 @@ ACE_OS::strcat (char *s, const char *t) return ::strcat (s, t); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::strcat (wchar_t *s, const wchar_t *t) { @@ -71,7 +70,6 @@ ACE_OS::strcat (wchar_t *s, const wchar_t *t) return ::wcscat (s, t); # endif /* ACE_LACKS_WCSCAT */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE const char * ACE_OS::strchr (const char *s, int c) @@ -83,7 +81,6 @@ ACE_OS::strchr (const char *s, int c) #endif /* ACE_LACKS_STRCHR */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE const wchar_t * ACE_OS::strchr (const wchar_t *s, wchar_t c) { @@ -93,7 +90,6 @@ ACE_OS::strchr (const wchar_t *s, wchar_t c) return ::wcschr (s, c); # endif /* ACE_LACKS_WCSCHR */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE char * ACE_OS::strchr (char *s, int c) @@ -101,7 +97,6 @@ ACE_OS::strchr (char *s, int c) return ::strchr (s, c); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::strchr (wchar_t *s, wchar_t c) { @@ -109,23 +104,6 @@ ACE_OS::strchr (wchar_t *s, wchar_t c) const_cast<wchar_t *> (ACE_OS::strchr (const_cast<const wchar_t *> (s), c)); } -#endif /* ACE_HAS_WCHAR */ - -ACE_INLINE int -ACE_OS::strcmp (const char *s, const char *t) -{ - return ::strcmp (s, t); -} - -ACE_INLINE int -ACE_OS::strcmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t) -{ -# if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP) - return ACE_OS::wcscmp_emulation (s, t); -# else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */ - return ::wcscmp (s, t); -# endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */ -} ACE_INLINE char * ACE_OS::strcpy (char *s, const char *t) @@ -133,7 +111,6 @@ ACE_OS::strcpy (char *s, const char *t) return ::strcpy (s, t); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::strcpy (wchar_t *s, const wchar_t *t) { @@ -143,7 +120,6 @@ ACE_OS::strcpy (wchar_t *s, const wchar_t *t) return ::wcscpy (s, t); # endif /* ACE_LACKS_WCSCPY */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE size_t ACE_OS::strcspn (const char *s, const char *reject) @@ -151,7 +127,6 @@ ACE_OS::strcspn (const char *s, const char *reject) return ::strcspn (s, reject); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE size_t ACE_OS::strcspn (const wchar_t *s, const wchar_t *reject) { @@ -161,55 +136,6 @@ ACE_OS::strcspn (const wchar_t *s, const wchar_t *reject) return ::wcscspn (s, reject); # endif /* ACE_LACKS_WCSCSPN */ } -#endif /* ACE_HAS_WCHAR */ - -ACE_INLINE char * -ACE_OS::strdup (const char *s) -{ -# if (defined (ACE_LACKS_STRDUP) && !defined(ACE_STRDUP_EQUIVALENT)) \ - || defined (ACE_HAS_STRDUP_EMULATION) - return ACE_OS::strdup_emulation (s); -# elif defined (ACE_STRDUP_EQUIVALENT) - return ACE_STRDUP_EQUIVALENT (s); -# elif defined (ACE_HAS_NONCONST_STRDUP) - return ::strdup (const_cast<char *> (s)); -#else - return ::strdup (s); -# endif /* (ACE_LACKS_STRDUP && !ACE_STRDUP_EQUIVALENT) || ... */ -} - -#if defined (ACE_HAS_WCHAR) -ACE_INLINE wchar_t * -ACE_OS::strdup (const wchar_t *s) -{ -# if (defined (ACE_LACKS_WCSDUP) && !defined (ACE_WCSDUP_EQUIVALENT)) \ - || defined (ACE_HAS_WCSDUMP_EMULATION) - return ACE_OS::strdup_emulation (s); -# elif defined (ACE_WCSDUP_EQUIVALENT) - return ACE_WCSDUP_EQUIVALENT (s); -# elif defined (ACE_HAS_NONCONST_WCSDUP) - return ::wcsdup (const_cast<wchar_t*> (s)); -# else - return ::wcsdup (s); -# endif /* (ACE_LACKS_WCSDUP && !ACE_WCSDUP_EQUIVALENT) || ... */ -} -#endif /* ACE_HAS_WCHAR */ - -ACE_INLINE size_t -ACE_OS::strlen (const char *s) -{ - return ::strlen (s); -} - -ACE_INLINE size_t -ACE_OS::strlen (const ACE_WCHAR_T *s) -{ -# if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSLEN) - return ACE_OS::wcslen_emulation (s); -# else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */ - return ::wcslen (s); -# endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */ -} ACE_INLINE char * ACE_OS::strncat (char *s, const char *t, size_t len) @@ -217,14 +143,14 @@ ACE_OS::strncat (char *s, const char *t, size_t len) return ::strncat (s, t, len); } -ACE_INLINE ACE_WCHAR_T * -ACE_OS::strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) +ACE_INLINE wchar_t * +ACE_OS::strncat (wchar_t *s, const wchar_t *t, size_t len) { -# if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT) +# if defined (ACE_LACKS_WCSNCAT) return ACE_OS::wcsncat_emulation (s, t, len); -# else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */ +# else /* ACE_LACKS_WCSNCAT */ return ::wcsncat (s, t, len); -# endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */ +# endif /* ACE_LACKS_WCSNCAT */ } ACE_INLINE char * @@ -240,12 +166,12 @@ ACE_OS::strnchr (char *s, int c, size_t len) #endif } -ACE_INLINE ACE_WCHAR_T * -ACE_OS::strnchr (ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len) +ACE_INLINE wchar_t * +ACE_OS::strnchr (wchar_t *s, wint_t c, size_t len) { return - const_cast<ACE_WCHAR_T *> (ACE_OS::strnchr ( - const_cast<const ACE_WCHAR_T *> (s), + const_cast<wchar_t *> (ACE_OS::strnchr ( + static_cast<const wchar_t *> (s), c, len)); } @@ -257,29 +183,13 @@ ACE_OS::strncmp (const char *s, const char *t, size_t len) } ACE_INLINE int -ACE_OS::strncmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) +ACE_OS::strncmp (const wchar_t *s, const wchar_t *t, size_t len) { -# if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP) +# if defined (ACE_LACKS_WCSNCMP) return ACE_OS::wcsncmp_emulation (s, t, len); -# else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */ +# else /* ACE_LACKS_WCSNCMP */ return ::wcsncmp (s, t, len); -# endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */ -} - -ACE_INLINE char * -ACE_OS::strncpy (char *s, const char *t, size_t len) -{ - return ::strncpy (s, t, len); -} - -ACE_INLINE ACE_WCHAR_T * -ACE_OS::strncpy (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) -{ -# if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCPY) - return ACE_OS::wcsncpy_emulation (s, t, len); -# else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */ - return ::wcsncpy (s, t, len); -# endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */ +# endif /* ACE_LACKS_WCSNCMP */ } ACE_INLINE size_t @@ -297,9 +207,9 @@ ACE_OS::strnlen (const char *s, size_t maxlen) } ACE_INLINE size_t -ACE_OS::strnlen (const ACE_WCHAR_T *s, size_t maxlen) +ACE_OS::strnlen (const wchar_t *s, size_t maxlen) { -#if defined (ACE_HAS_WCHAR) && defined (ACE_HAS_WCSNLEN) +#if defined (ACE_HAS_WCSNLEN) return wcsnlen (s, maxlen); #else /* ACE_HAS_WCSNLEN */ size_t i; @@ -321,12 +231,12 @@ ACE_OS::strnstr (char *s, const char *t, size_t len) #endif } -ACE_INLINE ACE_WCHAR_T * -ACE_OS::strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len) +ACE_INLINE wchar_t * +ACE_OS::strnstr (wchar_t *s, const wchar_t *t, size_t len) { return - const_cast<ACE_WCHAR_T *> (ACE_OS::strnstr ( - static_cast<const ACE_WCHAR_T *> (s), + const_cast<wchar_t *> (ACE_OS::strnstr ( + static_cast<const wchar_t *> (s), t, len)); } @@ -341,7 +251,6 @@ ACE_OS::strpbrk (const char *s1, const char *s2) #endif /* ACE_LACKS_STRPBRK */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE const wchar_t * ACE_OS::strpbrk (const wchar_t *s, const wchar_t *t) { @@ -351,7 +260,6 @@ ACE_OS::strpbrk (const wchar_t *s, const wchar_t *t) return ::wcspbrk (s, t); # endif /* ACE_LACKS_WCSPBRK */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE char * ACE_OS::strpbrk (char *s1, const char *s2) @@ -363,14 +271,12 @@ ACE_OS::strpbrk (char *s1, const char *s2) #endif /* ACE_LACKS_STRPBRK */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::strpbrk (wchar_t *s, const wchar_t *t) { return const_cast<wchar_t *> (ACE_OS::strpbrk ( const_cast<const wchar_t *> (s), t)); } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE const char * ACE_OS::strrchr (const char *s, int c) @@ -382,7 +288,6 @@ ACE_OS::strrchr (const char *s, int c) #endif /* ! ACE_LACKS_STRRCHR */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE const wchar_t * ACE_OS::strrchr (const wchar_t *s, wchar_t c) { @@ -392,7 +297,6 @@ ACE_OS::strrchr (const wchar_t *s, wchar_t c) return const_cast <const wchar_t *> (::wcsrchr (s, c)); #endif /* ! ACE_LACKS_WCSRCHR */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE char * ACE_OS::strrchr (char *s, int c) @@ -404,14 +308,12 @@ ACE_OS::strrchr (char *s, int c) #endif /* ! ACE_LACKS_STRRCHR */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::strrchr (wchar_t *s, wchar_t c) { return const_cast<wchar_t *> (ACE_OS::strrchr ( const_cast<const wchar_t *> (s), c)); } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE size_t ACE_OS::strspn (const char *s, const char *t) @@ -423,7 +325,6 @@ ACE_OS::strspn (const char *s, const char *t) #endif /* ACE_LACKS_STRSPN */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE size_t ACE_OS::strspn (const wchar_t *s, const wchar_t *t) { @@ -433,7 +334,6 @@ ACE_OS::strspn (const wchar_t *s, const wchar_t *t) return ::wcsspn (s, t); # endif /* ACE_LACKS_WCSSPN */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE const char * ACE_OS::strstr (const char *s, const char *t) @@ -441,7 +341,6 @@ ACE_OS::strstr (const char *s, const char *t) return (const char *) ::strstr (s, t); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE const wchar_t * ACE_OS::strstr (const wchar_t *s, const wchar_t *t) { @@ -453,7 +352,6 @@ ACE_OS::strstr (const wchar_t *s, const wchar_t *t) return const_cast <const wchar_t *> (::wcsstr (s, t)); # endif /* ACE_LACKS_WCSSTR */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE char * ACE_OS::strstr (char *s, const char *t) @@ -461,7 +359,6 @@ ACE_OS::strstr (char *s, const char *t) return ::strstr (s, t); } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::strstr (wchar_t *s, const wchar_t *t) { @@ -473,7 +370,6 @@ ACE_OS::strstr (wchar_t *s, const wchar_t *t) return ::wcsstr (s, t); # endif /* ACE_LACKS_WCSSTR */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE char * ACE_OS::strtok (char *s, const char *tokens) @@ -481,18 +377,20 @@ ACE_OS::strtok (char *s, const char *tokens) return ::strtok (s, tokens); } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOK) ACE_INLINE wchar_t * ACE_OS::strtok (wchar_t *s, const wchar_t *tokens) { #if defined (ACE_HAS_3_PARAM_WCSTOK) static wchar_t *lasts; return ::wcstok (s, tokens, &lasts); -#else +#elif !defined (ACE_LACKS_WCSTOK) return ::wcstok (s, tokens); +#else + ACE_UNUSED_ARG( s ); + ACE_UNUSED_ARG( tokens ); + ACE_NOTSUP_RETURN (0); #endif /* ACE_HAS_3_PARAM_WCSTOK */ } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOK */ ACE_INLINE char * ACE_OS::strtok_r (char *s, const char *tokens, char **lasts) @@ -504,9 +402,8 @@ ACE_OS::strtok_r (char *s, const char *tokens, char **lasts) #endif /* (ACE_HAS_REENTRANT_FUNCTIONS) */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t* -ACE_OS::strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts) +ACE_OS::strtok_r (wchar_t *s, const wchar_t *tokens, wchar_t **lasts) { #if defined (ACE_LACKS_WCSTOK) return ACE_OS::strtok_r_emulation (s, tokens, lasts); @@ -519,6 +416,6 @@ ACE_OS::strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts # endif /* ACE_HAS_3_PARAM_WCSTOK */ #endif /* ACE_LACKS_WCSTOK */ } -#endif // ACE_HAS_WCHAR + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_strings.h b/ace/OS_NS_strings.h index 70d8e17cf5b..e834afac831 100644 --- a/ace/OS_NS_strings.h +++ b/ace/OS_NS_strings.h @@ -44,21 +44,17 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int strcasecmp (const char *s, const char *t); -#if defined (ACE_HAS_WCHAR) /// Compares two strings (case insensitive const wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION int strcasecmp (const wchar_t *s, const wchar_t *t); -#endif /* ACE_HAS_WCHAR */ /// Compares two arrays (case insensitive const char version). ACE_NAMESPACE_INLINE_FUNCTION int strncasecmp (const char *s, const char *t, size_t len); -#if defined (ACE_HAS_WCHAR) /// Compares two arrays (case insensitive const wchar_t version). ACE_NAMESPACE_INLINE_FUNCTION int strncasecmp (const wchar_t *s, const wchar_t *t, size_t len); -#endif /* ACE_HAS_WCHAR */ #if defined (ACE_LACKS_STRCASECMP) /// Emulated strcasecmp - Performs a case insensitive comparison of strings. diff --git a/ace/OS_NS_strings.inl b/ace/OS_NS_strings.inl index 2b2012b2f38..4e5d0f40dc0 100644 --- a/ace/OS_NS_strings.inl +++ b/ace/OS_NS_strings.inl @@ -2,9 +2,7 @@ // // $Id$ -#if defined (ACE_HAS_WCHAR) # include "ace/OS_NS_wchar.h" -#endif /* ACE_HAS_WCHAR */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -20,7 +18,6 @@ ACE_OS::strcasecmp (const char *s, const char *t) #endif /* ACE_LACKS_STRCASECMP */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t) { @@ -30,7 +27,6 @@ ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t) return ::_wcsicmp (s, t); # endif /* ACE_LACKS_WCSICMP */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::strncasecmp (const char *s, const char *t, size_t len) @@ -44,7 +40,6 @@ ACE_OS::strncasecmp (const char *s, const char *t, size_t len) #endif /* ACE_LACKS_STRCASECMP */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len) { @@ -54,6 +49,5 @@ ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len) return ::_wcsnicmp (s, t, len); #endif /* ACE_LACKS_WCSNICMP */ } -#endif /* ACE_HAS_WCHAR */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl index eb7449779fb..0379ca02468 100644 --- a/ace/OS_NS_sys_mman.inl +++ b/ace/OS_NS_sys_mman.inl @@ -308,9 +308,9 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, ACE_OS_TRACE ("ACE_OS::shm_open"); # if defined (ACE_HAS_SHM_OPEN) ACE_UNUSED_ARG (sa); - ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_TO_CHAR_IN(filename), mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE); # elif defined (ACE_OPENVMS) - ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_LIB_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE); # else /* ! ACE_HAS_SHM_OPEN */ // Just use ::open. return ACE_OS::open (filename, mode, perms, sa); @@ -322,7 +322,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path) { ACE_OS_TRACE ("ACE_OS::shm_unlink"); # if defined (ACE_HAS_SHM_OPEN) - ACE_OSCALL_RETURN (::shm_unlink (ACE_TEXT_ALWAYS_CHAR(path)), int, -1); + ACE_OSCALL_RETURN (::shm_unlink (ACE_TEXT_TO_CHAR_IN(path)), int, -1); # else /* ! ACE_HAS_SHM_OPEN */ // Just use ::unlink. return ACE_OS::unlink (path); diff --git a/ace/OS_NS_sys_stat.h b/ace/OS_NS_sys_stat.h index 76f029245cc..dfae190203e 100644 --- a/ace/OS_NS_sys_stat.h +++ b/ace/OS_NS_sys_stat.h @@ -68,21 +68,17 @@ namespace ACE_OS int lstat (const char *, ACE_stat *); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int lstat (const wchar_t *, ACE_stat *); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int mkdir (const char *path, mode_t mode = ACE_DEFAULT_DIR_PERMS); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int mkdir (const wchar_t *path, mode_t mode = ACE_DEFAULT_DIR_PERMS); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int mkfifo (const ACE_TCHAR *file, @@ -91,10 +87,8 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int stat (const char *file, ACE_stat *); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int stat (const wchar_t *file, ACE_stat *); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION mode_t umask (mode_t cmask); diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl index 448cfcd3246..6ae9a7a435d 100644 --- a/ace/OS_NS_sys_stat.inl +++ b/ace/OS_NS_sys_stat.inl @@ -27,7 +27,7 @@ namespace ACE_OS ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode), + ACE_OSCALL_RETURN (::creat (ACE_TEXT_TO_CHAR_IN (filename), mode), ACE_HANDLE, ACE_INVALID_HANDLE); #endif /* ACE_WIN32 */ } @@ -154,7 +154,6 @@ namespace ACE_OS # endif /* ACE_LACKS_LSTAT */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int lstat (const wchar_t *file, ACE_stat *stp) { @@ -162,10 +161,9 @@ namespace ACE_OS # if defined (ACE_LACKS_LSTAT) return ACE_OS::stat (file, stp); # else - return ACE_OS::lstat (ACE_Wide_To_Ascii (file).char_rep (), stp); + return ACE_OS::lstat (ACE_TEXT_TO_CHAR_IN (file), stp); # endif /* ACE_LACKS_LSTAT */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int mkdir (const char *path, mode_t mode) @@ -214,7 +212,7 @@ namespace ACE_OS ACE_OSCALL_RETURN (::_mkdir (const_cast <char *> (path)), int, -1); #elif defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (mode); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0), + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_TO_TCHAR_IN (path), 0), ace_result_), int, -1); #elif defined (ACE_MKDIR_LACKS_MODE) @@ -225,8 +223,6 @@ namespace ACE_OS #endif /* ACE_PSOS_LACKS_PHILE */ } -#if defined (ACE_HAS_WCHAR) - ACE_INLINE int mkdir (const wchar_t *path, mode_t mode) { @@ -239,12 +235,10 @@ namespace ACE_OS ACE_UNUSED_ARG (mode); ACE_OSCALL_RETURN (::_wmkdir (path), int, -1); #else - return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode); + return ACE_OS::mkdir (ACE_TEXT_TO_CHAR_IN (path), mode); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ - ACE_INLINE int mkfifo (const ACE_TCHAR *file, mode_t mode) { @@ -254,7 +248,7 @@ namespace ACE_OS ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode), int, -1); + ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_TO_CHAR_IN (file), mode), int, -1); #endif /* ACE_LACKS_MKFIFO */ } @@ -275,7 +269,7 @@ namespace ACE_OS HANDLE fhandle; - fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata); + fhandle = ::FindFirstFile (ACE_TEXT_TO_TCHAR_IN (file), &fdata); if (fhandle == INVALID_HANDLE_VALUE) { ACE_OS::set_errno_to_last_error (); @@ -309,7 +303,6 @@ namespace ACE_OS #endif /* ACE_HAS_NONCONST_STAT */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int stat (const wchar_t *file, ACE_stat *stp) { @@ -343,11 +336,9 @@ namespace ACE_OS #elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wstat (file, (struct _stat *) stp), int, -1); #else /* ACE_HAS_WINCE */ - ACE_Wide_To_Ascii nfile (file); - return ACE_OS::stat (nfile.char_rep (), stp); + return ACE_OS::stat (ACE_TEXT_TO_CHAR_IN (file), stp); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE mode_t umask (mode_t cmask) diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl index 99ca079478c..fbce238b080 100644 --- a/ace/OS_NS_time.inl +++ b/ace/OS_NS_time.inl @@ -7,6 +7,7 @@ #include "ace/Time_Value.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_time.h" +//#include "ace/TSS_T.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -115,24 +116,31 @@ ACE_OS::ctime (const time_t *t) #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0); #else -# if defined (ACE_USES_WCHAR) /* Not Win32, else it would do the above */ +# if defined (ACE_USES_WCHAR) // Wide and not Win32 char *narrow_time; ACE_OSCALL (::ctime (t), char *, 0, narrow_time); if (narrow_time == 0) return 0; - // ACE_Ascii_To_Wide::convert allocates (via new []) a wchar_t[]. If + // ACE_TEXT_TO_MALLOC_WCHAR_OUT allocates (via malloc) a wchar_t[]. If // we've done this before, free the previous one. Yes, this leaves a // small memory leak (26 characters) but there's no way around this // that I know of. (Steve Huston, 12-Feb-2003). - static wchar_t *wide_time = 0; - if (wide_time != 0) - delete [] wide_time; - wide_time = ACE_Ascii_To_Wide::convert (narrow_time); +// Including ACE_TSS_T.h causes error! +/* + wchar_t* init = 0; + static ACE_TSS< wchar_t* > wide_time (&init); + ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wide_time); + *wide_time.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT (narrow_time); + return *wide_time; +*/ + static wchar_t* wide_time = 0; + ACE::String_Conversion::Allocator_malloc<wchar_t>().free(wide_time); + wide_time = ACE_TEXT_TO_MALLOC_WCHAR_OUT (narrow_time); return wide_time; # else ACE_OSCALL_RETURN (::ctime (t), char *, 0); -# endif /* ACE_USES_WCHAR */ -# endif /* ACE_HAS_BROKEN_CTIME */ +# endif // ACE_USES_WCHAR +# endif // ACE_HAS_BROKEN_CTIME } #if !defined (ACE_HAS_WINCE) /* CE version in OS.cpp */ @@ -178,8 +186,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; # if defined (ACE_USES_WCHAR) - ACE_Ascii_To_Wide wide_buf (bufp); - ACE_OS_String::strcpy (buf, wide_buf.wchar_rep ()); + ACE_OS::string_copy (buf, bufp, buflen); return buf; # else return bufp; @@ -558,4 +565,5 @@ ACE_OS::tzset (void) # endif /* ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS && !__rtems__ && !ACE_HAS_DINKUM_STL */ } + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp index b39f0e527e3..3c3c2ecd823 100644 --- a/ace/OS_NS_unistd.cpp +++ b/ace/OS_NS_unistd.cpp @@ -54,7 +54,7 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, // Account for environment variables. if (substitute_env_args && argv[i][0] == ACE_LIB_TEXT ('$')) { -# if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR) +# if defined (ACE_WIN32) ACE_TCHAR *temp = 0; // Win32 is the only platform with a wide-char ACE_OS::getenv(). if ((temp = ACE_OS::getenv (&argv[i][1])) != 0) @@ -62,17 +62,17 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, else buf_len += ACE_OS::strlen (argv[i]); # else - // This is an ACE_HAS_WCHAR platform and not ACE_WIN32. + // This is not ACE_WIN32. // Convert the env variable name for getenv(), then add // the length of the returned char *string. Later, when we // actually use the returned env variable value, convert it // as well. - char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[i][1])); + char *ctemp = ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (&argv[i][1])); if (ctemp == 0) buf_len += ACE_OS::strlen (argv[i]); else buf_len += ACE_OS::strlen (ctemp); -# endif /* ACE_WIN32 || !ACE_HAS_WCHAR */ +# endif /* ACE_WIN32 */ } else #endif /* ACE_LACKS_ENV */ @@ -101,7 +101,7 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, // Account for environment variables. if (substitute_env_args && argv[j][0] == ACE_LIB_TEXT ('$')) { -# if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR) +# if defined (ACE_WIN32) // Win32 is the only platform with a wide-char ACE_OS::getenv(). ACE_TCHAR *temp = ACE_OS::getenv (&argv[j][1]); if (temp != 0) @@ -109,15 +109,15 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, else end = ACE_OS::strecpy (end, argv[j]); # else - // This is an ACE_HAS_WCHAR platform and not ACE_WIN32. + // This is not ACE_WIN32. // Convert the env variable name for getenv(), then convert // the returned char *string back to wchar_t. - char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[j][1])); + char *ctemp = ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (&argv[j][1])); if (ctemp == 0) end = ACE_OS::strecpy (end, argv[j]); else - end = ACE_OS::strecpy (end, ACE_TEXT_CHAR_TO_TCHAR (ctemp)); -# endif /* ACE_WIN32 || !ACE_HAS_WCHAR */ + end = ACE_OS::strecpy (end, ACE_TEXT_TO_TCHAR_IN (ctemp)); +# endif /* ACE_WIN32 */ } else #endif /* ACE_LACKS_ENV */ @@ -248,7 +248,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) // narrow char strings for execv(). char **cargv; int arg_count; -# endif /* ACE_HAS_WCHAR */ +# endif /* ACE_USES_WCHAR */ switch (result) { @@ -267,7 +267,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) --arg_count; // Back to 0-indexed cargv[arg_count] = 0; while (--arg_count >= 0) - cargv[arg_count] = ACE_Wide_To_Ascii::convert (argv[arg_count]); + cargv[arg_count] = ACE_TEXT_TO_CHAR_OUT(argv[arg_count]); // memory allocated! // 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) @@ -282,7 +282,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) // If the execv fails, this child needs to exit. ACE_OS::exit (errno); } -# endif /* ACE_HAS_WCHAR */ +# endif /* ACE_USES_WCHAR */ default: // Server process. The fork succeeded. @@ -616,135 +616,6 @@ ACE_OS::pwrite (ACE_HANDLE handle, # endif /* ACE_HAD_P_READ_WRITE */ } -int -ACE_OS::string_to_argv (ACE_TCHAR *buf, - int &argc, - ACE_TCHAR **&argv, - bool substitute_env_args) -{ - // Reset the number of arguments - argc = 0; - - if (buf == 0) - return -1; - - ACE_TCHAR *cp = buf; - - // First pass: count arguments. - - // '#' is the start-comment token.. - while (*cp != ACE_LIB_TEXT ('\0') && *cp != ACE_LIB_TEXT ('#')) - { - // Skip whitespace.. - while (ACE_OS::ace_isspace (*cp)) - cp++; - - // Increment count and move to next whitespace.. - if (*cp != ACE_LIB_TEXT ('\0')) - argc++; - - while (*cp != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*cp)) - { - // Grok quotes.... - if (*cp == ACE_LIB_TEXT ('\'') || *cp == ACE_LIB_TEXT ('"')) - { - ACE_TCHAR quote = *cp; - - // Scan past the string.. - for (cp++; *cp != ACE_LIB_TEXT ('\0') && *cp != quote; cp++) - continue; - - // '\0' implies unmatched quote.. - if (*cp == ACE_LIB_TEXT ('\0')) - { - argc--; - break; - } - else - cp++; - } - else - cp++; - } - } - - // Second pass: copy arguments. - ACE_TCHAR arg[ACE_DEFAULT_ARGV_BUFSIZ]; - ACE_TCHAR *argp = arg; - - // Make sure that the buffer we're copying into is always large - // enough. - if (cp - buf >= ACE_DEFAULT_ARGV_BUFSIZ) - ACE_NEW_RETURN (argp, - ACE_TCHAR[cp - buf + 1], - -1); - - // Make a new argv vector of argc + 1 elements. - ACE_NEW_RETURN (argv, - ACE_TCHAR *[argc + 1], - -1); - - ACE_TCHAR *ptr = buf; - - for (int i = 0; i < argc; i++) - { - // Skip whitespace.. - while (ACE_OS::ace_isspace (*ptr)) - ptr++; - - // Copy next argument and move to next whitespace.. - cp = argp; - while (*ptr != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*ptr)) - if (*ptr == ACE_LIB_TEXT ('\'') || *ptr == ACE_LIB_TEXT ('"')) - { - ACE_TCHAR quote = *ptr++; - - while (*ptr != ACE_LIB_TEXT ('\0') && *ptr != quote) - *cp++ = *ptr++; - - if (*ptr == quote) - ptr++; - } - else - *cp++ = *ptr++; - - *cp = ACE_LIB_TEXT ('\0'); - -#if !defined (ACE_LACKS_ENV) - // Check for environment variable substitution here. - if (substitute_env_args) { - argv[i] = ACE_OS::strenvdup(argp); - - if (argv[i] == 0) - { - if (argp != arg) - delete [] argp; - errno = ENOMEM; - return -1; - } - } - else -#endif /* ACE_LACKS_ENV */ - { - argv[i] = ACE_OS::strdup(argp); - - if (argv[i] == 0) - { - if (argp != arg) - delete [] argp; - errno = ENOMEM; - return -1; - } - } - } - - if (argp != arg) - delete [] argp; - - argv[argc] = 0; - return 0; -} - // Write <len> bytes from <buf> to <handle> (uses the <write> // system call on UNIX and the <WriteFile> call on Win32). diff --git a/ace/OS_NS_unistd.h b/ace/OS_NS_unistd.h index 831646bf47e..664102547fd 100644 --- a/ace/OS_NS_unistd.h +++ b/ace/OS_NS_unistd.h @@ -49,10 +49,8 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int access (const char *path, int amode); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int access (const wchar_t *path, int amode); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION unsigned int alarm (u_int secs); @@ -70,19 +68,15 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int chdir (const char *path); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int chdir (const wchar_t *path); -#endif /* ACE_HAS_WCHAR */ #endif /* ACE_LACKS_CHDIR */ ACE_NAMESPACE_INLINE_FUNCTION int rmdir (const char *path); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int rmdir (const wchar_t *path); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int close (ACE_HANDLE handle); @@ -144,10 +138,8 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION char *getcwd (char *, size_t); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wchar_t *getcwd (wchar_t *, size_t); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION gid_t getgid (void); @@ -183,11 +175,9 @@ namespace ACE_OS int hostname (char *name, size_t maxnamelen); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int hostname (wchar_t *name, size_t maxnamelen); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION int isatty (int handle); @@ -294,10 +284,10 @@ namespace ACE_OS int sleep (const ACE_Time_Value &tv); // used by ARGV::string_to_argv - extern ACE_Export - int string_to_argv (ACE_TCHAR *buf, + template <typename CHAR_TYPE> + int string_to_argv (CHAR_TYPE *buf, int &argc, - ACE_TCHAR **&argv, + CHAR_TYPE **&argv, bool substitute_env_args = true); ACE_NAMESPACE_INLINE_FUNCTION @@ -326,10 +316,8 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int unlink (const char *path); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION int unlink (const wchar_t *path); -#endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION ssize_t write (ACE_HANDLE handle, @@ -367,5 +355,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/OS_NS_unistd.inl" # endif /* ACE_HAS_INLINED_OSCALLS */ +#include "ace/OS_NS_unistd_T.inl" + # include /**/ "ace/post.h" #endif /* ACE_OS_NS_UNISTD_H */ diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index b961b822551..1e73cc50320 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -41,7 +41,7 @@ ACE_OS::access (const char *path, int amode) // @@ WINCE: There should be a Win32 API that can do this. // Hard coded read access here. ACE_UNUSED_ARG (amode); - FILE* handle = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(path), + FILE* handle = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(path), ACE_LIB_TEXT ("r")); if (handle != 0) { @@ -62,18 +62,15 @@ ACE_OS::access (const char *path, int amode) #endif /* ACE_LACKS_ACCESS */ } - -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1); #else /* ACE_WIN32 && !ACE_HAS_WINCE */ - return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); + return ACE_OS::access (ACE_TEXT_TO_CHAR_IN (path), amode); #endif /* ACE_WIN32 && !ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE u_int ACE_OS::alarm (u_int secs) @@ -147,17 +144,15 @@ ACE_OS::chdir (const char *path) #endif /* ACE_HAS_NONCONST_CHDIR */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::chdir (const wchar_t *path) { #if defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wchdir (path), int, -1); #else /* ACE_WIN32 */ - return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ()); + return ACE_OS::chdir (ACE_TEXT_TO_CHAR_IN (path)); #endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ #endif /* ACE_LACKS_CHDIR */ ACE_INLINE int @@ -201,7 +196,7 @@ ACE_OS::rmdir (const char *path) #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1); #elif defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR (path)), + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_TO_TCHAR_IN (path)), ace_result_), int, -1); #else @@ -209,7 +204,6 @@ ACE_OS::rmdir (const char *path) #endif /* ACE_PSOS_LACKS_PHILE */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::rmdir (const wchar_t *path) { @@ -220,11 +214,9 @@ ACE_OS::rmdir (const wchar_t *path) #elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wrmdir (path), int, -1); #else - ACE_Wide_To_Ascii n_path (path); - return ACE_OS::rmdir (n_path.char_rep ()); + return ACE_OS::rmdir (ACE_TEXT_TO_CHAR_IN (path)); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ // @todo: which 4 and why??? dhinton // NOTE: The following four function definitions must appear before @@ -540,7 +532,6 @@ ACE_OS::getcwd (char *buf, size_t size) #endif /* ACE_PSOS_LACKS_PHILE */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::getcwd (wchar_t *buf, size_t size) { @@ -551,17 +542,12 @@ ACE_OS::getcwd (wchar_t *buf, size_t size) # elif defined (ACE_WIN32) return ::_wgetcwd (buf, static_cast<int> (size)); # else - char *narrow_buf = new char[size]; - char *result = 0; - result = ACE_OS::getcwd (narrow_buf, size); - ACE_Ascii_To_Wide wide_buf (result); - delete [] narrow_buf; - if (result != 0) - ACE_OS::strsncpy (buf, wide_buf.wchar_rep (), size); - return result == 0 ? 0 : buf; + buf[0]=0; + 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 */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE gid_t ACE_OS::getgid (void) @@ -721,7 +707,6 @@ ACE_OS::hostname (char name[], size_t maxnamelen) #endif /* ACE_HAS_PHARLAP */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::hostname (wchar_t name[], size_t maxnamelen) { @@ -731,19 +716,11 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen) ace_result_), int, -1); #else /* ACE_WIN32 && !ACE_HAS_WINCE */ // Emulate using the char version - char *char_name = 0; - int result = 0; - - ACE_NEW_RETURN (char_name, char[maxnamelen], -1); - - result = ACE_OS::hostname(char_name, maxnamelen); - ACE_OS::strcpy (name, ACE_Ascii_To_Wide (char_name).wchar_rep ()); - - delete [] char_name; - return result; + name[0]=0; + ACE::String_Conversion::Convert_InOut< char, wchar_t > convert (name, maxnamelen); + return ACE_OS::hostname (convert.c_str(), convert.size()); #endif /* ACE_WIN32 && !ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::isatty (int handle) @@ -1220,7 +1197,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename, /* NOTREACHED */ #elif !defined (ACE_LACKS_TRUNCATE) ACE_OSCALL_RETURN - (::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset), int, -1); + (::truncate (ACE_TEXT_TO_CHAR_IN (filename), offset), int, -1); #else ACE_UNUSED_ARG (filename); ACE_UNUSED_ARG (offset); @@ -1280,7 +1257,7 @@ ACE_OS::unlink (const char *path) int, -1); # elif defined (ACE_HAS_WINCE) // @@ The problem is, DeleteFile is not actually equals to unlink. ;( - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_), + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_TO_TCHAR_IN (path)), ace_result_), int, -1); # elif defined (ACE_LACKS_UNLINK) ACE_UNUSED_ARG (path); @@ -1290,7 +1267,6 @@ ACE_OS::unlink (const char *path) # endif /* ACE_HAS_NONCONST_UNLINK */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::unlink (const wchar_t *path) { @@ -1302,11 +1278,9 @@ ACE_OS::unlink (const wchar_t *path) # elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wunlink (path), int, -1); # else - ACE_Wide_To_Ascii npath (path); - return ACE_OS::unlink (npath.char_rep ()); + return ACE_OS::unlink (ACE_TEXT_TO_CHAR_IN (path)); # endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE ssize_t ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte) diff --git a/ace/OS_NS_wchar.cpp b/ace/OS_NS_wchar.cpp index bc6fd7bae93..b6701492a67 100644 --- a/ace/OS_NS_wchar.cpp +++ b/ace/OS_NS_wchar.cpp @@ -1,17 +1,15 @@ // $Id$ -#include "ace/OS_NS_wchar.h" +# include "ace/OS_NS_wchar.h" -ACE_RCSID(ace, OS_NS_wchar, "$Id$") +ACE_RCSID(ace, OS_NS_wchar_t, "$Id$") #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_wchar.inl" #endif /* ACE_HAS_INLINED_OS_CALLS */ -#if defined (ACE_HAS_WCHAR) -# include "ace/OS_NS_ctype.h" -# include "ace/OS_NS_string.h" -#endif /* ACE_HAS_WCHAR */ +#include "ace/OS_NS_ctype.h" +#include "ace/OS_NS_string.h" // The following wcs*_emulation methods were created based on BSD code: /*- @@ -52,7 +50,8 @@ ACE_RCSID(ace, OS_NS_wchar, "$Id$") ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCAT) +#if defined (ACE_LACKS_WCSCAT) + wchar_t * ACE_OS::wcscat_emulation (wchar_t *destination, const wchar_t *source) @@ -63,9 +62,9 @@ ACE_OS::wcscat_emulation (wchar_t *destination, while ((*destination++ = *source++)); return save; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */ +#endif /* ACE_LACKS_WCSCAT */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR) +#if defined (ACE_LACKS_WCSCHR) wchar_t * ACE_OS::wcschr_emulation (const wchar_t *string, wint_t c) { @@ -75,21 +74,21 @@ ACE_OS::wcschr_emulation (const wchar_t *string, wint_t c) return 0; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCHR */ +#endif /* ACE_LACKS_WCSCHR */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP) +#if defined (ACE_LACKS_WCSCMP) int -ACE_OS::wcscmp_emulation (const ACE_WCHAR_T *string1, - const ACE_WCHAR_T *string2) +ACE_OS::wcscmp_emulation (const wchar_t *string1, + const wchar_t *string2) { while (*string1 == *string2++) if (*string1++ == 0) return (0); return (*string1 - *--string2); } -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */ +#endif /* ACE_LACKS_WCSCMP */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCPY) +#if defined (ACE_LACKS_WCSCPY) wchar_t * ACE_OS::wcscpy_emulation (wchar_t *destination, const wchar_t *source) @@ -99,9 +98,9 @@ ACE_OS::wcscpy_emulation (wchar_t *destination, for (; (*destination = *source); ++source, ++destination); return save; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCPY */ +#endif /* ACE_LACKS_WCSCPY */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCSPN) +#if defined (ACE_LACKS_WCSCSPN) size_t ACE_OS::wcscspn_emulation (const wchar_t *s, const wchar_t *reject) { @@ -121,9 +120,9 @@ ACE_OS::wcscspn_emulation (const wchar_t *s, const wchar_t *reject) return count; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCSPN */ +#endif /* ACE_LACKS_WCSCSPN */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSICMP) +#if defined (ACE_LACKS_WCSICMP) int ACE_OS::wcsicmp_emulation (const wchar_t *s, const wchar_t *t) { @@ -151,31 +150,31 @@ ACE_OS::wcsicmp_emulation (const wchar_t *s, const wchar_t *t) else return ACE_OS::ace_tolower (*scan1) - ACE_OS::ace_towlower (*scan2); } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSICMP */ +#endif /* ACE_LACKS_WCSICMP */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSLEN) +#if defined (ACE_LACKS_WCSLEN) size_t -ACE_OS::wcslen_emulation (const ACE_WCHAR_T *string) +ACE_OS::wcslen_emulation (const wchar_t *string) { - const ACE_WCHAR_T *s; + const wchar_t *s; for (s = string; *s; ++s) continue; return s - string; } -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */ +#endif /* ACE_LACKS_WCSLEN */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT) -ACE_WCHAR_T * -ACE_OS::wcsncat_emulation (ACE_WCHAR_T *destination, - const ACE_WCHAR_T *source, +#if defined (ACE_LACKS_WCSNCAT) +wchar_t * +ACE_OS::wcsncat_emulation (wchar_t *destination, + const wchar_t *source, size_t count) { if (count != 0) { - ACE_WCHAR_T *d = destination; - const ACE_WCHAR_T *s = source; + wchar_t *d = destination; + const wchar_t *s = source; while (*d != 0) d++; @@ -193,12 +192,12 @@ ACE_OS::wcsncat_emulation (ACE_WCHAR_T *destination, return destination; } -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCAT */ +#endif /* ACE_LACKS_WCSCAT */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP) +#if defined (ACE_LACKS_WCSNCMP) int -ACE_OS::wcsncmp_emulation (const ACE_WCHAR_T *s1, - const ACE_WCHAR_T *s2, +ACE_OS::wcsncmp_emulation (const wchar_t *s1, + const wchar_t *s2, size_t len) { if (len == 0) @@ -214,18 +213,18 @@ ACE_OS::wcsncmp_emulation (const ACE_WCHAR_T *s1, return 0; } -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */ +#endif /* ACE_LACKS_WCSNCMP */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCPY) -ACE_WCHAR_T * -ACE_OS::wcsncpy_emulation (ACE_WCHAR_T *destination, - const ACE_WCHAR_T *source, +#if defined (ACE_LACKS_WCSNCPY) +wchar_t * +ACE_OS::wcsncpy_emulation (wchar_t *destination, + const wchar_t *source, size_t len) { if (len != 0) { - ACE_WCHAR_T *d = destination; - const ACE_WCHAR_T *s = source; + wchar_t *d = destination; + const wchar_t *s = source; do { @@ -241,9 +240,9 @@ ACE_OS::wcsncpy_emulation (ACE_WCHAR_T *destination, return destination; } -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */ +#endif /* ACE_LACKS_WCSNCPY */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNICMP) +#if defined (ACE_LACKS_WCSNICMP) int ACE_OS::wcsnicmp_emulation (const wchar_t *s, const wchar_t *t, @@ -278,9 +277,9 @@ ACE_OS::wcsnicmp_emulation (const wchar_t *s, else return ACE_OS::ace_towlower (*scan1) - ACE_OS::ace_towlower (*scan2); } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNICMP */ +#endif /* ACE_LACKS_WCSNICMP */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSPBRK) +#if defined (ACE_LACKS_WCSPBRK) wchar_t * ACE_OS::wcspbrk_emulation (const wchar_t *string, const wchar_t *charset) @@ -297,9 +296,9 @@ ACE_OS::wcspbrk_emulation (const wchar_t *string, return 0; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */ +#endif /* ACE_LACKS_WCSPBRK */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSRCHR) +#if defined (ACE_LACKS_WCSRCHR) const wchar_t * ACE_OS::wcsrchr_emulation (const wchar_t *s, wint_t c) { @@ -327,9 +326,9 @@ ACE_OS::wcsrchr_emulation (wchar_t *s, wint_t c) return p; } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSRCHR */ +#endif /* ACE_LACKS_WCSRCHR */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSPN) +#if defined (ACE_LACKS_WCSSPN) size_t ACE_OS::wcsspn_emulation (const wchar_t *string, const wchar_t *charset) @@ -346,9 +345,9 @@ cont: goto cont; return (p - 1 - string); } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSPN */ +#endif /* ACE_LACKS_WCSSPN */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSTR) +#if defined (ACE_LACKS_WCSSTR) wchar_t * ACE_OS::wcsstr_emulation (const wchar_t *string, const wchar_t *charset) @@ -372,6 +371,6 @@ ACE_OS::wcsstr_emulation (const wchar_t *string, return const_cast<wchar_t *> (string); } -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSTR */ +#endif /* ACE_LACKS_WCSSTR */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_wchar.h b/ace/OS_NS_wchar.h index 55999db6e59..73db3b1c6ef 100644 --- a/ace/OS_NS_wchar.h +++ b/ace/OS_NS_wchar.h @@ -14,8 +14,8 @@ */ //============================================================================= -#ifndef ACE_OS_NS_WCHAR_H -# define ACE_OS_NS_WCHAR_H +#ifndef ACE_OS_NS_wchar_t_H +# define ACE_OS_NS_wchar_t_H # include /**/ "ace/pre.h" @@ -25,10 +25,9 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/os_include/os_wchar.h" +#include "ace/ace_wchar.h" #include "ace/Basic_Types.h" #include "ace/ACE_export.h" -#include "ace/ace_wchar.h" // include for the time being, but this code needs to be moved. dhinton #include "ace/os_include/os_errno.h" @@ -42,100 +41,96 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - typedef ACE_WCHAR_T WChar; - -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wint_t fgetwc (FILE* fp); -#endif /* ACE_HAS_WCHAR */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCAT) +#if defined (ACE_LACKS_WCSCAT) /// Emulated wcscat - Appends a string. extern ACE_Export wchar_t *wcscat_emulation (wchar_t *destination, const wchar_t *source); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */ +#endif /* ACE_LACKS_WCSCAT */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR) +#if defined (ACE_LACKS_WCSCHR) /// Emulated wcschr - Finds a character in a string. extern ACE_Export wchar_t *wcschr_emulation (const wchar_t *string, wint_t c); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCHR */ +#endif /* ACE_LACKS_WCSCHR */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP) +#if defined (ACE_LACKS_WCSCMP) /// Emulated wcscmp - Compares strings. extern ACE_Export - int wcscmp_emulation (const ACE_WCHAR_T *string1, const ACE_WCHAR_T *string2); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */ + int wcscmp_emulation (const wchar_t *string1, const wchar_t *string2); +#endif /* ACE_LACKS_WCSCMP */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCPY) +#if defined (ACE_LACKS_WCSCPY) /// Emulated wcscpy - Copies a string. extern ACE_Export wchar_t *wcscpy_emulation (wchar_t *destination, const wchar_t *source); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCPY */ +#endif /* ACE_LACKS_WCSCPY */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCSPN) +#if defined (ACE_LACKS_WCSCSPN) /// Emulated wcscspn. extern ACE_Export size_t wcscspn_emulation (const wchar_t *string, const wchar_t *reject); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCSPN */ +#endif /* ACE_LACKS_WCSCSPN */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSICMP) +#if defined (ACE_LACKS_WCSICMP) /// Emulated wcsicmp - Performs a case insensitive comparison of strings. extern ACE_Export int wcsicmp_emulation (const wchar_t *string1, const wchar_t *string2); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSICMP */ +#endif /* ACE_LACKS_WCSICMP */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSLEN) +#if defined (ACE_LACKS_WCSLEN) /// Emulated wcslen - Returns the length of a string. extern ACE_Export - size_t wcslen_emulation (const ACE_WCHAR_T *string); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */ + size_t wcslen_emulation (const wchar_t *string); +#endif /* ACE_LACKS_WCSLEN */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT) +#if defined (ACE_LACKS_WCSNCAT) /// Emulated wcscat - Appends a string. extern ACE_Export - ACE_WCHAR_T *wcsncat_emulation (ACE_WCHAR_T *destination, - const ACE_WCHAR_T *source, + wchar_t *wcsncat_emulation (wchar_t *destination, + const wchar_t *source, size_t count); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCAT */ +#endif /* ACE_LACKS_WCSCAT */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP) +#if defined (ACE_LACKS_WCSNCMP) /// Emulated wcsncmp - Compares two arrays. extern ACE_Export - int wcsncmp_emulation (const ACE_WCHAR_T *string1, - const ACE_WCHAR_T *string2, + int wcsncmp_emulation (const wchar_t *string1, + const wchar_t *string2, size_t len); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */ +#endif /* ACE_LACKS_WCSNCMP */ -#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCPY) +#if defined (ACE_LACKS_WCSNCPY) /// Emulated wcsncpy - Copies an array. extern ACE_Export - ACE_WCHAR_T *wcsncpy_emulation (ACE_WCHAR_T *destination, - const ACE_WCHAR_T *source, + wchar_t *wcsncpy_emulation (wchar_t *destination, + const wchar_t *source, size_t len); -#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */ +#endif /* ACE_LACKS_WCSNCPY */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNICMP) +#if defined (ACE_LACKS_WCSNICMP) /// Emulated wcsnicmp - Performs a case insensitive comparison of two /// arrays extern ACE_Export int wcsnicmp_emulation (const wchar_t *string1, const wchar_t *string2, size_t len); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNICMP */ +#endif /* ACE_LACKS_WCSNICMP */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSPBRK) +#if defined (ACE_LACKS_WCSPBRK) /// Emulated wcspbrk - Searches for characters in a string. extern ACE_Export wchar_t *wcspbrk_emulation (const wchar_t *string, const wchar_t *charset); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */ +#endif /* ACE_LACKS_WCSPBRK */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSRCHR) +#if defined (ACE_LACKS_WCSRCHR) /// Emulated wcsrchr (wchar_t version) - Finds the last occurance of a /// character in a string. extern ACE_Export @@ -145,43 +140,41 @@ namespace ACE_OS /// character in a string. extern ACE_Export const wchar_t *wcsrchr_emulation (const wchar_t *string, wint_t c); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSRCHR */ +#endif /* ACE_LACKS_WCSRCHR */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSPN) +#if defined (ACE_LACKS_WCSSPN) /// Emulated wcsspn. extern ACE_Export size_t wcsspn_emulation (const wchar_t *string, const wchar_t *charset); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSPN */ +#endif /* ACE_LACKS_WCSSPN */ -#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSTR) +#if defined (ACE_LACKS_WCSSTR) /// Emulated wcsstr - Performs a case insensitive comparison of two strings. extern ACE_Export wchar_t *wcsstr_emulation (const wchar_t *string, const wchar_t *charset); -#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSTR */ +#endif /* ACE_LACKS_WCSSTR */ // these are named wrong. should be wcslen, etc... dhinton ACE_NAMESPACE_INLINE_FUNCTION - u_int wslen (const WChar *); + u_int wslen (const wchar_t *); ACE_NAMESPACE_INLINE_FUNCTION - WChar *wscpy (WChar *, - const WChar *); + wchar_t *wscpy (wchar_t *, + const wchar_t *); ACE_NAMESPACE_INLINE_FUNCTION - int wscmp (const WChar *, - const WChar *); + int wscmp (const wchar_t *, + const wchar_t *); ACE_NAMESPACE_INLINE_FUNCTION - int wsncmp (const WChar *, - const WChar *, + int wsncmp (const wchar_t *, + const wchar_t *, size_t len); -#if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION wint_t ungetwc (wint_t c, FILE* fp); -#endif /* ACE_HAS_WCHAR */ } /* namespace ACE_OS */ diff --git a/ace/OS_NS_wchar.inl b/ace/OS_NS_wchar.inl index 7f2abac8d8f..19cddfcb413 100644 --- a/ace/OS_NS_wchar.inl +++ b/ace/OS_NS_wchar.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_WCHAR) + ACE_INLINE wint_t ACE_OS::fgetwc (FILE* fp) { @@ -15,10 +15,9 @@ ACE_OS::fgetwc (FILE* fp) ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetwc (fp), wint_t, WEOF); # endif /* ACE_LACKS_FGETWC */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE u_int -ACE_OS::wslen (const WChar *s) +ACE_OS::wslen (const wchar_t *s) { u_int len = 0; @@ -28,10 +27,10 @@ ACE_OS::wslen (const WChar *s) return len; } -ACE_INLINE ACE_OS::WChar * -ACE_OS::wscpy (WChar *dest, const WChar *src) +ACE_INLINE wchar_t * +ACE_OS::wscpy (wchar_t *dest, const wchar_t *src) { - WChar *original_dest = dest; + wchar_t *original_dest = dest; while ((*dest++ = *src++) != 0) continue; @@ -40,10 +39,10 @@ ACE_OS::wscpy (WChar *dest, const WChar *src) } ACE_INLINE int -ACE_OS::wscmp (const WChar *s, const WChar *t) +ACE_OS::wscmp (const wchar_t *s, const wchar_t *t) { - const WChar *scan1 = s; - const WChar *scan2 = t; + const wchar_t *scan1 = s; + const wchar_t *scan2 = t; while (*scan1 != 0 && *scan1 == *scan2) { @@ -55,10 +54,10 @@ ACE_OS::wscmp (const WChar *s, const WChar *t) } ACE_INLINE int -ACE_OS::wsncmp (const WChar *s, const WChar *t, size_t len) +ACE_OS::wsncmp (const wchar_t *s, const wchar_t *t, size_t len) { - const WChar *scan1 = s; - const WChar *scan2 = t; + const wchar_t *scan1 = s; + const wchar_t *scan2 = t; while (len != 0 && *scan1 != 0 && *scan1 == *scan2) { @@ -70,7 +69,6 @@ ACE_OS::wsncmp (const WChar *s, const WChar *t, size_t len) return len == 0 ? 0 : *scan1 - *scan2; } -#if defined (ACE_HAS_WCHAR) ACE_INLINE wint_t ACE_OS::ungetwc (wint_t c, FILE* fp) { @@ -82,6 +80,5 @@ ACE_OS::ungetwc (wint_t c, FILE* fp) ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ungetwc (c, fp), wint_t, WEOF); # endif /* ACE_LACKS_FGETWC */ } -#endif /* ACE_HAS_WCHAR */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp index 65087b8057b..79e8413bea9 100644 --- a/ace/OS_main.cpp +++ b/ace/OS_main.cpp @@ -138,7 +138,7 @@ int ACE_Main_Base::run (HINSTANCE, { ACE_TCHAR cmdline[1024]; ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program ")); - ACE_OS::strcat (cmdline, ACE_TEXT_WCHAR_TO_TCHAR (lpCmdLine)); + ACE_OS::strcat (cmdline, ACE_TEXT_TO_TCHAR_IN (lpCmdLine)); ACE_ARGV ce_argv (cmdline); ACE::init (); ACE_MAIN_OBJECT_MANAGER diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index 70477591e56..293864096b3 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -158,7 +158,7 @@ template <class T> class ACE_Cleanup_Adapter; * With ACE_HAS_NONSTATIC_OBJECT_MANAGER enabled, the ACE * library has no static objects that require destruction. * However, there are two drawbacks to using it: - * 1) main (int, char *[]) must be declared with arguments, even + * 1) ACE_TMAIN (int, ACE_TCHAR *[]) must be declared with arguments, even * if they're not used. All of ACE is converted to this, so * just applications have to be concerned with it. * 2) If there any static objects that depend on those that are diff --git a/ace/Object_Manager_Base.cpp b/ace/Object_Manager_Base.cpp index f61247558e9..185ab58d5be 100644 --- a/ace/Object_Manager_Base.cpp +++ b/ace/Object_Manager_Base.cpp @@ -409,7 +409,7 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number, #if !defined (ACE_HAS_WINCE) fprintf (stderr, "ace/OS.cpp, line %u: %s ", line_number, - ACE_TEXT_ALWAYS_CHAR (message)); + ACE_TEXT_TO_CHAR_IN (message)); perror ("failed"); #else // @@ Need to use the following information. diff --git a/ace/Process.cpp b/ace/Process.cpp index 1aa0adbd4e9..dcf34f36c16 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -350,8 +350,8 @@ ACE_Process::spawn (ACE_Process_Options &options) // releasing any of the converted string memory since this // process will either exec() or exit() shortly. # if defined (ACE_USES_WCHAR) - ACE_Wide_To_Ascii n_procname (options.process_name ()); - const char *procname = n_procname.char_rep (); + ACE::String_Conversion::Convert_In< char, wchar_t > n_procname (options.process_name ()); + const char *procname = n_procname.c_str (); wchar_t * const *wargv = options.command_line_argv (); size_t vcount, i; @@ -359,8 +359,9 @@ ACE_Process::spawn (ACE_Process_Options &options) ; char **procargv = new char *[vcount + 1]; // Need 0 at the end procargv[vcount] = 0; + for (i = 0; i < vcount; ++i) - procargv[i] = ACE_Wide_To_Ascii::convert (wargv[i]); + procargv[i] = ACE_TEXT_TO_CHAR_OUT (wargv[i]); // memory allocated! wargv = options.env_argv (); for (vcount = 0; wargv[vcount] != 0; ++vcount) @@ -368,7 +369,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_Wide_To_Ascii::convert (wargv[i]); + 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 (); @@ -963,7 +964,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...) return 0; } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) /** * @note Not available on Windows CE because it doesn't have a char version of * vsprintf. @@ -989,14 +990,14 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) va_end (argp); ACE_OS::strcpy (this->command_line_buf_, - ACE_TEXT_ANTI_TO_TCHAR (anti_clb)); + ACE_TEXT_TO_TCHAR_IN (anti_clb)); delete [] anti_clb; command_line_argv_calculated_ = 0; return 0; } -#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */ +#endif /* !ACE_HAS_WINCE */ ACE_TCHAR * ACE_Process_Options::env_buf (void) diff --git a/ace/Process.h b/ace/Process.h index 98582720e1c..6c057bd2ed7 100644 --- a/ace/Process.h +++ b/ace/Process.h @@ -128,10 +128,8 @@ public: /// be <= MAXPATHLEN. void working_directory (const char *wd); -#if defined (ACE_HAS_WCHAR) /// wchar_t version of working_directory void working_directory (const wchar_t *wd); -#endif /* ACE_HAS_WCHAR */ /** * Set the command-line arguments. @a format can use any printf @@ -144,10 +142,10 @@ public: */ int command_line (const ACE_TCHAR *format, ...); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) /// Anti-TChar version of command_line () int command_line (const ACE_ANTI_TCHAR *format, ...); -#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */ +#endif /* !ACE_HAS_WINCE */ /// Same as above in argv format. @a argv must be null terminated. int command_line (const ACE_TCHAR * const argv[]); diff --git a/ace/Process.inl b/ace/Process.inl index 3b9b18f6429..5af3893100f 100644 --- a/ace/Process.inl +++ b/ace/Process.inl @@ -250,7 +250,7 @@ ACE_INLINE int ACE_Process_Options::setreugid (const ACE_TCHAR* user) { #if !defined (ACE_LACKS_PWD_FUNCTIONS) - struct passwd *ent = ACE_OS::getpwnam (ACE_TEXT_ALWAYS_CHAR (user)); + struct passwd *ent = ACE_OS::getpwnam (ACE_TEXT_TO_CHAR_IN (user)); if (ent != 0) { @@ -342,23 +342,21 @@ ACE_INLINE void ACE_Process_Options::working_directory (const char *wd) { #if !defined(ACE_HAS_WINCE) - ACE_OS::strcpy (working_directory_, ACE_TEXT_CHAR_TO_TCHAR (wd)); + ACE_OS::strcpy (working_directory_, ACE_TEXT_TO_TCHAR_IN (wd)); #else ACE_UNUSED_ARG (wd); #endif /* !ACE_HAS_WINCE */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE void ACE_Process_Options::working_directory (const wchar_t *wd) { #if !defined(ACE_HAS_WINCE) - ACE_OS::strcpy (working_directory_, ACE_TEXT_WCHAR_TO_TCHAR (wd)); + ACE_OS::strcpy (working_directory_, ACE_TEXT_TO_TCHAR_IN (wd)); #else ACE_UNUSED_ARG (wd); #endif /* !ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE void ACE_Process_Options::process_name (const ACE_TCHAR *p) diff --git a/ace/Process_Mutex.cpp b/ace/Process_Mutex.cpp index 9aba33a7894..6078bfdbc68 100644 --- a/ace/Process_Mutex.cpp +++ b/ace/Process_Mutex.cpp @@ -40,7 +40,7 @@ ACE_Process_Mutex::unique_name (void) ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode) #if defined (_ACE_USE_SV_SEM) - : lock_ (name ? name : ACE_TEXT_ALWAYS_CHAR (this->unique_name ()), + : lock_ (name ? name : ACE_TEXT_TO_CHAR_IN (this->unique_name ()), ACE_SV_Semaphore_Complex::ACE_CREATE, 1, 1, @@ -48,7 +48,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode) #else : lock_ (USYNC_PROCESS, name ? - ACE_TEXT_CHAR_TO_TCHAR (name) : this->unique_name (), + ACE_TEXT_TO_TCHAR_IN (name) : this->unique_name (), (ACE_mutexattr_t *) arg, mode) #endif /* _ACE_USE_SV_SEM */ @@ -58,14 +58,13 @@ ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode) #endif /* !_ACE_USE_SV_SEM */ } -#if defined (ACE_HAS_WCHAR) ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name, void *arg, mode_t mode) #if defined (_ACE_USE_SV_SEM) : lock_ (name ? - ACE_Wide_To_Ascii (name).char_rep () : - ACE_TEXT_ALWAYS_CHAR (this->unique_name ()), + ACE_TEXT_TO_CHAR_IN (name) : + ACE_TEXT_TO_CHAR_IN (this->unique_name ()), ACE_SV_Semaphore_Complex::ACE_CREATE, 1, 1, @@ -73,7 +72,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name, #else : lock_ (USYNC_PROCESS, name ? - ACE_TEXT_WCHAR_TO_TCHAR (name) : this->unique_name (), + ACE_TEXT_TO_TCHAR_IN (name) : this->unique_name (), (ACE_mutexattr_t *) arg, mode) #endif /* _ACE_USE_SV_SEM */ @@ -82,7 +81,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name, ACE_UNUSED_ARG (arg); #endif /* _ACE_USE_SV_SEM */ } -#endif /* ACE_HAS_WCHAR */ + ACE_Process_Mutex::~ACE_Process_Mutex (void) { } diff --git a/ace/Process_Mutex.h b/ace/Process_Mutex.h index 130f59980f1..604d7ee0c80 100644 --- a/ace/Process_Mutex.h +++ b/ace/Process_Mutex.h @@ -90,8 +90,6 @@ public: ACE_Process_Mutex (const char *name = 0, void *arg = 0, mode_t mode = ACE_DEFAULT_FILE_PERMS); - -#if defined (ACE_HAS_WCHAR) /** * Create a Process_Mutex, passing in the optional @c name. (@c wchar_t * version) @@ -109,7 +107,6 @@ public: ACE_Process_Mutex (const wchar_t *name, void *arg = 0, mode_t mode = ACE_DEFAULT_FILE_PERMS); -#endif /* ACE_HAS_WCHAR */ ~ACE_Process_Mutex (void); diff --git a/ace/Process_Semaphore.cpp b/ace/Process_Semaphore.cpp index 952f20a99f6..1ac13b44065 100644 --- a/ace/Process_Semaphore.cpp +++ b/ace/Process_Semaphore.cpp @@ -32,7 +32,7 @@ ACE_Process_Semaphore::ACE_Process_Semaphore (u_int count, #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS) : lock_ (count, USYNC_PROCESS, name, arg, max) #else - : lock_ (ACE_TEXT_ALWAYS_CHAR (name), + : lock_ (ACE_TEXT_TO_CHAR_IN (name), ACE_SV_Semaphore_Complex::ACE_CREATE, count) #endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */ diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp index 548c56bef12..408d5f22a62 100644 --- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp +++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp @@ -134,8 +134,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr, if (this->subscribe (mcast_addr, qos_params, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr()), + ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr()), protocol_family, protocol, protocolinfo) == 0) diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp index e382af8482e..465da31d34b 100644 --- a/ace/Registry_Name_Space.cpp +++ b/ace/Registry_Name_Space.cpp @@ -82,7 +82,7 @@ ACE_Registry_Name_Space::bind (const ACE_NS_WString &name, #else return this->context_.bind (name.char_rep(), object); -#endif /* ACE_HAS_WCHAR */ +#endif /* ACE_USES_WCHAR */ } diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp index 2b55cf684a5..2d3f7795e38 100644 --- a/ace/Remote_Name_Space.cpp +++ b/ace/Remote_Name_Space.cpp @@ -46,12 +46,12 @@ ACE_Remote_Name_Space::bind (const ACE_NS_WString &name, const char *type) { ACE_TRACE ("ACE_Remote_Name_Space::bind"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ()); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> value_urep (value.rep ()); ACE_UINT32 name_len = - static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t)); ACE_UINT32 value_len = - static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (value.length () * sizeof (wchar_t)); ACE_UINT32 type_len = static_cast<ACE_UINT32> (ACE_OS::strlen (type)); ACE_Name_Request request (ACE_Name_Request::BIND, @@ -70,12 +70,12 @@ ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name, const char *type) { ACE_TRACE ("ACE_Remote_Name_Space::rebind"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ()); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> value_urep (value.rep ()); ACE_UINT32 name_len = - static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t)); ACE_UINT32 value_len = - static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (value.length () * sizeof (wchar_t)); ACE_UINT32 type_len = static_cast<ACE_UINT32> (ACE_OS::strlen (type)); ACE_Name_Request request (ACE_Name_Request::REBIND, @@ -94,9 +94,9 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name, char *&type) { ACE_TRACE ("ACE_Remote_Name_Space::resolve"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ()); ACE_UINT32 name_len = - static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::RESOLVE, name_urep.get (), name_len, @@ -110,7 +110,7 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name, if (this->ns_proxy_.recv_reply (reply) == -1) return -1; - ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (ACE_WCHAR_T)); + ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (wchar_t)); value = temp; ACE_NEW_RETURN (type, char[reply.type_len () + 1], @@ -123,9 +123,9 @@ int ACE_Remote_Name_Space::unbind (const ACE_NS_WString &name) { ACE_TRACE ("ACE_Remote_Name_Space::unbind"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ()); ACE_UINT32 name_len = - static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::UNBIND, name_urep.get (), name_len, @@ -138,9 +138,9 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, const ACE_NS_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_names"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ()); ACE_UINT32 pattern_len = - static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::LIST_NAMES, pattern_urep.get (), pattern_len, @@ -160,7 +160,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_WCHAR_T)); + reply.name_len () / sizeof (wchar_t)); set.insert (name); } } @@ -172,9 +172,9 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, const ACE_NS_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_values"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ()); ACE_UINT32 pattern_len = - static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::LIST_VALUES, pattern_urep.get (), pattern_len, @@ -194,7 +194,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_WCHAR_T)); + reply.value_len () / sizeof (wchar_t)); set.insert (value); } } @@ -207,9 +207,9 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, const ACE_NS_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_types"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ()); ACE_UINT32 pattern_len = - static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::LIST_TYPES, pattern_urep.get (), pattern_len, @@ -242,9 +242,9 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, const ACE_NS_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ()); ACE_UINT32 pattern_len = - static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES, pattern_urep.get (), pattern_len, @@ -265,9 +265,9 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_WCHAR_T)); + reply.name_len () / sizeof (wchar_t)); ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_WCHAR_T)); + reply.value_len () / sizeof (wchar_t)); ACE_Name_Binding entry (name, value, reply.type ()); @@ -283,9 +283,9 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, const ACE_NS_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ()); ACE_UINT32 pattern_len = - static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES, pattern_urep.get (), pattern_len, @@ -306,9 +306,9 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_WCHAR_T)); + reply.name_len () / sizeof (wchar_t)); ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_WCHAR_T)); + reply.value_len () / sizeof (wchar_t)); ACE_Name_Binding entry (name, value, reply.type()); @@ -324,9 +324,9 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, const ACE_NS_WString &pattern) { ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries"); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ()); ACE_UINT32 pattern_len = - static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T)); + static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t)); ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES, pattern_urep.get (), pattern_len, @@ -347,9 +347,9 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { ACE_NS_WString name (reply.name (), - reply.name_len () / sizeof (ACE_WCHAR_T)); + reply.name_len () / sizeof (wchar_t)); ACE_NS_WString value (reply.value (), - reply.value_len () / sizeof (ACE_WCHAR_T)); + reply.value_len () / sizeof (wchar_t)); ACE_Name_Binding entry (name, value, reply.type ()); diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index dc0c925fe02..249a6af39a8 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -616,7 +616,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq, #else ifreq if_address; - ACE_OS::strcpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if)); + ACE_OS::string_copy (if_address.ifr_name, net_if, sizeof(if_address.ifr_name)); if (ACE_OS::ioctl (this->get_handle (), SIOCGIFADDR, @@ -658,7 +658,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, #if defined(__linux__) if (net_if != 0) { - lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR(net_if)); + lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_TO_CHAR_IN(net_if)); } else #elif defined (ACE_WIN32) @@ -702,10 +702,11 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, { if ((num_if && pAddrs->Ipv6IfIndex == static_cast<unsigned int>(if_ix)) || (!num_if && - (ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR (net_if), - pAddrs->AdapterName) == 0 - || ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR (net_if), - ACE_Wide_To_Ascii (pAddrs->FriendlyName).char_rep()) == 0))) + // Do we need these conversions? + (ACE_OS::strcmp (ACE_TEXT_TO_CHAR_IN (net_if), + ACE_TEXT_TO_CHAR_IN (pAddrs->AdapterName)) == 0 + || ACE_OS::strcmp (ACE_TEXT_TO_CHAR_IN (net_if), + ACE_TEXT_TO_CHAR_IN (pAddrs->FriendlyName)) == 0))) { lmreq.ipv6mr_interface = pAddrs->Ipv6IfIndex; break; diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp index 4138d067c37..ff8d9f1fd69 100644 --- a/ace/SOCK_Dgram_Bcast.cpp +++ b/ace/SOCK_Dgram_Bcast.cpp @@ -146,7 +146,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) // Get host ip address if (host_name) { - hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR (host_name)); + hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_TO_CHAR_IN (host_name)); if (hp == 0) return -1; diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 5f325a7e519..2e5daad30a7 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -273,7 +273,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, while (intf[index].if_index != 0 || intf[index].if_name != 0) { if (this->join (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR(intf[index].if_name)) == 0) + ACE_TEXT_TO_TCHAR_IN(intf[index].if_name)) == 0) ++nr_subscribed; ++index; @@ -314,7 +314,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, while (pAddrs) { if (this->join (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR(pAddrs->AdapterName)) == 0) + ACE_TEXT_TO_TCHAR_IN(pAddrs->AdapterName)) == 0) ++nr_subscribed; pAddrs = pAddrs->Next; @@ -365,8 +365,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, continue; if (this->subscribe (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN(if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_subscribed; } } @@ -416,8 +415,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, continue; if (this->subscribe (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_subscribed; } } @@ -657,7 +655,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, int index = 0; while (intf[index].if_index != 0 || intf[index].if_name != 0) { - if (this->leave (mcast_addr, ACE_TEXT_CHAR_TO_TCHAR(intf[index].if_name)) == 0) + if (this->leave (mcast_addr, ACE_TEXT_TO_TCHAR_IN(intf[index].if_name)) == 0) ++nr_unsubscribed; ++index; @@ -697,7 +695,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, while (pAddrs) { - if (this->leave (mcast_addr, ACE_TEXT_CHAR_TO_TCHAR(pAddrs->AdapterName)) == 0) + if (this->leave (mcast_addr, ACE_TEXT_TO_TCHAR_IN(pAddrs->AdapterName)) == 0) ++nr_unsubscribed; pAddrs = pAddrs->Next; @@ -750,8 +748,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (if_addrs[if_cnt].get_type () != AF_INET || if_addrs[if_cnt].is_loopback ()) continue; if (this->leave (mcast_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_unsubscribed; } } @@ -799,8 +796,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (if_addrs[if_cnt].is_loopback ()) continue; if (this->leave (mcast_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_unsubscribed; } } diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp index 23ab69059fd..2e0188475c5 100644 --- a/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ace/SSL/SSL_Asynch_Stream.cpp @@ -121,8 +121,8 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( if (this->ssl_ == 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("- cannot allocate new SSL structure") + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("- cannot allocate new SSL structure") )); ::SSL_set_verify (this->ssl_, @@ -141,9 +141,9 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) if (this->flags_ & SF_STREAM_OPEN) // open if ((this->flags_ & SF_DELETE_ENABLE) == 0) // but .. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-") - ACE_TEXT("possible access violation ") - ACE_TEXT("if proactor still handles events\n"))); + ACE_LIB_TEXT("ACE_SSL_Asynch_Stream::DTOR-") + ACE_LIB_TEXT("possible access violation ") + ACE_LIB_TEXT("if proactor still handles events\n"))); ::SSL_free (this->ssl_); @@ -232,22 +232,22 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, if (this->flags_ & SF_STREAM_OPEN) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- already opened")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- already opened")), -1); if (this->ssl_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- SSL structure is absent")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- SSL structure is absent")), -1); if (handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- invalid handle")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- invalid handle")), -1); @@ -275,8 +275,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, if (this->bio_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- cannot allocate new BIO structure")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- cannot allocate new BIO structure")), -1); ::SSL_set_bio (this->ssl_ , this->bio_ , this->bio_); @@ -294,8 +294,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- invalid stream type")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- invalid stream type")), -1); } @@ -464,7 +464,7 @@ ACE_SSL_Asynch_Stream::do_SSL_shutdown (void) default: this->print_error (status, - ACE_TEXT ("Shutdown error")); + ACE_LIB_TEXT ("Shutdown error")); retval = -1; break; } @@ -505,8 +505,8 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("- invalid stream type")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("- invalid stream type")), -1); } @@ -528,7 +528,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) case SSL_ERROR_SYSCALL: default: this->print_error (status, - ACE_TEXT ("Handshake error")); + ACE_LIB_TEXT ("Handshake error")); return -1; } @@ -587,7 +587,7 @@ ACE_SSL_Asynch_Stream::do_SSL_read (void) this->notify_read (0, EFAULT); this->print_error (status, - ACE_TEXT ("SSL_read error")); + ACE_LIB_TEXT ("SSL_read error")); return -1; } @@ -637,7 +637,7 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void) this->notify_write(0, EFAULT); this->print_error (status, - ACE_TEXT ("SSL_write error")); + ACE_LIB_TEXT ("SSL_write error")); return -1; } @@ -820,8 +820,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::size() ") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("error in ACE_Message_Block::size() ") )); errval = EINVAL; @@ -843,8 +843,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt read failed") + ACE_LIB_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("attempt read failed") )); errval = EINVAL; // may be leave EINPROGRESS ?? @@ -884,8 +884,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::size() ") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("error in ACE_Message_Block::size() ") )); errval = EINVAL; @@ -901,8 +901,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::copy() ") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("error in ACE_Message_Block::copy() ") )); errval = EINVAL; @@ -920,8 +920,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt write failed") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("attempt write failed") )); errval = EINVAL; // may be leave EINPROGRESS ?? @@ -971,8 +971,8 @@ ACE_SSL_Asynch_Stream::handle_write_stream ( ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt write failed") + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("attempt write failed") )); this->bio_out_errno_ = EINVAL; diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index fa120632038..fd884dd9044 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -503,7 +503,7 @@ ACE_SSL_Context::report_error (unsigned long error_code) (void) ::ERR_error_string (error_code, error_string); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"), + ACE_LIB_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"), error_code, error_string)); } diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp index d0ed9f3709e..f5ba831ad17 100644 --- a/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ace/SSL/SSL_SOCK_Stream.cpp @@ -45,7 +45,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) ACE_ERROR ((LM_ERROR, "(%P|%t) ACE_SSL_SOCK_Stream " "- cannot allocate new SSL structure %p\n", - ACE_TEXT (""))); + ACE_LIB_TEXT (""))); } } diff --git a/ace/SString.cpp b/ace/SString.cpp index 6c16c6b7697..1c03657398f 100644 --- a/ace/SString.cpp +++ b/ace/SString.cpp @@ -41,12 +41,7 @@ operator<< (ACE_OSTREAM_TYPE &os, const ACE_WString &ws) { // @@ Need to figure out how to print the "wide" string // on platforms that don't support "wide" strings. -#if defined (ACE_HAS_WCHAR) - os << ACE_Wide_To_Ascii (ws.fast_rep ()).char_rep (); -#else - ACE_UNUSED_ARG (ws); - os << "(*non-printable string*)"; -#endif + os << ACE_TEXT_TO_CHAR_IN (ws.fast_rep ()); return os; } diff --git a/ace/SStringfwd.h b/ace/SStringfwd.h index 315553751ce..8910233ed56 100644 --- a/ace/SStringfwd.h +++ b/ace/SStringfwd.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "ace/Basic_Types.h" /* ACE_WCHAR_T definition */ +#include "ace/Basic_Types.h" /* wchar_t definition */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class CHAR> class ACE_String_Base; // Forward declaration. -typedef ACE_WCHAR_T ACE_WSTRING_TYPE; +typedef wchar_t ACE_WSTRING_TYPE; typedef ACE_String_Base<char> ACE_CString; typedef ACE_String_Base<ACE_WSTRING_TYPE> ACE_WString; diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp index 42fac9be0c7..3156338c44b 100644 --- a/ace/SV_Semaphore_Simple.cpp +++ b/ace/SV_Semaphore_Simple.cpp @@ -188,7 +188,6 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); } -#if defined (ACE_HAS_WCHAR) ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name, short flags, int initial_value, @@ -196,7 +195,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name, mode_t perms) { ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple(wchar_t)"); - if (this->open (ACE_Wide_To_Ascii (name).char_rep (), + if (this->open (ACE_TEXT_TO_CHAR_IN (name), flags, initial_value, nsems, @@ -205,7 +204,6 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); } -#endif /* ACE_HAS_WCHAR */ ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void) { diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h index af999654f0f..d2c82b71181 100644 --- a/ace/SV_Semaphore_Simple.h +++ b/ace/SV_Semaphore_Simple.h @@ -69,13 +69,12 @@ public: int initial_value = 1, u_short nsems = 1, mode_t perms = ACE_DEFAULT_FILE_PERMS); -#if defined (ACE_HAS_WCHAR) + ACE_SV_Semaphore_Simple (const wchar_t *name, short flags = ACE_SV_Semaphore_Simple::ACE_CREATE, int initial_value = 1, u_short nsems = 1, mode_t perms = ACE_DEFAULT_FILE_PERMS); -#endif /* ACE_HAS_WCHAR */ ~ACE_SV_Semaphore_Simple (void); @@ -85,13 +84,11 @@ public: u_short nsems = 1, mode_t perms = ACE_DEFAULT_FILE_PERMS); -#if defined (ACE_HAS_WCHAR) int open (const wchar_t *name, short flags = ACE_SV_Semaphore_Simple::ACE_CREATE, int initial_value = 1, u_short nsems = 1, mode_t perms = ACE_DEFAULT_FILE_PERMS); -#endif /* ACE_HAS_WCHAR */ /// Open or create one or more SV_Semaphores. We return 0 if all is /// OK, else -1. diff --git a/ace/SV_Semaphore_Simple.inl b/ace/SV_Semaphore_Simple.inl index 5dde75ffff6..81a828b4401 100644 --- a/ace/SV_Semaphore_Simple.inl +++ b/ace/SV_Semaphore_Simple.inl @@ -7,7 +7,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_WCHAR) // Semaphores don't offer wide-char names, so convert the name and forward // to the narrow-char open(). ACE_INLINE int @@ -18,13 +17,12 @@ ACE_SV_Semaphore_Simple::open (const wchar_t *name, mode_t perms) { ACE_TRACE ("ACE_SV_Semaphore_Simple::open (wchar_t)"); - return this->open (ACE_Wide_To_Ascii (name).char_rep (), + return this->open (ACE_TEXT_TO_CHAR_IN (name), flags, initial_value, nsems, perms); } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_SV_Semaphore_Simple::control (int cmd, diff --git a/ace/Service_Config.h b/ace/Service_Config.h index a6607f4e1e4..9cba0012a76 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -50,6 +50,18 @@ class ACE_DLL; ACE_LIB_TEXT ("() \"") \ ACE_LIB_TEXT (parameters) \ ACE_LIB_TEXT ("\"") +#define ACE_DYNAMIC_SERVICE_DIRECTIVE_A(ident, libpathname, objectclass, parameters) \ + "dynamic " \ + ident \ + " Service_Object * " \ + libpathname \ + ":" \ + objectclass \ + "() \"" \ + parameters \ + "\"" + + #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \ ACE_LIB_TEXT ("remove ") \ ACE_LIB_TEXT (ident) diff --git a/ace/Service_Config.inl b/ace/Service_Config.inl index a3cdbea8000..aad291eaa22 100644 --- a/ace/Service_Config.inl +++ b/ace/Service_Config.inl @@ -126,32 +126,32 @@ ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd, ACE_INLINE int ACE_Service_Config::initialize (const ACE_Service_Type *sp, ACE_ANTI_TCHAR parameters[]) { - return ACE_Service_Config::initialize (sp, ACE_TEXT_ANTI_TO_TCHAR (parameters)); + return ACE_Service_Config::initialize (sp, ACE_TEXT_TO_TCHAR_IN (parameters)); } ACE_INLINE int ACE_Service_Config::initialize (const ACE_ANTI_TCHAR svc_name[], ACE_ANTI_TCHAR parameters[]) { - return ACE_Service_Config::initialize (ACE_TEXT_ANTI_TO_TCHAR (svc_name), - ACE_TEXT_ANTI_TO_TCHAR (parameters)); + return ACE_Service_Config::initialize (ACE_TEXT_TO_TCHAR_IN (svc_name), + ACE_TEXT_TO_TCHAR_IN (parameters)); } ACE_INLINE int ACE_Service_Config::resume (const ACE_ANTI_TCHAR svc_name[]) { - return ACE_Service_Config::resume (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); + return ACE_Service_Config::resume (ACE_TEXT_TO_TCHAR_IN (svc_name)); } ACE_INLINE int ACE_Service_Config::suspend (const ACE_ANTI_TCHAR svc_name[]) { - return ACE_Service_Config::suspend (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); + return ACE_Service_Config::suspend (ACE_TEXT_TO_TCHAR_IN (svc_name)); } ACE_INLINE int ACE_Service_Config::remove (const ACE_ANTI_TCHAR svc_name[]) { - return ACE_Service_Config::remove (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); + return ACE_Service_Config::remove (ACE_TEXT_TO_TCHAR_IN (svc_name)); } #endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */ diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp index 446302ce87a..3dd1c8e151c 100644 --- a/ace/Service_Manager.cpp +++ b/ace/Service_Manager.cpp @@ -96,7 +96,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) { ACE_TRACE ("ACE_Service_Manager::init"); ACE_INET_Addr local_addr (ACE_Service_Manager::DEFAULT_PORT_); - ACE_Get_Opt getopt (argc, argv, ACE_LIB_TEXT ("dp:s:"), 0); // Start at argv[0] + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_LIB_TEXT ("dp:s:"), 0); // Start at argv[0] for (int c; (c = getopt ()) != -1; ) switch (c) @@ -301,7 +301,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("accepted from host %s at port %d\n"), - ACE_TEXT_CHAR_TO_TCHAR (sa.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (sa.get_host_name ()), sa.get_port_number ())); } diff --git a/ace/Shared_Memory_Pool.cpp b/ace/Shared_Memory_Pool.cpp index c61334485b7..93fb2e97fcf 100644 --- a/ace/Shared_Memory_Pool.cpp +++ b/ace/Shared_Memory_Pool.cpp @@ -251,7 +251,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_n // key. int segment_key; - int result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (backing_store_name), + int result = ::sscanf (ACE_TEXT_TO_CHAR_IN (backing_store_name), "%d", &segment_key); @@ -259,7 +259,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_n // The conversion to a number failed so hash with crc32 // ACE::crc32 is also used in <SV_Semaphore_Simple>. this->base_shm_key_ = - (key_t) ACE::crc32 (ACE_TEXT_ALWAYS_CHAR (backing_store_name)); + (key_t) ACE::crc32 (ACE_TEXT_TO_CHAR_IN (backing_store_name)); else this->base_shm_key_ = segment_key; diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index fa3c00993b0..ec7797ae156 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -526,7 +526,7 @@ ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name (void) { // @todo make this a constant somewhere (or it there already is one // then use it. - return ACE_TEXT("ACE"); + return ACE_LIB_TEXT("ACE"); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp index 98b4e3079dd..e2b316e1097 100644 --- a/ace/Sock_Connect.cpp +++ b/ace/Sock_Connect.cpp @@ -391,7 +391,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, // Get host ip address if necessary. if (host_name) { - hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR (host_name)); + hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_TO_CHAR_IN (host_name)); if (hp == 0) return -1; diff --git a/ace/Stats.cpp b/ace/Stats.cpp index 058830a8cc6..fa75340c83e 100644 --- a/ace/Stats.cpp +++ b/ace/Stats.cpp @@ -521,7 +521,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) @@ -584,7 +584,56 @@ 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) +{ + if (this->samples_count () == 0u) + { + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("%s : no data collected\n"), msg)); + return; + } + + this->ACE_Basic_Stats::dump_results (msg, sf); + + ACE_Throughput_Stats::dump_throughput (msg, sf, + this->throughput_last_, + this->samples_count ()); +} + +void +ACE_Throughput_Stats::dump_throughput (const char *msg, + ACE_UINT32 sf, + ACE_UINT64 elapsed_time, + ACE_UINT32 samples_count) +{ +#ifndef ACE_NLOGGING + double seconds = +# if defined ACE_LACKS_LONGLONG_T + elapsed_time / sf; +#elif defined (ACE_LACKS_UNSIGNEDLONGLONG_T) + static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER ( + ACE_U_LongLong(elapsed_time / sf))); +# else /* ! ACE_LACKS_LONGLONG_T */ + static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / sf)); +# endif /* ! ACE_LACKS_LONGLONG_T */ + seconds /= ACE_HR_SCALE_CONVERSION; + + const double t_avg = samples_count / seconds; + + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("%s throughput: %.2f (events/second)\n"), + msg, t_avg)); +#else + ACE_UNUSED_ARG (msg); + ACE_UNUSED_ARG (sf); + ACE_UNUSED_ARG (elapsed_time); + ACE_UNUSED_ARG (samples_count); +#endif /* ACE_NLOGGING */ +} + +void +ACE_Throughput_Stats::dump_throughput (const wchar_t *msg, ACE_UINT32 sf, ACE_UINT64 elapsed_time, ACE_UINT32 samples_count) diff --git a/ace/Stats.h b/ace/Stats.h index a95328b74d1..e98305cb0b8 100644 --- a/ace/Stats.h +++ b/ace/Stats.h @@ -243,10 +243,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/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 360cbecaed2..b4c85d5ca14 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -1722,7 +1722,7 @@ ace_get_module (const ACE_Service_Type *sr, // Main driver program. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Svc_Conf_Param param (stdin); diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp index 8dd3c52a36c..cb23ba91ef5 100644 --- a/ace/UNIX_Addr.cpp +++ b/ace/UNIX_Addr.cpp @@ -50,7 +50,7 @@ int ACE_UNIX_Addr::addr_to_string (ACE_TCHAR s[], size_t len) const { ACE_OS::strsncpy (s, - ACE_TEXT_CHAR_TO_TCHAR (this->unix_addr_.sun_path), + ACE_TEXT_TO_TCHAR_IN (this->unix_addr_.sun_path), len); return 0; } diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h index fcd6ed9bf46..eacabcf0d90 100644 --- a/ace/UNIX_Addr.h +++ b/ace/UNIX_Addr.h @@ -73,13 +73,11 @@ public: /// Transform the string into the current addressing format. virtual int string_to_addr (const char addr[]); -#if defined (ACE_HAS_WCHAR) /// Creates an ACE_UNIX_Addr from a string. ACE_UNIX_Addr (const wchar_t rendezvous_point[]); /// Creates an ACE_UNIX_Addr from a string. int set (const wchar_t rendezvous_point[]); -#endif /* ACE_HAS_WCHAR */ /// Compare two addresses for equality. bool operator == (const ACE_UNIX_Addr &SAP) const; diff --git a/ace/UNIX_Addr.inl b/ace/UNIX_Addr.inl index 34fa002ef34..4e9e369d8f0 100644 --- a/ace/UNIX_Addr.inl +++ b/ace/UNIX_Addr.inl @@ -10,21 +10,18 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_WCHAR) -/// Creates an ACE_UNIX_Addr from a string. ACE_INLINE ACE_UNIX_Addr::ACE_UNIX_Addr (const wchar_t rendezvous_point[]) { - this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point)); + this->set (rendezvous_point); } /// Creates an ACE_UNIX_Addr from a string. ACE_INLINE int ACE_UNIX_Addr::set (const wchar_t rendezvous_point[]) { - return this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point)); + return this->set (ACE_TEXT_TO_CHAR_IN (rendezvous_point)); } -#endif /* ACE_HAS_WCHAR */ // Compare two addresses for equality. diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index ef0026fb7d0..740100eb671 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -17,83 +17,49 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// These macros have been deprecated and should be replaced by their -// ACE_TEXT_* equivalents. These macros are just hacks and may not -// completely provide the old functionality. -#if defined (ACE_LEGACY_MODE) -// Convert the old unicode indicators -# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -# define ACE_USES_WCHAR -# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ -# if defined (ACE_HAS_UNICODE) -# define ACE_HAS_WCHAR -# endif /* ACE_HAS_UNICODE */ - -// These are defined to get older stuff to compile -// FUZZ: disable check_for_tchar -# define ASYS_TCHAR ACE_TCHAR -# define ASYS_TEXT ACE_TEXT -# define ASYS_ONLY_MULTIBYTE_STRING ACE_TEXT_ALWAYS_CHAR -# define ASYS_MULTIBYTE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ASYS_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR -# define ACE_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR - -# if defined (ACE_USES_WCHAR) -# define ASYS_ONLY_WIDE_STRING(STRING) STRING -# else /* ACE_USES_WCHAR */ -# define ASYS_ONLY_WIDE_STRING(STRING) \ - ACE_Ascii_To_Wide (STRING).wchar_rep () -# endif /* ACE_USES_WCHAR */ - -# define ACE_TEXT_STRING ACE_TString - -#endif /* ACE_LEGACY_MODE */ - -#if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) -# if !defined (ACE_HAS_WCHAR) -# define ACE_HAS_WCHAR -# endif -# include /**/ <wchar.h> -#endif /* ACE_HAS_XPG4_MULTIBYPTE_CHAR */ - -#if defined (ACE_HAS_WCHAR) -# if defined (ACE_VXWORKS) +#if !defined(ACE_SIZEOF_WCHAR) || !defined (ACE_WCHAR_MAX) +#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. +# if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) +# include /**/ <wchar.h> +# endif /* ACE_HAS_XPG4_MULTIBYPTE_CHAR */ + +# if defined (VXWORKS) # include /**/ <types/vxTypes.h> /* For wchar_t */ -# include /**/ <stdlib.h> /* For mbstowcs, etc. */ -# include /**/ <string.h> /* For strlen */ -# if !defined (__RTP__) -# define wint_t unsigned int /* VxWorks has wchar_t but not wint_t */ -# else -# include /**/ <wchar.h> -# include /**/ <wctype.h> -# endif +# include <stddef.h> /* For wint_t */ + typedef wchar_t wctype_t; +# elif defined (__Lynx__) +# include /**/ <stdlib.h> /* For wchar_t */ + typedef unsigned int wint_t; + typedef wchar_t wctype_t; # elif defined (ACE_OPENVMS) # include /**/ <wchar.h> # include /**/ <wctype.h> + # elif defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ (ACE_HAS_STANDARD_CPP_LIBRARY != 0) # include /**/ <cwchar> # include /**/ <cwctype> + # elif defined (ACE_HAS_WINCE) # include /**/ <wtypes.h> + # elif !defined (__BORLANDC__) # include /**/ <wchar.h> + # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#endif /* ACE_HAS_WCHAR */ #if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) using std::size_t; #endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */ -// This makes the somewhat dubious assumption that if a platform lacks -// a native wchar_t type, then it will typedef it as unsigned short. -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_NATIVE_WCHAR_T) -# if !defined (ACE_WSTRING_HAS_USHORT_SUPPORT) -# define ACE_WSTRING_HAS_USHORT_SUPPORT -# endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */ -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_NATIVE_WCHAR_T */ - // Set the default behaviour for ACE_TEXT_WIDE to use the L-prefix #if !defined (ACE_USES_L_PREFIX) # define ACE_USES_L_PREFIX 1 @@ -110,26 +76,6 @@ using std::size_t; # define ACE_TEXT_WIDE(STRING) ACE_TEXT_WIDE_I (STRING) # endif /* ACE_TEXT_WIDE */ -#if defined (ACE_USES_WCHAR) -typedef wchar_t ACE_TCHAR; -typedef char ACE_ANTI_TCHAR; -# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) -# define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () -# define ACE_TEXT_ALWAYS_WCHAR(STRING) STRING -# define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () -# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING -# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () -#else /* ACE_USES_WCHAR */ -typedef char ACE_TCHAR; -typedef wchar_t ACE_ANTI_TCHAR; -# define ACE_LIB_TEXT(STRING) STRING -# define ACE_TEXT_ALWAYS_CHAR(STRING) STRING -# define ACE_TEXT_ALWAYS_WCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () -# define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING -# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () -# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () -#endif /* ACE_USES_WCHAR */ - #if defined (ACE_LEGACY_MODE) # define ACE_TEXT TEXT #else /* ACE_LEGACY_MODE */ @@ -161,188 +107,33 @@ typedef wchar_t ACE_ANTI_TCHAR; #endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */ -#if defined ACE_HAS_WCHAR - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class ACE_Wide_To_Ascii - * - * @brief A lightweight wchar* to char* string conversion class. - * - * The purpose of this class is to perform conversion from - * wchar* to char* strings. It is not intended for general - * purpose use. - */ -class ACE_Wide_To_Ascii -{ -public: - /// Ctor must take a wchar string. - ACE_Wide_To_Ascii (const wchar_t *s); - - /// Dtor will free up the memory. - ~ACE_Wide_To_Ascii (void); - - /// Return the internal char* representation. - char *char_rep (void); - - /// Converts an wchar_t string to ascii and returns a new string. - static char *convert (const wchar_t *wstr); - -private: - /// Internal pointer to the converted string. - char *s_; - - /// Disallow these operation. - ACE_Wide_To_Ascii (void); - ACE_Wide_To_Ascii (ACE_Wide_To_Ascii &); - ACE_Wide_To_Ascii& operator= (ACE_Wide_To_Ascii &); -}; - -/** - * @class ACE_Ascii_To_Wide - * - * @brief A lightweight char* to wchar* string conversion class. - * - * The purpose of this class is to perform conversion from - * char* to wchar* strings. It is not intended for general - * purpose use. - */ -class ACE_Ascii_To_Wide -{ -public: - /// Ctor must take a wchar string. - ACE_Ascii_To_Wide (const char *s); - - /// Dtor will free up the memory. - ~ACE_Ascii_To_Wide (void); - - /// Return the internal wchar* representation. - wchar_t *wchar_rep (void); - - /// Converts an char string to unicode/wide and returns a new string. - static wchar_t *convert (const char *str); - -private: - /// Internal pointer to the converted string. - wchar_t *s_; - - /// Disallow these operation. - ACE_Ascii_To_Wide (void); - ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &); - ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &); -}; - -#if defined (ACE_LEGACY_MODE) -typedef ACE_Ascii_To_Wide ACE_OS_CString; -typedef ACE_Wide_To_Ascii ACE_OS_WString; -#endif /* ACE_LEGACY_MODE */ - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_HAS_WCHAR */ - -#if defined (ACE_WIN32) #if defined (ACE_USES_WCHAR) -#define ACE_TEXT_SERVICE_TABLE_ENTRY SERVICE_TABLE_ENTRYW -#define ACE_TEXT_STARTUPINFO STARTUPINFOW -#define ACE_TEXT_WIN32_FIND_DATA WIN32_FIND_DATAW - -#define ACE_TEXT_CreateEvent ::CreateEventW -#define ACE_TEXT_CreateFile ::CreateFileW -#define ACE_TEXT_CreateFileMapping ::CreateFileMappingW -#define ACE_TEXT_CreateMutex ::CreateMutexW -#define ACE_TEXT_CreateProcess ::CreateProcessW -#define ACE_TEXT_CreateSemaphore ::CreateSemaphoreW -#define ACE_TEXT_CreateService ::CreateServiceW -#define ACE_TEXT_ExpandEnvironmentStrings ::ExpandEnvironmentStringsW -#define ACE_TEXT_FindFirstChangeNotification ::FindFirstChangeNotificationW -#define ACE_TEXT_FindFirstFile ::FindFirstFileW -#define ACE_TEXT_FindNextFile ::FindNextFileW -#define ACE_TEXT_FormatMessage ::FormatMessageW -#define ACE_TEXT_FreeEnvironmentStrings ::FreeEnvironmentStringsW -#define ACE_TEXT_GetComputerName ::GetComputerNameW -#define ACE_TEXT_GetEnvironmentStrings ::GetEnvironmentStringsW -#define ACE_TEXT_GetFileAttributes ::GetFileAttributesW -#define ACE_TEXT_GetModuleFileName ::GetModuleFileNameW -#define ACE_TEXT_GetTempPath ::GetTempPathW -#define ACE_TEXT_GetUserName ::GetUserNameW -#define ACE_TEXT_LoadLibrary ::LoadLibraryW -#define ACE_TEXT_MoveFileEx ::MoveFileExW -#define ACE_TEXT_WaitNamedPipe ::WaitNamedPipeW -#define ACE_TEXT_OpenFileMapping ::OpenFileMappingW -#define ACE_TEXT_OpenSCManager ::OpenSCManagerW -#define ACE_TEXT_OpenService ::OpenServiceW -#define ACE_TEXT_OutputDebugString ::OutputDebugStringW -#define ACE_TEXT_RegisterEventSource ::RegisterEventSourceW -#define ACE_TEXT_RegisterServiceCtrlHandler ::RegisterServiceCtrlHandlerW -#define ACE_TEXT_RegConnectRegistry ::RegConnectRegistryW -#define ACE_TEXT_RegCreateKeyEx ::RegCreateKeyExW -#define ACE_TEXT_RegDeleteKey ::RegDeleteKeyW -#define ACE_TEXT_RegDeleteValue ::RegDeleteValueW -#define ACE_TEXT_RegEnumKeyEx ::RegEnumKeyExW -#define ACE_TEXT_RegEnumValue ::RegEnumValueW -#define ACE_TEXT_RegCreateKey ::RegCreateKeyW -#define ACE_TEXT_RegOpenKey ::RegOpenKeyW -#define ACE_TEXT_RegOpenKeyEx ::RegOpenKeyExW -#define ACE_TEXT_RegQueryValueEx ::RegQueryValueExW -#define ACE_TEXT_RegSetValueEx ::RegSetValueExW -#define ACE_TEXT_ReportEvent ::ReportEventW -#define ACE_TEXT_SearchPath ::SearchPathW -#define ACE_TEXT_StartService ::StartServiceW -#define ACE_TEXT_StartServiceCtrlDispatcher ::StartServiceCtrlDispatcherW - + typedef wchar_t ACE_TCHAR; + typedef char ACE_ANTI_TCHAR; + # define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE( STRING ) #else /* ACE_USES_WCHAR */ -#define ACE_TEXT_SERVICE_TABLE_ENTRY SERVICE_TABLE_ENTRYA -#define ACE_TEXT_STARTUPINFO STARTUPINFOA -#define ACE_TEXT_WIN32_FIND_DATA WIN32_FIND_DATAA - -#define ACE_TEXT_CreateEvent ::CreateEventA -#define ACE_TEXT_CreateFile ::CreateFileA -#define ACE_TEXT_CreateFileMapping ::CreateFileMappingA -#define ACE_TEXT_CreateMutex ::CreateMutexA -#define ACE_TEXT_CreateProcess ::CreateProcessA -#define ACE_TEXT_CreateSemaphore ::CreateSemaphoreA -#define ACE_TEXT_CreateService ::CreateServiceA -#define ACE_TEXT_ExpandEnvironmentStrings ::ExpandEnvironmentStringsA -#define ACE_TEXT_FindFirstChangeNotification ::FindFirstChangeNotificationA -#define ACE_TEXT_FindFirstFile ::FindFirstFileA -#define ACE_TEXT_FindNextFile ::FindNextFileA -#define ACE_TEXT_FormatMessage ::FormatMessageA -#define ACE_TEXT_FreeEnvironmentStrings ::FreeEnvironmentStringsA -#define ACE_TEXT_GetComputerName ::GetComputerNameA -#define ACE_TEXT_GetEnvironmentStrings ::GetEnvironmentStringsA -#define ACE_TEXT_GetFileAttributes ::GetFileAttributesA -#define ACE_TEXT_GetModuleFileName ::GetModuleFileNameA -#define ACE_TEXT_GetTempPath ::GetTempPathA -#define ACE_TEXT_GetUserName ::GetUserNameA -#define ACE_TEXT_LoadLibrary ::LoadLibraryA -#define ACE_TEXT_MoveFileEx ::MoveFileExA -#define ACE_TEXT_WaitNamedPipe ::WaitNamedPipeA -#define ACE_TEXT_OpenFileMapping ::OpenFileMappingA -#define ACE_TEXT_OpenSCManager ::OpenSCManagerA -#define ACE_TEXT_OpenService ::OpenServiceA -#define ACE_TEXT_OutputDebugString ::OutputDebugStringA -#define ACE_TEXT_RegisterEventSource ::RegisterEventSourceA -#define ACE_TEXT_RegisterServiceCtrlHandler ::RegisterServiceCtrlHandlerA -#define ACE_TEXT_RegConnectRegistry ::RegConnectRegistryA -#define ACE_TEXT_RegCreateKeyEx ::RegCreateKeyExA -#define ACE_TEXT_RegDeleteKey ::RegDeleteKeyA -#define ACE_TEXT_RegDeleteValue ::RegDeleteValueA -#define ACE_TEXT_RegEnumKeyEx ::RegEnumKeyExA -#define ACE_TEXT_RegEnumValue ::RegEnumValueA -#define ACE_TEXT_RegCreateKey ::RegCreateKeyA -#define ACE_TEXT_RegOpenKey ::RegOpenKeyA -#define ACE_TEXT_RegOpenKeyEx ::RegOpenKeyExA -#define ACE_TEXT_RegQueryValueEx ::RegQueryValueExA -#define ACE_TEXT_RegSetValueEx ::RegSetValueExA -#define ACE_TEXT_ReportEvent ::ReportEventA -#define ACE_TEXT_SearchPath ::SearchPathA -#define ACE_TEXT_StartService ::StartServiceA -#define ACE_TEXT_StartServiceCtrlDispatcher ::StartServiceCtrlDispatcherA + typedef char ACE_TCHAR; + typedef wchar_t ACE_ANTI_TCHAR; + # define ACE_LIB_TEXT(STRING) STRING #endif /* ACE_USES_WCHAR */ -#endif /* ACE_WIN32 */ -#include "ace/ace_wchar.inl" +#if !defined (ACE_LACKS_DEPRECATED_MACROS) + // Via compiler, sys headers, config-platform.h, + // or this header we have a wchar_t + #define ACE_HAS_WCHAR + #undef ACE_LACKS_WCHAR_T + // The wchar type is simpley wchar_t + #define ACE_WCHAR_T wchar_t + #define ACE_WINT_T wint_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 /* ACE_LACKS_DEPRECATED_MACROS */ + +// This package should only be included in the implementation files +// that use it. +#if defined (ACE_WIN32) +#include "ace/ace_wchar_win32_defs.h" +#endif #endif /* ACE_WCHAR_H */ diff --git a/ace/config-all.h b/ace/config-all.h index 9c0f3bf6efc..3763d81dc8f 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -72,6 +72,9 @@ # include "ace/Trace.h" #endif /* ACE_OS_NTRACE */ +// Include the string conversion services here for backward compatibility +#include "ace/String_Conversion_T.h" + // These includes are here to avoid circular dependencies. // Keep this at the bottom of the file. It contains the main macros. #include "ace/OS_main.h" diff --git a/ace/config-borland-common.h b/ace/config-borland-common.h index b692f07aecd..ab35738edca 100644 --- a/ace/config-borland-common.h +++ b/ace/config-borland-common.h @@ -64,7 +64,9 @@ # define ACE_HAS_NEW_NOTHROW # define ACE_TEMPLATES_REQUIRE_SOURCE 1 # define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu") +# define ACE_TEMPLATES_REQUIRE_SOURCE 1 +# define ACE_UINT64_FORMAT_SPECIFIER_A "%Lu" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 0 diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h index d779436acd3..bb80a9c2b87 100644 --- a/ace/config-doxygen.h +++ b/ace/config-doxygen.h @@ -18,9 +18,6 @@ /// Make sure that we always turn inlining on. #define __ACE_INLINE__ -/// Make the wchar_t interfaces available. -#define ACE_HAS_WCHAR - /// Make all the emulation versions of string operations visible // #define ACE_LACKS_WCSTOK #define ACE_LACKS_ITOW diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h index 6ed6e250bcc..e4bd5543a7c 100644 --- a/ace/config-freebsd.h +++ b/ace/config-freebsd.h @@ -256,7 +256,6 @@ typedef union sigval sigval_t; #define ACE_LACKS_STROPTS_H -// Needed when ACE_HAS_WCHAR is defined. #define ACE_LACKS_WCSNICMP #define ACE_LACKS_WCSICMP #define ACE_LACKS_WCSDUP diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h index 38c5fe91bb0..c40ada25f69 100644 --- a/ace/config-hpux-11.00.h +++ b/ace/config-hpux-11.00.h @@ -147,8 +147,6 @@ // Platform has XPG4 wide character support # define ACE_HAS_XPG4_MULTIBYTE_CHAR -# define ACE_HAS_WCHAR -# define ACE_SIZEOF_WCHAR _WCHAR_T # endif /* __cplusplus < 199707L */ diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index a0f91d1f175..7323735b3de 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -230,7 +230,7 @@ # endif /* __cplusplus */ #endif /* ! __GNUG__ && ! __KCC */ -// Completely common part :-) +// Completely common part :-) // Platform/compiler has the sigwait(2) prototype # define ACE_HAS_SIGWAIT @@ -287,6 +287,12 @@ #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES +// ACE WChar support +#define ACE_SIZEOF_WCHAR 4 +#define ACE_WCHAR_MAX 0x7FFFFFFF +#define ACE_LACKS_BUILTIN_WCHAR_T + + // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT @@ -384,9 +390,12 @@ #if defined (__ia64) || defined(__alpha) || defined (__x86_64__) // On 64 bit platforms, the "long" type is 64-bits. Override the // default 32-bit platform-specific format specifiers appropriately. -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER_A "%lu" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) +# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%ld" +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) +# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #endif /* __ia64 */ #define ACE_SIZEOF_WCHAR 4 @@ -415,3 +424,4 @@ #include /**/ "ace/post.h" #endif /* ACE_LINUX_COMMON_H */ + diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h index bcb1635aac0..6f837b09f50 100644 --- a/ace/config-lynxos.h +++ b/ace/config-lynxos.h @@ -21,6 +21,11 @@ # define ACE_NEEDS_IPC_1C_H #endif /* ACE_LYNXOS_MAJOR */ +// Describe the native wchar_t +#define ACE_SIZEOF_WCHAR 4 +#define ACE_WCHAR_MAX 0x7fffffff +#define ACE_LACKS_BUILTIN_WCHAR_T + #if defined (__x86__) # define ACE_HAS_PENTIUM #elif defined (__powerpc__) @@ -100,6 +105,32 @@ #define ACE_LACKS_TIMESPEC_T #define ACE_LACKS_UCONTEXT_H #define ACE_LACKS_WCHAR_H +#define ACE_LACKS_WCSLEN +#define ACE_LACKS_WCSNCPY +#define ACE_LACKS_WCSTOUL +#define ACE_LACKS_WCSTOL +#define ACE_LACKS_WCSTOD +#define ACE_LACKS_ITOW +#define ACE_LACKS_WCSTOK +#define ACE_LACKS_WCSSTR +#define ACE_LACKS_WCSSPN +#define ACE_LACKS_WCSRCHR +#define ACE_LACKS_WCSPBRK +#define ACE_LACKS_WCSNCMP +#define ACE_LACKS_WCSNCAT +#define ACE_LACKS_WCSCSPN +#define ACE_LACKS_WCSCPY +#define ACE_LACKS_WCSCMP +#define ACE_LACKS_WCSCHR +#define ACE_LACKS_WCSCAT +#define ACE_LACKS_TOWLOWER +#define ACE_LACKS_TOWUPPER +#define ACE_LACKS_FGETWC +#define ACE_LACKS_UNGETWC +#define ACE_LACKS_FGETWS +#define ACE_LACKS_FPUTWS +#define ACE_LACKS_WCSICMP +#define ACE_LACKS_WCSNICMP #define ACE_LACKS_SUSECONDS_T #define ACE_LACKS_USECONDS_T #define ACE_MALLOC_ALIGN 8 diff --git a/ace/config-macosx-panther.h b/ace/config-macosx-panther.h index 8807bdf17fa..c8308edb975 100644 --- a/ace/config-macosx-panther.h +++ b/ace/config-macosx-panther.h @@ -16,8 +16,9 @@ #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #define ACE_LACKS_SUSECONDS_T -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM diff --git a/ace/config-macosx-tiger.h b/ace/config-macosx-tiger.h index 1345bc18193..5b897b6d9ba 100644 --- a/ace/config-macosx-tiger.h +++ b/ace/config-macosx-tiger.h @@ -18,7 +18,8 @@ #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #if !defined (ACE_SIZEOF_LONG_DOUBLE) # if (__GNUC__ == 3 && __GNUC_MINOR__ == 3) diff --git a/ace/config-macosx.h b/ace/config-macosx.h index 7238c440bfd..a6d1f1d7521 100644 --- a/ace/config-macosx.h +++ b/ace/config-macosx.h @@ -16,7 +16,8 @@ #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h index 1c7f52f3cf7..d92e16c32e4 100644 --- a/ace/config-netbsd.h +++ b/ace/config-netbsd.h @@ -84,7 +84,6 @@ #define ACE_HAS_UCONTEXT_T 1 #define ACE_HAS_VOIDPTR_MMAP 1 #define ACE_HAS_VOIDPTR_SOCKOPT 1 -#define ACE_HAS_WCHAR 1 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1 #define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 #define ACE_IOCTL_TYPE_ARG2 u_long @@ -135,8 +134,10 @@ typedef unsigned long ACE_UINT64; typedef signed long ACE_INT64; -#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%ld" +#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #elif defined(__i386__) #define ACE_HAS_PENTIUM 1 diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h index fa274e22383..928e3395f9c 100644 --- a/ace/config-pharlap.h +++ b/ace/config-pharlap.h @@ -54,7 +54,6 @@ // Let the config-win32.h file do its thing #undef ACE_CONFIG_H #include "ace/config-win32.h" -#undef ACE_HAS_WCHAR #include /**/ <embkern.h> #if defined (ACE_HAS_PHARLAP_RT) diff --git a/ace/config-rtems.h b/ace/config-rtems.h index cb93a725dec..81cb8778a8f 100644 --- a/ace/config-rtems.h +++ b/ace/config-rtems.h @@ -135,8 +135,6 @@ ACE_HAS_SEND_TIMEDWAIT ACE_HAS_SENDTO_TIMEDWAIT ACE_HAS_IP_MULTICAST ACE_HAS_NONCONST_SELECT_TIMEVAL -ACE_HAS_WCHAR_TYPEDEFS_CHAR -ACE_HAS_WCHAR_TYPEDEFS_USHORT ACE_HAS_SIGNAL_SAFE_OS_CALLS ACE_HAS_SIZET_SOCKET_LEN ACE_HAS_SOCKADDR_MSG_NAME diff --git a/ace/config-tandem-nsk-mips-v2.h b/ace/config-tandem-nsk-mips-v2.h index cba5b7b8148..fe35e30ba68 100644 --- a/ace/config-tandem-nsk-mips-v2.h +++ b/ace/config-tandem-nsk-mips-v2.h @@ -241,7 +241,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HRTIME_T_IS_BASIC_TYPE // printf format specifiers for 64 bit integers -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER_A "%Ld" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") //========================================================================= diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index ae13a39d880..146c5d65e86 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -36,6 +36,11 @@ # define ACE_LACKS_LINEBUFFERED_STREAMBUF +// ACE WChar support +#define ACE_SIZEOF_WCHAR 4 +#define ACE_WCHAR_MAX 0xFFFFFFFF +#undef ACE_LACKS_BUILTIN_WCHAR_T + // An explicit check for Tornado 2.1, which had very limited release. // See include/makeinclude/platform_vxworks5.x_g++.GNU for details // on version conventions used by ACE for VxWorks. @@ -140,8 +145,11 @@ #define ACE_LACKS_ACCESS #define ACE_LACKS_EXEC #define ACE_LACKS_FCNTL +#define ACE_LACKS_FGETWC +#define ACE_LACKS_FGETWS #define ACE_LACKS_FILELOCKS #define ACE_LACKS_FORK +#define ACE_LACKS_FPUTWS #define ACE_LACKS_FSYNC #define ACE_LACKS_GETHOSTENT #define ACE_LACKS_GETOPT @@ -196,6 +204,7 @@ #define ACE_LACKS_NATIVE_STRPTIME #define ACE_LACKS_WAIT #define ACE_LACKS_WAITPID +#define ACE_LACKS_WCTYPE_H #define ACE_LACKS_DUP2 #define ACE_LACKS_DUP #define ACE_LACKS_SUSECONDS_T diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 9b53c7143fd..bc8964d2ab9 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -295,6 +295,13 @@ #define ACE_UINT64_TYPE unsigned long long #endif +// ACE WChar support +#define ACE_SIZEOF_WCHAR 2 +#define ACE_WCHAR_MAX 0xFFFF +#if !defined(_NATIVE_WCHAR_T_DEFINED) +# define ACE_LACKS_BUILTIN_WCHAR_T +#endif + // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT @@ -302,12 +309,6 @@ // is controlled in compiler configs since it's a compiler switch. // Additionally, if the user selected use of wide chars (by setting either // ACE_USES_WCHAR or UNICODE) make sure both are enabled. -#define ACE_HAS_WCHAR -#if defined (ACE_USES_WCHAR) -# ifndef UNICODE -# define UNICODE -# endif -#endif /* ACE_USES_WCHAR */ #if defined (UNICODE) && !defined (ACE_USES_WCHAR) # define ACE_USES_WCHAR #endif /* UNICODE && !ACE_USES_WCHAR */ diff --git a/ace/config-win32-dmc.h b/ace/config-win32-dmc.h index 6012e44620e..fa623098e74 100644 --- a/ace/config-win32-dmc.h +++ b/ace/config-win32-dmc.h @@ -23,7 +23,6 @@ # undef ACE_LACKS_STRUCT_DIR #endif -// Changed ACE_TEXT to ACE_LIB_TEXT in the following line # define ACE_CC_NAME ACE_LIB_TEXT ("Digital Mars") # define ACE_CC_MAJOR_VERSION (1) # define ACE_CC_MINOR_VERSION (8) @@ -66,7 +65,6 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_STRBUF_T #define ACE_HAS_3_PARAM_WCSTOK diff --git a/ace/config-win32-ghs.h b/ace/config-win32-ghs.h index 2d332f58e16..e4c2ef327f4 100644 --- a/ace/config-win32-ghs.h +++ b/ace/config-win32-ghs.h @@ -25,11 +25,9 @@ //Green Hills Native x86 does not support structural exceptions # undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS -# undef ACE_HAS_WCHAR # define ACE_CONFIG_INCLUDE_GHS_COMMON # include "ace/config-ghs-common.h" -// Changed ACE_TEXT to ACE_LIB_TEXT in the following line # define ACE_CC_NAME ACE_LIB_TEXT ("Green Hills C++") # define ACE_CC_MAJOR_VERSION (1) # define ACE_CC_MINOR_VERSION (8) @@ -76,8 +74,8 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +# define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 // Set the following to zero to placate SString.h ACE_WString CTOR diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h index 104b40c6c04..c49dcd97115 100644 --- a/ace/config-win32-mingw.h +++ b/ace/config-win32-mingw.h @@ -99,7 +99,8 @@ #endif #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h index fd28598d0f4..2fbae1e20aa 100644 --- a/ace/config-win32-msvc-7.h +++ b/ace/config-win32-msvc-7.h @@ -66,7 +66,8 @@ #define ACE_HAS_TEMPLATE_SPECIALIZATION #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) // Platform provides ACE_TLI function prototypes. // For Win32, this is not really true, but saves a lot of hassle! diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h index 6fbcca6de4c..897bf4b44f4 100644 --- a/ace/config-win32-msvc-8.h +++ b/ace/config-win32-msvc-8.h @@ -64,7 +64,8 @@ #define ACE_HAS_TEMPLATE_SPECIALIZATION #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) // Platform provides ACE_TLI function prototypes. // For Win32, this is not really true, but saves a lot of hassle! diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h index 77bcedec66f..68713115275 100644 --- a/ace/config-win32-msvc.h +++ b/ace/config-win32-msvc.h @@ -55,7 +55,7 @@ #endif /* _CPPRTTI */ #if ! defined(_NATIVE_WCHAR_T_DEFINED) - #define ACE_LACKS_NATIVE_WCHAR_T + #define ACE_LACKS_BUILTIN_WCHAR_T #endif // Win Mobile still does thread exits differently than PC Windows. diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h index 451687a00b2..1a3ac304e0c 100644 --- a/ace/config-win32-visualage.h +++ b/ace/config-win32-visualage.h @@ -74,7 +74,8 @@ #define ACE_SIZEOF_LONG_DOUBLE 10 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 #define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS 1 -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #define ACE_LACKS_NET_IF_H diff --git a/ace/os_include/os_stddef.h b/ace/os_include/os_stddef.h index 87bcbdd2e36..f909488e16b 100644 --- a/ace/os_include/os_stddef.h +++ b/ace/os_include/os_stddef.h @@ -72,12 +72,6 @@ extern "C" value equal to its value when used as the lone character in an integer character constant. */ -#if defined (ACE_LACKS_WCHAR_T) -# if !defined (ACE_WCHAR_T_TYPE) -# define ACE_WCHAR_T_TYPE long; -# endif /* !ACE_WCHAR_T_TYPE */ - typedef ACE_WCHAR_T_TYPE wchar_t; -#endif /* ACE_LACKS_WCHAR_T */ // Unsigned integer type of the result of the sizeof operator. #if defined (ACE_LACKS_SIZE_T) diff --git a/apps/FaCE/FaCE.cpp b/apps/FaCE/FaCE.cpp index 7d7c50ffcd3..49f413065b1 100644 --- a/apps/FaCE/FaCE.cpp +++ b/apps/FaCE/FaCE.cpp @@ -18,7 +18,7 @@ #include <sipapi.h> -ACE_TCHAR* g_ParameterFileName = ACE_LIB_TEXT("Parameters.txt"); +ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); /** * This simple and small class manages user-input command line @@ -90,7 +90,7 @@ void ParameterList::addParameter(char* newParameter) delete w_output; #else - this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter)); + this->addParameter(ACE_TEXT_TO_TCHAR_IN(newParameter)); #endif // NO_ACE } @@ -112,12 +112,12 @@ void ParameterList::addParameter(ACE_TCHAR* newParameter) void ParameterList::saveParameter(FILE* outputFile) { if ( (outputFile == 0) && (this->param_ != 0) ) { - outputFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("w+")); + outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+")); } if (outputFile != 0) { if (this->param_ != 0) { - fwprintf(outputFile, ACE_LIB_TEXT("%s\n"), this->param_); + fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_); this->next_->saveParameter(outputFile); } else { @@ -173,7 +173,7 @@ void InitSetup() void LoadParameterHistory() { - FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("r")); + FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r")); if (parameterFile != NULL) { while (feof(parameterFile) == 0) { @@ -328,12 +328,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_SETTING_RUN: { #ifdef NO_ACE - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; + cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; CE_ARGV ce_argv(g_CommandLine); main_i(ce_argv.argc(), ce_argv.argv()); - cout << ACE_LIB_TEXT("END") << endl << endl; + cout << ACE_TEXT("END") << endl << endl; #else - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; + cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; ACE_CE_ARGV ce_argv(g_CommandLine); ACE::init(); ACE_MAIN_OBJECT_MANAGER @@ -341,7 +341,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK); // set call back flag ace_main_i(ce_argv.argc(), ce_argv.argv()); ACE::fini(); - cout << ACE_LIB_TEXT("END") << endl << endl; + cout << ACE_TEXT("END") << endl << endl; #endif // NO_ACE } break; @@ -388,7 +388,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) GetClientRect(hWnd, &textRect); nCmdHt = CommandBar_Height(mbi.hwndMB); - hWndEdit = CreateWindow(ACE_LIB_TEXT("EDIT"), + hWndEdit = CreateWindow(ACE_TEXT("EDIT"), NULL, WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL, 0, @@ -457,7 +457,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { SHINITDLGINFO shidi; - ACE_TCHAR* copyrightNote = ACE_LIB_TEXT( + ACE_TCHAR* copyrightNote = ACE_TEXT( "ACE® and TAO® are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object \ Computing at Washington University,© 1993-2002, all rights reserved. \ FaCE is copyrighted by Object Computing, Inc.,© 2002,\n all rights reserved.\n\ @@ -552,7 +552,7 @@ LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1); EndDialog(hDlg, wmId); - tempFile = _wfopen(tempBuffer, ACE_LIB_TEXT("r")); + tempFile = _wfopen(tempBuffer, ACE_TEXT("r")); if (tempFile != NULL) // if file exists { diff --git a/apps/FaCE/FaCE.h b/apps/FaCE/FaCE.h index 8a4b80425d9..ef1842323c0 100644 --- a/apps/FaCE/FaCE.h +++ b/apps/FaCE/FaCE.h @@ -30,7 +30,7 @@ #include "CE_Screen_Output.h" #define ACE_TCHAR wchar_t -#define ACE_LIB_TEXT(STRING) L##STRING +#define ACE_TEXT(STRING) L##STRING #define ACE_CE_Screen_Output CE_Screen_Output int main_i(int, wchar_t**); diff --git a/apps/Gateway/Gateway/Config_Files.cpp b/apps/Gateway/Gateway/Config_Files.cpp index f1b9e96dd23..12328282242 100644 --- a/apps/Gateway/Gateway/Config_Files.cpp +++ b/apps/Gateway/Gateway/Config_Files.cpp @@ -138,7 +138,7 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry, #if defined (DEBUGGING) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { FP_RETURN_TYPE result; int line_number = 0; diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp index cc80ce06c7d..1408e5f4e41 100644 --- a/apps/Gateway/Gateway/Options.cpp +++ b/apps/Gateway/Gateway/Options.cpp @@ -173,7 +173,7 @@ int Options::parse_args (int argc, ACE_TCHAR *argv[]) { // Assign defaults. - ACE_Get_Opt get_opt (argc, + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:bC:c:dm:P:p:q:r:t:vw:"), 0); diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp index 0b33552e629..659fc38b5c9 100644 --- a/apps/Gateway/Peer/Options.cpp +++ b/apps/Gateway/Peer/Options.cpp @@ -108,7 +108,7 @@ Options::enabled (int option) const void Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:c:C:h:m:t:v"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:c:C:h:m:t:v"), 0); for (int c; (c = get_opt ()) != -1; ) { diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp index 8dc842a2f5a..0c5fd166d04 100644 --- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp +++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp @@ -279,7 +279,7 @@ ACE_Blob_Writer::send_request (void) // Create the header, store the actual length in mesglen. // NOTE! %lu is really what's wanted. ACE_SIZE_T_FORMAT_SPECIFIER is - // defined in terms of ACE_LIB_TEXT which is NOT what we want here. + // defined in terms of ACE_TEXT which is NOT what we want here. mesglen = ACE_OS::sprintf (mesg, "%s /%s %s %lu\n\n", request_prefix_, filename_, request_suffix_, (unsigned long)length_); diff --git a/apps/JAWS/clients/Blobby/Options.cpp b/apps/JAWS/clients/Blobby/Options.cpp index 08f7de4ad8b..5934bd59591 100644 --- a/apps/JAWS/clients/Blobby/Options.cpp +++ b/apps/JAWS/clients/Blobby/Options.cpp @@ -23,7 +23,7 @@ Options::instance (void) void Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("rwh:p:f:l:o:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("rwh:p:f:l:o:d")); int c; diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp index f0bb20b6d56..b565dcb05be 100644 --- a/apps/JAWS/clients/Caching/http_client.cpp +++ b/apps/JAWS/clients/Caching/http_client.cpp @@ -58,7 +58,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) while (isspace (*s)); // Shell command. - if (ACE_OS::system (ACE_TEXT_CHAR_TO_TCHAR (s)) == -1) + if (ACE_OS::system (ACE_TEXT_TO_TCHAR_IN (s)) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT (" ! Error executing: %C\n"), s)); } else if (ACE_OS::strncmp (s, "http://", 7) == 0) diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp index bfeda511176..cb8d0290937 100644 --- a/apps/JAWS/clients/Caching/http_handler.cpp +++ b/apps/JAWS/clients/Caching/http_handler.cpp @@ -137,7 +137,7 @@ HTTP_Handler::svc (void) && (::sscanf (contentlength, "\nContent-%*[lL]ength: %d ", &this->response_size_) == 1)) { - ACE_Filecache_Handle afh (ACE_TEXT_CHAR_TO_TCHAR (this->filename_), + ACE_Filecache_Handle afh (ACE_TEXT_TO_TCHAR_IN (this->filename_), this->response_size_); this->peer ().recv_n (afh.address (), this->response_size_); @@ -189,7 +189,7 @@ HTTP_Connector::connect (const char * url) HTTP_Handler *hhptr = &hh; // First check the cache. - if (ACE_Filecache::instance ()->find (ACE_TEXT_CHAR_TO_TCHAR (hh.filename ())) == 0) + if (ACE_Filecache::instance ()->find (ACE_TEXT_TO_TCHAR_IN (hh.filename ())) == 0) { ACE_DEBUG ((LM_DEBUG, " ``%s'' is already cached.\n", hh.filename ())); diff --git a/apps/JAWS/clients/Caching/test_URL.cpp b/apps/JAWS/clients/Caching/test_URL.cpp index 7e81a359f45..13467f8eb4a 100644 --- a/apps/JAWS/clients/Caching/test_URL.cpp +++ b/apps/JAWS/clients/Caching/test_URL.cpp @@ -4,7 +4,7 @@ ACE_RCSID(Caching, test_URL, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp index 86ffea0542a..0f22cc78d7c 100644 --- a/apps/JAWS/server/HTTP_Server.cpp +++ b/apps/JAWS/server/HTTP_Server.cpp @@ -49,7 +49,7 @@ HTTP_Server::parse_args (int argc, ACE_TCHAR *argv[]) this->throttle_ = 0; this->caching_ = true; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:n:t:i:b:c:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:n:t:i:b:c:")); while ((c = get_opt ()) != -1) switch (c) diff --git a/apps/JAWS/server/main.cpp b/apps/JAWS/server/main.cpp index 4f319f02727..dc9d8291549 100644 --- a/apps/JAWS/server/main.cpp +++ b/apps/JAWS/server/main.cpp @@ -33,7 +33,7 @@ handler (int) // JAWS as an ACE Service, as well. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Service_Config daemon; diff --git a/apps/JAWS/stress_testing/benchd.cpp b/apps/JAWS/stress_testing/benchd.cpp index ff17f669430..c5a06a6c8b2 100644 --- a/apps/JAWS/stress_testing/benchd.cpp +++ b/apps/JAWS/stress_testing/benchd.cpp @@ -174,7 +174,7 @@ Handle_Events::serve (char *buf) static void parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "i:u:q"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "i:u:q"); int c; @@ -205,7 +205,7 @@ handler (int) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT); ACE_OS::signal (SIGCLD, SIG_IGN); @@ -231,7 +231,7 @@ main (int argc, char *argv[]) } #else int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_ERROR ((LM_ERROR, "error: %s must be run on a platform that support IP multicast\n", argv[0])); diff --git a/apps/JAWS/stress_testing/http_tester.cpp b/apps/JAWS/stress_testing/http_tester.cpp index eb086262317..2a7366fde33 100644 --- a/apps/JAWS/stress_testing/http_tester.cpp +++ b/apps/JAWS/stress_testing/http_tester.cpp @@ -124,7 +124,7 @@ int driver(char *id, int total_num, float requests_sec, char *url1, float p1, ch } -main(int argc, char **argv) +ACE_TMAIN(int argc, ACE_TCHAR **argv) { // This will set the global scale factor if the ACE_SCALE_FACTOR // environment variable is set. diff --git a/apps/JAWS2/JAWS/Server.cpp b/apps/JAWS2/JAWS/Server.cpp index 4fbec0cd0f7..e65ca3b57d3 100644 --- a/apps/JAWS2/JAWS/Server.cpp +++ b/apps/JAWS2/JAWS/Server.cpp @@ -142,7 +142,7 @@ JAWS_Server::parse_args (int argc, char *argv[]) int c; int t = 0; - ACE_Get_Opt getopt (argc, argv, "t" "p:c:d:n:m:f:r:"); + ACE_Get_Arg_Opt<char> getopt (argc, argv, "t" "p:c:d:n:m:f:r:"); while ((c = getopt ()) != -1) switch (c) { diff --git a/apps/JAWS2/main.cpp b/apps/JAWS2/main.cpp index d1bd6f46dcb..1d3198f8ba8 100644 --- a/apps/JAWS2/main.cpp +++ b/apps/JAWS2/main.cpp @@ -26,7 +26,7 @@ static JAWS_HTTP_10_Parse_Task HTTP_Parse; static JAWS_HTTP_10_Write_Task HTTP_Write; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_OS::signal (SIGCHLD, SIG_IGN); diff --git a/apps/JAWS3/bench/mkfiles.cpp b/apps/JAWS3/bench/mkfiles.cpp index 42bc2c969fa..c83b3c2582e 100644 --- a/apps/JAWS3/bench/mkfiles.cpp +++ b/apps/JAWS3/bench/mkfiles.cpp @@ -8,9 +8,9 @@ static float gammln (float xx); static float poidev (float xm); -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt options (argc, argv, "m:s:x:n:"); + ACE_Get_Arg_Opt<ACE_TCHAR> options (argc, argv, "m:s:x:n:"); // m -- median file size in kB // x -- maximum file size in kB // n -- number of files diff --git a/apps/JAWS3/bench/rqfiles.cpp b/apps/JAWS3/bench/rqfiles.cpp index 49e6bf726d0..e6f88417a4d 100644 --- a/apps/JAWS3/bench/rqfiles.cpp +++ b/apps/JAWS3/bench/rqfiles.cpp @@ -161,7 +161,7 @@ typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Noop_Token> ACE_Select_NULL_LOCK_Reactor; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Select_NULL_LOCK_Reactor *select_reactor; select_reactor = new ACE_Select_NULL_LOCK_Reactor; @@ -173,7 +173,7 @@ main (int argc, char *argv[]) ACE_Reactor::instance ()->register_handler (SIGINT, signal_handler); ACE_OS::signal (SIGPIPE, SIG_IGN); - ACE_Get_Opt options (argc, argv, "f:r:n:w:"); + ACE_Get_Arg_Opt<ACE_TCHAR> options (argc, argv, "f:r:n:w:"); // f -- file list // r -- request rate in requests per second diff --git a/apps/JAWS3/http/HTTP_Service_Handler.cpp b/apps/JAWS3/http/HTTP_Service_Handler.cpp index 56e2d2c7e92..bad847b48ca 100644 --- a/apps/JAWS3/http/HTTP_Service_Handler.cpp +++ b/apps/JAWS3/http/HTTP_Service_Handler.cpp @@ -37,7 +37,7 @@ JAWS_HTTP_Service_Handler::close (unsigned long) int JAWS_HTTP_Acceptor::init (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opt (argc, argv, "p:"); + ACE_Get_Arg_Opt<ACE_TCHAR> opt (argc, argv, "p:"); unsigned short p = 0; diff --git a/apps/JAWS3/jaws3/main.cpp b/apps/JAWS3/jaws3/main.cpp index 4b5705abc2f..9ffa504a291 100644 --- a/apps/JAWS3/jaws3/main.cpp +++ b/apps/JAWS3/jaws3/main.cpp @@ -9,7 +9,7 @@ #include "jaws3/Signal_Task.h" int -main (int argc, ACE_TCHAR *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_REACTOR_INSTANCE_INIT; diff --git a/apps/JAWS3/small/SS_Service_Handler.cpp b/apps/JAWS3/small/SS_Service_Handler.cpp index 627996a7b07..80acf90c725 100644 --- a/apps/JAWS3/small/SS_Service_Handler.cpp +++ b/apps/JAWS3/small/SS_Service_Handler.cpp @@ -37,7 +37,7 @@ TeraSS_Service_Handler::close (unsigned long) int TeraSS_Acceptor::init (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opt (argc, argv, "p:"); + ACE_Get_Arg_Opt<ACE_TCHAR> opt (argc, argv, "p:"); unsigned short p = 0; diff --git a/apps/drwho/Options.cpp b/apps/drwho/Options.cpp index 076623c0e03..3a074ffc857 100644 --- a/apps/drwho/Options.cpp +++ b/apps/drwho/Options.cpp @@ -79,7 +79,7 @@ Options::set_options (int argc, char *argv[]) int add_default_hosts = 1; Options::program_name = argv[0]; - ACE_Get_Opt getopt (argc, argv, "?aA:bdF:f:hH:Llp:rRsSt:w:"); + ACE_Get_Arg_Opt<char> getopt (argc, argv, "?aA:bdF:f:hH:Llp:rRsSt:w:"); while ((c = getopt ()) != -1) { diff --git a/apps/drwho/client.cpp b/apps/drwho/client.cpp index 5b8f4fcf8ab..c2443720b4f 100644 --- a/apps/drwho/client.cpp +++ b/apps/drwho/client.cpp @@ -42,7 +42,7 @@ make_client (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Options::set_options (argc, argv); diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp index aa4bea1349b..09bbe570f00 100644 --- a/apps/drwho/server.cpp +++ b/apps/drwho/server.cpp @@ -86,7 +86,7 @@ do_drwho (SMR_Server &smr_server) // debugging! int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_OS::signal (SIGTERM, (ACE_SignalHandler)exit_server); ACE_OS::signal (SIGINT, (ACE_SignalHandler)exit_server); diff --git a/apps/gperf/src/Options.cpp b/apps/gperf/src/Options.cpp index 4251d7c7c39..d433bbc8c9b 100644 --- a/apps/gperf/src/Options.cpp +++ b/apps/gperf/src/Options.cpp @@ -261,7 +261,7 @@ Options::parse_args (int argc, char *argv[]) if (ACE_LOG_MSG->open (argv[0]) == -1) return -1; - ACE_Get_Opt getopt (argc, argv, "abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:"); + ACE_Get_Arg_Opt<char> getopt (argc, argv, "abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:"); int option_char; argc_ = argc; diff --git a/apps/gperf/src/gperf.cpp b/apps/gperf/src/gperf.cpp index de4ca87430d..c6a838e2874 100644 --- a/apps/gperf/src/gperf.cpp +++ b/apps/gperf/src/gperf.cpp @@ -38,7 +38,7 @@ ACE_RCSID(src, gperf, "$Id$") #include "ace/OS_main.h" int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { struct tm *tm; time_t clock; @@ -75,7 +75,7 @@ main (int argc, char *argv[]) } #else /* ! ACE_HAS_GPERF */ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc index f5ea29989fe..de8c7b9e0a8 100644 --- a/apps/gperf/tests/tests.mpc +++ b/apps/gperf/tests/tests.mpc @@ -2,6 +2,7 @@ // $Id$ project(cinset): gperf_test { + avoids += uses_wchar exename = cout verbatim(gnuace, bottom) { @@ -26,6 +27,7 @@ project(cinset): gperf_test { } project(adainset): gperf_test { + avoids += uses_wchar exename = aout verbatim(gnuace, bottom) { @@ -50,6 +52,7 @@ project(adainset): gperf_test { } project(cppinset): gperf_test { + avoids += uses_wchar exename = cppout verbatim(gnuace, bottom) { @@ -74,6 +77,7 @@ project(cppinset): gperf_test { } project(preinset): gperf_test { + avoids += uses_wchar exename = preout verbatim(gnuace, bottom) { @@ -98,6 +102,7 @@ project(preinset): gperf_test { } project(m3inset): gperf_test { + avoids += uses_wchar exename = m3out verbatim(gnuace, bottom) { @@ -122,6 +127,7 @@ project(m3inset): gperf_test { } project(pinset): gperf_test { + avoids += uses_wchar exename = pout verbatim(gnuace, bottom) { @@ -146,6 +152,7 @@ project(pinset): gperf_test { } project(iinset): gperf_test { + avoids += uses_wchar exename = iout verbatim(gnuace, bottom) { @@ -170,6 +177,7 @@ project(iinset): gperf_test { } project(iinset2): gperf_test { + avoids += uses_wchar exename = iout2 after += iinset @@ -196,6 +204,7 @@ project(iinset2): gperf_test { } project(tinset): gperf_test { + avoids += uses_wchar exename = tout verbatim(gnuace, bottom) { @@ -220,6 +229,7 @@ project(tinset): gperf_test { } project(taoinset): gperf_test { + avoids += uses_wchar exename = taoout verbatim(gnuace, bottom) { diff --git a/apps/mkcsregdb/mkcsregdb.cpp b/apps/mkcsregdb/mkcsregdb.cpp index 388e9212dec..9d638725a10 100644 --- a/apps/mkcsregdb/mkcsregdb.cpp +++ b/apps/mkcsregdb/mkcsregdb.cpp @@ -312,7 +312,7 @@ csdb_generator::fini_output (const char *tgt) } int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { ACE_CString srcname; if (argc > 1) diff --git a/apps/soreduce/Library.cpp b/apps/soreduce/Library.cpp index 6b5b2944ce2..b1b0c5b3e59 100644 --- a/apps/soreduce/Library.cpp +++ b/apps/soreduce/Library.cpp @@ -238,13 +238,13 @@ Library::load_modules () ACE_CString subdir = path_ + "/.shobj"; struct dirent **dent; - num_modules_ = ACE_OS::scandir(ACE_TEXT_CHAR_TO_TCHAR (subdir.c_str()), + num_modules_ = ACE_OS::scandir(ACE_TEXT_TO_TCHAR_IN (subdir.c_str()), &dent,selector,comparator); if (num_modules_ > 0) { modules_ = new Obj_Module * [num_modules_]; for (int i = 0; i < num_modules_; i++) { - ACE_CString ent_name (ACE_TEXT_ALWAYS_CHAR (dent[i]->d_name)); + ACE_CString ent_name (ACE_TEXT_TO_CHAR_IN (dent[i]->d_name)); modules_[i] = new Obj_Module(ent_name); modules_[i]->add_source (ACE_CString(subdir + "/" + ent_name).c_str()); ACE_OS::free(dent[i]); @@ -302,7 +302,7 @@ Library::write_export_list (int show_ref_counts) if (show_ref_counts) { ACE_DEBUG ((LM_DEBUG, "Making directory %s\n",rcpath.c_str())); - if (ACE_OS::mkdir(ACE_TEXT_CHAR_TO_TCHAR (rcpath.c_str())) == -1 && + if (ACE_OS::mkdir(ACE_TEXT_TO_TCHAR_IN (rcpath.c_str())) == -1 && errno != EEXIST) ACE_ERROR ((LM_ERROR, "%p\n", "mkdir")); } diff --git a/apps/soreduce/soreduce.cpp b/apps/soreduce/soreduce.cpp index 4ac9e99aa16..b155ef24cef 100644 --- a/apps/soreduce/soreduce.cpp +++ b/apps/soreduce/soreduce.cpp @@ -32,7 +32,7 @@ ACE_RCSID (src, soreduce, "$Id$") int -main (int argc, char ** argv) +ACE_TMAIN (int argc, ACE_TCHAR ** argv) { SO_Group group; diff --git a/bin/sandbox.cpp b/bin/sandbox.cpp index fce69dedcb6..6b38aee0a6f 100644 --- a/bin/sandbox.cpp +++ b/bin/sandbox.cpp @@ -18,7 +18,7 @@ const char *child_name = 0; static int parse_args(int& argc, char* argv[]); int -main(int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { if (parse_args(argc, argv) != 0) return 1; diff --git a/contrib/utility/Example/CommandLine/Foo/foo.cpp b/contrib/utility/Example/CommandLine/Foo/foo.cpp index a389f8d822a..9c6c36daea5 100644 --- a/contrib/utility/Example/CommandLine/Foo/foo.cpp +++ b/contrib/utility/Example/CommandLine/Foo/foo.cpp @@ -48,7 +48,7 @@ int help (int argc, char* argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { // Step 1: determine command 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, diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp index 0cc05964720..1357af3a6cd 100644 --- a/netsvcs/clients/Naming/Client/Client_Test.cpp +++ b/netsvcs/clients/Naming/Client/Client_Test.cpp @@ -407,7 +407,7 @@ Client_Test::set_host (const char *hostname, int port) this->name_options_->context (ACE_Naming_Context::NET_LOCAL); // Set Name Options - this->name_options_->nameserver_host (ACE_TEXT_CHAR_TO_TCHAR (hostname)); + this->name_options_->nameserver_host (ACE_TEXT_TO_TCHAR_IN (hostname)); this->name_options_->nameserver_port (port); return NAMING_CONTEXT ()->open (ACE_Naming_Context::NET_LOCAL); diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp index bfda59cd09f..c3aba7ee354 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp @@ -98,7 +98,7 @@ Dump_Restore::handle_input (ACE_HANDLE) case 'h' : if (::scanf ("%s %hu", buf1, &port) <= 0) break; - set_host (ACE_TEXT_CHAR_TO_TCHAR (buf1), port); + set_host (ACE_TEXT_TO_TCHAR_IN (buf1), port); break; case 'F': case 'f': diff --git a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp b/netsvcs/clients/Naming/Dump_Restore/createfile.cpp index 25bf2fb803c..0e9f08889fc 100644 --- a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp +++ b/netsvcs/clients/Naming/Dump_Restore/createfile.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Dump_Restore, createfile, "$Id$") int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { FILE *infile, *outfile; char buf[BUFSIZ]; diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp index 8df0ae625fc..5853c5afd91 100644 --- a/netsvcs/clients/Tokens/collection/collection.cpp +++ b/netsvcs/clients/Tokens/collection/collection.cpp @@ -92,7 +92,7 @@ parse_args (int argc, char *argv[]) { ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE); - ACE_Get_Opt get_opt (argc, argv, "un:dp:h:", 1); + ACE_Get_Arg_Opt get_opt (argc, argv, "un:dp:h:", 1); for (int c; (c = get_opt ()) != -1; ) { @@ -129,7 +129,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { if (parse_args (argc, argv) == -1) return -1; @@ -202,7 +202,7 @@ main (int argc, char* argv[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1); diff --git a/netsvcs/clients/Tokens/collection/rw_locks.cpp b/netsvcs/clients/Tokens/collection/rw_locks.cpp index 2670f99214f..81923e630c4 100644 --- a/netsvcs/clients/Tokens/collection/rw_locks.cpp +++ b/netsvcs/clients/Tokens/collection/rw_locks.cpp @@ -74,7 +74,7 @@ parse_args (int argc, char *argv[]) { ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE); - ACE_Get_Opt get_opt (argc, argv, "t:iun:drR:sp:h:", 1); + ACE_Get_Arg_Opt get_opt (argc, argv, "t:iun:drR:sp:h:", 1); for (int c; (c = get_opt ()) != -1; ) { @@ -127,7 +127,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { if (parse_args (argc, argv) == -1) return -1; @@ -165,7 +165,7 @@ main (int argc, char* argv[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1); diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp index e1a9d60ccd6..0ca8c13df54 100644 --- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp +++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp @@ -170,7 +170,7 @@ parse_args (int argc, char *argv[]) { ACE_LOG_MSG->open (argv[0]); - ACE_Get_Opt get_opt (argc, argv, "iuh:rp:n:", 1); + ACE_Get_Arg_Opt get_opt (argc, argv, "iuh:rp:n:", 1); for (int c; (c = get_opt ()) != -1; ) { @@ -317,7 +317,7 @@ rwlock_test (void) } int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { if (parse_args (argc, argv) == -1) return -1; @@ -332,7 +332,7 @@ main (int argc, char* argv[]) } #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1); diff --git a/netsvcs/clients/Tokens/invariant/invariant.cpp b/netsvcs/clients/Tokens/invariant/invariant.cpp index cda1f54f6f7..cc9e643a0e2 100644 --- a/netsvcs/clients/Tokens/invariant/invariant.cpp +++ b/netsvcs/clients/Tokens/invariant/invariant.cpp @@ -157,7 +157,7 @@ run_final_test (void) } int -main (int /* argc */, char* /* argv */ []) +ACE_TMAIN (int /* argc */, ACE_TCHAR* /* argv */ []) { ACE_Thread_Manager mgr; @@ -188,7 +188,7 @@ main (int /* argc */, char* /* argv */ []) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1); diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp index d75c2b543b1..f8a5e18a5a1 100644 --- a/netsvcs/clients/Tokens/manual/manual.cpp +++ b/netsvcs/clients/Tokens/manual/manual.cpp @@ -103,7 +103,7 @@ STDIN_Token::parse_args (int argc, char *argv[]) { ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); - ACE_Get_Opt get_opt (argc, argv, "h:p:diu", 1); + ACE_Get_Arg_Opt get_opt (argc, argv, "h:p:diu", 1); for (int c; (c = get_opt ()) != -1; ) { @@ -349,7 +349,7 @@ STDIN_Token::create_proxy (const char *token, char type) } int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { STDIN_Token st; return st.open (argc, argv); @@ -357,7 +357,7 @@ main (int argc, char* argv[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "threads or ACE_HAS_TOKENS_LIBRARY not supported on this platform\n"), -1); diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp index 73a33cb6c6e..5697b1aa426 100644 --- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp +++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp @@ -69,7 +69,7 @@ parse_args (int argc, char *argv[]) { ACE_LOG_MSG->open (argv[0]); - ACE_Get_Opt get_opt (argc, argv, "t:uh:p:n:", 1); + ACE_Get_Arg_Opt get_opt (argc, argv, "t:uh:p:n:", 1); for (int c; (c = get_opt ()) != -1; ) { @@ -107,7 +107,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Thread_Manager thread_mgr; @@ -135,7 +135,7 @@ main (int argc, char *argv[]) return 0; } #else -int main (int, char *[]) +int ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "you must have threads to run this test program\n"), -1); } diff --git a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp index 5d0d95af876..a4d0ddb5ecd 100644 --- a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp +++ b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp @@ -142,7 +142,7 @@ parse_args (int argc, char *argv[]) { ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE); - ACE_Get_Opt get_opt (argc, argv, "t:iun:dr:sp:h:R", 1); + ACE_Get_Arg_Opt get_opt (argc, argv, "t:iun:dr:sp:h:R", 1); for (int c; (c = get_opt ()) != -1; ) { @@ -204,7 +204,7 @@ parse_args (int argc, char *argv[]) #endif int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { if (parse_args (argc, argv) == -1) return -1; @@ -244,7 +244,7 @@ main (int argc, char* argv[]) #else int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_ERROR_RETURN ((LM_ERROR, "threads not supported on this platform\n"), -1); diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp index 714d9744d68..6e90646b786 100644 --- a/netsvcs/lib/Client_Logging_Handler.cpp +++ b/netsvcs/lib/Client_Logging_Handler.cpp @@ -500,7 +500,7 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[]) int ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:k:p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("h:k:p:"), 0); for (int c; (c = get_opt ()) != -1; ) { diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp index 7d085c1c3cc..40c1899a67f 100644 --- a/netsvcs/lib/Name_Handler.cpp +++ b/netsvcs/lib/Name_Handler.cpp @@ -34,7 +34,7 @@ ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) ACE_LOG_MSG->open (ACE_TEXT ("Name Service")); - 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; ) { @@ -364,9 +364,9 @@ ACE_Name_Handler::shared_bind (int rebind) { ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::shared_bind")); ACE_NS_WString a_name (this->name_request_.name (), - this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); + this->name_request_.name_len () / sizeof (wchar_t)); ACE_NS_WString a_value (this->name_request_.value (), - this->name_request_.value_len () / sizeof (ACE_WCHAR_T)); + this->name_request_.value_len () / sizeof (wchar_t)); int result; if (rebind == 0) { @@ -404,7 +404,7 @@ ACE_Name_Handler::resolve (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for RESOLVE \n"))); #endif /* 0 */ ACE_NS_WString a_name (this->name_request_.name (), - this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); + this->name_request_.name_len () / sizeof (wchar_t)); // The following will deliver our reply back to client we // pre-suppose success (indicated by type RESOLVE). @@ -413,12 +413,12 @@ ACE_Name_Handler::resolve (void) char *atype; if (NAMING_CONTEXT::instance ()->resolve (a_name, avalue, atype) == 0) { - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> avalue_urep (avalue.rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> avalue_urep (avalue.rep ()); ACE_Name_Request nrq (ACE_Name_Request::RESOLVE, 0, 0, avalue_urep.get (), - avalue.length () * sizeof (ACE_WCHAR_T), + avalue.length () * sizeof (wchar_t), atype, ACE_OS::strlen (atype)); delete[] atype; return this->send_request (nrq); @@ -437,7 +437,7 @@ ACE_Name_Handler::unbind (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for UNBIND \n"))); #endif /* 0 */ ACE_NS_WString a_name (this->name_request_.name (), - this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); + this->name_request_.name_len () / sizeof (wchar_t)); if (NAMING_CONTEXT::instance ()->unbind (a_name) == 0) return this->send_reply (0); @@ -449,10 +449,10 @@ ACE_Name_Request ACE_Name_Handler::name_request (ACE_NS_WString *one_name) { ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::name_request")); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_name_urep (one_name->rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> one_name_urep (one_name->rep ()); return ACE_Name_Request (ACE_Name_Request::LIST_NAMES, one_name_urep.get (), - one_name->length () * sizeof (ACE_WCHAR_T), + one_name->length () * sizeof (wchar_t), 0, 0, 0, 0); } @@ -461,11 +461,11 @@ ACE_Name_Request ACE_Name_Handler::value_request (ACE_NS_WString *one_value) { ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::value_request")); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_value_urep (one_value->rep ()); + ACE_Auto_Basic_Array_Ptr<wchar_t> one_value_urep (one_value->rep ()); return ACE_Name_Request (ACE_Name_Request::LIST_VALUES, 0, 0, one_value_urep.get (), - one_value->length () * sizeof (ACE_WCHAR_T), + one_value->length () * sizeof (wchar_t), 0, 0); } @@ -487,7 +487,7 @@ ACE_Name_Handler::lists (void) ACE_PWSTRING_SET set; ACE_NS_WString pattern (this->name_request_.name (), - this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); + this->name_request_.name_len () / sizeof (wchar_t)); // Get the index into the list table int index = ACE_LIST_MAP (this->name_request_.msg_type (), @@ -537,7 +537,7 @@ ACE_Name_Handler::lists_entries (void) ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists_entries")); ACE_BINDING_SET set; ACE_NS_WString pattern (this->name_request_.name (), - this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); + this->name_request_.name_len () / sizeof (wchar_t)); int result = -1; @@ -586,15 +586,15 @@ ACE_Name_Handler::lists_entries (void) set_iterator.next (one_entry) !=0; set_iterator.advance()) { - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> + ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (one_entry->name_.rep ()); - ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> + ACE_Auto_Basic_Array_Ptr<wchar_t> value_urep (one_entry->value_.rep ()); ACE_Name_Request mynrq (this->name_request_.msg_type (), name_urep.get (), - one_entry->name_.length () * sizeof (ACE_WCHAR_T), + one_entry->name_.length () * sizeof (wchar_t), value_urep.get (), - one_entry->value_.length () * sizeof (ACE_WCHAR_T), + one_entry->value_.length () * sizeof (wchar_t), one_entry->type_, ACE_OS::strlen (one_entry->type_)); diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp index aca7492c985..e65769994cf 100644 --- a/netsvcs/lib/Server_Logging_Handler_T.cpp +++ b/netsvcs/lib/Server_Logging_Handler_T.cpp @@ -163,10 +163,10 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::op #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__) this->receiver_.m_ = - ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ())); + ACE_TString (ACE_TEXT_TO_TCHAR_IN (client_addr.get_host_name ())); #else this->host_name_ = - ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ())); + ACE_TString (ACE_TEXT_TO_TCHAR_IN (client_addr.get_host_name ())); #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */ ACE_DEBUG ((LM_DEBUG, @@ -249,7 +249,7 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, ACE_TCHAR *a ACE_LOG_MSG->open (ACE_TEXT ("Logging Service")); - 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; ) { diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp index 221ee1690fa..572c56af965 100644 --- a/netsvcs/lib/TS_Clerk_Handler.cpp +++ b/netsvcs/lib/TS_Clerk_Handler.cpp @@ -568,7 +568,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[]) ACE_INET_Addr server_addr; ACE_TS_Clerk_Handler *handler; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:t:p:b"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("h:t:p:b"), 0); for (int c; (c = get_opt ()) != -1; ) { diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp index cdc78b1d3bd..9e7cd78ea4c 100644 --- a/netsvcs/lib/TS_Server_Handler.cpp +++ b/netsvcs/lib/TS_Server_Handler.cpp @@ -20,7 +20,7 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) ACE_LOG_MSG->open (ACE_TEXT ("Time Service")); - 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; ) { diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp index 806f91c52c5..885ec72d52a 100644 --- a/netsvcs/lib/Token_Handler.cpp +++ b/netsvcs/lib/Token_Handler.cpp @@ -23,7 +23,7 @@ ACE_Token_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) ACE_LOG_MSG->open (ACE_TEXT ("Token Service")); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Arg_Opt get_opt (argc, argv, "p:", 0); for (int c; (c = get_opt ()) != -1; ) { diff --git a/performance-tests/Misc/basic_perf.cpp b/performance-tests/Misc/basic_perf.cpp index d084e84e1b2..0aa04d3b007 100644 --- a/performance-tests/Misc/basic_perf.cpp +++ b/performance-tests/Misc/basic_perf.cpp @@ -498,7 +498,7 @@ static unsigned int get_options (int argc, ACE_TCHAR *argv []) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:?")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:?")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp index 739d676a5fb..b497ab004d1 100644 --- a/performance-tests/Misc/childbirth_time.cpp +++ b/performance-tests/Misc/childbirth_time.cpp @@ -336,7 +336,7 @@ prof_mutex_base (size_t iteration) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:l:pftahmxe")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:l:pftahmxe")); int c; size_t iteration = 10; Profiler profiler = 0; diff --git a/performance-tests/Misc/context_switch_time.cpp b/performance-tests/Misc/context_switch_time.cpp index 084d85eaca6..a14f918bc93 100644 --- a/performance-tests/Misc/context_switch_time.cpp +++ b/performance-tests/Misc/context_switch_time.cpp @@ -1085,7 +1085,7 @@ static u_int get_options (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("c:n?")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("c:n?")); int opt; while ((opt = get_opt ()) != EOF) { switch (opt) { @@ -1307,7 +1307,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/performance-tests/Misc/preempt.cpp b/performance-tests/Misc/preempt.cpp index 56a961031e8..2c68e817385 100644 --- a/performance-tests/Misc/preempt.cpp +++ b/performance-tests/Misc/preempt.cpp @@ -293,7 +293,7 @@ Low_Priority_Task::svc (void) static int get_options (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("fh:l:n:p:y?")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("fh:l:n:p:y?")); int opt; while ((opt = get_opt ()) != EOF) { switch (opt) { diff --git a/performance-tests/Misc/test_guard.cpp b/performance-tests/Misc/test_guard.cpp index 507f22bfff7..7d2707d3e58 100644 --- a/performance-tests/Misc/test_guard.cpp +++ b/performance-tests/Misc/test_guard.cpp @@ -50,10 +50,10 @@ char *test_name[TEST_END] = { "ACE_Guard", "ACE_Thread_Mutex_Guard" }; guard_func test_function=guard; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Profile_Timer timer; - ACE_Get_Opt getopt (argc, argv, "gtn:"); + ACE_Get_Arg_Opt getopt (argc, argv, "gtn:"); int iterations = DEFAULT_ITERATIONS; int c, i; @@ -105,7 +105,7 @@ main (int argc, char *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/performance-tests/RPC/client.cpp b/performance-tests/RPC/client.cpp index b0f4a476600..ef85b9fa559 100644 --- a/performance-tests/RPC/client.cpp +++ b/performance-tests/RPC/client.cpp @@ -7,13 +7,13 @@ #include "ping.h" -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { const char* host = 0; int nsamples = 10000; int c; - ACE_Get_Opt getopt (argc, argv, "h:i:"); + ACE_Get_Arg_Opt getopt (argc, argv, "h:i:"); while ((c = getopt ()) != -1) { diff --git a/performance-tests/SCTP/Options_Manager.cpp b/performance-tests/SCTP/Options_Manager.cpp index 6d28a393fdf..dcf3f740072 100644 --- a/performance-tests/SCTP/Options_Manager.cpp +++ b/performance-tests/SCTP/Options_Manager.cpp @@ -67,45 +67,45 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c __program_name[Options_Manager::string_len - 1] = '\0'; } - // Declare options with ACE_Get_Opt + // Declare options with ACE_Get_Arg_Opt int c; - ACE_Get_Opt * get_opt = 0; + ACE_Get_Arg_Opt<ACE_TCHAR> * get_opt = 0; if (!ACE_OS::strcmp(ACE_TEXT ("client-opts"), opts_set)){ - get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h")); + get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h")); get_opt->long_option (ACE_TEXT ("test_iterations"), 'c', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("test_enable_nagle"), 'n'); get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("histogram_min_bin"), 'm', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("histogram_max_bin"), 'M', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("histogram_num_outliers"), 'x', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("histogram_bin_count"), 'b', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("client_port"), 'C', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("client_accept_addr"), 'i', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("server_port"), 'p', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("server_host"), 'H', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("payload_size_power_of_2"), 's', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("help"), 'h'); } else if (!ACE_OS::strcmp (ACE_TEXT ("server-opts"), opts_set)){ - get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("nt:p:a:u")); + get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("nt:p:a:u")); get_opt->long_option (ACE_TEXT ("test_enable_nagle"), 'n'); get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("server_port"), 'p', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("server_accept_addr"), 'a', - ACE_Get_Opt::ARG_REQUIRED); + ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED); get_opt->long_option (ACE_TEXT ("help"), 'h'); } else { _error = 1; @@ -114,7 +114,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c return; } - // Parse options with ACE_Get_Opt + // Parse options with ACE_Get_Arg_Opt while ((c = (*get_opt)()) != -1) { switch ((char) c) @@ -173,7 +173,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // Obtain the 32-bit, host-byte-order representation of // the primary address. struct in_addr foo; - int aton_retval = ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (str), + int aton_retval = ACE_OS::inet_aton(ACE_TEXT_TO_CHAR_IN (str), &foo); // If this representation was not obtained, terminate with @@ -231,7 +231,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // Obtain the 32-bit, host-byte-order representation of // a secondary address. aton_retval = - ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (next_secondary_addr), + ACE_OS::inet_aton(ACE_TEXT_TO_CHAR_IN (next_secondary_addr), &foo); // If the representation was obtained without error, @@ -290,7 +290,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // Obtain the 32-bit, host-byte-order representation of // the primary address. struct in_addr foo; - int aton_retval = ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (str), + int aton_retval = ACE_OS::inet_aton (ACE_TEXT_TO_CHAR_IN (str), &foo); // If this representation was not obtained, terminate with @@ -348,7 +348,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // Obtain the 32-bit, host-byte-order representation of // a secondary address. aton_retval = - ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (next_secondary_addr), + ACE_OS::inet_aton (ACE_TEXT_TO_CHAR_IN (next_secondary_addr), &foo); // If the representation was obtained without error, diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp index 7f98883bfad..9dd12ef4a72 100644 --- a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp +++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp @@ -61,7 +61,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // check that valid options were specified if (optsMgr._error) { - ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message)); + ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message)); return 1; } diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp index 84db9afc541..7677c317ed6 100644 --- a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp +++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp @@ -231,7 +231,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // check that valid options were specified if (optsMgr._error) { - ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message)); + ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message)); return 1; } diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/performance-tests/SCTP/SOCK_STREAM_clt.cpp index 365890265b1..f98836bedfb 100644 --- a/performance-tests/SCTP/SOCK_STREAM_clt.cpp +++ b/performance-tests/SCTP/SOCK_STREAM_clt.cpp @@ -65,7 +65,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // check that valid options were specified if (optsMgr._error) { - ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message)); + ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message)); return 1; } diff --git a/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/performance-tests/SCTP/SOCK_STREAM_srv.cpp index c2d3cceb1fc..c3bb001f2db 100644 --- a/performance-tests/SCTP/SOCK_STREAM_srv.cpp +++ b/performance-tests/SCTP/SOCK_STREAM_srv.cpp @@ -244,7 +244,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // check that valid options were specified if (optsMgr._error) { - ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message)); + ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message)); return 1; } diff --git a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp index 59b6844836a..b081ff9b4d3 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp +++ b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp @@ -246,7 +246,7 @@ Leader_Follower_Task::svc (void) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:t:d:s:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:t:d:s:")); int c; while ((c = get_opt ()) != -1) diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp index 5703ff2a1af..5ba6738013d 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp +++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp @@ -192,7 +192,7 @@ Leader_Follower_Task::svc (void) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:")); int c; while ((c = get_opt ()) != -1) diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp index 7f90fc62012..098407be216 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp @@ -396,7 +396,7 @@ Output_Task::put (ACE_Message_Block *mb, ACE_Time_Value *) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:t:d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:t:d:")); int c; while ((c = get_opt ()) != -1) @@ -577,7 +577,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) #else /*ACE_HAS_THREADS*/ int -main (int, char *[]) +ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Not supported in single threaded builds \n")); diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp index 5bb58d42397..c6ad34f828d 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp @@ -235,7 +235,7 @@ IO_Task::svc (void) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:")); int c; while ((c = get_opt ()) != -1) diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp index ed2703e7401..256ad60b902 100644 --- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp +++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp @@ -40,7 +40,7 @@ Baseline_Test_Base::init (int argc, ACE_TCHAR *argv[]) int Baseline_Test_Base::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("i:ylrw"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("i:ylrw"), 0); int c; while ((c = getopt ()) != -1) @@ -102,7 +102,7 @@ Baseline_Test_Options::Baseline_Test_Options (void) int Baseline_Test_Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("tv"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("tv"), 0); int c; while ((c = getopt ()) != -1) diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp index d2f5305de07..9a5dfdf354f 100644 --- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp +++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp @@ -74,7 +74,7 @@ Performance_Test_Options::Performance_Test_Options (void) void Performance_Test_Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("a:A:bBc:C:dDe:F:g:H:i:L:l:M:m:n:Np:P:s:S:t:T:uvX:Z:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:A:bBc:C:dDe:F:g:H:i:L:l:M:m:n:Np:P:s:S:t:T:uvX:Z:"), 0); int c; while ((c = get_opt ()) != -1) diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp index e1824f3d4ac..429bd97a031 100644 --- a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp +++ b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp @@ -37,7 +37,7 @@ ACE_Thread_Mutex Guard_Test::mutex_; int Guard_Test::init (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("gt")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("gt")); int c; while ((c = getopt()) != -1) diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp index 182914e14b7..a08f475e62f 100644 --- a/performance-tests/TCP/tcp_test.cpp +++ b/performance-tests/TCP/tcp_test.cpp @@ -528,7 +528,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:")); while ((c = getopt ()) != -1) { @@ -655,7 +655,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (remote_addr.set (dstport, (ACE_UINT32) ACE_OS::inet_addr - (ACE_TEXT_ALWAYS_CHAR(argv[getopt.opt_ind ()]))) == -1) + (ACE_TEXT_TO_CHAR_IN(argv[getopt.opt_ind ()]))) == -1) ACE_ERROR_RETURN ((LM_ERROR, "invalid IP address: %s\n", argv[getopt.opt_ind ()]), diff --git a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp index 975048a4a7e..27d66a906b6 100644 --- a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp +++ b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp @@ -216,7 +216,7 @@ char *title = 0; int new_line = 0; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_SOCK_Stream connection_stream; int c; diff --git a/performance-tests/TTCP/C/new-ttcp.cpp b/performance-tests/TTCP/C/new-ttcp.cpp index a897f5b39a3..997d44063fa 100644 --- a/performance-tests/TTCP/C/new-ttcp.cpp +++ b/performance-tests/TTCP/C/new-ttcp.cpp @@ -215,7 +215,7 @@ char *title = 0; int new_line = 0; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_SOCK_Stream connection_stream; unsigned long addr_tmp; diff --git a/performance-tests/UDP/udp_test.cpp b/performance-tests/UDP/udp_test.cpp index 449c998f3ae..1d3b773061a 100644 --- a/performance-tests/UDP/udp_test.cpp +++ b/performance-tests/UDP/udp_test.cpp @@ -609,7 +609,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) cmd = argv; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("x:w:f:vs:I:p:rtn:b:a")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("x:w:f:vs:I:p:rtn:b:a")); while ((c = getopt ()) != -1) { @@ -725,7 +725,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (remote_addr.set (dstport, (ACE_UINT32) ACE_OS::inet_addr - (ACE_TEXT_ALWAYS_CHAR(argv[getopt.opt_ind ()]))) == -1) + (ACE_TEXT_TO_CHAR_IN(argv[getopt.opt_ind ()]))) == -1) ACE_ERROR_RETURN ((LM_ERROR, "invalid IP address: %s\n", argv[getopt.opt_ind ()]), diff --git a/protocols/ace/HTBP/HTBP_Addr.cpp b/protocols/ace/HTBP/HTBP_Addr.cpp index aff894e80dc..1ee03ce991d 100644 --- a/protocols/ace/HTBP/HTBP_Addr.cpp +++ b/protocols/ace/HTBP/HTBP_Addr.cpp @@ -76,7 +76,7 @@ ACE::HTBP::Addr::addr_to_string (ACE_TCHAR buffer[], if (size < htid_.length()) return -1; ACE_OS::strncpy (buffer, - ACE_TEXT_CHAR_TO_TCHAR(htid_.c_str()), + ACE_TEXT_TO_TCHAR_IN(htid_.c_str()), size); return 0; } diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp index d46b16d0e3b..85e2931c0ec 100644 --- a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp +++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp @@ -83,7 +83,7 @@ ACE::HTBP::ID_Requestor::send_request (ACE_SOCK_Stream *cli_stream) char *buffer; ACE_NEW_RETURN (buffer, char[this->url_.length()+16],-1); ACE_OS::sprintf (buffer,"GET %s HTTP/1.0\n\n", - ACE_TEXT_ALWAYS_CHAR(url_.c_str())); + ACE_TEXT_TO_CHAR_IN(url_.c_str())); int result = cli_stream->send_n (buffer,ACE_OS::strlen(buffer)); delete [] buffer; if (result == -1) @@ -114,7 +114,7 @@ ACE::HTBP::ID_Requestor::get_HTID () ACE_Utils::UUID_Generator gen; ACE_Utils::UUID *uuid = gen.generateUUID (); const ACE_CString *uuidstr = uuid->to_string(); - ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_CHAR_TO_TCHAR (uuidstr->c_str()); + ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_TO_TCHAR_IN (uuidstr->c_str()); delete uuid; return ACE::HTBP::ID_Requestor::htid_.rep(); } @@ -130,7 +130,7 @@ ACE::HTBP::ID_Requestor::get_HTID () start = 0; else start++; - ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_CHAR_TO_TCHAR(answer.substr (start).c_str()); + ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_TO_TCHAR_IN(answer.substr (start).c_str()); htid = ACE::HTBP::ID_Requestor::htid_.rep(); } return htid; diff --git a/protocols/ace/HTBP/HTBP_Session.cpp b/protocols/ace/HTBP/HTBP_Session.cpp index f2bae3fde73..37e7258f3b7 100644 --- a/protocols/ace/HTBP/HTBP_Session.cpp +++ b/protocols/ace/HTBP/HTBP_Session.cpp @@ -70,7 +70,7 @@ ACE::HTBP::Session::Session (void) { ACE::HTBP::ID_Requestor req; ACE_TCHAR * htid = req.get_HTID(); - session_id_.local_ = ACE_TEXT_ALWAYS_CHAR(htid); + session_id_.local_ = ACE_TEXT_TO_CHAR_IN(htid); delete[] htid; session_id_.id_ = ACE::HTBP::Session::next_session_id(); ACE_NEW (inbound_, ACE::HTBP::Channel (this)); diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp index 64d77320e07..ee783ca7704 100644 --- a/tests/ACE_Init_Test.cpp +++ b/tests/ACE_Init_Test.cpp @@ -79,7 +79,7 @@ CACE_Init_TestApp theApp; BOOL CACE_Init_TestApp::InitInstance() { - // This is needed because there's no overridden main(int, char *[]) + // This is needed because there's no overridden ACE_TMAIN(int, ACE_TCHAR *[]) // which would normally handle the initialization. Also see the // corresponding ACE::fini, below. ACE::init(); diff --git a/tests/ARGV_Test.cpp b/tests/ARGV_Test.cpp index bb06c6b8d31..a2eb057d5d4 100644 --- a/tests/ARGV_Test.cpp +++ b/tests/ARGV_Test.cpp @@ -70,7 +70,7 @@ test_argv_type_converter (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%d) %s\n"), i, - ACE_TEXT_CHAR_TO_TCHAR (argv[i]))); + ACE_TEXT_TO_TCHAR_IN (argv[i]))); } for (size_t i = 0; save_argv[i]; ++i) diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp index 22c13223e06..2c75f7d6022 100644 --- a/tests/Aio_Platform_Test.cpp +++ b/tests/Aio_Platform_Test.cpp @@ -189,8 +189,9 @@ run_main (int, ACE_TCHAR *[]) "ACE_HAS_AIO_CALLS can be defined for this platform\n" "Further tests at $ACE_ROOT/examples/Reactor/Proactor\n")); else - ACE_ERROR ((LM_INFO, - "AIO not supported on this platform\n")); + ACE_ERROR_RETURN ((LM_ERROR, + "AIO not found.Test failed\n"), + -1); ACE_END_TEST; diff --git a/tests/Auto_Event_Test.cpp b/tests/Auto_Event_Test.cpp index a31b8a9f6a1..b507e70f259 100644 --- a/tests/Auto_Event_Test.cpp +++ b/tests/Auto_Event_Test.cpp @@ -114,7 +114,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("w:n:")); int c; diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp index 90fbf04a991..7602eb1a8c9 100644 --- a/tests/Basic_Types_Test.cpp +++ b/tests/Basic_Types_Test.cpp @@ -74,10 +74,8 @@ run_main (int, ACE_TCHAR *[]) errors += check (ACE_TEXT ("ACE_SIZEOF_CHAR: %u%s"), sizeof (char), ACE_SIZEOF_CHAR); -#if defined (ACE_HAS_WCHAR) errors += check (ACE_TEXT ("ACE_SIZEOF_WCHAR: %u%s"), sizeof (wchar_t), ACE_SIZEOF_WCHAR); -#endif /* ACE_HAS_WCHAR */ errors += check (ACE_TEXT ("ACE_SIZEOF_SHORT: %u%s"), sizeof (short), ACE_SIZEOF_SHORT); errors += check (ACE_TEXT ("ACE_SIZEOF_INT: %u%s"), diff --git a/tests/Bound_Ptr_Test.cpp b/tests/Bound_Ptr_Test.cpp index e2d85c27d31..03bc61a79e1 100644 --- a/tests/Bound_Ptr_Test.cpp +++ b/tests/Bound_Ptr_Test.cpp @@ -167,7 +167,7 @@ Printer::print (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->message_))); + ACE_TEXT_TO_TCHAR_IN(this->message_))); } #if defined (ACE_HAS_THREADS) diff --git a/tests/CDR_Array_Test.cpp b/tests/CDR_Array_Test.cpp index 5bb5a01c3eb..006fb038e0a 100644 --- a/tests/CDR_Array_Test.cpp +++ b/tests/CDR_Array_Test.cpp @@ -897,7 +897,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE::minor_version(), ACE::beta_version())); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:")); int dtotal = 0; int ftotal = 0; int qtotal = 0; @@ -1001,4 +1001,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index 9397574eabd..3f55e1bdc34 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -330,7 +330,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE::minor_version (), ACE::beta_version ())); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:rw")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:rw")); int opt; int reading = 1; int writing = 1; diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index ca61076c4ed..d99dea44bf4 100644 --- a/tests/CDR_Test.cpp +++ b/tests/CDR_Test.cpp @@ -228,7 +228,7 @@ short_stream (void) ACE_TEXT ("string transfer error")), 1); - if (ACE_OS::wscmp (wstr1, wstr)) + if (ACE_OS::strcmp (wstr1, wstr)) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("wide string transfer error")), @@ -430,7 +430,7 @@ CDR_Test_Types::test_get (ACE_InputCDR &cdr) const 1); // zero length ACE_Auto_Basic_Array_Ptr<ACE_CDR::WChar> auto_xwstr (wstr1); - if (ACE_OS::wslen(auto_xwstr.get () )) + if (ACE_OS::strlen(auto_xwstr.get () )) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("wstring[%d] differs\n"), i), @@ -450,7 +450,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE::minor_version(), ACE::beta_version())); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dn:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dn:l:")); int opt; int debug = 0; @@ -481,7 +481,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } // Sanity checks. - ACE_ASSERT (sizeof (ACE_CDR::Boolean) >= 1); + ACE_ASSERT (sizeof (ACE_CDR::Boolean) == 1); ACE_ASSERT (sizeof (ACE_CDR::Octet) == 1); ACE_ASSERT (sizeof (ACE_CDR::WChar) >= 2); ACE_ASSERT (sizeof (ACE_CDR::Short) == 2); @@ -565,4 +565,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp index 400235216e0..bf470ce3bd4 100644 --- a/tests/Cache_Map_Manager_Test.cpp +++ b/tests/Cache_Map_Manager_Test.cpp @@ -475,7 +475,7 @@ test_caching_strategy_type (void) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:i:r:f:p:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:i:r:f:p:d")); int cc; while ((cc = get_opt ()) != -1) @@ -595,4 +595,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp index 64717629458..0b99b19f30d 100644 --- a/tests/Cached_Accept_Conn_Test.cpp +++ b/tests/Cached_Accept_Conn_Test.cpp @@ -381,7 +381,7 @@ test_caching_strategy_type (void) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); int cc; diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp index d67d84a5988..c5149f84701 100644 --- a/tests/Cached_Conn_Test.cpp +++ b/tests/Cached_Conn_Test.cpp @@ -358,7 +358,7 @@ test_caching_strategy_type (void) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); int cc; diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 4cf08965fcb..110091b67af 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -979,7 +979,7 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) // we're not equal if we cannot get rhs int rc = false; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), intValue); + ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), intValue); originalString = int_value; } else if (originalType == ACE_Configuration::BINARY) @@ -1001,10 +1001,10 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) while (binary_length) { if (ptr != binary_data) - originalString += ACE_LIB_TEXT (","); + originalString += ACE_TEXT (","); ACE_OS::sprintf (bin_value, - ACE_LIB_TEXT ("%02x"), + ACE_TEXT ("%02x"), *ptr); originalString += bin_value; --binary_length; diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 2e808d4497b..a9bc906fb18 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -726,7 +726,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_START_TEST (ACE_TEXT ("Conn_Test")); int status = 0; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("c:i:s:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("c:i:s:")); for (int c; (c = getopt ()) != -1; ) switch (c) { diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp index 19c6e554b41..d8353bc3bae 100644 --- a/tests/Dirent_Test.cpp +++ b/tests/Dirent_Test.cpp @@ -202,7 +202,7 @@ dirent_count (const ACE_TCHAR *dir_path, #if !defined (ACE_LACKS_STRUCT_DIR) && !defined (__BORLANDC__) ACE_OS::strncpy (tname, - ACE_TEXT_CHAR_TO_TCHAR (directory->d_name), + ACE_TEXT_TO_TCHAR_IN (directory->d_name), maxnamlen); #else ACE_OS::strncpy (tname, directory->d_name, maxnamlen); diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp index b9bd438c6c0..0ef53a9942c 100644 --- a/tests/Enum_Interfaces_Test.cpp +++ b/tests/Enum_Interfaces_Test.cpp @@ -63,7 +63,7 @@ run_main (int, ACE_TCHAR *[]) for (size_t i = 0; i < how_many; i++) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t%s\n"), - ACE_TEXT_CHAR_TO_TCHAR (the_addr_array[i].get_host_addr ()))); + ACE_TEXT_TO_TCHAR_IN (the_addr_array[i].get_host_addr ()))); delete [] the_addr_array; } diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index c7a81909aa9..63d6063957d 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -110,9 +110,8 @@ run_main (int argc, ACE_TCHAR * [], ACE_TCHAR *envp[]) const ACE_TCHAR *defstr = ACE_TEXT ("Sarah Cleeland is Two!"); ACE_Env_Value<const ACE_TCHAR *> sval (ACE_TEXT ("This_Shouldnt_Be_Set_Hopefully"), defstr); - ACE_ASSERT (ACE_OS::strcmp (sval, defstr) == 0); + ACE_ASSERT (ACE_OS::strcmp (static_cast<const ACE_TCHAR *>(sval), defstr) == 0); ACE_END_TEST; } return 0; } - diff --git a/tests/Get_Opt_Test.cpp b/tests/Get_Opt_Test.cpp index b34c9e64f2f..cba53d53e40 100644 --- a/tests/Get_Opt_Test.cpp +++ b/tests/Get_Opt_Test.cpp @@ -7,7 +7,7 @@ // // = DESCRIPTION // This program tests both the short and long option support in -// <ACE_Get_Opt>, and demonstrates how to use it. +// <ACE_Get_Arg_Opt<ACE_TCHAR> >, and demonstrates how to use it. // // = AUTHOR // Don Hinton <dhinton@dresystems.com> @@ -25,7 +25,7 @@ ACE_RCSID(tests, Get_Opt_Test, "$Id$") /* * This is the heart of the test. It sets up the optstring, instantiates - * ACE_Get_Opt, add long options, processes them in a loop, and prints out + * ACE_Get_Arg_Opt<ACE_TCHAR> , add long options, processes them in a loop, and prints out * the results to the log. * * It returns 0 for success and 1 for error so we can keep track of the @@ -65,7 +65,7 @@ parse_args (int test_number, ACE_ARGV args (test.c_str ()); - ACE_Get_Opt get_opt (args.argc (), + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (args.argc (), args.argv (), optstring.c_str (), skip_argv, @@ -75,31 +75,31 @@ parse_args (int test_number, // Now add the default long args. if (get_opt.long_option (ACE_TEXT ("flag"), 'f', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'f' \n")), 1); if (get_opt.long_option (ACE_TEXT ("requires_arg"), 'r', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'r' \n")), 1); if (get_opt.long_option (ACE_TEXT ("optional_arg"), 'o', - ACE_Get_Opt::ARG_OPTIONAL) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'o' \n")), 1); if (get_opt.long_option (ACE_TEXT ("long_option"), 'l', - ACE_Get_Opt::ARG_OPTIONAL) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'l' \n")), 1); if (get_opt.long_option (ACE_TEXT ("long_only"), -11, - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option ") ACE_TEXT ("\"long_only\" \n")), 1); @@ -115,7 +115,7 @@ parse_args (int test_number, // (afterall, there are only so many alpha numeric characters available). if (get_opt.long_option (ACE_TEXT ("non_alpha-num_short"), -10, - ACE_Get_Opt::ARG_OPTIONAL) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option ") ACE_TEXT ("\"non_alpha_short\" \n")), 1); @@ -337,9 +337,9 @@ run_main (int, ACE_TCHAR *argv[]) int test_number = 0; // Run the tests for each type of ordering. - retval = run_test (test_number, ACE_Get_Opt::PERMUTE_ARGS); - retval += run_test (test_number, ACE_Get_Opt::REQUIRE_ORDER); - retval += run_test (test_number, ACE_Get_Opt::RETURN_IN_ORDER); + retval = run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::PERMUTE_ARGS); + retval += run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::REQUIRE_ORDER); + retval += run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::RETURN_IN_ORDER); ACE_END_TEST; return retval; diff --git a/tests/HTBP/Reactor_Tests/client.cpp b/tests/HTBP/Reactor_Tests/client.cpp index 2813d9116f3..a3cafc76e49 100644 --- a/tests/HTBP/Reactor_Tests/client.cpp +++ b/tests/HTBP/Reactor_Tests/client.cpp @@ -29,7 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) #endif /* 0 */ ACE::HTBP::ID_Requestor req (&env); - ACE::HTBP::Addr local = ACE_TEXT_ALWAYS_CHAR(req.get_HTID()); + ACE::HTBP::Addr local = ACE_TEXT_TO_CHAR_IN(req.get_HTID()); unsigned remote_port = 8088; const ACE_TCHAR * remote_host = argv[1]; @@ -48,7 +48,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_INET_Addr proxy(proxy_port,proxy_host.c_str()); - ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host)); + ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host)); ACE::HTBP::Session session(remote,local,ACE::HTBP::Session::next_session_id(),&proxy); ACE::HTBP::Stream stream (&session); diff --git a/tests/HTBP/Reactor_Tests/test_config.h b/tests/HTBP/Reactor_Tests/test_config.h index efd4eb7bcc6..218399854f3 100644 --- a/tests/HTBP/Reactor_Tests/test_config.h +++ b/tests/HTBP/Reactor_Tests/test_config.h @@ -43,7 +43,7 @@ #undef ACE_NDEBUG #undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT +#define ACE_TEXT ACE_TEXT #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. @@ -251,7 +251,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/tests/HTBP/Send_Large_Msg/client.cpp b/tests/HTBP/Send_Large_Msg/client.cpp index 62cd9140da8..4f1fafd8618 100644 --- a/tests/HTBP/Send_Large_Msg/client.cpp +++ b/tests/HTBP/Send_Large_Msg/client.cpp @@ -32,7 +32,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE::HTBP::ID_Requestor req (&env); - ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID())); + ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); unsigned remote_port = 8088; const ACE_TCHAR * remote_host = argv[1]; @@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_INET_Addr proxy(proxy_port,proxy_host.c_str()); - ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host)); + ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host)); ACE::HTBP::Session session(remote, local, diff --git a/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp b/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp index d462a11c3d3..d670dfab39e 100644 --- a/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp +++ b/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp @@ -69,7 +69,7 @@ client (void *arg) #endif /* 0 */ ACE::HTBP::ID_Requestor req (&ht_env); - ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID())); + ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); char hostname [128]; @@ -94,7 +94,7 @@ client (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(remote.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(remote.get_host_name ()))); //******************* TEST 1 ****************************** // @@ -230,7 +230,7 @@ server (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); //******************* TEST 1 ****************************** diff --git a/tests/HTBP/ping/client.cpp b/tests/HTBP/ping/client.cpp index e7753faab6d..e50fbd9a207 100644 --- a/tests/HTBP/ping/client.cpp +++ b/tests/HTBP/ping/client.cpp @@ -30,7 +30,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE::HTBP::ID_Requestor req (&env); - ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID())); + ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); unsigned remote_port = 8088; const ACE_TCHAR * remote_host = argv[1]; @@ -49,7 +49,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } ACE_INET_Addr proxy(proxy_port,proxy_host.c_str()); - ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host)); + ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host)); ACE::HTBP::Session session(remote, local, diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp index ab1cae561df..caf7d0c4acb 100644 --- a/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -32,7 +32,7 @@ static ACE_UINT32 table_size = ACE_MAX_ITERATIONS; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("t:i:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("t:i:")); int cc; @@ -119,4 +119,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index 5398157d8d3..c0ab6b4352e 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -114,7 +114,7 @@ run_main (int argc, ACE_TCHAR *argv[]) u_int iterations = 1; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("i:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("i:")); for (int c; (c = getopt ()) != -1; ) switch (c) { diff --git a/tests/INET_Addr_Test_IPV6.cpp b/tests/INET_Addr_Test_IPV6.cpp index 134119ae7b9..b8694c208b8 100644 --- a/tests/INET_Addr_Test_IPV6.cpp +++ b/tests/INET_Addr_Test_IPV6.cpp @@ -139,7 +139,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) #if defined (__linux__) // test a link local address to make sure the set_interface method works ACE_INET_Addr link_local_addr (80, LINK_LOCAL_ADDR); - if (0 != ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(link_local_addr.get_host_addr ()), + if (0 != ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(link_local_addr.get_host_addr ()), LINK_LOCAL_ADDR)) { ACE_ERROR ((LM_ERROR, diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index cd3c42a46a0..7966f9e4082 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -189,7 +189,7 @@ client (void *arg = 0) // Send a string to the server which it can interpret as a qchar[] const char *str = "\"This is a test string.\""; ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) Client Sending: (%s)\n"), - ACE_TEXT_CHAR_TO_TCHAR (str))); + ACE_TEXT_TO_TCHAR_IN (str))); server << str << endl; // Allow the server to get the string and echo it to the user. (The @@ -324,7 +324,7 @@ server (void *arg = 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) Server Received: (\"%s\")\n"), - ACE_TEXT_CHAR_TO_TCHAR ((char *) qbuf))); + ACE_TEXT_TO_TCHAR_IN ((char *) qbuf))); // Give the client time to announce the next test to the user. ACE_OS::sleep (2); @@ -365,7 +365,7 @@ server (void *arg = 0) break; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s "), - ACE_TEXT_CHAR_TO_TCHAR (buf))); + ACE_TEXT_TO_TCHAR_IN (buf))); } ACE_DEBUG ((LM_DEBUG, @@ -499,4 +499,3 @@ run_main (int, ACE_TCHAR *[]) ACE_END_TEST; return 0; } - diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp index 3dac88cf9f0..75545831db8 100644 --- a/tests/Log_Msg_Test.cpp +++ b/tests/Log_Msg_Test.cpp @@ -373,7 +373,7 @@ test_ostream (void) #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) // Create a persistent store. const ACE_TCHAR *filename = ACE_TEXT ("output"); - ofstream myostream (ACE_TEXT_ALWAYS_CHAR (filename), ios::out | ios::trunc); + ofstream myostream (ACE_TEXT_TO_CHAR_IN (filename), ios::out | ios::trunc); // Check for errors. if (myostream.bad ()) @@ -604,4 +604,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return status; } - diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp index 2a53c83606f..132c335e826 100644 --- a/tests/Logging_Strategy_Test.cpp +++ b/tests/Logging_Strategy_Test.cpp @@ -338,7 +338,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Specifications:\n"))); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("s:i:m:f:N:ow")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("s:i:m:f:N:ow")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index d581fd46180..34a853b61a0 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -469,7 +469,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_OS::sprintf(lognm, ACE_TEXT ("MEM_Stream_Test-%d"), mypid); ACE_START_TEST (lognm); - ACE_Get_Opt opts (argc, argv, ACE_TEXT ("p:rm")); + ACE_Get_Arg_Opt<ACE_TCHAR> opts (argc, argv, ACE_TEXT ("p:rm")); int opt, iport, status; ACE_MEM_IO::Signal_Strategy model = ACE_MEM_IO::Reactive; diff --git a/tests/MT_Reactor_Upcall_Test.cpp b/tests/MT_Reactor_Upcall_Test.cpp index 49c203b5f2c..532fe5de17e 100644 --- a/tests/MT_Reactor_Upcall_Test.cpp +++ b/tests/MT_Reactor_Upcall_Test.cpp @@ -266,7 +266,7 @@ test_reactor_upcall (ACE_Reactor &reactor) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("t:m:s:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("t:m:s:l:")); int c; diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp index f2e52a5c24f..3254114ce9e 100644 --- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -1240,7 +1240,7 @@ test<REACTOR_IMPL>::test (int ignore_nested_upcalls, static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:f:g:k:l:m:n:o:uz:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:d:f:g:k:l:m:n:o:uz:")); int cc; while ((cc = get_opt ()) != -1) diff --git a/tests/MT_Reference_Counted_Notify_Test.cpp b/tests/MT_Reference_Counted_Notify_Test.cpp index 713e81d6a5e..e9c60d8f750 100644 --- a/tests/MT_Reference_Counted_Notify_Test.cpp +++ b/tests/MT_Reference_Counted_Notify_Test.cpp @@ -319,7 +319,7 @@ test<REACTOR_IMPLEMENTATION>::test (int extra_iterations_needed) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:e:f:g:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:d:e:f:g:z:")); int cc; while ((cc = get_opt ()) != -1) diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index eb407f5f596..dd44f380df0 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -236,8 +236,9 @@ server (void *arg) ++num_clients_connected; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: Client %C connected from %d\n"), - cli_addr.get_host_name (), + + ACE_TEXT ("(%P|%t) server: Client %s connected from %d\n"), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); // Enable non-blocking I/O. diff --git a/tests/Manual_Event_Test.cpp b/tests/Manual_Event_Test.cpp index 1b28d846a71..4b70d2ef44e 100644 --- a/tests/Manual_Event_Test.cpp +++ b/tests/Manual_Event_Test.cpp @@ -74,7 +74,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("w:n:")); int c; diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp index 3757c3c9f2c..88bab4a2d00 100644 --- a/tests/Message_Block_Test.cpp +++ b/tests/Message_Block_Test.cpp @@ -124,7 +124,7 @@ Worker_Task::svc (void) // message here. else if (length > 0) { - int current_count = ACE_OS::atoi (ACE_TEXT_CHAR_TO_TCHAR (mb->rd_ptr ())); + int current_count = ACE_OS::atoi (ACE_TEXT_TO_TCHAR_IN (mb->rd_ptr ())); int i; ACE_ASSERT (count == current_count); @@ -166,7 +166,9 @@ Worker_Task::svc (void) { int deqresult = this->msg_queue ()->dequeue_head (dup); ACE_ASSERT (deqresult != -1); - ACE_ASSERT (count == ACE_OS::atoi (ACE_TEXT_CHAR_TO_TCHAR (dup->rd_ptr ()))); + //ACE_ASSERT (this->msg_queue ()->dequeue_head (dup) != -1); + ACE_ASSERT (count == ACE_OS::atoi (ACE_TEXT_TO_TCHAR_IN (dup->rd_ptr ()))); + ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), dup->rd_ptr ()) == 0); ACE_ASSERT (dup->msg_priority () == ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY + 1); dup->release (); diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp index 8613c1a498b..9a3b5e7e994 100644 --- a/tests/Multicast_Test.cpp +++ b/tests/Multicast_Test.cpp @@ -156,64 +156,64 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) int retval = 0; int help = 0; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT (":?"), 1, 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT (":?"), 1, 1); if (getopt.long_option (ACE_TEXT ("GroupStart"), 'g', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add GroupStart option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Groups"), 'n', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Groups option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Debug"), 'd', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Debug option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Role"), 'r', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Role option.\n")), 1); if (getopt.long_option (ACE_TEXT ("SDM_options"), 'm', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Multicast_Options option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Iterations"), 'i', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add iterations option.\n")), 1); if (getopt.long_option (ACE_TEXT ("TTL"), 't', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add TTL option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Wait"), 'w', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add wait option.\n")), 1); if (getopt.long_option (ACE_TEXT ("help"), 'h', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add help option.\n")), 1); diff --git a/tests/Multicast_Test_IPV6.cpp b/tests/Multicast_Test_IPV6.cpp index fd7d1705a92..397e7f5454d 100644 --- a/tests/Multicast_Test_IPV6.cpp +++ b/tests/Multicast_Test_IPV6.cpp @@ -160,64 +160,64 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) int retval = 0; int help = 0; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT (":?"), 1, 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT (":?"), 1, 1); if (getopt.long_option (ACE_TEXT ("GroupStart"), 'g', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add GroupStart option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Groups"), 'n', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Groups option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Debug"), 'd', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Debug option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Role"), 'r', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Role option.\n")), 1); if (getopt.long_option (ACE_TEXT ("SDM_options"), 'm', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Multicast_Options option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Iterations"), 'i', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add iterations option.\n")), 1); if (getopt.long_option (ACE_TEXT ("TTL"), 't', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add TTL option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Wait"), 'w', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add wait option.\n")), 1); if (getopt.long_option (ACE_TEXT ("help"), 'h', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add help option.\n")), 1); diff --git a/tests/Multihomed_INET_Addr_Test_IPV6.cpp b/tests/Multihomed_INET_Addr_Test_IPV6.cpp index 1607dd81fb2..7427a757e0d 100644 --- a/tests/Multihomed_INET_Addr_Test_IPV6.cpp +++ b/tests/Multihomed_INET_Addr_Test_IPV6.cpp @@ -96,7 +96,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) } // Check the primary address - if (0 != ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(addr.get_host_addr()), primary_ipv6)) + if (0 != ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(addr.get_host_addr()), primary_ipv6)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%s failed get_host_addr() check\n") diff --git a/tests/Network_Adapters_Test.cpp b/tests/Network_Adapters_Test.cpp index 882ac59118c..c8714a13b3e 100644 --- a/tests/Network_Adapters_Test.cpp +++ b/tests/Network_Adapters_Test.cpp @@ -939,7 +939,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("b:p:t:w:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("b:p:t:w:")); int c, counter = 0; ACE_INET_Addr b_temp_addr; ACE_TCHAR *token = 0; diff --git a/tests/NonBlocking_Conn_Test.cpp b/tests/NonBlocking_Conn_Test.cpp index 1b4dfa8a884..6512190cd31 100644 --- a/tests/NonBlocking_Conn_Test.cpp +++ b/tests/NonBlocking_Conn_Test.cpp @@ -168,7 +168,7 @@ test (ACE_Reactor_Impl *impl) else ACE_DEBUG ((LM_INFO, ACE_TEXT ("%p\n"), - ACE_TEXT_CHAR_TO_TCHAR (hosts[i]))); + ACE_TEXT_TO_TCHAR_IN (hosts[i]))); } ACE_Reactor reactor (impl, @@ -237,7 +237,7 @@ test (ACE_Reactor_Impl *impl) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:")); int cc; while ((cc = get_opt ()) != -1) @@ -316,4 +316,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp index b812630a065..0c88866e808 100644 --- a/tests/Notify_Performance_Test.cpp +++ b/tests/Notify_Performance_Test.cpp @@ -166,7 +166,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Notify_Performance_Test")); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("pswdc:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("pswdc:l:")); for (int c; (c = getopt ()) != -1; ) switch (c) diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp index fa7b058e4e4..866ce0cd03d 100644 --- a/tests/OS_Test.cpp +++ b/tests/OS_Test.cpp @@ -284,7 +284,6 @@ string_emulation_test (void) "-4566733") == 0); } -#if defined (ACE_HAS_WCHAR) { // ======================================================================== // Test itoa (wchar_t version) @@ -519,7 +518,6 @@ string_emulation_test (void) } -#endif /* ACE_HAS_WCHAR */ return 0; } @@ -661,7 +659,6 @@ string_strsncpy_test (void) } -#if defined (ACE_HAS_WCHAR) { // Test strsncpy (wchar_t version) ACE_DEBUG ((LM_DEBUG, @@ -728,7 +725,6 @@ string_strsncpy_test (void) // size should be 9 (+ '\0' char) ACE_ASSERT(ACE_OS::strlen(strsncpy2) == 9); } -#endif /* ACE_HAS_WCHAR */ return 0; } @@ -738,7 +734,6 @@ string_strsncpy_test (void) int string_convert_test (void) { -#if defined (ACE_HAS_WCHAR) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing narrow/wide string conversion\n"))); @@ -749,28 +744,28 @@ string_convert_test (void) const wchar_t *test2_w = ACE_TEXT_WIDE ("\xe9\xe8\xe0\xf9\xea"); wchar_t str_w[10]; char str_n[10]; - ACE_OS::strcpy (str_w, ACE_Ascii_To_Wide (test1_n).wchar_rep ()); + ACE_OS::strcpy (str_w, ACE_TEXT_TO_WCHAR_IN (test1_n)); if (0 != ACE_OS::strcmp (test1_w, str_w)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Simple narrow->wide failed: ") ACE_TEXT ("Expected \"%W\"; Got \"%W\"\n"), test1_w, str_w)); result = 1; } - ACE_OS::strcpy (str_n, ACE_Wide_To_Ascii (test1_w).char_rep ()); + ACE_OS::strcpy (str_n, ACE_TEXT_TO_CHAR_IN (test1_w)); if (0 != ACE_OS::strcmp (test1_n, str_n)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Simple wide->narrow failed: ") ACE_TEXT ("Expected \"%C\"; Got \"%C\"\n"), test1_n, str_n)); result = 1; } - ACE_OS::strcpy (str_w, ACE_Ascii_To_Wide (test2_n).wchar_rep ()); + ACE_OS::strcpy (str_w, ACE_TEXT_TO_WCHAR_IN (test2_n)); if (0 != ACE_OS::strcmp (test2_w, str_w)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Complex narrow->wide failed: ") ACE_TEXT ("Expected \"%W\"; Got \"%W\"\n"), test2_w, str_w)); result = 1; } - ACE_OS::strcpy (str_n, ACE_Wide_To_Ascii (test2_w).char_rep ()); + ACE_OS::strcpy (str_n, ACE_TEXT_TO_CHAR_IN (test2_w)); if (0 != ACE_OS::strcmp (test2_n, str_n)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Complex wide->narrow failed: ") @@ -778,9 +773,6 @@ string_convert_test (void) result = 1; } return result; -#else - return 0; -#endif /* ACE_HAS_WCHAR */ } // Test the methods for getting cpu info diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index bf722c921b9..adef9bc3af5 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -51,7 +51,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dci:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("dci:")); int c; diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp index b790b78b21c..e3be61e1c80 100644 --- a/tests/Priority_Reactor_Test.cpp +++ b/tests/Priority_Reactor_Test.cpp @@ -238,7 +238,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Priority_Reactor_Test")); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dc:l:m:t:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("dc:l:m:t:")); for (int c; (c = getopt ()) != -1; ) switch (c) @@ -394,4 +394,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/Proactor_Scatter_Gather_Test.cpp b/tests/Proactor_Scatter_Gather_Test.cpp index a3cbb335a34..830d405f6e3 100644 --- a/tests/Proactor_Scatter_Gather_Test.cpp +++ b/tests/Proactor_Scatter_Gather_Test.cpp @@ -1323,7 +1323,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if (argc == 1) // no arguments , so one button test return 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:csh:p:u")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:csh:p:u")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index 9d739b2d5e3..cf7d81d314d 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->open (1, 0, 1) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p\n"), - ACE_LIB_TEXT ("Connector::open failed"))); + ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("Connector::open failed"))); return rc; } @@ -1799,7 +1799,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if (argc == 1) // no arguments , so one button test return 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp index 7ac9443d0ae..d82a63374b6 100644 --- a/tests/Proactor_Test_IPV6.cpp +++ b/tests/Proactor_Test_IPV6.cpp @@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->open (1, 0, 1) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p\n"), - ACE_LIB_TEXT ("Connector::open failed"))); + ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("Connector::open failed"))); return rc; } @@ -1843,7 +1843,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if (argc == 1) // no arguments , so one button test return 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Proactor_Timer_Test.cpp b/tests/Proactor_Timer_Test.cpp index da61f142143..9b2e282fcab 100644 --- a/tests/Proactor_Timer_Test.cpp +++ b/tests/Proactor_Timer_Test.cpp @@ -112,7 +112,7 @@ test_registering_all_handlers (void) { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; size_t which[ACE_MAX_TIMERS]; @@ -138,7 +138,7 @@ test_registering_one_handler (void) { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; size_t which[ACE_MAX_TIMERS]; @@ -166,7 +166,7 @@ test_canceling_odd_timers (void) { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; size_t which[ACE_MAX_TIMERS]; diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp index f9ce72afc5a..123018b9377 100644 --- a/tests/Process_Manager_Test.cpp +++ b/tests/Process_Manager_Test.cpp @@ -105,7 +105,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE int run_main (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt args (argc, argv, ACE_TEXT ("d")); + ACE_Get_Arg_Opt<ACE_TCHAR> args (argc, argv, ACE_TEXT ("d")); for (int arg = args (); arg != EOF; arg = args ()) switch (arg) diff --git a/tests/Process_Manual_Event_Test.cpp b/tests/Process_Manual_Event_Test.cpp index b697743273b..bd7255912f2 100644 --- a/tests/Process_Manual_Event_Test.cpp +++ b/tests/Process_Manual_Event_Test.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 ("i:c")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:c")); int c; diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index e70cd8adede..9516868c194 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -51,7 +51,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dcn:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("dcn:")); int c; diff --git a/tests/Process_Semaphore_Test.cpp b/tests/Process_Semaphore_Test.cpp index af08108ad75..d1086485656 100644 --- a/tests/Process_Semaphore_Test.cpp +++ b/tests/Process_Semaphore_Test.cpp @@ -55,7 +55,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:c")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:c")); int c; @@ -80,11 +80,11 @@ acquire_release (void) #if defined (ACE_WIN32) || \ defined (ACE_USES_FIFO_SEM) || \ (defined (ACE_HAS_POSIX_SEM) && !defined (ACE_LACKS_NAMED_POSIX_SEM)) - ACE_Semaphore sema_ping (0, USYNC_PROCESS, ACE_TEXT_CHAR_TO_TCHAR (sema_ping_name)); - ACE_Semaphore sema_pong (0, USYNC_PROCESS, ACE_TEXT_CHAR_TO_TCHAR (sema_pong_name)); + ACE_Semaphore sema_ping (0, USYNC_PROCESS, ACE_TEXT_TO_TCHAR_IN (sema_ping_name)); + ACE_Semaphore sema_pong (0, USYNC_PROCESS, ACE_TEXT_TO_TCHAR_IN (sema_pong_name)); #else - ACE_Process_Semaphore sema_ping (0, ACE_TEXT_CHAR_TO_TCHAR (sema_ping_name)); - ACE_Process_Semaphore sema_pong (0, ACE_TEXT_CHAR_TO_TCHAR (sema_pong_name)); + ACE_Process_Semaphore sema_ping (0, ACE_TEXT_TO_TCHAR_IN (sema_ping_name)); + ACE_Process_Semaphore sema_pong (0, ACE_TEXT_TO_TCHAR_IN (sema_pong_name)); #endif // Make sure the constructor succeeded diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index aca7cc2e7de..aade8ee53ea 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -64,8 +64,8 @@ ACE_RCSID(tests, Process_Strategy_Test, "$Id$") #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<Options, ACE_Null_Mutex> * - ACE_Singleton<Options, ACE_Null_Mutex>::singleton_; + template ACE_Singleton<Options, ACE_Null_Mutex> * +ACE_Singleton<Options, ACE_Null_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ @@ -169,7 +169,7 @@ Options::~Options (void) int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:c:f:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:c:f:")); // - 26 is for the "process_strategy_test_temp" that is appended if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 26) == -1) @@ -416,7 +416,7 @@ Counting_Service::handle_input (ACE_HANDLE) bytes, this->peer ().get_handle (), bytes, - ACE_TEXT_CHAR_TO_TCHAR (buf))); + ACE_TEXT_TO_TCHAR_IN (buf))); // Read and return the current value in the file. if (ACE_OS::strncmp (buf, "read", @@ -581,7 +581,7 @@ client (void *arg) // the call to ACE_OS::strrchr (). buf [bytes_read] = '\0'; - size_t count = ACE_OS::atoi (ACE_OS::strrchr (ACE_TEXT_CHAR_TO_TCHAR (buf), + size_t count = ACE_OS::atoi (ACE_OS::strrchr (ACE_TEXT_TO_TCHAR_IN (buf), ACE_TEXT (' '))); ACE_DEBUG ((LM_DEBUG, diff --git a/tests/Reactor_Dispatch_Order_Test.cpp b/tests/Reactor_Dispatch_Order_Test.cpp index d6263f091d3..91dfd8ad060 100644 --- a/tests/Reactor_Dispatch_Order_Test.cpp +++ b/tests/Reactor_Dispatch_Order_Test.cpp @@ -143,7 +143,9 @@ Handler::handle_input (ACE_HANDLE fd) ACE_ASSERT (result == ssize_t (ACE_OS::strlen (message))); buffer[result] = '\0'; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Handler::handle_input: %C\n"), buffer)); + ACE_DEBUG ((LM_DEBUG, + "Handler::handle_input: %s\n", + ACE_TEXT_TO_TCHAR_IN (buffer))); ACE_ASSERT (ACE_OS::strcmp (buffer, message) == 0); diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp index 7d5aacc6456..e3850d433c6 100644 --- a/tests/Reactor_Performance_Test.cpp +++ b/tests/Reactor_Performance_Test.cpp @@ -315,7 +315,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Reactor_Performance_Test")); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dswc:l:"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("dswc:l:"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) { diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp index 2225fd2fd31..dac6cb25142 100644 --- a/tests/Reactor_Timer_Test.cpp +++ b/tests/Reactor_Timer_Test.cpp @@ -129,7 +129,7 @@ test_registering_all_handlers (void) { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; @@ -152,7 +152,7 @@ test_registering_one_handler (void) { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; @@ -177,7 +177,7 @@ test_canceling_odd_timers (void) { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; @@ -214,7 +214,7 @@ test_resetting_timer_intervals (void) { ACE_Trace t (ACE_TEXT ("test_resetting_timer_intervals"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt; long t_id; diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp index 4c18681d8f9..147bbb2f475 100644 --- a/tests/Reader_Writer_Test.cpp +++ b/tests/Reader_Writer_Test.cpp @@ -76,7 +76,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:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:w:n:")); int c; diff --git a/tests/Refcounted_Auto_Ptr_Test.cpp b/tests/Refcounted_Auto_Ptr_Test.cpp index e463afe276e..620a1577c42 100644 --- a/tests/Refcounted_Auto_Ptr_Test.cpp +++ b/tests/Refcounted_Auto_Ptr_Test.cpp @@ -37,7 +37,7 @@ Printer::Printer (const char *message) : message_ (message) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Creating Printer object\n"))); + ACE_TEXT ("(%t) Creating Printer object\n"))); ++Printer::instance_count_; } @@ -45,15 +45,15 @@ Printer::~Printer (void) { --Printer::instance_count_; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Deleting Printer object\n"))); + ACE_TEXT ("(%t) Deleting Printer object\n"))); } void Printer::print (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->message_))); + ACE_TEXT ("(%t) %s\n"), + ACE_TEXT_TO_TCHAR_IN(this->message_))); } #if defined (ACE_HAS_THREADS) @@ -129,18 +129,18 @@ Method_Request_print::Method_Request_print (Scheduler *new_scheduler, printer_ (printer) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Method_Request_print created\n"))); + ACE_TEXT ("(%t) Method_Request_print created\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"), + ACE_TEXT ("(%t) Printer reference count: %d\n"), printer_.count ())); } Method_Request_print::~Method_Request_print (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Method_Request_print will be deleted.\n"))); + ACE_TEXT ("(%t) Method_Request_print will be deleted.\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"), + ACE_TEXT ("(%t) Printer reference count: %d\n"), printer_.count ())); } @@ -199,7 +199,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler) : activation_queue_ (msg_queue ()), scheduler_ (new_scheduler) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler created\n"))); + ACE_TEXT ("(%t) Scheduler created\n"))); } // Destructor @@ -207,7 +207,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler) Scheduler::~Scheduler (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler will be destroyed\n"))); + ACE_TEXT ("(%t) Scheduler will be destroyed\n"))); } // open @@ -216,7 +216,7 @@ int Scheduler::open (void *) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler open\n"))); + ACE_TEXT ("(%t) Scheduler open\n"))); // Become an Active Object. int num_threads = 3; return this->activate (THR_BOUND | THR_JOINABLE, num_threads); @@ -227,7 +227,7 @@ Scheduler::open (void *) int Scheduler::close (u_long) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) rundown\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) rundown\n"))); return 0; } @@ -244,13 +244,13 @@ Scheduler::svc (void) if (0 == mo_p) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) activation queue shut down\n"))); + ACE_TEXT ("(%t) activation queue shut down\n"))); break; } auto_ptr<ACE_Method_Request> mo (mo_p); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) calling method request\n"))); + ACE_TEXT ("(%t) calling method request\n"))); // Call it. if(mo->call () == -1) break; @@ -285,7 +285,7 @@ static int n_loops = 10; int run_main (int, ACE_TCHAR *[]) { - ACE_START_TEST (ACE_LIB_TEXT ("Refcounted_Auto_Ptr_Test")); + ACE_START_TEST (ACE_TEXT ("Refcounted_Auto_Ptr_Test")); // ========================================================================= @@ -293,7 +293,7 @@ run_main (int, ACE_TCHAR *[]) // thread of control, hence we use the ACE_Null_Mutex ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) performing synchronous test...\n"))); + ACE_TEXT ("(%t) performing synchronous test...\n"))); Printer *printer1; ACE_NEW_RETURN (printer1, @@ -309,7 +309,7 @@ run_main (int, ACE_TCHAR *[]) ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex> r6 = r1; } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), + ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), Printer::instance_count_)); ACE_ASSERT (Printer::instance_count_ == 0); @@ -320,7 +320,7 @@ run_main (int, ACE_TCHAR *[]) // threads of control. ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) performing asynchronous test...\n"))); + ACE_TEXT ("(%t) performing asynchronous test...\n"))); Scheduler *scheduler_ptr; @@ -352,7 +352,7 @@ run_main (int, ACE_TCHAR *[]) scheduler->wait (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), + ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), Printer::instance_count_)); ACE_ASSERT (Printer::instance_count_ == 0); diff --git a/tests/Reference_Counted_Event_Handler_Test.cpp b/tests/Reference_Counted_Event_Handler_Test.cpp index 1e947135d6d..e8e45272f0d 100644 --- a/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/tests/Reference_Counted_Event_Handler_Test.cpp @@ -890,7 +890,7 @@ test<REACTOR_IMPLEMENTATION>::test (void) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:f:g:h:i:k:l:m:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:f:g:h:i:k:l:m:z:")); int cc; while ((cc = get_opt ()) != -1) @@ -1012,4 +1012,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 0eee2d171d3..229bac706fd 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -93,7 +93,7 @@ find_another_host (ACE_TCHAR other_host[]) ACE_OS::strcpy (other_host, ACE_LOCALHOST); else // Use me if can't find another - ACE_OS::strcpy (other_host, ACE_TEXT_CHAR_TO_TCHAR (h->h_name)); + ACE_OS::strcpy (other_host, ACE_TEXT_TO_TCHAR_IN (h->h_name)); // @@ We really need to add wrappers for these hostent methods. @@ -114,7 +114,7 @@ find_another_host (ACE_TCHAR other_host[]) while ((h = gethostent ()) != 0) { if (ACE_OS::strcmp (h->h_name, - ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) + ACE_TEXT_TO_CHAR_IN (ACE_DEFAULT_SERVER_HOST)) == 0) continue; // AIX just _has_ to be different if (ACE_OS::strcmp (h->h_name, "loopback") == 0) @@ -122,11 +122,11 @@ find_another_host (ACE_TCHAR other_host[]) // If not me. if (ACE_OS::strcmp - (h->h_name, ACE_TEXT_ALWAYS_CHAR (other_host)) != 0 + (h->h_name, ACE_TEXT_TO_CHAR_IN (other_host)) != 0 && ACE_OS::strcmp (h->h_name, un.nodename) != 0) { ACE_OS::strcpy (candidate[candidate_count].host_name, - ACE_TEXT_CHAR_TO_TCHAR (h->h_name)); + ACE_TEXT_TO_TCHAR_IN (h->h_name)); if (++candidate_count >= MAX_CANDIDATES) break; } diff --git a/tests/SOCK_Dgram_Bcast_Test.cpp b/tests/SOCK_Dgram_Bcast_Test.cpp index fc8149bce3c..7300801c6f2 100644 --- a/tests/SOCK_Dgram_Bcast_Test.cpp +++ b/tests/SOCK_Dgram_Bcast_Test.cpp @@ -216,7 +216,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) int opt = 0; int auto_test_recv = 0; int result = 0; - ACE_Get_Opt opts (argc, argv, ACE_TEXT ("p:t:n:sra")); + ACE_Get_Arg_Opt<ACE_TCHAR> opts (argc, argv, ACE_TEXT ("p:t:n:sra")); while ((opt = opts ()) != -1) switch (opt) { diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index f971c98e65b..3366be73b58 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -81,7 +81,7 @@ client (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); //******************* TEST 1 ****************************** // @@ -208,7 +208,7 @@ server (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); //******************* TEST 1 ****************************** diff --git a/tests/SOCK_Send_Recv_Test_IPV6.cpp b/tests/SOCK_Send_Recv_Test_IPV6.cpp index b630ffb00ec..5626671fb27 100644 --- a/tests/SOCK_Send_Recv_Test_IPV6.cpp +++ b/tests/SOCK_Send_Recv_Test_IPV6.cpp @@ -76,7 +76,7 @@ client (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); //******************* TEST 1 ****************************** // @@ -203,7 +203,7 @@ server (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); //******************* TEST 1 ****************************** diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index 6472711a857..2cd92351063 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -63,7 +63,7 @@ client (void *arg) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("connection failed")), 0); else ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); } if (cli_stream.disable (ACE_NONBLOCK) == -1) @@ -141,7 +141,7 @@ server (void *arg) while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), cli_addr.get_port_number ())); + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); // Enable non-blocking I/O. if (new_stream.enable (ACE_NONBLOCK) == -1) diff --git a/tests/SOCK_Test_IPv6.cpp b/tests/SOCK_Test_IPv6.cpp index 08950687fcf..31082bb9e97 100644 --- a/tests/SOCK_Test_IPv6.cpp +++ b/tests/SOCK_Test_IPv6.cpp @@ -64,7 +64,7 @@ client (void *arg) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("connection failed")), 0); else ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); } if (cli_stream.disable (ACE_NONBLOCK) == -1) @@ -142,7 +142,7 @@ server (void *arg) while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), cli_addr.get_port_number ())); + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); // Enable non-blocking I/O. if (new_stream.enable (ACE_NONBLOCK) == -1) diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp index 7486e2d2b5b..a6be520d300 100644 --- a/tests/SString_Test.cpp +++ b/tests/SString_Test.cpp @@ -26,7 +26,6 @@ ACE_RCSID(tests, SString_Test, "$Id$") static int testConcatenation() { -#ifdef ACE_HAS_WCHAR ACE_WString s1; s1 += L'H'; if (s1 != ACE_WString(L"H")) { @@ -62,7 +61,6 @@ static int testConcatenation() { ACE_ERROR((LM_ERROR, "Concat wchar_t 2\n")); return 1; } -#endif /* ACE_HAS_WCHAR */ return 0; } @@ -211,7 +209,7 @@ run_main (int, ACE_TCHAR *[]) ACE_NS_WString s5 = s1 + " " + s2; ACE_NS_WString s6 = ("hella"); // Same length as s1, off by one char. - ACE_WCHAR_T single_character = 'z'; + wchar_t single_character = 'z'; ACE_NS_WString single_character_string (single_character); ACE_NS_WString empty_string; diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp index e2b82042559..0f68bb0f2a4 100644 --- a/tests/Semaphore_Test.cpp +++ b/tests/Semaphore_Test.cpp @@ -119,7 +119,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("s:w:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("s:w:n:")); int c; diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp index 330ce322c37..aa09b53aaaf 100644 --- a/tests/Signal_Test.cpp +++ b/tests/Signal_Test.cpp @@ -374,7 +374,7 @@ run_test (ACE_THR_FUNC worker, static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:chp:t:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:chp:t:")); int c; diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp index c36d8483e08..9fa2bdd8011 100644 --- a/tests/Svc_Handler_Test.cpp +++ b/tests/Svc_Handler_Test.cpp @@ -40,23 +40,23 @@ run_test (SVC_HANDLER &svc_handler, { ACE_Message_Block *mb; ACE_NEW (mb, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("hello ")))); + ACE_Message_Block (sizeof (ACE_TEXT("hello ")))); ACE_Message_Block *cb1; ACE_NEW (cb1, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n")))); + ACE_Message_Block (sizeof (ACE_TEXT("there\n")))); ACE_Message_Block *cb2; ACE_NEW (cb2, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n")))); + ACE_Message_Block (sizeof (ACE_TEXT("there\n")))); mb->copy ("hello ", - ACE_OS::strlen (ACE_LIB_TEXT("hello "))); + ACE_OS::strlen (ACE_TEXT("hello "))); cb1->copy ("there ", - ACE_OS::strlen (ACE_LIB_TEXT("there "))); + ACE_OS::strlen (ACE_TEXT("there "))); mb->cont (cb1); cb2->copy ("doug\n", - ACE_OS::strlen (ACE_LIB_TEXT("doug\n"))); + ACE_OS::strlen (ACE_TEXT("doug\n"))); cb1->cont (cb2); // Note that this is a buffered call! @@ -132,15 +132,15 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_FILE_Info info; file_io.get_info (info); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("file size = %d\n"), info.size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("file size = %d\n"), info.size_)); for (ssize_t n_bytes; (n_bytes = file_io.recv (buf, ACE_MAXLOGMSGLEN)) > 0; ) { buf[n_bytes] = '\0'; - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s"), ACE_TEXT_CHAR_TO_TCHAR(buf))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%s"), ACE_TEXT_TO_TCHAR_IN(buf))); } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); file_io.close (); @@ -154,4 +154,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp index 91d2b43812f..5be774ae934 100644 --- a/tests/TP_Reactor_Test.cpp +++ b/tests/TP_Reactor_Test.cpp @@ -1072,7 +1072,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:n:p:d:h:s:v:ub")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:n:p:d:h:s:v:ub")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp index 3502fea9e3b..ee390f26a52 100644 --- a/tests/Test_Output.cpp +++ b/tests/Test_Output.cpp @@ -101,7 +101,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -145,7 +145,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; @@ -249,4 +249,3 @@ randomize (int array[], size_t size) array [size] = temp; } } - diff --git a/tests/Thread_Pool_Reactor_Resume_Test.cpp b/tests/Thread_Pool_Reactor_Resume_Test.cpp index 327ef0bc917..c860d90310c 100644 --- a/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -84,7 +84,7 @@ static int req_delay = 50; static void parse_arg (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); int c; diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp index ff0c3098e80..7d813e95b67 100644 --- a/tests/Thread_Pool_Reactor_Test.cpp +++ b/tests/Thread_Pool_Reactor_Test.cpp @@ -87,7 +87,7 @@ static int req_delay = 50; static void parse_arg (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); int c; diff --git a/tests/Timer_Queue_Reference_Counting_Test.cpp b/tests/Timer_Queue_Reference_Counting_Test.cpp index f21585938d0..30b2f29c3aa 100644 --- a/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -550,7 +550,7 @@ static int test_simple = 1; static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:l:m:n:o:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:d:l:m:n:o:z:")); int cc; while ((cc = get_opt ()) != -1) @@ -673,4 +673,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp index ca99f677496..ae76bccbcae 100644 --- a/tests/Upgradable_RW_Test.cpp +++ b/tests/Upgradable_RW_Test.cpp @@ -117,7 +117,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("e:fr:w:n:u")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("e:fr:w:n:u")); int c; @@ -488,4 +488,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return status; } - diff --git a/tests/tests.mpc b/tests/tests.mpc index 8903bca5f89..ca539304ead 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -1324,6 +1324,13 @@ project(Based Pointer Test) : acetest { } } +project(WChar_Conversion) : acetest { + exename = WChar_Conversion + Source_Files { + WChar_Conversion.cpp + } +} + project(Library Unload) { exename = UnloadLibACE staticflags += ACE_AS_STATIC_LIBS |