diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-09-03 00:19:05 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-09-03 00:19:05 +0000 |
| commit | 341cbc7c3a474f1b1350076b14c2d60652728a47 (patch) | |
| tree | bbc69e58be4b9f20d77bce8e4be665b515abdfd8 /ace/Object_Manager.cpp | |
| parent | b917f7cb29895c47c3042ca6fa352ab88d837d83 (diff) | |
| download | ATCD-341cbc7c3a474f1b1350076b14c2d60652728a47.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 3c788fbff94..ac6c32fd739 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -17,7 +17,7 @@ ACE_Object_Manager *ACE_Object_Manager::instance_ = 0; ACE_Object_Manager::ACE_Object_Manager (void) : shutting_down_(0) { - ACE_NEW (registered_objects_, ACE_Unbounded_Queue<object_info_t>); + ACE_NEW (registered_objects_, ACE_Unbounded_Queue<ACE_Cleanup_Info>); #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) // Store the address of this static instance so that instance () @@ -33,7 +33,7 @@ ACE_Object_Manager::ACE_Object_Manager (void) ACE_Object_Manager::~ACE_Object_Manager (void) { - object_info_t info; + ACE_Cleanup_Info info; // This call closes and deletes all ACE library services and // singletons. @@ -92,8 +92,8 @@ ACE_Object_Manager::at_exit_i (void *object, return -1; // Check for already in queue, and return 1 if so. - object_info_t *info = 0; - for (ACE_Unbounded_Queue_Iterator<object_info_t> iter (*registered_objects_); + ACE_Cleanup_Info *info = 0; + for (ACE_Unbounded_Queue_Iterator<ACE_Cleanup_Info> iter (*registered_objects_); iter.next (info) != 0; iter.advance ()) { @@ -104,7 +104,7 @@ ACE_Object_Manager::at_exit_i (void *object, } } - object_info_t new_info; + ACE_Cleanup_Info new_info; new_info.object_ = object; new_info.cleanup_hook_ = cleanup_hook; new_info.param_ = param; @@ -115,11 +115,11 @@ ACE_Object_Manager::at_exit_i (void *object, } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Unbounded_Queue<ACE_Object_Manager::object_info_t>; -template class ACE_Unbounded_Queue_Iterator<ACE_Object_Manager::object_info_t>; -template class ACE_Node<ACE_Object_Manager::object_info_t>; +template class ACE_Unbounded_Queue<ACE_Object_Manager::ACE_Cleanup_Info>; +template class ACE_Unbounded_Queue_Iterator<ACE_Object_Manager::ACE_Cleanup_Info>; +template class ACE_Node<ACE_Object_Manager::ACE_Cleanup_Info>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Unbounded_Queue<ACE_Object_Manager::object_info_t> -#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Object_Manager::object_info_t> -#pragma instantiate ACE_Node<ACE_Object_Manager::object_info_t> +#pragma instantiate ACE_Unbounded_Queue<ACE_Object_Manager::ACE_Cleanup_Info> +#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Object_Manager::ACE_Cleanup_Info> +#pragma instantiate ACE_Node<ACE_Object_Manager::ACE_Cleanup_Info> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |