summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-27 16:08:41 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-27 16:08:41 +0000
commit07f357ccb94f1bb1b7abc571f4a186b95018ea40 (patch)
tree18e6df9ea7b6373d423529707aab2c34c63143d0
parent39dad71cdf144a4943535164b65a4481690dac11 (diff)
downloadATCD-07f357ccb94f1bb1b7abc571f4a186b95018ea40.tar.gz
added call to ACE_Allocater::close_singleton (), and protected call to ACE_Static_Object_Lock::close_singleton () with ACE_HAS_THREADS
-rw-r--r--ace/Object_Manager.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 50c53dcc081..99e7bcab34d 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -46,8 +46,13 @@ ACE_Object_Manager::~ACE_Object_Manager (void)
// Close the Log_Msg instance.
ACE_Log_Msg::close ();
- // Finally, close the ACE_Allocator and ACE_Static_Object_Lock.
+ // Close the ACE_Allocator.
+ ACE_Allocator::close_singleton ();
+
+# if defined (ACE_HAS_THREADS)
+ // Close the ACE_Allocator and ACE_Static_Object_Lock.
ACE_Static_Object_Lock::close_singleton ();
+# endif /* ACE_HAS_THREADS */
}
ACE_Object_Manager *