diff options
Diffstat (limited to 'TAO/examples/Quoter/Generic_Factory_i.cpp')
| -rw-r--r-- | TAO/examples/Quoter/Generic_Factory_i.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index 59851056278..d22e7ee8e87 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -33,8 +33,8 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) } CORBA::Boolean -Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &, - CORBA::Environment &) +Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -43,8 +43,8 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &, CosNaming::NamingContext_ptr -Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key, - CORBA::Environment &ACE_TRY_ENV) +Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key + TAO_ENV_ARG_DECL) { CosNaming::NamingContext_var quoterNamingContext_var; ACE_TRY @@ -55,7 +55,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the Naming Service object reference. CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -64,8 +64,8 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Narrow the object reference to a Naming Context. CosNaming::NamingContext_var namingContext_var = - CosNaming::NamingContext::_narrow (namingObj_var.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (namingObj_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name quoterContextName (1); // max = 1 @@ -74,12 +74,12 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the IDL_Quoter naming context. CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName, ACE_TRY_ENV); + namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; quoterNamingContext_var = - CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -95,8 +95,8 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, - const CosLifeCycle::Criteria &, - CORBA::Environment &ACE_TRY_ENV) + const CosLifeCycle::Criteria & + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -106,8 +106,8 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, ACE_TRY { CosNaming::NamingContext_var quoterNamingContext_var = - this->get_naming_context (factory_key, - ACE_TRY_ENV); + this->get_naming_context (factory_key + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ** now a proper reference to the quoter naming context is @@ -119,7 +119,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Try to get a reference to a Quoter Factory CORBA::Object_var quoterFactoryObject_var = - quoterNamingContext_var->resolve (factory_Name, ACE_TRY_ENV); + quoterNamingContext_var->resolve (factory_Name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We were able to get a reference to Quoter Factory. @@ -130,8 +130,8 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, } Stock::Quoter_Factory_var factory_var = - Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in (), - ACE_TRY_ENV); + Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory_var.in ())) @@ -146,8 +146,8 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Now retrieve the Quoter obj ref corresponding to the key. quoter_var = - factory_var->create_quoter ("test", - ACE_TRY_ENV); + factory_var->create_quoter ("test" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ > 1) |