diff options
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index f6986c58c6e..525b426f265 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -294,7 +294,7 @@ ACE_Object_Manager::init (void) // NOTE this only works for intel based windows builds. # ifdef _M_IX86 - HMODULE hKernel32 = LoadLibrary (ACE_TEXT ("kernel32.dll")); + HMODULE hKernel32 = ACE_TEXT_LoadLibrary (ACE_TEXT ("kernel32.dll")); if (hKernel32) { void *pOrgEntry = @@ -444,7 +444,8 @@ ACE_Object_Manager::instance (void) int ACE_Object_Manager::at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, - void *param) + void *param, + const char* name) { ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *instance_->internal_lock_, -1)); @@ -462,7 +463,7 @@ ACE_Object_Manager::at_exit_i (void *object, return -1; } - return exit_info_.at_exit_i (object, cleanup_hook, param); + return exit_info_.at_exit_i (object, cleanup_hook, param, name); } int @@ -556,7 +557,9 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock) // termination. This call will cause us to grab the // ACE_Object_Manager::instance ()->internal_lock_ // again; that's why it is a recursive lock. - ACE_Object_Manager::at_exit (lock_adapter); + ACE_Object_Manager::at_exit (lock_adapter, + 0, + typeid (*lock_adapter).name ()); } } } |