summaryrefslogtreecommitdiff
path: root/ace/Thread_Manager.cpp
diff options
context:
space:
mode:
authorjwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-21 04:07:25 +0000
committerjwh1 <jwh1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-21 04:07:25 +0000
commit84464bec19aab83c06898b6fd5b3ef25ecb4ecfa (patch)
tree3f63778ca629baa6860c458f77b5f0898dbc1a9b /ace/Thread_Manager.cpp
parentabb401698120d4f233a09430b3191c2d98458f15 (diff)
downloadATCD-84464bec19aab83c06898b6fd5b3ef25ecb4ecfa.tar.gz
Thu Jul 20 23:04:30 2000 John Heitmann <jwh1@cs.wustl.edu>
Diffstat (limited to 'ace/Thread_Manager.cpp')
-rw-r--r--ace/Thread_Manager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 06ed0d7a4c2..dacae3cb8db 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -1038,7 +1038,9 @@ int
ACE_Thread_Manager::join_thr (ACE_Thread_Descriptor *td, int)
{
ACE_TRACE ("ACE_Thread_Manager::join_thr");
-
+#if defined (ACE_HAS_PACE)
+ return ACE_Thread::join (td->thr_handle_);
+#else
int result = ACE_Thread::join (td->thr_handle_);
# if defined (ACE_HAS_PTHREADS_DRAFT4) && defined (ACE_LACKS_SETDETACH)
@@ -1065,6 +1067,7 @@ ACE_Thread_Manager::join_thr (ACE_Thread_Descriptor *td, int)
}
return 0;
+#endif /* ACE_HAS_PACE */
}
int