diff options
Diffstat (limited to 'TAO/tao/RTCORBA/RT_Stub.h')
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Stub.h | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index f2bd0adacc8..96403604062 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -56,21 +56,18 @@ public: * policy type. Returns the effective override for all other policy * types. */ - CORBA::Policy_ptr get_policy (CORBA::PolicyType type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Policy_ptr get_policy (CORBA::PolicyType type + TAO_ENV_ARG_DECL_WITH_DEFAULTS); - CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA::SetOverrideType set_add + TAO_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -79,17 +76,17 @@ public: /// Returns the CORBA::Policy (which will be narrowed to be /// used as RTCORBA::PriorityModelPolicy) exported /// in object's IOR. - CORBA::Policy_ptr exposed_priority_model (CORBA::Environment &ACE_TRY_ENV); + CORBA::Policy_ptr exposed_priority_model (TAO_ENV_SINGLE_ARG_DECL); /// Returns the CORBA::Policy (which will be narrowed and used /// as RTCORBA::PriorityBandedConnectionPolicy) exported /// in object's IOR. - CORBA::Policy_ptr exposed_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV); + CORBA::Policy_ptr exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL); /// Returns the CORBA::Policy (which will be narrowed and used /// as RTCORBA::ClientProtocolPolicy) exported /// in object's IOR. - CORBA::Policy_ptr exposed_client_protocol (CORBA::Environment &ACE_TRY_ENV); + CORBA::Policy_ptr exposed_client_protocol (TAO_ENV_SINGLE_ARG_DECL); CORBA::Policy *private_connection (void); @@ -106,19 +103,16 @@ public: // the policy value exported in the Object's IOR. CORBA::Policy * - effective_priority_banded_connection (CORBA::Environment - &ACE_TRY_ENV = - TAO_default_environment ()); + effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Policy * - effective_client_protocol (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: /// Helper method used to parse the policies. - void parse_policies (CORBA::Environment &ACE_TRY_ENV); + void parse_policies (TAO_ENV_SINGLE_ARG_DECL); void exposed_priority_model (CORBA::Policy_ptr policy); |