diff options
Diffstat (limited to 'TAO/tao/Exception.cpp')
| -rw-r--r-- | TAO/tao/Exception.cpp | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 2fdfabc06fe..de20b536ce9 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -318,7 +318,7 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp, || stream.encode (CORBA::_tc_TypeCode, &CORBA::_tc_any, 0, TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW (CORBA_INITIALIZE ()); + TAO_THROW (CORBA_INITIALIZE (CORBA::COMPLETED_NO)); tcp = new CORBA::TypeCode (CORBA::tk_except, stream.length (), @@ -374,7 +374,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, || stream.encode (CORBA::_tc_TypeCode, &TC_completion_status, 0, TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW (CORBA_INITIALIZE ()); + TAO_THROW (CORBA_INITIALIZE (CORBA::COMPLETED_NO)); // OK, we stuffed the buffer we were given (or grew a bigger one; // hope to avoid that during initialization). Now build and return @@ -428,10 +428,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, TAO_SYSTEM_EXCEPTION (REBIND) \ TAO_SYSTEM_EXCEPTION (TIMEOUT) \ TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \ - TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED) \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK) \ - TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION) + TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) // Declare static storage for these ... the buffer is "naturally" // aligned and overwritten. @@ -531,7 +528,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA_##name :: CORBA_##name (void) \ : CORBA_SystemException (CORBA::_tc_ ## name, \ - TAO_DEFAULT_MINOR_CODE, \ + 0xffff0000L, \ CORBA::COMPLETED_NO) \ { \ } @@ -542,7 +539,6 @@ STANDARD_EXCEPTION_LIST CORBA_ExceptionList::CORBA_ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list) - : ref_count_ (1) { for (CORBA::ULong i=0; i < len; i++) this->add (tc_list [i]); @@ -586,7 +582,6 @@ CORBA_ExceptionList::item (CORBA::ULong index, return CORBA::TypeCode::_duplicate (*tc); } } - void CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &env) { @@ -594,38 +589,17 @@ CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &env) env.clear (); } -CORBA_ExceptionList_ptr -CORBA_ExceptionList::_duplicate (void) -{ - ++this->ref_count_; - return this; -} - -void -CORBA_ExceptionList::_destroy (void) -{ - CORBA::ULong current = --this->ref_count_; - if (current == 0) - delete this; -} - #if defined (TAO_DONT_CATCH_DOT_DOT_DOT) TAO_DONT_CATCH::TAO_DONT_CATCH () {} #endif /* TAO_DONT_CATCH_DOT_DOT_DOT */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Node<CORBA::TypeCode_ptr>; template class ACE_Unbounded_Queue<CORBA::TypeCode_ptr>; template class ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>; -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Node<CORBA::TypeCode_ptr> #pragma instantiate ACE_Unbounded_Queue<CORBA::TypeCode_ptr> #pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr> -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |