diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Driver.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Driver.cpp | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 8985aa6f772..c8689505bdb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -76,7 +76,6 @@ TAO_Notify_Tests_Worker::command_builder (TAO_Notify_Tests_Command_Builder* cmd_ int TAO_Notify_Tests_Worker::svc (void) { -#if 0 ACE_hthread_t current; ACE_Thread::self (current); @@ -88,7 +87,6 @@ TAO_Notify_Tests_Worker::svc (void) } ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands @ priority:%d \n", priority)); -#endif ACE_DECLARE_NEW_CORBA_ENV; @@ -131,13 +129,6 @@ TAO_Notify_Tests_ORB_Run_Worker::run_period (ACE_Time_Value run_period) int TAO_Notify_Tests_ORB_Run_Worker::svc (void) { -#if 0 - // ACE_Thread::getprio() fails on systems that do not support thread - // priorities. While we could just treat the failure as benign, I'm - // just disabling it altogether. It doesn't provide much value, and - // makes service startup needlessly more verbose. See bugzilla 2477 - // for details. - ACE_hthread_t current; ACE_Thread::self (current); @@ -148,8 +139,8 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void) return -1; } + ACE_DEBUG ((LM_ERROR, "Activated ORB Run Worker Thread to run the ORB @ priority:%d \n", priority)); -#endif ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -186,13 +177,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 +192,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 +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("-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 +226,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 |