summaryrefslogtreecommitdiff
path: root/ace/Map_Manager.cpp
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-29 03:00:28 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-29 03:00:28 +0000
commit7381607fc4fb078f33330665e4e61c8d8f407808 (patch)
tree0bc1d814be39b961890e074cd35f369b8ee336cf /ace/Map_Manager.cpp
parent6ec3981a0004ba270715e26a85fc7a387ac11c09 (diff)
downloadATCD-7381607fc4fb078f33330665e4e61c8d8f407808.tar.gz
*** empty log message ***
Diffstat (limited to 'ace/Map_Manager.cpp')
-rw-r--r--ace/Map_Manager.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 4ff94017a0b..781b5af7d53 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -29,12 +29,15 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Map_Iterator)
ACE_ALLOC_HOOK_DEFINE(ACE_Map_Reverse_Iterator)
- template <class EXT_ID, class INT_ID, class ACE_LOCK> int
+template <class EXT_ID, class INT_ID, class ACE_LOCK> int
ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::open (size_t size,
ACE_Allocator *alloc)
{
ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
+ // Close old map (if any).
+ this->close_i ();
+
// Use the user specified allocator or the default singleton one.
if (alloc == 0)
alloc = ACE_Allocator::instance ();
@@ -45,14 +48,6 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::open (size_t size,
// happen.
ACE_ASSERT (size != 0);
- // Reset circular occupied list.
- this->occupied_list_.next (this->occupied_list_id ());
- this->occupied_list_.prev (this->occupied_list_id ());
-
- // Reset circular free list.
- this->free_list_.next (this->free_list_id ());
- this->free_list_.prev (this->free_list_id ());
-
// Resize from 0 to <size>. Note that this will also set up the
// circular free list.
return this->resize_i (size);