diff options
Diffstat (limited to 'ace/Token_Invariants.cpp')
| -rw-r--r-- | ace/Token_Invariants.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp index c9d093664a1..cf98e79c21d 100644 --- a/ace/Token_Invariants.cpp +++ b/ace/Token_Invariants.cpp @@ -28,9 +28,8 @@ ACE_Token_Invariant_Manager::instance (void) if (instance_ == 0) { - ACE_NEW_RETURN (instance_, - ACE_Token_Invariant_Manager, - 0); + ACE_NEW_RETURN (instance_, ACE_Token_Invariant_Manager, 0); + // Register for destruction with ACE_Object_Manager. ACE_Object_Manager::at_exit (instance_); } @@ -45,7 +44,7 @@ ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager (void) } int -ACE_Token_Invariant_Manager::mutex_acquired (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::mutex_acquired (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_acquired"); @@ -88,7 +87,7 @@ ACE_Token_Invariant_Manager::releasing (const ACE_Token_Proxy *proxy) } void -ACE_Token_Invariant_Manager::mutex_releasing (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::mutex_releasing (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::mutex_releasing"); ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_); @@ -99,7 +98,7 @@ ACE_Token_Invariant_Manager::mutex_releasing (const ASYS_TCHAR *token_name) } int -ACE_Token_Invariant_Manager::reader_acquired (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::reader_acquired (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::reader_acquired"); ACE_GUARD_RETURN (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_, -1); @@ -112,7 +111,7 @@ ACE_Token_Invariant_Manager::reader_acquired (const ASYS_TCHAR *token_name) } int -ACE_Token_Invariant_Manager::writer_acquired (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::writer_acquired (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::writer_acquired"); @@ -126,7 +125,7 @@ ACE_Token_Invariant_Manager::writer_acquired (const ASYS_TCHAR *token_name) } void -ACE_Token_Invariant_Manager::rwlock_releasing (const ASYS_TCHAR *token_name) +ACE_Token_Invariant_Manager::rwlock_releasing (const char *token_name) { ACE_TRACE ("ACE_Token_Invariant_Manager::rwlock_releasing"); @@ -151,7 +150,7 @@ ACE_Token_Invariant_Manager::dump (void) const int -ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name, +ACE_Token_Invariant_Manager::get_mutex (const char *token_name, ACE_Mutex_Invariants *&inv) { ACE_TRACE ("ACE_Token_Invariant_Manager::get_mutex"); @@ -161,9 +160,8 @@ ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name, { ACE_Mutex_Invariants *new_invariant; - ACE_NEW_RETURN (new_invariant, - ACE_Mutex_Invariants, - -1); + ACE_NEW_RETURN (new_invariant, ACE_Mutex_Invariants, -1); + if (mutex_collection_.bind (name, new_invariant) == -1) { delete new_invariant; @@ -179,7 +177,7 @@ ACE_Token_Invariant_Manager::get_mutex (const ASYS_TCHAR *token_name, } int -ACE_Token_Invariant_Manager::get_rwlock (const ASYS_TCHAR *token_name, +ACE_Token_Invariant_Manager::get_rwlock (const char *token_name, ACE_RWLock_Invariants *&inv) { ACE_TRACE ("ACE_Token_Invariant_Manager::get_rwlock"); @@ -189,9 +187,8 @@ ACE_Token_Invariant_Manager::get_rwlock (const ASYS_TCHAR *token_name, { ACE_RWLock_Invariants *new_invariant; - ACE_NEW_RETURN (new_invariant, - ACE_RWLock_Invariants, - -1); + ACE_NEW_RETURN (new_invariant, ACE_RWLock_Invariants, -1); + if (rwlock_collection_.bind (name, new_invariant) == -1) return -1; |