*** empty log message ***

2 files changed, 85 insertions, 16 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 3fcf37a4e2d..5ca550c0d40 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,8 @@
 Thu Apr  9 21:57:52 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
+	* tao/POAS.cpp: Fixed up the POA to use the new
+ 	  ACE_Static_Allocator_Base stuff.
+
 	* tao/Operation_Table: Added an additional parameter to the
  	  TAO_Dynamic_Hash_OpTable constructor so that we can pass in the
  	  ACE_Static_Allocator_Base.  Also, changed the code to use the
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index b6d397deaf4..556623818cf 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO ORB and the TAO IDL Compiler have been developed by Washington
 // University Computer Science's Distributed Object Computing Group.
@@ -16,7 +18,11 @@ static const TAO_operation_db_entry PortableServer_CurrentBase_operations [] = {
   {"_is_a", &POA_PortableServer::CurrentBase::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_CurrentBase_optable (PortableServer_CurrentBase_operations, 1, 2);
+static const CORBA::Long _tao_PortableServer_CurrentBase_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_CurrentBase_optable_pool [_tao_PortableServer_CurrentBase_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_CurrentBase_allocator (_tao_PortableServer_CurrentBase_optable_pool, _tao_PortableServer_CurrentBase_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_CurrentBase_optable (PortableServer_CurrentBase_operations, 1, 1, &_tao_PortableServer_CurrentBase_allocator);
+
 // skeleton constructor
 POA_PortableServer::CurrentBase::CurrentBase (void)
 {
@@ -142,7 +148,11 @@ static const TAO_operation_db_entry PortableServer_Policy_operations [] = {
   {"_is_a", &POA_PortableServer::Policy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_Policy_optable (PortableServer_Policy_operations, 3, 6);
+static const CORBA::Long _tao_PortableServer_Policy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (9);
+static char _tao_PortableServer_Policy_optable_pool [_tao_PortableServer_Policy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_Policy_allocator (_tao_PortableServer_Policy_optable_pool, _tao_PortableServer_Policy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_Policy_optable (PortableServer_Policy_operations, 3, 6, &_tao_PortableServer_Policy_allocator);
+
 // skeleton constructor
 POA_PortableServer::Policy::Policy (void)
 {
@@ -352,7 +362,11 @@ static const TAO_operation_db_entry PortableServer_ThreadPolicy_operations [] =
   {"_is_a", &POA_PortableServer::ThreadPolicy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ThreadPolicy_optable (PortableServer_ThreadPolicy_operations, 4, 8);
+static const CORBA::Long _tao_PortableServer_ThreadPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_PortableServer_ThreadPolicy_optable_pool [_tao_PortableServer_ThreadPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ThreadPolicy_allocator (_tao_PortableServer_ThreadPolicy_optable_pool, _tao_PortableServer_ThreadPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ThreadPolicy_optable (PortableServer_ThreadPolicy_operations, 4, 8, &_tao_PortableServer_ThreadPolicy_allocator);
+
 // skeleton constructor
 POA_PortableServer::ThreadPolicy::ThreadPolicy (void)
 {
@@ -542,7 +556,11 @@ static const TAO_operation_db_entry PortableServer_LifespanPolicy_operations []
   {"_is_a", &POA_PortableServer::LifespanPolicy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_LifespanPolicy_optable (PortableServer_LifespanPolicy_operations, 4, 8);
+static const CORBA::Long _tao_PortableServer_LifespanPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_PortableServer_LifespanPolicy_optable_pool [_tao_PortableServer_LifespanPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_LifespanPolicy_allocator (_tao_PortableServer_LifespanPolicy_optable_pool, _tao_PortableServer_LifespanPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_LifespanPolicy_optable (PortableServer_LifespanPolicy_operations, 4, 8, &_tao_PortableServer_LifespanPolicy_allocator);
+
 // skeleton constructor
 POA_PortableServer::LifespanPolicy::LifespanPolicy (void)
 {
@@ -731,7 +749,11 @@ static const TAO_operation_db_entry PortableServer_IdUniquenessPolicy_operations
   {"_is_a", &POA_PortableServer::IdUniquenessPolicy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable (PortableServer_IdUniquenessPolicy_operations, 4, 8);
+static const CORBA::Long _tao_PortableServer_IdUniquenessPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_PortableServer_IdUniquenessPolicy_optable_pool [_tao_PortableServer_IdUniquenessPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_IdUniquenessPolicy_allocator (_tao_PortableServer_IdUniquenessPolicy_optable_pool, _tao_PortableServer_IdUniquenessPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable (PortableServer_IdUniquenessPolicy_operations, 4, 8, &_tao_PortableServer_IdUniquenessPolicy_allocator);
+
 // skeleton constructor
 POA_PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 {
@@ -920,7 +942,11 @@ static const TAO_operation_db_entry PortableServer_IdAssignmentPolicy_operations
   {"_is_a", &POA_PortableServer::IdAssignmentPolicy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable (PortableServer_IdAssignmentPolicy_operations, 4, 8);
+static const CORBA::Long _tao_PortableServer_IdAssignmentPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_PortableServer_IdAssignmentPolicy_optable_pool [_tao_PortableServer_IdAssignmentPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_IdAssignmentPolicy_allocator (_tao_PortableServer_IdAssignmentPolicy_optable_pool, _tao_PortableServer_IdAssignmentPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable (PortableServer_IdAssignmentPolicy_operations, 4, 8, &_tao_PortableServer_IdAssignmentPolicy_allocator);
+
 // skeleton constructor
 POA_PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 {
@@ -1109,7 +1135,11 @@ static const TAO_operation_db_entry PortableServer_ImplicitActivationPolicy_oper
   {"_is_a", &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable (PortableServer_ImplicitActivationPolicy_operations, 4, 8);
+static const CORBA::Long _tao_PortableServer_ImplicitActivationPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_PortableServer_ImplicitActivationPolicy_optable_pool [_tao_PortableServer_ImplicitActivationPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ImplicitActivationPolicy_allocator (_tao_PortableServer_ImplicitActivationPolicy_optable_pool, _tao_PortableServer_ImplicitActivationPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable (PortableServer_ImplicitActivationPolicy_operations, 4, 8, &_tao_PortableServer_ImplicitActivationPolicy_allocator);
+
 // skeleton constructor
 POA_PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 {
@@ -1298,7 +1328,11 @@ static const TAO_operation_db_entry PortableServer_ServantRetentionPolicy_operat
   {"_is_a", &POA_PortableServer::ServantRetentionPolicy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable (PortableServer_ServantRetentionPolicy_operations, 4, 8);
+static const CORBA::Long _tao_PortableServer_ServantRetentionPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_PortableServer_ServantRetentionPolicy_optable_pool [_tao_PortableServer_ServantRetentionPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantRetentionPolicy_allocator (_tao_PortableServer_ServantRetentionPolicy_optable_pool, _tao_PortableServer_ServantRetentionPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable (PortableServer_ServantRetentionPolicy_operations, 4, 8, &_tao_PortableServer_ServantRetentionPolicy_allocator);
+
 // skeleton constructor
 POA_PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 {
@@ -1487,7 +1521,11 @@ static const TAO_operation_db_entry PortableServer_RequestProcessingPolicy_opera
   {"_is_a", &POA_PortableServer::RequestProcessingPolicy::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable (PortableServer_RequestProcessingPolicy_operations, 4, 8);
+static const CORBA::Long _tao_PortableServer_RequestProcessingPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_PortableServer_RequestProcessingPolicy_optable_pool [_tao_PortableServer_RequestProcessingPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_RequestProcessingPolicy_allocator (_tao_PortableServer_RequestProcessingPolicy_optable_pool, _tao_PortableServer_RequestProcessingPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable (PortableServer_RequestProcessingPolicy_operations, 4, 8, &_tao_PortableServer_RequestProcessingPolicy_allocator);
+
 // skeleton constructor
 POA_PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 {
@@ -1673,7 +1711,11 @@ static const TAO_operation_db_entry PortableServer_POAManager_operations [] = {
   {"_is_a", &POA_PortableServer::POAManager::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_POAManager_optable (PortableServer_POAManager_operations, 1, 2);
+static const CORBA::Long _tao_PortableServer_POAManager_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_POAManager_optable_pool [_tao_PortableServer_POAManager_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_POAManager_allocator (_tao_PortableServer_POAManager_optable_pool, _tao_PortableServer_POAManager_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_POAManager_optable (PortableServer_POAManager_operations, 1, 1, &_tao_PortableServer_POAManager_allocator);
+
 // skeleton constructor
 POA_PortableServer::POAManager::POAManager (void)
 {
@@ -1841,7 +1883,11 @@ static const TAO_operation_db_entry PortableServer_AdapterActivator_operations [
   {"_is_a", &POA_PortableServer::AdapterActivator::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_AdapterActivator_optable (PortableServer_AdapterActivator_operations, 1, 2);
+static const CORBA::Long _tao_PortableServer_AdapterActivator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_AdapterActivator_optable_pool [_tao_PortableServer_AdapterActivator_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_AdapterActivator_allocator (_tao_PortableServer_AdapterActivator_optable_pool, _tao_PortableServer_AdapterActivator_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_AdapterActivator_optable (PortableServer_AdapterActivator_operations, 1, 1, &_tao_PortableServer_AdapterActivator_allocator);
+
 // skeleton constructor
 POA_PortableServer::AdapterActivator::AdapterActivator (void)
 {
@@ -1978,7 +2024,11 @@ static const TAO_operation_db_entry PortableServer_ServantManager_operations []
   {"_is_a", &POA_PortableServer::ServantManager::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantManager_optable (PortableServer_ServantManager_operations, 1, 2);
+static const CORBA::Long _tao_PortableServer_ServantManager_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_ServantManager_optable_pool [_tao_PortableServer_ServantManager_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantManager_allocator (_tao_PortableServer_ServantManager_optable_pool, _tao_PortableServer_ServantManager_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantManager_optable (PortableServer_ServantManager_operations, 1, 1, &_tao_PortableServer_ServantManager_allocator);
+
 // skeleton constructor
 POA_PortableServer::ServantManager::ServantManager (void)
 {
@@ -2102,7 +2152,11 @@ static const TAO_operation_db_entry PortableServer_ServantActivator_operations [
   {"_is_a", &POA_PortableServer::ServantActivator::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantActivator_optable (PortableServer_ServantActivator_operations, 1, 2);
+static const CORBA::Long _tao_PortableServer_ServantActivator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_ServantActivator_optable_pool [_tao_PortableServer_ServantActivator_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantActivator_allocator (_tao_PortableServer_ServantActivator_optable_pool, _tao_PortableServer_ServantActivator_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantActivator_optable (PortableServer_ServantActivator_operations, 1, 1, &_tao_PortableServer_ServantActivator_allocator);
+
 // skeleton constructor
 POA_PortableServer::ServantActivator::ServantActivator (void)
 {
@@ -2262,7 +2316,11 @@ static const TAO_operation_db_entry PortableServer_ServantLocator_operations []
   {"_is_a", &POA_PortableServer::ServantLocator::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantLocator_optable (PortableServer_ServantLocator_operations, 1, 2);
+static const CORBA::Long _tao_PortableServer_ServantLocator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (24);
+static char _tao_PortableServer_ServantLocator_optable_pool [_tao_PortableServer_ServantLocator_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantLocator_allocator (_tao_PortableServer_ServantLocator_optable_pool, _tao_PortableServer_ServantLocator_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantLocator_optable (PortableServer_ServantLocator_operations, 8, 16, &_tao_PortableServer_ServantLocator_allocator);
+
 // skeleton constructor
 POA_PortableServer::ServantLocator::ServantLocator (void)
 {
@@ -2426,7 +2484,11 @@ static const TAO_operation_db_entry PortableServer_POA_operations [] = {
   {"_is_a", &POA_PortableServer::POA::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_POA_optable (PortableServer_POA_operations, 1, 2);
+static const CORBA::Long _tao_PortableServer_POA_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_POA_optable_pool [_tao_PortableServer_POA_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_POA_allocator (_tao_PortableServer_POA_optable_pool, _tao_PortableServer_POA_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_POA_optable (PortableServer_POA_operations, 1, 1, &_tao_PortableServer_POA_allocator);
+
 // skeleton constructor
 POA_PortableServer::POA::POA (void)
 {
@@ -2875,7 +2937,11 @@ static const TAO_operation_db_entry PortableServer_Current_operations [] = {
   {"_is_a", &POA_PortableServer::Current::_is_a_skel}
 };
 
-TAO_Dynamic_Hash_OpTable tao_PortableServer_Current_optable (PortableServer_Current_operations, 3, 6);
+static const CORBA::Long _tao_PortableServer_Current_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (9);
+static char _tao_PortableServer_Current_optable_pool [_tao_PortableServer_Current_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_Current_allocator (_tao_PortableServer_Current_optable_pool, _tao_PortableServer_Current_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_Current_optable (PortableServer_Current_operations, 3, 6, &_tao_PortableServer_Current_allocator);
+
 // skeleton constructor
 POA_PortableServer::Current::Current (void)
 {