diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/Container_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Container_i.cpp | 574 |
1 files changed, 287 insertions, 287 deletions
diff --git a/TAO/orbsvcs/IFR_Service/Container_i.cpp b/TAO/orbsvcs/IFR_Service/Container_i.cpp index 9e7c6fd25e2..c3bbfcc8e0f 100644 --- a/TAO/orbsvcs/IFR_Service/Container_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Container_i.cpp @@ -21,16 +21,16 @@ TAO_Container_i::~TAO_Container_i (void) } void -TAO_Container_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Container_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) +TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int index = 0; @@ -39,12 +39,12 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) // Destroy and/or remove references. - ACE_Configuration_Section_Key refs_key; - status = - this->repo_->config ()->open_section (this->section_key_, - "refs", - 0, - refs_key); + ACE_Configuration_Section_Key refs_key; + status = + this->repo_->config ()->open_section (this->section_key_, + "refs", + 0, + refs_key); // This section may not have been created. if (status == 0) @@ -76,13 +76,13 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) if (status == 0) { TAO_IDLType_i *impl = - this->repo_->servant_factory ()->create_idltype (entry_key, - ACE_TRY_ENV); + this->repo_->servant_factory ()->create_idltype (entry_key + TAO_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr<TAO_IDLType_i> safety (impl); - CORBA::DefinitionKind def_kind = impl->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind def_kind = impl->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; switch (def_kind) @@ -95,7 +95,7 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) case CORBA::dk_Fixed: case CORBA::dk_Array: case CORBA::dk_Sequence: - impl->destroy_i (ACE_TRY_ENV); + impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; break; default: @@ -145,13 +145,13 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) defn_key); TAO_Contained_i *impl = - this->repo_->servant_factory ()->create_contained (defn_key, - ACE_TRY_ENV); + this->repo_->servant_factory ()->create_contained (defn_key + TAO_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr<TAO_Contained_i> safety (impl); - impl->destroy_i (ACE_TRY_ENV); + impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -162,19 +162,19 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) } CORBA_Contained_ptr -TAO_Container_i::lookup (const char *search_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Container_i::lookup (const char *search_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->lookup_i (search_name, - ACE_TRY_ENV); + return this->lookup_i (search_name + TAO_ENV_ARG_PARAMETER); } CORBA_Contained_ptr -TAO_Container_i::lookup_i (const char *search_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Container_i::lookup_i (const char *search_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key iter_key; @@ -377,31 +377,31 @@ TAO_Container_i::lookup_i (const char *search_name, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Contained::_nil ()); - return CORBA_Contained::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_Contained::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * TAO_Container_i::contents (CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean exclude_inherited + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->contents_i (limit_type, - exclude_inherited, - ACE_TRY_ENV); + exclude_inherited + TAO_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean exclude_inherited + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (limit_type == CORBA::dk_none) @@ -467,7 +467,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, // Base interfaces - CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (def_kind == CORBA::dk_Interface) @@ -482,8 +482,8 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, iface.interface_contents (kind_queue, path_queue, limit_type, - exclude_inherited, - ACE_TRY_ENV); + exclude_inherited + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -510,13 +510,13 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (next_kind, - next_path.c_str (), - ACE_TRY_ENV); + next_path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_Contained_var next_cont = - CORBA_Contained::_narrow (obj.in (), - ACE_TRY_ENV); + CORBA_Contained::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[j] = next_cont._retn (); @@ -529,8 +529,8 @@ CORBA_ContainedSeq * TAO_Container_i::lookup_name (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean exclude_inherited + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -538,16 +538,16 @@ TAO_Container_i::lookup_name (const char *search_name, return this->lookup_name_i (search_name, levels_to_search, limit_type, - exclude_inherited, - ACE_TRY_ENV); + exclude_inherited + TAO_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean exclude_inherited + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; @@ -558,8 +558,8 @@ TAO_Container_i::lookup_name_i (const char *search_name, search_name, levels_to_search, limit_type, - exclude_inherited, - ACE_TRY_ENV); + exclude_inherited + TAO_ENV_ARG_PARAMETER); size_t size = kind_queue.size (); @@ -582,13 +582,13 @@ TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (next_kind, - next_path.c_str (), - ACE_TRY_ENV); + next_path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_Contained_var next_cont = - CORBA_Contained::_narrow (obj.in (), - ACE_TRY_ENV); + CORBA_Contained::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = next_cont._retn (); @@ -600,28 +600,28 @@ TAO_Container_i::lookup_name_i (const char *search_name, CORBA_Container::DescriptionSeq * TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, - CORBA::Long max_returned_objs, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Long max_returned_objs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->describe_contents_i (limit_type, exclude_inherited, - max_returned_objs, - ACE_TRY_ENV); + max_returned_objs + TAO_ENV_ARG_PARAMETER); } CORBA_Container::DescriptionSeq * TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, - CORBA::Long max_returned_objs, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Long max_returned_objs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_ContainedSeq_var contents = this->contents_i (limit_type, - exclude_inherited, - ACE_TRY_ENV); + exclude_inherited + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = contents->length (); @@ -653,8 +653,8 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, for (CORBA::ULong i = 0; i < ret_len; i++) { - oid = this->repo_->ir_poa ()->reference_to_id (contents[i], - ACE_TRY_ENV); + oid = this->repo_->ir_poa ()->reference_to_id (contents[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); contained_path = @@ -665,14 +665,14 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, contained_key, 0); - impl = - this->repo_->servant_factory ()->create_contained (contained_key, - ACE_TRY_ENV); + impl = + this->repo_->servant_factory ()->create_contained (contained_key + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr<TAO_Contained_i> safety (impl); - desc = impl->describe_i (ACE_TRY_ENV); + desc = impl->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i].contained_object = @@ -689,35 +689,35 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, CORBA_ModuleDef_ptr TAO_Container_i::create_module (const char *id, const char *name, - const char *version, - CORBA::Environment &ACE_TRY_ENV) + const char *version + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ModuleDef::_nil ()); return this->create_module_i (id, name, - version, - ACE_TRY_ENV); + version + TAO_ENV_ARG_PARAMETER); } CORBA_ModuleDef_ptr TAO_Container_i::create_module_i (const char *id, const char *name, - const char *version, - CORBA::Environment &ACE_TRY_ENV) + const char *version + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); if (!legal_op) return CORBA_ModuleDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); if (bad_params) @@ -751,12 +751,12 @@ TAO_Container_i::create_module_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Module, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); - return CORBA_ModuleDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_ModuleDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_ConstantDef_ptr @@ -764,8 +764,8 @@ TAO_Container_i::create_constant (const char *id, const char *name, const char *version, CORBA_IDLType_ptr type, - const CORBA::Any &value, - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any &value + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ConstantDef::_nil ()); @@ -774,8 +774,8 @@ TAO_Container_i::create_constant (const char *id, name, version, type, - value, - ACE_TRY_ENV); + value + TAO_ENV_ARG_PARAMETER); } CORBA_ConstantDef_ptr @@ -783,20 +783,20 @@ TAO_Container_i::create_constant_i (const char *id, const char *name, const char *version, CORBA_IDLType_ptr type, - const CORBA::Any &value, - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any &value + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); if (!legal_op) return CORBA_ConstantDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); if (bad_params) @@ -822,8 +822,8 @@ TAO_Container_i::create_constant_i (const char *id, // Get the path to our type and store it. PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (type, - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); CORBA::String_var type_path = @@ -838,7 +838,7 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::TypeCode_var val_tc = value.type (); - CORBA::TCKind kind = val_tc->kind (ACE_TRY_ENV); + CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); switch (kind) @@ -868,20 +868,20 @@ TAO_Container_i::create_constant_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Constant, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); - return CORBA_ConstantDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_ConstantDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_StructDef_ptr TAO_Container_i::create_struct (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_StructDef::_nil ()); @@ -889,28 +889,28 @@ TAO_Container_i::create_struct (const char *id, return this->create_struct_i (id, name, version, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA_StructDef_ptr TAO_Container_i::create_struct_i (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (!legal_op) return CORBA_StructDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (bad_params) @@ -962,8 +962,8 @@ TAO_Container_i::create_struct_i (const char *id, members[i].name.in ()); PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (), - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); CORBA::String_var member_path = @@ -974,7 +974,7 @@ TAO_Container_i::create_struct_i (const char *id, member_path.in ()); } - CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -988,12 +988,12 @@ TAO_Container_i::create_struct_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Struct, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); - return CORBA_StructDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_StructDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_UnionDef_ptr @@ -1001,8 +1001,8 @@ TAO_Container_i::create_union (const char *id, const char *name, const char *version, CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_UnionMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_UnionDef::_nil ()); @@ -1011,8 +1011,8 @@ TAO_Container_i::create_union (const char *id, name, version, discriminator_type, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA_UnionDef_ptr @@ -1020,20 +1020,20 @@ TAO_Container_i::create_union_i (const char *id, const char *name, const char *version, CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_UnionMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (!legal_op) return CORBA_UnionDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (bad_params) @@ -1058,8 +1058,8 @@ TAO_Container_i::create_union_i (const char *id, // Add a field to hold the path to the discriminator type. PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (discriminator_type, - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (discriminator_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); CORBA::String_var disc_path = @@ -1098,8 +1098,8 @@ TAO_Container_i::create_union_i (const char *id, members[i].name.in ()); PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (), - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); CORBA::String_var member_path = @@ -1110,11 +1110,11 @@ TAO_Container_i::create_union_i (const char *id, member_path.in ()); this->store_label (member_key, - members[i].label, - ACE_TRY_ENV); + members[i].label + TAO_ENV_ARG_PARAMETER); } - CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -1128,20 +1128,20 @@ TAO_Container_i::create_union_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Union, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); - return CORBA_UnionDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_UnionDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_EnumDef_ptr TAO_Container_i::create_enum (const char *id, const char *name, const char *version, - const CORBA_EnumMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_EnumMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_EnumDef::_nil ()); @@ -1149,28 +1149,28 @@ TAO_Container_i::create_enum (const char *id, return this->create_enum_i (id, name, version, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA_EnumDef_ptr TAO_Container_i::create_enum_i (const char *id, const char *name, const char *version, - const CORBA_EnumMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_EnumMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (!legal_op) return CORBA_EnumDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (bad_params) @@ -1215,7 +1215,7 @@ TAO_Container_i::create_enum_i (const char *id, members[i].in ()); } - CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -1229,20 +1229,20 @@ TAO_Container_i::create_enum_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Enum, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); - return CORBA_EnumDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_EnumDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_AliasDef_ptr TAO_Container_i::create_alias (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type, - CORBA::Environment &ACE_TRY_ENV) + CORBA_IDLType_ptr original_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_AliasDef::_nil ()); @@ -1250,28 +1250,28 @@ TAO_Container_i::create_alias (const char *id, return this->create_alias_i (id, name, version, - original_type, - ACE_TRY_ENV); + original_type + TAO_ENV_ARG_PARAMETER); } CORBA_AliasDef_ptr TAO_Container_i::create_alias_i (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type, - CORBA::Environment &ACE_TRY_ENV) + CORBA_IDLType_ptr original_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); if (!legal_op) return CORBA_AliasDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); if (bad_params) @@ -1296,8 +1296,8 @@ TAO_Container_i::create_alias_i (const char *id, // Get the path to our original type and store it. PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (original_type, - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (original_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); CORBA::String_var unalias_path = @@ -1310,20 +1310,20 @@ TAO_Container_i::create_alias_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Alias, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); - return CORBA_AliasDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_AliasDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_InterfaceDef_ptr TAO_Container_i::create_interface (const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_InterfaceDefSeq &base_interfaces + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); @@ -1331,28 +1331,28 @@ TAO_Container_i::create_interface (const char *id, return this->create_interface_i (id, name, version, - base_interfaces, - ACE_TRY_ENV); + base_interfaces + TAO_ENV_ARG_PARAMETER); } CORBA_InterfaceDef_ptr TAO_Container_i::create_interface_i (const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_InterfaceDefSeq &base_interfaces + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (!legal_op) return CORBA_InterfaceDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (bad_params) @@ -1391,8 +1391,8 @@ TAO_Container_i::create_interface_i (const char *id, for (CORBA::ULong i = 0; i < length; i++) { PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (base_interfaces[i], - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1409,12 +1409,12 @@ TAO_Container_i::create_interface_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Interface, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); - return CORBA_InterfaceDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_InterfaceDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr @@ -1427,8 +1427,8 @@ TAO_Container_i::create_value (const char *id, CORBA::Boolean is_truncatable, const CORBA_ValueDefSeq &abstract_base_values, const CORBA_InterfaceDefSeq &supported_interfaces, - const CORBA_InitializerSeq &initializers, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_InitializerSeq &initializers + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueDef::_nil ()); @@ -1442,8 +1442,8 @@ TAO_Container_i::create_value (const char *id, is_truncatable, abstract_base_values, supported_interfaces, - initializers, - ACE_TRY_ENV); + initializers + TAO_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr @@ -1456,8 +1456,8 @@ TAO_Container_i::create_value_i (const char * /* id */, CORBA::Boolean /* is_truncatable */, const CORBA_ValueDefSeq & /* abstract_base_values */, const CORBA_InterfaceDefSeq & /* supported_interfaces */, - const CORBA_InitializerSeq & /* initializers */, - CORBA::Environment & /* ACE_TRY_ENV */) + const CORBA_InitializerSeq & /* initializers */ + TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -1468,8 +1468,8 @@ CORBA_ValueBoxDef_ptr TAO_Container_i::create_value_box (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV) + CORBA_IDLType_ptr original_type_def + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueBoxDef::_nil ()); @@ -1477,28 +1477,28 @@ TAO_Container_i::create_value_box (const char *id, return this->create_value_box_i (id, name, version, - original_type_def, - ACE_TRY_ENV); + original_type_def + TAO_ENV_ARG_PARAMETER); } CORBA_ValueBoxDef_ptr TAO_Container_i::create_value_box_i (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV ) + CORBA_IDLType_ptr original_type_def + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (!legal_op) return CORBA_ValueBoxDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (bad_params) @@ -1523,8 +1523,8 @@ TAO_Container_i::create_value_box_i (const char *id, // Get the path to our original type and store it. PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (original_type_def, - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (original_type_def + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); CORBA::String_var boxed_path = @@ -1537,20 +1537,20 @@ TAO_Container_i::create_value_box_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_ValueBox, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); - return CORBA_ValueBoxDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_ValueBoxDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_ExceptionDef_ptr TAO_Container_i::create_exception (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ExceptionDef::_nil ()); @@ -1558,28 +1558,28 @@ TAO_Container_i::create_exception (const char *id, return this->create_exception_i (id, name, version, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA_ExceptionDef_ptr TAO_Container_i::create_exception_i (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); if (!legal_op) return CORBA_ExceptionDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); if (bad_params) @@ -1629,8 +1629,8 @@ TAO_Container_i::create_exception_i (const char *id, members[i].name.in ()); PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (), - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); CORBA::String_var member_path = @@ -1644,46 +1644,46 @@ TAO_Container_i::create_exception_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); - return CORBA_ExceptionDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_ExceptionDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_NativeDef_ptr TAO_Container_i::create_native (const char *id, const char *name, - const char *version, - CORBA::Environment &ACE_TRY_ENV) + const char *version + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_NativeDef::_nil ()); return this->create_native_i (id, name, - version, - ACE_TRY_ENV); + version + TAO_ENV_ARG_PARAMETER); } CORBA_NativeDef_ptr TAO_Container_i::create_native_i (const char *id, const char *name, - const char *version, - CORBA::Environment &ACE_TRY_ENV) + const char *version + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); if (!legal_op) return CORBA_NativeDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); if (bad_params) @@ -1709,12 +1709,12 @@ TAO_Container_i::create_native_i (const char *id, // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Native, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); - return CORBA_NativeDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_NativeDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_AbstractInterfaceDef_ptr @@ -1722,8 +1722,8 @@ TAO_Container_i::create_abstract_interface ( const char *id, const char *name, const char *version, - const CORBA_AbstractInterfaceDefSeq &base_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_AbstractInterfaceDefSeq &base_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1732,8 +1732,8 @@ TAO_Container_i::create_abstract_interface ( return this->create_abstract_interface_i (id, name, version, - base_interfaces, - ACE_TRY_ENV); + base_interfaces + TAO_ENV_ARG_PARAMETER); } CORBA_AbstractInterfaceDef_ptr @@ -1741,14 +1741,14 @@ TAO_Container_i::create_abstract_interface_i ( const char *id, const char *name, const char *version, - const CORBA_AbstractInterfaceDefSeq &base_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_AbstractInterfaceDefSeq &base_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container ( - CORBA::dk_AbstractInterface, - ACE_TRY_ENV + CORBA::dk_AbstractInterface + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); @@ -1756,8 +1756,8 @@ TAO_Container_i::create_abstract_interface_i ( return CORBA_AbstractInterfaceDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); if (bad_params) @@ -1796,8 +1796,8 @@ TAO_Container_i::create_abstract_interface_i ( for (CORBA::ULong i = 0; i < length; i++) { PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (base_interfaces[i], - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1814,12 +1814,12 @@ TAO_Container_i::create_abstract_interface_i ( // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_AbstractInterface, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); - return CORBA_AbstractInterfaceDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_AbstractInterfaceDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA_LocalInterfaceDef_ptr @@ -1827,8 +1827,8 @@ TAO_Container_i::create_local_interface ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InterfaceDefSeq &base_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1837,8 +1837,8 @@ TAO_Container_i::create_local_interface ( return this->create_local_interface_i (id, name, version, - base_interfaces, - ACE_TRY_ENV); + base_interfaces + TAO_ENV_ARG_PARAMETER); } CORBA_LocalInterfaceDef_ptr @@ -1846,21 +1846,21 @@ TAO_Container_i::create_local_interface_i ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InterfaceDefSeq &base_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface, - ACE_TRY_ENV); + CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); if (!legal_op) return CORBA_LocalInterfaceDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); if (bad_params) @@ -1899,8 +1899,8 @@ TAO_Container_i::create_local_interface_i ( for (CORBA::ULong i = 0; i < length; i++) { PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (base_interfaces[i], - ACE_TRY_ENV); + this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1917,17 +1917,17 @@ TAO_Container_i::create_local_interface_i ( // Create the object reference. CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_LocalInterface, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); - return CORBA_LocalInterfaceDef::_narrow (obj.in (), - ACE_TRY_ENV); + return CORBA_LocalInterfaceDef::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Container_i::name_exists (const char *name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Container_i::name_exists (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int index = 0; @@ -2003,7 +2003,7 @@ TAO_Container_i::name_exists (const char *name, } // If we are an interface, check the inherited members. - CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (def_kind == CORBA::dk_Interface) @@ -2059,8 +2059,8 @@ TAO_Container_i::lookup_name_recursive ( const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean exclude_inherited + TAO_ENV_ARG_DECL ) { ACE_Configuration_Section_Key defns_key; @@ -2124,8 +2124,8 @@ TAO_Container_i::lookup_name_recursive ( { TAO_Container_i *impl = this->repo_->servant_factory ()->create_container ( - defn_key, - ACE_TRY_ENV + defn_key + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -2142,14 +2142,14 @@ TAO_Container_i::lookup_name_recursive ( ? -1 : levels_to_search - 1, limit_type, - exclude_inherited, - ACE_TRY_ENV); + exclude_inherited + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } } - CORBA::DefinitionKind kind = this->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value) @@ -2377,8 +2377,8 @@ TAO_Container_i::lookup_op ( } CORBA::Boolean -TAO_Container_i::id_exists (const char *id, - CORBA::Environment &ACE_TRY_ENV) +TAO_Container_i::id_exists (const char *id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The repo id must not already exist. @@ -2399,17 +2399,17 @@ TAO_Container_i::id_exists (const char *id, CORBA::Boolean TAO_Container_i::pre_exist (const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV) + const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean exist = this->id_exists (id, ACE_TRY_ENV); + CORBA::Boolean exist = this->id_exists (id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (exist) return 1; - return name_exists (name, ACE_TRY_ENV); + return name_exists (name TAO_ENV_ARG_PARAMETER); } ACE_TString @@ -2515,11 +2515,11 @@ TAO_Container_i::create_common ( } CORBA::Boolean -TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind, - CORBA::Environment &ACE_TRY_ENV) +TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::DefinitionKind my_kind = this->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind my_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int error_flag = 0; @@ -2578,13 +2578,13 @@ TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind, void TAO_Container_i::store_label (ACE_Configuration_Section_Key key, - const CORBA::Any &value, - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any &value + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var tc = value.type (); - CORBA::TCKind kind = tc->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_InputCDR cdr (value._tao_get_cdr (), |