diff options
Diffstat (limited to 'TAO/tests/RTScheduling/Current/Thread_Task.cpp')
-rw-r--r-- | TAO/tests/RTScheduling/Current/Thread_Task.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp index ecbe671a9b8..4d0d0122fc3 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp @@ -4,9 +4,13 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" +Thread_Task::Thread_Task (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + int -Thread_Task::activate_task (CORBA::ORB_ptr orb, - int thr_count) +Thread_Task::activate_task (int thr_count) { ACE_TRY_NEW_ENV @@ -21,13 +25,11 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb, active_thread_count_ = thr_count; - this->orb_ = CORBA::ORB::_duplicate (orb); - - CORBA::Object_ptr current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" + CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->current_ = RTScheduling::Current::_narrow (current_obj + this->current_ = RTScheduling::Current::_narrow (current_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -136,7 +138,7 @@ Thread_Task::svc (void) ACE_TRY_CHECK; - RTScheduling::Current::NameList* segment_name_list = + RTScheduling::Current::NameList_var segment_name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -150,7 +152,7 @@ Thread_Task::svc (void) { ACE_DEBUG ((LM_DEBUG, "%s\n", - (*segment_name_list)[i].in ())); + static_cast<char const*>((*segment_name_list)[i]))); } } |