diff options
Diffstat (limited to 'TAO')
454 files changed, 943 insertions, 2941 deletions
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index dc0082c11ef..5a76e8d875d 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -387,21 +387,18 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) RtecEventChannelAdmin::ConsumerAdmin_ptr Event_Service::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->ec_impl_->for_consumers (); } RtecEventChannelAdmin::SupplierAdmin_ptr Event_Service::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->ec_impl_->for_suppliers (); } void Event_Service::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->ec_impl_->destroy (); this->orb_->shutdown (); @@ -409,20 +406,12 @@ Event_Service::destroy (void) RtecEventChannelAdmin::Observer_Handle Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { return this->ec_impl_->append_observer (observer); } void Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { this->ec_impl_->remove_observer (handle); } diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h index 84c3f46542f..62af2b9691f 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.h +++ b/TAO/orbsvcs/Event_Service/Event_Service.h @@ -41,24 +41,13 @@ public: // = The RtecEventChannelAdmin::Event_Channel methods virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); + virtual void destroy (void); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); - virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr observer); + virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle); private: /// Parse the command line args diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index 0d064530b33..6bb082d39e9 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -25,14 +25,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::NoFactory - , PortableGroup::ObjectNotCreated - , PortableGroup::InvalidCriteria - , PortableGroup::InvalidProperty - , PortableGroup::CannotMeetCriteria - )) { ACE_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n")); @@ -68,10 +60,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( void EventChannelFactory_i::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectNotFound - )) { ACE_TRACE("EventChannelFactory_i::delete_object"); CORBA::ULong object_id; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h index c4f2da131fe..86efcffab16 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h @@ -29,23 +29,11 @@ public: const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::NoFactory - , PortableGroup::ObjectNotCreated - , PortableGroup::InvalidCriteria - , PortableGroup::InvalidProperty - , PortableGroup::CannotMeetCriteria - )) ; + ); virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectNotFound - )); + ); private: CORBA::Object_ptr create_process ( diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index c824b411c5e..b9aec6de436 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -215,7 +215,6 @@ size_t TAO::FT_FaultConsumer::notifications () const void TAO::FT_FaultConsumer::push_structured_event ( const CosNotification::StructuredEvent &event ) - ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { // Debugging support. this->notifications_ += 1; @@ -266,7 +265,6 @@ void TAO::FT_FaultConsumer::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -277,7 +275,6 @@ void TAO::FT_FaultConsumer::offer_change ( void TAO::FT_FaultConsumer::disconnect_structured_push_consumer ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { //TODO: For now, we are just ignoring the disconnect callback. ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 04f8c3303e1..5731824342f 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -105,18 +105,15 @@ namespace TAO // CORBA methods virtual void push_structured_event ( const CosNotification::StructuredEvent ¬ification - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)); + ); virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); //@} diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp index 33d947d344e..1d3f14c6732 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp @@ -46,9 +46,6 @@ TAO::FT_Property_Validator::~FT_Property_Validator (void) void TAO::FT_Property_Validator::validate_property ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { const CORBA::ULong len = props.length (); @@ -135,9 +132,6 @@ TAO::FT_Property_Validator::validate_property ( void TAO::FT_Property_Validator::validate_criteria ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { const CORBA::ULong len = props.length (); PortableGroup::Criteria invalid_criteria; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h index 77d0d76b6a0..6c1f52f946a 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h @@ -48,19 +48,13 @@ namespace TAO /// first invalid property is encountered. The remaining properties /// will not be validated. virtual - void validate_property (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + void validate_property (const PortableGroup::Properties & props); /// Validate the given properties/criteria. All criteria /// will be validated regardless of whether or not an invalid /// property was encountered. virtual - void validate_criteria (const PortableGroup::Properties & criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + void validate_criteria (const PortableGroup::Properties & criteria); private: diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 3446bccf877..19d3dd06682 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -355,7 +355,6 @@ int TAO::FT_ReplicationManager::fini (void) void TAO::FT_ReplicationManager::register_fault_notifier ( FT::FaultNotifier_ptr fault_notifier) - ACE_THROW_SPEC ( (CORBA::SystemException)) { this->register_fault_notifier_i (fault_notifier); } @@ -364,7 +363,6 @@ TAO::FT_ReplicationManager::register_fault_notifier ( void TAO::FT_ReplicationManager::register_fault_notifier_i ( FT::FaultNotifier_ptr fault_notifier) - ACE_THROW_SPEC ( (CORBA::SystemException)) { if (CORBA::is_nil (fault_notifier)) { @@ -446,7 +444,6 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( //CORBA FT::FaultNotifier_ptr TAO::FT_ReplicationManager::get_fault_notifier () - ACE_THROW_SPEC ( (CORBA::SystemException, FT::InterfaceNotFound)) { if (CORBA::is_nil (this->fault_notifier_.in ())) { @@ -461,7 +458,6 @@ TAO::FT_ReplicationManager::get_fault_notifier () ::PortableGroup::FactoryRegistry_ptr TAO::FT_ReplicationManager::get_factory_registry ( const PortableGroup::Criteria & selection_criteria) - ACE_THROW_SPEC ( (CORBA::SystemException)) { ACE_UNUSED_ARG (selection_criteria); return this->factory_registry_.reference (); @@ -470,7 +466,6 @@ TAO::FT_ReplicationManager::get_factory_registry ( // TAO-specific shutdown operation. //public void TAO::FT_ReplicationManager::shutdown () - ACE_THROW_SPEC ( (CORBA::SystemException)) { this->quit_ = 1; } @@ -500,9 +495,6 @@ char * TAO::FT_ReplicationManager::type_id ( void TAO::FT_ReplicationManager::set_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->properties_support_.set_default_properties (props); @@ -512,7 +504,6 @@ TAO::FT_ReplicationManager::set_default_properties ( //CORBA PortableGroup::Properties * TAO::FT_ReplicationManager::get_default_properties () - ACE_THROW_SPEC ( (CORBA::SystemException)) { return this->properties_support_.get_default_properties (); } @@ -521,9 +512,6 @@ TAO::FT_ReplicationManager::get_default_properties () void TAO::FT_ReplicationManager::remove_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->properties_support_.remove_default_properties (props); } @@ -533,9 +521,6 @@ void TAO::FT_ReplicationManager::set_type_properties ( const char *type_id, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->properties_support_.set_type_properties ( type_id, @@ -546,7 +531,6 @@ TAO::FT_ReplicationManager::set_type_properties ( PortableGroup::Properties * TAO::FT_ReplicationManager::get_type_properties ( const char *type_id) - ACE_THROW_SPEC ( (CORBA::SystemException)) { return this->properties_support_.get_type_properties (type_id); } @@ -556,9 +540,6 @@ void TAO::FT_ReplicationManager::remove_type_properties ( const char *type_id, const PortableGroup::Properties & props) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->properties_support_.remove_type_properties ( type_id, @@ -570,10 +551,6 @@ void TAO::FT_ReplicationManager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { TAO::PG_Object_Group * group = 0; @@ -591,8 +568,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically ( PortableGroup::Properties * TAO::FT_ReplicationManager::get_properties ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { PortableGroup::Properties_var result; ACE_NEW_THROW_EX (result, PortableGroup::Properties(), CORBA::NO_MEMORY ()); @@ -619,13 +594,6 @@ PortableGroup::ObjectGroup_ptr TAO::FT_ReplicationManager::set_primary_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( ( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - , PortableGroup::MemberNotFound - , FT::PrimaryNotSet - , FT::BadReplicationStyle - )) { METHOD_ENTRY (TAO::FT_ReplicationManager::set_primary_member); PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil(); @@ -660,13 +628,6 @@ TAO::FT_ReplicationManager::create_member ( const PortableGroup::Location & the_location, const char * type_id, const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil(); TAO::PG_Object_Group * group = 0; @@ -695,10 +656,6 @@ TAO::FT_ReplicationManager::add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, CORBA::Object_ptr member) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)) { METHOD_ENTRY (TAO::FT_ReplicationManager::add_member); PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil (); @@ -732,9 +689,6 @@ PortableGroup::ObjectGroup_ptr TAO::FT_ReplicationManager::remove_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil (); @@ -762,8 +716,6 @@ TAO::FT_ReplicationManager::remove_member ( PortableGroup::Locations * TAO::FT_ReplicationManager::locations_of_members ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { PortableGroup::Locations * result = 0; @@ -790,7 +742,6 @@ TAO::FT_ReplicationManager::locations_of_members ( PortableGroup::ObjectGroups * TAO::FT_ReplicationManager::groups_at_location ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException)) { return this->group_factory_.groups_at_location (the_location); } @@ -799,8 +750,6 @@ TAO::FT_ReplicationManager::groups_at_location ( PortableGroup::ObjectGroupId TAO::FT_ReplicationManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { PortableGroup::ObjectGroupId result = 0; TAO::PG_Object_Group * group = 0; @@ -826,8 +775,6 @@ TAO::FT_ReplicationManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr TAO::FT_ReplicationManager::get_object_group_ref ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil (); @@ -854,10 +801,6 @@ TAO::FT_ReplicationManager::get_object_group_ref ( PortableGroup::ObjectGroup_ptr TAO::FT_ReplicationManager::get_object_group_ref_from_id ( PortableGroup::ObjectGroupId group_id) - ACE_THROW_SPEC ( ( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - )) { PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil (); @@ -885,9 +828,6 @@ CORBA::Object_ptr TAO::FT_ReplicationManager::get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { CORBA::Object_var result = CORBA::Object::_nil(); @@ -920,12 +860,6 @@ TAO::FT_ReplicationManager::create_object ( const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)) { METHOD_ENTRY (TAO::FT_ReplicationManager::create_object) @@ -968,8 +902,6 @@ TAO::FT_ReplicationManager::create_object ( void TAO::FT_ReplicationManager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectNotFound)) { PortableGroup::ObjectGroupId group_id = 0; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index 753b8f9340c..c8f1b65c95e 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -157,33 +157,20 @@ namespace TAO /// Registers the Fault Notifier with the Replication Manager. virtual void register_fault_notifier ( FT::FaultNotifier_ptr fault_notifier - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); /// Returns the reference of the Fault Notifier. virtual FT::FaultNotifier_ptr get_fault_notifier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FT::InterfaceNotFound - )); + ); /// TAO-specific find factory registry virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry ( const PortableGroup::Criteria & selection_criteria - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); /// TAO-specific shutdown operation. virtual void shutdown ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); //@} @@ -196,21 +183,14 @@ namespace TAO /// Set the default properties to be used by all object groups. virtual void set_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /// Get the default properties used by all object groups. - virtual PortableGroup::Properties * get_default_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableGroup::Properties * get_default_properties (); /// Remove default properties. virtual void remove_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /** * Set properties associated with a given Replica type. These @@ -218,10 +198,7 @@ namespace TAO */ virtual void set_type_properties ( const char * type_id, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties associated with a given Replica type. These @@ -229,16 +206,12 @@ namespace TAO * addition to the default properties that were not overridden. */ virtual PortableGroup::Properties * get_type_properties ( - const char * type_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * type_id); /// Remove the given properties associated with the Replica type ID. virtual void remove_type_properties ( const char * type_id, - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /** * Dynamically set the properties associated with a given object @@ -248,11 +221,7 @@ namespace TAO */ virtual void set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties currently in use by the given object @@ -262,9 +231,7 @@ namespace TAO * that weren't overridden. */ virtual PortableGroup::Properties * get_properties ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); //@} @@ -281,24 +248,13 @@ namespace TAO PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, const char * type_id, - const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + const PortableGroup::Criteria & the_criteria); /// Add an existing object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, - CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)); + CORBA::Object_ptr member); /** * Remove the member at a specific location from an @@ -313,27 +269,19 @@ namespace TAO */ virtual PortableGroup::ObjectGroup_ptr remove_member ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::Locations * locations_of_members ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::ObjectGroups * groups_at_location ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Location & the_location); /// Return the ObjectGroupId for the given ObjectGroup. virtual PortableGroup::ObjectGroupId get_object_group_id ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /** * Return an update the IOGR for an object group. If no changes have @@ -341,9 +289,7 @@ namespace TAO * parameter. */ virtual PortableGroup::ObjectGroup_ptr get_object_group_ref ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /** * TAO-specific extension. @@ -351,11 +297,7 @@ namespace TAO */ virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id ( PortableGroup::ObjectGroupId group_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - )); + ); /** * Return the reference corresponding to the Replica of a given @@ -363,23 +305,13 @@ namespace TAO */ virtual CORBA::Object_ptr get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & loc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & loc); /// Sets the primary member of a group. virtual PortableGroup::ObjectGroup_ptr set_primary_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - , PortableGroup::MemberNotFound - , FT::PrimaryNotSet - , FT::BadReplicationStyle - )); + ); //@} @@ -404,13 +336,7 @@ namespace TAO const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)); + factory_creation_id); /** * Delete the object group corresponding to the provided @@ -420,9 +346,7 @@ namespace TAO */ virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + factory_creation_id); //@} @@ -437,10 +361,7 @@ namespace TAO /// Registers the Fault Notifier with the Replication Manager. void register_fault_notifier_i ( FT::FaultNotifier_ptr fault_notifier - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); //////////////// // Forbidden methods diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 4eaa9a6bf19..1ca418ff98c 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -433,10 +433,6 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault void TAO::FT_FaultDetectorFactory_i::change_properties ( const PortableGroup::Properties & property_set ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::InvalidProperty - )) { METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::change_properties); @@ -471,9 +467,6 @@ void TAO::FT_FaultDetectorFactory_i::change_properties ( } void TAO::FT_FaultDetectorFactory_i::shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::shutdown); InternalGuard guard (this->internals_); @@ -487,14 +480,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::NoFactory - , PortableGroup::ObjectNotCreated - , PortableGroup::InvalidCriteria - , PortableGroup::InvalidProperty - , PortableGroup::CannotMeetCriteria - )) { METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::create_object); @@ -647,10 +632,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( void TAO::FT_FaultDetectorFactory_i::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectNotFound - )) { METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::delete_object); @@ -677,7 +658,6 @@ void TAO::FT_FaultDetectorFactory_i::delete_object ( } CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive) 1; diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index f6e9fa59a07..289fc1ae775 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -156,16 +156,9 @@ namespace TAO // CORBA interface FaultDetectorFactory methods virtual void change_properties ( const PortableGroup::Properties & property_set - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::InvalidProperty - )); + ); - virtual void shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void shutdown (void); ///////////////////////////////////////// // CORBA interface GenericFactory methods @@ -173,29 +166,16 @@ namespace TAO const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::NoFactory - , PortableGroup::ObjectNotCreated - , PortableGroup::InvalidCriteria - , PortableGroup::InvalidProperty - , PortableGroup::CannotMeetCriteria - )); + ); virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectNotFound - )); + ); ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); ///////////////////////// // Implementation methods diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index 2af2e7a10ef..d113228eb47 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -465,7 +465,6 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) void TAO::FT_FaultNotifier_i::push_structured_fault ( const CosNotification::StructuredEvent & event ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_structured_fault); @@ -477,7 +476,6 @@ void TAO::FT_FaultNotifier_i::push_structured_fault ( void TAO::FT_FaultNotifier_i::push_sequence_fault ( const CosNotification::EventBatch & events ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_sequence_fault); @@ -489,7 +487,6 @@ void TAO::FT_FaultNotifier_i::push_sequence_fault ( ::CosNotifyFilter::Filter_ptr TAO::FT_FaultNotifier_i::create_subscription_filter ( const char * constraint_grammar ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar)) { METHOD_ENTRY(TAO::FT_FaultNotifier_i::create_subscription_filter); ACE_UNUSED_ARG (constraint_grammar); //@@todo @@ -503,7 +500,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_ CosNotifyComm::StructuredPushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::FT_FaultNotifier_i::connect_structured_fault_consumer); @@ -567,7 +563,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co CosNotifyComm::SequencePushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::FT_FaultNotifier_i::connect_sequence_fault_consumer); ///////////////////////// @@ -627,7 +622,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co void TAO::FT_FaultNotifier_i::disconnect_consumer ( FT::FaultNotifier::ConsumerId connection ) - ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { METHOD_ENTRY(TAO::FT_FaultNotifier_i::disconnect_consumer); @@ -692,7 +686,6 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer ( } CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_RETURN(TAO::FT_FaultNotifier_i::is_alive) 1; } diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index f182cb50000..cfffe13aec6 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -94,40 +94,33 @@ namespace TAO virtual void push_structured_fault ( const CosNotification::StructuredEvent & event - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void push_sequence_fault ( const CosNotification::EventBatch & events - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter ( const char * constraint_grammar - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar)); + ); virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void disconnect_consumer ( FT::FaultNotifier::ConsumerId connection - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)); + ); ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); ///////////////////////////////////////// diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp index de47e349eb3..a9c866e799e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp @@ -78,7 +78,6 @@ CORBA::Object_ptr ImR_Activator_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR **) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h index c41f2c947b3..d290fadd236 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h @@ -29,8 +29,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); // Unlike other service objects, we have our own orb. int run(void); diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp index 021fecad545..f893b947636 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp @@ -27,7 +27,6 @@ ImR_Adapter::init (PortableServer::ServantLocator_ptr servant) CORBA::Boolean ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (! CORBA::is_nil(parent)); ACE_ASSERT (name != 0); diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h index eda7d41a054..e1396f9c7d4 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h @@ -46,8 +46,7 @@ public: virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char *name - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void init(PortableServer::ServantLocator_ptr servant); private: diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h index 33c824f5165..59ee659344d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h @@ -48,8 +48,7 @@ public: void wait_for_startup ( ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr rh, - const char* name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char* name); void unblock_one(const char* name, const char* partial_ior, const char* ior, bool queue); void unblock_all(const char* name); diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index cf596ceff99..b33ffa9ad94 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -65,7 +65,6 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr poa, const char *, PortableServer::ServantLocator::Cookie &) - ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { ACE_ASSERT (! CORBA::is_nil(poa)); CORBA::Object_var forward_obj; diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp index afa06a09a1f..6820bc9285f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp @@ -21,7 +21,6 @@ INS_Locator::INS_Locator (ImR_Locator_i& loc) char * INS_Locator::locate (const char* object_key) -ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_ASSERT (object_key != 0); try diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h index 82a69c31a7b..c80a9d6d7b5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h @@ -42,8 +42,7 @@ public: INS_Locator (ImR_Locator_i& loc); /// Locate the appropriate IOR. - char* locate (const char *object_key) - ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)); + char* locate (const char *object_key); private: ImR_Locator_i& imr_locator_; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index db232316c29..eb690a35fe2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -256,7 +256,6 @@ ImR_Activator_i::run (void) void ImR_Activator_i::shutdown (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { shutdown (false); } @@ -272,7 +271,6 @@ ImR_Activator_i::start_server(const char* name, const char* cmdline, const char* dir, const ImplementationRepository::EnvironmentList & env) - ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate)) { if (debug_ > 1) ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting server <%s>...\n", name)); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index ad84089c25e..3bb71eb164b 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -67,11 +67,9 @@ public: const char* name, const char* cmdline, const char* dir, - const ImplementationRepository::EnvironmentList & env) - ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate)); + const ImplementationRepository::EnvironmentList & env); - void shutdown(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown(void); /// Initialize the Server state - parsing arguments and waiting. int init (Activator_Options& opts); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index d2e1a00db29..cd6e60bec5e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -217,7 +217,6 @@ ImR_Locator_i::run (void) void ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (servers != 0 && this->repository_.servers ().current_size () > 0) { @@ -368,7 +367,6 @@ ImR_Locator_i::setup_multicast (ACE_Reactor* reactor, const char* ior) CORBA::Long ImR_Locator_i::register_activator (const char* aname, ImplementationRepository::Activator_ptr activator) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (aname != 0); ACE_ASSERT (! CORBA::is_nil (activator)); @@ -395,7 +393,6 @@ ImR_Locator_i::register_activator (const char* aname, void ImR_Locator_i::unregister_activator (const char* aname, CORBA::Long token) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (aname != 0); Activator_Info_Ptr info = this->get_activator (aname); @@ -430,7 +427,6 @@ ImR_Locator_i::unregister_activator_i (const char* aname) void ImR_Locator_i::notify_child_death (const char* name) -ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (name != 0); @@ -457,9 +453,6 @@ ACE_THROW_SPEC ((CORBA::SystemException)) void ImR_Locator_i::activate_server (const char* server) -ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)) { if (debug_ > 1) ACE_DEBUG ((LM_DEBUG, "ImR: Manually activating server <%s>\n", server)); @@ -471,9 +464,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, char* ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start) -ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)) { // Activate the server, starting it if necessary. Don't start MANUAL // servers unless manual_start=true @@ -491,9 +481,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, char* ImR_Locator_i::activate_server_by_object (const char* object_name) -ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)) { ACE_ASSERT (object_name != 0); @@ -509,9 +496,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, char* ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start) -ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)) { if (info.activation_mode == ImplementationRepository::PER_CLIENT) { @@ -559,9 +543,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, char* ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start) -ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)) { Server_Info_Ptr shared_info = this->repository_.get_server (info.name); do @@ -602,9 +583,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::StartupInfo* ImR_Locator_i::start_server (Server_Info& info, bool manual_start, int& waiting_clients) -ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)) { if (info.activation_mode == ImplementationRepository::MANUAL && ! manual_start) { @@ -760,8 +738,6 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& void ImR_Locator_i::add_or_update_server (const char* server, const ImplementationRepository::StartupOptions &options) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound)) { ACE_ASSERT (server != 0); @@ -846,7 +822,6 @@ ImR_Locator_i::add_or_update_server (const char* server, void ImR_Locator_i::remove_server (const char* name) -ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)) { ACE_ASSERT (name != 0); if (this->read_only_) @@ -907,7 +882,6 @@ ImR_Locator_i::findPOA (const char* name) void ImR_Locator_i::shutdown_server (const char* server) -ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)) { ACE_ASSERT (server != 0); @@ -973,8 +947,6 @@ void ImR_Locator_i::server_is_running (const char* name, const char* partial_ior, ImplementationRepository::ServerObject_ptr server) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound)) { ACE_ASSERT (name != 0); ACE_ASSERT (partial_ior != 0); @@ -1038,7 +1010,6 @@ ImR_Locator_i::server_is_running (const char* name, void ImR_Locator_i::server_is_shutting_down (const char* server) -ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)) { ACE_ASSERT (server != 0); Server_Info_Ptr info = this->repository_.get_server (server); @@ -1065,7 +1036,6 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)) void ImR_Locator_i::find (const char* server, ImplementationRepository::ServerInformation_out imr_info) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (server != 0); ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ()); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h index ac1a543ba22..03ca0f0e594 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h @@ -62,75 +62,46 @@ public: // Activator->Locator virtual CORBA::Long register_activator (const char* name, - ImplementationRepository::Activator_ptr admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + ImplementationRepository::Activator_ptr admin); virtual void unregister_activator (const char* name, - CORBA::Long token) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void notify_child_death (const char* name) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long token); + virtual void notify_child_death (const char* name); // tao_imr->Locator - virtual void activate_server (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)); + virtual void activate_server (const char * name); virtual void add_or_update_server (const char * name, - const ImplementationRepository::StartupOptions &options) - ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)); - virtual void remove_server (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)); - virtual void shutdown_server (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)); + const ImplementationRepository::StartupOptions &options); + virtual void remove_server (const char * name); + virtual void shutdown_server (const char * name); virtual void find (const char * name, - ImplementationRepository::ServerInformation_out info) - ACE_THROW_SPEC ((CORBA::SystemException)); + ImplementationRepository::ServerInformation_out info); virtual void list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers) - ACE_THROW_SPEC ((CORBA::SystemException)); + ImplementationRepository::ServerInformationIterator_out server_iterator); + virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers); // Server->Locator virtual void server_is_running (const char* name, const char* partial_ior, - ImplementationRepository::ServerObject_ptr server_object) - ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)); - virtual void server_is_shutting_down (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound)); + ImplementationRepository::ServerObject_ptr server_object); + virtual void server_is_shutting_down (const char * name); // Used by the INS_Locator to start a sever given an object name - char* activate_server_by_object (const char* object_name) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)); + char* activate_server_by_object (const char* object_name); - char* activate_server_by_name (const char * name, bool manual_start) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)); + char* activate_server_by_name (const char * name, bool manual_start); private: - char* activate_server_i (Server_Info& info, bool manual_start) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)); + char* activate_server_i (Server_Info& info, bool manual_start); - char* activate_perclient_server_i (Server_Info info, bool manual_start) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)); + char* activate_perclient_server_i (Server_Info info, bool manual_start); ImplementationRepository::StartupInfo* - start_server(Server_Info& info, bool manual_start, int& waiting_clients) - ACE_THROW_SPEC ((CORBA::SystemException, - ImplementationRepository::NotFound, - ImplementationRepository::CannotActivate)); + start_server(Server_Info& info, bool manual_start, int& waiting_clients); bool is_alive(Server_Info& info); int is_alive_i(Server_Info& info); diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp index b30cb4ab1f3..7e4182e08dc 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp @@ -23,7 +23,6 @@ ImR_Iterator::ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableSe CORBA::Boolean ImR_Iterator::next_n (CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (server_list, ImplementationRepository::ServerInformationList(0), CORBA::NO_MEMORY()); @@ -81,7 +80,6 @@ ImR_Iterator::next_n (CORBA::ULong how_many, void ImR_Iterator::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = poa_->servant_to_id (this); poa_->deactivate_object (oid.in()); diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index eced1e66db8..1dab91eec44 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -39,11 +39,9 @@ public: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); private: Locator_Repository& repo_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp index da0fc913da9..55c0d283a25 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp @@ -72,7 +72,6 @@ CORBA::Object_ptr ImR_Locator_Loader::create_object (CORBA::ORB_ptr, int, ACE_TCHAR**) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT(); } diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h index 06f7ed93b4b..0489ab6d38e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h @@ -28,8 +28,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); // Unlike other service objects, we have our own orb. int run(void); diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp index a1ddcf0b3d9..d2b9e1309a1 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp @@ -20,7 +20,6 @@ Locator_XMLHandler::startElement (const ACEXML_Char*, const ACEXML_Char*, const ACEXML_Char* qName, ACEXML_Attributes* attrs ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_ASSERT (qName != 0); if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0) @@ -70,7 +69,6 @@ void Locator_XMLHandler::endElement (const ACEXML_Char*, const ACEXML_Char*, const ACEXML_Char* qName ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_ASSERT(qName != 0); if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0 diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h index ff8691d0a78..e8745f48799 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h @@ -61,13 +61,11 @@ public: virtual void startElement (const ACEXML_Char* namespaceURI, const ACEXML_Char* localName, const ACEXML_Char* qName, - ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL); virtual void endElement (const ACEXML_Char* namespaceURI, const ACEXML_Char* localName, - const ACEXML_Char* qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)); + const ACEXML_Char* qName ACEXML_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp index 4fe8a698fa7..198090406b5 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp @@ -38,7 +38,6 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void) CORBA::Boolean Life_Cycle_Service_i::supports (const CosLifeCycle::Key &) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -46,10 +45,6 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &) CORBA::Object_ptr Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: called.\n")); @@ -144,7 +139,6 @@ Life_Cycle_Service_i::register_factory (const char * name, const char * location, const char * description, CORBA::Object_ptr object) - ACE_THROW_SPEC (( CORBA::SystemException)) { if (factory_trader_ptr_ == 0) ACE_NEW (factory_trader_ptr_, Factory_Trader(this->debug_level_)); diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index 327ae2c4b20..2d0aa105925 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -29,17 +29,12 @@ public: Life_Cycle_Service_i (int debug_level = 1); ~Life_Cycle_Service_i (void); - CORBA::Boolean supports (const CosLifeCycle::Key &factory_key) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean supports (const CosLifeCycle::Key &factory_key); // Returns true if the Generic Factory is able to forward a request // for creating an object described by the <factory_key>. CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, - const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)); + const CosLifeCycle::Criteria &the_criteria); // Returns an object reference to a newly created object, though the // Generic Factory itself cannot create objects, it will forward the // request to a more concrete Factory. @@ -47,8 +42,7 @@ public: void register_factory (const char * name, const char * location, const char * description, - CORBA::Object_ptr object) - ACE_THROW_SPEC (( CORBA::SystemException)); + CORBA::Object_ptr object); // Registers a factory with specified properties diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp index f070e65ec31..f503e2f22e8 100644 --- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp +++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp @@ -60,7 +60,6 @@ TAO_PSDL_Code_Gen::set_codec (void) int TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name, const char *string_obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Invoke the helper encode method which will // convert the stringified object reference to a CORBA::OctetSeq. @@ -93,7 +92,6 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name, const char * TAO_PSDL_Code_Gen::get_obj_ref (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get from the hash_map saved in the database, the corresponding entry // (CORBA::OctetSeq *) for the name. Then, decode the octetseq to @@ -124,7 +122,6 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name) CORBA::OctetSeq * TAO_PSDL_Code_Gen::encode (const char *string_obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any data; data <<= string_obj_ref; @@ -140,7 +137,6 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref) const char * TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data) - ACE_THROW_SPEC ((CORBA::SystemException)) { const char *extracted_value; diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h index 7ec81dfdc5e..ac461c40611 100644 --- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h +++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h @@ -50,25 +50,21 @@ class TAO_PSDL_Export TAO_PSDL_Code_Gen /// Method to save the name-stringified object reference pair /// to the database. Returns -1 on failure. int set_name_obj_ref (const char *name, - const char *string_obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *string_obj_ref); /// Get the stringified form of the object reference given the name /// of the object. - const char *get_obj_ref (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *get_obj_ref (const char *name); private: /// Helper method which serializes the data and saves it to the /// database. - CORBA::OctetSeq *encode (const char *string_obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::OctetSeq *encode (const char *string_obj_ref); /// Helper method to get the octet sequence - const char *decode (const CORBA::OctetSeq &data) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *decode (const CORBA::OctetSeq &data); /// File where the persistent data is stored. const char *file_name_; diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index bbf168f2d44..6bcd6c8d280 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -71,11 +71,6 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa, CosEventChannelAdmin::EventChannel_ptr TAO_CosEventChannelFactory_i::create (const char * channel_id, CORBA::Boolean store_in_naming_service) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::DuplicateChannel, - CosEventChannelFactory::BindFailed - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); @@ -164,10 +159,6 @@ TAO_CosEventChannelFactory_i::destroy const char * channel_id, CORBA::Boolean unbind_from_naming_service ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); @@ -219,10 +210,6 @@ TAO_CosEventChannelFactory_i::find ( const char * channel_id ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); @@ -251,10 +238,6 @@ TAO_CosEventChannelFactory_i::find_channel_id ( CosEventChannelAdmin::EventChannel_ptr channel ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )) { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h index 0afbde49bd2..13ebcb5b406 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h @@ -66,40 +66,23 @@ class TAO_CosEventChannelFactory_i : ( const char * channel_id, CORBA::Boolean store_in_naming_service - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::DuplicateChannel, - CosEventChannelFactory::BindFailed - )); + ); virtual void destroy ( const char * channel_id, CORBA::Boolean unbind_from_naming_service - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )); + ); virtual CosEventChannelAdmin::EventChannel_ptr find ( const char * channel_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )); + ); virtual char * find_channel_id ( CosEventChannelAdmin::EventChannel_ptr channel - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventChannelFactory::NoSuchChannel - )); + ); protected: PortableServer::POA_var poa_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp index 8f682906fc3..eb7a53782f0 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp @@ -27,7 +27,6 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil = CosEventChannelAdmin::ProxyPushSupplier::_nil (); @@ -57,7 +56,6 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void) CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. return CosEventChannelAdmin::ProxyPullSupplier::_nil (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index e9895d9c3ab..83689e0dbb0 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -47,13 +47,11 @@ public: RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin); virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier(void); // Returns a new ProxyPushSupplier_ptr. virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_supplier(void); // Returns a new ProxyPullSupplier_ptr. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index f3df43e46d5..98f8fb7d23c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -210,21 +210,18 @@ CosEC_ServantBase::deactivate_cosec (void) CosEventChannelAdmin::ConsumerAdmin_ptr CosEC_ServantBase::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->cosec_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr CosEC_ServantBase::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->cosec_->for_suppliers (); } void CosEC_ServantBase::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate all the contained servants and ourselves. // The poa will "destroy" the ref counted servants. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index 26eaf55e438..293b71c8320 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -67,14 +67,11 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : // Deactivates the CosEC and friends with the POA. // = POA_CosEventChannelAdmin::EventChannel methods. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroys this Event Channel object. protected: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp index 6559d30c427..75fd15400db 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp @@ -70,7 +70,6 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum CosEventChannelAdmin::ConsumerAdmin_ptr TAO_CosEC_EventChannel_i::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Pradeep: you must make a copy here, because the caller is // responsible of removing this object. @@ -80,7 +79,6 @@ TAO_CosEC_EventChannel_i::for_consumers (void) CosEventChannelAdmin::SupplierAdmin_ptr TAO_CosEC_EventChannel_i::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Pradeep: you must make a copy here, because the caller is // responsible of removing this object, same here.. @@ -90,7 +88,6 @@ TAO_CosEC_EventChannel_i::for_suppliers (void) void TAO_CosEC_EventChannel_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate the CosEventChannel PortableServer::POA_var poa = diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index 82e16cc01fd..cc30861b4f8 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -54,18 +54,15 @@ public: // Activates the ConsumerAdmin and SupplierAdmin servants. Returns // -1 on error, 0 on success. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); // The for_consumers method will return the same ConsumerAdmin_ptr // everytime its called. - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); // The for_suppliers method will return the same SupplierAdmin_ptr // everytime its called. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroys this Event Channel object. void shutdown (void); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index 626c6226fed..2301272e0b6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -31,8 +31,7 @@ public: ~TAO_CosEC_PushSupplierWrapper (void); // Destructor. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // Disconnects the push supplier. private: @@ -64,7 +63,6 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void) void TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->supplier_->disconnect_push_supplier (); @@ -97,7 +95,6 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void) void TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data) - ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::Event buffer[1]; // Create an event set that does not own the buffer.... @@ -134,7 +131,6 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data) void TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->proxypushconsumer_->disconnect_push_consumer (); @@ -150,8 +146,6 @@ TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void) void TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { if (this->connected ()) throw CosEventChannelAdmin::AlreadyConnected (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index 3d56f52ed16..b4c6bf6bc59 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -53,17 +53,13 @@ public: ~TAO_CosEC_ProxyPushConsumer_i (void); // Destructor. - virtual void push (const CORBA::Any &data) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const CORBA::Any &data); // Suppliers call this method to pass data to connected consumers. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); // Disconnects the supplier from the event communication. - virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); + virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier); // Connects a push supplier. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 5e64a573392..958e10373ad 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -30,12 +30,10 @@ public: ~TAO_CosEC_PushConsumerWrapper (void); // Destructor. - virtual void push (const RtecEventComm::EventSet & data) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet & data); // This method is called by the RTEvent Channel to supply data. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); // Disconnects the consumer from the event channel. private: @@ -61,7 +59,6 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper () void TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set) - ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < set.length (); @@ -80,7 +77,6 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set) void TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate the supplier proxy. this->consumer_->disconnect_push_consumer (); @@ -114,7 +110,6 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void) void TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->pps_->disconnect_push_supplier (); @@ -133,9 +128,6 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void) void TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)) { if (this->connected ()) throw CosEventChannelAdmin::AlreadyConnected (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index bb26a3ef8fa..875feca65d5 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -46,14 +46,10 @@ public: ~TAO_CosEC_ProxyPushSupplier_i (void); // Destructor. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // Ends the event communication and disposes this object. - virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)); + virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer); // Connects the <push_consumer> to the Event Channel. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp index 09fd6da3817..66800d52839 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp @@ -27,7 +27,6 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl CosEventChannelAdmin::ProxyPushConsumer_ptr TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil = CosEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -56,7 +55,6 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void) CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: implement this. return CosEventChannelAdmin::ProxyPullConsumer::_nil (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index 7a7c39daf94..bab4970dbbc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -49,13 +49,11 @@ public: // error. virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); // Returns a new ProxyPushConsumer_ptr. virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_consumer(void); // Returns a new ProxyPullConsumer_ptr. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp index b2385f752dc..7a9073af784 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp @@ -53,10 +53,6 @@ Consumer::disconnect (void) void Consumer::push (const CORBA::Any &) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { ACE_DEBUG ((LM_DEBUG, "in Consumer::push\n")); @@ -66,9 +62,6 @@ Consumer::push (const CORBA::Any &) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Deactivate this object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index d1d61414dbb..7466073ed0f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -46,17 +46,10 @@ public: // Disconnect from the supplier, but do not forget about it or close // it. - virtual void push (const CORBA::Any &data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + virtual void push (const CORBA::Any &data); // push the event to the consumer. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_push_consumer (void); // disconnect the consumer from the EC. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp index 886bf57af84..4495a9bdd82 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp @@ -55,9 +55,6 @@ Supplier::send_event (const CORBA::Any & data) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Deactivate this object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h index 1d2d6a0117a..ac7f7e77f35 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h @@ -45,10 +45,7 @@ public: void send_event (const CORBA::Any &data); // Send one event. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_push_supplier (void); // The POA_CosEventComm::PushSupplier method. private: diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp index 5755ed1d97d..099d0f4b492 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -90,10 +90,6 @@ Consumer::disconnect (void) void Consumer::push (const CORBA::Any &) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { ACE_DEBUG ((LM_DEBUG, "(%P):%s\n", @@ -120,9 +116,6 @@ Consumer::push (const CORBA::Any &) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Deactivate this object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index 757c4a062cd..7486ddc9d53 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -53,17 +53,10 @@ public: // Disconnect from the supplier, but do not forget about it or close // it. - virtual void push (const CORBA::Any &data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + virtual void push (const CORBA::Any &data); // push the event to the consumer. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_push_consumer (void); // disconnect the consumer from the EC. // = CosEC_Multiple methods. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp index 3a0e1addb11..d5c45142eeb 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp @@ -94,9 +94,6 @@ Supplier::send_event (const CORBA::Any & data) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Deactivate this object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index 1041ae6a163..f5c29b92f62 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -51,10 +51,7 @@ public: void send_event (const CORBA::Any &data); // Send one event. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_push_supplier (void); // The POA_CosEventComm::PushSupplier method. void run (void); diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index a191a8f4da7..1a600a91e0f 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -92,7 +92,6 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const CORBA::Any &) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count_ ++; if (this->event_count_ % 100 == 0) @@ -105,7 +104,6 @@ Consumer::push (const CORBA::Any &) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index 2915b51441e..ee022ef3e3b 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h @@ -40,10 +40,8 @@ public: // = The CosEventComm::PushConsumer methods - virtual void push (const CORBA::Any &event) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const CORBA::Any &event); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index ebe33cb3d41..03a0c13e02a 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -103,7 +103,6 @@ Supplier::run (int argc, char* argv[]) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index ca9e1267edb..789c67bda1f 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -40,8 +40,7 @@ public: // = The CosEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp index cb0a13b15a6..08b0dfec2da 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp @@ -17,7 +17,6 @@ Country_i::~Country_i (void) void Country_i::update_population (const char * country, CORBA::Long population) - ACE_THROW_SPEC ((CORBA::SystemException)) { //Add your implementation here @@ -27,7 +26,6 @@ void Country_i::update_population (const char * country, CORBA::Object_ptr Country_i::get_typed_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { //Add your implementation here @@ -43,8 +41,6 @@ Country_i::get_typed_consumer (void) void Country_i::push (const CORBA::Any & /* data */ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { //Add your implementation here @@ -52,7 +48,6 @@ Country_i::push (const CORBA::Any & /* data */ void Country_i::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { //Add your implementation here diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h index 11231abba89..a1ba3fe3826 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h @@ -22,18 +22,13 @@ public: virtual ~Country_i (void); virtual void update_population (const char * country, - CORBA::Long population) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long population); - virtual CORBA::Object_ptr get_typed_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Object_ptr get_typed_consumer (void); - virtual void push (const CORBA::Any & data) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + virtual void push (const CORBA::Any & data); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); private: /// The ORB diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp index a2ef5f64119..6974742a02f 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp @@ -12,13 +12,11 @@ void ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate slot id. // diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h index 219ef9fa590..18b2210531d 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h @@ -15,12 +15,10 @@ class ORB_Initializer : public: virtual void - pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void - post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #endif /* ORB_INITIALIZER_H */ diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index 0f39c065b71..7d37a7df673 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -224,8 +224,6 @@ void ReplicaController::tao_ft_interception_point ( PortableInterceptor::ServerRequestInfo_ptr ri, CORBA::OctetSeq_out ocs) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { FT::FTRequestServiceContext_var ftr ( extract_context (ri)); @@ -259,7 +257,6 @@ ReplicaController::tao_ft_interception_point ( void ReplicaController::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { FT::FTRequestServiceContext_var ftr ( extract_context (ri)); @@ -424,7 +421,6 @@ namespace { FT::FTRequestServiceContext* extract_context (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var svc = ri->get_request_service_context (IOP::FT_REQUEST); @@ -475,7 +471,6 @@ namespace char* ReplicaController::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ReplicaController"); } @@ -483,30 +478,23 @@ ReplicaController::name (void) void ReplicaController::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ReplicaController::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ReplicaController::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ReplicaController::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } @@ -514,7 +502,5 @@ ReplicaController::receive_request_service_contexts ( void ReplicaController::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h index fe4e1aa1f86..de2e6ebd5c6 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h @@ -40,50 +40,37 @@ public: public: virtual char * - name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + name (void); virtual void - destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + destroy (void); #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 virtual void tao_ft_interception_point ( PortableInterceptor::ServerRequestInfo_ptr ri, - CORBA::OctetSeq_out ocs) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + CORBA::OctetSeq_out ocs); #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/ virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); private: static ACE_THR_FUNC_RETURN diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp index 20d9f800e63..2115454097c 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp @@ -40,7 +40,6 @@ set_state (CORBA::Any const& state) CORBA::Short RolyPoly_i::number (char *&str) - ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E)) { CORBA::string_free (str); @@ -63,7 +62,6 @@ RolyPoly_i::number (char *&str) void RolyPoly_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n")); diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h index 99cc4b79c68..5af5fd6064d 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h @@ -28,12 +28,10 @@ public: // RolyPoly // virtual CORBA::Short - number (char *&s) - ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E)); + number (char *&s); virtual void - shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + shutdown (void); private: CORBA::Short number_; diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp index 7a03c0c7de4..9fd7218042f 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.cpp @@ -15,7 +15,6 @@ Manager_i::~Manager_i (void) } CORBA::Long Manager_i::registerServer () -ACE_THROW_SPEC ((CORBA::SystemException)) { if (retry_attempt_ < retry_count_) { @@ -26,14 +25,12 @@ ACE_THROW_SPEC ((CORBA::SystemException)) } void Manager_i::startRetry (CORBA::Long count) -ACE_THROW_SPEC ((CORBA::SystemException)) { retry_count_ = count; retry_attempt_ = 0; } CORBA::Long Manager_i::endRetry () -ACE_THROW_SPEC ((CORBA::SystemException)) { return retry_count_ - retry_attempt_; } diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h index 5c45021ce6e..9a5bca21ed9 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h @@ -18,14 +18,11 @@ public: virtual ~Manager_i (void); - virtual CORBA::Long registerServer () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long registerServer (); - virtual void startRetry (CORBA::Long count) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void startRetry (CORBA::Long count); - virtual CORBA::Long endRetry () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long endRetry (); private: diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h index 07730db0cbd..e14d680a403 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h @@ -26,8 +26,7 @@ public: ::CORBA::Long req ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdownOrb () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdownOrb (); bool acknowledgeHit(); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index d62ce2c7645..6c915e53337 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp @@ -23,7 +23,6 @@ public: { } virtual CORBA::Long process_directive(const char* s) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT(s != 0); ACE_ASSERT(ACE_OS::strlen(s) > 0); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 44a9d2f175c..37923edbcb5 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp @@ -144,7 +144,6 @@ Object_ptr DynServer_Loader::create_object (ORB_ptr, int, ACE_TCHAR **) - ACE_THROW_SPEC ((SystemException)) { throw NO_IMPLEMENT(); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h index c222ebe531e..fe6fefcb718 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h @@ -39,8 +39,7 @@ public: // Not supported virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp index d6da384d62b..1641db55b1e 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp @@ -21,14 +21,12 @@ ORBInitializer::ORBInitializer (void) void ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->interceptor_, diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h index ac320b21e63..584463e99a7 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h @@ -58,11 +58,9 @@ public: * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} /// Return a reference to the LoadAlert object. diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp index efe8447563c..cd24d5f5852 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp @@ -32,7 +32,6 @@ RPS_Monitor::~RPS_Monitor (void) CosLoadBalancing::Location * RPS_Monitor::the_location (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -48,7 +47,6 @@ RPS_Monitor::the_location (void) CosLoadBalancing::LoadList * RPS_Monitor::loads (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const ACE_Time_Value current_time = ACE_OS::gettimeofday (); diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h index 048cd1bb10f..2c81309da6e 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h @@ -50,8 +50,7 @@ public: /** * The returned "Location" is a sequence of length 1. */ - virtual CosLoadBalancing::Location * the_location () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Location * the_location (); /// Return the average CPU load at the location which this /// LoadMonitor resides. @@ -60,8 +59,7 @@ public: * equal to CosLoadBalancing::LoadAverage, and the average CPU * load. */ - virtual CosLoadBalancing::LoadList * loads () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::LoadList * loads (); //@} diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp index a1a291b4a94..5e200084da9 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp @@ -16,22 +16,18 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void) char * ServerRequestInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void ServerRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++this->request_count_; } @@ -39,31 +35,24 @@ ServerRequestInterceptor::receive_request_service_contexts ( void ServerRequestInterceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h index 15e73de4d43..80f1b2ab4ba 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h @@ -61,35 +61,24 @@ public: * ServerRequestInterceptors. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} CORBA::Long request_count (void); diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp index cdd1fd226e1..bfe19785090 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp @@ -28,7 +28,6 @@ StockFactory::get_stock (const char *symbol) void StockFactory::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h index 0d721a9a0d3..053fe79e808 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h +++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h @@ -17,8 +17,7 @@ public: Test::Stock_ptr get_stock (const char *symbol) throw (Test::Invalid_Stock_Symbol); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 5ee4a7ce293..a400a12eb3b 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -93,7 +93,6 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const CORBA::Any &) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count_ ++; @@ -106,7 +105,6 @@ Consumer::push (const CORBA::Any &) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index d552c48d738..641291357d9 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h @@ -42,11 +42,9 @@ public: // = The CosEventComm::PushConsumer methods - virtual void push (const CORBA::Any &event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const CORBA::Any &event); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 45100a53b9b..7c55821a082 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -203,7 +203,6 @@ Supplier::run (int argc, char* argv[]) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index bc989ce8643..a9370f40a2c 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h @@ -42,8 +42,7 @@ public: // = The CosEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 3d20b0ed0dc..3ab7a703ce3 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -113,10 +113,6 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const CORBA::Any &event) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { ACE_UNUSED_ARG (event); @@ -130,9 +126,6 @@ Consumer::push (const CORBA::Any &event) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->proxy_supplier_-> disconnect_push_supplier(); @@ -142,10 +135,6 @@ void Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { // No-Op. } diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 0d2498223fb..f67f8d7c830 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -56,25 +56,14 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier methods -virtual void push (const CORBA::Any &event) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); +virtual void push (const CORBA::Any &event); virtual void disconnect_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: CORBA::ULong event_count_; diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index b0ace66c5a9..f367b06466b 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -299,10 +299,6 @@ void Filter_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { //No-Op. } @@ -319,9 +315,6 @@ Filter_StructuredPushSupplier::send_event void Filter_StructuredPushSupplier::disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // No-Op. } diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index 0326d711dc6..22d20672f07 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -106,18 +106,11 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index 1f1cfb0d4ee..ece0cbdf9f1 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -130,7 +130,6 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (events); @@ -143,7 +142,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h index b4009a41576..b84035dfc9d 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h @@ -43,10 +43,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index 3564e963677..07fd17cddfd 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -251,7 +251,6 @@ Supplier::run (int argc, char* argv[]) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h index 9404dd76d52..cc3fc9bad0d 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h @@ -43,8 +43,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 9bd46c2a5a7..1388c36585a 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -146,8 +146,6 @@ private: virtual void offer_change (EventTypeSeq const&, EventTypeSeq const&) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { // We don't care. } @@ -156,8 +154,6 @@ private: // virtual void push_structured_event (StructuredEvent const& e) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { // Extract space_craft_name and agent_name. // @@ -182,7 +178,6 @@ private: virtual void disconnect_structured_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // We don't care. } diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp index 19187fdb325..e4fb1423e43 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp @@ -192,8 +192,6 @@ tracker () void Gate:: push_structured_event (StructuredEvent const& e) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { for (ULong i (0); i < e.header.variable_header.length (); ++i) { @@ -250,7 +248,6 @@ push_structured_event (StructuredEvent const& e) void Gate:: disconnect_structured_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // We don't care. } @@ -258,8 +255,6 @@ disconnect_structured_push_consumer (void) void Gate:: offer_change (EventTypeSeq const&, EventTypeSeq const&) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { // We don't care. } diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h index d4838d078ff..ff05025cf66 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h @@ -52,21 +52,16 @@ private: // virtual void offer_change (CosNotification::EventTypeSeq const&, - CosNotification::EventTypeSeq const&) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + CosNotification::EventTypeSeq const&); // StructuredPushSupplier interface. // virtual void - push_structured_event (CosNotification::StructuredEvent const& e) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + push_structured_event (CosNotification::StructuredEvent const& e); virtual void - disconnect_structured_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + disconnect_structured_push_consumer (void); private: ACE_thread_t thread_; diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index 4da44d2059a..aeb872a8b54 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -337,10 +337,6 @@ Filter_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { // No-Op. } @@ -348,10 +344,6 @@ Filter_StructuredPushConsumer::offer_change void Filter_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { CORBA::Long val; @@ -374,9 +366,6 @@ Filter_StructuredPushConsumer::push_structured_event void Filter_StructuredPushConsumer::disconnect_structured_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // No-Op. } @@ -426,10 +415,6 @@ Filter_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { //No-Op. } @@ -449,9 +434,6 @@ Filter_StructuredPushSupplier::send_event void Filter_StructuredPushSupplier::disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 6f4263808f6..c5fd5ae7da2 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -170,26 +170,15 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; /*****************************************************************/ @@ -237,18 +226,11 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; #endif /* NOTIFY_FILTER_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 17adfa7d657..9c166e7ccdc 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -79,20 +79,12 @@ void TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { // No-Op. } void TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { try { @@ -147,9 +139,6 @@ TAO_Notify_Lanes_Consumer::deactivate (void) void TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index f1f16034ae1..35ac32e3502 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -82,26 +82,15 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 44c4a0fd1a6..5210b534d17 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -139,10 +139,6 @@ void TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & /*removed */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -164,9 +160,6 @@ TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& e void TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index f7c96ab45c1..d7c2f31af5d 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -64,17 +64,10 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_structured_push_supplier (void); /// = Data members /// ORB Objects. diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index def1e0c1dcb..bf9b59f62fd 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -304,10 +304,6 @@ Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { // No-Op. } @@ -315,10 +311,6 @@ Subscribe_StructuredPushConsumer::offer_change void Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { const char* domain_name = notification.header.fixed_header.event_type.domain_name; @@ -349,9 +341,6 @@ Subscribe_StructuredPushConsumer::push_structured_event void Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // No-Op. } @@ -406,10 +395,6 @@ Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { //No-Op. } @@ -426,9 +411,6 @@ Subscribe_StructuredPushSupplier::send_event void Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index a606aada5ef..1205daec5b7 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -160,26 +160,15 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; /*****************************************************************/ @@ -224,18 +213,11 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 29cabc964bb..4a73b95e1d5 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -124,10 +124,6 @@ void TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { // No-Op. } @@ -135,10 +131,6 @@ TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSe void TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -195,9 +187,6 @@ TAO_Notify_ThreadPool_Consumer::deactivate (void) void TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index 3d2b581f8bd..9196cab9603 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -66,26 +66,15 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); // = Data members diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index d7f25a61eb8..44fa82370f5 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -139,10 +139,6 @@ void TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & /*removed */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -173,9 +169,6 @@ TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEve void TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index 4f46c83ac87..e8b30447a59 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -66,17 +66,10 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_structured_push_supplier (void); /// = Data members /// ORB Objects. diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp index 8730f4dfcec..446ed61ebf5 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp @@ -16,7 +16,6 @@ CORBA::Object_ptr Gateway_ObjRef_Factory:: make_object (const char *interface_repository_id, const PortableInterceptor::ObjectId & id) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var object = this->old_factory_->make_object (interface_repository_id, diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h index e0bcb4bbb67..431db81c3d0 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h @@ -26,8 +26,7 @@ public: virtual CORBA::Object_ptr make_object ( const char *repository_id, - const PortableInterceptor::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableInterceptor::ObjectId &id); private: diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp index d6e510b8edf..ae4ac1dd5ae 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp @@ -15,7 +15,6 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::Object_ptr Object_Factory_i::create_object (const char *interface_repository_id, CORBA::Object_ptr gatewayed_object) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var stringified_object = this->orb_->object_to_string (gatewayed_object); diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h index 35febb7b331..ba8db8489ce 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h @@ -32,8 +32,7 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory CORBA::Object_ptr create_object (const char *interface_repository_id, - CORBA::Object_ptr gatewayed_object) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Object_ptr gatewayed_object); private: diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp index 8806a482225..5809da7409e 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp @@ -22,14 +22,12 @@ Server_IORInterceptor::~Server_IORInterceptor (void) char * Server_IORInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_IORInterceptor"); } void Server_IORInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::release (this->gateway_object_factory_); this->gateway_object_factory_ = Gateway::Object_Factory::_nil (); @@ -38,14 +36,12 @@ Server_IORInterceptor::destroy (void) void Server_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_IORInterceptor::components_established ( PortableInterceptor::IORInfo_ptr ior_info) - ACE_THROW_SPEC ((CORBA::SystemException)) { Gateway_ObjRef_Factory *my_factory = 0; @@ -64,7 +60,6 @@ void Server_IORInterceptor::adapter_manager_state_changed ( const char *, PortableInterceptor::AdapterState) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -72,6 +67,5 @@ void Server_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, PortableInterceptor::AdapterState) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index 50e62b9e707..fc5b5b2a382 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -36,31 +36,25 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); virtual void components_established ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::AdapterState state); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::AdapterState state); //@} diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp index c9aeca5ca75..42306c63e67 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp @@ -14,14 +14,12 @@ void Server_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = info->resolve_initial_references ("Gateway_Object_Factory"); diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h index 51af3ab3a94..f64aa68b211 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h @@ -25,12 +25,10 @@ class Server_IORInterceptor_ORBInitializer //@{ /// The pre-initialization hook. - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); /// The post-initialization hook. - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp index 31987a4feab..fe8a7a38833 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp @@ -13,7 +13,6 @@ sum_server_i::sum_server_i () CORBA::Long sum_server_i::add_variables (CORBA::Long a, CORBA::Long b) - ACE_THROW_SPEC ((CORBA::SystemException)) { return a+b; } diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h index e093073e790..d9eb24f2943 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.h +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h @@ -31,8 +31,7 @@ class sum_server_i : public virtual POA_ORT::sum_server /// add variables method CORBA::Long add_variables (CORBA::Long a, - CORBA::Long b) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long b); }; diff --git a/TAO/orbsvcs/examples/PSS/Server_i.cpp b/TAO/orbsvcs/examples/PSS/Server_i.cpp index 70480aacaa9..63193c391bc 100644 --- a/TAO/orbsvcs/examples/PSS/Server_i.cpp +++ b/TAO/orbsvcs/examples/PSS/Server_i.cpp @@ -14,7 +14,6 @@ Server_i::~Server_i (void) char * Server_i::get_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("active"); } diff --git a/TAO/orbsvcs/examples/PSS/Server_i.h b/TAO/orbsvcs/examples/PSS/Server_i.h index 24f406c9223..768e94d9a42 100644 --- a/TAO/orbsvcs/examples/PSS/Server_i.h +++ b/TAO/orbsvcs/examples/PSS/Server_i.h @@ -31,8 +31,7 @@ class Server_i : public virtual POA_Simple_Server::Server ~Server_i (); - virtual char *get_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char *get_status (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp index efdfdc48b71..3bc1093f353 100644 --- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp +++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp @@ -21,7 +21,6 @@ Naming_Context_i::~Naming_Context_i () int Naming_Context_i::bind (const char *n, const char *obj) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Save the binding to database. int result = @@ -32,7 +31,6 @@ Naming_Context_i::bind (const char *n, char * Naming_Context_i::find (const char *n) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the Stringified object reference corresponding to // 'n' diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h index 84bb1e2bed4..41174e02c73 100644 --- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h +++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h @@ -36,11 +36,9 @@ class Naming_Context_i : public virtual POA_Simple_Naming::Naming_Context ~Naming_Context_i (void); virtual int bind (const char *n, - const char *obj) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *obj); - virtual char *find (const char *n) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char *find (const char *n); private: diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 3a6642ff963..9c2c1d2ffef 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -130,7 +130,6 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -150,7 +149,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h index 8541290d29a..a477656b498 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h @@ -37,10 +37,8 @@ public: // = The RtecEventComm::PushConsumer methods // The skeleton methods. - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); private: int parse_args (int argc, char *argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index e5d03182523..f016dbfff30 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -144,7 +144,6 @@ Supplier::run (int argc, char* argv[]) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h index e42042c197d..4e4a3c97fe7 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h @@ -36,8 +36,7 @@ public: // = The RtecEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); private: int parse_args (int argc, char *argv[]); diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp index 20ff6a10b22..3c88f73b002 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp @@ -10,7 +10,6 @@ Consumer::Consumer (void) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -25,7 +24,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h index 51bacf725b8..36c247802f6 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h @@ -44,10 +44,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. }; diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp index ec77f956c8b..9dd7b492b1a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp @@ -38,7 +38,6 @@ Supplier::timeout_occured (void) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -49,7 +48,6 @@ Timeout_Consumer::Timeout_Consumer (Supplier* supplier) void Timeout_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -64,7 +62,6 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events) void Timeout_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h index 0ca45a86b8f..8222337af57 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h @@ -46,8 +46,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. void timeout_occured (void); @@ -73,10 +72,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp index c7ba18ae47b..79c0d07e1bf 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp @@ -12,7 +12,6 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr) void AddrServer::get_addr (const RtecEventComm::EventHeader&, RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)) { addr = this->addr_; } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h index deeced433db..de7aeb6d590 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h @@ -40,8 +40,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecUDPAdmin::UDP_Addr_out addr); private: RtecUDPAdmin::UDP_Addr addr_; diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index 4f5bbb2cc1e..125c8b7775d 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -67,7 +67,6 @@ Consumer::disconnect (void) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -87,7 +86,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h index 9985ca129d6..5c4f141719d 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h @@ -45,10 +45,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index 205518d540d..5ad924f7209 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -76,7 +76,6 @@ Supplier::perform_push (void) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h index 67c885b6d08..6ee7f3251cd 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h @@ -49,8 +49,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp index 20ff6a10b22..3c88f73b002 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp @@ -10,7 +10,6 @@ Consumer::Consumer (void) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -25,7 +24,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h index 51bacf725b8..36c247802f6 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h @@ -44,10 +44,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. }; diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp index 9411ec8c3b3..f1714bf8773 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp @@ -12,7 +12,6 @@ Supplier::Supplier (void) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h index d255d1e8c7f..8824c4b9f86 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h @@ -44,8 +44,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index a1a1ca46a0f..5203f82a466 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -114,7 +114,6 @@ Consumer::run (int argc, char* argv[]) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -134,7 +133,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h index af6a05b2b3b..8641e434194 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h @@ -41,10 +41,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 2a61331ed38..56b0a8063cc 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -123,7 +123,6 @@ Supplier::run (int argc, char* argv[]) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index edc8bd098a4..2587333a271 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -41,8 +41,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index 84448bc0c75..6a3e81510bb 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -15,7 +15,6 @@ static int authorize_2 = 1; CORBA::Boolean SLevel1_Server_i::authorize_level1 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { /// Get a reference to the SecurityCurrent object. @@ -110,7 +109,6 @@ SLevel1_Server_i::authorize_level1 (void) CORBA::Boolean SLevel1_Server_i::authorize_level2 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { /// If the owner of this invocation is authorized to invoke this /// method, return 0 else return 1. diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index 0e7ae144123..94a2151481d 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -25,11 +25,9 @@ class SLevel1_Server_i : public POA_SLevel1_Server SLevel1_Server_i (); /// - CORBA::Boolean authorize_level1 (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean authorize_level1 (void); - CORBA::Boolean authorize_level2 (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean authorize_level2 (void); static int authorized_1; static int authorized_2; diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index 858fc2c99d6..0b8df081939 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -10,14 +10,12 @@ ACE_RCSID(Send_File, test_i, "$Id$") void Simple_Server_i::send_line (const char *line) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", line)); } void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h index dce0675446b..729b1d933f8 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - void send_line (const char *line) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_line (const char *line); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp index 5903d6e7ec4..88faddf22e0 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp @@ -18,14 +18,12 @@ ORBInitializer::ORBInitializer (void) void ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor; ACE_NEW_THROW_EX (reject_interceptor, diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h index 5a190fb2006..b081f37b25f 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h @@ -58,11 +58,9 @@ public: * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} /// Return a reference to the LoadAlert object. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp index 4d770e79ef2..4ac4714e6a4 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp @@ -18,7 +18,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb) Test::Timestamp Roundtrip::test_method (Test::Timestamp send_time, Test::number cl_number) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (cl_number % 2 == 0) { @@ -40,7 +39,6 @@ Roundtrip::test_method (Test::Timestamp send_time, void Roundtrip::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h index 70aec84ecc9..f91c83ac26a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h @@ -23,11 +23,9 @@ public: // = The skeleton methods virtual Test::Timestamp test_method (Test::Timestamp send_time, - Test::number cl_number) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::number cl_number); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index ec190f3298c..5c189e8c0af 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -19,14 +19,12 @@ ORBInitializer::ORBInitializer (void) void ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->interceptor_, ServerRequestInterceptor, diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h index 83734927f65..7ccd73b60f5 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h @@ -58,11 +58,9 @@ public: * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} /// Return a reference to the LoadAlert object. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp index a9ea95abd62..ac374cc840a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp @@ -31,7 +31,6 @@ RPS_Monitor::~RPS_Monitor (void) CosLoadBalancing::Location * RPS_Monitor::the_location (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -47,7 +46,6 @@ RPS_Monitor::the_location (void) CosLoadBalancing::LoadList * RPS_Monitor::loads (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const ACE_Time_Value current_time = ACE_OS::gettimeofday (); diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h index 821e3964021..7825b5e5e67 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -49,8 +49,7 @@ public: /** * The returned "Location" is a sequence of length 1. */ - virtual CosLoadBalancing::Location * the_location () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Location * the_location (); /// Return the average CPU load at the location which this /// LoadMonitor resides. @@ -59,8 +58,7 @@ public: * equal to CosLoadBalancing::LoadAverage, and the average CPU * load. */ - virtual CosLoadBalancing::LoadList * loads () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::LoadList * loads (); //@} diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp index 4c8cf73a5c2..abf3b4db251 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp @@ -18,7 +18,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb) Test::Timestamp Roundtrip::test_method (Test::Timestamp send_time, Test::number cl_number) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (cl_number % 2 == 0) @@ -34,7 +33,6 @@ Roundtrip::test_method (Test::Timestamp send_time, void Roundtrip::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h index 70aec84ecc9..f91c83ac26a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h @@ -23,11 +23,9 @@ public: // = The skeleton methods virtual Test::Timestamp test_method (Test::Timestamp send_time, - Test::number cl_number) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::number cl_number); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp index b7d2ca0b5f9..fa7f88a1ce8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp @@ -15,22 +15,18 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void) char * ServerRequestInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void ServerRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++this->request_count_; } @@ -38,31 +34,24 @@ ServerRequestInterceptor::receive_request_service_contexts ( void ServerRequestInterceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h index 556a67570bf..2e3fe2247a5 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h @@ -60,35 +60,24 @@ public: * ServerRequestInterceptors. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} CORBA::Long request_count (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index 8fc6824ff85..0870f02aded 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -55,8 +55,7 @@ public: */ virtual Federated_Test::Experiment_Results * run_experiment (CORBA::Long experiment_id, - CORBA::Long iterations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long iterations); //@} private: @@ -186,7 +185,6 @@ int main (int argc, char *argv[]) Federated_Test::Experiment_Results * Roundtrip_Peer::run_experiment (CORBA::Long experiment_id, CORBA::Long iterations) - ACE_THROW_SPEC ((CORBA::SystemException)) { int thread_count = 1; #if 0 diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp index 5e859b50e45..538c0ed5471 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp @@ -17,7 +17,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb) Test::Timestamp Roundtrip::test_method (Test::Timestamp send_time, CORBA::Long workload_in_usecs) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t start = ACE_OS::gethrtime (); CORBA::Long elapsed = 0; @@ -35,7 +34,6 @@ Roundtrip::test_method (Test::Timestamp send_time, void Roundtrip::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h index 9a67072a43b..19c09b07e45 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h @@ -18,11 +18,9 @@ public: // = The skeleton methods virtual Test::Timestamp test_method (Test::Timestamp send_time, - CORBA::Long workload_in_usecs) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long workload_in_usecs); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp index dda1ee587a1..8ac7e2263f2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp @@ -24,7 +24,6 @@ Callback::sample_history (void) void Callback::sample (Test::Timestamp the_timestamp) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t elapsed = ACE_OS::gethrtime () - the_timestamp; @@ -36,7 +35,6 @@ Callback::sample (Test::Timestamp the_timestamp) PortableServer::POA_ptr Callback::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h index 93f716e0b51..7c048852fda 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h @@ -36,11 +36,9 @@ public: //@{ /** @name The RtecEventComm::PushCallback methods */ - virtual void sample (Test::Timestamp the_timestamp) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sample (Test::Timestamp the_timestamp); - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp index 30beb42f72b..3bfa987de59 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp @@ -17,21 +17,18 @@ Session::Session (Test::Callback_ptr cb, void Session::sample (Test::Timestamp the_timestamp) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->cb_->sample (the_timestamp); } void Session::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Implicit_Deactivator deactivator (this); } PortableServer::POA_ptr Session::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h index 8786b3f89ca..dc425ae9747 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h @@ -18,14 +18,11 @@ public: PortableServer::POA_ptr poa); // = The skeleton methods - virtual void sample (Test::Timestamp the_timestamp) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sample (Test::Timestamp the_timestamp); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableServer::POA_ptr _default_POA (void); private: Test::Callback_var cb_; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp index eebb4855cc9..20de05953e5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp @@ -18,7 +18,6 @@ Session_Factory::Session_Factory (CORBA::ORB_ptr orb, Test::Session_ptr Session_Factory::create_new_session (Test::Callback_ptr cb) - ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<Session> session_impl (new Session (cb, this->poa_.in ())); @@ -28,14 +27,12 @@ Session_Factory::create_new_session (Test::Callback_ptr cb) void Session_Factory::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } PortableServer::POA_ptr Session_Factory::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h index 829afb63323..e91a2a57568 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h @@ -18,14 +18,11 @@ public: PortableServer::POA_ptr poa); // = The skeleton methods - virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index a89beb5367b..9045c8ee020 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -92,7 +92,6 @@ Consumer::sample_history (void) void Consumer::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -116,7 +115,6 @@ Consumer::push (const RtecEventComm::EventSet &events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_supplier_ = @@ -125,7 +123,6 @@ Consumer::disconnect_push_consumer (void) PortableServer::POA_ptr Consumer::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index 4718601a084..c9109cc884c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -49,12 +49,9 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index 89c0ed4b450..c8dedde7cff 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -44,7 +44,6 @@ Control::~Control (void) void Control::join (Federated_Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -164,7 +163,6 @@ Control::join (Federated_Test::Peer_ptr peer) PortableServer::POA_ptr Control::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h index e5bc4eb52df..dd923f2e8bd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h @@ -38,11 +38,9 @@ public: //@{ /** @name The Federated_Test::Control methods */ - virtual void join (Federated_Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void join (Federated_Test::Peer_ptr peer); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp index 3039480f1f8..c97cc03f939 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp @@ -30,7 +30,6 @@ Loopback::Loopback (CORBA::Long experiment_id, void Loopback::disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h index 5b21092466f..4507a1a5a88 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h @@ -35,8 +35,7 @@ public: //@{ /** @name The Federated_Test::Loopback methods */ - virtual void disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index 14ca03140b0..2fd3d0911e3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -83,7 +83,6 @@ Loopback_Consumer::disconnect (void) void Loopback_Consumer::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n")); this->supplier_->push (events); @@ -91,7 +90,6 @@ Loopback_Consumer::push (const RtecEventComm::EventSet &events) void Loopback_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_supplier_ = @@ -100,7 +98,6 @@ Loopback_Consumer::disconnect_push_consumer (void) PortableServer::POA_ptr Loopback_Consumer::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index 00295b762b7..4d7f1fd1ec9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -43,12 +43,9 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp index a1750d26f21..02a00e848fa 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp @@ -74,7 +74,6 @@ Loopback_Supplier::disconnect (void) void Loopback_Supplier::push (const RtecEventComm::EventSet &source) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Supplier pushing\n")); RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -109,7 +108,6 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source) void Loopback_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_consumer_ = @@ -118,7 +116,6 @@ Loopback_Supplier::disconnect_push_supplier (void) PortableServer::POA_ptr Loopback_Supplier::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 6c58a9d55f7..e89dc9a5007 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -42,16 +42,13 @@ public: /// Disconnect from the event channel void disconnect (void); - void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet &events); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index c4bb55f0347..4ca0fac10f4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -50,7 +50,6 @@ Peer_Base::~Peer_Base (void) void Peer_Base::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { { EC_Destroyer ec_destroyer (this->event_channel_.in ()); @@ -63,14 +62,12 @@ Peer_Base::shutdown (void) CORBA::Object_ptr Peer_Base::channel (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->event_channel_.in ()); } void Peer_Base::connect (Federated_Test::Peer_ptr remote_peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n")); CORBA::Object_var remote_ec_object = @@ -95,7 +92,6 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer) Federated_Test::Loopback_ptr Peer_Base::setup_loopback (CORBA::Long experiment_id, CORBA::Long base_event_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<Loopback> loopback ( new Loopback (experiment_id, @@ -116,7 +112,6 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id, PortableServer::POA_ptr Peer_Base::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index caecbbfefa9..cea199e28c0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -40,22 +40,17 @@ public: //@{ /** @name The Federated_Test::Peer methods */ - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); virtual CORBA::Object_ptr - channel (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + channel (void); - virtual void connect (Federated_Test::Peer_ptr remote_peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void connect (Federated_Test::Peer_ptr remote_peer); Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id, - CORBA::Long base_event_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long base_event_type); - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); //@} protected: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp index 014ad19a0cc..4763b3abcd1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp @@ -79,7 +79,6 @@ Supplier::disconnect (void) void Supplier::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Supplier pushing (%d,%d)\n", // events[0].header.type, events[0].header.source)); @@ -96,7 +95,6 @@ Supplier::push (const RtecEventComm::EventSet &events) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_consumer_ = @@ -105,7 +103,6 @@ Supplier::disconnect_push_supplier (void) PortableServer::POA_ptr Supplier::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index b164fd51e46..ebb88581e01 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -43,16 +43,13 @@ public: /// Disconnect from the event channel void disconnect (void); - void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet &events); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 7244d8dcdf0..9761d9ef279 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -39,9 +39,6 @@ CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &/* the_flows */ ) - ACE_THROW_SPEC((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed )) { ACE_DEBUG ((LM_DEBUG, "Sender_StreamEndPoint::modify_QoS\n")); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h index 78ca9dc022f..9faeb16e931 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h @@ -30,10 +30,7 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint /// chosen. CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &flow_spec) - ACE_THROW_SPEC((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed )); + const AVStreams::flowSpec &flow_spec); /// The over-ridden modify_qos method to change the qos of the /// flows specified in the flow spec to that in the new_qos. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 07d6f6b2294..dde7cf28790 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -16,9 +16,6 @@ ACE_Time_Value inter_frame_time; CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows) - ACE_THROW_SPEC (( CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed )) { ACE_DEBUG ((LM_DEBUG, "Sender_StreamEndPoint::modify_QoS\n")); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h index 46676fd5579..c72a69c2925 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h @@ -40,10 +40,7 @@ public: CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &/* the_flows */ - ) - ACE_THROW_SPEC(( CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed )); + ); protected: TAO_AV_Callback callback_; // Application callback. diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 8551e20c058..98b7b344376 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -11,16 +11,13 @@ class Time_impl : { public: virtual TimeModule::TimeOfDay - get_gmt (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + get_gmt (void); - void Shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void Shutdown (void); }; TimeModule::TimeOfDay Time_impl::get_gmt (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { time_t time_now = time(0); @@ -37,7 +34,6 @@ TimeModule::TimeOfDay Time_impl::get_gmt (void) void Time_impl::Shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { exit(0); } diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp index 6aa1ec88f69..9f0afee75c3 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp @@ -37,7 +37,6 @@ Test_i::~Test_i (void) int Test_i::try_and_create_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -66,7 +65,6 @@ Test_i::try_and_create_POA (void) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h index 59e2f65f292..03952a5d946 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h @@ -18,11 +18,9 @@ public: ~Test_i (void); /// Try and create a persistant POA - int try_and_create_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + int try_and_create_POA (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); protected: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp index b1331a60f77..054b84275a5 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp @@ -19,7 +19,6 @@ Simple_Server_i::Simple_Server_i (void) char* Simple_Server_i::remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in())); @@ -33,7 +32,6 @@ Simple_Server_i::remote_call (void) char* Simple_Server_i::shutdown (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in())); @@ -53,7 +51,6 @@ Simple_Server_i::shutdown (const char* key) char* Simple_Server_i::abort (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in())); int still_alive = 1; diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h index be5b3ba7a95..12f537ff77f 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h @@ -21,14 +21,11 @@ public: // ctor // = The Simple_Server methods. - char* remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char* remote_call (void); - char* shutdown (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)); + char* shutdown (const char* key); - char* abort (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)); + char* abort (const char* key); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp index 604643f3f4a..fe9454b050f 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp @@ -16,14 +16,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; // Install the server request interceptor. diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h index 4400e6235cb..9d6ac8cca22 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h @@ -45,11 +45,9 @@ public: /// Constructor. Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp index 8ae869dc2d0..c18328ab77e 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp @@ -20,21 +20,18 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) void Server_Request_Interceptor::forward_reference ( const char* iorstr) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->iorstr_ = CORBA::string_dup (iorstr); } char * Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -42,8 +39,6 @@ void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr // ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } @@ -51,8 +46,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { IOP::ServiceContext_var svc = ri->get_request_service_context (IOP::FT_GROUP_VERSION); @@ -106,22 +99,17 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h index 1c7e62a26d4..cf3f4ff782e 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h @@ -46,8 +46,7 @@ public: ~Server_Request_Interceptor (void); /// Set the references to which requests will be forwarded. - virtual void forward_reference (const char* iorstr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void forward_reference (const char* iorstr); /** * @name Methods Required by the Server Request Interceptor @@ -59,35 +58,24 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp index a83f72c028a..f76b17f2b1d 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp @@ -19,7 +19,6 @@ Simple_Server_i::Simple_Server_i (void) char* Simple_Server_i::remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in())); @@ -33,7 +32,6 @@ Simple_Server_i::remote_call (void) char* Simple_Server_i::shutdown (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in())); @@ -53,7 +51,6 @@ Simple_Server_i::shutdown (const char* key) char* Simple_Server_i::abort (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in())); int still_alive = 1; diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h index 29009ba799e..f4873fc8871 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h @@ -21,14 +21,11 @@ public: // ctor // = The Simple_Server methods. - char* remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char* remote_call (void); - char* shutdown (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)); + char* shutdown (const char* key); - char* abort (const char* key) - ACE_THROW_SPEC ((CORBA::SystemException)); + char* abort (const char* key); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp index e0b003a58bb..ce5558c04f2 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp @@ -17,21 +17,18 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } void Hello::throw_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException)) { throw Test::MyException (); } @@ -39,7 +36,6 @@ Hello::throw_exception (void) // Nested sequence step 1 - This op called by the client on the server CORBA::Boolean Hello::call_me_back (Test::Hello_ptr me) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean result = me->call_back (); return result; @@ -48,7 +44,6 @@ Hello::call_me_back (Test::Hello_ptr me) // Nested sequence step 2 - This op called by the server on the client CORBA::Boolean Hello::call_back (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean result = server_->check_request_id (); return result; @@ -57,7 +52,6 @@ Hello::call_back (void) // Nested sequence step 3 - This op called by the client on the server CORBA::Boolean Hello::check_request_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The server request interceptor will have set this public static member // false if the same retention id has been used twice @@ -66,7 +60,6 @@ Hello::check_request_id (void) CORBA::ULong Hello::drop_down_dead (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return server_id_; } diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h index a4cd341189b..b4d9a3cca92 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h @@ -22,26 +22,19 @@ public: Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual void throw_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException)); + virtual void throw_exception (void); - virtual CORBA::Boolean call_me_back (Test::Hello_ptr me) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean call_me_back (Test::Hello_ptr me); - virtual CORBA::Boolean call_back (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean call_back (void); - virtual CORBA::Boolean check_request_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean check_request_id (void); - virtual CORBA::ULong drop_down_dead (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong drop_down_dead (void); static CORBA::Boolean ids_differ_; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp index 3f59631356a..c6d4c104dcc 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp @@ -11,7 +11,6 @@ void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -19,7 +18,6 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_server_request_interceptors (info); } @@ -27,7 +25,6 @@ Server_ORBInitializer::post_init ( void Server_ORBInitializer::register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr sri = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h index a512252892d..b80f8a306dc 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h @@ -27,18 +27,15 @@ class Server_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: /// Register the necessary interceptors. void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp index 5d11612ae90..7aff46ebb9d 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp @@ -11,7 +11,6 @@ void Server_ORBInitializer2::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -19,7 +18,6 @@ Server_ORBInitializer2::pre_init ( void Server_ORBInitializer2::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_server_request_interceptors (info); } @@ -27,7 +25,6 @@ Server_ORBInitializer2::post_init ( void Server_ORBInitializer2::register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr sri = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h index f2608319bee..58a08867a06 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h @@ -27,18 +27,15 @@ class Server_ORBInitializer2 : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: /// Register the necessary interceptors. void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp index f088e5984ff..67cee269b35 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp @@ -28,30 +28,24 @@ TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void) char * TAO249_ServerRequest_Interceptor::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor"); } void TAO249_ServerRequest_Interceptor::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO249_ServerRequest_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO249_ServerRequest_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); try @@ -109,23 +103,18 @@ catch (const CORBA::Exception& ex) void TAO249_ServerRequest_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO249_ServerRequest_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO249_ServerRequest_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h index ec1f1eadf75..0b5eb02ab6c 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h @@ -45,35 +45,24 @@ TAO249_ServerRequest_Interceptor (void); */ //@{ /// Return the name of this ServerRequestinterceptor. -virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual char * name (void); -virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp index 89f07d67686..3736fc94f3e 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp @@ -31,30 +31,24 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void) char * TAO249_ServerRequest_Interceptor2::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2"); } void TAO249_ServerRequest_Interceptor2::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO249_ServerRequest_Interceptor2::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO249_ServerRequest_Interceptor2::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -204,23 +198,18 @@ TAO249_ServerRequest_Interceptor2::get_now (void) void TAO249_ServerRequest_Interceptor2::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO249_ServerRequest_Interceptor2::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO249_ServerRequest_Interceptor2::send_other ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h index 546d4c52d3d..209e1ecd17c 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h @@ -46,35 +46,24 @@ TAO249_ServerRequest_Interceptor2 (void); */ //@{ /// Return the name of this ServerRequestinterceptor. -virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual char * name (void); -virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp index e6b390c5f2b..c20b692c4af 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp @@ -12,21 +12,18 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } void Hello::ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return; } void Hello::throw_location_forward (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return; } diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h index 7f8559b39ee..28bb6597705 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h @@ -22,14 +22,11 @@ public: Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0); // = The skeleton methods - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); - virtual void throw_location_forward (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void throw_location_forward (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp index 5d11612ae90..7aff46ebb9d 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp @@ -11,7 +11,6 @@ void Server_ORBInitializer2::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -19,7 +18,6 @@ Server_ORBInitializer2::pre_init ( void Server_ORBInitializer2::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_server_request_interceptors (info); } @@ -27,7 +25,6 @@ Server_ORBInitializer2::post_init ( void Server_ORBInitializer2::register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr sri = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h index f2608319bee..58a08867a06 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h @@ -27,18 +27,15 @@ class Server_ORBInitializer2 : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: /// Register the necessary interceptors. void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp index e18c2e67d9f..dc9d6b1f7e7 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp @@ -34,30 +34,24 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void) char * TAO249_ServerRequest_Interceptor2::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2"); } void TAO249_ServerRequest_Interceptor2::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO249_ServerRequest_Interceptor2::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO249_ServerRequest_Interceptor2::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -143,23 +137,18 @@ TAO249_ServerRequest_Interceptor2::get_now (void) void TAO249_ServerRequest_Interceptor2::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO249_ServerRequest_Interceptor2::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO249_ServerRequest_Interceptor2::send_other ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h index 5f537001b96..536d3782173 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h @@ -46,35 +46,24 @@ TAO249_ServerRequest_Interceptor2 (void); */ //@{ /// Return the name of this ServerRequestinterceptor. -virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual char * name (void); -virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} static CORBA::Object_var server_iogr_; diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp index d7bd3093cb2..81115492175 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp @@ -14,21 +14,18 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } void Hello::ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return; } CORBA::Boolean Hello::has_ft_request_service_context (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ServerRequest_Interceptor2::has_ft_request_sc_; } diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h index bfe3791b6c8..c2257a266f1 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h @@ -22,14 +22,11 @@ public: Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0); // = The skeleton methods - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); - virtual CORBA::Boolean has_ft_request_service_context (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean has_ft_request_service_context (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp index 2f25ad62893..28c65bdca2b 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp @@ -11,7 +11,6 @@ void Server_ORBInitializer2::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -19,7 +18,6 @@ Server_ORBInitializer2::pre_init ( void Server_ORBInitializer2::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_server_request_interceptors (info); } @@ -27,7 +25,6 @@ Server_ORBInitializer2::post_init ( void Server_ORBInitializer2::register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr sri = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h index f2608319bee..58a08867a06 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h @@ -27,18 +27,15 @@ class Server_ORBInitializer2 : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: /// Register the necessary interceptors. void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp index afd584a6b3b..2ccd153fb10 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp @@ -33,30 +33,24 @@ ServerRequest_Interceptor2::~ServerRequest_Interceptor2 (void) char * ServerRequest_Interceptor2::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequest_Interceptor2"); } void ServerRequest_Interceptor2::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequest_Interceptor2::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequest_Interceptor2::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -90,23 +84,18 @@ ACE_THROW_SPEC ((CORBA::SystemException, void ServerRequest_Interceptor2::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequest_Interceptor2::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequest_Interceptor2::send_other ( PortableInterceptor::ServerRequestInfo_ptr) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h index ac8917d5d8b..7b978a5702a 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h @@ -45,35 +45,24 @@ ServerRequest_Interceptor2 (void); */ //@{ /// Return the name of this ServerRequestinterceptor. -virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual char * name (void); -virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); +virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) -ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} static CORBA::Boolean has_ft_request_sc_; diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp index 2f7fb7e268b..08916607cda 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp @@ -10,7 +10,6 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb) // virtual void TestImpl::myMethod (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") ); } @@ -18,7 +17,6 @@ void TestImpl::myMethod (void) // virtual void TestImpl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h index caf61465a18..0573e057c49 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h @@ -10,11 +10,9 @@ public: TestImpl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void myMethod (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void myMethod (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc index 04fcfb3257f..b6c8462eff7 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc @@ -8,7 +8,8 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): namingexe, naming_serv { +project(*NsMain): namingexe, naming_serv { + exename = nsmain after += *idl Source_Files { Hello.cpp @@ -31,3 +32,16 @@ project(*Client): namingexe { } } +project(*Server): namingexe, portableserver { + exename = server + after += *idl + Source_Files { + server.cpp + Hello.cpp + } + Source_Files { + TestC.cpp + TestS.cpp + } +} + diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp index 3bb0a772b76..df5dc90d3d9 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl new file mode 100755 index 00000000000..8d73ffb4ae7 --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl @@ -0,0 +1,122 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +# This is a Perl script that runs a Naming Service test. It starts +# all the servers and clients as necessary. + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::Run_Test; +use Cwd; + +# Amount of delay (in seconds) between starting a server and a client +# to allow proper server initialization. +$sleeptime = 10; + +$quiet = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } + if ($ARGV[0] eq '-q') { + $quiet = 1; + } +} + + +# Variables for command-line arguments to client and server +# executables. +$ns_orb_port1 = 9931; +$ns_orb_port2 = 9932; +$ns_endpoint1 = "iiop://localhost:$ns_orb_port1"; +$ns_endpoint2 = "iiop://localhost:$ns_orb_port2"; +$nsiorfile1 = PerlACE::LocalFile ("ns1.ior"); +$nsiorfile2 = PerlACE::LocalFile ("ns2.ior"); +$iorfile = PerlACE::LocalFile ("test.ior"); + +$status = 0; + +# Run two Naming Servers + +my $args = "-ORBEndPoint $ns_endpoint1 -o $nsiorfile1 -m 0"; +my $prog = "../../Naming_Service/Naming_Service"; +$NS1 = new PerlACE::Process ($prog, $args); + +unlink $nsiorfile1; +unlink $iorfile; + +$NS1->Spawn (); + +if (PerlACE::waitforfile_timed ($nsiorfile1, $PerlACE::wait_interval_for_process_creation) == -1) { + print STDERR "ERROR: cannot find IOR file <$nsiorfile1>\n"; + $NS1->Kill (); + exit 1; +} + +my $args = "-ORBEndPoint $ns_endpoint2 -o $nsiorfile2 -m 0"; +my $prog = "../../Naming_Service/Naming_Service"; +$NS2 = new PerlACE::Process ($prog, $args); + +unlink $nsiorfile2; + +$NS2->Spawn (); + +if (PerlACE::waitforfile_timed ($nsiorfile2, $PerlACE::wait_interval_for_process_creation) == -1) { + print STDERR "ERROR: cannot find IOR file <$nsiorfile2>\n"; + $NS2->Kill (); + exit 1; +} + +$SV = new PerlACE::Process ("server", "-ORBDebuglevel $debug_level"); +$CL = new PerlACE::Process ("client", ""); + +$server = $SV->Spawn (); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + exit 1; +} + +if (PerlACE::waitforfile_timed ($iorfile, + $PerlACE::wait_interval_for_process_creation) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +# Kill naming service 2 +print STDERR "Killing second naming server\n"; +$NS2->Kill (); + +print STDERR "Starting client\n"; +$client = $CL->Spawn (10); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +sleep (15); + +print STDERR "Starting NS2 again\n"; + +$NS2->Spawn (); + +$server = $SV->WaitKill (10); + +if ($server != 0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +$NS1->Kill (); + +unlink $iorfile1; +unlink $iorfile2; + +exit $status; diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp new file mode 100644 index 00000000000..78515124da8 --- /dev/null +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp @@ -0,0 +1,152 @@ +// $Id$ + +#include "Hello.h" +#include "orbsvcs/CosNamingC.h" +#include "ace/Get_Opt.h" +#include "ace/Task.h" + +const char *ior_output_file = "test.ior"; + +class TestTask : public ACE_Task_Base +{ +public: + TestTask(int argc, char **argv); + virtual int svc(); + + int parse_args (int argc, char **argv); + + void end(); +private: + CORBA::ORB_var orb_; + CORBA::Boolean shutdown_ns_; +}; + +TestTask::TestTask(int argc, char **argv) +{ + orb_ = CORBA::ORB_init(argc, argv, "ServerORB"); + shutdown_ns_ = false; + parse_args(argc, argv); +} + +void TestTask::end() +{ + orb_->shutdown(0); + wait(); +} + +int +TestTask::parse_args (int argc, char **argv) +{ + ACE_Get_Opt get_opts (argc, argv, "o:s"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 's': + shutdown_ns_ = true; + break; + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + } + // Indicates sucessful parsing of the command line + return 0; +} + +int TestTask::svc() +{ + + try { + // Get reference to Root POA + CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); + PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()); + + // Activate POA Manager + PortableServer::POAManager_var mgr = poa->the_POAManager(); + mgr->activate(); + + // Find the Naming Service + obj = orb_->string_to_object ("corbaloc:iiop:1.2@localhost:9932/NameService"); + CosNaming::NamingContext_var root = + CosNaming::NamingContext::_narrow(obj.in()); + + if (CORBA::is_nil(root.in())) { + ACE_ERROR ((LM_ERROR, "Error, Nil Naming Context reference\n")); + return 1; + } + // Bind the example Naming Context, if necessary + CosNaming::NamingContext_var example_nc; + CosNaming::Name name; + name.length(1); + name[0].id = CORBA::string_dup("example"); + try { + obj = root->resolve(name); + example_nc = + CosNaming::NamingContext::_narrow(obj.in()); + } + catch (CosNaming::NamingContext::NotFound&) { + example_nc = root->bind_new_context(name); + } + + // Bind the Test object + name.length(2); + name[1].id = CORBA::string_dup("Hello"); + + // Create an object + Hello servant(orb_.in ()); + PortableServer::ObjectId_var oid = poa->activate_object(&servant); + obj = poa->id_to_reference(oid.in()); + root->rebind(name, obj.in()); + + ACE_DEBUG ((LM_INFO, "Hello object bound in Naming Service B\n")); + + name.length(1); + obj = orb_->string_to_object ("corbaloc:iiop:1.2@localhost:9931/NameService"); + root = CosNaming::NamingContext::_narrow(obj.in()); + root->bind_context (name, example_nc.in ()); + + ACE_DEBUG ((LM_INFO, "'example' context of NS B bound in Naming Service A\n")); + + CORBA::String_var ior = + orb_->object_to_string (obj.in ()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + ACE_DEBUG ((LM_INFO, "Wrote IOR file\n")); + + // Normally we run the orb and the orb is shutdown by + // calling TestTask::end(). + // Accept requests + orb_->run(); + orb_->destroy(); + + return 0; + } + catch (CORBA::Exception& ex) + { + ex._tao_print_exception ("CORBA exception: "); + } + + return -1; +} + +int main(int argc, char* argv[]) +{ + // Start the Test task + TestTask test_(argc, argv); + test_.activate(); + + // Wait the Test task finish. + test_.wait(); + + return 0; +} diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp index d7339a7eb0b..9cfd6c265c9 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp @@ -17,7 +17,6 @@ ACE_RCSID(Hello, Hello, "$Id$") char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -60,7 +59,6 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h index 63b4ec180be..556409e5d00 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h @@ -20,11 +20,9 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index d01c973448d..c4b1c0400bb 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -345,14 +345,12 @@ RND_Consumer::disconnect (void) void RND_Consumer::push (const CORBA::Any &event) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->driver_->event (event); } void RND_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -424,7 +422,6 @@ RND_Supplier::push (CORBA::Any &event) void RND_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index 20dd4130a11..9287f5bc7f1 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -44,10 +44,8 @@ public: RND_Consumer (RND_Driver *driver); // Constructor - void push (const CORBA::Any &event) - ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const CORBA::Any &event); + void disconnect_push_consumer (void); void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin); void disconnect (void); @@ -76,8 +74,7 @@ class RND_Timer : public RND_Consumer public: RND_Timer (RND_Driver *driver); - void push (const CORBA::Any &event) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const CORBA::Any &event); }; inline @@ -108,8 +105,7 @@ public: void push (CORBA::Any &event); // Push a single event... - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); virtual int svc (void); // Active method diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp index 3a60fabd759..d51f9d3e32b 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp @@ -69,7 +69,6 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance) void CEC_Counting_Consumer::push (const CORBA::Any&) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count ++; #if 0 @@ -85,7 +84,6 @@ CEC_Counting_Consumer::push (const CORBA::Any&) void CEC_Counting_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; this->supplier_proxy_ = @@ -187,7 +185,6 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance) void CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; this->supplier_proxy_ = diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index 7b30ad07f53..e3d0304fc2e 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -49,10 +49,8 @@ public: // = The CosEventComm::PushConsumer methods - virtual void push (const CORBA::Any& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const CORBA::Any& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. CORBA::ULong event_count; @@ -95,8 +93,7 @@ public: CORBA::Any *try_pull (CORBA::Boolean_out has_event); // = The CosEventComm::PullConsumer methods - virtual void disconnect_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_pull_consumer (void); // The skeleton methods. CORBA::ULong event_count; diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index ffd0b5644d7..1fcfae99a24 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -47,7 +47,6 @@ CEC_Counting_Supplier::disconnect (void) void CEC_Counting_Supplier::push (const CORBA::Any&) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -61,7 +60,6 @@ CEC_Counting_Supplier::push (const CORBA::Any&) void CEC_Counting_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; this->consumer_proxy_ = @@ -180,7 +178,6 @@ CEC_Pull_Counting_Supplier::disconnect (void) CORBA::Any* CEC_Pull_Counting_Supplier::pull (void) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) throw CosEventComm::Disconnected (); @@ -200,7 +197,6 @@ CEC_Pull_Counting_Supplier::pull (void) CORBA::Any* CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) throw CosEventComm::Disconnected (); @@ -225,7 +221,6 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event) void CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; this->consumer_proxy_ = diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index b8505bdb9c8..2ff59be1e18 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -45,12 +45,10 @@ public: void disconnect (void); // Simple connect/disconnect methods.. - void push (const CORBA::Any& events) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const CORBA::Any& events); // Push an event. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. CORBA::ULong event_count; @@ -118,12 +116,9 @@ public: // Simple connect/disconnect methods.. // The PullSupplier methods. - CORBA::Any* pull (void) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - CORBA::Any* try_pull (CORBA::Boolean_out has_event) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Any* pull (void); + CORBA::Any* try_pull (CORBA::Boolean_out has_event); + virtual void disconnect_pull_supplier (void); CORBA::ULong event_count; // Count the number of events sent diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 23726697bc7..13b532c93bd 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -402,7 +402,6 @@ Test_Consumer::disconnect (void) void Test_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t arrival = ACE_OS::gethrtime (); this->driver_->push_consumer (this->cookie_, arrival, events); @@ -410,7 +409,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events) void Test_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index 3aea5b9c7d3..c354a41c798 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -41,10 +41,8 @@ public: void disconnect (void); // Disconnect from the EC. - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 9e499db70be..936fdd5195c 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -474,7 +474,6 @@ Test_Supplier::svc () void Test_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index eff3dc62727..718846597cb 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -45,8 +45,7 @@ public: void disconnect (void); // Disconnect from the EC. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The methods in the skeleton. RtecEventComm::EventSourceID supplier_id (void) const; diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp index a7f4dc64cef..dbaff8c8d25 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp @@ -15,7 +15,6 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr) void AddrServer::get_addr (const RtecEventComm::EventHeader&, RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)) { addr = this->addr_; } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h index 7fcc819f905..0f7a7931366 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h @@ -27,8 +27,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecUDPAdmin::UDP_Addr_out addr); private: RtecUDPAdmin::UDP_Addr addr_; diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 40df46d3aec..2d48ae0266f 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -68,7 +68,6 @@ Consumer::disconnect (void) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -88,7 +87,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h index b09bde069d3..00001f37d6c 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h @@ -32,10 +32,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index c07e5d2a770..ff590115fb7 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -77,7 +77,6 @@ Supplier::perform_push (void) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h index 432359e4202..dca5f9b3d8b 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h @@ -36,8 +36,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 021f04d030f..a5a21dad5b4 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -704,7 +704,6 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events) void ECM_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // this->supplier_proxy_->disconnect_push_supplier (); } @@ -811,7 +810,6 @@ ECM_Consumer::close (void) void ECM_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t arrival = ACE_OS::gethrtime (); this->federation_->consumer_push (arrival, events); @@ -819,7 +817,6 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events) void ECM_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index 05c79b18523..96f43929d34 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -186,8 +186,7 @@ public: // Implement the callbacks for our consumer personality. // = The POA_RtecEventComm::PushSupplier methods. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); private: ECM_Local_Federation* federation_; @@ -234,10 +233,8 @@ public: // it. // = The POA_RtecEventComm::PushComsumer methods. - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); private: ECM_Local_Federation* federation_; diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 82b1a79a805..3d90eadbbe0 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -1386,7 +1386,6 @@ Test_Supplier::push (const RtecEventComm::EventSet& events) void Test_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; @@ -1469,7 +1468,6 @@ Test_Consumer::close (void) void Test_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t arrival = ACE_OS::gethrtime (); this->test_->push_consumer (this->cookie_, arrival, events); @@ -1477,7 +1475,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events) void Test_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 5307080c435..7a1cce73f24 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -65,8 +65,7 @@ public: // Implement the callbacks for our consumer personality. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The methods in the skeleton. RtecEventComm::EventSourceID supplier_id (void) const; @@ -123,10 +122,8 @@ public: void close (void); // Disconnect from the EC. - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 8ce4695e239..cef7a0fd846 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -107,7 +107,6 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const void Test_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -163,6 +162,5 @@ Test_Consumer::push (const RtecEventComm::EventSet& events) void Test_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index 5621cc3d99a..d7d39b9c440 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -58,10 +58,8 @@ public: void accumulate (ACE_Throughput_Stats& stats) const; // Add our throughput and latency statistics to <stats> - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 9563f5e9e12..f5b5e192edb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -259,7 +259,6 @@ Consumer::dump_results (int base_count, void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h index 15356ef9f95..3fb3f235148 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h @@ -40,8 +40,7 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); /// Number of events of type <event_base_type_> received. CORBA::ULong event_base_count; diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 59c00b65055..345bcd20d64 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -146,7 +146,6 @@ Simple_Address_Server (const ACE_INET_Addr& address) void Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&, RtecUDPAdmin::UDP_Addr& address) - ACE_THROW_SPEC ((CORBA::SystemException)) { address = this->address_; } diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 99048d0c9ab..de5000e101e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -73,8 +73,7 @@ public: Simple_Address_Server (const ACE_INET_Addr& address); virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr& address) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecUDPAdmin::UDP_Addr& address); private: /// The UDP addres... diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index 110ba5b8122..d6af8fe7a5e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -159,7 +159,6 @@ Consumer::Consumer (const char* name, void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index dbf5944fcab..11e82c8fd7e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.h +++ b/TAO/orbsvcs/tests/Event/Basic/Control.h @@ -34,8 +34,7 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); private: /// After this number of events the consumer disconnects from the diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index b75ab7c31ef..cd8641c38f6 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -358,7 +358,6 @@ RND_Driver::event (const RtecEventComm::Event &e) void RND_Timer::push (const RtecEventComm::EventSet &event) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -406,14 +405,12 @@ RND_Consumer::disconnect (void) void RND_Consumer::push (const RtecEventComm::EventSet &event) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->driver_->event (event[0]); } void RND_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -483,7 +480,6 @@ RND_Supplier::push (RtecEventComm::EventSet &event) void RND_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index b18d4a3e44d..5ef4c3b5652 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -35,10 +35,8 @@ public: /// Constructor RND_Consumer (RND_Driver *driver); - void push (const RtecEventComm::EventSet &event) - ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet &event); + void disconnect_push_consumer (void); void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, const RtecEventChannelAdmin::ConsumerQOS &qos); @@ -68,8 +66,7 @@ class RND_Timer : public RND_Consumer public: RND_Timer (RND_Driver *driver); - void push (const RtecEventComm::EventSet &event) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet &event); }; inline @@ -101,8 +98,7 @@ public: void push_new_event (void); void push (RtecEventComm::EventSet &event); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); /// Active method virtual int svc (void); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp index 0be36c4b49b..ce760d23290 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp @@ -74,7 +74,6 @@ EC_Wrapper::init (CORBA::ORB_ptr orb, RtecEventChannelAdmin::ConsumerAdmin_ptr EC_Wrapper::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->ec_impl_) return this->ec_impl_->for_consumers (); @@ -84,7 +83,6 @@ EC_Wrapper::for_consumers (void) RtecEventChannelAdmin::SupplierAdmin_ptr EC_Wrapper::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->ec_impl_) return this->ec_impl_->for_suppliers (); @@ -94,7 +92,6 @@ EC_Wrapper::for_suppliers (void) void EC_Wrapper::destroy_ec (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { auto_ptr<TAO_EC_Event_Channel> ec_impl_aptr (this->ec_impl_); this->ec_impl_ = 0; @@ -107,7 +104,6 @@ EC_Wrapper::destroy_ec (void) void EC_Wrapper::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister from POA. this->deactivator_.deactivate (); @@ -127,10 +123,6 @@ EC_Wrapper::destroy (void) RtecEventChannelAdmin::Observer_Handle EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { if (this->ec_impl_) return this->ec_impl_->append_observer (observer); @@ -140,10 +132,6 @@ EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer) void EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { if (this->ec_impl_) this->ec_impl_->remove_observer (handle); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h index adc71f8e9b5..83874c32241 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h @@ -44,28 +44,17 @@ public: /// RtecEventChannelAdmin::Event_Channel methods. //@{ virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); /// Destroy the Event Channel, deactivate from POA, and shut down /// the ORB. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); - virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr observer); + virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle); //@} protected: @@ -78,8 +67,7 @@ private: /// Helper - destroys Event Channel and deactivate from POA, if /// necessary. - void destroy_ec (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy_ec (void); /// Event Channel implementation. /* diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 95784c8e4dc..b2d3faef8f6 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -19,19 +19,16 @@ public: //@{ /// Logs each event. Initiates shutdown after receiving 100 events /// of each type. - virtual void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet &events); /// No-op. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); private: /// Helper - destroys EC, shutdowns the ORB and prints number of /// events received. - void disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void disconnect (void); /// Number of events of different types pushed to us by EC. //@{ @@ -57,7 +54,6 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb, void EC_Consumer::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < events.length (); ++i) { @@ -91,13 +87,11 @@ EC_Consumer::push (const RtecEventComm::EventSet &events) void EC_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void EC_Consumer::disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->a_events_ == 100 && this->b_events_ == 100 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 558d0b83ad9..42f4cff3add 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -18,11 +18,9 @@ public: /// PushConsumer methods. //@{ /// Logs each event. Initiates shutdown after receiving 100 events. - virtual void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet &events); /// No-op. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); //@} private: @@ -49,7 +47,6 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb, void EC_Consumer::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < events.length (); ++i) { @@ -63,7 +60,6 @@ EC_Consumer::push (const RtecEventComm::EventSet &events) void EC_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 0ce53838c4f..42b615358aa 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -71,12 +71,10 @@ public: /// PushConsumer methods. //@{ /// Update our <heartbeats_> database to reflect newly received heartbeats. - virtual void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet &events); /// Initiate shutdown(). - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); //@} private: @@ -401,7 +399,6 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&, void Heartbeat_Application::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < events.length (); ++i) { @@ -447,7 +444,6 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events) void Heartbeat_Application::disconnect_push_consumer (void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->shutdown (); } diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index d43c466728c..104af8dffe2 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -290,7 +290,6 @@ EC_Latency_Consumer::done (void) void EC_Latency_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t creation; ORBSVCS_Time::TimeT_to_hrtime (creation, @@ -310,7 +309,6 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events) void EC_Latency_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -322,7 +320,6 @@ EC_Latency_Supplier::EC_Latency_Supplier (void) void EC_Latency_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index b88d5855ba1..f09e9ad531e 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -41,10 +41,8 @@ public: /// Return 1 when all the messages have been received int done (void); - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); private: /// Roundtrip delays are recorded here @@ -65,8 +63,7 @@ public: /// Constructor EC_Latency_Supplier (void); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); }; // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp index c7ba18ae47b..79c0d07e1bf 100644 --- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp @@ -12,7 +12,6 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr) void AddrServer::get_addr (const RtecEventComm::EventHeader&, RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)) { addr = this->addr_; } diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h index deeced433db..de7aeb6d590 100644 --- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h +++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h @@ -40,8 +40,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecUDPAdmin::UDP_Addr_out addr); private: RtecUDPAdmin::UDP_Addr addr_; diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp index 05968cd88b8..7335f2aa543 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp @@ -76,7 +76,6 @@ Consumer::disconnect (void) void Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -132,7 +131,6 @@ Consumer::push (const RtecEventComm::EventSet& events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h index 0442a5ff6e2..e805bbb8236 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h @@ -45,10 +45,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); // The skeleton methods. CORBA::ULong event_count (void) const; diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp index b06c957738f..72c83e70cdc 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp @@ -96,7 +96,6 @@ Supplier::perform_push (void) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h index f8de21817f6..52c17eb22f9 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h @@ -50,8 +50,7 @@ public: // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index f94031f8750..b4c324ca6e0 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -101,7 +101,6 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const void EC_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->driver_->consumer_push (this->cookie_, events); @@ -145,7 +144,6 @@ EC_Consumer::push (const RtecEventComm::EventSet& events) void EC_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->driver_->consumer_disconnect (this->cookie_); this->supplier_proxy_ = diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index e7e0eb758de..a4fbff85dea 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -77,10 +77,8 @@ public: // = The RtecEventComm::PushConsumer methods /// The skeleton methods. - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); private: /// The main driver for the test. diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index e3fa9afacbb..ad1d409fb6b 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -75,7 +75,6 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance) void EC_Counting_Consumer::push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) { @@ -98,7 +97,6 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events) void EC_Counting_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; this->supplier_proxy_ = diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h index 5c63615d8f5..5627999653d 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h @@ -48,10 +48,8 @@ public: // = The RtecEventComm::PushConsumer methods /// The skeleton methods. - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); /// Keep track of the number of events received. CORBA::ULong event_count; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index da31b33f29d..0ce3c6e4be9 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -112,7 +112,6 @@ EC_Counting_Supplier::disconnect (void) void EC_Counting_Supplier::push (const RtecEventComm::EventSet&) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -129,13 +128,11 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&) void EC_Counting_Supplier::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void EC_Counting_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; this->consumer_proxy_ = diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index 54702a32de9..702df0b6743 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -59,14 +59,11 @@ public: void disconnect (void); /// The Consumer side methods. - void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet& events); + void disconnect_push_consumer (void); /// The skeleton methods. - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); /// Count the number of events sent CORBA::ULong event_count; diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index e1c135d0398..95613a79b39 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -164,7 +164,6 @@ EC_Supplier::shutdown (void) void EC_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->driver_->supplier_disconnect (this->cookie_); this->consumer_proxy_ = diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index a5bd9d2fb1e..4db8b23cdf5 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -94,8 +94,7 @@ public: RtecEventComm::Event& event); // = The PushSupplier methods - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); private: /// Class we forward to. diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 36f13748307..66dcf920711 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -590,14 +590,6 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object ( const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::NoFactory - , PortableGroup::ObjectNotCreated - , PortableGroup::InvalidCriteria - , PortableGroup::InvalidProperty - , PortableGroup::CannotMeetCriteria - )) { METHOD_ENTRY(FT_ReplicaFactory_i::create_object); ACE_UNUSED_ARG (type_id); @@ -685,10 +677,6 @@ FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name) void FT_ReplicaFactory_i::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectNotFound - )) { METHOD_ENTRY(FT_ReplicaFactory_i::delete_object); @@ -715,16 +703,12 @@ void FT_ReplicaFactory_i::delete_object ( } CORBA::Boolean FT_ReplicaFactory_i::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_RETURN(FT_ReplicaFactory_i::is_alive) 1; } void FT_ReplicaFactory_i::shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { METHOD_ENTRY(FT_FaultDetectorFactory_i::shutdown); InternalGuard guard (this->internals_); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h index ca8eec537e8..4d04baba07e 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h @@ -105,10 +105,7 @@ public: // CORBA interface // See IDL for documentation - virtual void shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void shutdown (void); ///////////////////////////////////////// // CORBA interface GenericFactory methods @@ -116,29 +113,16 @@ public: const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::NoFactory - , PortableGroup::ObjectNotCreated - , PortableGroup::InvalidCriteria - , PortableGroup::InvalidProperty - , PortableGroup::CannotMeetCriteria - )); + ); virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectNotFound - )); + ); ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); ///////////////////////// // Implementation methods diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index bb6837089ea..7fe89a379d5 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -250,7 +250,6 @@ int FT_TestReplica_i::fini (void) ///////////////////////////////////////////////////// // class FT_TestReplica_i: PullMonitorable interface CORBA::Boolean FT_TestReplica_i::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { KEVORKIAN_RETURN(DURING_IS_ALIVE, is_alive, 0) ACE_ERROR ((LM_ERROR, @@ -267,7 +266,6 @@ CORBA::Boolean FT_TestReplica_i::is_alive (void) ///////////////////////////////////////////////////// // class FT_TestReplica_i: Updateable interface FT::State * FT_TestReplica_i::get_update (void) - ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable)) { KEVORKIAN_RETURN(DURING_GET_UPDATE, get_update, 0) long counter = load(); @@ -278,7 +276,6 @@ FT::State * FT_TestReplica_i::get_update (void) } void FT_TestReplica_i::set_update (const FT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate)) { #if defined(FT_TEST_LACKS_UPDATE) throw FT::InvalidUpdate (); @@ -293,7 +290,6 @@ void FT_TestReplica_i::set_update (const FT::State & s) ///////////////////////////////////////////////////// // class FT_TestReplica_i: Checkpointable interface ::FT::State * FT_TestReplica_i::get_state (void) - ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable)) { #if defined(FT_TEST_LACKS_STATE) throw FT::NoStateAvailable (); @@ -308,7 +304,6 @@ void FT_TestReplica_i::set_update (const FT::State & s) } void FT_TestReplica_i::set_state (const FT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState)) { #if defined(FT_TEST_LACKS_STATE) throw FT::InvalidState (); @@ -325,7 +320,6 @@ void FT_TestReplica_i::tao_update_object_group ( PortableGroup::ObjectGroupRefVersion version, CORBA::Boolean is_primary ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (iogr); ACE_UNUSED_ARG (version); @@ -338,7 +332,6 @@ void FT_TestReplica_i::tao_update_object_group ( // implement FT_TEST::Replica void FT_TestReplica_i::set (CORBA::Long value) - ACE_THROW_SPEC ((CORBA::SystemException)) { KEVORKIAN(BEFORE_STATE_CHANGE, set) long counter = value; @@ -347,7 +340,6 @@ void FT_TestReplica_i::set (CORBA::Long value) } CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta) - ACE_THROW_SPEC ((CORBA::SystemException)) { KEVORKIAN_RETURN(BEFORE_STATE_CHANGE, increment, 0) long counter = load (); @@ -358,7 +350,6 @@ CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta) } CORBA::Long FT_TestReplica_i::get (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { KEVORKIAN_DURING_RETURN(get, 0) long counter = load (); @@ -366,7 +357,6 @@ CORBA::Long FT_TestReplica_i::get (void) } CORBA::Long FT_TestReplica_i::counter (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { KEVORKIAN_DURING_RETURN([get]counter, 0) long counter = load (); @@ -374,7 +364,6 @@ CORBA::Long FT_TestReplica_i::counter (void) } void FT_TestReplica_i::counter (CORBA::Long counter) - ACE_THROW_SPEC ((CORBA::SystemException)) { KEVORKIAN(BEFORE_STATE_CHANGE, [set]counter) store (counter); @@ -382,7 +371,6 @@ void FT_TestReplica_i::counter (CORBA::Long counter) } void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane when) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_OS::fprintf (stdout, "%s@%s#%lu Received death threat: %d\n", name_.c_str(), this->factory_->location(), this->factory_id_, when); @@ -392,7 +380,6 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane when) } void FT_TestReplica_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n", name_.c_str(), this->factory_->location(), this->factory_id_); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h index b7b99dc33f0..7e3e5147af9 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h @@ -96,47 +96,35 @@ public: private: /////////////////////////// // override Replica methods - virtual void set (CORBA::Long value) - ACE_THROW_SPEC (( CORBA::SystemException)); + virtual void set (CORBA::Long value); - virtual CORBA::Long increment (CORBA::Long delta) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long increment (CORBA::Long delta); - virtual CORBA::Long get (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long get (void); - virtual CORBA::Long counter (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long counter (void); - virtual void counter (CORBA::Long counter) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void counter (CORBA::Long counter); - virtual void die (FT_TEST::TestReplica::Bane when) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void die (FT_TEST::TestReplica::Bane when); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); /////////////////////////// // override PullMonitorable - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); /////////////////////////// // override Updatable - virtual ::FT::State * get_update (void) - ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable)); + virtual ::FT::State * get_update (void); - virtual void set_update (const FT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate)); + virtual void set_update (const FT::State & s); - virtual ::FT::State * get_state (void) - ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable)); + virtual ::FT::State * get_state (void); - virtual void set_state (const FT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState)); + virtual void set_state (const FT::State & s); //////////////// // Implement TAO_UpdateObjectGroup @@ -145,8 +133,7 @@ private: const char * iogr, PortableGroup::ObjectGroupRefVersion version, CORBA::Boolean is_primary - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); ///////////////// // implementation diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index e57d6787089..34065840e40 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -123,10 +123,6 @@ int StubBatchConsumer::idle(int & result) void StubBatchConsumer::push_structured_events ( const CosNotification::EventBatch & notifications ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventComm::Disconnected - )) { ACE_UNUSED_ARG (notifications); //@@ sequence of structured event handling not written yet @@ -136,7 +132,6 @@ void StubBatchConsumer::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -149,9 +144,6 @@ void StubBatchConsumer::offer_change ( //virtual void StubBatchConsumer::disconnect_sequence_push_consumer ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_ERROR ((LM_ERROR, "StubBatchConsumer:disconnect_sequence_push_consumer interpreted as quit request.\n" diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h index 24f067a4fd2..2712f5bbdf3 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h @@ -76,25 +76,15 @@ public: virtual void push_structured_events ( const CosNotification::EventBatch & notifications - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventComm::Disconnected - )); + ); virtual void disconnect_sequence_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, CosNotifyComm::InvalidEventType - )); + ); //////////////////// // Forbidden methods diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 3dfc0f4bdb5..b5f8aea762b 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -236,7 +236,6 @@ int StubFaultConsumer::idle(int & result) void StubFaultConsumer::push_structured_event( const CosNotification::StructuredEvent ¬ification ) - ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { //////////////////////////////////////// // keep track of how many we've received @@ -280,7 +279,6 @@ void StubFaultConsumer::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -290,7 +288,6 @@ void StubFaultConsumer::offer_change ( } void StubFaultConsumer::disconnect_structured_push_consumer(void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ERROR ((LM_ERROR, "StubFaultConsumer:disconnect_structured_push_consumer interpreted as quit request.\n" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 111d44eac95..89a59f19b28 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -79,17 +79,14 @@ public: // CORBA methods virtual void push_structured_event( const CosNotification::StructuredEvent ¬ification - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)); + ); virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)); + ); - virtual void disconnect_structured_push_consumer(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_structured_push_consumer(void); //////////////////// // Forbidden methods diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index c121257c59f..6ed5f3e9c0e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -334,7 +334,6 @@ void StubFaultNotifier::shutdown_i (void) void StubFaultNotifier::push_structured_fault ( const CosNotification::StructuredEvent & event ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ERROR ((LM_ERROR, "FaultNotifier: Received Fault notification:\n" @@ -363,9 +362,6 @@ void StubFaultNotifier::push_structured_fault ( void StubFaultNotifier::push_sequence_fault ( const CosNotification::EventBatch & events ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_UNUSED_ARG (events); throw CORBA::NO_IMPLEMENT(); @@ -374,10 +370,6 @@ void StubFaultNotifier::push_sequence_fault ( ::CosNotifyFilter::Filter_ptr StubFaultNotifier::create_subscription_filter ( const char * constraint_grammar ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosNotifyFilter::InvalidGrammar - )) { ACE_UNUSED_ARG (constraint_grammar); throw CORBA::NO_IMPLEMENT(); @@ -389,9 +381,6 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_structured_fault_consum CosNotifyComm::StructuredPushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_UNUSED_ARG(push_consumer); ACE_UNUSED_ARG(filter); @@ -405,9 +394,6 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer CosNotifyComm::SequencePushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_UNUSED_ARG(push_consumer); ACE_UNUSED_ARG(filter); @@ -419,10 +405,6 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer void StubFaultNotifier::disconnect_consumer ( FT::FaultNotifier::ConsumerId connection ) - ACE_THROW_SPEC (( - CORBA::SystemException - , CosEventComm::Disconnected - )) { ACE_UNUSED_ARG(connection); @@ -430,7 +412,6 @@ void StubFaultNotifier::disconnect_consumer ( } CORBA::Boolean StubFaultNotifier::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h index 7197c9a72fa..5b336720dd1 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h @@ -84,40 +84,33 @@ public: virtual void push_structured_fault ( const CosNotification::StructuredEvent & event - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void push_sequence_fault ( const CosNotification::EventBatch & events - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter ( const char * constraint_grammar - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar)); + ); virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer, CosNotifyFilter::Filter_ptr filter - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void disconnect_consumer ( FT::FaultNotifier::ConsumerId connection - ) - ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)); + ); ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); ///////////////// // Implementation diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 4f193a80688..bfdb8218cf7 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -191,7 +191,6 @@ int TAO::Object_Group_Creator::create_detector_for_replica ( CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group ( const char * type_id) - ACE_THROW_SPEC ( (CORBA::SystemException )) { CORBA::Object_var group = CORBA::Object::_nil (); @@ -244,7 +243,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group CORBA::Object_ptr TAO::Object_Group_Creator::create_group ( const char * role, int write_iors) - ACE_THROW_SPEC ( (CORBA::SystemException )) { CORBA::Object_var group = CORBA::Object::_nil (); diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h index 7cbd507c530..87adda9aeaf 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h @@ -50,14 +50,12 @@ namespace TAO // functionality CORBA::Object_ptr create_group( const char * role, - int write_iors) - ACE_THROW_SPEC ((CORBA::SystemException)); + int write_iors); ///////////////// // functionality CORBA::Object_ptr create_infrastructure_managed_group( - const char * type_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * type_id); int unregister_role(const char * role); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp index e81d1e0ddfc..9dea6f91d01 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp @@ -19,14 +19,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; // Install the server request interceptor. diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h index a4a8999d72a..fa650dc5676 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h @@ -48,11 +48,9 @@ public: /// Constructor. Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index dc02d137738..dde606cbff8 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -25,7 +25,6 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) void Server_Request_Interceptor::reset () - ACE_THROW_SPEC ((CORBA::SystemException)) { this->request_count_ = 0; this->forward_request_thrown_ = false; @@ -35,7 +34,6 @@ void Server_Request_Interceptor::forward_references ( CORBA::Object_ptr obj1, CORBA::Object_ptr obj2) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2)) throw CORBA::INV_OBJREF ( @@ -61,14 +59,12 @@ Server_Request_Interceptor::forward_references ( char * Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::release (this->obj_[0]); CORBA::release (this->obj_[1]); @@ -77,8 +73,6 @@ Server_Request_Interceptor::destroy (void) void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { this->request_count_++; @@ -124,8 +118,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (this->request_count_ == 8) { @@ -180,22 +172,17 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h index 0f1ea6e848d..5dc35aa4be1 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h @@ -51,12 +51,10 @@ public: /// Set the references to which requests will be forwarded. virtual void forward_references (CORBA::Object_ptr obj1, - CORBA::Object_ptr obj2) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Object_ptr obj2); /// Reset to initial state, like counter etc, keeps the object-references - virtual void reset () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void reset (); /** @@ -69,35 +67,24 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp index 283aae38b3c..b25a7d02ce9 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp @@ -19,14 +19,12 @@ test_i::~test_i (void) CORBA::Short test_i::number (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h index d22fba97d4c..5b9bb5ed552 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h @@ -33,12 +33,10 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short number (void); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index bbe23477614..8754b8bacb0 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -21,7 +21,6 @@ Simple_Server_i::Simple_Server_i (void) void Simple_Server_i::remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Print out from process id (%P) hosting the servant \n"))); @@ -32,7 +31,6 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h index d9cdfe56754..47adea6b740 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h @@ -34,11 +34,9 @@ public: // ctor // = The Simple_Server methods. - void remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void remote_call (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 32392aefe58..09440fb3def 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -18,9 +18,6 @@ PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb) void PushConsumer_impl::push (const RtecEventComm::EventSet & event ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { CORBA::ULong x; ACE_Time_Value time_val = ACE_OS::gettimeofday (); @@ -36,9 +33,6 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event void PushConsumer_impl::disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { PortableServer::Current_var current = resolve_init<PortableServer::Current>(orb_.in(), "POACurrent"); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h index 950766fe295..c1af32ca71f 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h @@ -22,16 +22,10 @@ public: virtual void push ( const RtecEventComm::EventSet & data - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void disconnect_push_consumer ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: CORBA::ORB_var orb_; PushConsumer_impl(const PushConsumer_impl&); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 28deb58d382..693fe30f472 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -89,9 +89,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) void PushSupplier_impl::disconnect_push_supplier ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { reactor_task_.reactor_->end_reactor_event_loop(); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h index 28f36099c86..fbd6601a062 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h @@ -30,10 +30,7 @@ public: int init(RtecEventChannelAdmin::EventChannel_ptr); virtual void disconnect_push_supplier ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: class ReactorTask : public ACE_Task_Base diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp index d08b2f33c52..83ca917173f 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp @@ -33,8 +33,6 @@ CORBA::Long AMI_Test_i::foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str) - ACE_THROW_SPEC ((CORBA::SystemException, - A::DidTheRightThing)) { out_l = 931233; @@ -58,7 +56,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -66,7 +63,6 @@ AMI_Test_i::shutdown (void) CORBA::Long AMI_Test_i::yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n")); @@ -76,7 +72,6 @@ AMI_Test_i::yadda (void) void AMI_Test_i::yadda (CORBA::Long yadda) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%N:%l:(%P:%t):AMI_Test_i::(set_)yadda\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h index 9788a022b3b..edc62b03212 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h @@ -33,18 +33,13 @@ public: // The AMI_Test methods. CORBA::Long foo (CORBA::Long_out out_l, CORBA::Long in_l, - const char* in_str) - ACE_THROW_SPEC ((CORBA::SystemException, - A::DidTheRightThing)); + const char* in_str); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); - CORBA::Long yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long yadda (void); - void yadda (CORBA::Long yadda) - ACE_THROW_SPEC ((CORBA::SystemException)); + void yadda (CORBA::Long yadda); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index cce401a6901..2d50b5a9de6 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -102,7 +102,6 @@ public: void foo (CORBA::Long result, CORBA::Long out_l) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) { @@ -116,7 +115,6 @@ public: }; void foo_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -132,7 +130,6 @@ public: }; void get_yadda (CORBA::Long result) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda> called: result <%d>\n", @@ -140,21 +137,18 @@ public: }; void get_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda_excep> called: \n")); }; void set_yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda> called: \n")); }; void set_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called: \n")); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index d1d6b541274..89fa19c457a 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -80,7 +80,6 @@ public: void foo (CORBA::Long ami_return_val, CORBA::Long out_l) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) { @@ -92,7 +91,6 @@ public: }; void foo_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -116,7 +114,6 @@ public: void get_yadda (CORBA::Long result) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda> called: result <%d>\n", @@ -124,21 +121,18 @@ public: }; void get_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda_excep> called: \n")); }; void set_yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda> called: \n")); }; void set_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called: \n")); diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp index dc7f9f97136..f8878cd9957 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp @@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional, test_i, "$Id$") void Callback_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (0); @@ -23,7 +22,6 @@ Callback_i::shutdown (void) void Callback_i::callback_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Callback method called \n")); @@ -35,7 +33,6 @@ Callback_i::callback_method (void) CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { @@ -48,7 +45,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object this->callback_ = Callback::_duplicate (callback); @@ -86,7 +82,6 @@ Simple_Server_i::call_client (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h index 33333f74968..cc4725dc141 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h @@ -31,12 +31,10 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); // Safe way to shutdown - void callback_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_method (void); // The callback method private: @@ -58,14 +56,11 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Boolean do_callback); - void callback_object (Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_object (Callback_ptr callback); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); int call_client (void); diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp index 2b00e7b4331..dd1638af6b2 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp @@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "in get_string\n")); return CORBA::string_dup ("Hello there!"); @@ -20,7 +19,6 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); ACE_DEBUG ((LM_DEBUG,"in shutdown\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h index ea78ac96072..0afa1750f24 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h @@ -22,11 +22,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp index e178808d455..cc99975fe44 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp @@ -9,7 +9,6 @@ MCast_Server_i::MCast_Server_i (void) CORBA::Boolean MCast_Server_i::connect_server (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h index 693419395cb..f325761243f 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h @@ -11,8 +11,7 @@ public: // Simple method just to see that the client contacted the // server. If does contact, a '0' is returned. - CORBA::Boolean connect_server (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean connect_server (void); }; #endif /* MCAST_SERVER_I_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp index c54fdfffb31..769eadd5a2d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp @@ -4,7 +4,6 @@ CORBA::Boolean Messenger_i::send_message (const char *user_name, const char *subject, char *& message) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Message from: %s\nSubject: %s\nMessage: %s" "\n"), user_name, subject, message)); diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h index 2c5a471b433..0fadc985960 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h @@ -14,8 +14,7 @@ public: {} virtual CORBA::Boolean - send_message (const char *user_name, const char *subject, char *&message) - ACE_THROW_SPEC((CORBA::SystemException)); + send_message (const char *user_name, const char *subject, char *&message); private: int count_; diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp index 3276aac194c..725220e589e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp @@ -30,7 +30,6 @@ Airplane_i::~Airplane_i (void) char * Airplane_i::get_plane (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n")); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h index da4beedac2f..2f2962f1d5a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h @@ -48,8 +48,7 @@ public: ~Airplane_i (void); /// Returns a random plane. - virtual char *get_plane (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char *get_plane (void); }; #endif /* AIRPLANE_I_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 654899816c0..562e5da3485 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -35,7 +35,6 @@ Nestea_i::~Nestea_i (void) void Nestea_i::drink (CORBA::Long cans) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::drink %d cans\n", cans)); @@ -50,7 +49,6 @@ Nestea_i::drink (CORBA::Long cans) void Nestea_i::crush (CORBA::Long cans) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::crush %d cans\n", cans)); @@ -68,7 +66,6 @@ Nestea_i::crush (CORBA::Long cans) CORBA::Long Nestea_i::bookshelf_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n")); @@ -80,7 +77,6 @@ Nestea_i::bookshelf_size (void) char * Nestea_i::get_praise (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n")); @@ -99,7 +95,6 @@ Nestea_i::get_praise (void) void Nestea_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::shutdown\n")); diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h index 5a7ea6eb25d..6d09301bc10 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h @@ -45,23 +45,18 @@ public: virtual ~Nestea_i (void); /// Add <cans> number of cans to the bookshelf. - virtual void drink (CORBA::Long cans) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void drink (CORBA::Long cans); /// Removes <cans> number of cans from the bookshelf. - virtual void crush (CORBA::Long cans) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void crush (CORBA::Long cans); /// Returns the number of cans in the bookshelf. - virtual CORBA::Long bookshelf_size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long bookshelf_size (void); /// Returns comments about your collection. - virtual char *get_praise (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char *get_praise (void); - virtual void shutdown(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown(void); private: /// Saves bookshelf data to a file. int save_data (void); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp index 86bd5e8b464..c1fdcb889ee 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp @@ -15,7 +15,6 @@ CORBA::Boolean inventory_i::getCDinfo (const char * artist, char *& title, CORBA::Float_out price) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean in_stock = 0; price = 0.0f; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h index 35a178c0d4b..1554203f924 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h @@ -12,7 +12,6 @@ class inventory_i : public POA_warehouse::inventory public: CORBA::Boolean getCDinfo (const char * artist, char *& title, - CORBA::Float_out price) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Float_out price); }; diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 422a144f817..e37fe89b531 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -64,7 +64,7 @@ class NContextExt_Client_i char * get_name (void); // Generates a random name - int argc_; + int argc_; // # of arguments on the command line. char **argv_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp index 47a13d574c1..13b86e01d0f 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp @@ -20,14 +20,12 @@ Basic::Basic (CORBA::Object_ptr object_group, char * Basic::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->location_); } void Basic::remove_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -60,7 +58,6 @@ Basic::remove_member (void) void Basic::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h index 9cfeea8e6ca..fcc5ee719c0 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h @@ -27,14 +27,11 @@ public: CORBA::ORB_ptr orb, const char *loc); - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual void remove_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void remove_member (void); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp index 80adbc78677..8b33a533185 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp @@ -17,12 +17,6 @@ Factory::create_object ( const char * /*type_id*/, const PortableGroup::Criteria & /*the_criteria*/, PortableGroup::GenericFactory::FactoryCreationId_out fcid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)) { Simple *servant; @@ -68,8 +62,6 @@ void Factory::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & fcid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { CORBA::ULong my_fcid = 0; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h index 925b241a31e..7ad15cded9f 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h @@ -31,13 +31,7 @@ public: const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)); + factory_creation_id); /// The LoadManager is passed the FactoryCreationId, it received /// from the create_object () call. @@ -45,9 +39,7 @@ public: virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + factory_creation_id); private: /// The factory creation id. CORBA::ULong fcid_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp index cd173291fe0..1b3a9a3a99a 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp @@ -12,7 +12,6 @@ Simple::Simple (void) char * Simple::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO Load Balancing Works!"); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h index d8767be2696..12eccd1512d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h @@ -20,8 +20,7 @@ public: Simple (void); /// Constructor - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); }; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp index b776dcc513a..dee11993c13 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp @@ -22,21 +22,18 @@ Basic::Basic (CORBA::Object_ptr object_group, CORBA::Short Basic::number (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } char * Basic::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->location_); } void Basic::remove_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -69,7 +66,6 @@ Basic::remove_member (void) void Basic::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h index 5f8a5eb3465..b53ae03f1a7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h @@ -26,17 +26,13 @@ public: CORBA::Short num, const char *loc); - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual void remove_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void remove_member (void); - virtual CORBA::Short number (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short number (void); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp index ca076d4782c..323bbfa3662 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp @@ -22,21 +22,18 @@ Simple::Simple (CORBA::Object_ptr object_group, CORBA::Short Simple::number (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } char * Simple::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->location_); } void Simple::remove_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -69,7 +66,6 @@ Simple::remove_member (void) void Simple::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h index 5a274f26153..c21ff402b60 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h @@ -28,17 +28,13 @@ public: CORBA::Short num, const char *loc); - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual void remove_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void remove_member (void); - virtual CORBA::Short number (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short number (void); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp index 1043b523d26..10dd672650c 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp @@ -16,7 +16,6 @@ McastHello::McastHello (CORBA::ORB_ptr orb, void McastHello::send_forty_two (CORBA::Long forty_two) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->small_request_status_ == 0 && forty_two == 42) @@ -29,7 +28,6 @@ McastHello::send_forty_two (CORBA::Long forty_two) void McastHello::send_large_octet_array (const Test::Octets &payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean valid_payload = 1; for (CORBA::ULong i = 0; i < payload.length (); ++i) @@ -56,7 +54,6 @@ McastHello::send_large_octet_array (const Test::Octets &payload) void McastHello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h index 09a94708ee8..c6a85237a95 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h @@ -18,18 +18,15 @@ public: int instance); // = The skeleton methods - virtual void send_forty_two (CORBA::Long forty_two) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_forty_two (CORBA::Long forty_two); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); /// Return whether all test requests have been received successfully. CORBA::Boolean get_status (); // Silence the builds - void send_large_octet_array (const Test::Octets &) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_large_octet_array (const Test::Octets &); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index d18ea21d273..13be4bf52ae 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -108,7 +108,6 @@ AdminProperties_StructuredPushConsumer::AdminProperties_StructuredPushConsumer ( void AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/ ) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { ++events_received_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h index 91f171853f5..5ce59f56701 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h @@ -32,11 +32,7 @@ public: // = StructuredPushSupplier methods virtual void push_structured_event (const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); protected: AdminProperties* client_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 788c8e2e44d..3980a578d17 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -18,8 +18,6 @@ void Event_StructuredPushConsumer::push_structured_event ( const CosNotification::StructuredEvent & notification ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { int event_num; notification.filterable_data[0].value >>= event_num; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h index f4e6c2b8217..fe3e038ba46 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h @@ -37,9 +37,7 @@ public: // = StructuredPushSupplier methods. virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); protected: Events * test_client_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index 3497a62013f..d5177fa07b7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -17,10 +17,6 @@ MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client) void MultiTypes_PushConsumer::push (const CORBA::Any & /*data*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { client_->on_received_event (this); } @@ -35,10 +31,6 @@ MultiTypes_StructuredPushConsumer::MultiTypes_StructuredPushConsumer (MultiTypes void MultiTypes_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { client_->on_received_event (this); } @@ -55,10 +47,6 @@ MultiTypes_SequencePushConsumer::MultiTypes_SequencePushConsumer (MultiTypes* cl void MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch & /*notifications*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { client_->on_received_event (this); } diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h index 4b8fa5ed939..1d8e3af7ddf 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h @@ -40,11 +40,7 @@ public: void push ( const CORBA::Any & data - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); protected: MultiTypes* client_; @@ -59,11 +55,7 @@ public: // = StructuredPushSupplier methods virtual void push_structured_event (const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); protected: MultiTypes* client_; @@ -77,11 +69,7 @@ public: // = SequencePushConsumer methods virtual void push_structured_events ( const CosNotification::EventBatch & notifications - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); protected: MultiTypes* client_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index 67ada03200b..a47a9314e37 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -19,8 +19,6 @@ void SequencePushConsumer::push_structured_events ( const CosNotification::EventBatch &batch ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { this->test_client_->events_received_ += batch.length (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index f54484b6de3..08e499df957 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -36,11 +36,7 @@ public: // = SequencePushConsumer methods virtual void push_structured_events ( const CosNotification::EventBatch & notifications - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); protected: Sequence* test_client_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index faa27ba5776..79690c36c2c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -16,8 +16,6 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client) void Event_AnyPushConsumer::push (const CORBA::Any & data) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { int event_num; data >>= event_num; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index ed80e117075..ef89670dfe7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -38,9 +38,7 @@ public: // = PushSupplier methods virtual void push ( const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); protected: Simple_Test * test_client_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index 6725fe62063..293f27e2899 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -17,10 +17,6 @@ Updates_StructuredPushConsumer::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer::offer_change invoked:\n")); @@ -43,8 +39,6 @@ Updates_StructuredPushSupplier::subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "StructuredPushSupplier::subscription_change invoked:\n")); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h index e5a222c600a..91a2421db19 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h @@ -35,9 +35,7 @@ public: // Contructor. virtual void offer_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + const CosNotification::EventTypeSeq & removed); // Offer change is conveyed here. protected: @@ -58,9 +56,7 @@ public: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); // Subscription change is conveyed here. protected: diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index da30915c6a8..9db620c8143 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -27,7 +27,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); @@ -76,7 +75,6 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event ( const CosNotification::StructuredEvent& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); ACE_UNUSED_ARG(event); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h index 9b9e143af85..afc3eff9095 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h @@ -32,12 +32,10 @@ public: unsigned int expected, Notify_Test_Client& client); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); protected: - void push_structured_event (const CosNotification::StructuredEvent&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_event (const CosNotification::StructuredEvent&); ACE_CString name_; TimeBase::TimeT blocking_timeout_; diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 4a3896ba229..c70e0a4dd81 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -41,13 +41,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp index 67bfc2552e9..dd9c654fe21 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -42,7 +42,6 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer ( void Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var consumer = this->_this (); @@ -81,7 +80,6 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events ( const CosNotification::EventBatch& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++count_; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h index 4c60891d68c..e19763cb7e5 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h @@ -30,12 +30,10 @@ public: Notify_Test_Client& client, int sent); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); protected: - void push_structured_events (const CosNotification::EventBatch&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_events (const CosNotification::EventBatch&); ACE_CString name_; CORBA::Short discard_policy_; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index 3cb7e10ff34..f079b0053e2 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -26,7 +26,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); @@ -58,7 +57,6 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event ( const CosNotification::StructuredEvent& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h index 347d20ba278..bd58ab5e9f8 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h @@ -31,12 +31,10 @@ public: CORBA::Long max_events_per_consumer, Notify_Test_Client& client); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); protected: - void push_structured_event (const CosNotification::StructuredEvent&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_event (const CosNotification::StructuredEvent&); ACE_CString name_; CORBA::Short discard_policy_; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index af6a7107fc7..e26e788f839 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -54,13 +54,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 12a7edb0518..6ac0beea5c7 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -45,13 +45,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp index 856843f7660..8969889d264 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp @@ -19,7 +19,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void Notify_Structured_Push_Consumer::push_structured_event ( const CosNotification::StructuredEvent& /*event*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h index 99c00e0bb5c..0e5ff0b2fea 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h @@ -30,8 +30,7 @@ public: unsigned int expected, Notify_Test_Client& client); protected: - void push_structured_event (const CosNotification::StructuredEvent&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_event (const CosNotification::StructuredEvent&); ACE_CString name_; unsigned int expected_; diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index c70f1d160cf..d42e0c93188 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -42,13 +42,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index 5fb18be9cff..d07ecd3689c 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -30,7 +30,6 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer ( void Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = this->_this (); @@ -71,7 +70,6 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events ( const CosNotification::EventBatch& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (count_ == 0) { diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h index 5d22ffdc2a2..8468813f787 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h @@ -31,12 +31,10 @@ public: int expected_count, Notify_Test_Client& client); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); protected: - void push_structured_events (const CosNotification::EventBatch&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_events (const CosNotification::EventBatch&); ACE_CString name_; CORBA::Short order_policy_; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index 4ed908f305e..60719e71117 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -31,7 +31,6 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( void Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); @@ -65,7 +64,6 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event ( const CosNotification::StructuredEvent& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); if (count_ == 0) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h index fb764f049cf..0d948b295a2 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h @@ -32,12 +32,10 @@ public: int expected, Notify_Test_Client& client); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); protected: - void push_structured_event (const CosNotification::StructuredEvent&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_event (const CosNotification::StructuredEvent&); ACE_CString name_; CORBA::Short order_policy_; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index 5403daa0e41..9eaad1e7967 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -31,13 +31,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index ceafea4d1a5..da297e04130 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -30,13 +30,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 0212a144027..055dc246d98 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -69,9 +69,6 @@ StructuredPushConsumer_i::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -135,8 +132,6 @@ StructuredPushConsumer_i::check_serial_number (CORBA::ULong seq) void StructuredPushConsumer_i::push_structured_event ( const CosNotification::StructuredEvent & notification) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { this->received_ += 1; if (this->received_ == this->expect_ + 1) @@ -227,7 +222,6 @@ StructuredPushConsumer_i::push_structured_event ( void StructuredPushConsumer_i::disconnect_structured_push_consumer ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) StructuredPushConsumer received disconnect\n") @@ -288,9 +282,6 @@ SequencePushConsumer_i::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -354,8 +345,6 @@ void SequencePushConsumer_i::push_structured_events ( const CosNotification::EventBatch & notifications ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { size_t batch_size = notifications.length(); if (this->verbose_) @@ -446,7 +435,6 @@ SequencePushConsumer_i::push_structured_events ( void SequencePushConsumer_i::disconnect_sequence_push_consumer ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) SequencePushConsumer received disconnect\n") @@ -507,9 +495,6 @@ AnyPushConsumer_i::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -573,8 +558,6 @@ void AnyPushConsumer_i::push ( const CORBA::Any & data ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { this->received_ += 1; if (this->received_ == this->expect_ + 1) @@ -656,7 +639,6 @@ AnyPushConsumer_i::push ( void AnyPushConsumer_i::disconnect_push_consumer ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) AnyPushConsumer received disconnect\n") @@ -703,7 +685,6 @@ ReconnectionCallback_i::reconnect ( CORBA::Boolean ReconnectionCallback_i::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Boolean (1); } @@ -1087,7 +1068,6 @@ Consumer_Main::load_ids() void Consumer_Main::reconnect ( CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->verbose_) { diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index c3bda2e0b63..61d18fb4638 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -30,20 +30,14 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); size_t received () const; void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose); @@ -73,20 +67,14 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); virtual void push_structured_events ( const CosNotification::EventBatch & notifications - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); virtual void disconnect_sequence_push_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); size_t received () const; void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose); @@ -117,20 +105,14 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); virtual void push ( const CORBA::Any & data - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); virtual void disconnect_push_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); size_t received () const; void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose); @@ -172,8 +154,7 @@ public: CORBA::Object_ptr reconnection ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); private: Consumer_Main & consumer_main_; @@ -198,8 +179,7 @@ class Consumer_Main void usage (FILE * log) const; void reconnect ( - CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory); private: /// Find naming service. diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index f2b91f8de26..4a22dbd01db 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -21,9 +21,6 @@ StructuredPushSupplier_i::subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -36,7 +33,6 @@ StructuredPushSupplier_i::subscription_change ( void StructuredPushSupplier_i::disconnect_structured_push_supplier ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) Supplier StructuredPushSupplier received disconnect\n") @@ -51,9 +47,6 @@ SequencePushSupplier_i::subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -66,7 +59,6 @@ SequencePushSupplier_i::subscription_change ( void SequencePushSupplier_i::disconnect_sequence_push_supplier ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) Supplier SequencePushSupplier received disconnect\n") @@ -81,9 +73,6 @@ AnyPushSupplier_i::subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { ACE_UNUSED_ARG (added); ACE_UNUSED_ARG (removed); @@ -96,7 +85,6 @@ AnyPushSupplier_i::subscription_change ( void AnyPushSupplier_i::disconnect_push_supplier ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P,%t) Suppleir AnyPushSupplier received disconnect\n") @@ -143,7 +131,6 @@ ReconnectionCallback_i::reconnect ( CORBA::Boolean ReconnectionCallback_i::is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Boolean (1); } @@ -497,7 +484,6 @@ Supplier_Main::load_ids() void Supplier_Main::reconnect ( CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory); this->reconnecting_ = true; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h index a5abbd355d7..76790f3845c 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h @@ -28,14 +28,10 @@ class StructuredPushSupplier_i : public virtual POA_CosNotifyComm::StructuredPus virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); virtual void disconnect_structured_push_supplier ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSupplier @@ -43,14 +39,10 @@ class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSup virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); virtual void disconnect_sequence_push_supplier ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier @@ -58,14 +50,10 @@ class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); virtual void disconnect_push_supplier ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; class ReconnectionCallback_i : public virtual POA_NotifyExt::ReconnectionCallback @@ -87,8 +75,7 @@ public: CORBA::Object_ptr reconnection ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean is_alive (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean is_alive (void); private: Supplier_Main & supplier_main_; @@ -113,8 +100,7 @@ class Supplier_Main void usage (FILE * log) const; void reconnect ( - CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory); private: /// Find naming service. diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index 4d75d55a852..93c9ce3ed8c 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -25,7 +25,6 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer ( void Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = this->_this (); @@ -57,7 +56,6 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events ( const CosNotification::EventBatch& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "{%u}", events.length())); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h index b73f3c2a9e7..cdb1c927dc9 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h @@ -30,12 +30,10 @@ public: unsigned int high, Notify_Test_Client& client); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); protected: - void push_structured_events (const CosNotification::EventBatch&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_events (const CosNotification::EventBatch&); ACE_CString name_; unsigned int low_; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index d752690b91a..99e64b8d641 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -41,13 +41,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index 7da1dca4809..19e325d9f7d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -30,7 +30,6 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer () void Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = this->_this (); @@ -62,7 +61,6 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events( const CosNotification::EventBatch& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "{%u}", events.length())); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h index 66e93b2f84d..d6fc3520099 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h @@ -32,12 +32,10 @@ public: ~Notify_Sequence_Push_Consumer (); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); private: - void push_structured_events(const CosNotification::EventBatch&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_events(const CosNotification::EventBatch&); ACE_CString name_; unsigned int low_; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index aa75ef1b151..204c211622a 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -43,13 +43,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp index dba87df34f5..20cad2ec4ed 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp @@ -31,7 +31,6 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name, void Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CosNotifyChannelAdmin::EventChannel_ptr notify_channel) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(notify_channel); CosNotifyComm::StructuredPushConsumer_var objref = @@ -65,7 +64,6 @@ static void validate_expression(bool expr, const char* msg) void Notify_Push_Consumer::push_structured_event ( const CosNotification::StructuredEvent& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); received_++; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h index d577b7f5002..3649d2d46a9 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h @@ -28,12 +28,10 @@ public: Notify_Push_Consumer (const char* name, int sent, bool useFilter, Notify_Test_Client& client); void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CosNotifyChannelAdmin::EventChannel_ptr ec) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosNotifyChannelAdmin::EventChannel_ptr ec); private: - void push_structured_event (const CosNotification::StructuredEvent&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_event (const CosNotification::StructuredEvent&); private: ACE_CString name_; CORBA::Long sent_; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index 86542c868f2..a9ca558ee4a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -32,13 +32,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp index 32aa61440c0..65dbd223d8a 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp @@ -78,7 +78,6 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name, void Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CosNotifyChannelAdmin::EventChannel_ptr notify_channel) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); @@ -133,7 +132,6 @@ static void validate_expression(bool expr, const char* msg) void Notify_Push_Consumer::push_structured_event ( const CosNotification::StructuredEvent& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "-")); received_++; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h index 9113d215823..2d17ace210b 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h @@ -31,12 +31,10 @@ public: NS_FilterType supplierFilter, Notify_Test_Client& client); void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CosNotifyChannelAdmin::EventChannel_ptr ec) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosNotifyChannelAdmin::EventChannel_ptr ec); private: - void push_structured_event (const CosNotification::StructuredEvent&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_event (const CosNotification::StructuredEvent&); private: ACE_CString name_; CORBA::Long sent_; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp index 963ddda3627..6a98b5c6eee 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp @@ -6,7 +6,6 @@ Notify_Push_Supplier::_connect ( CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CosNotifyChannelAdmin::EventChannel_ptr notify_channel, bool useFilter) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushSupplier_var objref = this->_this (); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h index 254ae0b88b4..da41e3a9064 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h @@ -10,8 +10,7 @@ class Notify_Push_Supplier: public TAO_Notify_Tests_StructuredPushSupplier public: void _connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CosNotifyChannelAdmin::EventChannel_ptr notify_channel, - bool useFilter) - ACE_THROW_SPEC ((CORBA::SystemException)); + bool useFilter); }; #endif /* NOTIFY_PUSH_SUPPLIER_H */ diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index 1fa4997d470..1dd0218557e 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -33,13 +33,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index ed23bf0e963..6db332ceea9 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -22,9 +22,6 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter () char* TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("ETCL"); } @@ -33,10 +30,6 @@ TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void) CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint - )) { const char* PoolId_prefix = "PoolId = "; size_t poolId_index = ACE_OS::strlen (PoolId_prefix); @@ -86,11 +79,6 @@ void TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/, const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint, - CosNotifyFilter::ConstraintNotFound - )) { } @@ -98,29 +86,24 @@ TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::Cons CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::ConstraintNotFound)) { return 0; } CosNotifyFilter::ConstraintInfoSeq * TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Notify_Tests_RT_Test_Filter::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -135,8 +118,6 @@ TAO_Notify_Tests_RT_Test_Filter::destroy (void) CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData)) { throw CORBA::NO_IMPLEMENT (); } @@ -144,8 +125,6 @@ TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */ CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -241,8 +220,6 @@ CORBA::Boolean TAO_Notify_Tests_RT_Test_Filter::match_typed ( const CosNotification::PropertySeq & /* filterable_data */ ) - ACE_THROW_SPEC (( CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData)) { throw CORBA::NO_IMPLEMENT (); } @@ -251,7 +228,6 @@ CosNotifyFilter::CallbackID TAO_Notify_Tests_RT_Test_Filter::attach_callback ( CosNotifyComm::NotifySubscribe_ptr /* callback */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -260,15 +236,12 @@ void TAO_Notify_Tests_RT_Test_Filter::detach_callback ( CosNotifyFilter::CallbackID /* callback */ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyFilter::CallbackNotFound)) { throw CORBA::NO_IMPLEMENT (); } CosNotifyFilter::CallbackIDSeq * TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h index 70814b3c6f6..8745a307fa2 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h @@ -43,80 +43,33 @@ public: ~TAO_Notify_Tests_RT_Test_Filter (); protected: - virtual char * constraint_grammar (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual char * constraint_grammar (void); - virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint - )); + virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list); virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list, const CosNotifyFilter::ConstraintInfoSeq & modify_list - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidConstraint, - CosNotifyFilter::ConstraintNotFound - )); - - virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::ConstraintNotFound - )); - - virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void remove_all_constraints (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void destroy (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual CORBA::Boolean match (const CORBA::Any & filterable_data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); - - virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); - - virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::UnsupportedFilterableData - )); - - virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void detach_callback (CosNotifyFilter::CallbackID callback) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::CallbackNotFound - )); - - virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); + + virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list); + + virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void); + + virtual void remove_all_constraints (void); + + virtual void destroy (void); + + virtual CORBA::Boolean match (const CORBA::Any & filterable_data); + + virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data); + + virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data); + + virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback); + + virtual void detach_callback (CosNotifyFilter::CallbackID callback); + + virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp index c272f58f359..0e492c999bb 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp @@ -28,10 +28,6 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_ CosNotifyFilter::Filter_ptr TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_grammar) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "(%P, %t)In TAO_Notify_Tests_RT_Test_FilterFactory::create_filter\n")); @@ -65,10 +61,6 @@ CosNotifyFilter::MappingFilter_ptr TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/, const CORBA::Any & /*default_value*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h index a660b54c952..bcb35f1f89c 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h @@ -51,19 +51,11 @@ public: ///= CosNotifyFilter::FilterFactory methods virtual CosNotifyFilter::Filter_ptr create_filter (const char * constraint_grammar - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )); + ); virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (const char * constraint_grammar, const CORBA::Any & default_value - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyFilter::InvalidGrammar - )); + ); protected: /// The POA in which to activate the Filters. diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 3bc1ad86a3b..efabcadd2e4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -259,9 +259,6 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void) void TAO_Notify_Tests_Activation_Manager::start (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h index 3e50b89342a..2c38032e172 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h @@ -55,10 +55,7 @@ public: virtual ~TAO_Notify_Tests_Activation_Manager (); /// Interface impl. - virtual void start (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void start (void); /// Register Supplier void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name); diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index 2f9f8fadb29..7647879b111 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -90,8 +90,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { // No-Op. } diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index 5bb80446e24..3c81fa9772d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -77,11 +77,7 @@ protected: // = NotifyPublish method virtual void offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index 77c60f9f1cf..a4cf175e466 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -171,10 +171,6 @@ TAO_Notify_Tests_Periodic_Consumer::check_priority (const CosNotification::Prope void TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h index a3e84ea25fd..a722bacbc6b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h @@ -57,11 +57,7 @@ protected: virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); void handle_start_event (const CosNotification::PropertySeq& prop_seq); void check_priority (const CosNotification::PropertySeq& prop_seq); diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp index d7a94d18abe..27cb0748b62 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp @@ -38,7 +38,6 @@ TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void) void TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); @@ -47,10 +46,6 @@ TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void) void TAO_Notify_Tests_PushConsumer::push (const CORBA::Any & /*data*/) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )) { // NOP } diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h index aab6ae3635b..6a880b72ba6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h @@ -80,19 +80,12 @@ protected: virtual void disconnect_from_proxy (void); // = PushConsumer methods - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_push_consumer (void); /// Default does nothing. void push ( const CORBA::Any & data - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp index 2125a574fbf..335efc1ec7e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp @@ -46,7 +46,6 @@ TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void) void TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h index 82a27d6dcb3..5301aa7c3a2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h @@ -83,10 +83,7 @@ protected: virtual void disconnect_from_proxy (void); // = PushSupplier method - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_push_supplier (void); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp index 0f8c26001f1..252d400bd7b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp @@ -26,8 +26,6 @@ TAO_Notify_Tests_Relay_Consumer::connect (void) void TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent ¬ification) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { // The Periodic Consumer will record the run statistics. //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification); diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h index 1dd0739b4e8..5fcbb013102 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h @@ -40,9 +40,7 @@ public: virtual void connect (void); void push_structured_event (const CosNotification::StructuredEvent &/*notification*/ - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); protected: /// Destination object. diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp index 1cf382bd71c..169b179a4aa 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp @@ -38,7 +38,6 @@ TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void) void TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); @@ -49,8 +48,6 @@ void TAO_Notify_Tests_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch &/*notifications*/ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { // NOP } diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h index d17da42daa4..43e8becdda3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h @@ -80,19 +80,12 @@ protected: virtual void disconnect_from_proxy (void); // = SequencePushConsumer methods - virtual void disconnect_sequence_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_sequence_push_consumer (void); /// Default does nothing. virtual void push_structured_events ( const CosNotification::EventBatch & notifications - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp index dce9988b74a..36537a16048 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp @@ -47,7 +47,6 @@ TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void) void TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h index 35615eb5c1c..7794f59d00c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h @@ -83,10 +83,7 @@ protected: virtual void disconnect_from_proxy (void); // = SequencePushSupplier method - virtual void disconnect_sequence_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_sequence_push_supplier (void); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp index cc58c87c8ea..eb7973ba0e6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp @@ -38,7 +38,6 @@ TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void) void TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); @@ -49,8 +48,6 @@ void TAO_Notify_Tests_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent &/*notification*/ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { // NOP } diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h index 68d24401d7c..841785f955f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h @@ -80,19 +80,12 @@ protected: virtual void disconnect_from_proxy (void); // = StructuredPushConsumer methods - virtual void disconnect_structured_push_consumer (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_structured_push_consumer (void); /// Default does nothing. virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp index fb9e76fc469..d5cc66c07d0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp @@ -48,7 +48,6 @@ TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void) void TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h index 5a70d452e8e..3b9a9983aeb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h @@ -83,10 +83,7 @@ protected: virtual void disconnect_from_proxy (void); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void disconnect_structured_push_supplier (void); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 96aa030b188..30582741d3b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -85,10 +85,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::subscription_change ( const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )) { // No op. } diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index a00a7f33fdc..7a3d12f7c78 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -78,11 +78,7 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosNotifyComm::InvalidEventType - )); + ); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp index cc6a64df10a..e1654e3fead 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp @@ -26,7 +26,6 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer () void Notify_Sequence_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = this->_this (); @@ -56,7 +55,6 @@ Notify_Sequence_Push_Consumer::_connect ( void Notify_Sequence_Push_Consumer::push_structured_events( const CosNotification::EventBatch& events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if ( this->count_ == 0 ) { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h index 89094dcf08a..ac3e9d44568 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h @@ -31,12 +31,10 @@ public: ~Notify_Sequence_Push_Consumer (); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); private: - void push_structured_events(const CosNotification::EventBatch&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_events(const CosNotification::EventBatch&); ACE_CString name_; unsigned int expected_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp index 31b8c3b6e0a..a04c78eea3f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp @@ -27,7 +27,6 @@ Notify_Structured_Push_Consumer::~Notify_Structured_Push_Consumer () void Notify_Structured_Push_Consumer::_connect ( CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); @@ -50,7 +49,6 @@ Notify_Structured_Push_Consumer::_connect ( void Notify_Structured_Push_Consumer::push_structured_event( const CosNotification::StructuredEvent& /*event*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { if ( this->count_ == 0 ) { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h index a342bd45cb2..9d7d0cdd158 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h @@ -31,12 +31,10 @@ public: Notify_Test_Client& client); ~Notify_Structured_Push_Consumer (); - void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin) - ACE_THROW_SPEC ((CORBA::SystemException)); + void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); private: - void push_structured_event(const CosNotification::StructuredEvent&) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_structured_event(const CosNotification::StructuredEvent&); ACE_CString name_; unsigned int expected_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index a2c6cdd8b32..77219aa1a54 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -41,13 +41,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index 9d7ec6fac29..85921ac91c4 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -40,13 +40,11 @@ public: } void go (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } void done (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 7a37115c4b3..44fe363c9af 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -455,8 +455,6 @@ RedGreen_Test_StructuredPushConsumer::offer_change ( const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { // No-Op. } @@ -465,8 +463,6 @@ void RedGreen_Test_StructuredPushConsumer::push_structured_event ( const CosNotification::StructuredEvent & notification ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, @@ -511,7 +507,6 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event ( void RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No-Op. } @@ -533,8 +528,6 @@ void SlowConsumer::push_structured_event ( const CosNotification::StructuredEvent & notification ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { // Slow it down ... ACE_OS::sleep (1); @@ -615,8 +608,6 @@ RedGreen_Test_StructuredPushSupplier::subscription_change ( const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)) { //No-Op. } @@ -648,7 +639,6 @@ RedGreen_Test_StructuredPushSupplier::send_event ( void RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No-Op. } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 5cebcd037f7..b50fcfa64d0 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -218,20 +218,15 @@ protected: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); virtual void disconnect_structured_push_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; /*****************************************************************/ @@ -243,9 +238,7 @@ public: virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)); + ); }; @@ -299,14 +292,11 @@ protected: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosNotifyComm::InvalidEventType)); + ); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); }; /*****************************************************************/ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index b7002dd7bf2..f8c45095160 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -45,8 +45,6 @@ void Throughput_StructuredPushConsumer::push_structured_event ( const CosNotification::StructuredEvent & notification ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { // Extract payload. const char* msg; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index a6e5fb04aec..2798f0d5cbe 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -66,11 +66,7 @@ public: // = StructuredPushSupplier methods virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosEventComm::Disconnected - )); + ); void accumulate_into (ACE_Throughput_Stats &throughput) const; // Accumulate the throughput statistics into <throughput> diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp index f226d42dba3..0f139779223 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp @@ -41,7 +41,6 @@ Object1_impl::~Object1_impl() void Object1_impl::method1(const char* activity, CORBA::Long seconds, char* &output) - ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException)) { const int scale_factor = 2000; int work; diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h index ef99d1209a8..80e16f06dbe 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h +++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h @@ -35,8 +35,7 @@ class Object1_impl : public POA_testSched::Object1 virtual void method1(const char *activity, CORBA::Long seconds, char *&output - ) - ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException)); + ); }; #endif /* Object1_I_H */ diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 6b2d0eb4935..142dc77809f 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -44,12 +44,10 @@ public: // = Interface implementation accessor methods. - void id (CORBA::Short id) - ACE_THROW_SPEC ((CORBA::SystemException)); + void id (CORBA::Short id); // Sets id. - CORBA::Short id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short id (void); // Gets id. private: @@ -67,14 +65,12 @@ My_Test_Object::~My_Test_Object (void) CORBA::Short My_Test_Object::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return id_; } void My_Test_Object::id (CORBA::Short id) - ACE_THROW_SPEC ((CORBA::SystemException)) { id_ = id; } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp index cac6e66f604..02da1a0652c 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp @@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional, test_i, "$Id$") void Callback_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (0); @@ -23,7 +22,6 @@ Callback_i::shutdown (void) void Callback_i::callback_method () - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Callback method called \n")); @@ -35,7 +33,6 @@ Callback_i::callback_method () CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { @@ -48,7 +45,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object this->callback_ = Callback::_duplicate (callback); @@ -94,7 +90,6 @@ Simple_Server_i::call_client (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h index 33333f74968..cc4725dc141 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h @@ -31,12 +31,10 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); // Safe way to shutdown - void callback_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_method (void); // The callback method private: @@ -58,14 +56,11 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Boolean do_callback); - void callback_object (Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_object (Callback_ptr callback); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); int call_client (void); diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp index 4e93ab3c7d3..d0500b4c774 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp @@ -20,7 +20,6 @@ TX_Object_i::~TX_Object_i (void) void TX_Object_i::send (const DataSeq & data) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->data_ = data; @@ -31,7 +30,6 @@ TX_Object_i::send (const DataSeq & data) void TX_Object_i::recv (DataSeq_out data) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (data, DataSeq, @@ -46,7 +44,6 @@ TX_Object_i::recv (DataSeq_out data) void TX_Object_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h index 0a5a0608374..9b4c59bde58 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h +++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h @@ -33,14 +33,11 @@ public: // Destructor virtual ~TX_Object_i (void); - virtual void send (const DataSeq & data) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send (const DataSeq & data); - virtual void recv (DataSeq_out data) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void recv (DataSeq_out data); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp index 30af277ad32..e91058cf879 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp @@ -16,7 +16,6 @@ client_i::~client_i (void) void client_i::test_reply (const char *msg) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_INFO, ACE_TEXT("(%N) message received was ") diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h index 593fac1e9a2..ae1d1405e9b 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h @@ -30,8 +30,7 @@ public: client_i (server_ptr s); virtual ~client_i (void); - virtual void test_reply (const char *msg) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void test_reply (const char *msg); private: diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp index b16ab2f3f1f..873cf521f55 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp @@ -16,21 +16,18 @@ server_i::~server_i (void) void server_i::set_client (client_ptr c) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->client_ = client::_duplicate (c); } void server_i::test_request (const char *msg) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->client_->test_reply (msg); } void server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h index fe6d4278022..ca6edbbada5 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h @@ -30,14 +30,11 @@ public: server_i (CORBA::ORB_ptr orb); virtual ~server_i (void); - virtual void set_client (client_ptr c) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_client (client_ptr c); - virtual void test_request (const char *msg) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void test_request (const char *msg); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp index f278cf08e3a..225c91d9abd 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp @@ -12,7 +12,6 @@ ACE_RCSID (Send_File, void Simple_Server_i::send_line (const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { /* @@ -33,7 +32,6 @@ Simple_Server_i::send_line (const char *) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h index dce0675446b..729b1d933f8 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - void send_line (const char *line) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_line (const char *line); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp index b688de2b03a..ba8e1b90c52 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp @@ -18,15 +18,12 @@ ACE_RCSID (MT_IIOP_SSL, void Simple_Server_i::ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return; } void Simple_Server_i::validate_protocol (void) - ACE_THROW_SPEC ((Simple_Server::WrongProtocolType, - CORBA::SystemException)) { if (this->validated_ == NOT_VALIDATED) { @@ -74,7 +71,6 @@ Simple_Server_i::validate_protocol (void) CORBA::Long Simple_Server_i::test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Request in thread [%t]\n")); @@ -85,7 +81,6 @@ Simple_Server_i::test_method (CORBA::Long x) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h index 0894e704594..61eb06ce0b5 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h @@ -31,18 +31,13 @@ public: // ctor // = The Simple_Server methods. - void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void ping (void); - void validate_protocol (void) - ACE_THROW_SPEC ((Simple_Server::WrongProtocolType, - CORBA::SystemException)); + void validate_protocol (void); - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: /// The ORB diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp index dbe79cedd55..634b0fd9e27 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp @@ -13,7 +13,6 @@ ACE_RCSID (MT_Server, CORBA::Long Simple_Server_i::test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Simple_Server: Request in thread %t\n")); @@ -24,7 +23,6 @@ Simple_Server_i::test_method (CORBA::Long x) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -33,7 +31,6 @@ Simple_Server_i::shutdown (void) CORBA::Long Another_One_i::test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Another_One: Request in thread %t\n")); diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h index b9277d89035..28dafc13474 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -56,8 +54,7 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp index 3c682f2d2df..3312a201f57 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp @@ -19,8 +19,6 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb, void Foo_i::baz (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Foo::Bar::NoSecurityAttributes)) { SecurityLevel3::ClientCredentials_var credentials = this->current_->client_credentials (); @@ -38,7 +36,6 @@ Foo_i::baz (void) void Foo_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 4fc3d00a03d..dce00836ab5 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -27,12 +27,9 @@ public: SecurityLevel3::SecurityCurrent_ptr current); /// Test method. - virtual void baz (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Foo::Bar::NoSecurityAttributes)); + virtual void baz (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index ee365c81d78..28864874d31 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -41,12 +41,10 @@ public: // = Interface implementation accessor methods. - void id (CORBA::Short id) - ACE_THROW_SPEC ((CORBA::SystemException)); + void id (CORBA::Short id); // Sets id. - CORBA::Short id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short id (void); // Gets id. private: @@ -64,14 +62,12 @@ My_Test_Object::~My_Test_Object (void) CORBA::Short My_Test_Object::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return id_; } void My_Test_Object::id (CORBA::Short id) - ACE_THROW_SPEC ((CORBA::SystemException)) { id_ = id; } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index ee365c81d78..28864874d31 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -41,12 +41,10 @@ public: // = Interface implementation accessor methods. - void id (CORBA::Short id) - ACE_THROW_SPEC ((CORBA::SystemException)); + void id (CORBA::Short id); // Sets id. - CORBA::Short id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short id (void); // Gets id. private: @@ -64,14 +62,12 @@ My_Test_Object::~My_Test_Object (void) CORBA::Short My_Test_Object::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return id_; } void My_Test_Object::id (CORBA::Short id) - ACE_THROW_SPEC ((CORBA::SystemException)) { id_ = id; } diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index e2a7d1997bf..148ae9c5a37 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -9,7 +9,6 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$") TAO_Offer_Exporter:: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) - ACE_THROW_SPEC ((CORBA::SystemException)) : verbose_ (verbose) { // Initialize the offer sequences and structures. @@ -32,16 +31,6 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void) void TAO_Offer_Exporter::export_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting offers.\n")); @@ -57,16 +46,6 @@ TAO_Offer_Exporter::export_offers (void) void TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)) { try { @@ -117,16 +96,6 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) void TAO_Offer_Exporter::export_offers_to_all (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting to all.\n")); @@ -189,10 +158,6 @@ TAO_Offer_Exporter::export_offers_to_all (void) void TAO_Offer_Exporter::withdraw_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n")); @@ -221,10 +186,6 @@ TAO_Offer_Exporter::withdraw_offers (void) void TAO_Offer_Exporter::describe_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n")); @@ -265,18 +226,6 @@ TAO_Offer_Exporter::describe_offers (void) void TAO_Offer_Exporter::modify_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId, - CosTrading::IllegalPropertyName, - CosTrading::Register::UnknownPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::MandatoryProperty, - CosTrading::Register::ReadonlyProperty, - CosTrading::DuplicatePropertyName)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n")); @@ -317,11 +266,6 @@ TAO_Offer_Exporter::modify_offers (void) void TAO_Offer_Exporter:: withdraw_offers_using_constraints (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Register::NoMatchingOffers)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing with constraint.\n")); @@ -355,8 +299,6 @@ withdraw_offers_using_constraints (void) CosTrading::OfferIdSeq* TAO_Offer_Exporter::grab_offerids (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)) { if (this->verbose_) ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n")); diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h index f31142f193b..0280714f872 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h @@ -25,95 +25,37 @@ class TAO_TTest_Export TAO_Offer_Exporter public: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean verbose); ~TAO_Offer_Exporter (void); - void export_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)); + void export_offers (void); // Export a number of offers to the Trading Service. - void export_offers_to_all (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)); + void export_offers_to_all (void); // Export a number of offers to all traders accessible by the // bootstrapped trader. - void withdraw_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)); + void withdraw_offers (void); // Withdraw all exported offers. - void describe_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId)); + void describe_offers (void); // Describe all the offers registered with the bootstrapped trader. - void modify_offers (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId, - CosTrading::IllegalPropertyName, - CosTrading::Register::UnknownPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::MandatoryProperty, - CosTrading::Register::ReadonlyProperty, - CosTrading::DuplicatePropertyName)); + void modify_offers (void); // Remove some properties and change some properties in each offer. - void withdraw_offers_using_constraints (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Register::NoMatchingOffers)); + void withdraw_offers_using_constraints (void); // Withdraw a number of offers based on a constraint string. private: - CosTrading::OfferIdSeq* grab_offerids (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::NotImplemented)); + CosTrading::OfferIdSeq* grab_offerids (void); void create_offers (void); // Fill in each of the offer structures. - void export_to (CosTrading::Register_ptr reg) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)); + void export_to (CosTrading::Register_ptr reg); // Export the offers to the give Register interface. typedef ACE_Unbounded_Queue<TAO_Dynamic_Property*> DP_Queue; diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index c2f2049c714..ec3d6f11da4 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -13,17 +13,6 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, void TAO_Offer_Importer::perform_queries (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Federated Query.\n")); @@ -39,17 +28,6 @@ TAO_Offer_Importer::perform_queries (void) void TAO_Offer_Importer::perform_directed_queries (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Directed Query.\n")); @@ -132,17 +110,6 @@ void TAO_Offer_Importer::perform_queries_with_policies ( const TAO_Policy_Creator& policies ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)) { try { @@ -216,7 +183,6 @@ TAO_Offer_Importer::perform_queries_with_policies ( void TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, CosTrading::OfferIterator_ptr offer_iterator) const - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h index 74b47228d6a..b0355182cfe 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h @@ -33,55 +33,21 @@ public: TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose = 1); - void perform_queries (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + void perform_queries (void); // Barrage the bootstrapped-to trader with queries. - void perform_directed_queries (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + void perform_directed_queries (void); // Direct a query to a trader two graph edges distant from the // bootstrapped-to trader. private: - void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::IllegalConstraint, - CosTrading::Lookup::IllegalPreference, - CosTrading::Lookup::IllegalPolicyName, - CosTrading::Lookup::PolicyTypeMismatch, - CosTrading::Lookup::InvalidPolicyValue, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTrading::DuplicatePolicyName)); + void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager); // Perform a query on the bootstrapped-to trader given the policies // pass in <policy_manager>. void display_results (const CosTrading::OfferSeq& offer_seq, - CosTrading::OfferIterator_ptr offer_iterator) const - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTrading::OfferIterator_ptr offer_iterator) const; // Display the results of the query to the screen. CORBA::Boolean verbose_; diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index ad62f462b2e..14e938eee4d 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -7,7 +7,6 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$") TAO_Service_Type_Exporter:: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) - ACE_THROW_SPEC ((CORBA::SystemException)) : verbose_ (verbose), lookup_ (lookup_if) { @@ -23,10 +22,6 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, void TAO_Service_Type_Exporter::remove_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::HasSubTypes)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::removing all" " types from the Repository.\n")); @@ -56,15 +51,6 @@ TAO_Service_Type_Exporter::remove_all_types (void) void TAO_Service_Type_Exporter::add_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" @@ -74,15 +60,6 @@ TAO_Service_Type_Exporter::add_all_types (void) void TAO_Service_Type_Exporter::add_all_types_to_all (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" "add all types to all repositories.\n")); @@ -129,15 +106,6 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void) void TAO_Service_Type_Exporter:: add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) { for (int i = 0; i < NUM_TYPES; i++) { @@ -187,7 +155,6 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos) void TAO_Service_Type_Exporter::list_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -219,9 +186,6 @@ TAO_Service_Type_Exporter::list_all_types (void) void TAO_Service_Type_Exporter::describe_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)) { try { @@ -250,9 +214,6 @@ TAO_Service_Type_Exporter::describe_all_types (void) void TAO_Service_Type_Exporter::fully_describe_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)) { try { diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h index c11ae36f505..0553c65b621 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h @@ -24,57 +24,27 @@ class TAO_TTest_Export TAO_Service_Type_Exporter public: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose) - ACE_THROW_SPEC ((CORBA::SystemException)); - - void remove_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::HasSubTypes)); + CORBA::Boolean verbose); + + void remove_all_types (void); // Remove all service types from the trading service instance. - void add_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); + void add_all_types (void); // Add all the generated service types to the trading service instance. - void add_all_types_to_all (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); + void add_all_types_to_all (void); // Add all the generated service types to all the trading service // instances linked to the trading service we bootstrapped to. - void list_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void list_all_types (void); // List all the service types registered with the trading service // instance. - void describe_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)); + void describe_all_types (void); // Describe all the service types registered with the trading // service instance. - void fully_describe_all_types (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType)); + void fully_describe_all_types (void); // Same as describe_all_types, but fully describe lists the // properties of all service types the described service type // inherits from. @@ -84,16 +54,7 @@ private: void create_types (void); // Generate the service type description structures. - void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, - CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, - CosTrading::UnknownServiceType, - CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); + void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos); // Add all types to a sepcified service type repository reference. void diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp index b907db37a75..a7731f8777b 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp @@ -17,7 +17,6 @@ template <class T> CORBA::Any* TAO_Simple_Dynamic_Property<T>::evalDP (const char*, CORBA::TypeCode_ptr, const CORBA::Any&) - ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { CORBA::Any* return_value = 0; ACE_NEW_RETURN (return_value, CORBA::Any, 0); diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index d9b455df004..2836545113f 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -33,8 +33,7 @@ public: virtual CORBA::Any* evalDP (const char* /* name */, CORBA::TypeCode_ptr /* returned_type */, const CORBA::Any& /* extra_info */ - ) - ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); + ); private: T dp_; diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index 76fdc207e07..391e066b747 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -38,7 +38,7 @@ public: Remote_Output (void) {} virtual void confirm (void) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} // Method to test that the importer received a valid reference to // the exported object. }; @@ -51,7 +51,7 @@ public: Printer (void) {} virtual void confirm (void) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} // Method to test that the importer received a valid reference to // the exported object. }; @@ -63,7 +63,7 @@ public: Plotter (void) {} virtual void confirm (void) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} // Method to test that the importer received a valid reference to // the exported object. }; @@ -75,7 +75,7 @@ public: File_System (void) {} virtual void confirm (void) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} // Method to test that the importer received a valid reference to // the exported object. }; @@ -87,7 +87,7 @@ public: PostScript_Printer (void) {} virtual void confirm (void) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} // Method to test that the importer received a valid reference to // the exported object. }; diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp index 10ee6f6d41b..4d588fdfd60 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp @@ -11,7 +11,6 @@ corbaname_Status_i::corbaname_Status_i (void) CORBA::Boolean corbaname_Status_i::print_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // If the client makes a succesful request, return a true value // indicating that it has successfully reached the server. diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h index be0aa750b56..853351b58cd 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h @@ -11,8 +11,7 @@ class corbaname_Status_i : public POA_corbaname::Status { public: corbaname_Status_i (void); - CORBA::Boolean print_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean print_status (void); }; |