diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-01 11:43:26 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-01 11:43:26 +0000 |
| commit | 3a1d3ceb5048fc59409626f40da8a71527194c00 (patch) | |
| tree | 70e827eee129e07a040a8dccd997de64c73d54ff /TAO/orbsvcs/orbsvcs/IFRService | |
| parent | cb34aefc6dae0aed0a9977dd5e72e07072161ef8 (diff) | |
| download | ATCD-3a1d3ceb5048fc59409626f40da8a71527194c00.tar.gz | |
ChangeLogTag:Sat Mar 1 03:41:30 2003 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService')
65 files changed, 927 insertions, 999 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index e572cb5d162..e3a4be66f89 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -53,4 +53,3 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id return this->TAO_InterfaceDef_i::is_a_i (interface_id ACE_ENV_ARG_PARAMETER); } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 9188ace6df3..4c98733aec8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -78,16 +78,16 @@ TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_AliasDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -114,14 +114,14 @@ TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, original_type.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - return CORBA_IDLType::_narrow (obj.in () + return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def +TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -132,7 +132,7 @@ TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def } void -TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def +TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -148,4 +148,3 @@ TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def "original_type", original_type.in ()); } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h index 03444d28d72..e26a8b1a027 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h @@ -69,24 +69,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual CORBA_IDLType_ptr original_type_def ( + virtual CORBA::IDLType_ptr original_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr original_type_def_i ( + CORBA::IDLType_ptr original_type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -97,4 +97,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_ALIASDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index eb2709dbf92..75848914e09 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -156,16 +156,16 @@ TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL) return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ArrayDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -192,14 +192,14 @@ TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - return CORBA_IDLType::_narrow (obj.in () + return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_ArrayDef_i::element_type_def (CORBA_IDLType_ptr element_type_def +TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -210,7 +210,7 @@ TAO_ArrayDef_i::element_type_def (CORBA_IDLType_ptr element_type_def } void -TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def +TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -280,4 +280,3 @@ TAO_ArrayDef_i::destroy_element_type ( break; } } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index 9cbe147dd4a..4b53ede8c8c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -109,24 +109,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_IDLType_ptr element_type_def ( + virtual CORBA::IDLType_ptr element_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr element_type_def_i ( + CORBA::IDLType_ptr element_type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( - CORBA_IDLType_ptr element_type_def + CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( - CORBA_IDLType_ptr element_type_def + CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -144,4 +144,3 @@ private: #endif /* _MSC_VER */ #endif /* TAO_ARRAYDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 4bf09e2fcf8..a2bc1a3863f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -30,7 +30,7 @@ TAO_AttributeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Attribute; } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -39,17 +39,17 @@ TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Contained::Description *desc_ptr = 0; + CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - CORBA_Contained::Description, + CORBA::Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_Contained::Description_var retval = desc_ptr; + CORBA::Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -94,16 +94,16 @@ TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_AttributeDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -130,17 +130,17 @@ TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in () + CORBA::IDLType_var retval = CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); return retval._retn (); } void -TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def +TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -151,7 +151,7 @@ TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def } void -TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def +TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -210,11 +210,11 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode mode); } -CORBA_AttributeDescription +CORBA::AttributeDescription TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_AttributeDescription ad; + CORBA::AttributeDescription ad; ad.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); @@ -280,7 +280,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA_ExcDescriptionSeq get_ed_seq (index); + CORBA::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 (ACE_ENV_SINGLE_ARG_DECL) ACE_Configuration_Section_Key key; key_queue.dequeue_head (key); - CORBA_ExceptionDescription get_ed; + CORBA::ExceptionDescription get_ed; ACE_TString name; this->repo_->config ()->get_string_value (key, @@ -364,7 +364,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA_ExcDescriptionSeq put_ed_seq (index); + CORBA::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 (ACE_ENV_SINGLE_ARG_DECL) ACE_Configuration_Section_Key key; key_queue.dequeue_head (key); - CORBA_ExceptionDescription put_ed; + CORBA::ExceptionDescription put_ed; ACE_TString name; this->repo_->config ()->get_string_value (key, @@ -416,7 +416,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL) return ad; } -CORBA_ExceptionDefSeq * +CORBA::ExceptionDefSeq * TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -464,15 +464,15 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL) size_t size = path_queue.size (); - CORBA_ExceptionDefSeq *get_ed_seq = 0; + CORBA::ExceptionDefSeq *get_ed_seq = 0; ACE_NEW_THROW_EX (get_ed_seq, - CORBA_ExceptionDefSeq (size), + CORBA::ExceptionDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); get_ed_seq->length (size); - CORBA_ExceptionDefSeq_var retval = get_ed_seq; + CORBA::ExceptionDefSeq_var retval = get_ed_seq; for (CORBA::ULong i = 0; i < size; ++i) { @@ -485,7 +485,7 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval[i] = CORBA_ExceptionDef::_narrow (obj.in () + retval[i] = CORBA::ExceptionDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -493,7 +493,7 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } -CORBA_ExceptionDefSeq * +CORBA::ExceptionDefSeq * TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -541,15 +541,15 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) size_t size = path_queue.size (); - CORBA_ExceptionDefSeq *put_ed_seq = 0; + CORBA::ExceptionDefSeq *put_ed_seq = 0; ACE_NEW_THROW_EX (put_ed_seq, - CORBA_ExceptionDefSeq (size), + CORBA::ExceptionDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); put_ed_seq->length (size); - CORBA_ExceptionDefSeq_var retval = put_ed_seq; + CORBA::ExceptionDefSeq_var retval = put_ed_seq; for (CORBA::ULong i = 0; i < size; ++i) { @@ -562,11 +562,10 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval[i] = CORBA_ExceptionDef::_narrow (obj.in () + retval[i] = CORBA::ExceptionDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return retval._retn (); } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index f564056a4d7..bef74696bbc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -57,13 +57,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -79,24 +79,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_IDLType_ptr type_def ( + virtual CORBA::IDLType_ptr type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr type_def_i ( + CORBA::IDLType_ptr type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( - CORBA_IDLType_ptr type_def + CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( - CORBA_IDLType_ptr type_def + CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -123,7 +123,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_AttributeDescription make_description ( + CORBA::AttributeDescription make_description ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -131,12 +131,12 @@ public: // making its own description. // These two are called by Contained::move(). - CORBA_ExceptionDefSeq *get_exceptions ( + CORBA::ExceptionDefSeq *get_exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ExceptionDefSeq *put_exceptions ( + CORBA::ExceptionDefSeq *put_exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -147,4 +147,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_ATTRIBUTEDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index 404cbceb9d2..e7b9d2c3f8e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -45,7 +45,7 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGL // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -54,7 +54,7 @@ TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -79,7 +79,7 @@ TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_A return 0; } -CORBA_InterfaceDefSeq * +CORBA::InterfaceDefSeq * TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -88,7 +88,7 @@ TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDefSeq * +CORBA::InterfaceDefSeq * TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -98,7 +98,7 @@ TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* void TAO_ComponentDef_i::supported_interfaces ( - const CORBA_InterfaceDefSeq &supported_interfaces + const CORBA::InterfaceDefSeq &supported_interfaces ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -111,7 +111,7 @@ TAO_ComponentDef_i::supported_interfaces ( void TAO_ComponentDef_i::supported_interfaces_i ( - const CORBA_InterfaceDefSeq & /* supported_interfaces */ + const CORBA::InterfaceDefSeq & /* supported_interfaces */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -234,7 +234,7 @@ TAO_ComponentDef_i::create_provides ( const char *id, const char *name, const char *version, - CORBA_InterfaceDef_ptr interface_type + CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -253,7 +253,7 @@ TAO_ComponentDef_i::create_provides_i ( const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_InterfaceDef_ptr /* interface_type */ + CORBA::InterfaceDef_ptr /* interface_type */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -266,7 +266,7 @@ IR::UsesDef_ptr TAO_ComponentDef_i::create_uses (const char *id, const char *name, const char *version, - CORBA_InterfaceDef_ptr interface_type, + CORBA::InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -285,7 +285,7 @@ IR::UsesDef_ptr TAO_ComponentDef_i::create_uses_i (const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_InterfaceDef_ptr /* interface_type */, + CORBA::InterfaceDef_ptr /* interface_type */, CORBA::Boolean /* is_multiple */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -298,7 +298,7 @@ IR::EmitsDef_ptr TAO_ComponentDef_i::create_emits (const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -315,7 +315,7 @@ IR::EmitsDef_ptr TAO_ComponentDef_i::create_emits_i (const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_ValueDef_ptr /* value */ + CORBA::ValueDef_ptr /* value */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -327,7 +327,7 @@ IR::PublishesDef_ptr TAO_ComponentDef_i::create_publishes (const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -344,7 +344,7 @@ IR::PublishesDef_ptr TAO_ComponentDef_i::create_publishes_i (const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_ValueDef_ptr /* value */ + CORBA::ValueDef_ptr /* value */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -356,7 +356,7 @@ IR::ConsumesDef_ptr TAO_ComponentDef_i::create_consumes (const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -373,11 +373,10 @@ IR::ConsumesDef_ptr TAO_ComponentDef_i::create_consumes_i (const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_ValueDef_ptr /* value */ + CORBA::ValueDef_ptr /* value */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index 1228478c8c2..2c105aeff6e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -70,13 +70,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -94,24 +94,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual CORBA_InterfaceDefSeq *supported_interfaces ( + virtual CORBA::InterfaceDefSeq *supported_interfaces ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InterfaceDefSeq *supported_interfaces_i ( + CORBA::InterfaceDefSeq *supported_interfaces_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( - const CORBA_InterfaceDefSeq &supported_interfaces + const CORBA::InterfaceDefSeq &supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( - const CORBA_InterfaceDefSeq &supported_interfaces + const CORBA::InterfaceDefSeq &supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -190,7 +190,7 @@ public: const char *id, const char *name, const char *version, - CORBA_InterfaceDef_ptr interface_type + CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -199,7 +199,7 @@ public: const char *id, const char *name, const char *version, - CORBA_InterfaceDef_ptr interface_type + CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -208,7 +208,7 @@ public: const char *id, const char *name, const char *version, - CORBA_InterfaceDef_ptr interface_type, + CORBA::InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -218,7 +218,7 @@ public: const char *id, const char *name, const char *version, - CORBA_InterfaceDef_ptr interface_type, + CORBA::InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -228,7 +228,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -237,7 +237,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -246,7 +246,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -255,7 +255,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -264,7 +264,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -273,7 +273,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr value + CORBA::ValueDef_ptr value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -284,5 +284,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_COMPONENTDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index cbaeaae6da6..1e92311ed7d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -26,7 +26,7 @@ TAO_ComponentRepository_i::create_component ( const char *name, const char *version, IR::ComponentDef_ptr base_component, - const CORBA_InterfaceDefSeq & supports_interfaces + const CORBA::InterfaceDefSeq & supports_interfaces ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -47,7 +47,7 @@ TAO_ComponentRepository_i::create_component_i ( const char * /* name */, const char * /* version */, IR::ComponentDef_ptr /* base_component */, - const CORBA_InterfaceDefSeq & /* supports_interfaces */ + const CORBA::InterfaceDefSeq & /* supports_interfaces */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -63,7 +63,7 @@ TAO_ComponentRepository_i::create_home ( const char *version, IR::HomeDef_ptr base_component, IR::ComponentDef_ptr managed_component, - CORBA_ValueDef_ptr primary_key + CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -86,7 +86,7 @@ TAO_ComponentRepository_i::create_home_i ( const char * /* version */, IR::HomeDef_ptr /* base_component */, IR::ComponentDef_ptr /* managed_component */, - CORBA_ValueDef_ptr /* primary_key */ + CORBA::ValueDef_ptr /* primary_key */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -94,4 +94,3 @@ TAO_ComponentRepository_i::create_home_i ( // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index b82a165939b..bc0ecae77df 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -60,7 +60,7 @@ public: const char *name, const char *version, IR::ComponentDef_ptr base_component, - const CORBA_InterfaceDefSeq & supports_interfaces + const CORBA::InterfaceDefSeq & supports_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -70,7 +70,7 @@ public: const char *name, const char *version, IR::ComponentDef_ptr base_component, - const CORBA_InterfaceDefSeq & supports_interfaces + const CORBA::InterfaceDefSeq & supports_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -81,7 +81,7 @@ public: const char *version, IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, - CORBA_ValueDef_ptr primary_key + CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -92,7 +92,7 @@ public: const char *version, IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, - CORBA_ValueDef_ptr primary_key + CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 9691d8c6be0..a339083a51e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -29,7 +29,7 @@ TAO_ConstantDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Constant; } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ConstantDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,22 +38,22 @@ TAO_ConstantDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Contained::Description *desc_ptr = 0; + CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - CORBA_Contained::Description, + CORBA::Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_Contained::Description_var retval = desc_ptr; + CORBA::Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_ConstantDescription cd; + CORBA::ConstantDescription cd; cd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -119,16 +119,16 @@ TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ConstantDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -155,14 +155,14 @@ TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - return CORBA_IDLType::_narrow (obj.in () + return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_ConstantDef_i::type_def (CORBA_IDLType_ptr type_def +TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -173,7 +173,7 @@ TAO_ConstantDef_i::type_def (CORBA_IDLType_ptr type_def } void -TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def +TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h index 0419041fd77..488365bf328 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h @@ -56,13 +56,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -78,24 +78,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_IDLType_ptr type_def ( + virtual CORBA::IDLType_ptr type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr type_def_i ( + CORBA::IDLType_ptr type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( - CORBA_IDLType_ptr type_def + CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( - CORBA_IDLType_ptr type_def + CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -128,4 +128,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_CONSTANTDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index e03833001b3..454c559a4dc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -43,7 +43,7 @@ TAO_ConsumesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ConsumesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,11 +52,10 @@ TAO_ConsumesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ConsumesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index b6211f10edb..97b114b715a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -68,13 +68,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -86,5 +86,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_CONSUMESDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index a4cf9266e73..d88f06e85e5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -272,16 +272,16 @@ TAO_Contained_i::version_i (const char *version version); } -CORBA_Container_ptr +CORBA::Container_ptr TAO_Contained_i::defined_in (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_Container::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ()); return this->defined_in_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Container_ptr +CORBA::Container_ptr TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -316,11 +316,11 @@ TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, container_path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_Container::_nil ()); + ACE_CHECK_RETURN (CORBA::Container::_nil ()); - CORBA_Container_var retval = CORBA_Container::_narrow (obj.in () + CORBA::Container_var retval = CORBA::Container::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_Container::_nil ()); + ACE_CHECK_RETURN (CORBA::Container::_nil ()); return retval._retn (); } @@ -346,16 +346,16 @@ TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::string_dup (absolute_name.c_str ()); } -CORBA_Repository_ptr +CORBA::Repository_ptr TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_Repository::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::Repository::_nil ()); return this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Repository_ptr +CORBA::Repository_ptr TAO_Contained_i::containing_repository_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -363,7 +363,7 @@ TAO_Contained_i::containing_repository_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_Contained_i::move (CORBA_Container_ptr new_container, +TAO_Contained_i::move (CORBA::Container_ptr new_container, const char *new_name, const char *new_version ACE_ENV_ARG_DECL) @@ -481,14 +481,14 @@ TAO_Contained_i::contents_name_update (ACE_TString stem, } void -TAO_Contained_i::move_i (CORBA_Container_ptr new_container, +TAO_Contained_i::move_i (CORBA::Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Boolean cleanup ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Repository_var my_repo = + CORBA::Repository_var my_repo = this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -534,7 +534,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, auto_ptr<TAO_Contained_i> safety (impl); - CORBA_Repository_var your_repo = + CORBA::Repository_var your_repo = impl->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -576,7 +576,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_EnumDef_i impl (this->repo_, this->section_key_); - CORBA_EnumMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::EnumMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -590,7 +590,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, ACE_TRY_CHECK; } - CORBA_EnumDef_var new_defn = + CORBA::EnumDef_var new_defn = container_impl->create_enum_i (id.in (), new_name, new_version, @@ -604,7 +604,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_AliasDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_alias_i (id.in (), @@ -629,7 +629,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ValueBoxDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_value_box_i (id.in (), @@ -645,7 +645,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_StructDef_i impl (this->repo_, this->section_key_); - CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -659,7 +659,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, ACE_TRY_CHECK; } - CORBA_StructDef_var new_defn = + CORBA::StructDef_var new_defn = container_impl->create_struct_i (id.in (), new_name, new_version, @@ -677,11 +677,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_UnionDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var disc_type = + CORBA::IDLType_var disc_type = impl.discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_UnionMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::UnionMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -695,7 +695,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, ACE_TRY_CHECK; } - CORBA_UnionDef_var new_defn = + CORBA::UnionDef_var new_defn = container_impl->create_union_i (id.in (), new_name, new_version, @@ -711,7 +711,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, } case CORBA::dk_Module: { - CORBA_ModuleDef_var new_defn = + CORBA::ModuleDef_var new_defn = container_impl->create_module_i (id.in (), new_name, new_version @@ -728,10 +728,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ExceptionDef_i impl (this->repo_, this->section_key_); - CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ExceptionDef_var new_defn = + CORBA::ExceptionDef_var new_defn = container_impl->create_exception_i (id.in (), new_name, new_version, @@ -749,11 +749,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_InterfaceDef_i impl (this->repo_, this->section_key_); - CORBA_InterfaceDefSeq_var bases = + CORBA::InterfaceDefSeq_var bases = impl.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_InterfaceDef_var new_defn = + CORBA::InterfaceDef_var new_defn = container_impl->create_interface_i (id.in (), new_name, new_version, @@ -771,7 +771,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ConstantDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any_var value = impl.value_i (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -791,7 +791,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_AttributeDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::AttributeMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -835,20 +835,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_OperationDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var result = impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var result = impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::OperationMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ParDescriptionSeq_var params = impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::ParDescriptionSeq_var params = impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ExceptionDefSeq_var exceptions = + CORBA::ExceptionDefSeq_var exceptions = impl.exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ContextIdSeq_var contexts = impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::ContextIdSeq_var contexts = impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Interface) @@ -964,7 +964,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, } void -TAO_Contained_i::move_pre_process (CORBA_Container_ptr container, +TAO_Contained_i::move_pre_process (CORBA::Container_ptr container, const char *contained_path, const char *name ACE_ENV_ARG_DECL) @@ -1026,7 +1026,7 @@ TAO_Contained_i::move_pre_process (CORBA_Container_ptr container, } void -TAO_Contained_i::move_contents (CORBA_Container_ptr new_container +TAO_Contained_i::move_contents (CORBA::Container_ptr new_container ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index a1a89d05b1a..ffb9d4fcdda 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -128,12 +128,12 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Container_ptr defined_in ( + virtual CORBA::Container_ptr defined_in ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_Container_ptr defined_in_i ( + CORBA::Container_ptr defined_in_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -148,30 +148,30 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Repository_ptr containing_repository ( + virtual CORBA::Repository_ptr containing_repository ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_Repository_ptr containing_repository_i ( + CORBA::Repository_ptr containing_repository_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void move ( - CORBA_Container_ptr new_container, + CORBA::Container_ptr new_container, const char *new_name, const char *new_version ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -180,7 +180,7 @@ public: protected: void move_i ( - CORBA_Container_ptr new_container, + CORBA::Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Boolean cleanup @@ -207,7 +207,7 @@ private: // Recursively update the scoped name of our contents. void move_pre_process ( - CORBA_Container_ptr container, + CORBA::Container_ptr container, const char *contained_path, const char *name ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -219,7 +219,7 @@ private: // unmangles the names. void move_contents ( - CORBA_Container_ptr new_container + CORBA::Container_ptr new_container ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index 406f2b64821..75c0e0b436e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -161,7 +161,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) } } -CORBA_Contained_ptr +CORBA::Contained_ptr TAO_Container_i::lookup (const char *search_name ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -172,7 +172,7 @@ TAO_Container_i::lookup (const char *search_name ACE_ENV_ARG_PARAMETER); } -CORBA_Contained_ptr +CORBA::Contained_ptr TAO_Container_i::lookup_i (const char *search_name ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -356,7 +356,7 @@ TAO_Container_i::lookup_i (const char *search_name } } - return CORBA_Contained::_nil (); + return CORBA::Contained::_nil (); } this->repo_->config ()->get_integer_value (work_key, @@ -379,13 +379,13 @@ TAO_Container_i::lookup_i (const char *search_name this->repo_->servant_factory ()->create_objref (def_kind, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_Contained::_nil ()); + ACE_CHECK_RETURN (CORBA::Contained::_nil ()); - return CORBA_Contained::_narrow (obj.in () + return CORBA::Contained::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_ContainedSeq * +CORBA::ContainedSeq * TAO_Container_i::contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited ACE_ENV_ARG_DECL) @@ -398,19 +398,19 @@ TAO_Container_i::contents (CORBA::DefinitionKind limit_type, ACE_ENV_ARG_PARAMETER); } -CORBA_ContainedSeq * +CORBA::ContainedSeq * TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_ContainedSeq *contents = 0; + CORBA::ContainedSeq *contents = 0; ACE_NEW_THROW_EX (contents, - CORBA_ContainedSeq, + CORBA::ContainedSeq, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_ContainedSeq_var retval = contents; + CORBA::ContainedSeq_var retval = contents; retval->length (0); if (limit_type == CORBA::dk_none) @@ -522,8 +522,8 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_Contained_var next_cont = - CORBA_Contained::_narrow (obj.in () + CORBA::Contained_var next_cont = + CORBA::Contained::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -533,7 +533,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, return retval._retn (); } -CORBA_ContainedSeq * +CORBA::ContainedSeq * TAO_Container_i::lookup_name (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, @@ -550,7 +550,7 @@ TAO_Container_i::lookup_name (const char *search_name, ACE_ENV_ARG_PARAMETER); } -CORBA_ContainedSeq * +CORBA::ContainedSeq * TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, @@ -571,13 +571,13 @@ TAO_Container_i::lookup_name_i (const char *search_name, size_t size = kind_queue.size (); - CORBA_ContainedSeq *holder; + CORBA::ContainedSeq *holder; ACE_NEW_THROW_EX (holder, - CORBA_ContainedSeq (size), + CORBA::ContainedSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_ContainedSeq_var retval = holder; + CORBA::ContainedSeq_var retval = holder; retval->length (size); for (size_t i = 0; i < size; i++) @@ -594,8 +594,8 @@ TAO_Container_i::lookup_name_i (const char *search_name, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_Contained_var next_cont = - CORBA_Contained::_narrow (obj.in () + CORBA::Contained_var next_cont = + CORBA::Contained::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -605,7 +605,7 @@ TAO_Container_i::lookup_name_i (const char *search_name, return retval._retn (); } -CORBA_Container::DescriptionSeq * +CORBA::Container::DescriptionSeq * TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs @@ -620,14 +620,14 @@ TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, ACE_ENV_ARG_PARAMETER); } -CORBA_Container::DescriptionSeq * +CORBA::Container::DescriptionSeq * TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_ContainedSeq_var contents = this->contents_i (limit_type, + CORBA::ContainedSeq_var contents = this->contents_i (limit_type, exclude_inherited ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -642,17 +642,17 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, ? length : max_returned_objs; - CORBA_Container::DescriptionSeq *desc_seq; + CORBA::Container::DescriptionSeq *desc_seq; ACE_NEW_THROW_EX (desc_seq, - CORBA_Container::DescriptionSeq (ret_len), + CORBA::Container::DescriptionSeq (ret_len), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); desc_seq->length (ret_len); - CORBA_Container::DescriptionSeq_var retval = desc_seq; + CORBA::Container::DescriptionSeq_var retval = desc_seq; - CORBA_Contained::Description_var desc; + CORBA::Contained::Description_var desc; ACE_Configuration_Section_Key contained_key; PortableServer::ObjectId_var oid; @@ -684,7 +684,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, ACE_CHECK_RETURN (0); retval[i].contained_object = - CORBA_Contained::_duplicate (contents[i]); + CORBA::Contained::_duplicate (contents[i]); retval[i].kind = desc->kind; @@ -694,14 +694,14 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, return retval._retn (); } -CORBA_ModuleDef_ptr +CORBA::ModuleDef_ptr TAO_Container_i::create_module (const char *id, const char *name, const char *version ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_ModuleDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ModuleDef::_nil ()); return this->create_module_i (id, name, @@ -709,7 +709,7 @@ TAO_Container_i::create_module (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_ModuleDef_ptr +CORBA::ModuleDef_ptr TAO_Container_i::create_module_i (const char *id, const char *name, const char *version @@ -718,18 +718,18 @@ TAO_Container_i::create_module_i (const char *id, { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ()); if (!legal_op) - return CORBA_ModuleDef::_nil (); + return CORBA::ModuleDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ()); if (bad_params) - return CORBA_ModuleDef::_nil (); + return CORBA::ModuleDef::_nil (); ACE_Configuration_Section_Key defns_key; @@ -739,7 +739,7 @@ TAO_Container_i::create_module_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -761,22 +761,22 @@ TAO_Container_i::create_module_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Module, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ()); - return CORBA_ModuleDef::_narrow (obj.in () + return CORBA::ModuleDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_ConstantDef_ptr +CORBA::ConstantDef_ptr TAO_Container_i::create_constant (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, const CORBA::Any &value ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_ConstantDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ConstantDef::_nil ()); return this->create_constant_i (id, name, @@ -786,29 +786,29 @@ TAO_Container_i::create_constant (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_ConstantDef_ptr +CORBA::ConstantDef_ptr TAO_Container_i::create_constant_i (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, const CORBA::Any &value ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ()); if (!legal_op) - return CORBA_ConstantDef::_nil (); + return CORBA::ConstantDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ()); if (bad_params) - return CORBA_ConstantDef::_nil (); + return CORBA::ConstantDef::_nil (); // Create/open section for members defined in this scope. ACE_Configuration_Section_Key defns_key; @@ -817,7 +817,7 @@ TAO_Container_i::create_constant_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -832,7 +832,7 @@ TAO_Container_i::create_constant_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -847,7 +847,7 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::TypeCode_var val_tc = value.type (); CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ()); switch (kind) { @@ -878,21 +878,21 @@ TAO_Container_i::create_constant_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Constant, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ()); - return CORBA_ConstantDef::_narrow (obj.in () + return CORBA::ConstantDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_StructDef_ptr +CORBA::StructDef_ptr TAO_Container_i::create_struct (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_StructDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::StructDef::_nil ()); return this->create_struct_i (id, name, @@ -901,28 +901,28 @@ TAO_Container_i::create_struct (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_StructDef_ptr +CORBA::StructDef_ptr TAO_Container_i::create_struct_i (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); + ACE_CHECK_RETURN (CORBA::StructDef::_nil ()); if (!legal_op) - return CORBA_StructDef::_nil (); + return CORBA::StructDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); + ACE_CHECK_RETURN (CORBA::StructDef::_nil ()); if (bad_params) - return CORBA_StructDef::_nil (); + return CORBA::StructDef::_nil (); // Create/open section for members defined in this scope. ACE_Configuration_Section_Key defns_key; @@ -931,7 +931,7 @@ TAO_Container_i::create_struct_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -972,7 +972,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.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); + ACE_CHECK_RETURN (CORBA::StructDef::_nil ()); CORBA::String_var member_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -983,7 +983,7 @@ TAO_Container_i::create_struct_i (const char *id, } CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); + ACE_CHECK_RETURN (CORBA::StructDef::_nil ()); if (def_kind == CORBA::dk_Struct || def_kind == CORBA::dk_Union @@ -998,22 +998,22 @@ TAO_Container_i::create_struct_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Struct, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); + ACE_CHECK_RETURN (CORBA::StructDef::_nil ()); - return CORBA_StructDef::_narrow (obj.in () + return CORBA::StructDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_UnionDef_ptr +CORBA::UnionDef_ptr TAO_Container_i::create_union (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq &members + CORBA::IDLType_ptr discriminator_type, + const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_UnionDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::UnionDef::_nil ()); return this->create_union_i (id, name, @@ -1023,29 +1023,29 @@ TAO_Container_i::create_union (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_UnionDef_ptr +CORBA::UnionDef_ptr TAO_Container_i::create_union_i (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq &members + CORBA::IDLType_ptr discriminator_type, + const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::UnionDef::_nil ()); if (!legal_op) - return CORBA_UnionDef::_nil (); + return CORBA::UnionDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::UnionDef::_nil ()); if (bad_params) - return CORBA_UnionDef::_nil (); + return CORBA::UnionDef::_nil (); // Create new section, or open if it already exists. ACE_Configuration_Section_Key defns_key; @@ -1054,7 +1054,7 @@ TAO_Container_i::create_union_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1068,7 +1068,7 @@ TAO_Container_i::create_union_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (discriminator_type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::UnionDef::_nil ()); CORBA::String_var disc_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1108,7 +1108,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.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::UnionDef::_nil ()); CORBA::String_var member_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1123,7 +1123,7 @@ TAO_Container_i::create_union_i (const char *id, } CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::UnionDef::_nil ()); if (def_kind == CORBA::dk_Struct || def_kind == CORBA::dk_Union @@ -1138,21 +1138,21 @@ TAO_Container_i::create_union_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Union, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::UnionDef::_nil ()); - return CORBA_UnionDef::_narrow (obj.in () + return CORBA::UnionDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_EnumDef_ptr +CORBA::EnumDef_ptr TAO_Container_i::create_enum (const char *id, const char *name, const char *version, - const CORBA_EnumMemberSeq &members + const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_EnumDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::EnumDef::_nil ()); return this->create_enum_i (id, name, @@ -1161,28 +1161,28 @@ TAO_Container_i::create_enum (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_EnumDef_ptr +CORBA::EnumDef_ptr TAO_Container_i::create_enum_i (const char *id, const char *name, const char *version, - const CORBA_EnumMemberSeq &members + const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); + ACE_CHECK_RETURN (CORBA::EnumDef::_nil ()); if (!legal_op) - return CORBA_EnumDef::_nil (); + return CORBA::EnumDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); + ACE_CHECK_RETURN (CORBA::EnumDef::_nil ()); if (bad_params) - return CORBA_EnumDef::_nil (); + return CORBA::EnumDef::_nil (); // Create new section, or open if it already exists. ACE_Configuration_Section_Key defns_key; @@ -1191,7 +1191,7 @@ TAO_Container_i::create_enum_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1224,7 +1224,7 @@ TAO_Container_i::create_enum_i (const char *id, } CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); + ACE_CHECK_RETURN (CORBA::EnumDef::_nil ()); if (def_kind == CORBA::dk_Struct || def_kind == CORBA::dk_Union @@ -1239,21 +1239,21 @@ TAO_Container_i::create_enum_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Enum, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); + ACE_CHECK_RETURN (CORBA::EnumDef::_nil ()); - return CORBA_EnumDef::_narrow (obj.in () + return CORBA::EnumDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_AliasDef_ptr +CORBA::AliasDef_ptr TAO_Container_i::create_alias (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type + CORBA::IDLType_ptr original_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_AliasDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::AliasDef::_nil ()); return this->create_alias_i (id, name, @@ -1262,28 +1262,28 @@ TAO_Container_i::create_alias (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_AliasDef_ptr +CORBA::AliasDef_ptr TAO_Container_i::create_alias_i (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type + CORBA::IDLType_ptr original_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AliasDef::_nil ()); if (!legal_op) - return CORBA_AliasDef::_nil (); + return CORBA::AliasDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AliasDef::_nil ()); if (bad_params) - return CORBA_AliasDef::_nil (); + return CORBA::AliasDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1292,7 +1292,7 @@ TAO_Container_i::create_alias_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1306,7 +1306,7 @@ TAO_Container_i::create_alias_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AliasDef::_nil ()); CORBA::String_var unalias_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1320,21 +1320,21 @@ TAO_Container_i::create_alias_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Alias, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AliasDef::_nil ()); - return CORBA_AliasDef::_narrow (obj.in () + return CORBA::AliasDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr +CORBA::InterfaceDef_ptr TAO_Container_i::create_interface (const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); return this->create_interface_i (id, name, @@ -1343,28 +1343,28 @@ TAO_Container_i::create_interface (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr +CORBA::InterfaceDef_ptr TAO_Container_i::create_interface_i (const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ()); if (!legal_op) - return CORBA_InterfaceDef::_nil (); + return CORBA::InterfaceDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ()); if (bad_params) - return CORBA_InterfaceDef::_nil (); + return CORBA::InterfaceDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1373,7 +1373,7 @@ TAO_Container_i::create_interface_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1401,7 +1401,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_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ()); CORBA::String_var inherited_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1419,27 +1419,27 @@ TAO_Container_i::create_interface_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Interface, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ()); - return CORBA_InterfaceDef::_narrow (obj.in () + return CORBA::InterfaceDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_ValueDef_ptr +CORBA::ValueDef_ptr TAO_Container_i::create_value (const char *id, const char *name, const char *version, CORBA::Boolean is_custom, CORBA::Boolean is_abstract, - CORBA_ValueDef_ptr base_value, + CORBA::ValueDef_ptr base_value, CORBA::Boolean is_truncatable, - const CORBA_ValueDefSeq &abstract_base_values, - const CORBA_InterfaceDefSeq &supported_interfaces, - const CORBA_InitializerSeq &initializers + const CORBA::ValueDefSeq &abstract_base_values, + const CORBA::InterfaceDefSeq &supported_interfaces, + const CORBA::InitializerSeq &initializers ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueDef::_nil ()); return this->create_value_i (id, name, @@ -1454,17 +1454,17 @@ TAO_Container_i::create_value (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_ValueDef_ptr +CORBA::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 */, - CORBA_ValueDef_ptr /* base_value */, + CORBA::ValueDef_ptr /* base_value */, CORBA::Boolean /* is_truncatable */, - const CORBA_ValueDefSeq & /* abstract_base_values */, - const CORBA_InterfaceDefSeq & /* supported_interfaces */, - const CORBA_InitializerSeq & /* initializers */ + const CORBA::ValueDefSeq & /* abstract_base_values */, + const CORBA::InterfaceDefSeq & /* supported_interfaces */, + const CORBA::InitializerSeq & /* initializers */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1472,15 +1472,15 @@ TAO_Container_i::create_value_i (const char * /* id */, return 0; } -CORBA_ValueBoxDef_ptr +CORBA::ValueBoxDef_ptr TAO_Container_i::create_value_box (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueBoxDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueBoxDef::_nil ()); return this->create_value_box_i (id, name, @@ -1489,28 +1489,28 @@ TAO_Container_i::create_value_box (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_ValueBoxDef_ptr +CORBA::ValueBoxDef_ptr TAO_Container_i::create_value_box_i (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ()); if (!legal_op) - return CORBA_ValueBoxDef::_nil (); + return CORBA::ValueBoxDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ()); if (bad_params) - return CORBA_ValueBoxDef::_nil (); + return CORBA::ValueBoxDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1519,7 +1519,7 @@ TAO_Container_i::create_value_box_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1533,7 +1533,7 @@ TAO_Container_i::create_value_box_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ()); CORBA::String_var boxed_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1547,21 +1547,21 @@ TAO_Container_i::create_value_box_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_ValueBox, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ()); - return CORBA_ValueBoxDef::_narrow (obj.in () + return CORBA::ValueBoxDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_ExceptionDef_ptr +CORBA::ExceptionDef_ptr TAO_Container_i::create_exception (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_ExceptionDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExceptionDef::_nil ()); return this->create_exception_i (id, name, @@ -1570,28 +1570,28 @@ TAO_Container_i::create_exception (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_ExceptionDef_ptr +CORBA::ExceptionDef_ptr TAO_Container_i::create_exception_i (const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ()); if (!legal_op) - return CORBA_ExceptionDef::_nil (); + return CORBA::ExceptionDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ()); if (bad_params) - return CORBA_ExceptionDef::_nil (); + return CORBA::ExceptionDef::_nil (); // Create/open section for members defined in this scope. ACE_Configuration_Section_Key defns_key; @@ -1600,7 +1600,7 @@ TAO_Container_i::create_exception_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1639,7 +1639,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.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ()); CORBA::String_var member_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1654,20 +1654,20 @@ TAO_Container_i::create_exception_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ()); - return CORBA_ExceptionDef::_narrow (obj.in () + return CORBA::ExceptionDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_NativeDef_ptr +CORBA::NativeDef_ptr TAO_Container_i::create_native (const char *id, const char *name, const char *version ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_NativeDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::NativeDef::_nil ()); return this->create_native_i (id, name, @@ -1675,7 +1675,7 @@ TAO_Container_i::create_native (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_NativeDef_ptr +CORBA::NativeDef_ptr TAO_Container_i::create_native_i (const char *id, const char *name, const char *version @@ -1684,18 +1684,18 @@ TAO_Container_i::create_native_i (const char *id, { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::NativeDef::_nil ()); if (!legal_op) - return CORBA_NativeDef::_nil (); + return CORBA::NativeDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::NativeDef::_nil ()); if (bad_params) - return CORBA_NativeDef::_nil (); + return CORBA::NativeDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1704,7 +1704,7 @@ TAO_Container_i::create_native_i (const char *id, 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1719,23 +1719,23 @@ TAO_Container_i::create_native_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Native, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::NativeDef::_nil ()); - return CORBA_NativeDef::_narrow (obj.in () + return CORBA::NativeDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_AbstractInterfaceDef_ptr +CORBA::AbstractInterfaceDef_ptr TAO_Container_i::create_abstract_interface ( const char *id, const char *name, const char *version, - const CORBA_AbstractInterfaceDefSeq &base_interfaces + const CORBA::AbstractInterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_AbstractInterfaceDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::AbstractInterfaceDef::_nil ()); return this->create_abstract_interface_i (id, name, @@ -1744,12 +1744,12 @@ TAO_Container_i::create_abstract_interface ( ACE_ENV_ARG_PARAMETER); } -CORBA_AbstractInterfaceDef_ptr +CORBA::AbstractInterfaceDef_ptr TAO_Container_i::create_abstract_interface_i ( const char *id, const char *name, const char *version, - const CORBA_AbstractInterfaceDefSeq &base_interfaces + const CORBA::AbstractInterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1758,18 +1758,18 @@ TAO_Container_i::create_abstract_interface_i ( CORBA::dk_AbstractInterface ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ()); if (!legal_op) - return CORBA_AbstractInterfaceDef::_nil (); + return CORBA::AbstractInterfaceDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ()); if (bad_params) - return CORBA_AbstractInterfaceDef::_nil (); + return CORBA::AbstractInterfaceDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1778,7 +1778,7 @@ TAO_Container_i::create_abstract_interface_i ( 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1806,7 +1806,7 @@ TAO_Container_i::create_abstract_interface_i ( PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ()); CORBA::String_var inherited_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1824,23 +1824,23 @@ TAO_Container_i::create_abstract_interface_i ( this->repo_->servant_factory ()->create_objref (CORBA::dk_AbstractInterface, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ()); - return CORBA_AbstractInterfaceDef::_narrow (obj.in () + return CORBA::AbstractInterfaceDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_LocalInterfaceDef_ptr +CORBA::LocalInterfaceDef_ptr TAO_Container_i::create_local_interface ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_LocalInterfaceDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::LocalInterfaceDef::_nil ()); return this->create_local_interface_i (id, name, @@ -1849,30 +1849,30 @@ TAO_Container_i::create_local_interface ( ACE_ENV_ARG_PARAMETER); } -CORBA_LocalInterfaceDef_ptr +CORBA::LocalInterfaceDef_ptr TAO_Container_i::create_local_interface_i ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ()); if (!legal_op) - return CORBA_LocalInterfaceDef::_nil (); + return CORBA::LocalInterfaceDef::_nil (); CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ()); if (bad_params) - return CORBA_LocalInterfaceDef::_nil (); + return CORBA::LocalInterfaceDef::_nil (); // Create new section. ACE_Configuration_Section_Key defns_key; @@ -1881,7 +1881,7 @@ TAO_Container_i::create_local_interface_i ( 1, defns_key); - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_Configuration_Section_Key new_key; ACE_TString path = this->create_common (defns_key, new_key, @@ -1909,7 +1909,7 @@ TAO_Container_i::create_local_interface_i ( PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ()); CORBA::String_var inherited_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -1927,9 +1927,9 @@ TAO_Container_i::create_local_interface_i ( this->repo_->servant_factory ()->create_objref (CORBA::dk_LocalInterface, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ()); - return CORBA_LocalInterfaceDef::_narrow (obj.in () + return CORBA::LocalInterfaceDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index 6f2c042fe84..45786dbac4f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -65,33 +65,33 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained_ptr lookup ( + virtual CORBA::Contained_ptr lookup ( const char *search_name ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_Contained_ptr lookup_i ( + CORBA::Contained_ptr lookup_i ( const char *search_name ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ContainedSeq *contents ( + virtual CORBA::ContainedSeq *contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ContainedSeq *contents_i ( + CORBA::ContainedSeq *contents_i ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ContainedSeq *lookup_name ( + virtual CORBA::ContainedSeq *lookup_name ( const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, @@ -100,7 +100,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ContainedSeq *lookup_name_i ( + CORBA::ContainedSeq *lookup_name_i ( const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, @@ -109,7 +109,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Container::DescriptionSeq *describe_contents ( + virtual CORBA::Container::DescriptionSeq *describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs @@ -117,7 +117,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_Container::DescriptionSeq *describe_contents_i ( + CORBA::Container::DescriptionSeq *describe_contents_i ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs @@ -125,7 +125,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ModuleDef_ptr create_module ( + virtual CORBA::ModuleDef_ptr create_module ( const char *id, const char *name, const char *version @@ -133,7 +133,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ModuleDef_ptr create_module_i ( + CORBA::ModuleDef_ptr create_module_i ( const char *id, const char *name, const char *version @@ -141,185 +141,185 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ConstantDef_ptr create_constant ( + virtual CORBA::ConstantDef_ptr create_constant ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, const CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ConstantDef_ptr create_constant_i ( + CORBA::ConstantDef_ptr create_constant_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, const CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_StructDef_ptr create_struct ( + virtual CORBA::StructDef_ptr create_struct ( const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_StructDef_ptr create_struct_i ( + CORBA::StructDef_ptr create_struct_i ( const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_UnionDef_ptr create_union ( + virtual CORBA::UnionDef_ptr create_union ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq &members + CORBA::IDLType_ptr discriminator_type, + const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_UnionDef_ptr create_union_i ( + CORBA::UnionDef_ptr create_union_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq &members + CORBA::IDLType_ptr discriminator_type, + const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_EnumDef_ptr create_enum ( + virtual CORBA::EnumDef_ptr create_enum ( const char *id, const char *name, const char *version, - const CORBA_EnumMemberSeq &members + const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_EnumDef_ptr create_enum_i ( + CORBA::EnumDef_ptr create_enum_i ( const char *id, const char *name, const char *version, - const CORBA_EnumMemberSeq &members + const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_AliasDef_ptr create_alias ( + virtual CORBA::AliasDef_ptr create_alias ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type + CORBA::IDLType_ptr original_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_AliasDef_ptr create_alias_i ( + CORBA::AliasDef_ptr create_alias_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type + CORBA::IDLType_ptr original_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_InterfaceDef_ptr create_interface ( + virtual CORBA::InterfaceDef_ptr create_interface ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InterfaceDef_ptr create_interface_i ( + CORBA::InterfaceDef_ptr create_interface_i ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueDef_ptr create_value ( + virtual CORBA::ValueDef_ptr create_value ( const char *id, const char *name, const char *version, CORBA::Boolean is_custom, CORBA::Boolean is_abstract, - CORBA_ValueDef_ptr base_value, + CORBA::ValueDef_ptr base_value, CORBA::Boolean is_truncatable, - const CORBA_ValueDefSeq &abstract_base_values, - const CORBA_InterfaceDefSeq & supported_interfaces, - const CORBA_InitializerSeq &initializers + const CORBA::ValueDefSeq &abstract_base_values, + const CORBA::InterfaceDefSeq & supported_interfaces, + const CORBA::InitializerSeq &initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueDef_ptr create_value_i ( + CORBA::ValueDef_ptr create_value_i ( const char *id, const char *name, const char *version, CORBA::Boolean is_custom, CORBA::Boolean is_abstract, - CORBA_ValueDef_ptr base_value, + CORBA::ValueDef_ptr base_value, CORBA::Boolean is_truncatable, - const CORBA_ValueDefSeq &abstract_base_values, - const CORBA_InterfaceDefSeq & supported_interfaces, - const CORBA_InitializerSeq &initializers + const CORBA::ValueDefSeq &abstract_base_values, + const CORBA::InterfaceDefSeq & supported_interfaces, + const CORBA::InitializerSeq &initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueBoxDef_ptr create_value_box ( + virtual CORBA::ValueBoxDef_ptr create_value_box ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueBoxDef_ptr create_value_box_i ( + CORBA::ValueBoxDef_ptr create_value_box_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ExceptionDef_ptr create_exception ( + virtual CORBA::ExceptionDef_ptr create_exception ( const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ExceptionDef_ptr create_exception_i ( + CORBA::ExceptionDef_ptr create_exception_i ( const char *id, const char *name, const char *version, - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_NativeDef_ptr create_native ( + virtual CORBA::NativeDef_ptr create_native ( const char *id, const char *name, const char *version @@ -327,7 +327,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_NativeDef_ptr create_native_i ( + CORBA::NativeDef_ptr create_native_i ( const char *id, const char *name, const char *version @@ -335,38 +335,38 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface ( + virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface ( const char *id, const char *name, const char *version, - const CORBA_AbstractInterfaceDefSeq &base_interfaces + const CORBA::AbstractInterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_AbstractInterfaceDef_ptr create_abstract_interface_i ( + CORBA::AbstractInterfaceDef_ptr create_abstract_interface_i ( const char *id, const char *name, const char *version, - const CORBA_AbstractInterfaceDefSeq &base_interfaces + const CORBA::AbstractInterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_LocalInterfaceDef_ptr create_local_interface ( + virtual CORBA::LocalInterfaceDef_ptr create_local_interface ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_LocalInterfaceDef_ptr create_local_interface_i ( + CORBA::LocalInterfaceDef_ptr create_local_interface_i ( const char *id, const char *name, const char *version, - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 97ad175d7ad..4def4465416 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -41,7 +41,7 @@ TAO_EmitsDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_AR // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_EmitsDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -50,11 +50,10 @@ TAO_EmitsDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_EmitsDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index d2ad56da6ae..0c50ac88cbd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -68,13 +68,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -86,5 +86,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_EMITSDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index 288a13fdd66..83711f9f567 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -50,7 +50,7 @@ TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); 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 (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } -CORBA_EnumMemberSeq * +CORBA::EnumMemberSeq * TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -68,7 +68,7 @@ TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL) return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_EnumMemberSeq * +CORBA::EnumMemberSeq * TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -77,9 +77,9 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) "count", count); - CORBA_EnumMemberSeq *retval = 0; + CORBA::EnumMemberSeq *retval = 0; ACE_NEW_THROW_EX (retval, - CORBA_EnumMemberSeq (count), + CORBA::EnumMemberSeq (count), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -106,7 +106,7 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members +TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -117,7 +117,7 @@ TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members } void -TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members +TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -145,4 +145,3 @@ TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members member_name); } } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h index 72a09ebf84b..21fc077b2c8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h @@ -69,24 +69,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual CORBA_EnumMemberSeq *members ( + virtual CORBA::EnumMemberSeq *members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_EnumMemberSeq *members_i ( + CORBA::EnumMemberSeq *members_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const CORBA_EnumMemberSeq &members + const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const CORBA_EnumMemberSeq &members + const CORBA::EnumMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -97,4 +97,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_ENUMDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index 92500cea21e..634d0de1671 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -33,7 +33,7 @@ TAO_EventDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_AR // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_EventDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42,7 +42,7 @@ TAO_EventDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_EventDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -70,20 +70,19 @@ TAO_EventDef_i::is_a_i (const char * /* event_id */ return 0; } -CORBA_ValueDef_ptr +CORBA::ValueDef_ptr TAO_EventDef_i::event (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); return this->event_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ValueDef_ptr +CORBA::ValueDef_ptr TAO_EventDef_i::event_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index 3be60e221a6..94e16d013cc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -62,13 +62,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -86,12 +86,12 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueDef_ptr event ( + virtual CORBA::ValueDef_ptr event ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueDef_ptr event_i ( + CORBA::ValueDef_ptr event_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -102,5 +102,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_EVENTDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 6dc98d5c663..24d6e79e692 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -52,7 +52,7 @@ TAO_ExceptionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ExceptionDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -61,22 +61,22 @@ TAO_ExceptionDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Contained::Description *desc_ptr = 0; + CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - CORBA_Contained::Description, + CORBA::Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_Contained::Description_var retval = desc_ptr; + CORBA::Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_ExceptionDescription ed; + CORBA::ExceptionDescription ed; ed.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -126,7 +126,7 @@ TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); 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 (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } -CORBA_StructMemberSeq * +CORBA::StructMemberSeq * TAO_ExceptionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -144,7 +144,7 @@ TAO_ExceptionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_StructMemberSeq * +CORBA::StructMemberSeq * TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -210,15 +210,15 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) size_t size = kind_queue.size (); - CORBA_StructMemberSeq *members = 0; + CORBA::StructMemberSeq *members = 0; ACE_NEW_THROW_EX (members, - CORBA_StructMemberSeq (size), + CORBA::StructMemberSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); members->length (size); - CORBA_StructMemberSeq_var retval = members; + CORBA::StructMemberSeq_var retval = members; ACE_TString name; ACE_TString path; @@ -243,7 +243,7 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval[k].type_def = CORBA_IDLType::_narrow (obj.in () + retval[k].type_def = CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -267,7 +267,7 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members +TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -278,7 +278,7 @@ TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members } void -TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members +TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index 12e20b6aaa6..a26f58a00d1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -70,13 +70,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -92,24 +92,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_StructMemberSeq *members ( + virtual CORBA::StructMemberSeq *members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_StructMemberSeq *members_i ( + CORBA::StructMemberSeq *members_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const CORBA_StructMemberSeq & members + const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const CORBA_StructMemberSeq & members + const CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -120,4 +120,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_EXCEPTIONDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index aa04971500c..e0b4f0ea5cf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -43,7 +43,7 @@ TAO_FactoryDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_FactoryDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,11 +52,10 @@ TAO_FactoryDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_FactoryDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index d973dfcf21e..03b3b10824d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -67,13 +67,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -85,6 +85,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_FACTORYDEF_I_H */ - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index 833621ce7e1..aba52b22d14 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -41,7 +41,7 @@ TAO_FinderDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_A // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_FinderDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -50,11 +50,10 @@ TAO_FinderDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_FinderDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index 4e244d33a68..96d0947c64f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -67,13 +67,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -85,6 +85,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_FINDERDEF_I_H */ - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index 966b10f2168..989286497d3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -43,7 +43,7 @@ TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_HomeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,7 +52,7 @@ TAO_HomeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -183,7 +183,7 @@ IR::PrimaryKeyDef_ptr TAO_HomeDef_i::create_primary_key (const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr primary_key + CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -200,7 +200,7 @@ IR::PrimaryKeyDef_ptr TAO_HomeDef_i::create_primary_key_i (const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_ValueDef_ptr /* primary_key */ + CORBA::ValueDef_ptr /* primary_key */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -212,8 +212,8 @@ IR::FactoryDef_ptr TAO_HomeDef_i::create_factory (const char *id, const char *name, const char *version, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -232,8 +232,8 @@ TAO_HomeDef_i::create_factory_i ( const char * /* id */, const char * /* name */, const char * /* version */, - const CORBA_ParDescriptionSeq & /* params */, - const CORBA_ExceptionDefSeq & /* exceptions */ + const CORBA::ParDescriptionSeq & /* params */, + const CORBA::ExceptionDefSeq & /* exceptions */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -246,8 +246,8 @@ IR::FinderDef_ptr TAO_HomeDef_i::create_finder (const char *id, const char *name, const char *version, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -266,8 +266,8 @@ TAO_HomeDef_i::create_finder_i ( const char * /* id */, const char * /* name */, const char * /* version */, - const CORBA_ParDescriptionSeq & /* params */, - const CORBA_ExceptionDefSeq & /* exceptions */ + const CORBA::ParDescriptionSeq & /* params */, + const CORBA::ExceptionDefSeq & /* exceptions */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h index 67876056d84..7ac5c2c0a50 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h @@ -69,13 +69,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -157,7 +157,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr primary_key + CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -166,7 +166,7 @@ public: const char *id, const char *name, const char *version, - CORBA_ValueDef_ptr primary_key + CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -175,8 +175,8 @@ public: const char *id, const char *name, const char *version, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -185,8 +185,8 @@ public: const char *id, const char *name, const char *version, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -195,8 +195,8 @@ public: const char *id, const char *name, const char *version, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -205,8 +205,8 @@ public: const char *id, const char *name, const char *version, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -217,6 +217,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_HOMEDEF_I_H */ - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h index 65ebef3fc7a..30f5a1d62bd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h @@ -14,7 +14,7 @@ monitor, \ this->repo_->lock (), \ CORBA::INTERNAL ( \ - CORBA_SystemException::_tao_minor_code ( \ + CORBA::SystemException::_tao_minor_code ( \ TAO_GUARD_FAILURE, \ 0), \ CORBA::COMPLETED_NO)); \ @@ -25,7 +25,7 @@ monitor, \ this->repo_->lock (), \ CORBA::INTERNAL ( \ - CORBA_SystemException::_tao_minor_code ( \ + CORBA::SystemException::_tao_minor_code ( \ TAO_GUARD_FAILURE, \ 0), \ CORBA::COMPLETED_NO)); \ @@ -36,7 +36,7 @@ monitor, \ this->repo_->lock (), \ CORBA::INTERNAL ( \ - CORBA_SystemException::_tao_minor_code ( \ + CORBA::SystemException::_tao_minor_code ( \ TAO_GUARD_FAILURE, \ 0), \ CORBA::COMPLETED_NO)); \ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index b18e5961696..4befac21071 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -37,7 +37,7 @@ class TAO_Repository_i; -class TAO_IFRService_Export TAO_IRObject_i : public POA_CORBA_IRObject +class TAO_IFRService_Export TAO_IRObject_i : public POA_CORBA::IRObject { // = TITLE // TAO_IRObject_i diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 791a05013ba..fd3be5bd764 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -61,7 +61,7 @@ TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_InterfaceDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -70,22 +70,22 @@ TAO_InterfaceDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Contained::Description *desc_ptr = 0; + CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - CORBA_Contained::Description, + CORBA::Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_Contained::Description_var retval = desc_ptr; + CORBA::Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_InterfaceDescription ifd; + CORBA::InterfaceDescription ifd; ifd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -105,12 +105,12 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (0); CORBA::ULong i = 0; - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); - CORBA_RepositoryIdSeq repo_ids (length); + CORBA::RepositoryIdSeq repo_ids (length); repo_ids.length (length); @@ -177,7 +177,7 @@ TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } -CORBA_InterfaceDefSeq * +CORBA::InterfaceDefSeq * TAO_InterfaceDef_i::base_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -186,7 +186,7 @@ TAO_InterfaceDef_i::base_interfaces (ACE_ENV_SINGLE_ARG_DECL) return this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDefSeq * +CORBA::InterfaceDefSeq * TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -198,14 +198,14 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) size_t size = kind_queue.size (); - CORBA_InterfaceDefSeq *seq = 0; + CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_THROW_EX (seq, - CORBA_InterfaceDefSeq (size), + CORBA::InterfaceDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); seq->length (size); - CORBA_InterfaceDefSeq_var retval = seq; + CORBA::InterfaceDefSeq_var retval = seq; for (CORBA::ULong i = 0; i < size; ++i) { @@ -223,7 +223,7 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) ); ACE_CHECK_RETURN (0); - retval[i] = CORBA_InterfaceDef::_narrow (obj.in () + retval[i] = CORBA::InterfaceDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -232,7 +232,7 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces +TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -243,7 +243,7 @@ TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interface } void -TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces +TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -349,7 +349,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id return 1; // Is it one of our ancestors' types? - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -387,7 +387,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id return 0; } -CORBA_InterfaceDef::FullInterfaceDescription * +CORBA::InterfaceDef::FullInterfaceDescription * TAO_InterfaceDef_i::describe_interface (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -396,16 +396,16 @@ TAO_InterfaceDef_i::describe_interface (ACE_ENV_SINGLE_ARG_DECL) return this->describe_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDef::FullInterfaceDescription * +CORBA::InterfaceDef::FullInterfaceDescription * TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_InterfaceDef::FullInterfaceDescription *fifd = 0; + CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0; ACE_NEW_RETURN (fifd, - CORBA_InterfaceDef::FullInterfaceDescription, + CORBA::InterfaceDef::FullInterfaceDescription, 0); - CORBA_InterfaceDef::FullInterfaceDescription_var retval = fifd; + CORBA::InterfaceDef::FullInterfaceDescription_var retval = fifd; fifd->name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -526,12 +526,12 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (0); } - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); - CORBA_RepositoryIdSeq repo_ids (length); + CORBA::RepositoryIdSeq repo_ids (length); repo_ids.length (length); @@ -569,18 +569,18 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } -CORBA_AttributeDef_ptr +CORBA::AttributeDef_ptr TAO_InterfaceDef_i::create_attribute ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_AttributeDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ()); return this->create_attribute_i (id, name, @@ -590,12 +590,12 @@ TAO_InterfaceDef_i::create_attribute ( ACE_ENV_ARG_PARAMETER); } -CORBA_AttributeDef_ptr +CORBA::AttributeDef_ptr TAO_InterfaceDef_i::create_attribute_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL ) @@ -604,17 +604,17 @@ TAO_InterfaceDef_i::create_attribute_i ( CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); if (bad_params) - return CORBA_AttributeDef::_nil (); + return CORBA::AttributeDef::_nil (); bad_params = this->check_inherited_attrs (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); if (bad_params) - return CORBA_AttributeDef::_nil (); + return CORBA::AttributeDef::_nil (); ACE_Configuration_Section_Key attrs_key; @@ -626,7 +626,7 @@ TAO_InterfaceDef_i::create_attribute_i ( ACE_Configuration_Section_Key new_key; - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_TString path = this->create_common (attrs_key, new_key, id, @@ -639,7 +639,7 @@ TAO_InterfaceDef_i::create_attribute_i ( PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -690,7 +690,7 @@ TAO_InterfaceDef_i::create_attribute_i ( this->repo_->ir_poa ()->reference_to_id (get_exceptions[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); CORBA::String_var get_except_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -722,7 +722,7 @@ TAO_InterfaceDef_i::create_attribute_i ( this->repo_->ir_poa ()->reference_to_id (put_exceptions[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); CORBA::String_var put_except_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -742,29 +742,29 @@ TAO_InterfaceDef_i::create_attribute_i ( this->repo_->servant_factory ()->create_objref (CORBA::dk_Attribute, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); - CORBA_AttributeDef_var retval = - CORBA_AttributeDef::_narrow (obj.in () + CORBA::AttributeDef_var retval = + CORBA::AttributeDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); return retval._retn (); } -CORBA_OperationDef_ptr +CORBA::OperationDef_ptr TAO_InterfaceDef_i::create_operation (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr result, + CORBA::IDLType_ptr result, CORBA::OperationMode mode, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions, - const CORBA_ContextIdSeq &contexts + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions, + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_OperationDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ()); return this->create_operation_i (id, name, @@ -777,26 +777,26 @@ TAO_InterfaceDef_i::create_operation (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_OperationDef_ptr +CORBA::OperationDef_ptr TAO_InterfaceDef_i::create_operation_i (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr result, + CORBA::IDLType_ptr result, CORBA::OperationMode mode, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions, - const CORBA_ContextIdSeq &contexts + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions, + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean bad_params = this->pre_exist (id, name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); if (bad_params) { - return CORBA_OperationDef::_nil (); + return CORBA::OperationDef::_nil (); } ACE_Configuration_Section_Key ops_key; @@ -809,7 +809,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, ACE_Configuration_Section_Key new_key; - // Common to all IR objects created in CORBA_Container. + // Common to all IR objects created in CORBA::Container. ACE_TString path = this->create_common (ops_key, new_key, id, @@ -819,23 +819,23 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, CORBA::dk_Operation); CORBA::TypeCode_var rettype = result->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); // Oneway operations cannot have a non-void return type. if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void) { ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), - CORBA_OperationDef::_nil ()); + CORBA::OperationDef::_nil ()); } // Get the path to our return type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (result ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); CORBA::String_var result_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -874,7 +874,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, { ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), - CORBA_OperationDef::_nil ()); + CORBA::OperationDef::_nil ()); } ACE_Configuration_Section_Key param_key; @@ -892,7 +892,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -917,7 +917,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, { ACE_THROW_RETURN (CORBA::BAD_PARAM (31, CORBA::COMPLETED_NO), - CORBA_OperationDef::_nil ()); + CORBA::OperationDef::_nil ()); } ACE_Configuration_Section_Key excepts_key; @@ -933,7 +933,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, this->repo_->ir_poa ()->reference_to_id (exceptions[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); CORBA::String_var type_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -973,12 +973,12 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, this->repo_->servant_factory ()->create_objref (CORBA::dk_Operation, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); - CORBA_OperationDef_var retval = - CORBA_OperationDef::_narrow (obj.in () + CORBA::OperationDef_var retval = + CORBA::OperationDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); + ACE_CHECK_RETURN (CORBA::OperationDef::_nil ()); return retval._retn (); } @@ -1159,7 +1159,7 @@ void TAO_InterfaceDef_i::create_attr_ops (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1176,11 +1176,11 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, the_get_name += name; - CORBA_ParDescriptionSeq params (0); - CORBA_ExceptionDefSeq excepts (0); - CORBA_ContextIdSeq contexts (0); + CORBA::ParDescriptionSeq params (0); + CORBA::ExceptionDefSeq excepts (0); + CORBA::ContextIdSeq contexts (0); - CORBA_OperationDef_var the_get_op = + CORBA::OperationDef_var the_get_op = this->create_operation_i (the_get_id.c_str (), the_get_name.c_str (), version, @@ -1200,7 +1200,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, the_set_name += name; - CORBA_PrimitiveDef_var rettype = + CORBA::PrimitiveDef_var rettype = this->repo_->get_primitive (CORBA::pk_void ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -1212,7 +1212,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, params[0].type_def = CORBA::IDLType::_duplicate (type); params[0].mode = CORBA::PARAM_IN; - CORBA_OperationDef_var the_set_op = + CORBA::OperationDef_var the_set_op = this->create_operation_i (the_set_id.c_str (), the_set_name.c_str (), version, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h index 27ba017111e..c33240a26f9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h @@ -71,13 +71,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -95,24 +95,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual CORBA_InterfaceDefSeq *base_interfaces ( + virtual CORBA::InterfaceDefSeq *base_interfaces ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InterfaceDefSeq *base_interfaces_i ( + CORBA::InterfaceDefSeq *base_interfaces_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_interfaces ( - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void base_interfaces_i ( - const CORBA_InterfaceDefSeq &base_interfaces + const CORBA::InterfaceDefSeq &base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -129,58 +129,58 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_InterfaceDef::FullInterfaceDescription *describe_interface ( + virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InterfaceDef::FullInterfaceDescription *describe_interface_i ( + CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_AttributeDef_ptr create_attribute ( + virtual CORBA::AttributeDef_ptr create_attribute ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_AttributeDef_ptr create_attribute_i ( + CORBA::AttributeDef_ptr create_attribute_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_OperationDef_ptr create_operation ( + virtual CORBA::OperationDef_ptr create_operation ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr result, + CORBA::IDLType_ptr result, CORBA::OperationMode mode, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions, - const CORBA_ContextIdSeq &contexts + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions, + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_OperationDef_ptr create_operation_i ( + CORBA::OperationDef_ptr create_operation_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr result, + CORBA::IDLType_ptr result, CORBA::OperationMode mode, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions, - const CORBA_ContextIdSeq &contexts + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions, + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -207,7 +207,7 @@ private: void create_attr_ops (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -244,4 +244,3 @@ private: #endif /* _MSC_VER */ #endif /* TAO_INTERFACEDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index 9b3097ec619..8bb11ceec54 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -47,7 +47,7 @@ TAO_ModuleDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ModuleDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -56,22 +56,22 @@ TAO_ModuleDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Contained::Description *desc_ptr = 0; + CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - CORBA_Contained::Description, + CORBA::Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_Contained::Description_var retval = desc_ptr; + CORBA::Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_ModuleDescription md; + CORBA::ModuleDescription md; md.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -94,4 +94,3 @@ TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h index 971dc4c405b..7fa98302599 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h @@ -70,13 +70,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -88,4 +88,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_MODULEDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index f5cc22de14a..f360f3d0aec 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -30,7 +30,7 @@ TAO_OperationDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::dk_Operation; } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -39,17 +39,17 @@ TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL ) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Contained::Description *desc_ptr = 0; + CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - CORBA_Contained::Description, + CORBA::Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_Contained::Description_var retval = desc_ptr; + CORBA::Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -94,16 +94,16 @@ TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL) return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_OperationDef_i::result_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -130,14 +130,14 @@ TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, result_path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - return CORBA_IDLType::_narrow (obj.in () + return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def +TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -148,7 +148,7 @@ TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def } void -TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def +TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -165,7 +165,7 @@ TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def result_path.in ()); } -CORBA_ParDescriptionSeq * +CORBA::ParDescriptionSeq * TAO_OperationDef_i::params (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -174,7 +174,7 @@ TAO_OperationDef_i::params (ACE_ENV_SINGLE_ARG_DECL) return this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ParDescriptionSeq * +CORBA::ParDescriptionSeq * TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -213,9 +213,9 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) size_t size = key_queue.size (); - CORBA_ParDescriptionSeq *pd_seq = 0; + CORBA::ParDescriptionSeq *pd_seq = 0; ACE_NEW_THROW_EX (pd_seq, - CORBA_ParDescriptionSeq (size), + CORBA::ParDescriptionSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -224,7 +224,7 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) if (size == 0) return pd_seq; - CORBA_ParDescriptionSeq_var retval = pd_seq; + CORBA::ParDescriptionSeq_var retval = pd_seq; for (i = 0; i < size; ++i) { @@ -280,7 +280,7 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval[i].type_def = CORBA_IDLType::_narrow (obj.in () + retval[i].type_def = CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -289,7 +289,7 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq ¶ms +TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq ¶ms ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -300,7 +300,7 @@ TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq ¶ms } void -TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq ¶ms +TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq ¶ms ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -396,7 +396,7 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode mode); } -CORBA_ContextIdSeq * +CORBA::ContextIdSeq * TAO_OperationDef_i::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -405,7 +405,7 @@ TAO_OperationDef_i::contexts (ACE_ENV_SINGLE_ARG_DECL) return this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ContextIdSeq * +CORBA::ContextIdSeq * TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -441,9 +441,9 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL) size_t size = context_queue.size (); - CORBA_ContextIdSeq *ci_seq = 0; + CORBA::ContextIdSeq *ci_seq = 0; ACE_NEW_THROW_EX (ci_seq, - CORBA_ContextIdSeq (size), + CORBA::ContextIdSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -461,7 +461,7 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts +TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -472,7 +472,7 @@ TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts } void -TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts +TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -501,7 +501,7 @@ TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts } } -CORBA_ExceptionDefSeq * +CORBA::ExceptionDefSeq * TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -510,7 +510,7 @@ TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL ) return this->exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ExceptionDefSeq * +CORBA::ExceptionDefSeq * TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -568,9 +568,9 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) size_t size = kind_queue.size (); - CORBA_ExceptionDefSeq *ed_seq = 0; + CORBA::ExceptionDefSeq *ed_seq = 0; ACE_NEW_THROW_EX (ed_seq, - CORBA_ExceptionDefSeq (size), + CORBA::ExceptionDefSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -579,7 +579,7 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) if (index == 0) return ed_seq; - CORBA_ExceptionDefSeq_var retval = ed_seq; + CORBA::ExceptionDefSeq_var retval = ed_seq; for (CORBA::ULong i = 0; i < size; ++i) { @@ -595,7 +595,7 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval[i] = CORBA_ExceptionDef::_narrow (obj.in () + retval[i] = CORBA::ExceptionDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -604,7 +604,7 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) } void -TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions +TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -615,7 +615,7 @@ TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions } void -TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions +TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -653,12 +653,12 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions } -CORBA_OperationDescription +CORBA::OperationDescription TAO_OperationDef_i::make_description ( ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_OperationDescription od; + CORBA::OperationDescription od; od.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); @@ -682,12 +682,12 @@ TAO_OperationDef_i::make_description ( od.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - CORBA_ContextIdSeq_var cid_seq = this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::ContextIdSeq_var cid_seq = this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); od.contexts = cid_seq.in (); - CORBA_ParDescriptionSeq_var pd_seq = this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::ParDescriptionSeq_var pd_seq = this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); od.parameters = pd_seq.in (); @@ -782,4 +782,3 @@ TAO_OperationDef_i::make_description ( return od; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h index f975e564493..5ee2e90ef98 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h @@ -57,13 +57,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -79,46 +79,46 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_IDLType_ptr result_def ( + virtual CORBA::IDLType_ptr result_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr result_def_i ( + CORBA::IDLType_ptr result_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void result_def ( - CORBA_IDLType_ptr result_def + CORBA::IDLType_ptr result_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result_def_i ( - CORBA_IDLType_ptr result_def + CORBA::IDLType_ptr result_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ParDescriptionSeq *params ( + virtual CORBA::ParDescriptionSeq *params ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ParDescriptionSeq *params_i ( + CORBA::ParDescriptionSeq *params_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void params ( - const CORBA_ParDescriptionSeq ¶ms + const CORBA::ParDescriptionSeq ¶ms ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void params_i ( - const CORBA_ParDescriptionSeq ¶ms + const CORBA::ParDescriptionSeq ¶ms ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -145,51 +145,51 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ContextIdSeq *contexts ( + virtual CORBA::ContextIdSeq *contexts ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ContextIdSeq *contexts_i ( + CORBA::ContextIdSeq *contexts_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void contexts ( - const CORBA_ContextIdSeq &contexts + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void contexts_i ( - const CORBA_ContextIdSeq &contexts + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ExceptionDefSeq *exceptions ( + virtual CORBA::ExceptionDefSeq *exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ExceptionDefSeq *exceptions_i ( + CORBA::ExceptionDefSeq *exceptions_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void exceptions ( - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void exceptions_i ( - const CORBA_ExceptionDefSeq &exceptions + const CORBA::ExceptionDefSeq &exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_OperationDescription make_description ( + CORBA::OperationDescription make_description ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -202,6 +202,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_OPERATIONDEF_I_H */ - - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.cpp index e52de82784f..85ee25b353e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.cpp @@ -42,7 +42,7 @@ TAO_PrimaryKeyDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SING // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_PrimaryKeyDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_PrimaryKeyDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_PrimaryKeyDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -79,20 +79,19 @@ TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */ return 0; } -CORBA_ValueDef_ptr +CORBA::ValueDef_ptr TAO_PrimaryKeyDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ValueDef_ptr +CORBA::ValueDef_ptr TAO_PrimaryKeyDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.h index c84b6d4e2e1..799eb5b25e0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimaryKeyDef_i.h @@ -69,13 +69,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -93,12 +93,12 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueDef_ptr primary_key ( + virtual CORBA::ValueDef_ptr primary_key ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueDef_ptr primary_key_i ( + CORBA::ValueDef_ptr primary_key_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -109,4 +109,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_PRIMARYKEYDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index 80e73290122..88ccab59209 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -42,7 +42,7 @@ TAO_ProvidesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ProvidesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_ProvidesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -59,20 +59,19 @@ TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGL return 0; } -CORBA_InterfaceDef_ptr +CORBA::InterfaceDef_ptr TAO_ProvidesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr +CORBA::InterfaceDef_ptr TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h index 9de4b7c40ac..201a3847054 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h @@ -67,24 +67,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_InterfaceDef_ptr interface_type ( + virtual CORBA::InterfaceDef_ptr interface_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InterfaceDef_ptr interface_type_i ( + CORBA::InterfaceDef_ptr interface_type_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -95,4 +95,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_PROVIDESDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index 044d7b67bf3..ddbd015ad9b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -43,7 +43,7 @@ TAO_PublishesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGL // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_PublishesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -52,11 +52,10 @@ TAO_PublishesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_PublishesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h index 46d19e89070..88a9de7e297 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h @@ -68,13 +68,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -86,5 +86,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_PUBLISHESDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 91ad19bd5e3..541f2a98aca 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -1,7 +1,3 @@ -// -*- C++ -*- -// -// $Id$ - #include "Repository_i.h" #include "IDLType_i.h" #include "ExceptionDef_i.h" @@ -234,18 +230,18 @@ TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); } -CORBA_Contained_ptr +CORBA::Contained_ptr TAO_Repository_i::lookup_id (const char *search_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_Contained::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::Contained::_nil ()); return this->lookup_id_i (search_id ACE_ENV_ARG_PARAMETER); } -CORBA_Contained_ptr +CORBA::Contained_ptr TAO_Repository_i::lookup_id_i (const char *search_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -253,7 +249,7 @@ TAO_Repository_i::lookup_id_i (const char *search_id if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0 || ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0) { - return CORBA_Contained::_nil (); + return CORBA::Contained::_nil (); } ACE_TString path; @@ -262,7 +258,7 @@ TAO_Repository_i::lookup_id_i (const char *search_id path) != 0) { - return CORBA_Contained::_nil (); + return CORBA::Contained::_nil (); } ACE_Configuration_Section_Key key; @@ -282,10 +278,10 @@ TAO_Repository_i::lookup_id_i (const char *search_id this->servant_factory_->create_objref (def_kind, path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_Contained::_nil ()); + ACE_CHECK_RETURN (CORBA::Contained::_nil ()); - return CORBA_Contained::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + return CORBA::Contained::_narrow (obj.in () + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -404,7 +400,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc } } -CORBA_PrimitiveDef_ptr +CORBA::PrimitiveDef_ptr TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -417,24 +413,24 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind this->servant_factory_->create_objref (CORBA::dk_Primitive, obj_id.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ()); + ACE_CHECK_RETURN (CORBA::PrimitiveDef::_nil ()); - return CORBA_PrimitiveDef::_narrow (obj.in () + return CORBA::PrimitiveDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_StringDef_ptr +CORBA::StringDef_ptr TAO_Repository_i::create_string (CORBA::ULong bound ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_StringDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::StringDef::_nil ()); return this->create_string_i (bound ACE_ENV_ARG_PARAMETER); } -CORBA_StringDef_ptr +CORBA::StringDef_ptr TAO_Repository_i::create_string_i (CORBA::ULong bound ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -476,24 +472,24 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound this->servant_factory_->create_objref (CORBA::dk_String, obj_id.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_StringDef::_nil ()); + ACE_CHECK_RETURN (CORBA::StringDef::_nil ()); - return CORBA_StringDef::_narrow (obj.in () + return CORBA::StringDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_WstringDef_ptr +CORBA::WstringDef_ptr TAO_Repository_i::create_wstring (CORBA::ULong bound ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_WstringDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::WstringDef::_nil ()); return this->create_wstring_i (bound ACE_ENV_ARG_PARAMETER); } -CORBA_WstringDef_ptr +CORBA::WstringDef_ptr TAO_Repository_i::create_wstring_i (CORBA::ULong bound ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -535,35 +531,35 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound this->servant_factory_->create_objref (CORBA::dk_Wstring, obj_id.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_WstringDef::_nil ()); + ACE_CHECK_RETURN (CORBA::WstringDef::_nil ()); - return CORBA_WstringDef::_narrow (obj.in () + return CORBA::WstringDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_SequenceDef_ptr +CORBA::SequenceDef_ptr TAO_Repository_i::create_sequence (CORBA::ULong bound, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_SequenceDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::SequenceDef::_nil ()); return this->create_sequence_i (bound, element_type ACE_ENV_ARG_PARAMETER); } -CORBA_SequenceDef_ptr +CORBA::SequenceDef_ptr TAO_Repository_i::create_sequence_i (CORBA::ULong bound, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::SequenceDef::_nil ()); CORBA::String_var element_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -613,35 +609,35 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound, this->servant_factory_->create_objref (CORBA::dk_Sequence, obj_id.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ()); + ACE_CHECK_RETURN (CORBA::SequenceDef::_nil ()); - return CORBA_SequenceDef::_narrow (obj.in () + return CORBA::SequenceDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_ArrayDef_ptr +CORBA::ArrayDef_ptr TAO_Repository_i::create_array (CORBA::ULong length, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_ArrayDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ArrayDef::_nil ()); return this->create_array_i (length, element_type ACE_ENV_ARG_PARAMETER); } -CORBA_ArrayDef_ptr +CORBA::ArrayDef_ptr TAO_Repository_i::create_array_i (CORBA::ULong length, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ArrayDef::_nil ()); CORBA::String_var element_path = PortableServer::ObjectId_to_string (oid.in ()); @@ -691,32 +687,32 @@ TAO_Repository_i::create_array_i (CORBA::ULong length, this->servant_factory_->create_objref (CORBA::dk_Array, obj_id.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ArrayDef::_nil ()); - return CORBA_ArrayDef::_narrow (obj.in () + return CORBA::ArrayDef::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } -CORBA_FixedDef_ptr +CORBA::FixedDef_ptr TAO_Repository_i::create_fixed (CORBA::UShort digits, CORBA::Short scale ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_FixedDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::FixedDef::_nil ()); return this->create_fixed_i (digits, scale ACE_ENV_ARG_PARAMETER); } -CORBA_FixedDef_ptr +CORBA::FixedDef_ptr TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */, CORBA::Short /* scale */ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA_FixedDef::_nil ()); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::FixedDef::_nil ()); } PortableServer::POA_ptr @@ -743,14 +739,14 @@ TAO_Repository_i::tc_factory (void) const return this->tc_factory_.in (); } -CORBA_Repository_ptr +CORBA::Repository_ptr TAO_Repository_i::repo_objref (void) const { - return CORBA_Repository::_duplicate (this->repo_objref_); + return CORBA::Repository::_duplicate (this->repo_objref_); } void -TAO_Repository_i::repo_objref (CORBA_Repository_ptr objref) +TAO_Repository_i::repo_objref (CORBA::Repository_ptr objref) { this->repo_objref_ = objref; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index 218d99849ec..419ff19116e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -71,13 +71,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // May not be called on a repository - raises BAD_INV_ORDER. - virtual CORBA_Contained_ptr lookup_id ( + virtual CORBA::Contained_ptr lookup_id ( const char *search_id ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_Contained_ptr lookup_id_i ( + CORBA::Contained_ptr lookup_id_i ( const char *search_id ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -103,66 +103,66 @@ public: // No locking necessary because the database is not // accessed. - virtual CORBA_StringDef_ptr create_string ( + virtual CORBA::StringDef_ptr create_string ( CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_StringDef_ptr create_string_i ( + CORBA::StringDef_ptr create_string_i ( CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_WstringDef_ptr create_wstring ( + virtual CORBA::WstringDef_ptr create_wstring ( CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_WstringDef_ptr create_wstring_i ( + CORBA::WstringDef_ptr create_wstring_i ( CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_SequenceDef_ptr create_sequence ( + virtual CORBA::SequenceDef_ptr create_sequence ( CORBA::ULong bound, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); - CORBA_SequenceDef_ptr create_sequence_i ( + CORBA::SequenceDef_ptr create_sequence_i ( CORBA::ULong bound, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); - virtual CORBA_ArrayDef_ptr create_array ( + virtual CORBA::ArrayDef_ptr create_array ( CORBA::ULong length, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ArrayDef_ptr create_array_i ( + CORBA::ArrayDef_ptr create_array_i ( CORBA::ULong length, - CORBA_IDLType_ptr element_type + CORBA::IDLType_ptr element_type ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_FixedDef_ptr create_fixed ( + virtual CORBA::FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_FixedDef_ptr create_fixed_i ( + CORBA::FixedDef_ptr create_fixed_i ( CORBA::UShort digits, CORBA::Short scale ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -181,8 +181,8 @@ public: CORBA::TypeCodeFactory_ptr tc_factory (void) const; // Accessor for the Typecode factory. - CORBA_Repository_ptr repo_objref (void) const; - void repo_objref (CORBA_Repository_ptr objref); + CORBA::Repository_ptr repo_objref (void) const; + void repo_objref (CORBA::Repository_ptr objref); // Accessor/mutator for our object reference. ACE_Configuration_Section_Key root_key (void) const; @@ -237,7 +237,7 @@ protected: CORBA::TypeCodeFactory_var tc_factory_; // Our Typecode factory. - CORBA_Repository_ptr repo_objref_; + CORBA::Repository_ptr repo_objref_; // The object reference of this servant. ACE_Configuration_Section_Key root_key_; @@ -272,14 +272,14 @@ protected: private: static const char *TAO_IFR_primitive_kinds[]; - // Set of strings corresponding to the CORBA_PrimitiveKind + // Set of strings corresponding to the CORBA::PrimitiveKind // enum values. const char *pkind_to_string (CORBA::PrimitiveKind pkind) const; // Convert the enum value to the equivalent string. u_int num_pkinds (void) const; - // Return the number of entries in the CORBA_PrimitiveKind enum. + // Return the number of entries in the CORBA::PrimitiveKind enum. }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index e84948ad205..adde2b9223f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -158,16 +158,16 @@ TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL) return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_SequenceDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -194,14 +194,14 @@ TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - return CORBA_IDLType::_narrow (obj.in () + return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def +TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -212,7 +212,7 @@ TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def } void -TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def +TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -283,4 +283,3 @@ TAO_SequenceDef_i::destroy_element_type ( break; } } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h index 4da903bffd3..722b173829f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h @@ -111,24 +111,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_IDLType_ptr element_type_def ( + virtual CORBA::IDLType_ptr element_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr element_type_def_i ( + CORBA::IDLType_ptr element_type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( - CORBA_IDLType_ptr element_type_def + CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( - CORBA_IDLType_ptr element_type_def + CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -146,5 +146,3 @@ private: #endif /* _MSC_VER */ #endif /* TAO_SEQUENCEDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index 08dfaa51490..e6fc0d222d7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -74,7 +74,7 @@ TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); 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 (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } -CORBA_StructMemberSeq * +CORBA::StructMemberSeq * TAO_StructDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -92,7 +92,7 @@ TAO_StructDef_i::members (ACE_ENV_SINGLE_ARG_DECL) return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_StructMemberSeq * +CORBA::StructMemberSeq * TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -158,15 +158,15 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) size_t size = kind_queue.size (); - CORBA_StructMemberSeq *members = 0; + CORBA::StructMemberSeq *members = 0; ACE_NEW_THROW_EX (members, - CORBA_StructMemberSeq (size), + CORBA::StructMemberSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); members->length (size); - CORBA_StructMemberSeq_var retval = members; + CORBA::StructMemberSeq_var retval = members; ACE_TString name, path; CORBA::DefinitionKind kind = CORBA::dk_none; @@ -190,7 +190,7 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval[k].type_def = CORBA_IDLType::_narrow (obj.in () + retval[k].type_def = CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -214,7 +214,7 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_StructDef_i::members (const CORBA_StructMemberSeq &members +TAO_StructDef_i::members (const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -225,7 +225,7 @@ TAO_StructDef_i::members (const CORBA_StructMemberSeq &members } void -TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members +TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -275,4 +275,3 @@ TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members "count", count); } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h index ec9a79b2672..4d5e06ffc4c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h @@ -81,24 +81,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual CORBA_StructMemberSeq *members ( + virtual CORBA::StructMemberSeq *members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_StructMemberSeq *members_i ( + CORBA::StructMemberSeq *members_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const CORBA_StructMemberSeq &members + const CORBA::StructMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -109,4 +109,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_STRUCTDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index 8884a883e9f..e523bfe19a0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -20,7 +20,7 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void) { } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_TypedefDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -29,22 +29,22 @@ TAO_TypedefDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA_Contained::Description *desc_ptr = 0; + CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, - CORBA_Contained::Description, + CORBA::Contained::Description, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - CORBA_Contained::Description_var retval = desc_ptr; + CORBA::Contained::Description_var retval = desc_ptr; retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA_TypeDescription td; + CORBA::TypeDescription td; ACE_CHECK_RETURN (0); td.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -70,4 +70,3 @@ TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) return retval._retn (); } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h index 86079596efb..5ab206a9f32 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h @@ -53,13 +53,13 @@ public: virtual ~TAO_TypedefDef_i (void); // Destructor - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -71,4 +71,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_TYPEDEFDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index 097f7fc1cbb..c1aab26cf6f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -77,7 +77,7 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA_UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); 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 (ACE_ENV_SINGLE_ARG_DECL) return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_UnionDef_i::discriminator_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -156,15 +156,15 @@ TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, disc_path.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - return CORBA_IDLType::_narrow (obj.in () + return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void TAO_UnionDef_i::discriminator_type_def ( - CORBA_IDLType_ptr discriminator_type_def + CORBA::IDLType_ptr discriminator_type_def ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -177,7 +177,7 @@ TAO_UnionDef_i::discriminator_type_def ( void TAO_UnionDef_i::discriminator_type_def_i ( - CORBA_IDLType_ptr discriminator_type_def + CORBA::IDLType_ptr discriminator_type_def ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -195,7 +195,7 @@ TAO_UnionDef_i::discriminator_type_def_i ( disc_path.in ()); } -CORBA_UnionMemberSeq * +CORBA::UnionMemberSeq * TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -204,7 +204,7 @@ TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_UnionMemberSeq * +CORBA::UnionMemberSeq * TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -252,15 +252,15 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) size_t size = key_queue.size (); - CORBA_UnionMemberSeq *members = 0; + CORBA::UnionMemberSeq *members = 0; ACE_NEW_THROW_EX (members, - CORBA_UnionMemberSeq (size), + CORBA::UnionMemberSeq (size), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); members->length (size); - CORBA_UnionMemberSeq_var retval = members; + CORBA::UnionMemberSeq_var retval = members; ACE_TString name, path; ACE_Configuration_Section_Key next_key, entry_key; @@ -306,7 +306,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval[k].type_def = CORBA_IDLType::_narrow (obj.in () + retval[k].type_def = CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -325,7 +325,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members +TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -336,7 +336,7 @@ TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members } void -TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members +TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -393,7 +393,7 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members void TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, - CORBA_UnionMember &member + CORBA::UnionMember &member ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -467,4 +467,3 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, break; } } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index 9e4bc365248..82454d05467 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -91,46 +91,46 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_IDLType_ptr discriminator_type_def ( + virtual CORBA::IDLType_ptr discriminator_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr discriminator_type_def_i ( + CORBA::IDLType_ptr discriminator_type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void discriminator_type_def ( - CORBA_IDLType_ptr discriminator_type_def + CORBA::IDLType_ptr discriminator_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void discriminator_type_def_i ( - CORBA_IDLType_ptr discriminator_type_def + CORBA::IDLType_ptr discriminator_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_UnionMemberSeq *members ( + virtual CORBA::UnionMemberSeq *members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_UnionMemberSeq *members_i ( + CORBA::UnionMemberSeq *members_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const CORBA_UnionMemberSeq &members + const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const CORBA_UnionMemberSeq &members + const CORBA::UnionMemberSeq &members ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -138,7 +138,7 @@ public: private: void fetch_label ( const ACE_Configuration_Section_Key member_key, - CORBA_UnionMember &member + CORBA::UnionMember &member ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -150,5 +150,3 @@ private: #endif /* _MSC_VER */ #endif /* TAO_UNIONDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 65e7d8ca51f..e5d67c5d30c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -40,7 +40,7 @@ TAO_UsesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_UsesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_UsesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -57,16 +57,16 @@ TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_AR return 0; } -CORBA_InterfaceDef_ptr +CORBA::InterfaceDef_ptr TAO_UsesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr +CORBA::InterfaceDef_ptr TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -90,4 +90,3 @@ TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index 417b838e8c9..441456d5025 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -67,24 +67,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_InterfaceDef_ptr interface_type ( + virtual CORBA::InterfaceDef_ptr interface_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InterfaceDef_ptr interface_type_i ( + CORBA::InterfaceDef_ptr interface_type_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -105,4 +105,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_USESDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index 97b29fd2fe3..44de16512c3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -80,16 +80,16 @@ TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ValueBoxDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -116,14 +116,14 @@ TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref (def_kind, boxed_type.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); + ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); - return CORBA_IDLType::_narrow (obj.in () + return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def +TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -134,7 +134,7 @@ TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def } void -TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def +TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -150,4 +150,3 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def "boxed_type", boxed_type.in ()); } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index 54bb15cc092..66fe38c2db7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -69,24 +69,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual CORBA_IDLType_ptr original_type_def ( + virtual CORBA::IDLType_ptr original_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr original_type_def_i ( + CORBA::IDLType_ptr original_type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( - CORBA_IDLType_ptr original_type_def + CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -97,4 +97,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_VALUEBOXDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 147d7cac989..f80007c2a94 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -42,7 +42,7 @@ TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_AR // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ValueDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_ValueDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,7 +76,7 @@ TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_P return 0; } -CORBA_InterfaceDefSeq * +CORBA::InterfaceDefSeq * TAO_ValueDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -85,7 +85,7 @@ TAO_ValueDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDefSeq * +CORBA::InterfaceDefSeq * TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -95,7 +95,7 @@ TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ void TAO_ValueDef_i::supported_interfaces ( - const CORBA_InterfaceDefSeq &supported_interfaces + const CORBA::InterfaceDefSeq &supported_interfaces ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -108,7 +108,7 @@ TAO_ValueDef_i::supported_interfaces ( void TAO_ValueDef_i::supported_interfaces_i ( - const CORBA_InterfaceDefSeq & /* supported_interfaces */ + const CORBA::InterfaceDefSeq & /* supported_interfaces */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -116,7 +116,7 @@ TAO_ValueDef_i::supported_interfaces_i ( // TODO } -CORBA_InitializerSeq * +CORBA::InitializerSeq * TAO_ValueDef_i::initializers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -125,7 +125,7 @@ TAO_ValueDef_i::initializers (ACE_ENV_SINGLE_ARG_DECL) return this->initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InitializerSeq * +CORBA::InitializerSeq * TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -134,7 +134,7 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SING } void -TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers +TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -145,23 +145,23 @@ TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers } void -TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */ +TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq & /* initializers */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } -CORBA_ValueDef_ptr +CORBA::ValueDef_ptr TAO_ValueDef_i::base_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); return this->base_value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ValueDef_ptr +CORBA::ValueDef_ptr TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -170,7 +170,7 @@ TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE } void -TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value +TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -181,14 +181,14 @@ TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value } void -TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */ +TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr /* base_value */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } -CORBA_ValueDefSeq * +CORBA::ValueDefSeq * TAO_ValueDef_i::abstract_base_values (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -197,7 +197,7 @@ TAO_ValueDef_i::abstract_base_values (ACE_ENV_SINGLE_ARG_DECL) return this->abstract_base_values_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ValueDefSeq * +CORBA::ValueDefSeq * TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -207,7 +207,7 @@ TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ void TAO_ValueDef_i::abstract_base_values ( - const CORBA_ValueDefSeq &abstract_base_values + const CORBA::ValueDefSeq &abstract_base_values ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -220,7 +220,7 @@ TAO_ValueDef_i::abstract_base_values ( void TAO_ValueDef_i::abstract_base_values_i ( - const CORBA_ValueDefSeq & /* abstract_base_values */ + const CORBA::ValueDefSeq & /* abstract_base_values */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -361,7 +361,7 @@ TAO_ValueDef_i::is_a_i (const char *id return 0; } -CORBA_ValueDef::FullValueDescription * +CORBA::ValueDef::FullValueDescription * TAO_ValueDef_i::describe_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -370,7 +370,7 @@ TAO_ValueDef_i::describe_value (ACE_ENV_SINGLE_ARG_DECL) return this->describe_value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_ValueDef::FullValueDescription * +CORBA::ValueDef::FullValueDescription * TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -378,16 +378,16 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SI return 0; } -CORBA_ValueMemberDef_ptr +CORBA::ValueMemberDef_ptr TAO_ValueDef_i::create_value_member (const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::Visibility access ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueMemberDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueMemberDef::_nil ()); return this->create_value_member_i (id, name, @@ -397,11 +397,11 @@ TAO_ValueDef_i::create_value_member (const char *id, ACE_ENV_ARG_PARAMETER); } -CORBA_ValueMemberDef_ptr +CORBA::ValueMemberDef_ptr TAO_ValueDef_i::create_value_member_i (const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_IDLType_ptr /* type */, + CORBA::IDLType_ptr /* type */, CORBA::Visibility /* access */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -410,18 +410,18 @@ TAO_ValueDef_i::create_value_member_i (const char * /* id */, return 0; } -CORBA_AttributeDef_ptr +CORBA::AttributeDef_ptr TAO_ValueDef_i::create_attribute ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_AttributeDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ()); return this->create_attribute_i (id, name, @@ -431,12 +431,12 @@ TAO_ValueDef_i::create_attribute ( ACE_ENV_ARG_PARAMETER); } -CORBA_AttributeDef_ptr +CORBA::AttributeDef_ptr TAO_ValueDef_i::create_attribute_i ( const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_IDLType_ptr /* type */, + CORBA::IDLType_ptr /* type */, CORBA::AttributeMode /* mode */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) @@ -446,21 +446,21 @@ TAO_ValueDef_i::create_attribute_i ( return 0; } -CORBA_OperationDef_ptr +CORBA::OperationDef_ptr TAO_ValueDef_i::create_operation ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr result, + CORBA::IDLType_ptr result, CORBA::OperationMode mode, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions, - const CORBA_ContextIdSeq &contexts + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions, + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (CORBA_OperationDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ()); return this->create_operation_i (id, name, @@ -473,16 +473,16 @@ TAO_ValueDef_i::create_operation ( ACE_ENV_ARG_PARAMETER); } -CORBA_OperationDef_ptr +CORBA::OperationDef_ptr TAO_ValueDef_i::create_operation_i ( const char * /* id */, const char * /* name */, const char * /* version */, - CORBA_IDLType_ptr /* result */, + CORBA::IDLType_ptr /* result */, CORBA::OperationMode /* mode */, - const CORBA_ParDescriptionSeq & /* params */, - const CORBA_ExceptionDefSeq & /* exceptions */, - const CORBA_ContextIdSeq & /* contexts */ + const CORBA::ParDescriptionSeq & /* params */, + const CORBA::ExceptionDefSeq & /* exceptions */, + const CORBA::ContextIdSeq & /* contexts */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -490,4 +490,3 @@ TAO_ValueDef_i::create_operation_i ( // TODO return 0; } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index ac23eaf2e92..c69c06f5ca1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -70,13 +70,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -94,90 +94,90 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. - virtual CORBA_InterfaceDefSeq *supported_interfaces ( + virtual CORBA::InterfaceDefSeq *supported_interfaces ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InterfaceDefSeq *supported_interfaces_i ( + CORBA::InterfaceDefSeq *supported_interfaces_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( - const CORBA_InterfaceDefSeq & supported_interfaces + const CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( - const CORBA_InterfaceDefSeq & supported_interfaces + const CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_InitializerSeq *initializers ( + virtual CORBA::InitializerSeq *initializers ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_InitializerSeq *initializers_i ( + CORBA::InitializerSeq *initializers_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void initializers ( - const CORBA_InitializerSeq & initializers + const CORBA::InitializerSeq & initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void initializers_i ( - const CORBA_InitializerSeq & initializers + const CORBA::InitializerSeq & initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueDef_ptr base_value ( + virtual CORBA::ValueDef_ptr base_value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueDef_ptr base_value_i ( + CORBA::ValueDef_ptr base_value_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_value ( - CORBA_ValueDef_ptr base_value + CORBA::ValueDef_ptr base_value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void base_value_i ( - CORBA_ValueDef_ptr base_value + CORBA::ValueDef_ptr base_value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueDefSeq *abstract_base_values ( + virtual CORBA::ValueDefSeq *abstract_base_values ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueDefSeq *abstract_base_values_i ( + CORBA::ValueDefSeq *abstract_base_values_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void abstract_base_values ( - const CORBA_ValueDefSeq & abstract_base_values + const CORBA::ValueDefSeq & abstract_base_values ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void abstract_base_values_i ( - const CORBA_ValueDefSeq & abstract_base_values + const CORBA::ValueDefSeq & abstract_base_values ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -260,78 +260,78 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueDef::FullValueDescription *describe_value ( + virtual CORBA::ValueDef::FullValueDescription *describe_value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueDef::FullValueDescription *describe_value_i ( + CORBA::ValueDef::FullValueDescription *describe_value_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_ValueMemberDef_ptr create_value_member ( + virtual CORBA::ValueMemberDef_ptr create_value_member ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::Visibility access ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_ValueMemberDef_ptr create_value_member_i ( + CORBA::ValueMemberDef_ptr create_value_member_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::Visibility access ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_AttributeDef_ptr create_attribute ( + virtual CORBA::AttributeDef_ptr create_attribute ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_AttributeDef_ptr create_attribute_i ( + CORBA::AttributeDef_ptr create_attribute_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr type, + CORBA::IDLType_ptr type, CORBA::AttributeMode mode ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_OperationDef_ptr create_operation ( + virtual CORBA::OperationDef_ptr create_operation ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr result, + CORBA::IDLType_ptr result, CORBA::OperationMode mode, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions, - const CORBA_ContextIdSeq &contexts + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions, + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_OperationDef_ptr create_operation_i ( + CORBA::OperationDef_ptr create_operation_i ( const char *id, const char *name, const char *version, - CORBA_IDLType_ptr result, + CORBA::IDLType_ptr result, CORBA::OperationMode mode, - const CORBA_ParDescriptionSeq ¶ms, - const CORBA_ExceptionDefSeq &exceptions, - const CORBA_ContextIdSeq &contexts + const CORBA::ParDescriptionSeq ¶ms, + const CORBA::ExceptionDefSeq &exceptions, + const CORBA::ContextIdSeq &contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -342,5 +342,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_VALUEDEF_I_H */ - - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index 8e6b0912a21..4f20f03b5e8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -42,7 +42,7 @@ TAO_ValueMemberDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SIN // TODO } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ValueMemberDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -51,7 +51,7 @@ TAO_ValueMemberDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_Contained::Description * +CORBA::Contained::Description * TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,16 +76,16 @@ TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE return 0; } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ValueMemberDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_IDLType_ptr +CORBA::IDLType_ptr TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -94,7 +94,7 @@ TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SI } void -TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def +TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -105,7 +105,7 @@ TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def } void -TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */ +TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr /* type_def */ ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -147,4 +147,3 @@ TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */ { // TODO } - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h index 3812b0ac6ae..7cbbc7a7e9c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h @@ -67,13 +67,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_Contained::Description *describe ( + virtual CORBA::Contained::Description *describe ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. - virtual CORBA_Contained::Description *describe_i ( + virtual CORBA::Contained::Description *describe_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -89,24 +89,24 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA_IDLType_ptr type_def ( + virtual CORBA::IDLType_ptr type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA_IDLType_ptr type_def_i ( + CORBA::IDLType_ptr type_def_i ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( - CORBA_IDLType_ptr type_def + CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( - CORBA_IDLType_ptr type_def + CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -139,4 +139,3 @@ public: #endif /* _MSC_VER */ #endif /* TAO_VALUEMEMBERDEF_I_H */ - |