diff options
Diffstat (limited to 'TAO/tao/Messaging/Messaging_Policy_i.cpp')
| -rw-r--r-- | TAO/tao/Messaging/Messaging_Policy_i.cpp | 65 |
1 files changed, 25 insertions, 40 deletions
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 39d4cc2b50a..3d98a6f8ebb 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -42,7 +42,7 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( TimeBase::TimeT TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->relative_expiry_; @@ -50,7 +50,7 @@ TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( CORBA::PolicyType TAO_RelativeRoundtripTimeoutPolicy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void) ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE; @@ -62,7 +62,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, bool &has_timeout, ACE_Time_Value &time_value) { - ACE_TRY_NEW_ENV + try { CORBA::Policy_var policy = 0; @@ -71,15 +71,13 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, policy = orb_core->get_cached_policy_including_current ( TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { policy = stub->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } if (CORBA::is_nil (policy.in ())) @@ -91,11 +89,9 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, Messaging::RelativeRoundtripTimeoutPolicy_var p = Messaging::RelativeRoundtripTimeoutPolicy::_narrow ( policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); - TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + TimeBase::TimeT t = p->relative_expiry (); TimeBase::TimeT seconds = t / 10000000u; TimeBase::TimeT microseconds = (t % 10000000u) / 10; time_value.set (ACE_U64_TO_U32 (seconds), @@ -111,16 +107,14 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, time_value.msec ())); } } - ACE_CATCHANY + catch (const ::CORBA::Exception&) { // Ignore all exceptions... } - ACE_ENDTRY; } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val - ACE_ENV_ARG_DECL) +TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val) { // Future policy implementors: notice how the following code is // exception safe! @@ -135,7 +129,6 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val TAO_RelativeRoundtripTimeoutPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } @@ -151,23 +144,22 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_RelativeRoundtripTimeoutPolicy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is // exception safe! - TAO_RelativeRoundtripTimeoutPolicy* tmp; + TAO_RelativeRoundtripTimeoutPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return tmp; } void -TAO_RelativeRoundtripTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RelativeRoundtripTimeoutPolicy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -222,7 +214,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) } CORBA::PolicyType -TAO_Sync_Scope_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::SYNC_SCOPE_POLICY_TYPE; @@ -234,7 +226,7 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, bool &has_synchronization, Messaging::SyncScope &scope) { - ACE_TRY_NEW_ENV + try { CORBA::Policy_var policy = 0; @@ -243,47 +235,42 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, policy = orb_core->get_cached_policy_including_current ( TAO_CACHED_POLICY_SYNC_SCOPE - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } else { policy = stub->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ); } if (CORBA::is_nil (policy.in ())) { - has_synchronization = 0; + has_synchronization = false; return; } Messaging::SyncScopePolicy_var p = Messaging::SyncScopePolicy::_narrow (policy.in ()); - ACE_TRY_CHECK; if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL ( + throw ::CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_POLICY_NARROW_CODE, 0), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); has_synchronization = true; - scope = p->synchronization (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + scope = p->synchronization (); } - ACE_CATCHANY + catch (const ::CORBA::Exception&) { // Ignore all exceptions... } - ACE_ENDTRY; } CORBA::Policy_ptr TAO_Sync_Scope_Policy::create (const CORBA::Any& val - ACE_ENV_ARG_DECL) + ) { Messaging::SyncScope synchronization; if ((val >>= synchronization) == 0) @@ -294,7 +281,6 @@ TAO_Sync_Scope_Policy::create (const CORBA::Any& val ACE_NEW_THROW_EX (servant, TAO_Sync_Scope_Policy (synchronization), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return servant; } @@ -310,27 +296,26 @@ TAO_Sync_Scope_Policy::clone (void) const } Messaging::SyncScope -TAO_Sync_Scope_Policy::synchronization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::synchronization (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->synchronization_; } CORBA::Policy_ptr -TAO_Sync_Scope_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Sync_Scope_Policy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, TAO_Sync_Scope_Policy (*this), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return servant; } void -TAO_Sync_Scope_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Sync_Scope_Policy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } |