diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/AliasDef_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/AliasDef_i.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp index 555df7e18e5..9188ace6df3 100644 --- a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp @@ -22,23 +22,23 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void) } CORBA::DefinitionKind -TAO_AliasDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AliasDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Alias; } CORBA::TypeCode_ptr -TAO_AliasDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -64,31 +64,31 @@ TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (ot_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_alias_tc (id.c_str (), name.c_str (), tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AliasDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString original_type; @@ -113,32 +113,32 @@ TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, original_type.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->original_type_def_i (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var original_type = |