summaryrefslogtreecommitdiff
path: root/ACE/ace/Token_Manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/Token_Manager.cpp')
-rw-r--r--ACE/ace/Token_Manager.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp
index a68ac717ebf..0bc2a276494 100644
--- a/ACE/ace/Token_Manager.cpp
+++ b/ACE/ace/Token_Manager.cpp
@@ -154,8 +154,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, ACE_LIB_TEXT ("(%t) Deadlock detected.\n")));
- ACE_DEBUG ((LM_DEBUG, ACE_LIB_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 ()));
@@ -177,7 +177,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy)
if (debug_)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_LIB_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 ()));
@@ -232,7 +232,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token)
// we did not find one in the collection
{
errno = ENOENT;
- ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Token Manager could not release %s:%d\n"),
+ ACE_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"),
token->name (), token->type ()));
// @@ bad
}
@@ -259,10 +259,10 @@ ACE_Token_Manager::dump (void) const
#if defined (ACE_HAS_DUMP)
ACE_TRACE ("ACE_Token_Manager::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Manager::dump:\n")));
- ACE_DEBUG ((LM_DEBUG, ACE_LIB_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, ACE_LIB_TEXT ("collection_\n")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n")));
collection_.dump ();
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */