diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-01 22:31:40 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-01 22:31:40 +0000 |
| commit | 0b56b5a113769baf93ee79651d61867854fc7655 (patch) | |
| tree | dc4fb6e25975efbfcad4db6aaf80e6b885a0b7db | |
| parent | 4ddd69efa2537d5af731bbaf1f56169b5303fdd8 (diff) | |
| download | ATCD-0b56b5a113769baf93ee79651d61867854fc7655.tar.gz | |
ChangeLogTag: Fri Dec 1 16:24:51 2000 Jeff Parsons <parsons@cs.wustl.edu>
79 files changed, 1553 insertions, 1553 deletions
diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp index 07b85b3db60..41a44964288 100644 --- a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp @@ -21,11 +21,11 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_AliasDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Alias; + return dk_Alias; } CORBA::TypeCode_ptr @@ -78,16 +78,16 @@ TAO_AliasDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_AliasDef_i::original_type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->original_type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_AliasDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -107,21 +107,21 @@ TAO_AliasDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, original_type.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - return IR::IDLType::_narrow (obj.in (), + return IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); } void -TAO_AliasDef_i::original_type_def (IR::IDLType_ptr original_type_def, +TAO_AliasDef_i::original_type_def (IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -132,7 +132,7 @@ TAO_AliasDef_i::original_type_def (IR::IDLType_ptr original_type_def, } void -TAO_AliasDef_i::original_type_def_i (IR::IDLType_ptr original_type_def, +TAO_AliasDef_i::original_type_def_i (IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.h b/TAO/orbsvcs/IFR_Service/AliasDef_i.h index 876bce60728..d5d3bb0b576 100644 --- a/TAO/orbsvcs/IFR_Service/AliasDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.h @@ -10,7 +10,7 @@ // AliasDef_i.h // // = DESCRIPTION -// IR::AliasDef servant class. +// IR_AliasDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_AliasDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -71,27 +71,27 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::IDLType_ptr original_type_def ( + virtual IR_IDLType_ptr original_type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr original_type_def_i ( + IR_IDLType_ptr original_type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp index d06df49bfcd..9642b1d0a3d 100644 --- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp @@ -19,11 +19,11 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ArrayDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Array; + return dk_Array; } void @@ -156,16 +156,16 @@ TAO_ArrayDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV) return impl->type_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ArrayDef_i::element_type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->element_type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ArrayDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -185,21 +185,21 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - return IR::IDLType::_narrow (obj.in (), + return IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); } void -TAO_ArrayDef_i::element_type_def (IR::IDLType_ptr element_type_def, +TAO_ArrayDef_i::element_type_def (IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -210,7 +210,7 @@ TAO_ArrayDef_i::element_type_def (IR::IDLType_ptr element_type_def, } void -TAO_ArrayDef_i::element_type_def_i (IR::IDLType_ptr element_type_def, +TAO_ArrayDef_i::element_type_def_i (IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -251,19 +251,19 @@ TAO_ArrayDef_i::destroy_element_type ( "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); switch (def_kind) { // These exist only as our elements, so the type should // be destroyed when we are destroyed or our element type // is mutated. - case IR::dk_String: - case IR::dk_Wstring: - case IR::dk_Fixed: - case IR::dk_Array: - case IR::dk_Sequence: + case dk_String: + case dk_Wstring: + case dk_Fixed: + case dk_Array: + case dk_Sequence: { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key, diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h index cf286f337a2..c240f19306f 100644 --- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h @@ -10,7 +10,7 @@ // ArrayDef_i.h // // = DESCRIPTION -// IR::ArrayDef servant class. +// IR_ArrayDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_ArrayDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -119,27 +119,27 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::IDLType_ptr element_type_def ( + virtual IR_IDLType_ptr element_type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr element_type_def_i ( + IR_IDLType_ptr element_type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( - IR::IDLType_ptr element_type_def, + IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( - IR::IDLType_ptr element_type_def, + IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp index 845d83e1e3f..384b661b851 100644 --- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp @@ -23,14 +23,14 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_AttributeDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Attribute; + return dk_Attribute; } -IR::Contained::Description * +IR_Contained::Description * TAO_AttributeDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -39,17 +39,17 @@ TAO_AttributeDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_AttributeDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Contained::Description *desc_ptr = 0; + IR_Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - IR::Contained::Description, + IR_Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::Contained::Description_var retval = desc_ptr; + IR_Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -94,16 +94,16 @@ TAO_AttributeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) return impl->type_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_AttributeDef_i::type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_AttributeDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -123,24 +123,24 @@ TAO_AttributeDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - IR::IDLType_var retval = IR::IDLType::_narrow (obj.in (), + IR_IDLType_var retval = IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); return retval._retn (); } void -TAO_AttributeDef_i::type_def (IR::IDLType_ptr type_def, +TAO_AttributeDef_i::type_def (IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -151,7 +151,7 @@ TAO_AttributeDef_i::type_def (IR::IDLType_ptr type_def, } void -TAO_AttributeDef_i::type_def_i (IR::IDLType_ptr type_def, +TAO_AttributeDef_i::type_def_i (IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -168,16 +168,16 @@ TAO_AttributeDef_i::type_def_i (IR::IDLType_ptr type_def, type_path.in ()); } -IR::AttributeMode +IR_AttributeMode TAO_AttributeDef_i::mode (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::ATTR_NORMAL); + TAO_IFR_READ_GUARD_RETURN (IR_ATTR_NORMAL); return this->mode_i (ACE_TRY_ENV); } -IR::AttributeMode +IR_AttributeMode TAO_AttributeDef_i::mode_i (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -186,11 +186,11 @@ TAO_AttributeDef_i::mode_i (CORBA::Environment &) "mode", mode); - return ACE_static_cast (IR::AttributeMode, mode); + return ACE_static_cast (IR_AttributeMode, mode); } void -TAO_AttributeDef_i::mode (IR::AttributeMode mode, +TAO_AttributeDef_i::mode (IR_AttributeMode mode, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -201,7 +201,7 @@ TAO_AttributeDef_i::mode (IR::AttributeMode mode, } void -TAO_AttributeDef_i::mode_i (IR::AttributeMode mode, +TAO_AttributeDef_i::mode_i (IR_AttributeMode mode, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -210,11 +210,11 @@ TAO_AttributeDef_i::mode_i (IR::AttributeMode mode, mode); } -IR::AttributeDescription +IR_AttributeDescription TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::AttributeDescription ad; + IR_AttributeDescription ad; ad.name = this->name_i (ACE_TRY_ENV); ACE_CHECK_RETURN (ad); @@ -280,7 +280,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV) } } - IR::ExcDescriptionSeq get_ed_seq (index); + IR_ExcDescriptionSeq get_ed_seq (index); get_ed_seq.length (index); for (i = 0; i < (CORBA::ULong) index; ++i) @@ -288,7 +288,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV) ACE_Configuration_Section_Key key; key_queue.dequeue_head (key); - IR::ExceptionDescription get_ed; + IR_ExceptionDescription get_ed; ACE_TString name; this->repo_->config ()->get_string_value (key, @@ -364,7 +364,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV) } } - IR::ExcDescriptionSeq put_ed_seq (index); + IR_ExcDescriptionSeq put_ed_seq (index); put_ed_seq.length (index); for (i = 0; i < (CORBA::ULong) index; ++i) @@ -372,7 +372,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV) ACE_Configuration_Section_Key key; key_queue.dequeue_head (key); - IR::ExceptionDescription put_ed; + IR_ExceptionDescription put_ed; ACE_TString name; this->repo_->config ()->get_string_value (key, @@ -416,7 +416,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV) return ad; } -IR::ExceptionDefSeq * +IR_ExceptionDefSeq * TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -464,15 +464,15 @@ TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV) size_t size = path_queue.size (); - IR::ExceptionDefSeq *get_ed_seq = 0; + IR_ExceptionDefSeq *get_ed_seq = 0; ACE_NEW_THROW_EX (get_ed_seq, - IR::ExceptionDefSeq (size), + IR_ExceptionDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); get_ed_seq->length (size); - IR::ExceptionDefSeq_var retval = get_ed_seq; + IR_ExceptionDefSeq_var retval = get_ed_seq; for (CORBA::ULong i = 0; i < size; ++i) { @@ -480,20 +480,20 @@ TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV) path_queue.dequeue_head (path); CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Exception, + this->repo_->servant_factory ()->create_objref (dk_Exception, path.c_str (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); - retval[i] = IR::ExceptionDef::_narrow (obj.in (), - ACE_TRY_ENV); + retval[i] = IR_ExceptionDef::_narrow (obj.in (), + ACE_TRY_ENV); ACE_CHECK_RETURN (0); } return retval._retn (); } -IR::ExceptionDefSeq * +IR_ExceptionDefSeq * TAO_AttributeDef_i::put_exceptions (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -541,15 +541,15 @@ TAO_AttributeDef_i::put_exceptions (CORBA::Environment &ACE_TRY_ENV) size_t size = path_queue.size (); - IR::ExceptionDefSeq *put_ed_seq = 0; + IR_ExceptionDefSeq *put_ed_seq = 0; ACE_NEW_THROW_EX (put_ed_seq, - IR::ExceptionDefSeq (size), + IR_ExceptionDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); put_ed_seq->length (size); - IR::ExceptionDefSeq_var retval = put_ed_seq; + IR_ExceptionDefSeq_var retval = put_ed_seq; for (CORBA::ULong i = 0; i < size; ++i) { @@ -557,13 +557,13 @@ TAO_AttributeDef_i::put_exceptions (CORBA::Environment &ACE_TRY_ENV) path_queue.dequeue_head (path); CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Exception, + this->repo_->servant_factory ()->create_objref (dk_Exception, path.c_str (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); - retval[i] = IR::ExceptionDef::_narrow (obj.in (), - ACE_TRY_ENV); + retval[i] = IR_ExceptionDef::_narrow (obj.in (), + ACE_TRY_ENV); ACE_CHECK_RETURN (0); } diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h index d7ee45ba094..ee5c3537f96 100644 --- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h @@ -10,7 +10,7 @@ // AttributeDef_i.h // // = DESCRIPTION -// IR::AttributeDef servant class. +// IR_AttributeDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,21 +50,21 @@ public: virtual ~TAO_AttributeDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -83,59 +83,59 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::IDLType_ptr type_def ( + virtual IR_IDLType_ptr type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr type_def_i ( + IR_IDLType_ptr type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( - IR::IDLType_ptr type_def, + IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( - IR::IDLType_ptr type_def, + IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::AttributeMode mode ( + virtual IR_AttributeMode mode ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::AttributeMode mode_i ( + IR_AttributeMode mode_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mode ( - IR::AttributeMode mode, + IR_AttributeMode mode, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void mode_i ( - IR::AttributeMode mode, + IR_AttributeMode mode, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::AttributeDescription make_description ( + IR_AttributeDescription make_description ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -144,13 +144,13 @@ public: // making its own description. // These two are called by Contained::move(). - IR::ExceptionDefSeq *get_exceptions ( + IR_ExceptionDefSeq *get_exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ExceptionDefSeq *put_exceptions ( + IR_ExceptionDefSeq *put_exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp index 5483739e520..b0ab4ce1083 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp @@ -22,11 +22,11 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ComponentDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Component; + return dk_Component; } void @@ -45,7 +45,7 @@ TAO_ComponentDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_ComponentDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -54,7 +54,7 @@ TAO_ComponentDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ComponentDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -79,7 +79,7 @@ TAO_ComponentDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::InterfaceDefSeq * +IR_InterfaceDefSeq * TAO_ComponentDef_i::supported_interfaces (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -88,7 +88,7 @@ TAO_ComponentDef_i::supported_interfaces (CORBA::Environment &ACE_TRY_ENV) return this->supported_interfaces_i (ACE_TRY_ENV); } -IR::InterfaceDefSeq * +IR_InterfaceDefSeq * TAO_ComponentDef_i::supported_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -98,7 +98,7 @@ TAO_ComponentDef_i::supported_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV void TAO_ComponentDef_i::supported_interfaces ( - const IR::InterfaceDefSeq &supported_interfaces, + const IR_InterfaceDefSeq &supported_interfaces, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -111,7 +111,7 @@ TAO_ComponentDef_i::supported_interfaces ( void TAO_ComponentDef_i::supported_interfaces_i ( - const IR::InterfaceDefSeq & /* supported_interfaces */, + const IR_InterfaceDefSeq & /* supported_interfaces */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -119,16 +119,16 @@ TAO_ComponentDef_i::supported_interfaces_i ( // TODO } -IR::ComponentDef_ptr +IR_ComponentDef_ptr TAO_ComponentDef_i::base_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->base_component_i (ACE_TRY_ENV); } -IR::ComponentDef_ptr +IR_ComponentDef_ptr TAO_ComponentDef_i::base_component_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -136,7 +136,7 @@ TAO_ComponentDef_i::base_component_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::ProvidesDefSeq * +IR_ProvidesDefSeq * TAO_ComponentDef_i::provides_interfaces (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -145,7 +145,7 @@ TAO_ComponentDef_i::provides_interfaces (CORBA::Environment &ACE_TRY_ENV) return this->provides_interfaces_i (ACE_TRY_ENV); } -IR::ProvidesDefSeq * +IR_ProvidesDefSeq * TAO_ComponentDef_i::provides_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -153,7 +153,7 @@ TAO_ComponentDef_i::provides_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV * return 0; } -IR::UsesDefSeq * +IR_UsesDefSeq * TAO_ComponentDef_i::uses_interfaces (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -162,7 +162,7 @@ TAO_ComponentDef_i::uses_interfaces (CORBA::Environment &ACE_TRY_ENV) return this->uses_interfaces_i (ACE_TRY_ENV); } -IR::UsesDefSeq * +IR_UsesDefSeq * TAO_ComponentDef_i::uses_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -170,7 +170,7 @@ TAO_ComponentDef_i::uses_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::EmitsDefSeq * +IR_EmitsDefSeq * TAO_ComponentDef_i::emits_events (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -179,7 +179,7 @@ TAO_ComponentDef_i::emits_events (CORBA::Environment &ACE_TRY_ENV) return this->emits_events_i (ACE_TRY_ENV); } -IR::EmitsDefSeq * +IR_EmitsDefSeq * TAO_ComponentDef_i::emits_events_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -187,7 +187,7 @@ TAO_ComponentDef_i::emits_events_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::PublishesDefSeq * +IR_PublishesDefSeq * TAO_ComponentDef_i::publishes_events (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -196,7 +196,7 @@ TAO_ComponentDef_i::publishes_events (CORBA::Environment &ACE_TRY_ENV) return this->publishes_events_i (ACE_TRY_ENV); } -IR::PublishesDefSeq * +IR_PublishesDefSeq * TAO_ComponentDef_i::publishes_events_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -204,7 +204,7 @@ TAO_ComponentDef_i::publishes_events_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::ConsumesDefSeq * +IR_ConsumesDefSeq * TAO_ComponentDef_i::consumes_events (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -213,7 +213,7 @@ TAO_ComponentDef_i::consumes_events (CORBA::Environment &ACE_TRY_ENV) return this->consumes_events_i (ACE_TRY_ENV); } -IR::ConsumesDefSeq * +IR_ConsumesDefSeq * TAO_ComponentDef_i::consumes_events_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -229,17 +229,17 @@ TAO_ComponentDef_i::is_basic (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::ProvidesDef_ptr +IR_ProvidesDef_ptr TAO_ComponentDef_i::create_provides ( const char *id, const char *name, const char *version, - IR::InterfaceDef_ptr interface_type, + IR_InterfaceDef_ptr interface_type, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ProvidesDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ProvidesDef::_nil ()); return this->create_provides_i (id, name, @@ -248,12 +248,12 @@ TAO_ComponentDef_i::create_provides ( ACE_TRY_ENV); } -IR::ProvidesDef_ptr +IR_ProvidesDef_ptr TAO_ComponentDef_i::create_provides_i ( const char * /* id */, const char * /* name */, const char * /* version */, - IR::InterfaceDef_ptr /* interface_type */, + IR_InterfaceDef_ptr /* interface_type */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -262,16 +262,16 @@ TAO_ComponentDef_i::create_provides_i ( return 0; } -IR::UsesDef_ptr +IR_UsesDef_ptr TAO_ComponentDef_i::create_uses (const char *id, const char *name, const char *version, - IR::InterfaceDef_ptr interface_type, + IR_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::UsesDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_UsesDef::_nil ()); return this->create_uses_i (id, name, @@ -281,11 +281,11 @@ TAO_ComponentDef_i::create_uses (const char *id, ACE_TRY_ENV); } -IR::UsesDef_ptr +IR_UsesDef_ptr TAO_ComponentDef_i::create_uses_i (const char * /* id */, const char * /* name */, const char * /* version */, - IR::InterfaceDef_ptr /* interface_type */, + IR_InterfaceDef_ptr /* interface_type */, CORBA::Boolean /* is_multiple */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -294,15 +294,15 @@ TAO_ComponentDef_i::create_uses_i (const char * /* id */, return 0; } -IR::EmitsDef_ptr +IR_EmitsDef_ptr TAO_ComponentDef_i::create_emits (const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::EmitsDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_EmitsDef::_nil ()); return this->create_emits_i (id, name, @@ -311,11 +311,11 @@ TAO_ComponentDef_i::create_emits (const char *id, ACE_TRY_ENV); } -IR::EmitsDef_ptr +IR_EmitsDef_ptr TAO_ComponentDef_i::create_emits_i (const char * /* id */, const char * /* name */, const char * /* version */, - IR::ValueDef_ptr /* value */, + IR_ValueDef_ptr /* value */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -323,15 +323,15 @@ TAO_ComponentDef_i::create_emits_i (const char * /* id */, return 0; } -IR::PublishesDef_ptr +IR_PublishesDef_ptr TAO_ComponentDef_i::create_publishes (const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::PublishesDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_PublishesDef::_nil ()); return this->create_publishes_i (id, name, @@ -340,11 +340,11 @@ TAO_ComponentDef_i::create_publishes (const char *id, ACE_TRY_ENV); } -IR::PublishesDef_ptr +IR_PublishesDef_ptr TAO_ComponentDef_i::create_publishes_i (const char * /* id */, const char * /* name */, const char * /* version */, - IR::ValueDef_ptr /* value */, + IR_ValueDef_ptr /* value */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -352,15 +352,15 @@ TAO_ComponentDef_i::create_publishes_i (const char * /* id */, return 0; } -IR::ConsumesDef_ptr +IR_ConsumesDef_ptr TAO_ComponentDef_i::create_consumes (const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ConsumesDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ConsumesDef::_nil ()); return this->create_consumes_i (id, name, @@ -369,11 +369,11 @@ TAO_ComponentDef_i::create_consumes (const char *id, ACE_TRY_ENV); } -IR::ConsumesDef_ptr +IR_ConsumesDef_ptr TAO_ComponentDef_i::create_consumes_i (const char * /* id */, const char * /* name */, const char * /* version */, - IR::ValueDef_ptr /* value */, + IR_ValueDef_ptr /* value */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h index 7f92a03cf92..6c47b5c2960 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h @@ -10,7 +10,7 @@ // ComponentDef_i.h // // = DESCRIPTION -// IR::ComponentDef servant class. +// IR_ComponentDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_ComponentDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -70,14 +70,14 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -98,99 +98,99 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::InterfaceDefSeq *supported_interfaces ( + virtual IR_InterfaceDefSeq *supported_interfaces ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::InterfaceDefSeq *supported_interfaces_i ( + IR_InterfaceDefSeq *supported_interfaces_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( - const IR::InterfaceDefSeq &supported_interfaces, + const IR_InterfaceDefSeq &supported_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( - const IR::InterfaceDefSeq &supported_interfaces, + const IR_InterfaceDefSeq &supported_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ComponentDef_ptr base_component ( + virtual IR_ComponentDef_ptr base_component ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ComponentDef_ptr base_component_i ( + IR_ComponentDef_ptr base_component_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ProvidesDefSeq *provides_interfaces ( + virtual IR_ProvidesDefSeq *provides_interfaces ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ProvidesDefSeq *provides_interfaces_i ( + IR_ProvidesDefSeq *provides_interfaces_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::UsesDefSeq *uses_interfaces ( + virtual IR_UsesDefSeq *uses_interfaces ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::UsesDefSeq *uses_interfaces_i ( + IR_UsesDefSeq *uses_interfaces_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::EmitsDefSeq *emits_events ( + virtual IR_EmitsDefSeq *emits_events ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::EmitsDefSeq *emits_events_i ( + IR_EmitsDefSeq *emits_events_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::PublishesDefSeq *publishes_events ( + virtual IR_PublishesDefSeq *publishes_events ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::PublishesDefSeq *publishes_events_i ( + IR_PublishesDefSeq *publishes_events_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ConsumesDefSeq *consumes_events ( + virtual IR_ConsumesDefSeq *consumes_events ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ConsumesDefSeq *consumes_events_i ( + IR_ConsumesDefSeq *consumes_events_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -208,103 +208,103 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ProvidesDef_ptr create_provides ( + virtual IR_ProvidesDef_ptr create_provides ( const char *id, const char *name, const char *version, - IR::InterfaceDef_ptr interface_type, + IR_InterfaceDef_ptr interface_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ProvidesDef_ptr create_provides_i ( + IR_ProvidesDef_ptr create_provides_i ( const char *id, const char *name, const char *version, - IR::InterfaceDef_ptr interface_type, + IR_InterfaceDef_ptr interface_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::UsesDef_ptr create_uses ( + virtual IR_UsesDef_ptr create_uses ( const char *id, const char *name, const char *version, - IR::InterfaceDef_ptr interface_type, + IR_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::UsesDef_ptr create_uses_i ( + IR_UsesDef_ptr create_uses_i ( const char *id, const char *name, const char *version, - IR::InterfaceDef_ptr interface_type, + IR_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::EmitsDef_ptr create_emits ( + virtual IR_EmitsDef_ptr create_emits ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::EmitsDef_ptr create_emits_i ( + IR_EmitsDef_ptr create_emits_i ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::PublishesDef_ptr create_publishes ( + virtual IR_PublishesDef_ptr create_publishes ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::PublishesDef_ptr create_publishes_i ( + IR_PublishesDef_ptr create_publishes_i ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ConsumesDef_ptr create_consumes ( + virtual IR_ConsumesDef_ptr create_consumes ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ConsumesDef_ptr create_consumes_i ( + IR_ConsumesDef_ptr create_consumes_i ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr value, + IR_ValueDef_ptr value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp index fc830fbaa10..ec8cf9b6003 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp @@ -20,18 +20,18 @@ TAO_ComponentRepository_i::~TAO_ComponentRepository_i (void) { } -IR::ComponentDef_ptr +IR_ComponentDef_ptr TAO_ComponentRepository_i::create_component ( const char *id, const char *name, const char *version, - IR::ComponentDef_ptr base_component, - const IR::InterfaceDefSeq & supports_interfaces, + IR_ComponentDef_ptr base_component, + const IR_InterfaceDefSeq & supports_interfaces, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ComponentDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ComponentDef::_nil ()); return this->create_component_i (id, name, @@ -41,13 +41,13 @@ TAO_ComponentRepository_i::create_component ( ACE_TRY_ENV); } -IR::ComponentDef_ptr +IR_ComponentDef_ptr TAO_ComponentRepository_i::create_component_i ( const char * /* id */, const char * /* name */, const char * /* version */, - IR::ComponentDef_ptr /* base_component */, - const IR::InterfaceDefSeq & /* supports_interfaces */, + IR_ComponentDef_ptr /* base_component */, + const IR_InterfaceDefSeq & /* supports_interfaces */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -56,19 +56,19 @@ TAO_ComponentRepository_i::create_component_i ( return 0; } -IR::HomeDef_ptr +IR_HomeDef_ptr TAO_ComponentRepository_i::create_home ( const char *id, const char *name, const char *version, - IR::HomeDef_ptr base_component, - IR::ComponentDef_ptr managed_component, - IR::ValueDef_ptr primary_key, + IR_HomeDef_ptr base_component, + IR_ComponentDef_ptr managed_component, + IR_ValueDef_ptr primary_key, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::HomeDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_HomeDef::_nil ()); return this->create_home_i (id, name, @@ -79,14 +79,14 @@ TAO_ComponentRepository_i::create_home ( ACE_TRY_ENV); } -IR::HomeDef_ptr +IR_HomeDef_ptr TAO_ComponentRepository_i::create_home_i ( const char * /* id */, const char * /* name */, const char * /* version */, - IR::HomeDef_ptr /* base_component */, - IR::ComponentDef_ptr /* managed_component */, - IR::ValueDef_ptr /* primary_key */, + IR_HomeDef_ptr /* base_component */, + IR_ComponentDef_ptr /* managed_component */, + IR_ValueDef_ptr /* primary_key */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h index 9c05def6e7d..2dc2d8bc455 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h +++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h @@ -10,7 +10,7 @@ // ComponentRepository_i.h // // = DESCRIPTION -// IR::ComponentRepository servant class. +// IR_ComponentRepository servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -52,47 +52,47 @@ public: virtual ~TAO_ComponentRepository_i (void); // Destructor. - virtual IR::ComponentDef_ptr create_component ( + virtual IR_ComponentDef_ptr create_component ( const char *id, const char *name, const char *version, - IR::ComponentDef_ptr base_component, - const IR::InterfaceDefSeq & supports_interfaces, + IR_ComponentDef_ptr base_component, + const IR_InterfaceDefSeq & supports_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ComponentDef_ptr create_component_i ( + IR_ComponentDef_ptr create_component_i ( const char *id, const char *name, const char *version, - IR::ComponentDef_ptr base_component, - const IR::InterfaceDefSeq & supports_interfaces, + IR_ComponentDef_ptr base_component, + const IR_InterfaceDefSeq & supports_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::HomeDef_ptr create_home ( + virtual IR_HomeDef_ptr create_home ( const char *id, const char *name, const char *version, - IR::HomeDef_ptr base_home, - IR::ComponentDef_ptr managed_component, - IR::ValueDef_ptr primary_key, + IR_HomeDef_ptr base_home, + IR_ComponentDef_ptr managed_component, + IR_ValueDef_ptr primary_key, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::HomeDef_ptr create_home_i ( + IR_HomeDef_ptr create_home_i ( const char *id, const char *name, const char *version, - IR::HomeDef_ptr base_home, - IR::ComponentDef_ptr managed_component, - IR::ValueDef_ptr primary_key, + IR_HomeDef_ptr base_home, + IR_ComponentDef_ptr managed_component, + IR_ValueDef_ptr primary_key, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp index 9cefbe14a31..9ac919c0a6f 100644 --- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp @@ -22,14 +22,14 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ConstantDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Constant; + return dk_Constant; } -IR::Contained::Description * +IR_Contained::Description * TAO_ConstantDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,22 +38,22 @@ TAO_ConstantDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ConstantDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Contained::Description *desc_ptr = 0; + IR_Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - IR::Contained::Description, + IR_Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::Contained::Description_var retval = desc_ptr; + IR_Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - IR::ConstantDescription cd; + IR_ConstantDescription cd; cd.name = this->name_i (ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -119,16 +119,16 @@ TAO_ConstantDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) return impl->type_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ConstantDef_i::type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ConstantDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -148,21 +148,21 @@ TAO_ConstantDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - return IR::IDLType::_narrow (obj.in (), + return IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); } void -TAO_ConstantDef_i::type_def (IR::IDLType_ptr type_def, +TAO_ConstantDef_i::type_def (IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -173,7 +173,7 @@ TAO_ConstantDef_i::type_def (IR::IDLType_ptr type_def, } void -TAO_ConstantDef_i::type_def_i (IR::IDLType_ptr type_def, +TAO_ConstantDef_i::type_def_i (IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h index 68476069f4e..25c8898f2f1 100644 --- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h @@ -10,7 +10,7 @@ // ConstantDef_i.h // // = DESCRIPTION -// IR::ConstantDef servant class. +// IR_ConstantDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,21 +49,21 @@ public: virtual ~TAO_ConstantDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -82,27 +82,27 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::IDLType_ptr type_def ( + virtual IR_IDLType_ptr type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr type_def_i ( + IR_IDLType_ptr type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( - IR::IDLType_ptr type_def, + IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( - IR::IDLType_ptr type_def, + IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp index 4bd7898c1e9..363adca6a53 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp @@ -20,11 +20,11 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ConsumesDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Consumes; + return dk_Consumes; } void @@ -43,7 +43,7 @@ TAO_ConsumesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_ConsumesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,7 +52,7 @@ TAO_ConsumesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ConsumesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h index 03ed5e6dafd..6ec24bc1fc5 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h @@ -10,7 +10,7 @@ // ConsumesDef_i.h // // = DESCRIPTION -// IR::ConsumesDef servant class. +// IR_ConsumesDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_ConsumesDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -70,14 +70,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.cpp b/TAO/orbsvcs/IFR_Service/Contained_i.cpp index c1ab477f226..d7ac497f8ed 100644 --- a/TAO/orbsvcs/IFR_Service/Contained_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Contained_i.cpp @@ -273,16 +273,16 @@ TAO_Contained_i::version_i (const char *version, version); } -IR::Container_ptr +IR_Container_ptr TAO_Contained_i::defined_in (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::Container::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_Container::_nil ()); return this->defined_in_i (ACE_TRY_ENV); } -IR::Container_ptr +IR_Container_ptr TAO_Contained_i::defined_in_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -310,18 +310,18 @@ TAO_Contained_i::defined_in_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, container_path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::Container::_nil ()); + ACE_CHECK_RETURN (IR_Container::_nil ()); - IR::Container_var retval = IR::Container::_narrow (obj.in (), + IR_Container_var retval = IR_Container::_narrow (obj.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::Container::_nil ()); + ACE_CHECK_RETURN (IR_Container::_nil ()); return retval._retn (); } @@ -347,16 +347,16 @@ TAO_Contained_i::absolute_name_i (CORBA::Environment &) return CORBA::string_dup (absolute_name.c_str ()); } -IR::Repository_ptr +IR_Repository_ptr TAO_Contained_i::containing_repository (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::Repository::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_Repository::_nil ()); return this->containing_repository_i (ACE_TRY_ENV); } -IR::Repository_ptr +IR_Repository_ptr TAO_Contained_i::containing_repository_i (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -364,7 +364,7 @@ TAO_Contained_i::containing_repository_i (CORBA::Environment &) } void -TAO_Contained_i::move (IR::Container_ptr new_container, +TAO_Contained_i::move (IR_Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Environment &ACE_TRY_ENV) @@ -482,18 +482,18 @@ TAO_Contained_i::contents_name_update (ACE_TString stem, } void -TAO_Contained_i::move_i (IR::Container_ptr new_container, +TAO_Contained_i::move_i (IR_Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Boolean cleanup, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Repository_var my_repo = + IR_Repository_var my_repo = this->containing_repository_i (ACE_TRY_ENV); ACE_CHECK; - IR::DefinitionKind container_dk = + IR_DefinitionKind container_dk = new_container->def_kind (ACE_TRY_ENV); ACE_CHECK; @@ -502,7 +502,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, // Check that we're not trying to move to a different repository, // and set the container impl, used in each switch case below. - if (container_dk == IR::dk_Repository) + if (container_dk == dk_Repository) { if (my_repo.in () != new_container) { @@ -535,7 +535,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, auto_ptr<TAO_Contained_i> safety (impl); - IR::Repository_var your_repo = + IR_Repository_var your_repo = impl->containing_repository_i (ACE_TRY_ENV); ACE_CHECK; @@ -550,7 +550,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_CHECK; } - IR::DefinitionKind my_dk = this->def_kind (ACE_TRY_ENV); + IR_DefinitionKind my_dk = this->def_kind (ACE_TRY_ENV); ACE_CHECK; CORBA::String_var id = this->id_i (ACE_TRY_ENV); @@ -572,17 +572,17 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, // Call the appropriate create function. switch (my_dk) { - case IR::dk_Enum: + case dk_Enum: { TAO_EnumDef_i impl (this->repo_, this->section_key_); - IR::EnumMemberSeq_var members = impl.members_i (ACE_TRY_ENV); + IR_EnumMemberSeq_var members = impl.members_i (ACE_TRY_ENV); ACE_TRY_CHECK; - if (container_dk == IR::dk_Struct - || container_dk == IR::dk_Union - || container_dk == IR::dk_Exception) + if (container_dk == dk_Struct + || container_dk == dk_Union + || container_dk == dk_Exception) { this->move_pre_process (new_container, my_path.c_str (), @@ -591,7 +591,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; } - IR::EnumDef_var new_defn = + IR_EnumDef_var new_defn = container_impl->create_enum_i (id.in (), new_name, new_version, @@ -600,12 +600,12 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; break; } - case IR::dk_Alias: + case dk_Alias: { TAO_AliasDef_i impl (this->repo_, this->section_key_); - IR::IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV); + IR_IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV); ACE_TRY_CHECK; container_impl->create_alias_i (id.in (), @@ -616,7 +616,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; break; } - case IR::dk_Native: + case dk_Native: { container_impl->create_native_i (id.in (), new_name, @@ -625,12 +625,12 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; break; } - case IR::dk_ValueBox: + case dk_ValueBox: { TAO_ValueBoxDef_i impl (this->repo_, this->section_key_); - IR::IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV); + IR_IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV); ACE_TRY_CHECK; container_impl->create_value_box_i (id.in (), @@ -641,17 +641,17 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; break; } - case IR::dk_Struct: + case dk_Struct: { TAO_StructDef_i impl (this->repo_, this->section_key_); - IR::StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV); + IR_StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV); ACE_TRY_CHECK; - if (container_dk == IR::dk_Struct - || container_dk == IR::dk_Union - || container_dk == IR::dk_Exception) + if (container_dk == dk_Struct + || container_dk == dk_Union + || container_dk == dk_Exception) { this->move_pre_process (new_container, my_path.c_str (), @@ -660,7 +660,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; } - IR::StructDef_var new_defn = + IR_StructDef_var new_defn = container_impl->create_struct_i (id.in (), new_name, new_version, @@ -673,21 +673,21 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, break; } - case IR::dk_Union: + case dk_Union: { TAO_UnionDef_i impl (this->repo_, this->section_key_); - IR::IDLType_var disc_type = + IR_IDLType_var disc_type = impl.discriminator_type_def_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::UnionMemberSeq_var members = impl.members_i (ACE_TRY_ENV); + IR_UnionMemberSeq_var members = impl.members_i (ACE_TRY_ENV); ACE_TRY_CHECK; - if (container_dk == IR::dk_Struct - || container_dk == IR::dk_Union - || container_dk == IR::dk_Exception) + if (container_dk == dk_Struct + || container_dk == dk_Union + || container_dk == dk_Exception) { this->move_pre_process (new_container, my_path.c_str (), @@ -696,7 +696,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; } - IR::UnionDef_var new_defn = + IR_UnionDef_var new_defn = container_impl->create_union_i (id.in (), new_name, new_version, @@ -710,9 +710,9 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, break; } - case IR::dk_Module: + case dk_Module: { - IR::ModuleDef_var new_defn = + IR_ModuleDef_var new_defn = container_impl->create_module_i (id.in (), new_name, new_version, @@ -724,15 +724,15 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, break; } - case IR::dk_Exception: + case dk_Exception: { TAO_ExceptionDef_i impl (this->repo_, this->section_key_); - IR::StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV); + IR_StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::ExceptionDef_var new_defn = + IR_ExceptionDef_var new_defn = container_impl->create_exception_i (id.in (), new_name, new_version, @@ -745,12 +745,12 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, break; } - case IR::dk_Interface: + case dk_Interface: { TAO_InterfaceDef_i impl (this->repo_, this->section_key_); - IR::InterfaceDefSeq_var bases = + IR_InterfaceDefSeq_var bases = impl.base_interfaces_i (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -760,7 +760,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, CORBA::Boolean is_local = impl.is_local_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::InterfaceDef_var new_defn = + IR_InterfaceDef_var new_defn = container_impl->create_interface_i (id.in (), new_name, new_version, @@ -775,12 +775,12 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, break; } - case IR::dk_Constant: + case dk_Constant: { TAO_ConstantDef_i impl (this->repo_, this->section_key_); - IR::IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV); + IR_IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV); ACE_TRY_CHECK; CORBA::Any_var value = impl.value_i (ACE_TRY_ENV); @@ -795,26 +795,26 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; break; } - case IR::dk_Attribute: + case dk_Attribute: { TAO_AttributeDef_i impl (this->repo_, this->section_key_); - IR::IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV); + IR_IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::AttributeMode mode = impl.mode_i (ACE_TRY_ENV); + IR_AttributeMode mode = impl.mode_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::ExceptionDefSeq_var get_excepts = + IR_ExceptionDefSeq_var get_excepts = impl.get_exceptions (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::ExceptionDefSeq_var put_excepts = + IR_ExceptionDefSeq_var put_excepts = impl.put_exceptions (ACE_TRY_ENV); ACE_TRY_CHECK; - if (container_dk == IR::dk_Interface) + if (container_dk == dk_Interface) { TAO_InterfaceDef_i idef (this->repo_, container_key); @@ -830,7 +830,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; break; } - else if (container_dk == IR::dk_Value) + else if (container_dk == dk_Value) { TAO_ValueDef_i vdef (this->repo_, container_key); @@ -851,28 +851,28 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO)); } } - case IR::dk_Operation: + case dk_Operation: { TAO_OperationDef_i impl (this->repo_, this->section_key_); - IR::IDLType_var result = impl.result_def_i (ACE_TRY_ENV); + IR_IDLType_var result = impl.result_def_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::OperationMode mode = impl.mode_i (ACE_TRY_ENV); + IR_OperationMode mode = impl.mode_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::ParDescriptionSeq_var params = impl.params_i (ACE_TRY_ENV); + IR_ParDescriptionSeq_var params = impl.params_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::ExceptionDefSeq_var exceptions = + IR_ExceptionDefSeq_var exceptions = impl.exceptions_i (ACE_TRY_ENV); ACE_TRY_CHECK; - IR::ContextIdSeq_var contexts = impl.contexts_i (ACE_TRY_ENV); + IR_ContextIdSeq_var contexts = impl.contexts_i (ACE_TRY_ENV); ACE_TRY_CHECK; - if (container_dk == IR::dk_Interface) + if (container_dk == dk_Interface) { TAO_InterfaceDef_i idef (this->repo_, container_key); @@ -889,7 +889,7 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_TRY_CHECK; break; } - else if (container_dk == IR::dk_Value) + else if (container_dk == dk_Value) { TAO_ValueDef_i vdef (this->repo_, container_key); @@ -911,18 +911,18 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO)); } } - case IR::dk_Value: - case IR::dk_Home: - case IR::dk_Component: - case IR::dk_Factory: - case IR::dk_Finder: - case IR::dk_PrimaryKey: - case IR::dk_Provides: - case IR::dk_Uses: - case IR::dk_Emits: - case IR::dk_Publishes: - case IR::dk_Consumes: - case IR::dk_ValueMember: + case dk_Value: + case dk_Home: + case dk_Component: + case dk_Factory: + case dk_Finder: + case dk_PrimaryKey: + case dk_Provides: + case dk_Uses: + case dk_Emits: + case dk_Publishes: + case dk_Consumes: + case dk_ValueMember: // TODO default: break; @@ -980,12 +980,12 @@ TAO_Contained_i::move_i (IR::Container_ptr new_container, 1); } - if (container_dk != IR::dk_Repository) + if (container_dk != dk_Repository) delete container_impl; } void -TAO_Contained_i::move_pre_process (IR::Container_ptr container, +TAO_Contained_i::move_pre_process (IR_Container_ptr container, const char *contained_path, const char *name, CORBA::Environment &ACE_TRY_ENV) @@ -1047,7 +1047,7 @@ TAO_Contained_i::move_pre_process (IR::Container_ptr container, } void -TAO_Contained_i::move_contents (IR::Container_ptr new_container, +TAO_Contained_i::move_contents (IR_Container_ptr new_container, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1107,11 +1107,11 @@ TAO_Contained_i::move_contents (IR::Container_ptr new_container, } } - IR::DefinitionKind kind = this->def_kind (ACE_TRY_ENV); + IR_DefinitionKind kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK; // Specific to InterfaceDef_i and ValueDef_i - if (kind == IR::dk_Interface || kind == IR::dk_Value) + if (kind == dk_Interface || kind == dk_Value) { int index = 0; ACE_TString section_name; diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h index 1541aec3302..97e34e671fd 100644 --- a/TAO/orbsvcs/IFR_Service/Contained_i.h +++ b/TAO/orbsvcs/IFR_Service/Contained_i.h @@ -10,7 +10,7 @@ // Contained_i.h // // = DESCRIPTION -// IR::Contained servant class. +// IR_Contained servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -141,13 +141,13 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Container_ptr defined_in ( + virtual IR_Container_ptr defined_in ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::Container_ptr defined_in_i ( + IR_Container_ptr defined_in_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -165,26 +165,26 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Repository_ptr containing_repository ( + virtual IR_Repository_ptr containing_repository ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::Repository_ptr containing_repository_i ( + IR_Repository_ptr containing_repository_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -192,7 +192,7 @@ public: // Pure virtual. virtual void move ( - IR::Container_ptr new_container, + IR_Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Environment &ACE_TRY_ENV = @@ -202,7 +202,7 @@ public: protected: void move_i ( - IR::Container_ptr new_container, + IR_Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Boolean cleanup, @@ -231,7 +231,7 @@ private: // Recursively update the scoped name of our contents. void move_pre_process ( - IR::Container_ptr container, + IR_Container_ptr container, const char *contained_path, const char *name, CORBA::Environment &ACE_TRY_ENV = @@ -244,7 +244,7 @@ private: // unmangles the names. void move_contents ( - IR::Container_ptr new_container, + IR_Container_ptr new_container, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/Container_i.cpp b/TAO/orbsvcs/IFR_Service/Container_i.cpp index 48eb0f0ae00..9b8b63c5491 100644 --- a/TAO/orbsvcs/IFR_Service/Container_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Container_i.cpp @@ -83,7 +83,7 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) auto_ptr<TAO_IDLType_i> safety (impl); - IR::DefinitionKind def_kind = impl->def_kind (ACE_TRY_ENV); + IR_DefinitionKind def_kind = impl->def_kind (ACE_TRY_ENV); ACE_CHECK; switch (def_kind) @@ -91,11 +91,11 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) // These anonymous types were defined in IDL inside this // struct and have no 'contained-in' info of their own, // so they must be destroyed here. - case IR::dk_String: - case IR::dk_Wstring: - case IR::dk_Fixed: - case IR::dk_Array: - case IR::dk_Sequence: + case dk_String: + case dk_Wstring: + case dk_Fixed: + case dk_Array: + case dk_Sequence: impl->destroy_i (ACE_TRY_ENV); ACE_CHECK; break; @@ -162,7 +162,7 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) } } -IR::Contained_ptr +IR_Contained_ptr TAO_Container_i::lookup (const char *search_name, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -173,7 +173,7 @@ TAO_Container_i::lookup (const char *search_name, ACE_TRY_ENV); } -IR::Contained_ptr +IR_Contained_ptr TAO_Container_i::lookup_i (const char *search_name, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -187,7 +187,7 @@ TAO_Container_i::lookup_i (const char *search_name, int pos = 0; int so_far_so_good = 0; u_int kind = 0; - IR::DefinitionKind def_kind = IR::dk_none; + IR_DefinitionKind def_kind = dk_none; if (ACE_OS::strncmp (search_name, "::", 2) == 0) @@ -261,10 +261,10 @@ TAO_Container_i::lookup_i (const char *search_name, "def_kind", kind); - def_kind = ACE_static_cast (IR::DefinitionKind, kind); + def_kind = ACE_static_cast (IR_DefinitionKind, kind); - if (def_kind == IR::dk_Interface - || def_kind == IR::dk_Value) + if (def_kind == dk_Interface + || def_kind == dk_Value) { ACE_Configuration_Section_Key attrs_key; status = @@ -357,7 +357,7 @@ TAO_Container_i::lookup_i (const char *search_name, } } - return IR::Contained::_nil (); + return IR_Contained::_nil (); } this->repo_->config ()->get_integer_value (work_key, @@ -374,20 +374,20 @@ TAO_Container_i::lookup_i (const char *search_name, id.c_str (), path); - def_kind = ACE_static_cast (IR::DefinitionKind, kind); + def_kind = ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::Contained::_nil ()); + ACE_CHECK_RETURN (IR_Contained::_nil ()); - return IR::Contained::_narrow (obj.in (), + return IR_Contained::_narrow (obj.in (), ACE_TRY_ENV); } -IR::ContainedSeq * -TAO_Container_i::contents (IR::DefinitionKind limit_type, +IR_ContainedSeq * +TAO_Container_i::contents (IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -399,16 +399,16 @@ TAO_Container_i::contents (IR::DefinitionKind limit_type, ACE_TRY_ENV); } -IR::ContainedSeq * -TAO_Container_i::contents_i (IR::DefinitionKind limit_type, +IR_ContainedSeq * +TAO_Container_i::contents_i (IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - if (limit_type == IR::dk_none) + if (limit_type == dk_none) return 0; - ACE_Unbounded_Queue<IR::DefinitionKind> kind_queue; + ACE_Unbounded_Queue<IR_DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; // Definitions @@ -441,10 +441,10 @@ TAO_Container_i::contents_i (IR::DefinitionKind limit_type, "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); - if (limit_type == IR::dk_all + if (limit_type == dk_all || limit_type == def_kind) { kind_queue.enqueue_tail (def_kind); @@ -470,14 +470,14 @@ TAO_Container_i::contents_i (IR::DefinitionKind limit_type, if (exclude_inherited == 0) { - IR::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + IR_DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - if (def_kind == IR::dk_Interface) + if (def_kind == dk_Interface) { - if (limit_type == IR::dk_Operation - || limit_type == IR::dk_Attribute - || limit_type == IR::dk_all) + if (limit_type == dk_Operation + || limit_type == dk_Attribute + || limit_type == dk_all) { TAO_InterfaceDef_i iface (this->repo_, this->section_key_); @@ -493,19 +493,19 @@ TAO_Container_i::contents_i (IR::DefinitionKind limit_type, size_t size = kind_queue.size (); - IR::ContainedSeq *contents = 0; + IR_ContainedSeq *contents = 0; ACE_NEW_THROW_EX (contents, - IR::ContainedSeq (size), + IR_ContainedSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::ContainedSeq_var retval = contents; + IR_ContainedSeq_var retval = contents; retval->length (size); for (size_t j = 0; j < size; j++) { - IR::DefinitionKind next_kind; + IR_DefinitionKind next_kind; kind_queue.dequeue_head (next_kind); ACE_TString next_path; @@ -517,8 +517,8 @@ TAO_Container_i::contents_i (IR::DefinitionKind limit_type, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - IR::Contained_var next_cont = - IR::Contained::_narrow (obj.in (), + IR_Contained_var next_cont = + IR_Contained::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -528,10 +528,10 @@ TAO_Container_i::contents_i (IR::DefinitionKind limit_type, return retval._retn (); } -IR::ContainedSeq * +IR_ContainedSeq * TAO_Container_i::lookup_name (const char *search_name, CORBA::Long levels_to_search, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -545,15 +545,15 @@ TAO_Container_i::lookup_name (const char *search_name, ACE_TRY_ENV); } -IR::ContainedSeq * +IR_ContainedSeq * TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Long levels_to_search, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_Unbounded_Queue<IR::DefinitionKind> kind_queue; + ACE_Unbounded_Queue<IR_DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; this->lookup_name_recursive (kind_queue, @@ -566,18 +566,18 @@ TAO_Container_i::lookup_name_i (const char *search_name, size_t size = kind_queue.size (); - IR::ContainedSeq *holder; + IR_ContainedSeq *holder; ACE_NEW_THROW_EX (holder, - IR::ContainedSeq (size), + IR_ContainedSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::ContainedSeq_var retval = holder; + IR_ContainedSeq_var retval = holder; retval->length (size); for (size_t i = 0; i < size; i++) { - IR::DefinitionKind next_kind; + IR_DefinitionKind next_kind; kind_queue.dequeue_head (next_kind); ACE_TString next_path; @@ -589,8 +589,8 @@ TAO_Container_i::lookup_name_i (const char *search_name, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - IR::Contained_var next_cont = - IR::Contained::_narrow (obj.in (), + IR_Contained_var next_cont = + IR_Contained::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -600,8 +600,8 @@ TAO_Container_i::lookup_name_i (const char *search_name, return retval._retn (); } -IR::Container::DescriptionSeq * -TAO_Container_i::describe_contents (IR::DefinitionKind limit_type, +IR_Container::DescriptionSeq * +TAO_Container_i::describe_contents (IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs, CORBA::Environment &ACE_TRY_ENV) @@ -615,14 +615,14 @@ TAO_Container_i::describe_contents (IR::DefinitionKind limit_type, ACE_TRY_ENV); } -IR::Container::DescriptionSeq * -TAO_Container_i::describe_contents_i (IR::DefinitionKind limit_type, +IR_Container::DescriptionSeq * +TAO_Container_i::describe_contents_i (IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::ContainedSeq_var contents = this->contents_i (limit_type, + IR_ContainedSeq_var contents = this->contents_i (limit_type, exclude_inherited, ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -637,17 +637,17 @@ TAO_Container_i::describe_contents_i (IR::DefinitionKind limit_type, ? length : max_returned_objs; - IR::Container::DescriptionSeq *desc_seq; + IR_Container::DescriptionSeq *desc_seq; ACE_NEW_THROW_EX (desc_seq, - IR::Container::DescriptionSeq (ret_len), + IR_Container::DescriptionSeq (ret_len), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); desc_seq->length (ret_len); - IR::Container::DescriptionSeq_var retval = desc_seq; + IR_Container::DescriptionSeq_var retval = desc_seq; - IR::Contained::Description_var desc; + IR_Contained::Description_var desc; ACE_Configuration_Section_Key contained_key; PortableServer::ObjectId_var oid; @@ -679,7 +679,7 @@ TAO_Container_i::describe_contents_i (IR::DefinitionKind limit_type, ACE_CHECK_RETURN (0); retval[i].contained_object = - IR::Contained::_duplicate (contents[i]); + IR_Contained::_duplicate (contents[i]); retval[i].kind = desc->kind; @@ -689,14 +689,14 @@ TAO_Container_i::describe_contents_i (IR::DefinitionKind limit_type, return retval._retn (); } -IR::ModuleDef_ptr +IR_ModuleDef_ptr TAO_Container_i::create_module (const char *id, const char *name, const char *version, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ModuleDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ModuleDef::_nil ()); return this->create_module_i (id, name, @@ -704,27 +704,27 @@ TAO_Container_i::create_module (const char *id, ACE_TRY_ENV); } -IR::ModuleDef_ptr +IR_ModuleDef_ptr TAO_Container_i::create_module_i (const char *id, const char *name, const char *version, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Module, + CORBA::Boolean legal_op = this->valid_container (dk_Module, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ModuleDef::_nil ()); + ACE_CHECK_RETURN (IR_ModuleDef::_nil ()); if (!legal_op) - return IR::ModuleDef::_nil (); + return IR_ModuleDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ModuleDef::_nil ()); + ACE_CHECK_RETURN (IR_ModuleDef::_nil ()); if (bad_params) - return IR::ModuleDef::_nil (); + return IR_ModuleDef::_nil (); ACE_Configuration_Section_Key defns_key; @@ -734,7 +734,7 @@ TAO_Container_i::create_module_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -742,7 +742,7 @@ TAO_Container_i::create_module_i (const char *id, name, version, "defns\\", - IR::dk_Module); + dk_Module); // For anonymous members. ACE_Configuration_Section_Key refs_key; @@ -753,25 +753,25 @@ TAO_Container_i::create_module_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Module, + this->repo_->servant_factory ()->create_objref (dk_Module, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ModuleDef::_nil ()); + ACE_CHECK_RETURN (IR_ModuleDef::_nil ()); - return IR::ModuleDef::_narrow (obj.in (), + return IR_ModuleDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::ConstantDef_ptr +IR_ConstantDef_ptr TAO_Container_i::create_constant (const char *id, const char *name, const char *version, - IR::IDLType_ptr type, + IR_IDLType_ptr type, const CORBA::Any &value, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ConstantDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ConstantDef::_nil ()); return this->create_constant_i (id, name, @@ -781,29 +781,29 @@ TAO_Container_i::create_constant (const char *id, ACE_TRY_ENV); } -IR::ConstantDef_ptr +IR_ConstantDef_ptr TAO_Container_i::create_constant_i (const char *id, const char *name, const char *version, - IR::IDLType_ptr type, + IR_IDLType_ptr type, const CORBA::Any &value, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Constant, + CORBA::Boolean legal_op = this->valid_container (dk_Constant, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ConstantDef::_nil ()); + ACE_CHECK_RETURN (IR_ConstantDef::_nil ()); if (!legal_op) - return IR::ConstantDef::_nil (); + return IR_ConstantDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ConstantDef::_nil ()); + ACE_CHECK_RETURN (IR_ConstantDef::_nil ()); if (bad_params) - return IR::ConstantDef::_nil (); + return IR_ConstantDef::_nil (); // Create/open section for members defined in this scope. ACE_Configuration_Section_Key defns_key; @@ -812,7 +812,7 @@ TAO_Container_i::create_constant_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -820,14 +820,14 @@ TAO_Container_i::create_constant_i (const char *id, name, version, "defns\\", - IR::dk_Constant); + dk_Constant); // Get the path to our type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ConstantDef::_nil ()); + ACE_CHECK_RETURN (IR_ConstantDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -842,7 +842,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); - ACE_CHECK_RETURN (IR::ConstantDef::_nil ()); + ACE_CHECK_RETURN (IR_ConstantDef::_nil ()); switch (kind) { @@ -870,24 +870,24 @@ TAO_Container_i::create_constant_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Constant, + this->repo_->servant_factory ()->create_objref (dk_Constant, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ConstantDef::_nil ()); + ACE_CHECK_RETURN (IR_ConstantDef::_nil ()); - return IR::ConstantDef::_narrow (obj.in (), + return IR_ConstantDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::StructDef_ptr +IR_StructDef_ptr TAO_Container_i::create_struct (const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::StructDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_StructDef::_nil ()); return this->create_struct_i (id, name, @@ -896,28 +896,28 @@ TAO_Container_i::create_struct (const char *id, ACE_TRY_ENV); } -IR::StructDef_ptr +IR_StructDef_ptr TAO_Container_i::create_struct_i (const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Struct, + CORBA::Boolean legal_op = this->valid_container (dk_Struct, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::StructDef::_nil ()); + ACE_CHECK_RETURN (IR_StructDef::_nil ()); if (!legal_op) - return IR::StructDef::_nil (); + return IR_StructDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::StructDef::_nil ()); + ACE_CHECK_RETURN (IR_StructDef::_nil ()); if (bad_params) - return IR::StructDef::_nil (); + return IR_StructDef::_nil (); // Create/open section for members defined in this scope. ACE_Configuration_Section_Key defns_key; @@ -926,7 +926,7 @@ TAO_Container_i::create_struct_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -934,7 +934,7 @@ TAO_Container_i::create_struct_i (const char *id, name, version, "defns\\", - IR::dk_Struct); + dk_Struct); // Open a section for the struct's members. ACE_Configuration_Section_Key refs_key; @@ -967,7 +967,7 @@ TAO_Container_i::create_struct_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::StructDef::_nil ()); + ACE_CHECK_RETURN (IR_StructDef::_nil ()); CORBA::String_var member_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -977,12 +977,12 @@ TAO_Container_i::create_struct_i (const char *id, member_path.in ()); } - IR::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::StructDef::_nil ()); + IR_DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + ACE_CHECK_RETURN (IR_StructDef::_nil ()); - if (def_kind == IR::dk_Struct - || def_kind == IR::dk_Union - || def_kind == IR::dk_Exception) + if (def_kind == dk_Struct + || def_kind == dk_Union + || def_kind == dk_Exception) { this->update_refs (path.c_str (), name); @@ -990,25 +990,25 @@ TAO_Container_i::create_struct_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Struct, + this->repo_->servant_factory ()->create_objref (dk_Struct, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::StructDef::_nil ()); + ACE_CHECK_RETURN (IR_StructDef::_nil ()); - return IR::StructDef::_narrow (obj.in (), + return IR_StructDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::UnionDef_ptr +IR_UnionDef_ptr TAO_Container_i::create_union (const char *id, const char *name, const char *version, - IR::IDLType_ptr discriminator_type, - const IR::UnionMemberSeq &members, + IR_IDLType_ptr discriminator_type, + const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::UnionDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_UnionDef::_nil ()); return this->create_union_i (id, name, @@ -1018,29 +1018,29 @@ TAO_Container_i::create_union (const char *id, ACE_TRY_ENV); } -IR::UnionDef_ptr +IR_UnionDef_ptr TAO_Container_i::create_union_i (const char *id, const char *name, const char *version, - IR::IDLType_ptr discriminator_type, - const IR::UnionMemberSeq &members, + IR_IDLType_ptr discriminator_type, + const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Union, + CORBA::Boolean legal_op = this->valid_container (dk_Union, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::UnionDef::_nil ()); + ACE_CHECK_RETURN (IR_UnionDef::_nil ()); if (!legal_op) - return IR::UnionDef::_nil (); + return IR_UnionDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::UnionDef::_nil ()); + ACE_CHECK_RETURN (IR_UnionDef::_nil ()); if (bad_params) - return IR::UnionDef::_nil (); + return IR_UnionDef::_nil (); // Create new section, or open if it already exists. ACE_Configuration_Section_Key defns_key; @@ -1049,7 +1049,7 @@ TAO_Container_i::create_union_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1057,13 +1057,13 @@ TAO_Container_i::create_union_i (const char *id, name, version, "defns\\", - IR::dk_Union); + dk_Union); // 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); - ACE_CHECK_RETURN (IR::UnionDef::_nil ()); + ACE_CHECK_RETURN (IR_UnionDef::_nil ()); CORBA::String_var disc_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1103,7 +1103,7 @@ TAO_Container_i::create_union_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::UnionDef::_nil ()); + ACE_CHECK_RETURN (IR_UnionDef::_nil ()); CORBA::String_var member_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1117,12 +1117,12 @@ TAO_Container_i::create_union_i (const char *id, ACE_TRY_ENV); } - IR::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::UnionDef::_nil ()); + IR_DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + ACE_CHECK_RETURN (IR_UnionDef::_nil ()); - if (def_kind == IR::dk_Struct - || def_kind == IR::dk_Union - || def_kind == IR::dk_Exception) + if (def_kind == dk_Struct + || def_kind == dk_Union + || def_kind == dk_Exception) { this->update_refs (path.c_str (), name); @@ -1130,24 +1130,24 @@ TAO_Container_i::create_union_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Union, + this->repo_->servant_factory ()->create_objref (dk_Union, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::UnionDef::_nil ()); + ACE_CHECK_RETURN (IR_UnionDef::_nil ()); - return IR::UnionDef::_narrow (obj.in (), + return IR_UnionDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::EnumDef_ptr +IR_EnumDef_ptr TAO_Container_i::create_enum (const char *id, const char *name, const char *version, - const IR::EnumMemberSeq &members, + const IR_EnumMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::EnumDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_EnumDef::_nil ()); return this->create_enum_i (id, name, @@ -1156,28 +1156,28 @@ TAO_Container_i::create_enum (const char *id, ACE_TRY_ENV); } -IR::EnumDef_ptr +IR_EnumDef_ptr TAO_Container_i::create_enum_i (const char *id, const char *name, const char *version, - const IR::EnumMemberSeq &members, + const IR_EnumMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Enum, + CORBA::Boolean legal_op = this->valid_container (dk_Enum, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::EnumDef::_nil ()); + ACE_CHECK_RETURN (IR_EnumDef::_nil ()); if (!legal_op) - return IR::EnumDef::_nil (); + return IR_EnumDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::EnumDef::_nil ()); + ACE_CHECK_RETURN (IR_EnumDef::_nil ()); if (bad_params) - return IR::EnumDef::_nil (); + return IR_EnumDef::_nil (); // Create new section, or open if it already exists. ACE_Configuration_Section_Key defns_key; @@ -1186,7 +1186,7 @@ TAO_Container_i::create_enum_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1194,7 +1194,7 @@ TAO_Container_i::create_enum_i (const char *id, name, version, "defns\\", - IR::dk_Enum); + dk_Enum); // Store the member count of the enum. CORBA::ULong count = members.length (); @@ -1218,12 +1218,12 @@ TAO_Container_i::create_enum_i (const char *id, members[i].in ()); } - IR::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::EnumDef::_nil ()); + IR_DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + ACE_CHECK_RETURN (IR_EnumDef::_nil ()); - if (def_kind == IR::dk_Struct - || def_kind == IR::dk_Union - || def_kind == IR::dk_Exception) + if (def_kind == dk_Struct + || def_kind == dk_Union + || def_kind == dk_Exception) { this->update_refs (path.c_str (), name); @@ -1231,24 +1231,24 @@ TAO_Container_i::create_enum_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Enum, + this->repo_->servant_factory ()->create_objref (dk_Enum, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::EnumDef::_nil ()); + ACE_CHECK_RETURN (IR_EnumDef::_nil ()); - return IR::EnumDef::_narrow (obj.in (), + return IR_EnumDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::AliasDef_ptr +IR_AliasDef_ptr TAO_Container_i::create_alias (const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type, + IR_IDLType_ptr original_type, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::AliasDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_AliasDef::_nil ()); return this->create_alias_i (id, name, @@ -1257,28 +1257,28 @@ TAO_Container_i::create_alias (const char *id, ACE_TRY_ENV); } -IR::AliasDef_ptr +IR_AliasDef_ptr TAO_Container_i::create_alias_i (const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type, + IR_IDLType_ptr original_type, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Alias, + CORBA::Boolean legal_op = this->valid_container (dk_Alias, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AliasDef::_nil ()); + ACE_CHECK_RETURN (IR_AliasDef::_nil ()); if (!legal_op) - return IR::AliasDef::_nil (); + return IR_AliasDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AliasDef::_nil ()); + ACE_CHECK_RETURN (IR_AliasDef::_nil ()); if (bad_params) - return IR::AliasDef::_nil (); + return IR_AliasDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1287,7 +1287,7 @@ TAO_Container_i::create_alias_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1295,13 +1295,13 @@ TAO_Container_i::create_alias_i (const char *id, name, version, "defns\\", - IR::dk_Alias); + dk_Alias); // 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); - ACE_CHECK_RETURN (IR::AliasDef::_nil ()); + ACE_CHECK_RETURN (IR_AliasDef::_nil ()); CORBA::String_var unalias_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1312,26 +1312,26 @@ TAO_Container_i::create_alias_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Alias, + this->repo_->servant_factory ()->create_objref (dk_Alias, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AliasDef::_nil ()); + ACE_CHECK_RETURN (IR_AliasDef::_nil ()); - return IR::AliasDef::_narrow (obj.in (), + return IR_AliasDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::InterfaceDef_ptr +IR_InterfaceDef_ptr TAO_Container_i::create_interface (const char *id, const char *name, const char *version, - const IR::InterfaceDefSeq &base_interfaces, + const IR_InterfaceDefSeq &base_interfaces, CORBA::Boolean is_abstract, CORBA::Boolean is_local, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::InterfaceDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_InterfaceDef::_nil ()); return this->create_interface_i (id, name, @@ -1342,30 +1342,30 @@ TAO_Container_i::create_interface (const char *id, ACE_TRY_ENV); } -IR::InterfaceDef_ptr +IR_InterfaceDef_ptr TAO_Container_i::create_interface_i (const char *id, const char *name, const char *version, - const IR::InterfaceDefSeq &base_interfaces, + const IR_InterfaceDefSeq &base_interfaces, CORBA::Boolean is_abstract, CORBA::Boolean is_local, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Interface, + CORBA::Boolean legal_op = this->valid_container (dk_Interface, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::InterfaceDef::_nil ()); + ACE_CHECK_RETURN (IR_InterfaceDef::_nil ()); if (!legal_op) - return IR::InterfaceDef::_nil (); + return IR_InterfaceDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::InterfaceDef::_nil ()); + ACE_CHECK_RETURN (IR_InterfaceDef::_nil ()); if (bad_params) - return IR::InterfaceDef::_nil (); + return IR_InterfaceDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1374,7 +1374,7 @@ TAO_Container_i::create_interface_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1382,7 +1382,7 @@ TAO_Container_i::create_interface_i (const char *id, name, version, "defns\\", - IR::dk_Interface); + dk_Interface); // Store the boolean attributes. this->repo_->config ()->set_integer_value (new_key, @@ -1411,7 +1411,7 @@ TAO_Container_i::create_interface_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i], ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::InterfaceDef::_nil ()); + ACE_CHECK_RETURN (IR_InterfaceDef::_nil ()); CORBA::String_var inherited_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1426,30 +1426,30 @@ TAO_Container_i::create_interface_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Interface, + this->repo_->servant_factory ()->create_objref (dk_Interface, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::InterfaceDef::_nil ()); + ACE_CHECK_RETURN (IR_InterfaceDef::_nil ()); - return IR::InterfaceDef::_narrow (obj.in (), + return IR_InterfaceDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_Container_i::create_value (const char *id, const char *name, const char *version, CORBA::Boolean is_custom, CORBA::Boolean is_abstract, - IR::ValueDef_ptr base_value, + IR_ValueDef_ptr base_value, CORBA::Boolean is_truncatable, - const IR::ValueDefSeq &abstract_base_values, - const IR::InterfaceDefSeq &supported_interfaces, - const IR::InitializerSeq &initializers, + const IR_ValueDefSeq &abstract_base_values, + const IR_InterfaceDefSeq &supported_interfaces, + const IR_InitializerSeq &initializers, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ValueDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ValueDef::_nil ()); return this->create_value_i (id, name, @@ -1464,17 +1464,17 @@ TAO_Container_i::create_value (const char *id, ACE_TRY_ENV); } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_Container_i::create_value_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA::Boolean /* is_custom */, CORBA::Boolean /* is_abstract */, - IR::ValueDef_ptr /* base_value */, + IR_ValueDef_ptr /* base_value */, CORBA::Boolean /* is_truncatable */, - const IR::ValueDefSeq & /* abstract_base_values */, - const IR::InterfaceDefSeq & /* supported_interfaces */, - const IR::InitializerSeq & /* initializers */, + const IR_ValueDefSeq & /* abstract_base_values */, + const IR_InterfaceDefSeq & /* supported_interfaces */, + const IR_InitializerSeq & /* initializers */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1482,15 +1482,15 @@ TAO_Container_i::create_value_i (const char * /* id */, return 0; } -IR::ValueBoxDef_ptr +IR_ValueBoxDef_ptr TAO_Container_i::create_value_box (const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ValueBoxDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ValueBoxDef::_nil ()); return this->create_value_box_i (id, name, @@ -1499,28 +1499,28 @@ TAO_Container_i::create_value_box (const char *id, ACE_TRY_ENV); } -IR::ValueBoxDef_ptr +IR_ValueBoxDef_ptr TAO_Container_i::create_value_box_i (const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_ValueBox, + CORBA::Boolean legal_op = this->valid_container (dk_ValueBox, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ()); if (!legal_op) - return IR::ValueBoxDef::_nil (); + return IR_ValueBoxDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ()); if (bad_params) - return IR::ValueBoxDef::_nil (); + return IR_ValueBoxDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1529,7 +1529,7 @@ TAO_Container_i::create_value_box_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1537,13 +1537,13 @@ TAO_Container_i::create_value_box_i (const char *id, name, version, "defns\\", - IR::dk_ValueBox); + dk_ValueBox); // 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); - ACE_CHECK_RETURN (IR::ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ()); CORBA::String_var boxed_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1554,24 +1554,24 @@ TAO_Container_i::create_value_box_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_ValueBox, + this->repo_->servant_factory ()->create_objref (dk_ValueBox, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ()); - return IR::ValueBoxDef::_narrow (obj.in (), + return IR_ValueBoxDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::ExceptionDef_ptr +IR_ExceptionDef_ptr TAO_Container_i::create_exception (const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ExceptionDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ExceptionDef::_nil ()); return this->create_exception_i (id, name, @@ -1580,28 +1580,28 @@ TAO_Container_i::create_exception (const char *id, ACE_TRY_ENV); } -IR::ExceptionDef_ptr +IR_ExceptionDef_ptr TAO_Container_i::create_exception_i (const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Exception, + CORBA::Boolean legal_op = this->valid_container (dk_Exception, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ExceptionDef::_nil ()); + ACE_CHECK_RETURN (IR_ExceptionDef::_nil ()); if (!legal_op) - return IR::ExceptionDef::_nil (); + return IR_ExceptionDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ExceptionDef::_nil ()); + ACE_CHECK_RETURN (IR_ExceptionDef::_nil ()); if (bad_params) - return IR::ExceptionDef::_nil (); + return IR_ExceptionDef::_nil (); // Create/open section for members defined in this scope. ACE_Configuration_Section_Key defns_key; @@ -1610,7 +1610,7 @@ TAO_Container_i::create_exception_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1618,7 +1618,7 @@ TAO_Container_i::create_exception_i (const char *id, name, version, "defns\\", - IR::dk_Exception); + dk_Exception); ACE_Configuration_Section_Key refs_key; this->repo_->config ()->open_section (new_key, @@ -1649,7 +1649,7 @@ TAO_Container_i::create_exception_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ExceptionDef::_nil ()); + ACE_CHECK_RETURN (IR_ExceptionDef::_nil ()); CORBA::String_var member_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1661,23 +1661,23 @@ TAO_Container_i::create_exception_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Exception, + this->repo_->servant_factory ()->create_objref (dk_Exception, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ExceptionDef::_nil ()); + ACE_CHECK_RETURN (IR_ExceptionDef::_nil ()); - return IR::ExceptionDef::_narrow (obj.in (), + return IR_ExceptionDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::NativeDef_ptr +IR_NativeDef_ptr TAO_Container_i::create_native (const char *id, const char *name, const char *version, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::NativeDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_NativeDef::_nil ()); return this->create_native_i (id, name, @@ -1685,27 +1685,27 @@ TAO_Container_i::create_native (const char *id, ACE_TRY_ENV); } -IR::NativeDef_ptr +IR_NativeDef_ptr TAO_Container_i::create_native_i (const char *id, const char *name, const char *version, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean legal_op = this->valid_container (IR::dk_Native, + CORBA::Boolean legal_op = this->valid_container (dk_Native, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::NativeDef::_nil ()); + ACE_CHECK_RETURN (IR_NativeDef::_nil ()); if (!legal_op) - return IR::NativeDef::_nil (); + return IR_NativeDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::NativeDef::_nil ()); + ACE_CHECK_RETURN (IR_NativeDef::_nil ()); if (bad_params) - return IR::NativeDef::_nil (); + return IR_NativeDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1714,7 +1714,7 @@ TAO_Container_i::create_native_i (const char *id, 1, defns_key); - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1722,26 +1722,26 @@ TAO_Container_i::create_native_i (const char *id, name, version, "defns\\", - IR::dk_Native); + dk_Native); // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Native, + this->repo_->servant_factory ()->create_objref (dk_Native, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::NativeDef::_nil ()); + ACE_CHECK_RETURN (IR_NativeDef::_nil ()); - return IR::NativeDef::_narrow (obj.in (), + return IR_NativeDef::_narrow (obj.in (), ACE_TRY_ENV); } void TAO_Container_i::lookup_name_recursive ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, const char *search_name, CORBA::Long levels_to_search, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV ) @@ -1773,10 +1773,10 @@ TAO_Container_i::lookup_name_recursive ( "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); - if (limit_type == IR::dk_all || limit_type == def_kind) + if (limit_type == dk_all || limit_type == def_kind) { ACE_TString name; this->repo_->config ()->get_string_value (defn_key, @@ -1832,12 +1832,12 @@ TAO_Container_i::lookup_name_recursive ( } } - IR::DefinitionKind kind = this->def_kind (ACE_TRY_ENV); + IR_DefinitionKind kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK; - if (kind == IR::dk_Interface || kind == IR::dk_Value) + if (kind == dk_Interface || kind == dk_Value) { - if (limit_type == IR::dk_all || limit_type == IR::dk_Attribute) + if (limit_type == dk_all || limit_type == dk_Attribute) { this->lookup_attr (kind_queue, path_queue, @@ -1845,7 +1845,7 @@ TAO_Container_i::lookup_name_recursive ( exclude_inherited); } - if (limit_type == IR::dk_all || limit_type == IR::dk_Operation) + if (limit_type == dk_all || limit_type == dk_Operation) { this->lookup_op (kind_queue, path_queue, @@ -1857,7 +1857,7 @@ TAO_Container_i::lookup_name_recursive ( void TAO_Container_i:: lookup_attr ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, const char *search_name, CORBA::Boolean exclude_inherited @@ -1893,7 +1893,7 @@ TAO_Container_i:: lookup_attr ( if (name == search_name) { - kind_queue.enqueue_tail (IR::dk_Attribute); + kind_queue.enqueue_tail (dk_Attribute); ACE_TString id; this->repo_->config ()->get_string_value (member_key, @@ -1959,7 +1959,7 @@ TAO_Container_i:: lookup_attr ( void TAO_Container_i::lookup_op ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, const char *search_name, CORBA::Boolean exclude_inherited @@ -1995,7 +1995,7 @@ TAO_Container_i::lookup_op ( if (name == search_name) { - kind_queue.enqueue_tail (IR::dk_Operation); + kind_queue.enqueue_tail (dk_Operation); ACE_TString id; this->repo_->config ()->get_string_value (member_key, @@ -2137,10 +2137,10 @@ TAO_Container_i::name_exists (const char *name, } // If we are an interface, check the inherited members. - IR::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); + IR_DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (1); - if (def_kind == IR::dk_Interface) + if (def_kind == dk_Interface) { ACE_Configuration_Section_Key inherited_key; int status = @@ -2230,7 +2230,7 @@ TAO_Container_i::create_common ( const char *name, const char *version, const char *sub_section, - IR::DefinitionKind def_kind + IR_DefinitionKind def_kind ) { u_int defn_count = 0; @@ -2325,49 +2325,49 @@ TAO_Container_i::create_common ( } CORBA::Boolean -TAO_Container_i::valid_container (const IR::DefinitionKind op_kind, +TAO_Container_i::valid_container (const IR_DefinitionKind op_kind, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::DefinitionKind my_kind = this->def_kind (ACE_TRY_ENV); + IR_DefinitionKind my_kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); int error_flag = 0; switch (my_kind) { - case IR::dk_Repository: - case IR::dk_Module: + case dk_Repository: + case dk_Module: break; - case IR::dk_Exception: - case IR::dk_Struct: - case IR::dk_Union: + case dk_Exception: + case dk_Struct: + case dk_Union: switch (op_kind) { - case IR::dk_Struct: - case IR::dk_Union: - case IR::dk_Enum: + case dk_Struct: + case dk_Union: + case dk_Enum: break; default: error_flag = 1; break; } break; - case IR::dk_Value: - case IR::dk_Interface: - case IR::dk_Home: + case dk_Value: + case dk_Interface: + case dk_Home: switch (op_kind) { - case IR::dk_Module: - case IR::dk_Interface: - case IR::dk_Value: + case dk_Module: + case dk_Interface: + case dk_Value: error_flag = 1; break; default: break; } break; - case IR::dk_Component: + case dk_Component: error_flag = 1; break; default: diff --git a/TAO/orbsvcs/IFR_Service/Container_i.h b/TAO/orbsvcs/IFR_Service/Container_i.h index 73714bba63b..e258aa1e346 100644 --- a/TAO/orbsvcs/IFR_Service/Container_i.h +++ b/TAO/orbsvcs/IFR_Service/Container_i.h @@ -10,7 +10,7 @@ // Container_i.h // // = DESCRIPTION -// IR::Container servant class. +// IR_Container servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -66,58 +66,58 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained_ptr lookup ( + virtual IR_Contained_ptr lookup ( const char *search_name, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::Contained_ptr lookup_i ( + IR_Contained_ptr lookup_i ( const char *search_name, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ContainedSeq *contents ( - IR::DefinitionKind limit_type, + virtual IR_ContainedSeq *contents ( + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ContainedSeq *contents_i ( - IR::DefinitionKind limit_type, + IR_ContainedSeq *contents_i ( + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ContainedSeq *lookup_name ( + virtual IR_ContainedSeq *lookup_name ( const char *search_name, CORBA::Long levels_to_search, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ContainedSeq *lookup_name_i ( + IR_ContainedSeq *lookup_name_i ( const char *search_name, CORBA::Long levels_to_search, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Container::DescriptionSeq *describe_contents ( - IR::DefinitionKind limit_type, + virtual IR_Container::DescriptionSeq *describe_contents ( + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs, CORBA::Environment &ACE_TRY_ENV = @@ -125,8 +125,8 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::Container::DescriptionSeq *describe_contents_i ( - IR::DefinitionKind limit_type, + IR_Container::DescriptionSeq *describe_contents_i ( + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs, CORBA::Environment &ACE_TRY_ENV = @@ -134,7 +134,7 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ModuleDef_ptr create_module ( + virtual IR_ModuleDef_ptr create_module ( const char *id, const char *name, const char *version, @@ -143,7 +143,7 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ModuleDef_ptr create_module_i ( + IR_ModuleDef_ptr create_module_i ( const char *id, const char *name, const char *version, @@ -152,115 +152,115 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ConstantDef_ptr create_constant ( + virtual IR_ConstantDef_ptr create_constant ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, + IR_IDLType_ptr type, const CORBA::Any & value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ConstantDef_ptr create_constant_i ( + IR_ConstantDef_ptr create_constant_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, + IR_IDLType_ptr type, const CORBA::Any & value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::StructDef_ptr create_struct ( + virtual IR_StructDef_ptr create_struct ( const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::StructDef_ptr create_struct_i ( + IR_StructDef_ptr create_struct_i ( const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::UnionDef_ptr create_union ( + virtual IR_UnionDef_ptr create_union ( const char *id, const char *name, const char *version, - IR::IDLType_ptr discriminator_type, - const IR::UnionMemberSeq &members, + IR_IDLType_ptr discriminator_type, + const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::UnionDef_ptr create_union_i ( + IR_UnionDef_ptr create_union_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr discriminator_type, - const IR::UnionMemberSeq &members, + IR_IDLType_ptr discriminator_type, + const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::EnumDef_ptr create_enum ( + virtual IR_EnumDef_ptr create_enum ( const char *id, const char *name, const char *version, - const IR::EnumMemberSeq &members, + const IR_EnumMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::EnumDef_ptr create_enum_i ( + IR_EnumDef_ptr create_enum_i ( const char *id, const char *name, const char *version, - const IR::EnumMemberSeq &members, + const IR_EnumMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::AliasDef_ptr create_alias ( + virtual IR_AliasDef_ptr create_alias ( const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type, + IR_IDLType_ptr original_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::AliasDef_ptr create_alias_i ( + IR_AliasDef_ptr create_alias_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type, + IR_IDLType_ptr original_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::InterfaceDef_ptr create_interface ( + virtual IR_InterfaceDef_ptr create_interface ( const char *id, const char *name, const char *version, - const IR::InterfaceDefSeq &base_interfaces, + const IR_InterfaceDefSeq &base_interfaces, CORBA::Boolean is_abstract, CORBA::Boolean is_local, CORBA::Environment &ACE_TRY_ENV = @@ -268,11 +268,11 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::InterfaceDef_ptr create_interface_i ( + IR_InterfaceDef_ptr create_interface_i ( const char *id, const char *name, const char *version, - const IR::InterfaceDefSeq &base_interfaces, + const IR_InterfaceDefSeq &base_interfaces, CORBA::Boolean is_abstract, CORBA::Boolean is_local, CORBA::Environment &ACE_TRY_ENV = @@ -280,79 +280,79 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ValueDef_ptr create_value ( + virtual IR_ValueDef_ptr create_value ( const char *id, const char *name, const char *version, CORBA::Boolean is_custom, CORBA::Boolean is_abstract, - IR::ValueDef_ptr base_value, + IR_ValueDef_ptr base_value, CORBA::Boolean is_truncatable, - const IR::ValueDefSeq &abstract_base_values, - const IR::InterfaceDefSeq & supported_interfaces, - const IR::InitializerSeq &initializers, + const IR_ValueDefSeq &abstract_base_values, + const IR_InterfaceDefSeq & supported_interfaces, + const IR_InitializerSeq &initializers, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ValueDef_ptr create_value_i ( + IR_ValueDef_ptr create_value_i ( const char *id, const char *name, const char *version, CORBA::Boolean is_custom, CORBA::Boolean is_abstract, - IR::ValueDef_ptr base_value, + IR_ValueDef_ptr base_value, CORBA::Boolean is_truncatable, - const IR::ValueDefSeq &abstract_base_values, - const IR::InterfaceDefSeq & supported_interfaces, - const IR::InitializerSeq &initializers, + const IR_ValueDefSeq &abstract_base_values, + const IR_InterfaceDefSeq & supported_interfaces, + const IR_InitializerSeq &initializers, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ValueBoxDef_ptr create_value_box ( + virtual IR_ValueBoxDef_ptr create_value_box ( const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ValueBoxDef_ptr create_value_box_i ( + IR_ValueBoxDef_ptr create_value_box_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ExceptionDef_ptr create_exception ( + virtual IR_ExceptionDef_ptr create_exception ( const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ExceptionDef_ptr create_exception_i ( + IR_ExceptionDef_ptr create_exception_i ( const char *id, const char *name, const char *version, - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::NativeDef_ptr create_native ( + virtual IR_NativeDef_ptr create_native ( const char *id, const char *name, const char *version, @@ -361,7 +361,7 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::NativeDef_ptr create_native_i ( + IR_NativeDef_ptr create_native_i ( const char *id, const char *name, const char *version, @@ -404,20 +404,20 @@ protected: const char *name, const char *version, const char *sub_section, - IR::DefinitionKind def_kind + IR_DefinitionKind def_kind ); // Code common to all the create_* methods. protected: void lookup_attr ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, const char *search_name, CORBA::Boolean exclude_inherited ); void lookup_op ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, const char *search_name, CORBA::Boolean exclude_inherited @@ -425,11 +425,11 @@ protected: private: void lookup_name_recursive ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, const char *search_name, CORBA::Long levels_to_search, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () @@ -444,7 +444,7 @@ private: // Checks for global existence of the repo id. CORBA::Boolean valid_container ( - const IR::DefinitionKind op_kind, + const IR_DefinitionKind op_kind, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp index 255908ae6d0..5cd7101cb9d 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp @@ -18,11 +18,11 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_EmitsDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Emits; + return dk_Emits; } void @@ -41,7 +41,7 @@ TAO_EmitsDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_EmitsDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -50,7 +50,7 @@ TAO_EmitsDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_EmitsDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h index b1871867cbe..e870009e72f 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h @@ -10,7 +10,7 @@ // EmitsDef_i.h // // = DESCRIPTION -// IR::EmitsDef servant class. +// IR_EmitsDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_EmitsDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -70,14 +70,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp index 68dec4e43bf..2219826b036 100644 --- a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp @@ -20,11 +20,11 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_EnumDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Enum; + return dk_Enum; } CORBA::TypeCode_ptr @@ -50,7 +50,7 @@ TAO_EnumDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) "name", name); - IR::EnumMemberSeq_var members = this->members_i (ACE_TRY_ENV); + IR_EnumMemberSeq_var members = this->members_i (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_enum_tc (id.c_str (), @@ -59,7 +59,7 @@ TAO_EnumDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); } -IR::EnumMemberSeq * +IR_EnumMemberSeq * TAO_EnumDef_i::members (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -68,7 +68,7 @@ TAO_EnumDef_i::members (CORBA::Environment &ACE_TRY_ENV) return this->members_i (ACE_TRY_ENV); } -IR::EnumMemberSeq * +IR_EnumMemberSeq * TAO_EnumDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -77,9 +77,9 @@ TAO_EnumDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) "count", count); - IR::EnumMemberSeq *retval = 0; + IR_EnumMemberSeq *retval = 0; ACE_NEW_THROW_EX (retval, - IR::EnumMemberSeq (count), + IR_EnumMemberSeq (count), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -106,7 +106,7 @@ TAO_EnumDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) } void -TAO_EnumDef_i::members (const IR::EnumMemberSeq &members, +TAO_EnumDef_i::members (const IR_EnumMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -117,7 +117,7 @@ TAO_EnumDef_i::members (const IR::EnumMemberSeq &members, } void -TAO_EnumDef_i::members_i (const IR::EnumMemberSeq &members, +TAO_EnumDef_i::members_i (const IR_EnumMemberSeq &members, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.h b/TAO/orbsvcs/IFR_Service/EnumDef_i.h index 762beebc320..98451bd53e7 100644 --- a/TAO/orbsvcs/IFR_Service/EnumDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.h @@ -10,7 +10,7 @@ // EnumDef_i.h // // = DESCRIPTION -// IR::EnumDef servant class. +// IR_EnumDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_EnumDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -71,27 +71,27 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::EnumMemberSeq *members ( + virtual IR_EnumMemberSeq *members ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::EnumMemberSeq *members_i ( + IR_EnumMemberSeq *members_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const IR::EnumMemberSeq &members, + const IR_EnumMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const IR::EnumMemberSeq &members, + const IR_EnumMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp index b8b3222e88c..66e955415e6 100644 --- a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp @@ -33,7 +33,7 @@ TAO_EventDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_EventDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42,7 +42,7 @@ TAO_EventDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_EventDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -70,16 +70,16 @@ TAO_EventDef_i::is_a_i (const char * /* event_id */, return 0; } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_EventDef_i::event (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::ValueDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_ValueDef::_nil ()); return this->event_i (ACE_TRY_ENV); } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_EventDef_i::event_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.h b/TAO/orbsvcs/IFR_Service/EventDef_i.h index 429ca51568b..7605dfea815 100644 --- a/TAO/orbsvcs/IFR_Service/EventDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EventDef_i.h @@ -10,7 +10,7 @@ // EventDef_i.h // // = DESCRIPTION -// IR::EventDef servant class. +// IR_EventDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -63,14 +63,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -91,13 +91,13 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ValueDef_ptr event ( + virtual IR_ValueDef_ptr event ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ValueDef_ptr event_i ( + IR_ValueDef_ptr event_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp index 3dfb14e2b35..5cebbe7b370 100644 --- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp @@ -23,11 +23,11 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ExceptionDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Exception; + return dk_Exception; } void @@ -52,7 +52,7 @@ TAO_ExceptionDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK; } -IR::Contained::Description * +IR_Contained::Description * TAO_ExceptionDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -61,22 +61,22 @@ TAO_ExceptionDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Contained::Description *desc_ptr = 0; + IR_Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - IR::Contained::Description, + IR_Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::Contained::Description_var retval = desc_ptr; + IR_Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - IR::ExceptionDescription ed; + IR_ExceptionDescription ed; ed.name = this->name_i (ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -126,7 +126,7 @@ TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) "name", name); - IR::StructMemberSeq_var members = this->members_i (ACE_TRY_ENV); + IR_StructMemberSeq_var members = this->members_i (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_exception_tc (id.c_str (), @@ -135,7 +135,7 @@ TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); } -IR::StructMemberSeq * +IR_StructMemberSeq * TAO_ExceptionDef_i::members (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -144,11 +144,11 @@ TAO_ExceptionDef_i::members (CORBA::Environment &ACE_TRY_ENV) return this->members_i (ACE_TRY_ENV); } -IR::StructMemberSeq * +IR_StructMemberSeq * TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_Unbounded_Queue<IR::DefinitionKind> kind_queue; + ACE_Unbounded_Queue<IR_DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; ACE_Unbounded_Queue<ACE_TString> name_queue; @@ -201,8 +201,8 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); kind_queue.enqueue_tail (def_kind); } @@ -210,19 +210,19 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) size_t size = kind_queue.size (); - IR::StructMemberSeq *members = 0; + IR_StructMemberSeq *members = 0; ACE_NEW_THROW_EX (members, - IR::StructMemberSeq (size), + IR_StructMemberSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); members->length (size); - IR::StructMemberSeq_var retval = members; + IR_StructMemberSeq_var retval = members; ACE_TString name; ACE_TString path; - IR::DefinitionKind kind = IR::dk_none; + IR_DefinitionKind kind = dk_none; CORBA::Object_var obj; ACE_Configuration_Section_Key member_key; TAO_IDLType_i *impl = 0; @@ -243,7 +243,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_CHECK_RETURN (0); - retval[k].type_def = IR::IDLType::_narrow (obj.in (), + retval[k].type_def = IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -267,7 +267,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) } void -TAO_ExceptionDef_i::members (const IR::StructMemberSeq &members, +TAO_ExceptionDef_i::members (const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -278,7 +278,7 @@ TAO_ExceptionDef_i::members (const IR::StructMemberSeq &members, } void -TAO_ExceptionDef_i::members_i (const IR::StructMemberSeq &members, +TAO_ExceptionDef_i::members_i (const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h index c6d59280a26..6e064928d1a 100644 --- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h @@ -10,7 +10,7 @@ // ExceptionDef_i.h // // = DESCRIPTION -// IR::ExceptionDef servant class. +// IR_ExceptionDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_ExceptionDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -71,14 +71,14 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -97,27 +97,27 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::StructMemberSeq *members ( + virtual IR_StructMemberSeq *members ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::StructMemberSeq *members_i ( + IR_StructMemberSeq *members_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const IR::StructMemberSeq & members, + const IR_StructMemberSeq & members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const IR::StructMemberSeq & members, + const IR_StructMemberSeq & members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp index e0396c70f90..39a9268d0b6 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp @@ -20,11 +20,11 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_FactoryDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Factory; + return dk_Factory; } void @@ -43,7 +43,7 @@ TAO_FactoryDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_FactoryDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,7 +52,7 @@ TAO_FactoryDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_FactoryDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h index 39b6191fc10..8cba17d416c 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h @@ -10,7 +10,7 @@ // FactoryDef_i.h // // = DESCRIPTION -// IR::FactoryDef servant class. +// IR_FactoryDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_FactoryDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -69,14 +69,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp index 06e9b01ac02..7176f75f6e1 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp @@ -18,11 +18,11 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_FinderDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Finder; + return dk_Finder; } void @@ -41,7 +41,7 @@ TAO_FinderDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_FinderDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -50,7 +50,7 @@ TAO_FinderDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_FinderDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.h b/TAO/orbsvcs/IFR_Service/FinderDef_i.h index b7489fdd035..7da9d7ee3db 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.h @@ -10,7 +10,7 @@ // FinderDef_i.h // // = DESCRIPTION -// IR::FinderDef servant class. +// IR_FinderDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_FinderDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -69,14 +69,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp index 1f25cae8026..37917f02486 100644 --- a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp @@ -17,11 +17,11 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_FixedDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Fixed; + return dk_Fixed; } void diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.h b/TAO/orbsvcs/IFR_Service/FixedDef_i.h index 2bad40a3ec1..6d9f3adfc51 100644 --- a/TAO/orbsvcs/IFR_Service/FixedDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.h @@ -10,7 +10,7 @@ // FixedDef_i.h // // = DESCRIPTION -// IR::FixedDef servant class. +// IR_FixedDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_FixedDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp index 8b8245c10a3..6f76461af09 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 +IR_DefinitionKind TAO_HomeDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Home; + return dk_Home; } void @@ -43,7 +43,7 @@ TAO_HomeDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_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 * +IR_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, + IR_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 */, + IR_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 IR_ParDescriptionSeq ¶ms, + const IR_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 (IR_FactoryDef::_nil ()); return this->create_factory_i (id, name, @@ -227,12 +227,12 @@ TAO_HomeDef_i::create_factory (const char *id, ACE_TRY_ENV); } -IR::FactoryDef_ptr +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 */, + const IR_ParDescriptionSeq & /* params */, + const IR_ExceptionDefSeq & /* exceptions */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -240,16 +240,16 @@ TAO_HomeDef_i::create_factory_i (const char * /* id */, 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 IR_ParDescriptionSeq ¶ms, + const IR_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,12 +259,12 @@ TAO_HomeDef_i::create_finder (const char *id, ACE_TRY_ENV); } -IR::FinderDef_ptr +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 */, + const IR_ParDescriptionSeq & /* params */, + const IR_ExceptionDefSeq & /* exceptions */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.h b/TAO/orbsvcs/IFR_Service/HomeDef_i.h index b32f4cdcd8a..01e496581ca 100644 --- a/TAO/orbsvcs/IFR_Service/HomeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.h @@ -10,7 +10,7 @@ // HomeDef_i.h // // = DESCRIPTION -// IR::HomeDef servant class. +// IR_HomeDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_HomeDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -69,14 +69,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -97,61 +97,61 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::HomeDef_ptr base_home ( + virtual IR_HomeDef_ptr base_home ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::HomeDef_ptr base_home_i ( + IR_HomeDef_ptr base_home_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ComponentDef_ptr managed_component ( + virtual IR_ComponentDef_ptr managed_component ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ComponentDef_ptr managed_component_i ( + IR_ComponentDef_ptr managed_component_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::PrimaryKeyDef_ptr primary_key ( + virtual IR_PrimaryKeyDef_ptr primary_key ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::PrimaryKeyDef_ptr primary_key_i ( + IR_PrimaryKeyDef_ptr primary_key_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::FactoryDefSeq *factories ( + virtual IR_FactoryDefSeq *factories ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::FactoryDefSeq *factories_i ( + IR_FactoryDefSeq *factories_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::FinderDefSeq *finders ( + virtual IR_FinderDefSeq *finders ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::FinderDefSeq *finders_i ( + IR_FinderDefSeq *finders_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -169,65 +169,65 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::PrimaryKeyDef_ptr create_primary_key ( + virtual IR_PrimaryKeyDef_ptr create_primary_key ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr primary_key, + IR_ValueDef_ptr primary_key, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::PrimaryKeyDef_ptr create_primary_key_i ( + IR_PrimaryKeyDef_ptr create_primary_key_i ( const char *id, const char *name, const char *version, - IR::ValueDef_ptr primary_key, + IR_ValueDef_ptr primary_key, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::FactoryDef_ptr create_factory ( + virtual IR_FactoryDef_ptr create_factory ( const char *id, const char *name, const char *version, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::FactoryDef_ptr create_factory_i ( + IR_FactoryDef_ptr create_factory_i ( const char *id, const char *name, const char *version, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::FinderDef_ptr create_finder ( + virtual IR_FinderDef_ptr create_finder ( const char *id, const char *name, const char *version, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::FinderDef_ptr create_finder_i ( + IR_FinderDef_ptr create_finder_i ( const char *id, const char *name, const char *version, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/IDLType_i.h b/TAO/orbsvcs/IFR_Service/IDLType_i.h index 1e898117185..3384cfbd782 100644 --- a/TAO/orbsvcs/IFR_Service/IDLType_i.h +++ b/TAO/orbsvcs/IFR_Service/IDLType_i.h @@ -10,7 +10,7 @@ // IDLType_i.h // // = DESCRIPTION -// IR::IDLType servant class. +// IR_IDLType servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index c96ac6f8b22..483b243e994 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -16,7 +16,7 @@ IFR_Service::IFR_Service (void) ior_multicast_ (0), config_ (0), repo_impl_ (0), - repository_ (IR::Repository::_nil ()) + repository_ (IR_Repository::_nil ()) { } diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index ad7f85af709..c01650270a8 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -97,7 +97,7 @@ protected: TAO_Repository_i *repo_impl_; // The IFR implementation instance. - IR::Repository_ptr repository_; + IR_Repository_ptr repository_; // The Interface Repository object reference. CORBA::String_var ifr_ior_; diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h index 2fcfb391aec..2547665280e 100644 --- a/TAO/orbsvcs/IFR_Service/IRObject_i.h +++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h @@ -52,7 +52,7 @@ public: virtual ~TAO_IRObject_i (void); // Destructor. - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp index 5771d1e066f..0ab9c52e942 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp @@ -24,11 +24,11 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_InterfaceDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Interface; + return dk_Interface; } void @@ -61,7 +61,7 @@ TAO_InterfaceDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK; } -IR::Contained::Description * +IR_Contained::Description * TAO_InterfaceDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -70,22 +70,22 @@ TAO_InterfaceDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Contained::Description *desc_ptr = 0; + IR_Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - IR::Contained::Description, + IR_Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::Contained::Description_var retval = desc_ptr; + IR_Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - IR::InterfaceDescription ifd; + IR_InterfaceDescription ifd; ifd.name = this->name_i (ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -200,12 +200,12 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK_RETURN (0); } - IR::InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV); + IR_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); - IR::RepositoryIdSeq repo_ids (length); + IR_RepositoryIdSeq repo_ids (length); repo_ids.length (length); @@ -281,7 +281,7 @@ TAO_InterfaceDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); } -IR::InterfaceDefSeq * +IR_InterfaceDefSeq * TAO_InterfaceDef_i::base_interfaces (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -290,7 +290,7 @@ TAO_InterfaceDef_i::base_interfaces (CORBA::Environment &ACE_TRY_ENV) return this->base_interfaces_i (ACE_TRY_ENV); } -IR::InterfaceDefSeq * +IR_InterfaceDefSeq * TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -305,8 +305,8 @@ TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV) u_int kind = 0; ACE_Configuration::VALUETYPE type; ACE_TString section_name, inherited_path; - IR::DefinitionKind def_kind = IR::dk_none; - ACE_Unbounded_Queue<IR::DefinitionKind> kind_queue; + IR_DefinitionKind def_kind = dk_none; + ACE_Unbounded_Queue<IR_DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; ACE_Configuration_Section_Key base_key; @@ -334,7 +334,7 @@ TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - def_kind = ACE_static_cast (IR::DefinitionKind, kind); + def_kind = ACE_static_cast (IR_DefinitionKind, kind); kind_queue.enqueue_tail (def_kind); } @@ -342,18 +342,18 @@ TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV) size_t size = kind_queue.size (); - IR::InterfaceDefSeq *seq = 0; + IR_InterfaceDefSeq *seq = 0; ACE_NEW_THROW_EX (seq, - IR::InterfaceDefSeq (size), + IR_InterfaceDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); seq->length (size); - IR::InterfaceDefSeq_var retval = seq; + IR_InterfaceDefSeq_var retval = seq; for (CORBA::ULong i = 0; i < size; ++i) { - IR::DefinitionKind def_kind; + IR_DefinitionKind def_kind; kind_queue.dequeue_head (def_kind); ACE_TString path; @@ -367,7 +367,7 @@ TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV) ); ACE_CHECK_RETURN (0); - retval[i] = IR::InterfaceDef::_narrow (obj.in (), + retval[i] = IR_InterfaceDef::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); } @@ -376,7 +376,7 @@ TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV) } void -TAO_InterfaceDef_i::base_interfaces (const IR::InterfaceDefSeq &base_interfaces, +TAO_InterfaceDef_i::base_interfaces (const IR_InterfaceDefSeq &base_interfaces, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -387,7 +387,7 @@ TAO_InterfaceDef_i::base_interfaces (const IR::InterfaceDefSeq &base_interfaces, } void -TAO_InterfaceDef_i::base_interfaces_i (const IR::InterfaceDefSeq &base_interfaces, +TAO_InterfaceDef_i::base_interfaces_i (const IR_InterfaceDefSeq &base_interfaces, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -552,7 +552,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id, return 1; // Is it one of our ancestors' types? - IR::InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV); + IR_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -590,20 +590,20 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id, return 0; } -IR::AttributeDef_ptr +IR_AttributeDef_ptr TAO_InterfaceDef_i::create_attribute ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, - IR::AttributeMode mode, - const IR::ExceptionDefSeq &get_exceptions, - const IR::ExceptionDefSeq &put_exceptions, + IR_IDLType_ptr type, + IR_AttributeMode mode, + const IR_ExceptionDefSeq &get_exceptions, + const IR_ExceptionDefSeq &put_exceptions, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::AttributeDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_AttributeDef::_nil ()); return this->create_attribute_i (id, name, @@ -615,15 +615,15 @@ TAO_InterfaceDef_i::create_attribute ( ACE_TRY_ENV); } -IR::AttributeDef_ptr +IR_AttributeDef_ptr TAO_InterfaceDef_i::create_attribute_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, - IR::AttributeMode mode, - const IR::ExceptionDefSeq &get_exceptions, - const IR::ExceptionDefSeq &put_exceptions, + IR_IDLType_ptr type, + IR_AttributeMode mode, + const IR_ExceptionDefSeq &get_exceptions, + const IR_ExceptionDefSeq &put_exceptions, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -631,10 +631,10 @@ TAO_InterfaceDef_i::create_attribute_i ( CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AttributeDef::_nil ()); + ACE_CHECK_RETURN (IR_AttributeDef::_nil ()); if (bad_params) - return IR::AttributeDef::_nil (); + return IR_AttributeDef::_nil (); ACE_Configuration_Section_Key attrs_key; @@ -646,20 +646,20 @@ TAO_InterfaceDef_i::create_attribute_i ( ACE_Configuration_Section_Key new_key; - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_TString path = this->create_common (attrs_key, new_key, id, name, version, "attrs\\", - IR::dk_Attribute); + dk_Attribute); // Store the path to the attribute's type definition. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AttributeDef::_nil ()); + ACE_CHECK_RETURN (IR_AttributeDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -694,7 +694,7 @@ TAO_InterfaceDef_i::create_attribute_i ( this->repo_->ir_poa ()->reference_to_id (get_exceptions[i], ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AttributeDef::_nil ()); + ACE_CHECK_RETURN (IR_AttributeDef::_nil ()); CORBA::String_var get_except_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -726,7 +726,7 @@ TAO_InterfaceDef_i::create_attribute_i ( this->repo_->ir_poa ()->reference_to_id (put_exceptions[i], ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AttributeDef::_nil ()); + ACE_CHECK_RETURN (IR_AttributeDef::_nil ()); CORBA::String_var put_except_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -741,32 +741,32 @@ TAO_InterfaceDef_i::create_attribute_i ( // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Attribute, + this->repo_->servant_factory ()->create_objref (dk_Attribute, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AttributeDef::_nil ()); + ACE_CHECK_RETURN (IR_AttributeDef::_nil ()); - IR::AttributeDef_var retval = - IR::AttributeDef::_narrow (obj.in (), + IR_AttributeDef_var retval = + IR_AttributeDef::_narrow (obj.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::AttributeDef::_nil ()); + ACE_CHECK_RETURN (IR_AttributeDef::_nil ()); return retval._retn (); } -IR::OperationDef_ptr +IR_OperationDef_ptr TAO_InterfaceDef_i::create_operation (const char *id, const char *name, const char *version, - IR::IDLType_ptr result, - IR::OperationMode mode, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, - const IR::ContextIdSeq &contexts, + IR_IDLType_ptr result, + IR_OperationMode mode, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::OperationDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_OperationDef::_nil ()); return this->create_operation_i (id, name, @@ -779,25 +779,25 @@ TAO_InterfaceDef_i::create_operation (const char *id, ACE_TRY_ENV); } -IR::OperationDef_ptr +IR_OperationDef_ptr TAO_InterfaceDef_i::create_operation_i (const char *id, const char *name, const char *version, - IR::IDLType_ptr result, - IR::OperationMode mode, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, - const IR::ContextIdSeq &contexts, + IR_IDLType_ptr result, + IR_OperationMode mode, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean bad_params = this->pre_exist (id, name, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::OperationDef::_nil ()); + ACE_CHECK_RETURN (IR_OperationDef::_nil ()); if (bad_params) - return IR::OperationDef::_nil (); + return IR_OperationDef::_nil (); ACE_Configuration_Section_Key ops_key; @@ -809,20 +809,20 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, ACE_Configuration_Section_Key new_key; - // Common to all IR objects created in IR::Container. + // Common to all IR objects created in IR_Container. ACE_TString path = this->create_common (ops_key, new_key, id, name, version, "ops\\", - IR::dk_Operation); + dk_Operation); // Get the path to our return type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (result, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::OperationDef::_nil ()); + ACE_CHECK_RETURN (IR_OperationDef::_nil ()); CORBA::String_var result_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -871,7 +871,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, this->repo_->ir_poa ()->reference_to_id (params[i].type_def, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::OperationDef::_nil ()); + ACE_CHECK_RETURN (IR_OperationDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -904,7 +904,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, this->repo_->ir_poa ()->reference_to_id (exceptions[i], ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::OperationDef::_nil ()); + ACE_CHECK_RETURN (IR_OperationDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -941,24 +941,24 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, // Create the object reference. CORBA::Object_var obj = - this->repo_->servant_factory ()->create_objref (IR::dk_Operation, + this->repo_->servant_factory ()->create_objref (dk_Operation, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::OperationDef::_nil ()); + ACE_CHECK_RETURN (IR_OperationDef::_nil ()); - IR::OperationDef_var retval = - IR::OperationDef::_narrow (obj.in (), + IR_OperationDef_var retval = + IR_OperationDef::_narrow (obj.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::OperationDef::_nil ()); + ACE_CHECK_RETURN (IR_OperationDef::_nil ()); return retval._retn (); } void TAO_InterfaceDef_i::inherited_contents ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -976,8 +976,8 @@ TAO_InterfaceDef_i::inherited_contents ( int index = 0; // Attributes - if (limit_type == IR::dk_Attribute - || limit_type == IR::dk_all) + if (limit_type == dk_Attribute + || limit_type == dk_all) { ACE_Configuration_Section_Key attrs_key; this->repo_->config ()->open_section (this->section_key_, @@ -990,7 +990,7 @@ TAO_InterfaceDef_i::inherited_contents ( section_name) == 0) { - kind_queue.enqueue_tail (IR::dk_Attribute); + kind_queue.enqueue_tail (dk_Attribute); path_queue.enqueue_tail ( path + "\\attrs\\" + section_name.c_str () @@ -999,8 +999,8 @@ TAO_InterfaceDef_i::inherited_contents ( } // Operations - if (limit_type == IR::dk_Operation - || limit_type == IR::dk_all) + if (limit_type == dk_Operation + || limit_type == dk_all) { index = 0; @@ -1015,7 +1015,7 @@ TAO_InterfaceDef_i::inherited_contents ( section_name) == 0) { - kind_queue.enqueue_tail (IR::dk_Operation); + kind_queue.enqueue_tail (dk_Operation); path_queue.enqueue_tail ( path + "\\ops\\" + section_name.c_str () diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h index 051830cbbf9..73aa025cc81 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h @@ -10,7 +10,7 @@ // InterfaceDef_i.h // // = DESCRIPTION -// IR::InterfaceDef servant class. +// IR_InterfaceDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -52,7 +52,7 @@ public: virtual ~TAO_InterfaceDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -72,14 +72,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -100,27 +100,27 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::InterfaceDefSeq *base_interfaces ( + virtual IR_InterfaceDefSeq *base_interfaces ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::InterfaceDefSeq *base_interfaces_i ( + IR_InterfaceDefSeq *base_interfaces_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_interfaces ( - const IR::InterfaceDefSeq &base_interfaces, + const IR_InterfaceDefSeq &base_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void base_interfaces_i ( - const IR::InterfaceDefSeq &base_interfaces, + const IR_InterfaceDefSeq &base_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -192,64 +192,64 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::AttributeDef_ptr create_attribute ( + virtual IR_AttributeDef_ptr create_attribute ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, - IR::AttributeMode mode, - const IR::ExceptionDefSeq &get_exceptions, - const IR::ExceptionDefSeq &put_exceptions, + IR_IDLType_ptr type, + IR_AttributeMode mode, + const IR_ExceptionDefSeq &get_exceptions, + const IR_ExceptionDefSeq &put_exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::AttributeDef_ptr create_attribute_i ( + IR_AttributeDef_ptr create_attribute_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, - IR::AttributeMode mode, - const IR::ExceptionDefSeq &get_exceptions, - const IR::ExceptionDefSeq &put_exceptions, + IR_IDLType_ptr type, + IR_AttributeMode mode, + const IR_ExceptionDefSeq &get_exceptions, + const IR_ExceptionDefSeq &put_exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::OperationDef_ptr create_operation ( + virtual IR_OperationDef_ptr create_operation ( const char *id, const char *name, const char *version, - IR::IDLType_ptr result, - IR::OperationMode mode, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, - const IR::ContextIdSeq &contexts, + IR_IDLType_ptr result, + IR_OperationMode mode, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::OperationDef_ptr create_operation_i ( + IR_OperationDef_ptr create_operation_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr result, - IR::OperationMode mode, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, - const IR::ContextIdSeq &contexts, + IR_IDLType_ptr result, + IR_OperationMode mode, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void inherited_contents ( - ACE_Unbounded_Queue<IR::DefinitionKind> &kind_queue, + ACE_Unbounded_Queue<IR_DefinitionKind> &kind_queue, ACE_Unbounded_Queue<ACE_TString> &path_queue, - IR::DefinitionKind limit_type, + IR_DefinitionKind limit_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp index 81174a873fb..1a2a9ab5dd9 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp @@ -18,11 +18,11 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ModuleDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Module; + return dk_Module; } void @@ -47,7 +47,7 @@ TAO_ModuleDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK; } -IR::Contained::Description * +IR_Contained::Description * TAO_ModuleDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -56,22 +56,22 @@ TAO_ModuleDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Contained::Description *desc_ptr = 0; + IR_Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - IR::Contained::Description, + IR_Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::Contained::Description_var retval = desc_ptr; + IR_Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - IR::ModuleDescription md; + IR_ModuleDescription md; md.name = this->name_i (ACE_TRY_ENV); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h index 77ed94f0c29..94b3553decf 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h @@ -10,7 +10,7 @@ // ModuleDef_i.h // // = DESCRIPTION -// IR::ModuleDef servant class. +// IR_ModuleDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_ModuleDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -71,14 +71,14 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp index 57953d3ee1a..fa14aa56946 100644 --- a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp @@ -19,11 +19,11 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_NativeDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Native; + return dk_Native; } CORBA::TypeCode_ptr diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.h b/TAO/orbsvcs/IFR_Service/NativeDef_i.h index c36f610f728..8b7a6265679 100644 --- a/TAO/orbsvcs/IFR_Service/NativeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.h @@ -10,7 +10,7 @@ // NativeDef_i.h // // = DESCRIPTION -// IR::NativeDef servant class. +// IR_NativeDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_NativeDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp index 79d3b53dbaa..1cd24cca105 100644 --- a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp @@ -23,14 +23,14 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_OperationDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Operation; + return dk_Operation; } -IR::Contained::Description * +IR_Contained::Description * TAO_OperationDef_i::describe (CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -39,17 +39,17 @@ TAO_OperationDef_i::describe (CORBA::Environment &ACE_TRY_ENV ) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_OperationDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Contained::Description *desc_ptr = 0; + IR_Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - IR::Contained::Description, + IR_Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::Contained::Description_var retval = desc_ptr; + IR_Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -94,16 +94,16 @@ TAO_OperationDef_i::result_i (CORBA::Environment &ACE_TRY_ENV) return impl->type_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_OperationDef_i::result_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->result_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_OperationDef_i::result_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -123,21 +123,21 @@ TAO_OperationDef_i::result_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, result_path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - return IR::IDLType::_narrow (obj.in (), + return IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); } void -TAO_OperationDef_i::result_def (IR::IDLType_ptr result_def, +TAO_OperationDef_i::result_def (IR_IDLType_ptr result_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -148,7 +148,7 @@ TAO_OperationDef_i::result_def (IR::IDLType_ptr result_def, } void -TAO_OperationDef_i::result_def_i (IR::IDLType_ptr result_def, +TAO_OperationDef_i::result_def_i (IR_IDLType_ptr result_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -165,7 +165,7 @@ TAO_OperationDef_i::result_def_i (IR::IDLType_ptr result_def, result_path.in ()); } -IR::ParDescriptionSeq * +IR_ParDescriptionSeq * TAO_OperationDef_i::params (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -174,7 +174,7 @@ TAO_OperationDef_i::params (CORBA::Environment &ACE_TRY_ENV) return this->params_i (ACE_TRY_ENV); } -IR::ParDescriptionSeq * +IR_ParDescriptionSeq * TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -213,9 +213,9 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV) size_t size = key_queue.size (); - IR::ParDescriptionSeq *pd_seq = 0; + IR_ParDescriptionSeq *pd_seq = 0; ACE_NEW_THROW_EX (pd_seq, - IR::ParDescriptionSeq (size), + IR_ParDescriptionSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -224,14 +224,14 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV) if (size == 0) return pd_seq; - IR::ParDescriptionSeq_var retval = pd_seq; + IR_ParDescriptionSeq_var retval = pd_seq; for (i = 0; i < size; ++i) { ACE_Configuration_Section_Key key; key_queue.dequeue_head (key); - IR::ParameterDescription pd; + IR_ParameterDescription pd; ACE_TString name; this->repo_->config ()->get_string_value (key, @@ -245,7 +245,7 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV) "mode", mode); - pd.mode = ACE_static_cast (IR::ParameterMode, mode); + pd.mode = ACE_static_cast (IR_ParameterMode, mode); ACE_TString type_path; this->repo_->config ()->get_string_value (key, @@ -273,8 +273,8 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, @@ -282,7 +282,7 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_CHECK_RETURN (0); - pd.type_def = IR::IDLType::_narrow (obj.in (), + pd.type_def = IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -293,7 +293,7 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV) } void -TAO_OperationDef_i::params (const IR::ParDescriptionSeq ¶ms, +TAO_OperationDef_i::params (const IR_ParDescriptionSeq ¶ms, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -304,7 +304,7 @@ TAO_OperationDef_i::params (const IR::ParDescriptionSeq ¶ms, } void -TAO_OperationDef_i::params_i (const IR::ParDescriptionSeq ¶ms, +TAO_OperationDef_i::params_i (const IR_ParDescriptionSeq ¶ms, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -358,16 +358,16 @@ TAO_OperationDef_i::params_i (const IR::ParDescriptionSeq ¶ms, } } -IR::OperationMode +IR_OperationMode TAO_OperationDef_i::mode (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::OP_NORMAL); + TAO_IFR_READ_GUARD_RETURN (IR_OP_NORMAL); return this->mode_i (ACE_TRY_ENV); } -IR::OperationMode +IR_OperationMode TAO_OperationDef_i::mode_i (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -376,11 +376,11 @@ TAO_OperationDef_i::mode_i (CORBA::Environment &) "mode", mode); - return ACE_static_cast (IR::OperationMode, mode); + return ACE_static_cast (IR_OperationMode, mode); } void -TAO_OperationDef_i::mode (IR::OperationMode mode, +TAO_OperationDef_i::mode (IR_OperationMode mode, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -391,7 +391,7 @@ TAO_OperationDef_i::mode (IR::OperationMode mode, } void -TAO_OperationDef_i::mode_i (IR::OperationMode mode, +TAO_OperationDef_i::mode_i (IR_OperationMode mode, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -400,7 +400,7 @@ TAO_OperationDef_i::mode_i (IR::OperationMode mode, mode); } -IR::ContextIdSeq * +IR_ContextIdSeq * TAO_OperationDef_i::contexts (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -409,7 +409,7 @@ TAO_OperationDef_i::contexts (CORBA::Environment &ACE_TRY_ENV) return this->contexts_i (ACE_TRY_ENV); } -IR::ContextIdSeq * +IR_ContextIdSeq * TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -445,9 +445,9 @@ TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV) size_t size = context_queue.size (); - IR::ContextIdSeq *ci_seq = 0; + IR_ContextIdSeq *ci_seq = 0; ACE_NEW_THROW_EX (ci_seq, - IR::ContextIdSeq (size), + IR_ContextIdSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -465,7 +465,7 @@ TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV) } void -TAO_OperationDef_i::contexts (const IR::ContextIdSeq &contexts, +TAO_OperationDef_i::contexts (const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -476,7 +476,7 @@ TAO_OperationDef_i::contexts (const IR::ContextIdSeq &contexts, } void -TAO_OperationDef_i::contexts_i (const IR::ContextIdSeq &contexts, +TAO_OperationDef_i::contexts_i (const IR_ContextIdSeq &contexts, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -505,7 +505,7 @@ TAO_OperationDef_i::contexts_i (const IR::ContextIdSeq &contexts, } } -IR::ExceptionDefSeq * +IR_ExceptionDefSeq * TAO_OperationDef_i::exceptions (CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -514,7 +514,7 @@ TAO_OperationDef_i::exceptions (CORBA::Environment &ACE_TRY_ENV ) return this->exceptions_i (ACE_TRY_ENV); } -IR::ExceptionDefSeq * +IR_ExceptionDefSeq * TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -526,7 +526,7 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) excepts_key); int index = 0; - ACE_Unbounded_Queue<IR::DefinitionKind> kind_queue; + ACE_Unbounded_Queue<IR_DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; // This section may not have been created. @@ -535,7 +535,7 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) ACE_TString field_name, type_path; ACE_Configuration::VALUETYPE type; u_int kind = 0; - IR::DefinitionKind def_kind = IR::dk_none; + IR_DefinitionKind def_kind = dk_none; ACE_Configuration_Section_Key except_key; while (this->repo_->config ()->enumerate_values (excepts_key, @@ -563,7 +563,7 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) kind); def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + ACE_static_cast (IR_DefinitionKind, kind); kind_queue.enqueue_tail (def_kind); } @@ -572,9 +572,9 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) size_t size = kind_queue.size (); - IR::ExceptionDefSeq *ed_seq = 0; + IR_ExceptionDefSeq *ed_seq = 0; ACE_NEW_THROW_EX (ed_seq, - IR::ExceptionDefSeq (size), + IR_ExceptionDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -583,11 +583,11 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) if (index == 0) return ed_seq; - IR::ExceptionDefSeq_var retval = ed_seq; + IR_ExceptionDefSeq_var retval = ed_seq; for (CORBA::ULong i = 0; i < size; ++i) { - IR::DefinitionKind def_kind; + IR_DefinitionKind def_kind; kind_queue.dequeue_head (def_kind); ACE_TString path; @@ -599,7 +599,7 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) ACE_TRY_ENV); ACE_CHECK_RETURN (0); - retval[i] = IR::ExceptionDef::_narrow (obj.in (), + retval[i] = IR_ExceptionDef::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); } @@ -608,7 +608,7 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV ) } void -TAO_OperationDef_i::exceptions (const IR::ExceptionDefSeq &exceptions, +TAO_OperationDef_i::exceptions (const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -619,7 +619,7 @@ TAO_OperationDef_i::exceptions (const IR::ExceptionDefSeq &exceptions, } void -TAO_OperationDef_i::exceptions_i (const IR::ExceptionDefSeq &exceptions, +TAO_OperationDef_i::exceptions_i (const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -657,12 +657,12 @@ TAO_OperationDef_i::exceptions_i (const IR::ExceptionDefSeq &exceptions, } -IR::OperationDescription +IR_OperationDescription TAO_OperationDef_i::make_description ( CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::OperationDescription od; + IR_OperationDescription od; od.name = this->name_i (ACE_TRY_ENV); ACE_CHECK_RETURN (od); @@ -686,12 +686,12 @@ TAO_OperationDef_i::make_description ( od.mode = this->mode_i (ACE_TRY_ENV); ACE_CHECK_RETURN (od); - IR::ContextIdSeq_var cid_seq = this->contexts_i (ACE_TRY_ENV); + IR_ContextIdSeq_var cid_seq = this->contexts_i (ACE_TRY_ENV); ACE_CHECK_RETURN (od); od.contexts = cid_seq.in (); - IR::ParDescriptionSeq_var pd_seq = this->params_i (ACE_TRY_ENV); + IR_ParDescriptionSeq_var pd_seq = this->params_i (ACE_TRY_ENV); ACE_CHECK_RETURN (od); od.parameters = pd_seq.in (); diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.h b/TAO/orbsvcs/IFR_Service/OperationDef_i.h index a14ba6baec8..614f4b6a458 100644 --- a/TAO/orbsvcs/IFR_Service/OperationDef_i.h +++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.h @@ -10,7 +10,7 @@ // OperationDef_i.h // // = DESCRIPTION -// IR::OperationDef servant class. +// IR_OperationDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,21 +50,21 @@ public: virtual ~TAO_OperationDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -83,137 +83,137 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::IDLType_ptr result_def ( + virtual IR_IDLType_ptr result_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr result_def_i ( + IR_IDLType_ptr result_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void result_def ( - IR::IDLType_ptr result_def, + IR_IDLType_ptr result_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void result_def_i ( - IR::IDLType_ptr result_def, + IR_IDLType_ptr result_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ParDescriptionSeq *params ( + virtual IR_ParDescriptionSeq *params ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ParDescriptionSeq *params_i ( + IR_ParDescriptionSeq *params_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void params ( - const IR::ParDescriptionSeq ¶ms, + const IR_ParDescriptionSeq ¶ms, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void params_i ( - const IR::ParDescriptionSeq ¶ms, + const IR_ParDescriptionSeq ¶ms, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::OperationMode mode ( + virtual IR_OperationMode mode ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::OperationMode mode_i ( + IR_OperationMode mode_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mode ( - IR::OperationMode mode, + IR_OperationMode mode, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void mode_i ( - IR::OperationMode mode, + IR_OperationMode mode, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ContextIdSeq *contexts ( + virtual IR_ContextIdSeq *contexts ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ContextIdSeq *contexts_i ( + IR_ContextIdSeq *contexts_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void contexts ( - const IR::ContextIdSeq &contexts, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void contexts_i ( - const IR::ContextIdSeq &contexts, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ExceptionDefSeq *exceptions ( + virtual IR_ExceptionDefSeq *exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ExceptionDefSeq *exceptions_i ( + IR_ExceptionDefSeq *exceptions_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void exceptions ( - const IR::ExceptionDefSeq &exceptions, + const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void exceptions_i ( - const IR::ExceptionDefSeq &exceptions, + const IR_ExceptionDefSeq &exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::OperationDescription make_description ( + IR_OperationDescription make_description ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp index c42bac53066..66f9e78e44c 100644 --- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp @@ -19,11 +19,11 @@ TAO_PrimaryKeyDef_i::~TAO_PrimaryKeyDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_PrimaryKeyDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_PrimaryKey; + return dk_PrimaryKey; } void @@ -42,7 +42,7 @@ TAO_PrimaryKeyDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_PrimaryKeyDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_PrimaryKeyDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_PrimaryKeyDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -79,16 +79,16 @@ TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */, return 0; } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_PrimaryKeyDef_i::primary_key (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::ValueDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_ValueDef::_nil ()); return this->primary_key_i (ACE_TRY_ENV); } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_PrimaryKeyDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h index fcf02833070..ea9683f466d 100644 --- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h @@ -10,7 +10,7 @@ // PrimaryKeyDef_i.h // // = DESCRIPTION -// IR::PrimaryKeyDef servant class. +// IR_PrimaryKeyDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -51,7 +51,7 @@ public: virtual ~TAO_PrimaryKeyDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -71,14 +71,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -99,13 +99,13 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ValueDef_ptr primary_key ( + virtual IR_ValueDef_ptr primary_key ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ValueDef_ptr primary_key_i ( + IR_ValueDef_ptr primary_key_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp index 56a18f0832a..31da5f88d11 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp @@ -19,11 +19,11 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_PrimitiveDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Primitive; + return dk_Primitive; } void @@ -58,67 +58,67 @@ TAO_PrimitiveDef_i::type_i (CORBA::Environment &) "pkind", pkind); - switch (ACE_static_cast (IR::PrimitiveKind, pkind)) + switch (ACE_static_cast (IR_PrimitiveKind, pkind)) { - case IR::pk_null: + case pk_null: return CORBA::TypeCode::_duplicate (CORBA::_tc_null); - case IR::pk_void: + case pk_void: return CORBA::TypeCode::_duplicate (CORBA::_tc_void); - case IR::pk_short: + case pk_short: return CORBA::TypeCode::_duplicate (CORBA::_tc_short); - case IR::pk_long: + case pk_long: return CORBA::TypeCode::_duplicate (CORBA::_tc_long); - case IR::pk_ushort: + case pk_ushort: return CORBA::TypeCode::_duplicate (CORBA::_tc_ushort); - case IR::pk_ulong: + case pk_ulong: return CORBA::TypeCode::_duplicate (CORBA::_tc_ulong); - case IR::pk_float: + case pk_float: return CORBA::TypeCode::_duplicate (CORBA::_tc_float); - case IR::pk_double: + case pk_double: return CORBA::TypeCode::_duplicate (CORBA::_tc_double); - case IR::pk_boolean: + case pk_boolean: return CORBA::TypeCode::_duplicate (CORBA::_tc_boolean); - case IR::pk_char: + case pk_char: return CORBA::TypeCode::_duplicate (CORBA::_tc_char); - case IR::pk_octet: + case pk_octet: return CORBA::TypeCode::_duplicate (CORBA::_tc_octet); - case IR::pk_any: + case pk_any: return CORBA::TypeCode::_duplicate (CORBA::_tc_any); - case IR::pk_TypeCode: + case pk_TypeCode: return CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode); - case IR::pk_Principal: + case pk_Principal: return CORBA::TypeCode::_duplicate (CORBA::_tc_Principal); - case IR::pk_string: + case pk_string: return CORBA::TypeCode::_duplicate (CORBA::_tc_string); - case IR::pk_objref: + case pk_objref: return CORBA::TypeCode::_duplicate (CORBA::_tc_Object); - case IR::pk_longlong: + case pk_longlong: return CORBA::TypeCode::_duplicate (CORBA::_tc_longlong); - case IR::pk_ulonglong: + case pk_ulonglong: return CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong); - case IR::pk_longdouble: + case pk_longdouble: return CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble); - case IR::pk_wchar: + case pk_wchar: return CORBA::TypeCode::_duplicate (CORBA::_tc_wchar); - case IR::pk_wstring: + case pk_wstring: return CORBA::TypeCode::_duplicate (CORBA::_tc_wstring); - case IR::pk_value_base: + case pk_value_base: // TODO - we haven't added this typecode constant yet. default: return CORBA::TypeCode::_duplicate (CORBA::_tc_null); } } -IR::PrimitiveKind +IR_PrimitiveKind TAO_PrimitiveDef_i::kind (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::pk_null); + TAO_IFR_READ_GUARD_RETURN (pk_null); return this->kind_i (ACE_TRY_ENV); } -IR::PrimitiveKind +IR_PrimitiveKind TAO_PrimitiveDef_i::kind_i (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -127,6 +127,6 @@ TAO_PrimitiveDef_i::kind_i (CORBA::Environment &) "pkind", pkind); - return ACE_static_cast (IR::PrimitiveKind, pkind); + return ACE_static_cast (IR_PrimitiveKind, pkind); } diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h index 3b462c1f9a8..4aa70eed616 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h @@ -10,7 +10,7 @@ // PrimitiveDef_i.h // // = DESCRIPTION -// IR::PrimitiveDef servant class. +// IR_PrimitiveDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_PrimitiveDef_i (void); // Destructor. - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -84,13 +84,13 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::PrimitiveKind kind ( + virtual IR_PrimitiveKind kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::PrimitiveKind kind_i ( + IR_PrimitiveKind kind_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp index 74bb336d1b6..f7ad752a624 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp @@ -19,11 +19,11 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ProvidesDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Provides; + return dk_Provides; } void @@ -42,7 +42,7 @@ TAO_ProvidesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_ProvidesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_ProvidesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -59,16 +59,16 @@ TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::InterfaceDef_ptr +IR_InterfaceDef_ptr TAO_ProvidesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::InterfaceDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_InterfaceDef::_nil ()); return this->interface_type_i (ACE_TRY_ENV); } -IR::InterfaceDef_ptr +IR_InterfaceDef_ptr TAO_ProvidesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h index f41c3163d37..e9c57b36d2b 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h @@ -10,7 +10,7 @@ // ProvidesDef_i.h // // = DESCRIPTION -// IR::ProvidesDef servant class. +// IR_ProvidesDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_ProvidesDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -69,27 +69,27 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::InterfaceDef_ptr interface_type ( + virtual IR_InterfaceDef_ptr interface_type ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::InterfaceDef_ptr interface_type_i ( + IR_InterfaceDef_ptr interface_type_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp index b62cfa3b135..9709d74263c 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp @@ -20,11 +20,11 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_PublishesDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Publishes; + return dk_Publishes; } void @@ -43,7 +43,7 @@ TAO_PublishesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_PublishesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,7 +52,7 @@ TAO_PublishesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_PublishesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h index 1e53e16f636..c112db20aa9 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h @@ -10,7 +10,7 @@ // PublishesDef_i.h // // = DESCRIPTION -// IR::PublishesDef servant class. +// IR_PublishesDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_PublishesDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -70,14 +70,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp index 1ac0ad09bdb..6ee8a571aa1 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp @@ -111,7 +111,7 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, for (u_int i = 0; i < num_pkinds; i++) { ACE_Configuration_Section_Key key; - IR::PrimitiveKind pkind = ACE_static_cast (IR::PrimitiveKind, + IR_PrimitiveKind pkind = ACE_static_cast (IR_PrimitiveKind, i); this->config_->open_section (this->pkinds_key_, @@ -121,7 +121,7 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, this->config_->set_integer_value (key, "def_kind", - IR::dk_Primitive); + dk_Primitive); this->config_->set_integer_value (key, "pkind", @@ -205,7 +205,7 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, this->config_->set_integer_value (this->section_key_, "def_kind", - IR::dk_Repository); + dk_Repository); } TAO_Repository_i::~TAO_Repository_i (void) @@ -214,11 +214,11 @@ TAO_Repository_i::~TAO_Repository_i (void) delete this->lock_; } -IR::DefinitionKind +IR_DefinitionKind TAO_Repository_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Repository; + return dk_Repository; } void @@ -228,18 +228,18 @@ TAO_Repository_i::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); } -IR::Contained_ptr +IR_Contained_ptr TAO_Repository_i::lookup_id (const char *search_id, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::Contained::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_Contained::_nil ()); return this->lookup_id_i (search_id, ACE_TRY_ENV); } -IR::Contained_ptr +IR_Contained_ptr TAO_Repository_i::lookup_id_i (const char *search_id, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -248,9 +248,9 @@ TAO_Repository_i::lookup_id_i (const char *search_id, if (this->config_->get_string_value (this->repo_ids_key_, search_id, path) - == 0) + != 0) { - return IR::Contained::_nil (); + return IR_Contained::_nil (); } ACE_Configuration_Section_Key key; @@ -263,15 +263,15 @@ TAO_Repository_i::lookup_id_i (const char *search_id, "def_kind", kind); - IR::DefinitionKind def_kind = ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->servant_factory_->create_objref (def_kind, path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::Contained::_nil ()); + ACE_CHECK_RETURN (IR_Contained::_nil ()); - return IR::Contained::_narrow (obj.in (), + return IR_Contained::_narrow (obj.in (), ACE_TRY_ENV); } @@ -391,8 +391,8 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc, } } -IR::PrimitiveDef_ptr -TAO_Repository_i::get_primitive (IR::PrimitiveKind kind, +IR_PrimitiveDef_ptr +TAO_Repository_i::get_primitive (IR_PrimitiveKind kind, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -401,27 +401,27 @@ TAO_Repository_i::get_primitive (IR::PrimitiveKind kind, obj_id += this->pkind_to_string (kind); CORBA::Object_var obj = - this->servant_factory_->create_objref (IR::dk_Primitive, + this->servant_factory_->create_objref (dk_Primitive, obj_id.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::PrimitiveDef::_nil ()); + ACE_CHECK_RETURN (IR_PrimitiveDef::_nil ()); - return IR::PrimitiveDef::_narrow (obj.in (), + return IR_PrimitiveDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::StringDef_ptr +IR_StringDef_ptr TAO_Repository_i::create_string (CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::StringDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_StringDef::_nil ()); return this->create_string_i (bound, ACE_TRY_ENV); } -IR::StringDef_ptr +IR_StringDef_ptr TAO_Repository_i::create_string_i (CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -449,7 +449,7 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound, this->config_->set_integer_value (new_key, "def_kind", - IR::dk_String); + dk_String); this->config_->set_string_value (new_key, "name", @@ -460,27 +460,27 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound, obj_id += name.in (); CORBA::Object_var obj = - this->servant_factory_->create_objref (IR::dk_String, + this->servant_factory_->create_objref (dk_String, obj_id.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::StringDef::_nil ()); + ACE_CHECK_RETURN (IR_StringDef::_nil ()); - return IR::StringDef::_narrow (obj.in (), + return IR_StringDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::WstringDef_ptr +IR_WstringDef_ptr TAO_Repository_i::create_wstring (CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::WstringDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_WstringDef::_nil ()); return this->create_wstring_i (bound, ACE_TRY_ENV); } -IR::WstringDef_ptr +IR_WstringDef_ptr TAO_Repository_i::create_wstring_i (CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -508,7 +508,7 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound, this->config_->set_integer_value (new_key, "def_kind", - IR::dk_Wstring); + dk_Wstring); this->config_->set_string_value (new_key, "name", @@ -519,38 +519,38 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound, obj_id += name.in (); CORBA::Object_var obj = - this->servant_factory_->create_objref (IR::dk_Wstring, + this->servant_factory_->create_objref (dk_Wstring, obj_id.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::WstringDef::_nil ()); + ACE_CHECK_RETURN (IR_WstringDef::_nil ()); - return IR::WstringDef::_narrow (obj.in (), + return IR_WstringDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::SequenceDef_ptr +IR_SequenceDef_ptr TAO_Repository_i::create_sequence (CORBA::ULong bound, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::SequenceDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_SequenceDef::_nil ()); return this->create_sequence_i (bound, element_type, ACE_TRY_ENV); } -IR::SequenceDef_ptr +IR_SequenceDef_ptr TAO_Repository_i::create_sequence_i (CORBA::ULong bound, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::SequenceDef::_nil ()); + ACE_CHECK_RETURN (IR_SequenceDef::_nil ()); CORBA::String_var element_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -580,7 +580,7 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound, // Set the def_kind attribute. this->config_->set_integer_value (new_key, "def_kind", - IR::dk_Sequence); + dk_Sequence); // Set the "name" for destroy to use. this->config_->set_string_value (new_key, @@ -597,38 +597,38 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound, obj_id += name.in (); CORBA::Object_var obj = - this->servant_factory_->create_objref (IR::dk_Sequence, + this->servant_factory_->create_objref (dk_Sequence, obj_id.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::SequenceDef::_nil ()); + ACE_CHECK_RETURN (IR_SequenceDef::_nil ()); - return IR::SequenceDef::_narrow (obj.in (), + return IR_SequenceDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::ArrayDef_ptr +IR_ArrayDef_ptr TAO_Repository_i::create_array (CORBA::ULong length, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ArrayDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ArrayDef::_nil ()); return this->create_array_i (length, element_type, ACE_TRY_ENV); } -IR::ArrayDef_ptr +IR_ArrayDef_ptr TAO_Repository_i::create_array_i (CORBA::ULong length, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type, ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ArrayDef::_nil ()); + ACE_CHECK_RETURN (IR_ArrayDef::_nil ()); CORBA::String_var element_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -658,7 +658,7 @@ TAO_Repository_i::create_array_i (CORBA::ULong length, // Set the def_kind attribute. this->config_->set_integer_value (new_key, "def_kind", - IR::dk_Array); + dk_Array); // Set the "name" for destroy to use. this->config_->set_string_value (new_key, @@ -675,35 +675,35 @@ TAO_Repository_i::create_array_i (CORBA::ULong length, obj_id += name.in (); CORBA::Object_var obj = - this->servant_factory_->create_objref (IR::dk_Array, + this->servant_factory_->create_objref (dk_Array, obj_id.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::ArrayDef::_nil ()); + ACE_CHECK_RETURN (IR_ArrayDef::_nil ()); - return IR::ArrayDef::_narrow (obj.in (), + return IR_ArrayDef::_narrow (obj.in (), ACE_TRY_ENV); } -IR::FixedDef_ptr +IR_FixedDef_ptr TAO_Repository_i::create_fixed (CORBA::UShort digits, CORBA::Short scale, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::FixedDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_FixedDef::_nil ()); return this->create_fixed_i (digits, scale, ACE_TRY_ENV); } -IR::FixedDef_ptr +IR_FixedDef_ptr TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */, CORBA::Short /* scale */, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), IR::FixedDef::_nil ()); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), IR_FixedDef::_nil ()); } PortableServer::POA_ptr @@ -730,14 +730,14 @@ TAO_Repository_i::tc_factory (void) const return this->tc_factory_.in (); } -IR::Repository_ptr +IR_Repository_ptr TAO_Repository_i::repo_objref (void) const { - return IR::Repository::_duplicate (this->repo_objref_); + return IR_Repository::_duplicate (this->repo_objref_); } void -TAO_Repository_i::repo_objref (IR::Repository_ptr objref) +TAO_Repository_i::repo_objref (IR_Repository_ptr objref) { this->repo_objref_ = objref; } @@ -829,7 +829,7 @@ const char *TAO_Repository_i::TAO_IFR_primitive_kinds[] = }; const char * -TAO_Repository_i::pkind_to_string (IR::PrimitiveKind pkind) const +TAO_Repository_i::pkind_to_string (IR_PrimitiveKind pkind) const { return TAO_Repository_i::TAO_IFR_primitive_kinds[pkind]; } diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.h b/TAO/orbsvcs/IFR_Service/Repository_i.h index 4aaefd74e69..b092b2d7de7 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.h +++ b/TAO/orbsvcs/IFR_Service/Repository_i.h @@ -10,7 +10,7 @@ // Repository_i.h // // = DESCRIPTION -// IR::Repository servant class. +// IR_Repository servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -57,7 +57,7 @@ public: virtual ~TAO_Repository_i (void); // Destructor. - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -71,14 +71,14 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // May not be called on a repository - raises BAD_INV_ORDER. - virtual IR::Contained_ptr lookup_id ( + virtual IR_Contained_ptr lookup_id ( const char *search_id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::Contained_ptr lookup_id_i ( + IR_Contained_ptr lookup_id_i ( const char *search_id, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () @@ -99,8 +99,8 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::PrimitiveDef_ptr get_primitive ( - IR::PrimitiveKind kind, + virtual IR_PrimitiveDef_ptr get_primitive ( + IR_PrimitiveKind kind, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -108,67 +108,67 @@ public: // No locking necessary because the database is not // accessed. - virtual IR::StringDef_ptr create_string ( + virtual IR_StringDef_ptr create_string ( CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::StringDef_ptr create_string_i ( + IR_StringDef_ptr create_string_i ( CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::WstringDef_ptr create_wstring ( + virtual IR_WstringDef_ptr create_wstring ( CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::WstringDef_ptr create_wstring_i ( + IR_WstringDef_ptr create_wstring_i ( CORBA::ULong bound, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::SequenceDef_ptr create_sequence ( + virtual IR_SequenceDef_ptr create_sequence ( CORBA::ULong bound, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException)); - IR::SequenceDef_ptr create_sequence_i ( + IR_SequenceDef_ptr create_sequence_i ( CORBA::ULong bound, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException)); - virtual IR::ArrayDef_ptr create_array ( + virtual IR_ArrayDef_ptr create_array ( CORBA::ULong length, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ArrayDef_ptr create_array_i ( + IR_ArrayDef_ptr create_array_i ( CORBA::ULong length, - IR::IDLType_ptr element_type, + IR_IDLType_ptr element_type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::FixedDef_ptr create_fixed ( + virtual IR_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale, CORBA::Environment &ACE_TRY_ENV = @@ -176,7 +176,7 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::FixedDef_ptr create_fixed_i ( + IR_FixedDef_ptr create_fixed_i ( CORBA::UShort digits, CORBA::Short scale, CORBA::Environment &ACE_TRY_ENV = @@ -196,8 +196,8 @@ public: CORBA::TypeCodeFactory_ptr tc_factory (void) const; // Accessor for the Typecode factory. - IR::Repository_ptr repo_objref (void) const; - void repo_objref (IR::Repository_ptr objref); + IR_Repository_ptr repo_objref (void) const; + void repo_objref (IR_Repository_ptr objref); // Accessor/mutator for our object reference. ACE_Configuration_Section_Key root_key (void) const; @@ -252,7 +252,7 @@ protected: CORBA::TypeCodeFactory_var tc_factory_; // Our Typecode factory. - IR::Repository_ptr repo_objref_; + IR_Repository_ptr repo_objref_; // The object reference of this servant. ACE_Configuration_Section_Key root_key_; @@ -287,14 +287,14 @@ protected: private: static const char *TAO_IFR_primitive_kinds[]; - // Set of strings corresponding to the IR::PrimitiveKind + // Set of strings corresponding to the IR_PrimitiveKind // enum values. - const char *pkind_to_string (IR::PrimitiveKind pkind) const; + const char *pkind_to_string (IR_PrimitiveKind pkind) const; // Convert the enum value to the equivalent string. u_int num_pkinds (void) const; - // Return the number of entries in the IR::PrimitiveKind enum. + // Return the number of entries in the IR_PrimitiveKind enum. }; diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp index b95cedaa9d8..01d00985bd7 100644 --- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp @@ -21,11 +21,11 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_SequenceDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Sequence; + return dk_Sequence; } void @@ -158,16 +158,16 @@ TAO_SequenceDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV) return impl->type_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_SequenceDef_i::element_type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->element_type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_SequenceDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -187,21 +187,21 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - return IR::IDLType::_narrow (obj.in (), + return IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); } void -TAO_SequenceDef_i::element_type_def (IR::IDLType_ptr element_type_def, +TAO_SequenceDef_i::element_type_def (IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -212,7 +212,7 @@ TAO_SequenceDef_i::element_type_def (IR::IDLType_ptr element_type_def, } void -TAO_SequenceDef_i::element_type_def_i (IR::IDLType_ptr element_type_def, +TAO_SequenceDef_i::element_type_def_i (IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -253,19 +253,19 @@ TAO_SequenceDef_i::destroy_element_type ( "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); switch (def_kind) { // These exist only as our elements, so the type should // be destroyed when we are destroyed or our element type // is mutated. - case IR::dk_String: - case IR::dk_Wstring: - case IR::dk_Fixed: - case IR::dk_Array: - case IR::dk_Sequence: + case dk_String: + case dk_Wstring: + case dk_Fixed: + case dk_Array: + case dk_Sequence: { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key, diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h index 6f97436f5ab..2e71da8791d 100644 --- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h @@ -10,7 +10,7 @@ // SequenceDef_i.h // // = DESCRIPTION -// IR::SequenceDef servant class. +// IR_SequenceDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_SequenceDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -121,27 +121,27 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::IDLType_ptr element_type_def ( + virtual IR_IDLType_ptr element_type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr element_type_def_i ( + IR_IDLType_ptr element_type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( - IR::IDLType_ptr element_type_def, + IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( - IR::IDLType_ptr element_type_def, + IR_IDLType_ptr element_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp index b68a827807d..98d6ac07110 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp @@ -20,9 +20,9 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, "def_kind", def_kind); - switch (ACE_static_cast (IR::DefinitionKind, def_kind)) + switch (ACE_static_cast (IR_DefinitionKind, def_kind)) { - case IR::dk_Interface: + case dk_Interface: { TAO_InterfaceDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -33,7 +33,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Alias: + case dk_Alias: { TAO_AliasDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -44,7 +44,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Struct: + case dk_Struct: { TAO_StructDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -55,7 +55,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Union: + case dk_Union: { TAO_UnionDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -66,7 +66,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Enum: + case dk_Enum: { TAO_EnumDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -77,7 +77,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Primitive: + case dk_Primitive: { TAO_PrimitiveDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -88,7 +88,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_String: + case dk_String: { TAO_StringDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -99,7 +99,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Sequence: + case dk_Sequence: { TAO_SequenceDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -110,7 +110,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Array: + case dk_Array: { TAO_ArrayDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -121,7 +121,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Wstring: + case dk_Wstring: { TAO_WstringDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -132,7 +132,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Fixed: + case dk_Fixed: { TAO_FixedDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -143,7 +143,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Value: + case dk_Value: { TAO_ValueDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -154,7 +154,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_ValueBox: + case dk_ValueBox: { TAO_ValueBoxDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -165,7 +165,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Native: + case dk_Native: { TAO_NativeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -176,7 +176,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Component: + case dk_Component: { TAO_ComponentDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -187,7 +187,7 @@ IFR_Servant_Factory::create_idltype (ACE_Configuration_Section_Key servant_key, return impl; } - case IR::dk_Home: + case dk_Home: { TAO_HomeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -214,9 +214,9 @@ IFR_Servant_Factory::create_contained ( "def_kind", def_kind); - switch (ACE_static_cast (IR::DefinitionKind, def_kind)) + switch (ACE_static_cast (IR_DefinitionKind, def_kind)) { - case IR::dk_Interface: + case dk_Interface: { TAO_InterfaceDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -227,7 +227,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Alias: + case dk_Alias: { TAO_AliasDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -238,7 +238,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Struct: + case dk_Struct: { TAO_StructDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -249,7 +249,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Union: + case dk_Union: { TAO_UnionDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -260,7 +260,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Enum: + case dk_Enum: { TAO_EnumDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -271,7 +271,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Module: + case dk_Module: { TAO_ModuleDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -282,7 +282,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Exception: + case dk_Exception: { TAO_ExceptionDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -293,7 +293,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Constant: + case dk_Constant: { TAO_ConstantDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -304,7 +304,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_ValueMember: + case dk_ValueMember: { TAO_ValueMemberDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -315,7 +315,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Uses: + case dk_Uses: { TAO_UsesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -326,7 +326,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Provides: + case dk_Provides: { TAO_ProvidesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -337,7 +337,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_PrimaryKey: + case dk_PrimaryKey: { TAO_PrimaryKeyDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -348,7 +348,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Emits: + case dk_Emits: { TAO_EmitsDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -359,7 +359,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Publishes: + case dk_Publishes: { TAO_PublishesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -370,7 +370,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Consumes: + case dk_Consumes: { TAO_ConsumesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -381,7 +381,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Attribute: + case dk_Attribute: { TAO_AttributeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -392,7 +392,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Operation: + case dk_Operation: { TAO_OperationDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -403,7 +403,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Value: + case dk_Value: { TAO_ValueDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -414,7 +414,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_ValueBox: + case dk_ValueBox: { TAO_ValueBoxDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -425,7 +425,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Native: + case dk_Native: { TAO_NativeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -436,7 +436,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Component: + case dk_Component: { TAO_ComponentDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -447,7 +447,7 @@ IFR_Servant_Factory::create_contained ( return impl; } - case IR::dk_Home: + case dk_Home: { TAO_HomeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -474,9 +474,9 @@ IFR_Servant_Factory::create_container ( "def_kind", def_kind); - switch (ACE_static_cast (IR::DefinitionKind, def_kind)) + switch (ACE_static_cast (IR_DefinitionKind, def_kind)) { - case IR::dk_Interface: + case dk_Interface: { TAO_InterfaceDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -487,7 +487,7 @@ IFR_Servant_Factory::create_container ( return impl; } - case IR::dk_Struct: + case dk_Struct: { TAO_StructDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -498,7 +498,7 @@ IFR_Servant_Factory::create_container ( return impl; } - case IR::dk_Union: + case dk_Union: { TAO_UnionDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -509,7 +509,7 @@ IFR_Servant_Factory::create_container ( return impl; } - case IR::dk_Module: + case dk_Module: { TAO_ModuleDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -520,7 +520,7 @@ IFR_Servant_Factory::create_container ( return impl; } - case IR::dk_Exception: + case dk_Exception: { TAO_ExceptionDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -531,7 +531,7 @@ IFR_Servant_Factory::create_container ( return impl; } - case IR::dk_Value: + case dk_Value: { TAO_ValueDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -542,7 +542,7 @@ IFR_Servant_Factory::create_container ( return impl; } - case IR::dk_Component: + case dk_Component: { TAO_ComponentDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -553,7 +553,7 @@ IFR_Servant_Factory::create_container ( return impl; } - case IR::dk_Home: + case dk_Home: { TAO_HomeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -579,9 +579,9 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, "def_kind", def_kind); - switch (ACE_static_cast (IR::DefinitionKind, def_kind)) + switch (ACE_static_cast (IR_DefinitionKind, def_kind)) { - case IR::dk_Attribute: + case dk_Attribute: { TAO_AttributeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -603,7 +603,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Constant: + case dk_Constant: { TAO_ConstantDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -625,7 +625,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Exception: + case dk_Exception: { TAO_ExceptionDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -647,7 +647,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Interface: + case dk_Interface: { TAO_InterfaceDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -669,7 +669,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Module: + case dk_Module: { TAO_ModuleDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -691,7 +691,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Operation: + case dk_Operation: { TAO_OperationDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -713,7 +713,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Alias: + case dk_Alias: { TAO_AliasDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -735,7 +735,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Struct: + case dk_Struct: { TAO_StructDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -757,7 +757,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Union: + case dk_Union: { TAO_UnionDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -779,7 +779,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Enum: + case dk_Enum: { TAO_EnumDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -801,7 +801,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Primitive: + case dk_Primitive: { TAO_PrimitiveDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -823,7 +823,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_String: + case dk_String: { TAO_StringDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -845,7 +845,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Sequence: + case dk_Sequence: { TAO_SequenceDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -867,7 +867,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Array: + case dk_Array: { TAO_ArrayDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -889,7 +889,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Wstring: + case dk_Wstring: { TAO_WstringDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -911,7 +911,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Fixed: + case dk_Fixed: { TAO_FixedDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -933,7 +933,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Value: + case dk_Value: { TAO_ValueDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -955,7 +955,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_ValueBox: + case dk_ValueBox: { TAO_ValueBoxDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -977,7 +977,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_ValueMember: + case dk_ValueMember: { TAO_ValueMemberDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -999,7 +999,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Native: + case dk_Native: { TAO_NativeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1021,7 +1021,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Component: + case dk_Component: { TAO_ComponentDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1043,7 +1043,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Home: + case dk_Home: { TAO_HomeDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1065,7 +1065,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Factory: + case dk_Factory: { TAO_FactoryDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1087,7 +1087,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Finder: + case dk_Finder: { TAO_FinderDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1109,7 +1109,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_PrimaryKey: + case dk_PrimaryKey: { TAO_PrimaryKeyDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1131,7 +1131,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Emits: + case dk_Emits: { TAO_EmitsDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1153,7 +1153,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Publishes: + case dk_Publishes: { TAO_PublishesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1175,7 +1175,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Consumes: + case dk_Consumes: { TAO_ConsumesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1197,7 +1197,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Provides: + case dk_Provides: { TAO_ProvidesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1219,7 +1219,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, safety.release (); return impl_tie; } - case IR::dk_Uses: + case dk_Uses: { TAO_UsesDef_i *impl = 0; ACE_NEW_THROW_EX (impl, @@ -1247,7 +1247,7 @@ IFR_Servant_Factory::create_tie (ACE_Configuration_Section_Key servant_key, } CORBA::Object_ptr -IFR_Servant_Factory::create_objref (IR::DefinitionKind def_kind, +IFR_Servant_Factory::create_objref (IR_DefinitionKind def_kind, const char *obj_id, CORBA::Environment &ACE_TRY_ENV) { @@ -1259,97 +1259,97 @@ IFR_Servant_Factory::create_objref (IR::DefinitionKind def_kind, switch (def_kind) { - case IR::dk_Attribute: + case dk_Attribute: repo_id += "AttributeDef:"; break; - case IR::dk_Constant: + case dk_Constant: repo_id += "ConstantDef:"; break; - case IR::dk_Exception: + case dk_Exception: repo_id += "ExceptionDef:"; break; - case IR::dk_Interface: + case dk_Interface: repo_id += "InterfaceDef:"; break; - case IR::dk_Module: + case dk_Module: repo_id += "ModuleDef:"; break; - case IR::dk_Operation: + case dk_Operation: repo_id += "OperationDef:"; break; - case IR::dk_Typedef: + case dk_Typedef: repo_id += "TypedefDef:"; break; - case IR::dk_Alias: + case dk_Alias: repo_id += "AliasDef:"; break; - case IR::dk_Struct: + case dk_Struct: repo_id += "StructDef:"; break; - case IR::dk_Union: + case dk_Union: repo_id += "UnionDef:"; break; - case IR::dk_Enum: + case dk_Enum: repo_id += "EnumDef:"; break; - case IR::dk_Primitive: + case dk_Primitive: repo_id += "PrimitiveDef:"; break; - case IR::dk_String: + case dk_String: repo_id += "StringDef:"; break; - case IR::dk_Sequence: + case dk_Sequence: repo_id += "SequenceDef:"; break; - case IR::dk_Array: + case dk_Array: repo_id += "ArrayDef:"; break; - case IR::dk_Wstring: + case dk_Wstring: repo_id += "WstringDef:"; break; - case IR::dk_Fixed: + case dk_Fixed: repo_id += "FixedDef:"; break; - case IR::dk_Value: + case dk_Value: repo_id += "ValueDef:"; break; - case IR::dk_ValueBox: + case dk_ValueBox: repo_id += "ValueBoxDef:"; break; - case IR::dk_ValueMember: + case dk_ValueMember: repo_id += "ValueMemberDef:"; break; - case IR::dk_Native: + case dk_Native: repo_id += "NativeDef:"; break; - case IR::dk_Component: + case dk_Component: repo_id += "ComponentDef:"; break; - case IR::dk_Home: + case dk_Home: repo_id += "HomeDef:"; break; - case IR::dk_Factory: + case dk_Factory: repo_id += "FactoryDef:"; break; - case IR::dk_Finder: + case dk_Finder: repo_id += "FinderDef:"; break; - case IR::dk_PrimaryKey: + case dk_PrimaryKey: repo_id += "PrimaryKeyDef:"; break; - case IR::dk_Emits: + case dk_Emits: repo_id += "EmitsDef:"; break; - case IR::dk_Publishes: + case dk_Publishes: repo_id += "PublishesDef:"; break; - case IR::dk_Consumes: + case dk_Consumes: repo_id += "ConsumesDef:"; break; - case IR::dk_Provides: + case dk_Provides: repo_id += "ProvidesDef:"; break; - case IR::dk_Uses: + case dk_Uses: repo_id += "UsesDef:"; break; default: diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.h b/TAO/orbsvcs/IFR_Service/Servant_Factory.h index 4c4e2de4667..9ae36824ea2 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Factory.h +++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.h @@ -66,7 +66,7 @@ public: CORBA::Environment &ACE_TRY_ENV); // Used by the servant locator to create a servant. - CORBA::Object_ptr create_objref (IR::DefinitionKind def_kind, + CORBA::Object_ptr create_objref (IR_DefinitionKind def_kind, const char *obj_id, CORBA::Environment &ACE_TRY_ENV); // Used to create return values. diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp index 5e0523d48e9..50953ade9c3 100644 --- a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp @@ -17,11 +17,11 @@ TAO_StringDef_i::~TAO_StringDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_StringDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_String; + return dk_String; } void diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.h b/TAO/orbsvcs/IFR_Service/StringDef_i.h index 697ce078398..0a2f35b1964 100644 --- a/TAO/orbsvcs/IFR_Service/StringDef_i.h +++ b/TAO/orbsvcs/IFR_Service/StringDef_i.h @@ -10,7 +10,7 @@ // StringDef_i.h // // = DESCRIPTION -// IR::StringDef servant class. +// IR_StringDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_StringDef_i (void); // Destructor. - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp index f2f36c94aeb..9c8301ae7c2 100644 --- a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp @@ -22,11 +22,11 @@ TAO_StructDef_i::~TAO_StructDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_StructDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Struct; + return dk_Struct; } void @@ -74,7 +74,7 @@ TAO_StructDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) "name", name); - IR::StructMemberSeq_var members = this->members_i (ACE_TRY_ENV); + IR_StructMemberSeq_var members = this->members_i (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_struct_tc (id.c_str (), @@ -83,7 +83,7 @@ TAO_StructDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); } -IR::StructMemberSeq * +IR_StructMemberSeq * TAO_StructDef_i::members (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -92,11 +92,11 @@ TAO_StructDef_i::members (CORBA::Environment &ACE_TRY_ENV) return this->members_i (ACE_TRY_ENV); } -IR::StructMemberSeq * +IR_StructMemberSeq * TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_Unbounded_Queue<IR::DefinitionKind> kind_queue; + ACE_Unbounded_Queue<IR_DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; ACE_Unbounded_Queue<ACE_TString> name_queue; @@ -149,8 +149,8 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); kind_queue.enqueue_tail (def_kind); } @@ -158,18 +158,18 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) size_t size = kind_queue.size (); - IR::StructMemberSeq *members = 0; + IR_StructMemberSeq *members = 0; ACE_NEW_THROW_EX (members, - IR::StructMemberSeq (size), + IR_StructMemberSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); members->length (size); - IR::StructMemberSeq_var retval = members; + IR_StructMemberSeq_var retval = members; ACE_TString name, path; - IR::DefinitionKind kind = IR::dk_none; + IR_DefinitionKind kind = dk_none; CORBA::Object_var obj; ACE_Configuration_Section_Key member_key; TAO_IDLType_i *impl = 0; @@ -190,7 +190,7 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_CHECK_RETURN (0); - retval[k].type_def = IR::IDLType::_narrow (obj.in (), + retval[k].type_def = IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -214,7 +214,7 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) } void -TAO_StructDef_i::members (const IR::StructMemberSeq &members, +TAO_StructDef_i::members (const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -225,7 +225,7 @@ TAO_StructDef_i::members (const IR::StructMemberSeq &members, } void -TAO_StructDef_i::members_i (const IR::StructMemberSeq &members, +TAO_StructDef_i::members_i (const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.h b/TAO/orbsvcs/IFR_Service/StructDef_i.h index 1b4b890c5b5..931069923e4 100644 --- a/TAO/orbsvcs/IFR_Service/StructDef_i.h +++ b/TAO/orbsvcs/IFR_Service/StructDef_i.h @@ -10,7 +10,7 @@ // StructDef_i.h // // = DESCRIPTION -// IR::StructDef servant class. +// IR_StructDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -51,7 +51,7 @@ public: virtual ~TAO_StructDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -85,27 +85,27 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::StructMemberSeq *members ( + virtual IR_StructMemberSeq *members ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::StructMemberSeq *members_i ( + IR_StructMemberSeq *members_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const IR::StructMemberSeq &members, + const IR_StructMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp index 3256bd8fd6b..d27f706c1f6 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp @@ -20,7 +20,7 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void) { } -IR::Contained::Description * +IR_Contained::Description * TAO_TypedefDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29,22 +29,22 @@ TAO_TypedefDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - IR::Contained::Description *desc_ptr = 0; + IR_Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - IR::Contained::Description, + IR_Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - IR::Contained::Description_var retval = desc_ptr; + IR_Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - IR::TypeDescription td; + IR_TypeDescription td; ACE_CHECK_RETURN (0); td.name = this->name_i (ACE_TRY_ENV); diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h index 4380a6b1fbc..04ce55146e2 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h @@ -10,7 +10,7 @@ // TypedefDef_i.h // // = DESCRIPTION -// IR::TypedefDef servant class. +// IR_TypedefDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -52,14 +52,14 @@ public: virtual ~TAO_TypedefDef_i (void); // Destructor - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp index 2af92163633..d8661b9271f 100644 --- a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp @@ -22,11 +22,11 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_UnionDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Union; + return dk_Union; } void @@ -77,7 +77,7 @@ TAO_UnionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - IR::UnionMemberSeq_var members = this->members_i (ACE_TRY_ENV); + IR_UnionMemberSeq_var members = this->members_i (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_union_tc (id.c_str (), @@ -120,16 +120,16 @@ TAO_UnionDef_i::discriminator_type_i (CORBA::Environment &ACE_TRY_ENV) return impl->type_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_UnionDef_i::discriminator_type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->discriminator_type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_UnionDef_i::discriminator_type_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -149,22 +149,22 @@ TAO_UnionDef_i::discriminator_type_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, disc_path.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - return IR::IDLType::_narrow (obj.in (), + return IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); } void TAO_UnionDef_i::discriminator_type_def ( - IR::IDLType_ptr discriminator_type_def, + IR_IDLType_ptr discriminator_type_def, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -177,7 +177,7 @@ TAO_UnionDef_i::discriminator_type_def ( void TAO_UnionDef_i::discriminator_type_def_i ( - IR::IDLType_ptr discriminator_type_def, + IR_IDLType_ptr discriminator_type_def, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -195,7 +195,7 @@ TAO_UnionDef_i::discriminator_type_def_i ( disc_path.in ()); } -IR::UnionMemberSeq * +IR_UnionMemberSeq * TAO_UnionDef_i::members (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -204,7 +204,7 @@ TAO_UnionDef_i::members (CORBA::Environment &ACE_TRY_ENV) return this->members_i (ACE_TRY_ENV); } -IR::UnionMemberSeq * +IR_UnionMemberSeq * TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -252,20 +252,20 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) size_t size = key_queue.size (); - IR::UnionMemberSeq *members = 0; + IR_UnionMemberSeq *members = 0; ACE_NEW_THROW_EX (members, - IR::UnionMemberSeq (size), + IR_UnionMemberSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); members->length (size); - IR::UnionMemberSeq_var retval = members; + IR_UnionMemberSeq_var retval = members; ACE_TString name, path; ACE_Configuration_Section_Key next_key, entry_key; u_int kind = 0; - IR::DefinitionKind def_kind = IR::dk_none; + IR_DefinitionKind def_kind = dk_none; CORBA::Object_var obj; TAO_IDLType_i *impl = 0; @@ -298,7 +298,7 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) kind); def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + ACE_static_cast (IR_DefinitionKind, kind); obj = this->repo_->servant_factory ()->create_objref (def_kind, @@ -306,7 +306,7 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_CHECK_RETURN (0); - retval[k].type_def = IR::IDLType::_narrow (obj.in (), + retval[k].type_def = IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -325,7 +325,7 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) } void -TAO_UnionDef_i::members (const IR::UnionMemberSeq &members, +TAO_UnionDef_i::members (const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -336,7 +336,7 @@ TAO_UnionDef_i::members (const IR::UnionMemberSeq &members, } void -TAO_UnionDef_i::members_i (const IR::UnionMemberSeq &members, +TAO_UnionDef_i::members_i (const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -393,7 +393,7 @@ TAO_UnionDef_i::members_i (const IR::UnionMemberSeq &members, void TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, - IR::UnionMember &member, + IR_UnionMember &member, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.h b/TAO/orbsvcs/IFR_Service/UnionDef_i.h index 0e8758c7ac6..c6bf8d20528 100644 --- a/TAO/orbsvcs/IFR_Service/UnionDef_i.h +++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.h @@ -10,7 +10,7 @@ // UnionDef_i.h // // = DESCRIPTION -// IR::UnionDef servant class. +// IR_UnionDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -51,7 +51,7 @@ public: virtual ~TAO_UnionDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -97,53 +97,53 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::IDLType_ptr discriminator_type_def ( + virtual IR_IDLType_ptr discriminator_type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr discriminator_type_def_i ( + IR_IDLType_ptr discriminator_type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void discriminator_type_def ( - IR::IDLType_ptr discriminator_type_def, + IR_IDLType_ptr discriminator_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void discriminator_type_def_i ( - IR::IDLType_ptr discriminator_type_def, + IR_IDLType_ptr discriminator_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::UnionMemberSeq *members ( + virtual IR_UnionMemberSeq *members ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::UnionMemberSeq *members_i ( + IR_UnionMemberSeq *members_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const IR::UnionMemberSeq &members, + const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const IR::UnionMemberSeq &members, + const IR_UnionMemberSeq &members, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -152,7 +152,7 @@ public: private: void fetch_label ( const ACE_Configuration_Section_Key member_key, - IR::UnionMember &member, + IR_UnionMember &member, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp index 9439d93d414..7b72ba9d33c 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp @@ -17,11 +17,11 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_UsesDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Uses; + return dk_Uses; } void @@ -40,7 +40,7 @@ TAO_UsesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_UsesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_UsesDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -57,16 +57,16 @@ TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::InterfaceDef_ptr +IR_InterfaceDef_ptr TAO_UsesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::InterfaceDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_InterfaceDef::_nil ()); return this->interface_type_i (ACE_TRY_ENV); } -IR::InterfaceDef_ptr +IR_InterfaceDef_ptr TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.h b/TAO/orbsvcs/IFR_Service/UsesDef_i.h index fbbbea0581c..a62eef52039 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.h @@ -10,7 +10,7 @@ // UsesDef_i.h // // = DESCRIPTION -// IR::UsesDef servant class. +// IR_UsesDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_UsesDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -69,27 +69,27 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::InterfaceDef_ptr interface_type ( + virtual IR_InterfaceDef_ptr interface_type ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::InterfaceDef_ptr interface_type_i ( + IR_InterfaceDef_ptr interface_type_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp index e894f77b309..7e9698ca0db 100644 --- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp @@ -23,11 +23,11 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ValueBoxDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_ValueBox; + return dk_ValueBox; } CORBA::TypeCode_ptr @@ -80,16 +80,16 @@ TAO_ValueBoxDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ValueBoxDef_i::original_type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->original_type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ValueBoxDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -109,21 +109,21 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - IR::DefinitionKind def_kind = - ACE_static_cast (IR::DefinitionKind, kind); + IR_DefinitionKind def_kind = + ACE_static_cast (IR_DefinitionKind, kind); CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, boxed_type.c_str (), ACE_TRY_ENV); - ACE_CHECK_RETURN (IR::IDLType::_nil ()); + ACE_CHECK_RETURN (IR_IDLType::_nil ()); - return IR::IDLType::_narrow (obj.in (), + return IR_IDLType::_narrow (obj.in (), ACE_TRY_ENV); } void -TAO_ValueBoxDef_i::original_type_def (IR::IDLType_ptr original_type_def, +TAO_ValueBoxDef_i::original_type_def (IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -134,7 +134,7 @@ TAO_ValueBoxDef_i::original_type_def (IR::IDLType_ptr original_type_def, } void -TAO_ValueBoxDef_i::original_type_def_i (IR::IDLType_ptr original_type_def, +TAO_ValueBoxDef_i::original_type_def_i (IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h index b362299a288..91545445884 100644 --- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h @@ -10,7 +10,7 @@ // ValueBoxDef_i.h // // = DESCRIPTION -// IR::ValueBoxDef servant class. +// IR_ValueBoxDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_ValueBoxDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -71,27 +71,27 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::IDLType_ptr original_type_def ( + virtual IR_IDLType_ptr original_type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr original_type_def_i ( + IR_IDLType_ptr original_type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( - IR::IDLType_ptr original_type_def, + IR_IDLType_ptr original_type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp index 782b4c4fdcb..91ae2f8da68 100644 --- a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp @@ -19,11 +19,11 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ValueDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Value; + return dk_Value; } void @@ -42,7 +42,7 @@ TAO_ValueDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_ValueDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_ValueDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ValueDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,7 +76,7 @@ TAO_ValueDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::InterfaceDefSeq * +IR_InterfaceDefSeq * TAO_ValueDef_i::supported_interfaces (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -85,7 +85,7 @@ TAO_ValueDef_i::supported_interfaces (CORBA::Environment &ACE_TRY_ENV) return this->supported_interfaces_i (ACE_TRY_ENV); } -IR::InterfaceDefSeq * +IR_InterfaceDefSeq * TAO_ValueDef_i::supported_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -95,7 +95,7 @@ TAO_ValueDef_i::supported_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */) void TAO_ValueDef_i::supported_interfaces ( - const IR::InterfaceDefSeq &supported_interfaces, + const IR_InterfaceDefSeq &supported_interfaces, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -108,7 +108,7 @@ TAO_ValueDef_i::supported_interfaces ( void TAO_ValueDef_i::supported_interfaces_i ( - const IR::InterfaceDefSeq & /* supported_interfaces */, + const IR_InterfaceDefSeq & /* supported_interfaces */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -116,7 +116,7 @@ TAO_ValueDef_i::supported_interfaces_i ( // TODO } -IR::InitializerSeq * +IR_InitializerSeq * TAO_ValueDef_i::initializers (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -125,7 +125,7 @@ TAO_ValueDef_i::initializers (CORBA::Environment &ACE_TRY_ENV) return this->initializers_i (ACE_TRY_ENV); } -IR::InitializerSeq * +IR_InitializerSeq * TAO_ValueDef_i::initializers_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -134,7 +134,7 @@ TAO_ValueDef_i::initializers_i (CORBA::Environment & /* ACE_TRY_ENV */) } void -TAO_ValueDef_i::initializers (const IR::InitializerSeq &initializers, +TAO_ValueDef_i::initializers (const IR_InitializerSeq &initializers, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -145,23 +145,23 @@ TAO_ValueDef_i::initializers (const IR::InitializerSeq &initializers, } void -TAO_ValueDef_i::initializers_i (const IR::InitializerSeq & /* initializers */, +TAO_ValueDef_i::initializers_i (const IR_InitializerSeq & /* initializers */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_ValueDef_i::base_value (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::ValueDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_ValueDef::_nil ()); return this->base_value_i (ACE_TRY_ENV); } -IR::ValueDef_ptr +IR_ValueDef_ptr TAO_ValueDef_i::base_value_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -170,7 +170,7 @@ TAO_ValueDef_i::base_value_i (CORBA::Environment & /* ACE_TRY_ENV */) } void -TAO_ValueDef_i::base_value (IR::ValueDef_ptr base_value, +TAO_ValueDef_i::base_value (IR_ValueDef_ptr base_value, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -181,14 +181,14 @@ TAO_ValueDef_i::base_value (IR::ValueDef_ptr base_value, } void -TAO_ValueDef_i::base_value_i (IR::ValueDef_ptr /* base_value */, +TAO_ValueDef_i::base_value_i (IR_ValueDef_ptr /* base_value */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } -IR::ValueDefSeq * +IR_ValueDefSeq * TAO_ValueDef_i::abstract_base_values (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -197,7 +197,7 @@ TAO_ValueDef_i::abstract_base_values (CORBA::Environment &ACE_TRY_ENV) return this->abstract_base_values_i (ACE_TRY_ENV); } -IR::ValueDefSeq * +IR_ValueDefSeq * TAO_ValueDef_i::abstract_base_values_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -207,7 +207,7 @@ TAO_ValueDef_i::abstract_base_values_i (CORBA::Environment & /* ACE_TRY_ENV */) void TAO_ValueDef_i::abstract_base_values ( - const IR::ValueDefSeq &abstract_base_values, + const IR_ValueDefSeq &abstract_base_values, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -220,7 +220,7 @@ TAO_ValueDef_i::abstract_base_values ( void TAO_ValueDef_i::abstract_base_values_i ( - const IR::ValueDefSeq & /* abstract_base_values */, + const IR_ValueDefSeq & /* abstract_base_values */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -356,16 +356,16 @@ TAO_ValueDef_i::is_a_i (const char * /* id */, return 0; } -IR::ValueMemberDef_ptr +IR_ValueMemberDef_ptr TAO_ValueDef_i::create_value_member (const char *id, const char *name, const char *version, - IR::IDLType_ptr type, + IR_IDLType_ptr type, CORBA::Visibility access, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::ValueMemberDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_ValueMemberDef::_nil ()); return this->create_value_member_i (id, name, @@ -375,11 +375,11 @@ TAO_ValueDef_i::create_value_member (const char *id, ACE_TRY_ENV); } -IR::ValueMemberDef_ptr +IR_ValueMemberDef_ptr TAO_ValueDef_i::create_value_member_i (const char * /* id */, const char * /* name */, const char * /* version */, - IR::IDLType_ptr /* type */, + IR_IDLType_ptr /* type */, CORBA::Visibility /* access */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -388,20 +388,20 @@ TAO_ValueDef_i::create_value_member_i (const char * /* id */, return 0; } -IR::AttributeDef_ptr +IR_AttributeDef_ptr TAO_ValueDef_i::create_attribute ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, - IR::AttributeMode mode, - const IR::ExceptionDefSeq &get_exceptions, - const IR::ExceptionDefSeq &put_exceptions, + IR_IDLType_ptr type, + IR_AttributeMode mode, + const IR_ExceptionDefSeq &get_exceptions, + const IR_ExceptionDefSeq &put_exceptions, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::AttributeDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_AttributeDef::_nil ()); return this->create_attribute_i (id, name, @@ -413,15 +413,15 @@ TAO_ValueDef_i::create_attribute ( ACE_TRY_ENV); } -IR::AttributeDef_ptr +IR_AttributeDef_ptr TAO_ValueDef_i::create_attribute_i ( const char * /* id */, const char * /* name */, const char * /* version */, - IR::IDLType_ptr /* type */, - IR::AttributeMode /* mode */, - const IR::ExceptionDefSeq & /* get_exceptions */, - const IR::ExceptionDefSeq & /* put_exceptions */, + IR_IDLType_ptr /* type */, + IR_AttributeMode /* mode */, + const IR_ExceptionDefSeq & /* get_exceptions */, + const IR_ExceptionDefSeq & /* put_exceptions */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -430,21 +430,21 @@ TAO_ValueDef_i::create_attribute_i ( return 0; } -IR::OperationDef_ptr +IR_OperationDef_ptr TAO_ValueDef_i::create_operation ( const char *id, const char *name, const char *version, - IR::IDLType_ptr result, - IR::OperationMode mode, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, - const IR::ContextIdSeq &contexts, + IR_IDLType_ptr result, + IR_OperationMode mode, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::OperationDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (IR_OperationDef::_nil ()); return this->create_operation_i (id, name, @@ -457,16 +457,16 @@ TAO_ValueDef_i::create_operation ( ACE_TRY_ENV); } -IR::OperationDef_ptr +IR_OperationDef_ptr TAO_ValueDef_i::create_operation_i ( const char * /* id */, const char * /* name */, const char * /* version */, - IR::IDLType_ptr /* result */, - IR::OperationMode /* mode */, - const IR::ParDescriptionSeq & /* params */, - const IR::ExceptionDefSeq & /* exceptions */, - const IR::ContextIdSeq & /* contexts */, + IR_IDLType_ptr /* result */, + IR_OperationMode /* mode */, + const IR_ParDescriptionSeq & /* params */, + const IR_ExceptionDefSeq & /* exceptions */, + const IR_ContextIdSeq & /* contexts */, CORBA::Environment & /* ACE_TRY_ENV */ ) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.h b/TAO/orbsvcs/IFR_Service/ValueDef_i.h index 6e1ab46f059..612d83ff1b4 100644 --- a/TAO/orbsvcs/IFR_Service/ValueDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.h @@ -10,7 +10,7 @@ // ValueDef_i.h // // = DESCRIPTION -// IR::ValueDef servant class. +// IR_ValueDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -52,7 +52,7 @@ public: virtual ~TAO_ValueDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -72,14 +72,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -100,105 +100,105 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual IR::InterfaceDefSeq *supported_interfaces ( + virtual IR_InterfaceDefSeq *supported_interfaces ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::InterfaceDefSeq *supported_interfaces_i ( + IR_InterfaceDefSeq *supported_interfaces_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( - const IR::InterfaceDefSeq & supported_interfaces, + const IR_InterfaceDefSeq & supported_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( - const IR::InterfaceDefSeq & supported_interfaces, + const IR_InterfaceDefSeq & supported_interfaces, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::InitializerSeq *initializers ( + virtual IR_InitializerSeq *initializers ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::InitializerSeq *initializers_i ( + IR_InitializerSeq *initializers_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void initializers ( - const IR::InitializerSeq & initializers, + const IR_InitializerSeq & initializers, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void initializers_i ( - const IR::InitializerSeq & initializers, + const IR_InitializerSeq & initializers, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ValueDef_ptr base_value ( + virtual IR_ValueDef_ptr base_value ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ValueDef_ptr base_value_i ( + IR_ValueDef_ptr base_value_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_value ( - IR::ValueDef_ptr base_value, + IR_ValueDef_ptr base_value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void base_value_i ( - IR::ValueDef_ptr base_value, + IR_ValueDef_ptr base_value, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ValueDefSeq *abstract_base_values ( + virtual IR_ValueDefSeq *abstract_base_values ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ValueDefSeq *abstract_base_values_i ( + IR_ValueDefSeq *abstract_base_values_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void abstract_base_values ( - const IR::ValueDefSeq & abstract_base_values, + const IR_ValueDefSeq & abstract_base_values, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void abstract_base_values_i ( - const IR::ValueDefSeq & abstract_base_values, + const IR_ValueDefSeq & abstract_base_values, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -296,77 +296,77 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::ValueMemberDef_ptr create_value_member ( + virtual IR_ValueMemberDef_ptr create_value_member ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, + IR_IDLType_ptr type, CORBA::Visibility access, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::ValueMemberDef_ptr create_value_member_i ( + IR_ValueMemberDef_ptr create_value_member_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, + IR_IDLType_ptr type, CORBA::Visibility access, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::AttributeDef_ptr create_attribute ( + virtual IR_AttributeDef_ptr create_attribute ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, - IR::AttributeMode mode, - const IR::ExceptionDefSeq &get_exceptions, - const IR::ExceptionDefSeq &put_exceptions, + IR_IDLType_ptr type, + IR_AttributeMode mode, + const IR_ExceptionDefSeq &get_exceptions, + const IR_ExceptionDefSeq &put_exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::AttributeDef_ptr create_attribute_i ( + IR_AttributeDef_ptr create_attribute_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr type, - IR::AttributeMode mode, - const IR::ExceptionDefSeq &get_exceptions, - const IR::ExceptionDefSeq &put_exceptions, + IR_IDLType_ptr type, + IR_AttributeMode mode, + const IR_ExceptionDefSeq &get_exceptions, + const IR_ExceptionDefSeq &put_exceptions, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::OperationDef_ptr create_operation ( + virtual IR_OperationDef_ptr create_operation ( const char *id, const char *name, const char *version, - IR::IDLType_ptr result, - IR::OperationMode mode, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, - const IR::ContextIdSeq &contexts, + IR_IDLType_ptr result, + IR_OperationMode mode, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::OperationDef_ptr create_operation_i ( + IR_OperationDef_ptr create_operation_i ( const char *id, const char *name, const char *version, - IR::IDLType_ptr result, - IR::OperationMode mode, - const IR::ParDescriptionSeq ¶ms, - const IR::ExceptionDefSeq &exceptions, - const IR::ContextIdSeq &contexts, + IR_IDLType_ptr result, + IR_OperationMode mode, + const IR_ParDescriptionSeq ¶ms, + const IR_ExceptionDefSeq &exceptions, + const IR_ContextIdSeq &contexts, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp index e79bd7a8f3f..ea23b1806d4 100644 --- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp @@ -19,11 +19,11 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_ValueMemberDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_ValueMember; + return dk_ValueMember; } void @@ -42,7 +42,7 @@ TAO_ValueMemberDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */) // TODO } -IR::Contained::Description * +IR_Contained::Description * TAO_ValueMemberDef_i::describe (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_ValueMemberDef_i::describe (CORBA::Environment &ACE_TRY_ENV) return this->describe_i (ACE_TRY_ENV); } -IR::Contained::Description * +IR_Contained::Description * TAO_ValueMemberDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,16 +76,16 @@ TAO_ValueMemberDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */) return 0; } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ValueMemberDef_i::type_def (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (IR_IDLType::_nil ()); return this->type_def_i (ACE_TRY_ENV); } -IR::IDLType_ptr +IR_IDLType_ptr TAO_ValueMemberDef_i::type_def_i (CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -94,7 +94,7 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::Environment & /* ACE_TRY_ENV */) } void -TAO_ValueMemberDef_i::type_def (IR::IDLType_ptr type_def, +TAO_ValueMemberDef_i::type_def (IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -105,7 +105,7 @@ TAO_ValueMemberDef_i::type_def (IR::IDLType_ptr type_def, } void -TAO_ValueMemberDef_i::type_def_i (IR::IDLType_ptr /* type_def */, +TAO_ValueMemberDef_i::type_def_i (IR_IDLType_ptr /* type_def */, CORBA::Environment & /* ACE_TRY_ENV */) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h index 71de6aba5f4..d7687cfb7a5 100644 --- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h @@ -10,7 +10,7 @@ // ValueMemberDef_i.h // // = DESCRIPTION -// IR::ValueMemberDef servant class. +// IR_ValueMemberDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -49,7 +49,7 @@ public: virtual ~TAO_ValueMemberDef_i (void); // Destructor - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -69,14 +69,14 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::Contained::Description *describe ( + virtual IR_Contained::Description *describe ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual IR::Contained::Description *describe_i ( + virtual IR_Contained::Description *describe_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) @@ -95,27 +95,27 @@ public: ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual IR::IDLType_ptr type_def ( + virtual IR_IDLType_ptr type_def ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); - IR::IDLType_ptr type_def_i ( + IR_IDLType_ptr type_def_i ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( - IR::IDLType_ptr type_def, + IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( - IR::IDLType_ptr type_def, + IR_IDLType_ptr type_def, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp index 52894b72631..a56225c5690 100644 --- a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp @@ -19,11 +19,11 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void) { } -IR::DefinitionKind +IR_DefinitionKind TAO_WstringDef_i::def_kind (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - return IR::dk_Wstring; + return dk_Wstring; } void diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.h b/TAO/orbsvcs/IFR_Service/WstringDef_i.h index 0625253b405..3e75b4bb80f 100644 --- a/TAO/orbsvcs/IFR_Service/WstringDef_i.h +++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.h @@ -10,7 +10,7 @@ // WstringDef_i.h // // = DESCRIPTION -// IR::WstringDef servant class. +// IR_WstringDef servant class. // // = AUTHOR // Jeff Parsons <parsons@cs.wustl.edu> @@ -50,7 +50,7 @@ public: virtual ~TAO_WstringDef_i (void); // Destructor. - virtual IR::DefinitionKind def_kind ( + virtual IR_DefinitionKind def_kind ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) diff --git a/TAO/orbsvcs/IFR_Service/tmplinst.cpp b/TAO/orbsvcs/IFR_Service/tmplinst.cpp index 3bd73d05bee..483b5745ce3 100644 --- a/TAO/orbsvcs/IFR_Service/tmplinst.cpp +++ b/TAO/orbsvcs/IFR_Service/tmplinst.cpp @@ -7,7 +7,7 @@ ACE_RCSID(IFR_Service, tmplinst, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<IR::DefinitionKind>; +template class ACE_Node<IR_DefinitionKind>; template class ACE_Unbounded_Queue<IR::DefinitionKind>; template class ACE_Unbounded_Queue_Iterator<IR::DefinitionKind>; template class ACE_Node<ACE_TString>; @@ -90,7 +90,7 @@ template class auto_ptr<char>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Node<IR::DefinitionKind> -#pragma instantiate ACE_Unbounded_Queue<IR::DefinitionKind> +#pragma instantiate ACE_Unbounded_Queue<IR_DefinitionKind> #pragma instantiate ACE_Unbounded_Queue_Iterator<IR::DefinitionKind> #pragma instantiate ACE_Node<ACE_TString> #pragma instantiate ACE_Unbounded_Queue<ACE_TString> |