diff options
Diffstat (limited to 'apps')
30 files changed, 58 insertions, 48 deletions
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; |