diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-05 20:13:29 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-05 20:13:29 +0000 |
| commit | 3b2de43a9b7295745ee3be244d8d130e96f365ef (patch) | |
| tree | 3d7fe111a3d424240451a03d723aac045d54c133 /TAO/tests | |
| parent | e8acb51bcc34340bfbd297c0daedce3e357c4ca9 (diff) | |
| download | ATCD-3b2de43a9b7295745ee3be244d8d130e96f365ef.tar.gz | |
Wed Jun 5 20:11:23 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* examples/AMI/FL_Callback/progress.cpp:
* orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp:
* performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
* tests/FL_Cube/server.cpp:
* tests/QtTests/client.cpp:
* tests/QtTests/server.cpp:
Fixed wchar build compile errors
Diffstat (limited to 'TAO/tests')
| -rw-r--r-- | TAO/tests/FL_Cube/server.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/QtTests/client.cpp | 6 | ||||
| -rw-r--r-- | TAO/tests/QtTests/server.cpp | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index 06ab83c9456..8887b07b328 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -54,7 +54,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - char* targv[] = { argv[0] }; + char* targv[] = { ACE_TEXT_ALWAYS_CHAR (argv[0]) }; window.show (1, targv); sw.show (); diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index d4f549290d7..55261dcb1a1 100644 --- 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/QtResource_Loader.h" #include "client.h" @@ -9,9 +10,10 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - QApplication app (argc, argv); - TAO::QtResource_Loader qt_resources (&app); + ACE_Argv_Type_Converter ct (argc, argv); + QApplication app (argc, ct.get_ASCII_argv ()); + TAO::QtResource_Loader qt_resources (&app); try { diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 6552506e4b8..63101f832b2 100644 --- 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" // who defines index macro? #ifdef index @@ -52,7 +53,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; // Qt specific stuff for running with TAO... - QApplication app (argc, argv); + ACE_Argv_Type_Converter ct (argc, argv); + QApplication app (argc, ct.get_ASCII_argv()); TAO::QtResource_Loader qt_resources (&app); try |