diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index c8a710dcc23..6398e72e4d9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -29,26 +29,25 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void) } CORBA::DefinitionKind -TAO_ValueBoxDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ValueBoxDef_i::def_kind (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_ValueBox; } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type (ACE_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + this->update_key (); - return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (); } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::type_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -70,8 +69,7 @@ TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) TAO_IFR_Service_Utils::path_to_idltype (boxed_type_path, this->repo_); - CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + CORBA::TypeCode_var tc = impl->type_i (); return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (), name.c_str (), @@ -80,19 +78,18 @@ TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) } CORBA::IDLType_ptr -TAO_ValueBoxDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::original_type_def (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); + this->update_key (); - return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->original_type_def_i (); } CORBA::IDLType_ptr -TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::original_type_def_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString boxed_type_path; @@ -104,7 +101,6 @@ TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) TAO_IFR_Service_Utils::path_to_ir_object (boxed_type_path, this->repo_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::IDLType::_nil ()); return CORBA::IDLType::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); @@ -117,8 +113,7 @@ TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def { TAO_IFR_WRITE_GUARD; - this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->update_key (); this->original_type_def_i (original_type_def ACE_ENV_ARG_PARAMETER); |