diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index ebb9b61f7f4..ee482f6a643 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -35,8 +35,7 @@ public: ~TAO_Service_Type_Repository (void); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber - incarnation (CORBA::Environment &_env) - ACE_THROW_SPEC (()); + incarnation (CORBA::Environment &_env); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber add_type (const char *name, @@ -44,7 +43,7 @@ public: const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, CORBA::Environment &_env) - ACE_THROW_SPEC ((CORBA::SystemException, + TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, @@ -98,7 +97,7 @@ public: virtual void remove_type (const char *name, CORBA::Environment &_env) - ACE_THROW_SPEC ((CORBA::SystemException, + TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::HasSubTypes)); @@ -114,7 +113,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types, CORBA::Environment &_env) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC // The list_types operation permits a client to obtain the names of @@ -130,7 +129,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * describe_type (const char *name, CORBA::Environment &_env) - ACE_THROW_SPEC ((CORBA::SystemException, + TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); // BEGIN SPEC @@ -144,7 +143,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * fully_describe_type (const char *name, CORBA::Environment &_env) - ACE_THROW_SPEC ((CORBA::SystemException, + TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); // BEGIN SPEC @@ -161,7 +160,7 @@ public: virtual void mask_type (const char *name, CORBA::Environment &_env) - ACE_THROW_SPEC ((CORBA::SystemException, + TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::AlreadyMasked)); @@ -180,7 +179,7 @@ public: virtual void unmask_type (const char *name, CORBA::Environment &_env) - ACE_THROW_SPEC ((CORBA::SystemException, + TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::NotMasked)); @@ -243,7 +242,7 @@ public: void validate_properties (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, CORBA::Environment &_env) - ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, + TAO_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // Confirm that the properties in props have valid names, and aren't // duplicated. Cram those properties into the prop_map. @@ -251,7 +250,7 @@ public: void validate_supertypes (Service_Type_Map &super_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, CORBA::Environment &_env) - ACE_THROW_SPEC ((CosTrading::IllegalServiceType, + TAO_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTrading::DuplicatePropertyName)); // Confirm that the each super type exists, and cram them into super_map. @@ -259,14 +258,14 @@ public: void validate_inheritance (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, CORBA::Environment &_env) - ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)); + TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)); // Ensure that properties of a super_type aren't having their types // or retstrictions redefined. // void validate_interface (const char *if_name, // Service_Type_Map &super_map, // CORBA::Environment &_env) - // ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch)); + // TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch)); // Ensure that the interface type derives from its superclasses'. void update_type_map (const char *name, |