diff options
Diffstat (limited to 'TAO/tao/POAS.cpp')
| -rw-r--r-- | TAO/tao/POAS.cpp | 248 |
1 files changed, 63 insertions, 185 deletions
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp index ba7d210fc18..a4de6c68583 100644 --- a/TAO/tao/POAS.cpp +++ b/TAO/tao/POAS.cpp @@ -71,16 +71,16 @@ TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::lookup (const char *str, u static const class TAO_operation_db_entry wordlist[] = { {"",0}, {"",0}, {"",0}, {"",0}, - {"copy", &POA_PortableServer::ThreadPolicy::copy_skel}, + {"copy", &POA_PortableServer::ThreadPolicy::copy_skel}, {"_is_a", &POA_PortableServer::ThreadPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_PortableServer::ThreadPolicy::destroy_skel}, + {"destroy", &POA_PortableServer::ThreadPolicy::destroy_skel}, {"",0}, {"",0}, - {"_get_value", &POA_PortableServer::ThreadPolicy::_get_value_skel}, + {"_get_value", &POA_PortableServer::ThreadPolicy::_get_value_skel}, {"",0}, {"",0}, {"_non_existent", &POA_PortableServer::ThreadPolicy::_non_existent_skel}, {"",0}, {"",0}, - {"_get_policy_type", &POA_PortableServer::ThreadPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_PortableServer::ThreadPolicy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -302,16 +302,7 @@ POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - - PortableServer::ThreadPolicy *retval = - PortableServer::ThreadPolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_ThreadPolicy (this, - stub), - PortableServer::ThreadPolicy::_nil ()); - - return retval; + return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub); } #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -366,16 +357,16 @@ TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::lookup (const char *str, static const class TAO_operation_db_entry wordlist[] = { {"",0}, {"",0}, {"",0}, {"",0}, - {"copy", &POA_PortableServer::LifespanPolicy::copy_skel}, + {"copy", &POA_PortableServer::LifespanPolicy::copy_skel}, {"_is_a", &POA_PortableServer::LifespanPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_PortableServer::LifespanPolicy::destroy_skel}, + {"destroy", &POA_PortableServer::LifespanPolicy::destroy_skel}, {"",0}, {"",0}, - {"_get_value", &POA_PortableServer::LifespanPolicy::_get_value_skel}, + {"_get_value", &POA_PortableServer::LifespanPolicy::_get_value_skel}, {"",0}, {"",0}, {"_non_existent", &POA_PortableServer::LifespanPolicy::_non_existent_skel}, {"",0}, {"",0}, - {"_get_policy_type", &POA_PortableServer::LifespanPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_PortableServer::LifespanPolicy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -597,16 +588,7 @@ POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - - PortableServer::LifespanPolicy *retval = - PortableServer::LifespanPolicy::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_LifespanPolicy (this, - stub), - PortableServer::LifespanPolicy::_nil ()); - - return retval; + return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub); } #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) @@ -659,16 +641,16 @@ TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::lookup (const char * static const class TAO_operation_db_entry wordlist[] = { {"",0}, {"",0}, {"",0}, {"",0}, - {"copy", &POA_PortableServer::IdUniquenessPolicy::copy_skel}, + {"copy", &POA_PortableServer::IdUniquenessPolicy::copy_skel}, {"_is_a", &POA_PortableServer::IdUniquenessPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_PortableServer::IdUniquenessPolicy::destroy_skel}, + {"destroy", &POA_PortableServer::IdUniquenessPolicy::destroy_skel}, {"",0}, {"",0}, - {"_get_value", &POA_PortableServer::IdUniquenessPolicy::_get_value_skel}, + {"_get_value", &POA_PortableServer::IdUniquenessPolicy::_get_value_skel}, {"",0}, {"",0}, {"_non_existent", &POA_PortableServer::IdUniquenessPolicy::_non_existent_skel}, {"",0}, {"",0}, - {"_get_policy_type", &POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -891,18 +873,7 @@ POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - - PortableServer::IdUniquenessPolicy *retval = - PortableServer::IdUniquenessPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, - stub), - PortableServer::IdUniquenessPolicy::_nil () - ); - - return retval; + return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, stub); } #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) @@ -955,16 +926,16 @@ TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::lookup (const char * static const class TAO_operation_db_entry wordlist[] = { {"",0}, {"",0}, {"",0}, {"",0}, - {"copy", &POA_PortableServer::IdAssignmentPolicy::copy_skel}, + {"copy", &POA_PortableServer::IdAssignmentPolicy::copy_skel}, {"_is_a", &POA_PortableServer::IdAssignmentPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_PortableServer::IdAssignmentPolicy::destroy_skel}, + {"destroy", &POA_PortableServer::IdAssignmentPolicy::destroy_skel}, {"",0}, {"",0}, - {"_get_value", &POA_PortableServer::IdAssignmentPolicy::_get_value_skel}, + {"_get_value", &POA_PortableServer::IdAssignmentPolicy::_get_value_skel}, {"",0}, {"",0}, {"_non_existent", &POA_PortableServer::IdAssignmentPolicy::_non_existent_skel}, {"",0}, {"",0}, - {"_get_policy_type", &POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1186,18 +1157,7 @@ POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &ACE_TRY_ENV) { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - - PortableServer::IdAssignmentPolicy *retval = - PortableServer::IdAssignmentPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, - stub), - PortableServer::IdAssignmentPolicy::_nil () - ); - - return retval; + return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub); } #if !defined (TAO_HAS_MINIMUM_CORBA) @@ -1252,16 +1212,16 @@ TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::lookup (const static const class TAO_operation_db_entry wordlist[] = { {"",0}, {"",0}, {"",0}, {"",0}, - {"copy", &POA_PortableServer::ImplicitActivationPolicy::copy_skel}, + {"copy", &POA_PortableServer::ImplicitActivationPolicy::copy_skel}, {"_is_a", &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_PortableServer::ImplicitActivationPolicy::destroy_skel}, + {"destroy", &POA_PortableServer::ImplicitActivationPolicy::destroy_skel}, {"",0}, {"",0}, - {"_get_value", &POA_PortableServer::ImplicitActivationPolicy::_get_value_skel}, + {"_get_value", &POA_PortableServer::ImplicitActivationPolicy::_get_value_skel}, {"",0}, {"",0}, {"_non_existent", &POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel}, {"",0}, {"",0}, - {"_get_policy_type", &POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1483,18 +1443,7 @@ POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &ACE_TRY_ { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - - PortableServer::ImplicitActivationPolicy *retval = - PortableServer::ImplicitActivationPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, - stub), - PortableServer::ImplicitActivationPolicy::_nil () - ); - - return retval; + return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub); } #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) @@ -1547,16 +1496,16 @@ TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::lookup (const ch static const class TAO_operation_db_entry wordlist[] = { {"",0}, {"",0}, {"",0}, {"",0}, - {"copy", &POA_PortableServer::ServantRetentionPolicy::copy_skel}, + {"copy", &POA_PortableServer::ServantRetentionPolicy::copy_skel}, {"_is_a", &POA_PortableServer::ServantRetentionPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_PortableServer::ServantRetentionPolicy::destroy_skel}, + {"destroy", &POA_PortableServer::ServantRetentionPolicy::destroy_skel}, {"",0}, {"",0}, - {"_get_value", &POA_PortableServer::ServantRetentionPolicy::_get_value_skel}, + {"_get_value", &POA_PortableServer::ServantRetentionPolicy::_get_value_skel}, {"",0}, {"",0}, {"_non_existent", &POA_PortableServer::ServantRetentionPolicy::_non_existent_skel}, {"",0}, {"",0}, - {"_get_policy_type", &POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -1778,18 +1727,7 @@ POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &ACE_TRY_EN { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - - PortableServer::ServantRetentionPolicy *retval = - PortableServer::ServantRetentionPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, - stub), - PortableServer::ServantRetentionPolicy::_nil () - ); - - return retval; + return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub); } #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) @@ -1842,16 +1780,16 @@ TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::lookup (const c static const class TAO_operation_db_entry wordlist[] = { {"",0}, {"",0}, {"",0}, {"",0}, - {"copy", &POA_PortableServer::RequestProcessingPolicy::copy_skel}, + {"copy", &POA_PortableServer::RequestProcessingPolicy::copy_skel}, {"_is_a", &POA_PortableServer::RequestProcessingPolicy::_is_a_skel}, {"",0}, - {"destroy", &POA_PortableServer::RequestProcessingPolicy::destroy_skel}, + {"destroy", &POA_PortableServer::RequestProcessingPolicy::destroy_skel}, {"",0}, {"",0}, - {"_get_value", &POA_PortableServer::RequestProcessingPolicy::_get_value_skel}, + {"_get_value", &POA_PortableServer::RequestProcessingPolicy::_get_value_skel}, {"",0}, {"",0}, {"_non_existent", &POA_PortableServer::RequestProcessingPolicy::_non_existent_skel}, {"",0}, {"",0}, - {"_get_policy_type", &POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel}, + {"_get_policy_type", &POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -2073,18 +2011,7 @@ POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &ACE_TRY_E { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - - PortableServer::RequestProcessingPolicy *retval = - PortableServer::RequestProcessingPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, - stub), - PortableServer::RequestProcessingPolicy::_nil () - ); - - return retval; + return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub); } #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -2204,18 +2131,11 @@ POA_PortableServer::_tao_collocated_POAManager:: get_state(CORBA::Environment &A } PortableServer::POAManager* -POA_PortableServer::POAManager::_this (CORBA_Environment &) +POA_PortableServer::POAManager::_this (CORBA_Environment &ACE_TRY_ENV) { - PortableServer::POAManager *retval = - PortableServer::POAManager::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_POAManager (this, - 0), - PortableServer::POAManager::_nil ()); - - - return retval; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return new POA_PortableServer::_tao_collocated_POAManager (this, stub); } #if !defined (TAO_HAS_MINIMUM_CORBA) @@ -2295,18 +2215,11 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_ada PortableServer::AdapterActivator* -POA_PortableServer::AdapterActivator::_this (CORBA_Environment &) +POA_PortableServer::AdapterActivator::_this (CORBA_Environment &ACE_TRY_ENV) { - PortableServer::AdapterActivator *retval = - PortableServer::AdapterActivator::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_AdapterActivator (this, - 0), - PortableServer::AdapterActivator::_nil ()); - - - return retval; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub); } // skeleton constructor @@ -2371,18 +2284,11 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a ( PortableServer::ServantManager* -POA_PortableServer::ServantManager::_this (CORBA_Environment &) +POA_PortableServer::ServantManager::_this (CORBA_Environment &ACE_TRY_ENV) { - PortableServer::ServantManager *retval = - PortableServer::ServantManager::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_ServantManager (this, - 0), - PortableServer::ServantManager::_nil ()); - - - return retval; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return new POA_PortableServer::_tao_collocated_ServantManager (this, stub); } // skeleton constructor @@ -2483,18 +2389,11 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize ( PortableServer::ServantActivator* -POA_PortableServer::ServantActivator::_this (CORBA_Environment &) +POA_PortableServer::ServantActivator::_this (CORBA_Environment &ACE_TRY_ENV) { - PortableServer::ServantActivator *retval = - PortableServer::ServantActivator::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_ServantActivator (this, - 0), - PortableServer::ServantActivator::_nil ()); - - - return retval; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub); } // skeleton constructor @@ -2599,18 +2498,11 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke ( PortableServer::ServantLocator* -POA_PortableServer::ServantLocator::_this (CORBA_Environment &) +POA_PortableServer::ServantLocator::_this (CORBA_Environment &ACE_TRY_ENV) { - PortableServer::ServantLocator *retval = - PortableServer::ServantLocator::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_ServantLocator (this, - 0), - PortableServer::ServantLocator::_nil ()); - - - return retval; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub); } #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -3013,18 +2905,11 @@ CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference ( PortableServer::POA* -POA_PortableServer::POA::_this (CORBA_Environment &) +POA_PortableServer::POA::_this (CORBA_Environment &ACE_TRY_ENV) { - PortableServer::POA *retval = - PortableServer::POA::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_POA (this, - 0), - PortableServer::POA::_nil ()); - - - return retval; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return new POA_PortableServer::_tao_collocated_POA (this, stub); } // skeleton constructor @@ -3111,16 +2996,9 @@ PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_obje PortableServer::Current* -POA_PortableServer::Current::_this (CORBA_Environment &) +POA_PortableServer::Current::_this (CORBA_Environment &ACE_TRY_ENV) { - PortableServer::Current *retval = - PortableServer::Current::_nil (); - - ACE_NEW_RETURN (retval, - POA_PortableServer::_tao_collocated_Current (this, - 0), - PortableServer::Current::_nil ()); - - - return retval; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return new POA_PortableServer::_tao_collocated_Current (this, stub); } |