summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-04-10 03:02:52 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-04-10 03:02:52 +0000
commitf5274f1c6b93380de7e9992369e69b137429f2e6 (patch)
treec4bb2a69c20c61e4c777dbf92e5cc024bd7ae876
parenta71d1511d48b337511ac24b0e250c13c9f446e37 (diff)
downloadATCD-f5274f1c6b93380de7e9992369e69b137429f2e6.tar.gz
*** empty log message ***
-rw-r--r--TAO/tao/Operation_Table.cpp13
-rw-r--r--TAO/tao/Operation_Table.h7
2 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/Operation_Table.cpp
index baa7bad0aae..283b871e208 100644
--- a/TAO/tao/Operation_Table.cpp
+++ b/TAO/tao/Operation_Table.cpp
@@ -26,20 +26,17 @@ ACE_Hash_Map_Manager<const char *, TAO_Skeleton, ACE_SYNCH_NULL_MUTEX>::hash (co
TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
CORBA::ULong dbsize,
- CORBA::ULong hashtblsize)
+ CORBA::ULong hashtblsize,
+ ACE_Allocator *alloc)
+ : hash_ (hashtblsize, alloc);
{
- if (hashtblsize > 0)
- this->hash_.open (hashtblsize);
- // Otherwise, some default is chosen by the ACE_Hash_Map_Manager
- // class
-
// The job of the constructor is to go thru each entry of the
// database and bind the operation name to its corresponding
// skeleton.
- for (CORBA::ULong i=0; i < dbsize; i++)
+ for (CORBA::ULong i = 0; i < dbsize; i++)
// @@ (ASG): what happens if bind fails ???
- (void)this->bind (db[i].opname_, db[i].skel_ptr_);
+ (void) this->bind (db[i].opname_, db[i].skel_ptr_);
}
TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void)
diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h
index 67985ed196f..2c18993d990 100644
--- a/TAO/tao/Operation_Table.h
+++ b/TAO/tao/Operation_Table.h
@@ -67,11 +67,14 @@ public:
// = Initialization and termination methods.
TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
CORBA::ULong dbsize,
- CORBA::ULong hashtblsize = 0);
+ CORBA::ULong hashtblsize,
+ ACE_Allocator *alloc);
// Initialize the dynamic hash operation table with a database of
// operation names. The hash table size may be different from the
// size of the database. Hence we use the third argument to specify
- // the size of the internal hash table.
+ // the size of the internal hash table. The <alloc> argument is
+ // used to determine where the memory comes from (usually from
+ // <ACE_Static_Allocator_Base>).
~TAO_Dynamic_Hash_OpTable (void);
// destructor