diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-02 15:31:52 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-02 15:31:52 +0000 |
| commit | fd8a707c82e8ce403889e230f83ba1424b579174 (patch) | |
| tree | 31618feddada1b086b15dbdde8e6849e513c3319 /ace/Object_Manager.cpp | |
| parent | 53a821932f17656ed35aea28f4fb0a0a6d9fd9d5 (diff) | |
| download | ATCD-fd8a707c82e8ce403889e230f83ba1424b579174.tar.gz | |
(~ACE_Object_Manager_Base): moved internal_lock_ deletion inside
ACE_MT_SAFE protection.
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 37ab6203861..f897cd06496 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -834,6 +834,9 @@ ACE_Object_Manager_Base::get_singleton_lock (ACE_RW_Thread_Mutex *&lock) ACE_Object_Manager_Base::~ACE_Object_Manager_Base (void) { #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) + delete internal_lock_; + internal_lock_ = 0; + delete singleton_null_lock_; singleton_null_lock_ = 0; @@ -852,9 +855,6 @@ ACE_Object_Manager_Base::~ACE_Object_Manager_Base (void) delete registered_objects_; registered_objects_ = 0; - - delete internal_lock_; - internal_lock_ = 0; } ACE_Object_Manager::~ACE_Object_Manager (void) |