diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp | 189 |
1 files changed, 60 insertions, 129 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index eb42f8bb52b..a521c6767df 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -83,26 +83,25 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void) } CORBA::DefinitionKind -TAO_ComponentDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ComponentDef_i::def_kind (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Component; } void -TAO_ComponentDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_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_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::destroy_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our special subsections first, then call destroy_i @@ -112,59 +111,48 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) "provides", this->repo_, this->section_key_ - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; TAO_IFR_Generic_Utils<TAO_UsesDef_i>::destroy_special ( "uses", this->repo_, this->section_key_ - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; TAO_IFR_Generic_Utils<TAO_EmitsDef_i>::destroy_special ( "emits", this->repo_, this->section_key_ - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; TAO_IFR_Generic_Utils<TAO_PublishesDef_i>::destroy_special ( "publishes", this->repo_, this->section_key_ - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>::destroy_special ( "consumes", this->repo_, this->section_key_ - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; - this->TAO_ExtInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); + this->TAO_ExtInterfaceDef_i::destroy_i (); } CORBA::Contained::Description * -TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::describe (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->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (); } CORBA::Contained::Description * -TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::describe_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ComponentIR::ComponentDescription cd; @@ -173,9 +161,7 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) cd, this->repo_, this->section_key_ - ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (0); ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -273,19 +259,15 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) TAO_ExtAttributeDef_i impl (this->repo_); impl.section_key (attr_key); - impl.fill_description (cd.attributes[i] - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + impl.fill_description (cd.attributes[i]); } - cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + cd.type = this->type_i (); CORBA::Contained::Description *cont_desc_ptr = 0; ACE_NEW_THROW_EX (cont_desc_ptr, CORBA::Contained::Description, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); CORBA::Contained::Description_var retval = cont_desc_ptr; cont_desc_ptr->kind = CORBA::dk_Component; @@ -295,19 +277,18 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_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_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::type_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -323,24 +304,22 @@ TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) return this->repo_->tc_factory ()->create_component_tc ( id.c_str (), name.c_str () - ACE_ENV_ARG_PARAMETER ); } CORBA::InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::supported_interfaces (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->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->supported_interfaces_i (); } CORBA::InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::supported_interfaces_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::InterfaceDefSeq *seq = 0; @@ -376,13 +355,9 @@ TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) path); tmp = TAO_IFR_Service_Utils::path_to_ir_object (path, - this->repo_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->repo_); - retval[i] = CORBA::InterfaceDef::_narrow (tmp.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + retval[i] = CORBA::InterfaceDef::_narrow (tmp.in ()); } } @@ -392,23 +367,19 @@ TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) void TAO_ComponentDef_i::supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces - 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->supported_interfaces_i (supported_interfaces - ACE_ENV_ARG_PARAMETER); + this->supported_interfaces_i (supported_interfaces); } void TAO_ComponentDef_i::supported_interfaces_i ( const CORBA::InterfaceDefSeq &supported_interfaces - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -445,9 +416,7 @@ TAO_ComponentDef_i::supported_interfaces_i ( TAO_IFR_Service_Utils::name_exists (&TAO_InterfaceDef_i::name_clash, this->section_key_, this->repo_, - this->def_kind () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->def_kind ()); char *stringified = TAO_IFR_Service_Utils::int_to_string (i); this->repo_->config ()->set_string_value (supported_key, @@ -457,19 +426,18 @@ TAO_ComponentDef_i::supported_interfaces_i ( } CORBA::ComponentIR::ComponentDef_ptr -TAO_ComponentDef_i::base_component (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::base_component (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); + this->update_key (); - return this->base_component_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->base_component_i (); } CORBA::ComponentIR::ComponentDef_ptr -TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::base_component_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString base_id; @@ -483,34 +451,27 @@ TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL) return CORBA::ComponentIR::ComponentDef::_nil (); } - CORBA::Contained_var obj = this->repo_->lookup_id (base_id.fast_rep () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); + CORBA::Contained_var obj = this->repo_->lookup_id (base_id.fast_rep ()); - return CORBA::ComponentIR::ComponentDef::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()); } void TAO_ComponentDef_i::base_component ( CORBA::ComponentIR::ComponentDef_ptr base_component - 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->base_component_i (base_component - ACE_ENV_ARG_PARAMETER); + this->base_component_i (base_component); } void TAO_ComponentDef_i::base_component_i ( CORBA::ComponentIR::ComponentDef_ptr base_component - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -536,9 +497,7 @@ TAO_ComponentDef_i::base_component_i ( TAO_IFR_Service_Utils::name_exists (&TAO_ComponentDef_i::name_clash, this->section_key_, this->repo_, - CORBA::dk_Component - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + CORBA::dk_Component); this->repo_->config ()->set_string_value ( this->section_key_, @@ -553,20 +512,17 @@ TAO_ComponentDef_i::create_provides ( const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ()); + this->update_key (); return this->create_provides_i (id, name, version, - interface_type - ACE_ENV_ARG_PARAMETER); + interface_type); } CORBA::ComponentIR::ProvidesDef_ptr @@ -575,7 +531,6 @@ TAO_ComponentDef_i::create_provides_i ( const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -590,8 +545,7 @@ TAO_ComponentDef_i::create_provides_i ( 0, this->repo_, CORBA::dk_Provides, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + this->section_key_); } CORBA::ComponentIR::UsesDef_ptr @@ -599,21 +553,18 @@ TAO_ComponentDef_i::create_uses (const char *id, const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type, - CORBA::Boolean is_multiple - ACE_ENV_ARG_DECL) + CORBA::Boolean is_multiple) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::UsesDef::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ComponentIR::UsesDef::_nil ()); + this->update_key (); return this->create_uses_i (id, name, version, interface_type, - is_multiple - ACE_ENV_ARG_PARAMETER); + is_multiple); } CORBA::ComponentIR::UsesDef_ptr @@ -621,8 +572,7 @@ TAO_ComponentDef_i::create_uses_i (const char *id, const char *name, const char *version, CORBA::InterfaceDef_ptr interface_type, - CORBA::Boolean is_multiple - ACE_ENV_ARG_DECL) + CORBA::Boolean is_multiple) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -636,36 +586,31 @@ TAO_ComponentDef_i::create_uses_i (const char *id, is_multiple, this->repo_, CORBA::dk_Uses, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + this->section_key_); } CORBA::ComponentIR::EmitsDef_ptr TAO_ComponentDef_i::create_emits (const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ACE_ENV_ARG_DECL) + CORBA::ValueDef_ptr value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EmitsDef::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ComponentIR::EmitsDef::_nil ()); + this->update_key (); return this->create_emits_i (id, name, version, - value - ACE_ENV_ARG_PARAMETER); + value); } CORBA::ComponentIR::EmitsDef_ptr TAO_ComponentDef_i::create_emits_i (const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ACE_ENV_ARG_DECL) + CORBA::ValueDef_ptr value) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -679,36 +624,31 @@ TAO_ComponentDef_i::create_emits_i (const char *id, 0, this->repo_, CORBA::dk_Emits, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + this->section_key_); } CORBA::ComponentIR::PublishesDef_ptr TAO_ComponentDef_i::create_publishes (const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ACE_ENV_ARG_DECL) + CORBA::ValueDef_ptr value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::PublishesDef::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ComponentIR::PublishesDef::_nil ()); + this->update_key (); return this->create_publishes_i (id, name, version, - value - ACE_ENV_ARG_PARAMETER); + value); } CORBA::ComponentIR::PublishesDef_ptr TAO_ComponentDef_i::create_publishes_i (const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ACE_ENV_ARG_DECL) + CORBA::ValueDef_ptr value) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -722,36 +662,31 @@ TAO_ComponentDef_i::create_publishes_i (const char *id, 0, this->repo_, CORBA::dk_Publishes, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + this->section_key_); } CORBA::ComponentIR::ConsumesDef_ptr TAO_ComponentDef_i::create_consumes (const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ACE_ENV_ARG_DECL) + CORBA::ValueDef_ptr value) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ()); + this->update_key (); return this->create_consumes_i (id, name, version, - value - ACE_ENV_ARG_PARAMETER); + value); } CORBA::ComponentIR::ConsumesDef_ptr TAO_ComponentDef_i::create_consumes_i (const char *id, const char *name, const char *version, - CORBA::ValueDef_ptr value - ACE_ENV_ARG_DECL) + CORBA::ValueDef_ptr value) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -765,28 +700,24 @@ TAO_ComponentDef_i::create_consumes_i (const char *id, 0, this->repo_, CORBA::dk_Consumes, - this->section_key_ - ACE_ENV_ARG_PARAMETER); + this->section_key_); } int TAO_ComponentDef_i::name_clash (const char *name) { - ACE_TRY_NEW_ENV + try { TAO_Container_i::tmp_name_holder_ = name; TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name, TAO_IFR_Service_Utils::tmp_key_, TAO_IFR_Service_Utils::repo_, - CORBA::dk_Component - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::dk_Component); } - ACE_CATCHANY + catch (const CORBA::Exception&) { return 1; } - ACE_ENDTRY; return 0; } |