diff options
Diffstat (limited to 'TAO/orbsvcs/examples')
115 files changed, 134 insertions, 622 deletions
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_; |