diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/Contained_i.h')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Contained_i.h | 157 |
1 files changed, 65 insertions, 92 deletions
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h index 5b1422c0bc9..299288402e9 100644 --- a/TAO/orbsvcs/IFR_Service/Contained_i.h +++ b/TAO/orbsvcs/IFR_Service/Contained_i.h @@ -51,153 +51,130 @@ public: // Destructor. 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. 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 char *id ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); char *id_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual void id ( - const char *id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); void id_i ( - const char *id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *name ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); char *name_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual void name ( - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); void name_i ( - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *version ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); char *version_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual void version ( - const char *version, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *version + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); void version_i ( - const char *version, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *version + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Container_ptr defined_in ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Container_ptr defined_in_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *absolute_name ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); char *absolute_name_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Repository_ptr containing_repository ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Repository_ptr containing_repository_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual CORBA_Contained::Description *describe_i ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void move ( CORBA_Container_ptr new_container, const char *new_name, - const char *new_version, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *new_version + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -205,10 +182,9 @@ protected: CORBA_Container_ptr new_container, const char *new_name, const char *new_version, - CORBA::Boolean cleanup, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::Boolean cleanup + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Engine for move() with an extra 'cleanup' // parameter. Since a section removal can be @@ -217,10 +193,9 @@ protected: private: CORBA::Boolean name_exists ( - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Check if <name> already exists in our container @@ -233,10 +208,9 @@ private: void move_pre_process ( CORBA_Container_ptr container, const char *contained_path, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Mangle the names of references that are also // defined in the scope, so a name clash will @@ -244,10 +218,9 @@ private: // unmangles the names. void move_contents ( - CORBA_Container_ptr new_container, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA_Container_ptr new_container + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); // Recursively calls move_i for definitions, // as well as operations and attributes if |