diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-13 11:47:36 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-13 11:47:36 +0000 |
| commit | 92615f085ce8da947e96b11e068e173c26a9c786 (patch) | |
| tree | e7eae3ea98a6dc88e9388ab33191a25c5b1329cb /ace/Thread_Manager.cpp | |
| parent | b9acf9215f2fd3ba5ea9c54dd926fbe4ff5d9cc3 (diff) | |
| download | ATCD-92615f085ce8da947e96b11e068e173c26a9c786.tar.gz | |
added ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> instantiation
Diffstat (limited to 'ace/Thread_Manager.cpp')
| -rw-r--r-- | ace/Thread_Manager.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index b5eb561fe40..94e293d2182 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -5,6 +5,7 @@ #include "ace/Thread_Manager.h" #include "ace/Dynamic.h" #include "ace/Object_Manager.h" +#include "ace/Singleton.h" #if !defined (__ACE_INLINE__) #include "ace/Thread_Manager.i" @@ -1004,8 +1005,8 @@ ACE_Thread_Manager::apply_grp (int grp_id, iter.advance ()) { if (iter.next ()->grp_id_ == grp_id) - if ((this->*func) (iter.next (), arg) == -1) - result = -1; + if ((this->*func) (iter.next (), arg) == -1) + result = -1; } // Must remove threads after we have traversed the thr_list_ to @@ -1015,7 +1016,7 @@ ACE_Thread_Manager::apply_grp (int grp_id, { ACE_Thread_Descriptor *td; while (this->thr_to_be_removed_.dequeue_head (td) != -1) - this->remove_thr (td); + this->remove_thr (td); } return result; @@ -1081,7 +1082,7 @@ ACE_Thread_Manager::apply_all (ACE_THR_MEMBER_FUNC func, int arg) { ACE_Thread_Descriptor *td; while (this->thr_to_be_removed_.dequeue_head (td) != -1) - this->remove_thr (td); + this->remove_thr (td); } return result; @@ -1309,7 +1310,7 @@ ACE_Thread_Manager::apply_task (ACE_Task_Base *task, { ACE_Thread_Descriptor *td; while (this->thr_to_be_removed_.dequeue_head (td) != -1) - this->remove_thr (td); + this->remove_thr (td); } return result; @@ -1664,7 +1665,8 @@ template class ACE_Double_Linked_List<ACE_Thread_Descriptor>; template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>; #if (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) // This doesn't necessarily belong here, but it's a convenient place for it. - template class ACE_TSS<ACE_Dynamic>; + template class ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>; + template class ACE_TSS<ACE_Dynamic>; // might not need this anymore? template class ACE_TSS<ACE_Thread_Exit>; #endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -1680,6 +1682,7 @@ template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>; #pragma instantiate ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> #if (defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) // This doesn't necessarily belong here, but it's a convenient place for it. + #pragma instantiate ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> #pragma instantiate ACE_TSS<ACE_Dynamic> #pragma instantiate ACE_TSS<ACE_Thread_Exit> #endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ |