diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | b11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tao/Policy_Manager.h | |
| parent | 8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff) | |
| download | ATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tao/Policy_Manager.h')
| -rw-r--r-- | TAO/tao/Policy_Manager.h | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 9635219bee9..029d27c9c9b 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -48,24 +48,21 @@ public: TAO_Policy_Manager (void); /// Obtain a single policy. - CORBA::Policy_ptr get_policy (CORBA::PolicyType policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType policy + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + const CORBA::PolicyTypeSeq & ts + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + CORBA::SetOverrideType set_add + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA_InvalidPolicies)); @@ -90,22 +87,19 @@ public: TAO_Policy_Current_Impl (void); /// Obtain a single policy. - CORBA::Policy_ptr get_policy (CORBA::PolicyType policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType policy + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + // = The CORBA::PolicyManager operations CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + const CORBA::PolicyTypeSeq & ts + TAO_ENV_ARG_DECL_WITH_DEFAULTS ); void set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()); + CORBA::SetOverrideType set_add + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); @@ -127,25 +121,22 @@ public: /// Obtain a single policy. CORBA::Policy_ptr get_policy ( - CORBA::PolicyType policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::PolicyType policy + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + // = The CORBA::PolicyManager operations virtual CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + const CORBA::PolicyTypeSeq & ts + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_policy_overrides ( const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () + CORBA::SetOverrideType set_add + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA_InvalidPolicies)); |