diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index a0530aec8ac..5f0a3087c54 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -37,7 +37,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) } CosTradingRepos::ServiceTypeRepository::IncarnationNumber -TAO_Service_Type_Repository::incarnation (CORBA::Environment &) +TAO_Service_Type_Repository::incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num; @@ -62,8 +62,8 @@ TAO_Service_Type_Repository:: add_type (const char *name, const char *if_name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -100,14 +100,14 @@ add_type (const char *name, // Make sure all property names are valid and appear only once. this->validate_properties (prop_map, - props, - ACE_TRY_ENV); + props + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (this->incarnation_); // Check that all super_types exist, and none are duplicated. this->validate_supertypes (super_map, - super_types, - ACE_TRY_ENV); + super_types + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (this->incarnation_); // NOTE: I don't really know a way to do this without an Interface @@ -115,7 +115,7 @@ add_type (const char *name, // information about supertypes. // // make sure interface name is legal. - // this->validate_interface (if_name, super_types, ACE_TRY_ENV); + // this->validate_interface (if_name, super_types TAO_ENV_ARG_PARAMETER); // ACE_CHECK_RETURN (this->incarnation); // // Instead, we do this: @@ -128,8 +128,8 @@ add_type (const char *name, // type are compatible. We can use prop_map and super_types_map for // the job. this->validate_inheritance (prop_map, - super_types, - ACE_TRY_ENV); + super_types + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (this->incarnation_); // We can now use prop_map to construct a sequence of all properties @@ -155,8 +155,8 @@ add_type (const char *name, } void -TAO_Service_Type_Repository::remove_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Service_Type_Repository::remove_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -186,8 +186,8 @@ TAO_Service_Type_Repository::remove_type (const char *name, CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * TAO_Service_Type_Repository:: -list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types, - CORBA::Environment &ACE_TRY_ENV) +list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); @@ -232,8 +232,8 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: -describe_type (const char * name, - CORBA::Environment& ACE_TRY_ENV) +describe_type (const char * name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -282,8 +282,8 @@ describe_type (const char * name, CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: -fully_describe_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +fully_describe_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -328,8 +328,8 @@ fully_describe_type (const char *name, void TAO_Service_Type_Repository:: -mask_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +mask_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -359,8 +359,8 @@ mask_type (const char *name, void TAO_Service_Type_Repository:: -unmask_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +unmask_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -496,8 +496,8 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ void TAO_Service_Type_Repository:: validate_properties (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) { @@ -525,8 +525,8 @@ validate_properties (Prop_Map &prop_map, void TAO_Service_Type_Repository:: validate_supertypes (Service_Type_Map &super_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) @@ -561,8 +561,8 @@ validate_supertypes (Service_Type_Map &super_map, void TAO_Service_Type_Repository:: validate_inheritance (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)) { CORBA::ULong num_super_types = super_types.length (); @@ -610,8 +610,8 @@ validate_inheritance (Prop_Map &prop_map, ACE_TRY { compare = - super_props[j].value_type->equal (prop_type, - ACE_TRY_ENV); + super_props[j].value_type->equal (prop_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |