summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-02 17:57:50 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-06-02 17:57:50 +0000
commit00356c60afcf4bd9b0589b8af1bf3467407c0dd7 (patch)
tree54eebbfd2ce2b55d87fb9382b7beca15af00e681
parent5b4644872113041b76289e7dfa1e87d2a0b58332 (diff)
downloadATCD-00356c60afcf4bd9b0589b8af1bf3467407c0dd7.tar.gz
wait_grp,wait_task: Don't copy Thread_Descriptor, copy Thread_Descriptor_Base instead.
-rw-r--r--ace/Thread_Manager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index e357c037266..4d2571b4c62 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -1253,7 +1253,7 @@ ACE_Thread_Manager::wait_grp (int grp_id)
ACE_TRACE ("ACE_Thread_Manager::wait_grp");
int copy_count = 0;
- ACE_Thread_Descriptor *copy_table = 0;
+ ACE_Thread_Descriptor_Base *copy_table = 0;
// We have to make sure that while we wait for these threads to
// exit, we do not have the lock. Therefore we make a copy of all
@@ -1261,7 +1261,7 @@ ACE_Thread_Manager::wait_grp (int grp_id)
{
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
- ACE_NEW_RETURN (copy_table, ACE_Thread_Descriptor [this->thr_list_.size ()], -1);
+ ACE_NEW_RETURN (copy_table, ACE_Thread_Descriptor_Base [this->thr_list_.size ()], -1);
for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
!iter.done ();
@@ -1517,7 +1517,7 @@ int
ACE_Thread_Manager::wait_task (ACE_Task_Base *task)
{
int copy_count = 0;
- ACE_Thread_Descriptor *copy_table = 0;
+ ACE_Thread_Descriptor_Base *copy_table = 0;
// We have to make sure that while we wait for these threads to
// exit, we do not have the lock. Therefore we make a copy of all
@@ -1526,7 +1526,7 @@ ACE_Thread_Manager::wait_task (ACE_Task_Base *task)
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
ACE_NEW_RETURN (copy_table,
- ACE_Thread_Descriptor [this->thr_list_.size ()],
+ ACE_Thread_Descriptor_Base [this->thr_list_.size ()],
-1);
for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);