diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2002-06-17 11:41:29 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2002-06-17 11:41:29 +0000 |
| commit | 702a575234c3489a40538d63fb85fd94e1a5a217 (patch) | |
| tree | 08615122d8b8103f4cdb912faab0790e19ace8b2 /ace/Object_Manager.cpp | |
| parent | e45bcf73c6e214cfb66160f61fd1c67af9a35a3c (diff) | |
| download | ATCD-702a575234c3489a40538d63fb85fd94e1a5a217.tar.gz | |
ChangeLogTag:Mon Jun 17 06:20:55 2002 Christopher Kohlhoff <chris@kohlhoff.com>
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index d5e11cc4cf7..939cc4e892c 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -4,9 +4,8 @@ #if !defined (ACE_LACKS_ACE_TOKEN) # include "ace/Token_Manager.h" #endif /* ! ACE_LACKS_ACE_TOKEN */ -#if defined (ACE_LACKS_ACE_SVCCONF) -# include "ace/Thread_Manager.h" -#else /* ! ACE_LACKS_ACE_SVCCONF */ +#include "ace/Thread_Manager.h" +#if !defined (ACE_LACKS_ACE_SVCCONF) # include "ace/Service_Manager.h" # include "ace/Service_Config.h" #endif /* ! ACE_LACKS_ACE_SVCCONF */ @@ -606,28 +605,11 @@ ACE_Object_Manager::fini (void) ACE_Trace::stop_tracing (); -#if defined (ACE_LACKS_ACE_SVCCONF) - -# if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) - ACE_Thread_Manager::close_singleton (); -# endif /* ! ACE_THREAD_MANAGER_LACKS_STATICS */ - -#else /* ! ACE_LACKS_ACE_SVCCONF */ - +#if !defined (ACE_LACKS_ACE_SVCCONF) // Close and possibly delete all service instances in the Service // Repository. ACE_Service_Config::fini_svcs (); -#endif /* ! ACE_LACKS_ACE_SVCCONF */ - - // Close the main thread's TSS, including its Log_Msg instance. - ACE_OS::cleanup_tss (1 /* main thread */); - - // - // Note: Do not access Log Msg after this since it is gone - // - -#if !defined (ACE_LACKS_ACE_SVCCONF) // Unlink all services in the Service Repository and close/delete // all ACE library services and singletons. ACE_Service_Config::close (); @@ -637,6 +619,17 @@ ACE_Object_Manager::fini (void) // close down it's dlls--it manages ACE_DLL_Manager. ACE_Framework_Repository::close_singleton (); +# if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) + ACE_Thread_Manager::close_singleton (); +# endif /* ! ACE_THREAD_MANAGER_LACKS_STATICS */ + + // Close the main thread's TSS, including its Log_Msg instance. + ACE_OS::cleanup_tss (1 /* main thread */); + + // + // Note: Do not access Log Msg after this since it is gone + // + // Close the ACE_Allocator. ACE_Allocator::close_singleton (); |