summaryrefslogtreecommitdiff
path: root/ace/Hash_Map_Manager.cpp
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-02-05 19:03:12 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-02-05 19:03:12 +0000
commit805ca90b6c6247cff3d2855875eb8854f82007fb (patch)
treeaba1d7db0298a65d82407de8864d67c57750a372 /ace/Hash_Map_Manager.cpp
parent72bd8ed9e6f7689a0e39f2e345c08170557972c6 (diff)
downloadATCD-805ca90b6c6247cff3d2855875eb8854f82007fb.tar.gz
replaced DEFAULT_SIZE with ACE_DEFAULT_MAP_SIZE so that Naming_Test runs on SunC++ 4.1
Diffstat (limited to 'ace/Hash_Map_Manager.cpp')
-rw-r--r--ace/Hash_Map_Manager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp
index 5e9eb59279e..c64768ece94 100644
--- a/ace/Hash_Map_Manager.cpp
+++ b/ace/Hash_Map_Manager.cpp
@@ -106,6 +106,12 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::open (size_t size,
this->allocator_ = allocator;
+ // This assertion is here to help track a situation that shouldn't happen,
+ // but did with Sun C++ 4.1 (before a change to this class was made:
+ // it used to have an enum that was supposed to be defined to be
+ // ACE_DEFAULT_MAP_SIZE, but instead was defined to be 0.
+ ACE_ASSERT (size != 0);
+
// If we need to grow buffer, then remove the existing buffer.
if (this->total_size_ < size)
return this->resize_i (size);
@@ -130,7 +136,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::ACE_Hash_Map_Manager (ACE_Allocator
total_size_ (0),
cur_size_ (0)
{
- if (this->open (DEFAULT_SIZE, allocator) == -1)
+ if (this->open (ACE_DEFAULT_MAP_SIZE, allocator) == -1)
ACE_ERROR ((LM_ERROR, "ACE_Hash_Map_Manager\n"));
}