From 00dd17df6807e223cd38ef90758173ec260a5a58 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Wed, 5 Jun 2013 20:14:04 +0000 Subject: Wed Jun 5 20:09:59 UTC 2013 Phil Mesnier * tests/FlReactor_Test.cpp: * tests/QtReactor_Test.cpp: Fixed wchar build compile errors --- ACE/ChangeLog | 7 +++++++ ACE/tests/FlReactor_Test.cpp | 12 +++++++++--- ACE/tests/QtReactor_Test.cpp | 5 ++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 40d94d1d2b2..208b7d42f12 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 5 20:09:59 UTC 2013 Phil Mesnier + + * tests/FlReactor_Test.cpp: + * tests/QtReactor_Test.cpp: + + Fixed wchar build compile errors + Fri May 31 14:02:11 UTC 2013 Johnny Willemsen * ace/ETCL/ETCL_Constraint.inl: diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp index 655a7af680d..f529c9ec6d1 100644 --- a/ACE/tests/FlReactor_Test.cpp +++ b/ACE/tests/FlReactor_Test.cpp @@ -27,6 +27,7 @@ #include "ace/FlReactor/FlReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" +#include "ace/Argv_Type_Converter.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/Service_Config.h" @@ -177,7 +178,8 @@ Connection_Handler::open (void*) from.addr_to_string (buf, bufsiz, 0); static char msg[256]; - ACE_OS::sprintf (msg, "connection from <%s>\n", buf); + ACE_OS::sprintf (msg, "connection from <%s>\n", + ACE_TEXT_ALWAYS_CHAR (buf)); this->box_->label (msg); this->box_->redraw (); @@ -259,13 +261,17 @@ int run_main (int argc, ACE_TCHAR *argv[]) address.addr_to_string (buf, bufsiz, 0); char msg[2 * bufsiz]; - ACE_OS::sprintf (msg, "Listening on <%s>\n", buf); + ACE_OS::sprintf (msg, "Listening on <%s>\n", + ACE_TEXT_ALWAYS_CHAR (buf)); box->label (msg); box->redraw (); window.end (); - window.show (argc, argv); + + ACE_Argv_Type_Converter ct (argc, argv); + + window.show (argc, ct.get_ASCII_argv ()); tw.show (); int const retval = Fl::run (); diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index f07b56aacfc..09ffbca3ffa 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -46,6 +46,7 @@ #include "ace/Time_Value.h" #include "ace/QtReactor/QtReactor.h" #include "ace/Event_Handler.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Acceptor.h" #include "ace/Connector.h" #include "ace/SOCK_Acceptor.h" @@ -891,7 +892,9 @@ void testQtReactor (int argc, ACE_TCHAR *argv[]) // Qt specific code ACE_DEBUG ((LM_INFO, ACE_TEXT ("Testing QtReactor\n"))); - QTestApplication app (argc, argv); + ACE_Argv_Type_Converter ct (argc, argv); + QTestApplication app (argc, ct.get_ASCII_argv ()); + ACE_QtReactor qtReactor (&app); ACE_Reactor reactor (&qtReactor); HandlersRegister handlersRegister (&reactor); -- cgit v1.2.1