diff options
Diffstat (limited to 'TAO/tao/Utils/Servant_Var.inl')
| -rw-r--r-- | TAO/tao/Utils/Servant_Var.inl | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index be906d9982f..ca6e0e6f9bf 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -11,21 +11,17 @@ template <class T> ACE_INLINE T * TAO::Utils::Servant_Var<T>::_duplicate (T * p) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { if (p != 0) { - p->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + p->_add_ref (); } } - ACE_CATCHALL + catch (...) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); return p; } @@ -85,19 +81,17 @@ TAO::Utils::Servant_Var<T>::~Servant_Var (void) // can't assume that it will not throw. If it does, then we are in // trouble. In any event, we can't let the exception escape our // destructor. - ACE_TRY_NEW_ENV + try { if (ptr_ != 0) { - ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ptr_->_remove_ref (); } } - ACE_CATCHALL + catch (...) { // Forget the exception.. } - ACE_ENDTRY; } #if !defined(ACE_LACKS_MEMBER_TEMPLATES) |