summaryrefslogtreecommitdiff
path: root/ace/Task.cpp
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2002-07-02 19:59:51 +0000
committerSteve Huston <shuston@riverace.com>2002-07-02 19:59:51 +0000
commit27847df8de460b35cba30a3560ff1ac5a0968a50 (patch)
treea77769a96ea72729688e1c40978f8f4a5512e0be /ace/Task.cpp
parentce8b35ae5b7452eba601a0ed4f7b8d9d0c2584f4 (diff)
downloadATCD-27847df8de460b35cba30a3560ff1ac5a0968a50.tar.gz
ChangeLogTag:Tue Jul 2 11:53:29 2002 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ace/Task.cpp')
-rw-r--r--ace/Task.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/ace/Task.cpp b/ace/Task.cpp
index b073c27eaed..a841b0295dd 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -107,7 +107,7 @@ ACE_Task_Base::activate (long flags,
// Thread Ids were not specified
grp_spawned =
this->thr_mgr_->spawn_n (n_threads,
- ACE_THR_FUNC (&ACE_Task_Base::svc_run),
+ &ACE_Task_Base::svc_run,
(void *) this,
flags,
priority,
@@ -121,7 +121,7 @@ ACE_Task_Base::activate (long flags,
grp_spawned =
this->thr_mgr_->spawn_n (thread_ids,
n_threads,
- ACE_THR_FUNC (&ACE_Task_Base::svc_run),
+ &ACE_Task_Base::svc_run,
(void *) this,
flags,
priority,
@@ -182,7 +182,7 @@ ACE_Task_Base_cleanup (void *object, void *)
}
#endif /* ACE_HAS_SIG_C_FUNC */
-void *
+ACE_THR_FUNC_RETURN
ACE_Task_Base::svc_run (void *args)
{
ACE_TRACE ("ACE_Task_Base::svc_run");
@@ -200,7 +200,8 @@ ACE_Task_Base::svc_run (void *args)
#endif /* ACE_HAS_SIG_C_FUNC */
// Call the Task's svc() hook method.
- void * status = ACE_reinterpret_cast(void *, t->svc ());
+ ACE_THR_FUNC_RETURN status =
+ ACE_reinterpret_cast(ACE_THR_FUNC_RETURN, t->svc ());
// If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke
#if 1