summaryrefslogtreecommitdiff
path: root/TAO/interop-tests/wchar/client.cpp
diff options
context:
space:
mode:
authorjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-08 23:00:05 +0000
committerjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-08 23:00:05 +0000
commitd1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch)
treecf04398acb7ad9fb45311eb105d60975028bbc03 /TAO/interop-tests/wchar/client.cpp
parent1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff)
downloadATCD-d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e.tar.gz
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
Diffstat (limited to 'TAO/interop-tests/wchar/client.cpp')
-rw-r--r--TAO/interop-tests/wchar/client.cpp6
1 files changed, 3 insertions, 3 deletions
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,