summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog-98b7
-rw-r--r--ace/Map_Manager.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index e43f3cd7a34..a8734cb1fb7 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,10 @@
+Sun Sep 27 18:53:25 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * tests/Map_Manager_Test.cpp:
+ Instead of clearing the capacity and size in the
+ free_search_structure() method we do it on the close()
+ method. The first method is also used in other places...
+
Sun Sep 27 18:25:57 1998 David L. Levine <levine@cs.wustl.edu>
* ace/OS.i (readdir_r): added __USE_POSIX test for three-arg
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index fc81a764ac3..cef6c579a45 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -82,6 +82,8 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i (void)
ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i");
this->free_search_structure ();
+ this->total_size_ = 0;
+ this->cur_size_ = 0;
return 0;
}
@@ -188,8 +190,6 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure (void)
// Actually free the memory.
this->allocator_->free (this->search_structure_);
this->search_structure_ = 0;
- this->total_size_ = 0;
- this->cur_size_ = 0;
}
}