diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event')
29 files changed, 35 insertions, 117 deletions
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. |