summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgiovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-14 17:29:36 +0000
committergiovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-14 17:29:36 +0000
commit2113a753640cbf17e5bb74e87b30218f2b54b8e2 (patch)
tree8a0a0483724ddd8c86f7fbc0f80fb3f78692ba92
parent3a991fc9e62202ed7b37496beff9412f32774b57 (diff)
downloadATCD-2113a753640cbf17e5bb74e87b30218f2b54b8e2.tar.gz
*** empty log message ***
-rw-r--r--TAO/interop-tests/wchar/client.cpp4
-rw-r--r--TAO/interop-tests/wchar/server.cpp2
-rw-r--r--TAO/performance-tests/perf.mwc1
3 files changed, 4 insertions, 3 deletions
diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index a187e37a95b..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_Arg_Opt<char> 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,7 +329,7 @@ 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
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index 35bdb11fc12..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_Arg_Opt<char> 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/performance-tests/perf.mwc b/TAO/performance-tests/perf.mwc
index dd297256b34..427cfc1ba2b 100644
--- a/TAO/performance-tests/perf.mwc
+++ b/TAO/performance-tests/perf.mwc
@@ -2,4 +2,5 @@
// $Id$
workspace {
+ avoids += uses_wchar
}