diff options
Diffstat (limited to 'ACE/ace/Framework_Component.cpp')
| -rw-r--r-- | ACE/ace/Framework_Component.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ACE/ace/Framework_Component.cpp b/ACE/ace/Framework_Component.cpp index 7c23fd70407..be7af61ecca 100644 --- a/ACE/ace/Framework_Component.cpp +++ b/ACE/ace/Framework_Component.cpp @@ -1,4 +1,3 @@ -// Framework_Component.cpp // $Id$ #include "ace/Framework_Component.h" @@ -13,8 +12,6 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/OS_NS_string.h" -ACE_RCSID(ace, Framework_Component, "$Id$") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Framework_Component::~ACE_Framework_Component (void) @@ -60,7 +57,7 @@ int ACE_Framework_Repository::close (void) { ACE_TRACE ("ACE_Framework_Repository::close"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); this->shutting_down_ = 1; @@ -128,7 +125,7 @@ int ACE_Framework_Repository::register_component (ACE_Framework_Component *fc) { ACE_TRACE ("ACE_Framework_Repository::register_component"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); int i; // Check to see if it's already registered @@ -155,7 +152,7 @@ int ACE_Framework_Repository::remove_component (const ACE_TCHAR *name) { ACE_TRACE ("ACE_Framework_Repository::remove_component"); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); int i; for (i = 0; i < this->current_size_; i++) @@ -178,7 +175,7 @@ ACE_Framework_Repository::remove_dll_components (const ACE_TCHAR *dll_name) if (this->shutting_down_) return this->remove_dll_components_i (dll_name); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); return this->remove_dll_components_i (dll_name); } |