diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp | 124 |
1 files changed, 45 insertions, 79 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index efc0446c718..2d1de15f315 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -32,51 +32,47 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void) } CORBA::DefinitionKind -TAO_UnionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UnionDef_i::def_kind (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Union; } void -TAO_UnionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->update_key (); - this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (); } void -TAO_UnionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::destroy_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO_Container_i::destroy_i (); // Destroy ourself. - TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO_Contained_i::destroy_i (); } CORBA::TypeCode_ptr -TAO_UnionDef_i::type (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + this->update_key (); - return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (); } CORBA::TypeCode_ptr -TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::type_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -93,7 +89,7 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) if (TAO_RecursiveDef_OuterScopes::SeenBefore( id )) return this->repo_->tc_factory ()-> - create_recursive_tc ( id.c_str () ACE_ENV_ARG_PARAMETER); + create_recursive_tc ( id.c_str ()); TAO_RecursiveDef_OuterScopes NowSeenThis( id ); @@ -108,33 +104,29 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) "name", name); - CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + CORBA::TypeCode_var tc = this->discriminator_type_i (); - CORBA::UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + CORBA::UnionMemberSeq_var members = this->members_i (); return this->repo_->tc_factory ()->create_union_tc (id.c_str (), name.c_str (), tc.in (), - members.in () - ACE_ENV_ARG_PARAMETER); + members.in ()); } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + this->update_key (); - return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_i (); } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; @@ -150,23 +142,22 @@ TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () ); } - return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (); } CORBA::IDLType_ptr -TAO_UnionDef_i::discriminator_type_def (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_def (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); + this->update_key (); - return this->discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_def_i (); } CORBA::IDLType_ptr -TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_def_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; @@ -176,34 +167,27 @@ TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = TAO_IFR_Service_Utils::path_to_ir_object (disc_path, - this->repo_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); + this->repo_); - return CORBA::IDLType::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + return CORBA::IDLType::_narrow (obj.in ()); } void TAO_UnionDef_i::discriminator_type_def ( CORBA::IDLType_ptr discriminator_type_def - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->update_key (); - this->discriminator_type_def_i (discriminator_type_def - ACE_ENV_ARG_PARAMETER); + this->discriminator_type_def_i (discriminator_type_def); } void TAO_UnionDef_i::discriminator_type_def_i ( CORBA::IDLType_ptr discriminator_type_def - ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -216,19 +200,18 @@ TAO_UnionDef_i::discriminator_type_def_i ( } CORBA::UnionMemberSeq * -TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::members (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->update_key (); - return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (); } CORBA::UnionMemberSeq * -TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::members_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; @@ -279,7 +262,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (members, CORBA::UnionMemberSeq (size), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); members->length (size); CORBA::UnionMemberSeq_var retval = members; @@ -303,22 +285,16 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) retval[k].name = name.c_str (); this->fetch_label (next_key, - retval[k] - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + retval[k]); this->repo_->config ()->get_string_value (next_key, "path", path); obj = TAO_IFR_Service_Utils::path_to_ir_object (path, - this->repo_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->repo_); - retval[k].type_def = CORBA::IDLType::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()); impl = TAO_IFR_Service_Utils::path_to_idltype (path, this->repo_); @@ -327,8 +303,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), 0 ); } - retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + retval[k].type = impl->type_i (); // If this union contains a nested union (of another type) at // some level, the above code will have changed the section key @@ -340,27 +315,22 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL) +TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->update_key (); - this->members_i (members - ACE_ENV_ARG_PARAMETER); + this->members_i (members); } void -TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members - ACE_ENV_ARG_DECL) +TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO_Container_i::destroy_i (); ACE_TString section_name; ACE_Configuration_Section_Key refs_key; @@ -400,15 +370,13 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members member_path); this->store_label (member_key, - members[i].label - ACE_ENV_ARG_PARAMETER); + members[i].label); } } void TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, - CORBA::UnionMember &member - ACE_ENV_ARG_DECL) + CORBA::UnionMember &member) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration::VALUETYPE vt; @@ -429,11 +397,9 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, value); CORBA::TypeCode_var tc = - this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->discriminator_type_i (); - CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::TCKind kind = tc->kind (); switch (kind) { |