diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/HomeDef_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/HomeDef_i.cpp | 92 |
1 files changed, 48 insertions, 44 deletions
diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp index 6f76461af09..e10c8cc69da 100644 --- a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp @@ -20,11 +20,11 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void) { } -IR_DefinitionKind +CORBA::DefinitionKind TAO_HomeDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return dk_Home; + return CORBA::dk_Home; } void @@ -43,7 +43,7 @@ TAO_HomeDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR_Contained::Description * +CORBA_Contained::Description * TAO_HomeDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,7 +52,7 @@ TAO_HomeDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR_Contained::Description * +CORBA_Contained::Description * TAO_HomeDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -77,16 +77,16 @@ TAO_HomeDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR_HomeDef_ptr +IR::HomeDef_ptr TAO_HomeDef_i::base_home (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR_HomeDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR::HomeDef::_nil ()); return this->base_home_i (ACE_TRY_ENV); } -IR_HomeDef_ptr +IR::HomeDef_ptr TAO_HomeDef_i::base_home_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -94,16 +94,16 @@ TAO_HomeDef_i::base_home_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR_ComponentDef_ptr +IR::ComponentDef_ptr TAO_HomeDef_i::managed_component (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR_ComponentDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ()); return this->managed_component_i (ACE_TRY_ENV); } -IR_ComponentDef_ptr +IR::ComponentDef_ptr TAO_HomeDef_i::managed_component_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -111,16 +111,16 @@ TAO_HomeDef_i::managed_component_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR_PrimaryKeyDef_ptr +IR::PrimaryKeyDef_ptr TAO_HomeDef_i::primary_key (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR_PrimaryKeyDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); return this->primary_key_i (ACE_TRY_ENV); } -IR_PrimaryKeyDef_ptr +IR::PrimaryKeyDef_ptr TAO_HomeDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -128,7 +128,7 @@ TAO_HomeDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR_FactoryDefSeq * +IR::FactoryDefSeq * TAO_HomeDef_i::factories (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -137,7 +137,7 @@ TAO_HomeDef_i::factories (CORBA::Environment &ACE_TRY_ENV) return this->factories_i (ACE_TRY_ENV); } -IR_FactoryDefSeq * +IR::FactoryDefSeq * TAO_HomeDef_i::factories_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -145,7 +145,7 @@ TAO_HomeDef_i::factories_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR_FinderDefSeq * +IR::FinderDefSeq * TAO_HomeDef_i::finders (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -154,7 +154,7 @@ TAO_HomeDef_i::finders (CORBA::Environment &ACE_TRY_ENV) return this->finders_i (ACE_TRY_ENV); } -IR_FinderDefSeq * +IR::FinderDefSeq * TAO_HomeDef_i::finders_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -179,15 +179,15 @@ TAO_HomeDef_i::is_basic_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR_PrimaryKeyDef_ptr +IR::PrimaryKeyDef_ptr TAO_HomeDef_i::create_primary_key (const char *id, const char *name, const char *version, - IR_ValueDef_ptr primary_key, + CORBA_ValueDef_ptr primary_key, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR_PrimaryKeyDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); return this->create_primary_key_i (id, name, @@ -196,11 +196,11 @@ TAO_HomeDef_i::create_primary_key (const char *id, ACE_TRY_ENV); } -IR_PrimaryKeyDef_ptr +IR::PrimaryKeyDef_ptr TAO_HomeDef_i::create_primary_key_i (const char * /* id */, const char * /* name */, const char * /* version */, - IR_ValueDef_ptr /* primary_key */, + CORBA_ValueDef_ptr /* primary_key */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -208,16 +208,16 @@ TAO_HomeDef_i::create_primary_key_i (const char * /* id */, return 0; } -IR_FactoryDef_ptr +IR::FactoryDef_ptr TAO_HomeDef_i::create_factory (const char *id, const char *name, const char *version, - const IR_ParDescriptionSeq ¶ms, - const IR_ExceptionDefSeq &exceptions, + const CORBA_ParDescriptionSeq ¶ms, + const CORBA_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR_FactoryDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (I:FactoryDef::_nil ()); return this->create_factory_i (id, name, @@ -227,29 +227,31 @@ TAO_HomeDef_i::create_factory (const char *id, ACE_TRY_ENV); } -IR_FactoryDef_ptr -TAO_HomeDef_i::create_factory_i (const char * /* id */, - const char * /* name */, - const char * /* version */, - const IR_ParDescriptionSeq & /* params */, - const IR_ExceptionDefSeq & /* exceptions */, - CORBA::Environment & /* ACE_TRY_ENV */) +IR::FactoryDef_ptr +TAO_HomeDef_i::create_factory_i ( + const char * /* id */, + const char * /* name */, + const char * /* version */, + const CORBA_ParDescriptionSeq & /* params */, + const CORBA_ExceptionDefSeq & /* exceptions */, + CORBA::Environment & /* ACE_TRY_ENV */ + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -IR_FinderDef_ptr +IR::FinderDef_ptr TAO_HomeDef_i::create_finder (const char *id, const char *name, const char *version, - const IR_ParDescriptionSeq ¶ms, - const IR_ExceptionDefSeq &exceptions, + const CORBA_ParDescriptionSeq ¶ms, + const CORBA_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR_FinderDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR::FinderDef::_nil ()); return this->create_finder_i (id, name, @@ -259,13 +261,15 @@ TAO_HomeDef_i::create_finder (const char *id, ACE_TRY_ENV); } -IR_FinderDef_ptr -TAO_HomeDef_i::create_finder_i (const char * /* id */, - const char * /* name */, - const char * /* version */, - const IR_ParDescriptionSeq & /* params */, - const IR_ExceptionDefSeq & /* exceptions */, - CORBA::Environment & /* ACE_TRY_ENV */) +IR::FinderDef_ptr +TAO_HomeDef_i::create_finder_i ( + const char * /* id */, + const char * /* name */, + const char * /* version */, + const CORBA_ParDescriptionSeq & /* params */, + const CORBA_ExceptionDefSeq & /* exceptions */, + CORBA::Environment & /* ACE_TRY_ENV */ + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO |