diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp index cb6db156611..3bffdcc71d6 100644 --- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp @@ -24,45 +24,45 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void) } CORBA::DefinitionKind -TAO_ExceptionDef_i::def_kind (CORBA::Environment &) +TAO_ExceptionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Exception; } -void -TAO_ExceptionDef_i::destroy (CORBA::Environment &ACE_TRY_ENV) +void +TAO_ExceptionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_ExceptionDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) +void +TAO_ExceptionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (ACE_TRY_ENV); + TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + // Destroy ourself. - TAO_Contained_i::destroy_i (ACE_TRY_ENV); + TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_ExceptionDef_i::describe (CORBA::Environment &ACE_TRY_ENV) +TAO_ExceptionDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (ACE_TRY_ENV); + return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) +TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -73,15 +73,15 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (ACE_TRY_ENV); + retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ExceptionDescription ed; - ed.name = this->name_i (ACE_TRY_ENV); + ed.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ed.id = this->id_i (ACE_TRY_ENV); + ed.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -92,10 +92,10 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) ed.defined_in = container_id.c_str (); - ed.version = this->version_i (ACE_TRY_ENV); + ed.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ed.type = this->type_i (ACE_TRY_ENV); + ed.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= ed; @@ -103,17 +103,17 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV) return retval._retn (); } -CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type (CORBA::Environment &ACE_TRY_ENV) +CORBA::TypeCode_ptr +TAO_ExceptionDef_i::type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (ACE_TRY_ENV); + return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); } -CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) +CORBA::TypeCode_ptr +TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -126,26 +126,26 @@ TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV) "name", name); - CORBA_StructMemberSeq_var members = this->members_i (ACE_TRY_ENV); + CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_exception_tc (id.c_str (), name.c_str (), - members.in (), - ACE_TRY_ENV); + members.in () + TAO_ENV_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_ExceptionDef_i::members (CORBA::Environment &ACE_TRY_ENV) +TAO_ExceptionDef_i::members (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (ACE_TRY_ENV); + return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) +TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; @@ -201,7 +201,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) "def_kind", kind); - CORBA::DefinitionKind def_kind = + CORBA::DefinitionKind def_kind = ACE_static_cast (CORBA::DefinitionKind, kind); kind_queue.enqueue_tail (def_kind); @@ -209,7 +209,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) } size_t size = kind_queue.size (); - + CORBA_StructMemberSeq *members = 0; ACE_NEW_THROW_EX (members, CORBA_StructMemberSeq (size), @@ -237,14 +237,14 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) path_queue.dequeue_head (path); - obj = + obj = this->repo_->servant_factory ()->create_objref (kind, - path.c_str (), - ACE_TRY_ENV); + path.c_str () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - - retval[k].type_def = CORBA_IDLType::_narrow (obj.in (), - ACE_TRY_ENV); + + retval[k].type_def = CORBA_IDLType::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->repo_->config ()->expand_path (this->repo_->root_key (), @@ -253,37 +253,37 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV) 0); impl = - this->repo_->servant_factory ()->create_idltype (member_key, - ACE_TRY_ENV); + this->repo_->servant_factory ()->create_idltype (member_key + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr<TAO_IDLType_i> safety (impl); - - retval[k].type = impl->type_i (ACE_TRY_ENV); + + retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return retval._retn (); } -void -TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) +void +TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->members_i (members, - ACE_TRY_ENV); + this->members_i (members + TAO_ENV_ARG_PARAMETER); } -void -TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV) +void +TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (ACE_TRY_ENV); + TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count = members.length (); @@ -315,9 +315,9 @@ TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members, "name", name); - PortableServer::ObjectId_var oid = - this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (), - ACE_TRY_ENV); + PortableServer::ObjectId_var oid = + this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var path = |