diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/StructDef_i.h')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/StructDef_i.h | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.h b/TAO/orbsvcs/IFR_Service/StructDef_i.h index 47622dd3f76..0249cafeadc 100644 --- a/TAO/orbsvcs/IFR_Service/StructDef_i.h +++ b/TAO/orbsvcs/IFR_Service/StructDef_i.h @@ -34,7 +34,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_StructDef_i : public virtual TAO_TypedefDef_i, +class TAO_StructDef_i : public virtual TAO_TypedefDef_i, public virtual TAO_Container_i { // = TITLE @@ -52,63 +52,54 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry and its contents. virtual void destroy_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_StructMemberSeq *members ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_StructMemberSeq *members_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); }; |