diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Driver.cpp')
-rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Driver.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 8985aa6f772..6fb6f16accf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -186,13 +186,13 @@ TAO_Notify_Tests_Driver::~TAO_Notify_Tests_Driver () int TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Timeout")))) // -Timeout timeout_period_S + if ((current_arg = arg_shifter.get_the_parameter ("-Timeout"))) // -Timeout timeout_period_S { if (current_arg != 0) { @@ -201,7 +201,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // -IORoutput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // -IORoutput file_name { if (this->activation_manager_->ior_output_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -210,7 +210,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORinput")))) // -IORinput file_name + else if ((current_arg = arg_shifter.get_the_parameter ("-IORinput"))) // -IORinput file_name { if (this->activation_manager_->ior_input_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -235,17 +235,17 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) } int -TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) +TAO_Notify_Tests_Driver::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - ACE_Argv_Type_Converter command_line(argc, argv); + ACE_Argv_Type_Converter convert(argc, argv); - this->orb_ = CORBA::ORB_init (command_line.get_argc(), - command_line.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (this->parse_args (argc, argv) == -1) + if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Make sure we can support multiple priorities that are required |