diff options
Diffstat (limited to 'TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index 4c8cbf69e89..854b21687a2 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -34,8 +34,8 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void) CORBA::Boolean -Life_Cycle_Service_i::supports (const CosLifeCycle::Key &, - CORBA::Environment &) +Life_Cycle_Service_i::supports (const CosLifeCycle::Key & + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -43,8 +43,8 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &, CORBA::Object_ptr Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, - const CosLifeCycle::Criteria &the_criteria, - CORBA::Environment &ACE_TRY_ENV) + const CosLifeCycle::Criteria &the_criteria + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -64,7 +64,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n")); - char* filter = criteria_Evaluator.getFilter (ACE_TRY_ENV); + char* filter = criteria_Evaluator.getFilter (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->debug_level_ >= 2) @@ -96,8 +96,8 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, ACE_TRY { genericFactory_var = - CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr, - ACE_TRY_ENV); + CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr + TAO_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; } ACE_CATCHANY @@ -119,8 +119,8 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, // Now retrieve the Object obj ref corresponding to the key. CORBA::Object_var object_var = genericFactory_var->create_object (factory_key, - the_criteria, - ACE_TRY_ENV); + the_criteria + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->debug_level_ >= 2) @@ -149,8 +149,8 @@ void Life_Cycle_Service_i::register_factory (const char * name, const char * location, const char * description, - CORBA::Object_ptr object, - CORBA::Environment &) + CORBA::Object_ptr object + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException)) { if (factory_trader_ptr_ == 0) |