diff options
Diffstat (limited to 'TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp')
| -rw-r--r-- | TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp index 9ad3f1430d0..97b36cd3e73 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -29,11 +29,11 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb) this->orb_ = CORBA::ORB::_duplicate (orb); - CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" + CORBA::Object_ptr current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->current_ = RTScheduling::Current::_narrow (current_obj.in () + this->current_ = RTScheduling::Current::_narrow (current_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -58,9 +58,9 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb) return 0; } -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ int Thread_Task::svc (void) @@ -102,7 +102,7 @@ Thread_Task::svc (void) { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *shutdown_lock_,-1); - RTScheduling::Current::NameList_var name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER); + RTScheduling::Current::NameList* name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, |