diff options
Diffstat (limited to 'TAO/interop-tests/wchar/client.cpp')
-rw-r--r-- | TAO/interop-tests/wchar/client.cpp | 6 |
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, |