diff options
author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-21 05:09:14 +0000 |
---|---|---|
committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-21 05:09:14 +0000 |
commit | 7125a6d9dc3a7a1869167c5313e125a3b1606754 (patch) | |
tree | 671858d30e757dac115f005709c0a01e11a9db7b /TAO/orbsvcs/orbsvcs | |
parent | ecb15a726656bc5b7139b97693b47684b1a3d34b (diff) | |
download | ATCD-7125a6d9dc3a7a1869167c5313e125a3b1606754.tar.gz |
ChangeLogTag:Fri Aug 21 00:04:11 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp | 45 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp | 24 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp | 82 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp | 10 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp | 2 |
8 files changed, 92 insertions, 83 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index a9aa0b8fecf..23284c731a8 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -90,7 +90,7 @@ CC_Lock::unlock (CORBA::Environment &_env) ACE_DEBUG ((LM_DEBUG, "CC_Lock::unlock\n")); if (lock_held_ == 0) - TAO_THROW (CosConcurrencyControl::LockNotHeld); + TAO_THROW (CosConcurrencyControl::LockNotHeld()); int success = 0; //semaphore_.release (); @@ -116,7 +116,7 @@ CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode, // write lock if (lock_held_ == 0) - TAO_THROW (CosConcurrencyControl::LockNotHeld); + TAO_THROW (CosConcurrencyControl::LockNotHeld()); this->mode_ = new_mode; } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 263cfe0b95a..cb30bc97199 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -163,7 +163,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, TAO_TRY { if (lock_[lm] == 0) // This lock is not held. - TAO_THROW (CosConcurrencyControl::LockNotHeld); + TAO_THROW (CosConcurrencyControl::LockNotHeld()); else lock_[lm]--; @@ -214,7 +214,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, TAO_TRY { if (this->lock_held (lm_held) == 0) // This lock is not held - TAO_THROW (CosConcurrencyControl::LockNotHeld); + TAO_THROW (CosConcurrencyControl::LockNotHeld()); else if (this->change_mode_i (lm_held, lm_new)==1) { this->unlock (held_mode, _env); diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 9d9d274e879..6952e7c5288 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -535,27 +535,30 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period &period, ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Dispatch_Queue::open_queue"), -1); case 0: - TAO_TRY - {// @@ TODO: Handle exceptions... - ACE_Scheduler_Factory::server()->set (rt_info_, - RtecScheduler::VERY_HIGH_CRITICALITY, - ORBSVCS_Time::zero, - ORBSVCS_Time::zero, - ORBSVCS_Time::zero, - period, - RtecScheduler::VERY_LOW_IMPORTANCE, - ORBSVCS_Time::zero, - 1, - RtecScheduler::OPERATION, - TAO_TRY_ENV); - TAO_CHECK_ENV; - } - TAO_CATCHANY - { - ACE_ERROR_RETURN ((LM_ERROR, - "ACE_ES_Dispatch_Queue::exception"), -1); - } - TAO_ENDTRY; + { + TAO_TRY + {// @@ TODO: Handle exceptions... + ACE_Scheduler_Factory::server()->set (rt_info_, + RtecScheduler::VERY_HIGH_CRITICALITY, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + period, + RtecScheduler::VERY_LOW_IMPORTANCE, + ORBSVCS_Time::zero, + 1, + RtecScheduler::OPERATION, + TAO_TRY_ENV); + TAO_CHECK_ENV; + } + TAO_CATCHANY + { + ACE_ERROR_RETURN ((LM_ERROR, + "ACE_ES_Dispatch_Queue::exception"), -1); + } + TAO_ENDTRY; + } + // FALLTHROUGH case 1: // Found. break; diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 704620456b3..d5f868ad086 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -406,7 +406,7 @@ ACE_Push_Supplier_Proxy::connect_push_supplier (RtecEventComm::PushSupplier_ptr CORBA::Environment &_env) { if (this->connected ()) - TAO_THROW (RtecEventChannelAdmin::AlreadyConnected); + TAO_THROW (RtecEventChannelAdmin::AlreadyConnected()); this->push_supplier_ = RtecEventComm::PushSupplier::_duplicate(push_supplier); @@ -515,7 +515,7 @@ ACE_Push_Consumer_Proxy::connect_push_consumer (RtecEventComm::PushConsumer_ptr CORBA::Environment &_env) { if (this->connected ()) - TAO_THROW (RtecEventChannelAdmin::AlreadyConnected); + TAO_THROW (RtecEventChannelAdmin::AlreadyConnected()); this->push_consumer_ = RtecEventComm::PushConsumer::_duplicate(push_consumer); @@ -1196,10 +1196,10 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer, { ACE_ES_GUARD ace_mon (lock_); if (ace_mon.locked () == 0) - TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR()); if (all_consumers_.remove (consumer) == -1) - TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR()); } // Tell everyone else that the consumer is disconnecting. This @@ -1290,7 +1290,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &_env) if (ace_mon.locked () == 0) { delete new_consumer; - TAO_THROW_RETURN (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, 0); + TAO_THROW_RETURN (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR(), 0); } if (all_consumers_.insert (new_consumer) == -1) @@ -1420,7 +1420,7 @@ ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer, { // Initialize the consumer correlation filter. if (consumer->correlation ().connected (consumer, this) == -1) - TAO_THROW (RtecEventChannelAdmin::EventChannel::CORRELATION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::CORRELATION_ERROR()); } void @@ -2163,7 +2163,7 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier, { ACE_ES_WGUARD ace_mon (lock_); if (ace_mon.locked () == 0) - TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR()); if (all_suppliers_.insert (supplier) == -1) ACE_ERROR ((LM_ERROR, "ACE_ES_Subscription_Module insert failed.\n")); @@ -2306,10 +2306,10 @@ ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier, { ACE_ES_WGUARD ace_mon (lock_); if (ace_mon.locked () == 0) - TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR()); if (all_suppliers_.remove (supplier) == -1) - TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR()); // Remove all consumers from the supplier's source-based subscription lists. ACE_ES_Subscription_Info::Subscriber_Set_Iterator source_iterator @@ -3064,10 +3064,10 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier, { ACE_ES_GUARD ace_mon (lock_); if (ace_mon.locked () == 0) - TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR()); if (all_suppliers_.remove (supplier) == -1) - TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR); + TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR()); up_->disconnecting (supplier, _env); @@ -3133,7 +3133,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &_env) if (ace_mon.locked () == 0) { delete new_supplier; - TAO_THROW_RETURN (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, 0); + TAO_THROW_RETURN (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR(), 0); } if (all_suppliers_.insert (new_supplier) == -1) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index 8973ddbe1fa..b4f0f2e7551 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -89,6 +89,10 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, this->naming_service_ior_ = str.in (); this->naming_context_name_ = CORBA::string_dup (""); } + TAO_CATCHANY + { + TAO_TRY_ENV.print_exception ("TAO_Naming_Server::init"); + } TAO_ENDTRY; char* naming_ior = ACE_OS::strdup (this->naming_service_ior_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index b36eb6a2f6b..c0753a92005 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -151,7 +151,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService delete new_set; // Throw the exception. - TAO_THROW_RETURN (CosPropertyService::ConstraintNotSupported, + TAO_THROW_RETURN (CosPropertyService::ConstraintNotSupported(), 0); } TAO_CATCH (CORBA::SystemException, ex) @@ -297,7 +297,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS delete new_set; // Throw the exception. - TAO_THROW_RETURN (CosPropertyService::ConstraintNotSupported, + TAO_THROW_RETURN (CosPropertyService::ConstraintNotSupported(), 0); } TAO_CATCH (CORBA::SystemException, ex) @@ -530,15 +530,15 @@ TAO_PropertySet::define_property (const char *property_name, // Check the name's validity. if (property_name == 0) - TAO_THROW (CosPropertyService::InvalidPropertyName); + TAO_THROW (CosPropertyService::InvalidPropertyName()); // Is this type allowed? if (is_type_allowed (property_value.type ()) != CORBA::B_TRUE) - TAO_THROW (CosPropertyService::UnsupportedTypeCode); + TAO_THROW (CosPropertyService::UnsupportedTypeCode()); // Is this property allowed? if (is_property_allowed (property_name) != CORBA::B_TRUE) - TAO_THROW (CosPropertyService::UnsupportedProperty); + TAO_THROW (CosPropertyService::UnsupportedProperty()); // Try to bind the property. (*normal* mode is used). CosProperty_Hash_Key hash_key (property_name); @@ -567,12 +567,12 @@ TAO_PropertySet::define_property (const char *property_name, // If type is not the same, raise exception. if (entry_ptr->int_id_.pvalue_->type () != property_value.type ()) - TAO_THROW (CosPropertyService::ConflictingProperty); + TAO_THROW (CosPropertyService::ConflictingProperty()); // If mode is read only, raise exception. if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) || (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly)) - TAO_THROW (CosPropertyService::ReadOnlyProperty); + TAO_THROW (CosPropertyService::ReadOnlyProperty()); // Use the mode that is already there. hash_value.pmode_ = entry_ptr->int_id_.pmode_; @@ -609,21 +609,23 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) for (size_t ti = 0; ti < this->allowed_property_types_.length (); ti++) - TAO_TRY { - ret_val = ((const CORBA::TypeCode *)this->allowed_property_types_[ti])->equal (type, - TAO_TRY_ENV); - TAO_CHECK_ENV; - - if (ret_val == CORBA::B_TRUE) - return CORBA::B_TRUE; - } - TAO_CATCHANY - { - TAO_TRY_ENV.print_exception ("TypeCode::equal"); - return ret_val; + TAO_TRY + { + ret_val = ((const CORBA::TypeCode *)this->allowed_property_types_[ti])->equal (type, + TAO_TRY_ENV); + TAO_CHECK_ENV; + + if (ret_val == CORBA::B_TRUE) + return CORBA::B_TRUE; + } + TAO_CATCHANY + { + TAO_TRY_ENV.print_exception ("TAO_PropertySet::is_type_allowed"); + return ret_val; + } + TAO_ENDTRY; } - TAO_ENDTRY; // Type not found. return ret_val; @@ -834,14 +836,14 @@ TAO_PropertySet::get_property_value (const char *property_name, // Check the name's validity. if (property_name == 0) - TAO_THROW_RETURN (CosPropertyService::InvalidPropertyName, + TAO_THROW_RETURN (CosPropertyService::InvalidPropertyName(), 0); CosProperty_Hash_Key hash_key (property_name); CosProperty_Hash_Value hash_value; if (this->hash_table_.find (hash_key, hash_value) != 0) - TAO_THROW_RETURN (CosPropertyService::PropertyNotFound, + TAO_THROW_RETURN (CosPropertyService::PropertyNotFound(), 0); else ACE_DEBUG ((LM_DEBUG, @@ -1012,7 +1014,7 @@ TAO_PropertySet::delete_property (const char *property_name, // Check the name's validity. if (property_name == 0) - TAO_THROW (CosPropertyService::InvalidPropertyName); + TAO_THROW (CosPropertyService::InvalidPropertyName()); CosProperty_Hash_Key hash_key (property_name); CosProperty_Hash_Entry_ptr entry_ptr = 0; @@ -1020,14 +1022,14 @@ TAO_PropertySet::delete_property (const char *property_name, // Get the entry_ptr and delete it. if (this->hash_table_.find (hash_key, entry_ptr) < 0) - TAO_THROW (CosPropertyService::PropertyNotFound); + TAO_THROW (CosPropertyService::PropertyNotFound()); ACE_DEBUG ((LM_DEBUG, "Property found\n")); // If property is fixed, then raise exception. if ((entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_normal) || (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly)) - TAO_THROW (CosPropertyService::FixedProperty); + TAO_THROW (CosPropertyService::FixedProperty()); // Unbind this property. if (this->hash_table_.unbind (entry_ptr) != 0) @@ -1321,19 +1323,19 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, // Check the names validity. if (property_name == 0) - TAO_THROW (CosPropertyService::InvalidPropertyName); + TAO_THROW (CosPropertyService::InvalidPropertyName()); // Is this type allowed? if (is_type_allowed (property_value.type ()) != CORBA::B_TRUE) - TAO_THROW (CosPropertyService::UnsupportedTypeCode); + TAO_THROW (CosPropertyService::UnsupportedTypeCode()); // Is this property allowed? if (is_property_allowed (property_name) != CORBA::B_TRUE) - TAO_THROW (CosPropertyService::UnsupportedProperty); + TAO_THROW (CosPropertyService::UnsupportedProperty()); // Is this a valid mode. if (property_mode == CosPropertyService::undefined) - TAO_THROW (CosPropertyService::UnsupportedMode); + TAO_THROW (CosPropertyService::UnsupportedMode()); // Try to bind the Property. CosProperty_Hash_Key hash_key (property_name); @@ -1363,19 +1365,19 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, // If type is not the same, raise exception. if (entry_ptr->int_id_.pvalue_->type () != property_value.type ()) - TAO_THROW (CosPropertyService::ConflictingProperty); + TAO_THROW (CosPropertyService::ConflictingProperty()); // If mode is read only, raise exception. if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) || (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly)) - TAO_THROW (CosPropertyService::ReadOnlyProperty); + TAO_THROW (CosPropertyService::ReadOnlyProperty()); // If current mode is fixed_normal, but the new mode is not // fixed, reject it. if ((entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_normal) && (property_mode < CosPropertyService::fixed_normal)) - TAO_THROW (CosPropertyService::UnsupportedMode); + TAO_THROW (CosPropertyService::UnsupportedMode()); // Everything is fine. Overwrite the value. if (this->hash_table_.rebind (hash_key, @@ -1504,7 +1506,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name, // Check for the name's validity. if (property_name == 0) - TAO_THROW_RETURN (CosPropertyService::InvalidPropertyName, + TAO_THROW_RETURN (CosPropertyService::InvalidPropertyName(), CosPropertyService::undefined); // Find the property in the hash table. @@ -1520,7 +1522,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name, return hash_value.pmode_; default: // Error or property is not found. - TAO_THROW_RETURN (CosPropertyService::PropertyNotFound, + TAO_THROW_RETURN (CosPropertyService::PropertyNotFound(), CosPropertyService::undefined); } } @@ -1600,11 +1602,11 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, // Check the names validity. if (property_name == 0) - TAO_THROW (CosPropertyService::InvalidPropertyName); + TAO_THROW (CosPropertyService::InvalidPropertyName()); // Trying to set to undefined mode is not allowed. if (property_mode == CosPropertyService::undefined) - TAO_THROW (CosPropertyService::UnsupportedMode); + TAO_THROW (CosPropertyService::UnsupportedMode()); // Find the property from the Hash Table. CosProperty_Hash_Key hash_key (property_name); @@ -1645,7 +1647,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, case CosPropertyService::read_only: // Read_only to fixed read only alone is possible. if (property_mode != CosPropertyService::fixed_readonly) - TAO_THROW (CosPropertyService::UnsupportedMode); + TAO_THROW (CosPropertyService::UnsupportedMode()); else { // Change the mode and update hash table. @@ -1664,7 +1666,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, case CosPropertyService::fixed_normal: // Fixed_normal to fixed_readonly alone is possible. if (property_mode != CosPropertyService::fixed_readonly) - TAO_THROW (CosPropertyService::UnsupportedMode); + TAO_THROW (CosPropertyService::UnsupportedMode()); else { // Change the mode and update the hash table. @@ -1682,13 +1684,13 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, default: // Fixed_readonly to any mode is not possible. - TAO_THROW (CosPropertyService::UnsupportedMode); + TAO_THROW (CosPropertyService::UnsupportedMode()); } break; case -1: default: // Error or property not found in the Hash Table. - TAO_THROW (CosPropertyService::PropertyNotFound); + TAO_THROW (CosPropertyService::PropertyNotFound()); } } diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 0fde43c2bec..821de41e549 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -101,8 +101,8 @@ void ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle, // any differences. if (handle < 0 || handle > entry_count_) { - TAO_THROW (RtecScheduler::UNKNOWN_TASK); - ACE_NOTREACHED (return); + TAO_THROW (RtecScheduler::UNKNOWN_TASK()); + // NOTREACHED } if (rt_info_[handle].worst_case_execution_time != time || rt_info_[handle].typical_execution_time != typical_time @@ -133,7 +133,7 @@ void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle, if (handle < 0 || handle > entry_count_) { TAO_THROW (RtecScheduler::UNKNOWN_TASK()); - ACE_NOTREACHED (return); + // NOTREACHED } priority = rt_info_[handle].priority; subpriority = rt_info_[handle].static_subpriority; @@ -170,8 +170,8 @@ void ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle, { if (handle < 0 || handle > entry_count_) { - TAO_THROW (RtecScheduler::UNKNOWN_TASK); - ACE_NOTREACHED (return); + TAO_THROW (RtecScheduler::UNKNOWN_TASK()); + // NOTREACHED } #if 0 // Just check that the information is consistent. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 76cafa96275..efc30da4b51 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -251,7 +251,7 @@ TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &_env) TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { - TAO_THROW_RETURN (CosTrading::UnknownMaxLeft, 0); + TAO_THROW_RETURN (CosTrading::UnknownMaxLeft(), 0); } // ************************************************************* |