diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-20 17:04:19 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-20 17:04:19 +0000 |
| commit | 29b1f2b8f8d739783db173628961cdc19b272f31 (patch) | |
| tree | 60955587fb9ffb8b0581545b140807cc62000d0e /ace/Token_Manager.cpp | |
| parent | 9cf80f9de4604004951879e2c249c05ed1b1f098 (diff) | |
| download | ATCD-29b1f2b8f8d739783db173628961cdc19b272f31.tar.gz | |
ChangeLogTag:Thu Feb 20 09:01:55 2003 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'ace/Token_Manager.cpp')
| -rw-r--r-- | ace/Token_Manager.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp index 13e21c361fc..d14871ab52c 100644 --- a/ace/Token_Manager.cpp +++ b/ace/Token_Manager.cpp @@ -1,5 +1,3 @@ -// $Id$ - #include "ace/Token_Manager.h" #include "ace/Object_Manager.h" @@ -9,7 +7,9 @@ #if defined (ACE_HAS_TOKENS_LIBRARY) -ACE_RCSID(ace, Token_Manager, "$Id$") +ACE_RCSID (ace, + Token_Manager, + "$Id$") // singleton token manager ACE_Token_Manager *ACE_Token_Manager::token_manager_ = 0; @@ -23,16 +23,16 @@ ACE_Token_Manager::~ACE_Token_Manager () { ACE_TRACE ("ACE_Token_Manager::~ACE_Token_Manager"); - COLLECTION_ITERATOR iterator (collection_); + COLLECTION::ITERATOR iterator (collection_); - for (COLLECTION_ENTRY *temp = 0; + for (COLLECTION::ENTRY *temp = 0; iterator.next (temp) != 0; iterator.advance ()) { // @ should I be doing an unbind here? delete temp->int_id_; // The ext_id_'s delete themselves when the array of - // COLLECTION_ENTRYs goes away. + // COLLECTION::ENTRYs goes away. } } @@ -119,8 +119,8 @@ ACE_Token_Manager::check_deadlock (ACE_Token_Proxy *proxy) // Whether or not we detect deadlock, we have to unmark all tokens // for the next time. - COLLECTION_ITERATOR iterator (collection_); - for (COLLECTION_ENTRY *temp = 0; + COLLECTION::ITERATOR iterator (collection_); + for (COLLECTION::ENTRY *temp = 0; iterator.next (temp) != 0; iterator.advance ()) temp->int_id_->visit (0); @@ -193,8 +193,8 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) ACE_Tokens * ACE_Token_Manager::token_waiting_for (const ACE_TCHAR *client_id) { - COLLECTION_ITERATOR iterator (collection_); - for (COLLECTION_ENTRY *temp = 0; + COLLECTION::ITERATOR iterator (collection_); + for (COLLECTION::ENTRY *temp = 0; iterator.next (temp) != 0; iterator.advance ()) { |