diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
| commit | a7c03cabf931b077d70c6f80ec02c7728a429f49 (patch) | |
| tree | 61d38d262d43ac77fc2ad94c9e7e850cd5607622 /ace/Token_Manager.cpp | |
| parent | 2aa7b10780ad7c670f588dce4ec341351a0646aa (diff) | |
| download | ATCD-a7c03cabf931b077d70c6f80ec02c7728a429f49.tar.gz | |
ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@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 9d6aa9e1d2d..019dcb2e921 100644 --- a/ace/Token_Manager.cpp +++ b/ace/Token_Manager.cpp @@ -66,7 +66,7 @@ ACE_Token_Manager::instance (void) void ACE_Token_Manager::get_token (ACE_Token_Proxy *proxy, - const ASYS_TCHAR *token_name) + const ACE_TCHAR *token_name) { ACE_TRACE ("ACE_Token_Manager::get"); // Hmm. I think this makes sense. We perform our own locking here @@ -150,8 +150,8 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) // The caller is an owner, so we have a deadlock situation. if (debug_) { - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) Deadlock detected.\n"))); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%s owns %s and is waiting for %s.\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deadlock detected.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"), proxy->client_id (), token->name (), proxy->token_->name ())); @@ -173,7 +173,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) if (debug_) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("%s owns %s and is waiting for %s.\n"), + ACE_TEXT ("%s owns %s and is waiting for %s.\n"), e->client_id (), token->name (), twf->name ())); @@ -190,7 +190,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) ACE_Tokens * -ACE_Token_Manager::token_waiting_for (const ASYS_TCHAR *client_id) +ACE_Token_Manager::token_waiting_for (const ACE_TCHAR *client_id) { COLLECTION_ITERATOR iterator (collection_); for (COLLECTION_ENTRY *temp = 0; @@ -228,8 +228,8 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token) // we did not find one in the collection { errno = ENOENT; - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Token Manager could not release %s:%d\n"), - ASYS_ONLY_MULTIBYTE_STRING (token->name ()), token->type ())); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"), + token->name (), token->type ())); // @@ bad } else @@ -254,10 +254,10 @@ ACE_Token_Manager::dump (void) const { ACE_TRACE ("ACE_Token_Manager::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("ACE_Token_Manager::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("lock_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Manager::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("collection_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); collection_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } |